[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

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

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

@@ -34,7 +34,10 @@ class ScopedMutex
 	public:
 		ScopedMutex(HANDLE mutex) : m_mutex(mutex)
 		{
-			WaitForSingleObject(m_mutex, INFINITE);
+			DWORD status = WaitForSingleObject(m_mutex, 500);
+			if (status != WAIT_OBJECT_0) {
+				DEBUG_LOG(("ScopedMutex WaitForSingleObject timed out - status %d\n", status));
+			}
 		}
 
 		~ScopedMutex()

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

@@ -72,6 +72,26 @@ class SparseMatchFinder
 		}
 	};
 
+	struct MapHelper
+	{
+		bool operator()(const BITSET& a, const BITSET& b) const
+		{
+			int i;
+			if (a.size() < b.size()) {
+				return true;
+			}
+			for (i = 0; i < a.size(); ++i) {
+				bool aVal = a.test(i);
+				bool bVal = b.test(i);
+				if (aVal && bVal) continue;
+				if (!aVal && !bVal) continue;
+				if (!aVal) return true;
+				return false;
+			}
+			return false; // all bits match.
+		}
+	};
+
 	//-------------------------------------------------------------------------------------------------
 	typedef std::hash_map< BITSET, const MATCHABLE*, HashMapHelper, HashMapHelper > MatchMap;
 

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

@@ -31,6 +31,7 @@
 #define __SPECIALPOWERMASKTYPE_H__
 
 #include "Common/BitFlags.h"
+#include "Common/BitFlagsIO.h"
 #include "Common/SpecialPowerType.h"
 
 typedef BitFlags<SPECIALPOWER_COUNT>	SpecialPowerMaskType;

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

@@ -45,7 +45,7 @@ class State;
 class StateMachine;
 class Object;
 
-#undef STATE_MACHINE_DEBUG
+//#undef STATE_MACHINE_DEBUG
 #if defined(_DEBUG)
 	#define STATE_MACHINE_DEBUG
 #endif
@@ -169,6 +169,7 @@ class State : public MemoryPoolObject, public Snapshot
 
 #ifdef STATE_MACHINE_DEBUG
 	virtual AsciiString getName() const {return m_name;}
+	std::vector<StateID> *getTransitions(void);
 #endif
 
 	// for internal use by the StateMachine class ---------------------------------------------------------

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

@@ -43,7 +43,6 @@
 #define __XFER_H_
 
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
-#include "Common/ModelState.h"
 #include "Common/Science.h"
 #include "Common/Upgrade.h"
 
@@ -171,6 +170,7 @@ class Xfer
 	virtual void xferRGBAColorInt( RGBAColorInt *rgbaColorInt );
 	virtual void xferObjectID( ObjectID *objectID );
 	virtual void xferDrawableID( DrawableID *drawableID );
+	virtual void xferSTLObjectIDVector( std::vector<ObjectID> *objectIDVectorData );
 	virtual void xferSTLObjectIDList( std::list< ObjectID > *objectIDListData );
 	virtual void xferSTLIntList( std::list< Int > *intListData );
 	virtual void xferScienceType( ScienceType *science );

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

@@ -32,6 +32,9 @@
 #define _CRC_H_
 
 #include "Lib/BaseType.h"
+
+#ifdef _DEBUG
+
 //#include "winsock2.h" // for htonl
 
 class CRC
@@ -50,4 +53,77 @@ class CRC
 	UnsignedInt crc;
 };
 
+#else
+
+// optimized inline only version
+class CRC
+{
+public:
+	CRC(void) { crc=0; }
+
+  /// Compute the CRC for a buffer, added into current CRC
+	__forceinline void computeCRC( const void *buf, Int len )
+  {
+    if (!buf||len<1)
+      return;
+    
+#if !(defined(_MSC_VER) && _MSC_VER < 1300)
+    // C++ version left in for reference purposes
+	  for (UnsignedByte *uintPtr=(UnsignedByte *)buf;len>0;len--,uintPtr++)
+    {
+    	int hibit;
+    	if (crc & 0x80000000) 
+      {
+		    hibit = 1;
+	    } 
+      else 
+      {
+		    hibit = 0;
+	    }
+
+	    crc <<= 1;
+	    crc += *uintPtr;
+	    crc += hibit;
+    }
+#else
+    // ASM version, verified by comparing resulting data with C++ version data
+    unsigned *crcPtr=&crc;
+    _asm
+    {
+      mov esi,[buf]
+      mov ecx,[len]
+      dec ecx
+      mov edi,[crcPtr]
+      mov ebx,dword ptr [edi]
+      xor eax,eax
+    lp:
+      mov al,byte ptr [esi]
+      shl ebx,1
+      inc esi
+      adc ebx,eax
+      dec ecx
+      jns lp
+      mov dword ptr [edi],ebx
+    };
+#endif
+  }
+
+  /// Clears the CRC to 0
+	void clear( void ) 
+  { 
+    crc = 0; 
+  }									
+
+  ///< Get the combined CRC
+	UnsignedInt get( void ) const
+  {
+    return crc;
+  }
+
+private:
+	UnsignedInt crc;
+};
+
+#endif
+
 #endif // _CRC_H_

Generals/Code/GameEngine/Include/GameClient/Color.h

@@ -76,6 +76,15 @@ extern void GameGetColorComponents( Color color,
 																	  UnsignedByte *green,
 																	  UnsignedByte *blue,
 																	  UnsignedByte *alpha );
+
+// Put on ice until later - M Lorenzen
+//extern void GameGetColorComponentsWithCheatSpy( Color color,
+//																	  UnsignedByte *red,
+//																	  UnsignedByte *green,
+//																	  UnsignedByte *blue,
+//																	  UnsignedByte *alpha );
+
+
 extern void GameGetColorComponentsReal( Color color, Real *red, Real *green, Real *blue, Real *alpha );
 
 extern Color GameDarkenColor( Color color, Int percent = 10 );