unify(network): Merge GameNetwork and related code

Author: xezon

Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h

@@ -78,6 +78,17 @@ class CustomMatchPreferences : public UserPreferences
 	Bool getDisallowNonAsianText( void );
 	void setDisallowNonAsianText( Bool val );
 
+  Bool getSuperweaponRestricted(void) const;
+  void setSuperweaponRestricted( Bool superweaponRestricted);
+
+  Money getStartingCash(void) const;
+  void setStartingCash( const Money &startingCash );
+
+  Bool getFactionsLimited(void) const; // Prefers to only use the original 3 sides, not USA Air Force General, GLA Toxin General, et al
+  void setFactionsLimited( Bool factionsLimited );
+
+  Bool getUseStats( void ) const;
+  void setUseStats( Bool useStats );
 };
 
 #endif // __CUSTOMMATCHPREFERENCES_H__

Generals/Code/GameEngine/Include/Common/GlobalData.h

@@ -39,6 +39,7 @@
 #include "Common/SubsystemInterface.h"
 #include "GameClient/Color.h"
 #include "Common/STLTypedefs.h"
+#include "Common/Money.h"
 
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
 struct FieldParse;
@@ -441,8 +442,8 @@ class GlobalData : public SubsystemInterface
 	Real m_standardMinefieldDistance;
 
 
-	Bool m_showMetrics;								///< whether or not to show the metrics.
-	Int m_defaultStartingCash;				///< The amount of cash a player starts with by default.
+	Bool  m_showMetrics;								///< whether or not to show the metrics.
+	Money m_defaultStartingCash;				///< The amount of cash a player starts with by default.
 
 	Bool m_debugShowGraphicalFramerate;		///< Whether or not to show the graphical framerate bar.
 

Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h

@@ -33,6 +33,7 @@
 #define _MULTIPLAYERSETTINGS_H_
 
 #include "GameClient/Color.h"
+#include "Common/Money.h"
 
 // FORWARD DECLARATIONS ///////////////////////////////////////////////////////////////////////////
 struct FieldParse;
@@ -69,6 +70,9 @@ class MultiplayerColorDefinition
 typedef std::map<Int, MultiplayerColorDefinition> MultiplayerColorList;
 typedef std::map<Int, MultiplayerColorDefinition>::iterator MultiplayerColorIter;
 
+// A list of values to display in the starting money dropdown
+typedef std::vector< Money > MultiplayerStartingMoneyList;
+
 //-------------------------------------------------------------------------------------------------
 /** Multiplayer Settings container class
   *	Defines multiplayer settings */
@@ -91,8 +95,6 @@ class MultiplayerSettings : public SubsystemInterface
 	MultiplayerColorDefinition * findMultiplayerColorDefinitionByName(AsciiString name);
 	MultiplayerColorDefinition * newMultiplayerColorDefinition(AsciiString name);
 
-	inline Int getInitialCreditsMin( void ) { return m_initialCreditsMin; }
-	inline Int getInitialCreditsMax( void ) { return m_initialCreditsMax; }
 	inline Int getStartCountdownTimerSeconds( void ) { return m_startCountdownTimerSeconds; }
 	inline Int getMaxBeaconsPerPlayer( void ) { return m_maxBeaconsPerPlayer; }
 	inline Bool isShroudInMultiplayer( void ) { return m_isShroudInMultiplayer; }
@@ -109,6 +111,17 @@ class MultiplayerSettings : public SubsystemInterface
 	}
 	MultiplayerColorDefinition * getColor(Int which);
 
+
+  const Money & getDefaultStartingMoney() const
+  {
+    DEBUG_ASSERTCRASH( m_gotDefaultStartingMoney, ("You must specify a default starting money amount in multiplayer.ini") );
+    return m_defaultStartingMoney;
+  }
+
+  const MultiplayerStartingMoneyList & getStartingMoneyList() const { return m_startingMoneyList; }
+
+  void addStartingMoneyChoice( const Money & money, Bool isDefault );
+
 private:
 	Int m_initialCreditsMin;
 	Int m_initialCreditsMax;
@@ -123,6 +136,9 @@ class MultiplayerSettings : public SubsystemInterface
 	Int m_numColors;
 	MultiplayerColorDefinition m_observerColor;
 	MultiplayerColorDefinition m_randomColor;
+  MultiplayerStartingMoneyList      m_startingMoneyList;
+  Money                             m_defaultStartingMoney;
+  Bool                              m_gotDefaultStartingMoney;
 };
 
 // singleton

Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h

