modified mp bobby rays to show inv. also disabled reinforcements in MP

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

GameSettings.cpp

@@ -699,6 +699,7 @@ 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);
 

Laptop/AimMembers.cpp

@@ -48,6 +48,7 @@
 
 #include "Strategic Town Loyalty.h"
 #include "connect.h"
+#include "fresh_header.h"
 
 //
 //******	Defines	******
@@ -1217,14 +1218,24 @@ 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 )
 		return( TRUE );
 
+	UINT16 wnameY = AIM_MEMBER_WEAPON_NAME_Y;
+	PosX = WEAPONBOX_X+3;		// + 3 ( 1 to take care of the shadow, +2 to get past the weapon box border )
 
 	PosY = WEAPONBOX_Y;
-	PosX = WEAPONBOX_X+3;		// + 3 ( 1 to take care of the shadow, +2 to get past the weapon box border )
+	if(is_networked && guiCurrentLaptopMode == LAPTOP_MODE_MERC_FILES)
+	{
+		PosY-=30;
+		wnameY-=30;
+
+	}
+
+
 	for(i=0; i<gMercProfiles[ubMercID].inv.size(); i++)
 	{
 		usItem = gMercProfiles[ubMercID].inv[ i ];
@@ -1268,10 +1279,10 @@ BOOLEAN DisplayMercsInventory(UINT8 ubMercID)
 			wcscpy( gzItemName, ShortItemNames[ usItem ] );
 
 			//if this will only be a single line, center it in the box
-			if( ( DisplayWrappedString( (UINT16)(PosX-1), AIM_MEMBER_WEAPON_NAME_Y, AIM_MEMBER_WEAPON_NAME_WIDTH, 2, AIM_M_WEAPON_TEXT_FONT, AIM_M_WEAPON_TEXT_COLOR,	gzItemName, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED | DONT_DISPLAY_TEXT ) / GetFontHeight( AIM_M_WEAPON_TEXT_FONT ) ) == 1 )
-				DisplayWrappedString( (UINT16)(PosX-1), (UINT16)(AIM_MEMBER_WEAPON_NAME_Y+GetFontHeight( AIM_M_WEAPON_TEXT_FONT )/2), AIM_MEMBER_WEAPON_NAME_WIDTH, 2, AIM_M_WEAPON_TEXT_FONT, AIM_M_WEAPON_TEXT_COLOR,	gzItemName, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED );
+			if( ( DisplayWrappedString( (UINT16)(PosX-1), wnameY, AIM_MEMBER_WEAPON_NAME_WIDTH, 2, AIM_M_WEAPON_TEXT_FONT, AIM_M_WEAPON_TEXT_COLOR,	gzItemName, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED | DONT_DISPLAY_TEXT ) / GetFontHeight( AIM_M_WEAPON_TEXT_FONT ) ) == 1 )
+				DisplayWrappedString( (UINT16)(PosX-1), (UINT16)(wnameY+GetFontHeight( AIM_M_WEAPON_TEXT_FONT )/2), AIM_MEMBER_WEAPON_NAME_WIDTH, 2, AIM_M_WEAPON_TEXT_FONT, AIM_M_WEAPON_TEXT_COLOR,	gzItemName, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED );
 			else
-				DisplayWrappedString( (UINT16)(PosX-1), AIM_MEMBER_WEAPON_NAME_Y, AIM_MEMBER_WEAPON_NAME_WIDTH, 2, AIM_M_WEAPON_TEXT_FONT, AIM_M_WEAPON_TEXT_COLOR,	gzItemName, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED );
+				DisplayWrappedString( (UINT16)(PosX-1), wnameY, AIM_MEMBER_WEAPON_NAME_WIDTH, 2, AIM_M_WEAPON_TEXT_FONT, AIM_M_WEAPON_TEXT_COLOR,	gzItemName, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED );
 
 			PosX += WEAPONBOX_SIZE_X;
 		}

Multiplayer/fresh_header.h

@@ -31,7 +31,7 @@ typedef struct
 
 }AIint;
 
-
+BOOLEAN DisplayMercsInventory(UINT8 ubMercID);
 void send_door ( SOLDIERTYPE *pSoldier, INT16 sGridNo, BOOLEAN fNoAnimations );
 
 void send_changestate (EV_S_CHANGESTATE * SChangeState);

Multiplayer/test_space.cpp

@@ -102,7 +102,7 @@ bool ovh_advance;
 bool ovh_ready;
 
 #include "opplist.h"
-
+#include "fresh_header.h"
 //int cnt = 40;
 
 
@@ -113,7 +113,7 @@ void test_func2 (void)//now bound to "0"
 
 SOLDIERTYPE * pSoldier=MercPtrs[ 0 ];
 
-PauseAITemporarily();
+
 
 //RemoveOneOpponent( pSoldier );
 //SOLDIERTYPE * pSoldier2=MercPtrs[ 127 ];

Multiplayer/test_space.h

@@ -11,4 +11,3 @@ INT8 FireBullet( SOLDIERTYPE * pFirer, BULLET * pBullet, BOOLEAN fFake );
 extern bool ovh_advance;
 extern bool ovh_ready;
 void request_ovh(UINT8 ubID);
-

Strategic/mapscreen.cpp

@@ -6151,6 +6151,7 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
 
 				case '0':
 					SelectAllCharactersInSquad( 9 ); // internal squad #s start at 0
+					if(is_networked)test_func2();
 					break;
 
 				case '!':