Merge branch 'master' of https://github.com/SupSuper/OpenXcom.git into autosave

Author: redv

CMakeLists.txt

@@ -9,6 +9,7 @@ option ( ENABLE_WARNING "Always show warnings (even for release builds)" OFF )
 option ( FATAL_WARNING "Treat warnings as errors" OFF )
 set ( MSVC_WARNING_LEVEL 3 CACHE STRING "Visual Studio warning levels" )
 option ( FORCE_INSTALL_DATA_TO_BIN "Force installation of data to binary directory" OFF )
+set ( DATADIR "" CACHE STRING "Where to place datafiles" )
 
 if ( WIN32 )
   set ( default_deps_dir "${CMAKE_SOURCE_DIR}/deps" )

Makefile.am

@@ -7,11 +7,11 @@ doc_DATA = \
 pkgdata_DATA = \
 	bin/data/README.txt
 
-rulesetdir =  $(pkgdatadir)/Ruleset
+rulesetdir =  $(pkgdatadir)/data/Ruleset
 ruleset_DATA = \
 	bin/data/Ruleset/Xcom1Ruleset.rul
 
-languagedir = $(pkgdatadir)/Language
+languagedir = $(pkgdatadir)/data/Language
 language_DATA = \
 	bin/data/Language/Big.fnt \
 	bin/data/Language/Bulgarian.geo \
@@ -49,7 +49,7 @@ language_DATA = \
 	bin/data/Language/Ukrainian.geo \
 	bin/data/Language/Ukrainian.lng
 
-namedir = $(pkgdatadir)/SoldierName
+namedir = $(pkgdatadir)/data/SoldierName
 name_DATA = \
 	bin/data/SoldierName/American.nam \
 	bin/data/SoldierName/British.nam \
@@ -68,7 +68,7 @@ name_DATA = \
 	bin/data/SoldierName/Spanish.nam \
 	bin/data/SoldierName/Swedish.nam
 
-shaderdir = $(pkgdatadir)/Shaders
+shaderdir = $(pkgdatadir)/data/Shaders
 shader_DATA = \
 	bin/data/Shaders/CRT.OpenGL.shader \
 	bin/data/Shaders/CRT-interlaced.OpenGL.shader \
@@ -475,6 +475,8 @@ openxcom_SOURCES = \
 	src/Ruleset/MapData.h \
 	src/Ruleset/MapDataSet.cpp \
 	src/Ruleset/MapDataSet.h \
+	src/Ruleset/MCDPatch.cpp \
+	src/Ruleset/MCDPatch.h \
 	src/Ruleset/AlienDeployment.cpp \
 	src/Ruleset/AlienDeployment.h \
 	src/Ruleset/AlienRace.cpp \
@@ -536,7 +538,7 @@ openxcom_SOURCES = \
 	src/Savegame/CraftWeapon.cpp \
 	src/Savegame/CraftWeapon.h \
 	src/Savegame/CraftWeaponProjectile.cpp \
-	src/Savegame/CraftWeaponProkectile.h \
+	src/Savegame/CraftWeaponProjectile.h \
 	src/Savegame/EquipmentLayoutItem.cpp \
 	src/Savegame/EquipmentLayoutItem.h \
 	src/Savegame/GameTime.cpp \

README.txt

@@ -2,7 +2,7 @@
 # OpenXcom v0.9 #
 #################
 
-OpenXcom is an open-source remake of the popular
+OpenXcom is an open-source clone of the popular
 UFO: Enemy Unknown (X-Com: UFO Defense in USA) videogame by
 Microprose, licensed under the GPL and written in C++ / SDL.
 See more info at the website: http://openxcom.org