- fixed RPATH in cmake

- minor fixes

CMakeLists.txt

@@ -64,8 +64,12 @@ add_definitions(-DM_DATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_DIR}")
 add_definitions(-DM_BIN_DIR="${CMAKE_INSTALL_PREFIX}/${BIN_DIR}")
 add_definitions(-DM_LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
 
+if (CMAKE_INSTALL_RPATH) # if RPATH is not empty - add separator for one more entry
+	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}:")
+endif()
+
 # remain full RPATH when installing (needed to find shared libraries)
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/vcmi")
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/vcmi")
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 add_subdirectory(lib)

Mods/WoG/filesystem.json

@@ -29,7 +29,7 @@
 		],
 		"MAPS/":
 		[
-			{"type" : "dir", "path" : "ALL/Maps"}
+			{"type" : "dir", "path" : "ALL/MODS/WOG/Maps"}
 		],
 	}
 }

lib/CModHandler.cpp

@@ -128,6 +128,7 @@ CCreature * CModHandler::loadCreature (const JsonNode &node)
 	cre->fightValue = node["fightValue"].Float();
 	cre->AIValue = node["aiValue"].Float();
 	cre->growth = node["growth"].Float();
+	cre->hordeGrowth = node["horde"].Float(); // Needed at least until configurable buildings
 
 	cre->addBonus(node["hitPoints"].Float(), Bonus::STACK_HEALTH);
 	cre->addBonus(node["speed"].Float(), Bonus::STACKS_SPEED);