Merge and compile fixes (non-bot, will do bots later)

zone/map.cpp

@@ -192,6 +192,14 @@ bool Map::CheckLoS(glm::vec3 myloc, glm::vec3 oloc) const {
 	return !imp->rm->raycast((const RmReal*)&myloc, (const RmReal*)&oloc, nullptr, nullptr, nullptr);
 }
 
+// returns true if a collision happens
+bool Map::DoCollisionCheck(glm::vec3 myloc, glm::vec3 oloc, glm::vec3 &outnorm, float &distance) const {
+	if(!imp)
+		return false;
+
+	return imp->rm->raycast((const RmReal*)&myloc, (const RmReal*)&oloc, nullptr, (RmReal *)&outnorm, (RmReal *)&distance);
+}
+
 inline bool file_exists(const std::string& name) {
 	std::ifstream f(name.c_str());
 	return f.good();