[GEN] Backports ZH additions

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

@@ -152,10 +152,6 @@ class AudioManager : public SubsystemInterface
 		virtual void resumeAudio( AudioAffect which ) = 0;
 		virtual void pauseAmbient( Bool shouldPause ) = 0;
 
-		// device dependent stops.
-		virtual void stopAllAmbientsBy( Object* obj ) = 0;
-		virtual void stopAllAmbientsBy( Drawable* draw ) = 0;
-
 		// for focus issues
 		virtual void loseFocus( void );
 		virtual void regainFocus( void );
@@ -240,6 +236,8 @@ class AudioManager : public SubsystemInterface
 		// on zoom.
 		virtual void set3DVolumeAdjustment( Real volumeAdjustment );
 
+    virtual Bool has3DSensitiveStreamsPlaying( void ) const = 0;
+
  		virtual void *getHandleForBink( void ) = 0;
  		virtual void releaseHandleForBink( void ) = 0;
 
@@ -257,6 +255,7 @@ class AudioManager : public SubsystemInterface
 		virtual void processRequestList( void );
 
 		virtual AudioEventInfo *newAudioEventInfo( AsciiString newEventName );
+    virtual void addAudioEventInfo( AudioEventInfo * newEventInfo );
 		virtual AudioEventInfo *findAudioEventInfo( AsciiString eventName ) const;
 
 		const AudioSettings *getAudioSettings( void ) const;
@@ -298,6 +297,7 @@ class AudioManager : public SubsystemInterface
 
 		// For Worldbuilder, to build lists from which to select
 		virtual void findAllAudioEventsOfType( AudioType audioType, std::vector<AudioEventInfo*>& allEvents );
+    virtual const AudioEventInfoHash & getAllAudioEvents() const { return m_allAudioEventInfo; }
 
 		Real getZoomVolume() const { return m_zoomVolume; }
 	protected:
@@ -316,7 +316,9 @@ class AudioManager : public SubsystemInterface
 
 		// For tracking purposes
 		virtual AudioHandle allocateNewHandle( void );	
-
+    
+    void removeAllAudioRequests( void );
+    
 	protected:
 		AudioSettings *m_audioSettings;
 		MiscAudio *m_miscAudio;

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

@@ -58,6 +58,8 @@ enum FormationID CPP_11(: Int)
 	FORCE_FORMATIONID_TO_LONG_SIZE = 0x7ffffff
 };
 
+#define INVALID_ANGLE -100.0f
+
 class INI;
 
 //-------------------------------------------------------------------------------------------------

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