@@ -57,6 +57,12 @@ class SkirmishPreferences : public UserPreferences
 	Int getPreferredColor(void);				// convenience function
 	AsciiString getPreferredMap(void);	// convenience function
 	Bool usesSystemMapDir(void);		// convenience function
+
+  Bool getSuperweaponRestricted(void) const;
+  void setSuperweaponRestricted( Bool superweaponRestricted);
+
+  Money getStartingCash(void) const;
+  void setStartingCash( const Money &startingCash );
 };
 
 #endif // __SKIRMISHPREFERENCES_H__

Generals/Code/GameEngine/Include/Common/UserPreferences.h

@@ -38,6 +38,7 @@
 //-----------------------------------------------------------------------------
 #include "Common/STLTypedefs.h"
 
+class Money;
 typedef UnsignedInt CursorCaptureMode;
 typedef UnsignedInt ScreenEdgeScrollMode;
 
@@ -166,6 +167,11 @@ class LANPreferences : public UserPreferences
 	Bool usesSystemMapDir(void);		// convenience function
 	Int getNumRemoteIPs(void);					// convenience function
 	UnicodeString getRemoteIPEntry(Int i);	// convenience function
+
+  Bool getSuperweaponRestricted(void) const;
+  Money getStartingCash(void) const;
+  void setSuperweaponRestricted( Bool superweaponRestricted);
+  void setStartingCash( const Money & startingCash );
 };
 
 #endif // __USERPREFERENCES_H__

Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h

@@ -123,7 +123,6 @@ class DisconnectManager
 	Bool m_haveNotifiedOtherPlayersOfCurrentFrame;
 
 	time_t m_timeOfDisconnectScreenOn;
-
 	Int m_pingsSent;
 	Int m_pingsRecieved;
 	UnsignedInt m_pingFrame;

Generals/Code/GameEngine/Include/GameNetwork/GUIUtil.h

@@ -37,8 +37,9 @@ void ShowUnderlyingGUIElements( Bool show, const char *layoutFilename, const cha
 															 const char **gadgetsToHide, const char **perPlayerGadgetsToHide );
 
 void PopulateColorComboBox(Int comboBox, GameWindow *comboArray[], GameInfo *myGame, Bool isObserver = FALSE);
-void PopulatePlayerTemplateComboBox(Int comboBox, GameWindow *comboArray[], GameInfo *myGame, Bool allowObservers);
+void PopulatePlayerTemplateComboBox(Int comboBox, GameWindow *comboArray[], GameInfo *myGame, Bool allowObservers );
 void PopulateTeamComboBox(Int comboBox, GameWindow *comboArray[], GameInfo *myGame, Bool isObserver = FALSE);
+void PopulateStartingCashComboBox(GameWindow *comboBox, GameInfo *myGame);
 
 void EnableSlotListUpdates( Bool val );
 Bool AreSlotListUpdatesEnabled( void );

Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h

@@ -32,6 +32,7 @@
 #define __GAMEINFO_H__
 
 #include "Common/Snapshot.h"
+#include "Common/Money.h"
 #include "GameNetwork/NetworkDefs.h"
 #include "GameNetwork/FirewallHelper.h"
 
@@ -193,6 +194,13 @@ class GameInfo
 	inline Int getMapContentsMask( void ) const;						///< Get the map contents mask
 	void setSeed( Int seed );													///< Set the random seed for the game
 	inline Int getSeed( void ) const;												///< Get the game seed
+	inline Int getUseStats( void ) const;		///< Does this game count towards gamespy stats?
+	inline void setUseStats( Int useStats );
+
+  inline UnsignedShort getSuperweaponRestriction( void ) const; ///< Get any optional limits on superweapons
+  void setSuperweaponRestriction( UnsignedShort restriction ); ///< Set the optional limits on superweapons
+  inline const Money & getStartingCash(void) const;
+  void setStartingCash( const Money & startingCash );
 
 	void setSlotPointer( Int index, GameSlot *slot );	///< Set the slot info pointer
 
@@ -222,6 +230,9 @@ class GameInfo
 	Bool isPlayerPreorder(Int index);
 	void markPlayerAsPreorder(Int index);
 
+  inline Bool oldFactionsOnly(void) const;
+  inline void setOldFactionsOnly( Bool oldFactionsOnly );
+
 protected:
 	Int m_preorderMask;
 	Int m_crcInterval;
