Merge branch 'master' into ExtraMercs

SaveLoadGame.cpp

@@ -1,14 +1,3 @@
-#ifdef PRECOMPILEDHEADERS
-	#include "JA2 All.h"
-	#include "PreBattle Interface.h"
-	#include "civ quotes.h"
-	#include "Militia Control.h"
-	#include "Strategic Event Handler.h"
-	#include "HelpScreen.h"
-	#include "Cheats.h"
-	#include "Animated ProgressBar.h"
-	#include "Shopkeeper Interface.h"
-#else
 	#include "Types.h"
 	#include "Soldier Profile.h"
 	#include "FileMan.h"
@@ -119,7 +108,6 @@
 	#include "ASD.h"				// added by Flugente
 	#include "MilitiaIndividual.h"	// added by Flugente
 	#include "Rebel Command.h"
-#endif
 
 #include		"BobbyR.h"
 #include		"Imp Portraits.h"
@@ -2513,7 +2501,7 @@ BOOLEAN SOLDIERTYPE::Load(HWFILE hFile)
 			return(FALSE);
 		}
 
-		// WANNE - BMP: TODO! Struktur prüfen
+		// WANNE - BMP: TODO! Struktur prüfen
 		//load some structs, atm just POD but could change
 		//Load STRUCT_AIData
 		numBytesRead = 0;
@@ -3456,7 +3444,7 @@ BOOLEAN SaveGame( int ubSaveGameID, STR16 pGameDesc )
 
 	SaveGameHeader.uiSavedGameVersion = SAVE_GAME_VERSION;
 	wcscpy( SaveGameHeader.sSavedGameDesc, pGameDesc );
-	strcpy( SaveGameHeader.zGameVersionNumber, czVersionNumber );
+	strcpy( SaveGameHeader.zGameVersionNumber, czVersionString );
 
 	SaveGameHeader.uiFlags;
 
@@ -4790,7 +4778,7 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
 	}
 
 	if ((gGameOptions.ubSquadSize == 8 && iResolution < _800x600) || 
-		(gGameOptions.ubSquadSize == 10 && iResolution < _1024x768))
+		(gGameOptions.ubSquadSize == 10 && iResolution < _1280x720))
 	{
 		FileClose( hFile );
 		return(FALSE);