[GEN] Backport several GameEngine additions from Zero Hour (#752)

Author: tomsons26

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

@@ -172,11 +172,10 @@ class ArchiveFileSystem : public SubsystemInterface
 
 	// Unprotected this for copy-protection routines
 	AsciiString						getArchiveFilenameForFile(const AsciiString& filename) const;
-	
 	void loadMods( void );
 
 protected:
-	virtual void					loadIntoDirectoryTree(const ArchiveFile *archiveFile, const AsciiString& archiveFilename, Bool overwrite = FALSE);	///< load the archive file's header information and apply it to the global archive directory tree.
+	virtual void					loadIntoDirectoryTree(const ArchiveFile *archiveFile, const AsciiString& archiveFilename, Bool overwrite = FALSE );	///< load the archive file's header information and apply it to the global archive directory tree.
 
 	ArchiveFileMap m_archiveFileMap;
 	ArchivedDirectoryInfo m_rootDirectory;

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

@@ -138,6 +138,18 @@ template <size_t NUMBITS>
 	((BitFlags*)store)->parse(ini, NULL);
 }
 
+//-------------------------------------------------------------------------------------------------
+//-------------------------------------------------------------------------------------------------
+template <size_t NUMBITS>
+/*static*/ void BitFlags<NUMBITS>::parseSingleBitFromINI(INI* ini, void* /*instance*/, void *store, const void* /*userData*/)
+{
+	const char *token = ini->getNextToken();
+	Int bitIndex = INI::scanIndexList(token, s_bitNameList);	// this throws if the token is not found
+
+	Int *storeAsInt = (Int*)store;
+	*storeAsInt = bitIndex;
+}
+
 //-------------------------------------------------------------------------------------------------
 /** Xfer method
 	* Version Info:

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

@@ -136,6 +136,7 @@ class DataChunkOutput
 	void writeUnicodeString(UnicodeString string);
 	void writeArrayOfBytes(char *ptr, Int len);
 	void writeDict(const Dict& d);
+	void writeNameKey(const NameKeyType key);
 };
 
 //----------------------------------------------------------------------
@@ -228,6 +229,8 @@ class DataChunkInput
 	UnicodeString readUnicodeString(void);
 	Dict readDict(void);
 	void readArrayOfBytes(char *ptr, Int len);
+
+	NameKeyType readNameKey(void);
 };
 
 

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

@@ -66,7 +66,7 @@ class Energy : public Snapshot
 
 public:
 
-	inline Energy() : m_energyProduction(0), m_energyConsumption(0), m_owner(NULL) { }
+	Energy();
 
 	// reset energy information to base values.
 	void init( Player *owner)
@@ -77,7 +77,7 @@ class Energy : public Snapshot
 	}
 
 	/// return current energy production in kilowatts
-	Int getProduction() const { return m_energyProduction; }
+	Int getProduction() const;
 
 	/// return current energy consumption in kilowatts
 	Int getConsumption() const { return m_energyConsumption; }

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

@@ -316,7 +316,6 @@ class AudioManager : public SubsystemInterface
 
 		// For tracking purposes
 		virtual AudioHandle allocateNewHandle( void );	
-
     // Remove all AudioEventInfo's with the m_isLevelSpecific flag
     virtual void removeLevelSpecificAudioEventInfos( void );
 

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

@@ -179,6 +179,7 @@ class GeometryInfo : public Snapshot
 
 	/// note that the pt is generated using game logic random, not game client random!
 	void makeRandomOffsetWithinFootprint(Coord3D& pt) const;
+	void makeRandomOffsetOnPerimeter(Coord3D& pt) const; //Chooses a random point on the extent border.
 
 	void clipPointToFootprint(const Coord3D& geomCenter, Coord3D& ptToClip) const;
 

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

@@ -82,8 +82,15 @@ class Money : public Snapshot
 
 	void setPlayerIndex(Int ndx) { m_playerIndex = ndx; }
 
-protected:
+  static void parseMoneyAmount( INI *ini, void *instance, void *store, const void* userData );
+
+  // Does the amount of this == the amount of that (compare everything except m_playerIndex)
+  Bool amountEqual( const Money & that ) const
+  {
+    return m_money == that.m_money;
+  }
 
+protected:
 	// snapshot methods
 	virtual void crc( Xfer *xfer );
 	virtual void xfer( Xfer *xfer );

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

@@ -79,9 +79,9 @@ class MultiplayerSettings : public SubsystemInterface
 
 	MultiplayerSettings( void );
 
-	void init() { }
-	void update() { }
-	void reset() { }
+	virtual void init() { }
+	virtual void update() { }
+	virtual void reset() { }
 
 	//-----------------------------------------------------------------------------------------------
 	static const FieldParse m_multiplayerSettingsFieldParseTable[];		///< the parse table for INI definition

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

@@ -96,9 +96,11 @@ class NameKeyGenerator : public SubsystemInterface
 
 	/// Given a string, convert into a unique integer key.
 	NameKeyType nameToKey(const AsciiString& name) { return nameToKey(name.str()); }
+	NameKeyType nameToLowercaseKey(const AsciiString& name) { return nameToLowercaseKey(name.str()); }
 
 	/// Given a string, convert into a unique integer key.
 	NameKeyType nameToKey(const char* name);
+	NameKeyType nameToLowercaseKey(const char *name);
 
 	/** 
 		given a key, return the name. this is almost never needed,
@@ -108,6 +110,9 @@ class NameKeyGenerator : public SubsystemInterface
 	*/
 	AsciiString keyToName(NameKeyType key);
 
+  // Get a string out of the INI. Store it into a NameKeyType
+  static void parseStringAsNameKeyType( INI *ini, void *instance, void *store, const void* userData );
+
 private:
 
 	enum

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

@@ -169,6 +169,7 @@ class Radar : public Snapshot,
 	Bool isRadarWindow( GameWindow *window ) { return (m_radarWindow == window) && (m_radarWindow != NULL); }
 
 	Bool radarToWorld( const ICoord2D *radar, Coord3D *world );		///< radar point to world point on terrain
+	Bool radarToWorld2D( const ICoord2D *radar, Coord3D *world );		///< radar point to world point (x,y only!)
 	Bool worldToRadar( const Coord3D *world, ICoord2D *radar );		///< translate world point to radar (x,y)
 	Bool localPixelToRadar( const ICoord2D *pixel, ICoord2D *radar );	///< translate pixel (with UL of radar being (0,0)) to logical radar coords
 	Bool screenPixelToWorld( const ICoord2D *pixel, Coord3D *world ); ///< translate pixel (with UL of the screen being (0,0)) to world position in the world