@@ -239,6 +250,10 @@ class GameInfo
 	UnsignedInt m_mapSize;
 	Int m_mapMask;
 	Int m_seed;
+	Int m_useStats;
+  Money         m_startingCash;
+  UnsignedShort m_superweaponRestriction;
+  Bool m_oldFactionsOnly; // Only USA, China, GLA -- not USA Air Force General, GLA Toxic General, et al
 };
 
 extern GameInfo *TheGameInfo;
@@ -254,6 +269,12 @@ Bool				GameInfo::isInGame( void ) const								{ return m_inGame; }
 void				GameInfo::setInGame( void )											{ m_inGame = true; }
 Bool				GameInfo::isGameInProgress( void ) const				{ return m_inProgress; }
 void				GameInfo::setGameInProgress( Bool inProgress )	{ m_inProgress = inProgress; }
+Int					GameInfo::getUseStats( void ) const             { return m_useStats; }
+void				GameInfo::setUseStats( Int useStats )           { m_useStats = useStats; }
+const Money&GameInfo::getStartingCash( void ) const         { return m_startingCash; }
+UnsignedShort GameInfo::getSuperweaponRestriction( void ) const { return m_superweaponRestriction; }
+Bool        GameInfo::oldFactionsOnly(void) const           { return m_oldFactionsOnly; }
+void        GameInfo::setOldFactionsOnly( Bool oldFactionsOnly ) { m_oldFactionsOnly = oldFactionsOnly; }
 
 AsciiString GameInfoToAsciiString( const GameInfo *game );
 Bool ParseAsciiStringToGameInfo( GameInfo *game, AsciiString options );
@@ -284,5 +305,6 @@ class SkirmishGameInfo : public GameInfo, public Snapshot
 };
 
 extern SkirmishGameInfo *TheSkirmishGameInfo;
+extern SkirmishGameInfo *TheChallengeGameInfo;
 
 #endif // __GAMEINFO_H__

Generals/Code/GameEngine/Source/Common/GlobalData.cpp

@@ -464,8 +464,8 @@ GlobalData* GlobalData::m_theOriginal = NULL;
 	{ "ObjectPlacementShadows", INI::parseBool, NULL, offsetof( GlobalData, m_objectPlacementShadows ) },
 
 	{ "StandardPublicBone", INI::parseAsciiStringVectorAppend, NULL, offsetof(GlobalData, m_standardPublicBones) },
-	{ "ShowMetrics",								INI::parseBool,				NULL,			offsetof( GlobalData, m_showMetrics ) },
-	{ "DefaultStartingCash",				INI::parseUnsignedInt, NULL,		offsetof( GlobalData, m_defaultStartingCash ) },
+	{ "ShowMetrics",								INI::parseBool,				   NULL,		offsetof( GlobalData, m_showMetrics ) },
+  { "DefaultStartingCash",				Money::parseMoneyAmount, NULL,		offsetof( GlobalData, m_defaultStartingCash ) },
 
 // NOTE: m_doubleClickTimeMS is still in use, but we disallow setting it from the GameData.ini file. It is now set in the constructor according to the windows parameter.
 //	{ "DoubleClickTimeMS",									INI::parseUnsignedInt,			NULL, offsetof( GlobalData, m_doubleClickTimeMS ) },

Generals/Code/GameEngine/Source/Common/RTS/Player.cpp

@@ -98,6 +98,7 @@
 #include "GameLogic/Module/BattlePlanUpdate.h"
 #include "GameLogic/VictoryConditions.h"
 
+#include "GameNetwork/GameInfo.h"
 
 
 //Grey for neutral.
@@ -429,7 +430,16 @@ void Player::init(const PlayerTemplate* pt)
 
 		if( m_money.countMoney() == 0 )
 		{
-			m_money.deposit( TheGlobalData->m_defaultStartingCash, FALSE );
+			// TheSuperHacker @bugfix Now correctly deposits the money and fixes its audio and academy issues.
+			// Note that copying the entire Money class instead would also copy the player index inside of it.
+			if ( TheGameInfo )
+			{
+				m_money.deposit( TheGameInfo->getStartingCash().countMoney(), FALSE );
+			}
+			else
+			{
+				m_money.deposit( TheGlobalData->m_defaultStartingCash.countMoney(), FALSE );
+			}
 		}
 
 		m_playerDisplayName.clear();