disabled mp reading of ja2_options.ini to take default values only.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2200 3b4a5df2-a311-0410-b5c6-a8a6f20db521

GameSettings.cpp

@@ -44,6 +44,7 @@
 
 #define				GAME_EXTERNAL_OPTIONS_FILE	"Ja2_Options.ini"
 
+
 #define				CD_ROOT_DIR						"DATA\\"
 
 GAME_SETTINGS		gGameSettings;
@@ -368,9 +369,14 @@ extern INT32 CountEmptyIMPSlots( INT8 iSex );
 // Snap: Read options from an INI file in the default of custom Data directory
 void LoadGameExternalOptions()
 {
+
 	//Kaiden: Setting Ja2_Options.ini file to be read
 	CIniReader iniReader(GAME_EXTERNAL_OPTIONS_FILE);
+	
 
+	
+	if(is_networked) memset(&iniReader, 0, sizeof (CIniReader) );//disable ini in mp (taking default values)
+	
 
 	//################# Laptop Settings #################
 
@@ -699,7 +705,6 @@ void LoadGameExternalOptions()
 	gGameExternalOptions.gfAllowMilitiaGroups				= iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_MILITIA_MOBILE_GROUPS",FALSE);
 	gGameExternalOptions.gfmusttrainroaming					= iniReader.ReadBoolean("JA2 Gameplay Settings","MUST_TRAIN_MOBILE_MILITIA",FALSE);
 	gGameExternalOptions.gfAllowReinforcements				= iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_REINFORCEMENTS",FALSE);
-	if(is_networked)gGameExternalOptions.gfAllowReinforcements = FALSE;//hayden
 	gGameExternalOptions.gfAllowReinforcementsOnlyInCity	= iniReader.ReadBoolean("JA2 Gameplay Settings","ALLOW_REINFORCEMENTS_ONLY_IN_CITIES",FALSE);
 	gGameExternalOptions.guiBaseQueenPoolIncrement			= iniReader.ReadInteger("JA2 Gameplay Settings","QUEEN_POOL_INCREMENT_PER_DIFFICULTY_LEVEL",60);
 

Language Defines.h

@@ -20,8 +20,8 @@
 
 #if !defined(ENGLISH) && !defined(GERMAN) && !defined(RUSSIAN) && !defined(DUTCH) && !defined(POLISH) && !defined(FRENCH) && !defined(ITALIAN) && !defined(TAIWANESE)
 /* please set one manually here (by uncommenting) if not willingly to set Workspace wide */
-//#define ENGLISH
-#define GERMAN
+#define ENGLISH
+//#define GERMAN
 //#define RUSSIAN
 //#define DUTCH
 //#define POLISH

Laptop/AimMembers.cpp

@@ -1218,7 +1218,7 @@ BOOLEAN DisplayMercsInventory(UINT8 ubMercID)
 	CHAR16			gzItemName[ SIZE_ITEM_NAME ];
 	UINT8				ubItemCount=0;
 //	UINT16			gzTempItemName[ SIZE_ITEM_INFO ];
-	HVOBJECT	hWeaponBoxHandle;
+	
 
 	//if the mercs inventory has already been purchased, dont display the inventory
 	if( gMercProfiles[ ubMercID ].ubMiscFlags & PROFILE_MISC_FLAG_ALREADY_USED_ITEMS )

Strategic/Game Event Hook.cpp

@@ -46,6 +46,8 @@
 	#include "Campaign.h"
 #endif
 
+#include "connect.h"
+
 #ifdef JA2BETAVERSION
 extern BOOLEAN gfMercsNeverQuit;
 #endif
@@ -86,6 +88,7 @@ BOOLEAN ExecuteStrategicEvent( STRATEGICEVENT *pEvent )
 	// Kaiden: Opening the INI File
 	CIniReader iniReader("..\\Ja2_Options.ini");
 
+	if(is_networked) memset(&iniReader, 0, sizeof (CIniReader) );//disable ini in mp (taking default values)
 
 	//Kaiden: Getting Value for MERC Available on Day one?
 	// for some reason, this can't be in gamesettings.cpp