[GEN] Backports various things from ZH

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/DisabledTypes.h

@@ -35,6 +35,7 @@
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
 #include "Common/BitFlags.h"
+#include "Common/BitFlagsIO.h"
 
 //-------------------------------------------------------------------------------------------------
 /** Kind of flags for determining groups of things that belong together
@@ -56,6 +57,8 @@ enum DisabledType CPP_11(: Int)
 	DISABLED_SCRIPT_UNDERPOWERED,
 
 	DISABLED_COUNT,
+	
+	DISABLED_ANY = 65535		///< Do not use this value for setting disabled types (read-only)
 };
 
 typedef BitFlags<DISABLED_COUNT>	DisabledMaskType;

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/FileSystem.h

@@ -116,9 +116,13 @@ struct FileInfo {
 	* created when FileSystem::Open() gets called.
 	*/
 //===============================
+#include <map>
 
 class FileSystem : public SubsystemInterface
 {
+  FileSystem(const FileSystem&);
+  FileSystem& operator=(const FileSystem&);
+  
 public:
 	FileSystem();
 	virtual	~FileSystem();
@@ -138,8 +142,7 @@ class FileSystem : public SubsystemInterface
 	void loadMusicFilesFromCD();
 	void unloadMusicFilesFromCD();
 protected:
-
-
+  mutable std::map<unsigned,bool> m_fileExist;
 };
 
 extern FileSystem*	TheFileSystem;

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

@@ -730,7 +730,6 @@ private: \
 public: /* include this line at the end to reset visibility to 'public' */ 
 
 
-
 // ----------------------------------------------------------------------------
 /**
 	This class is provided as a simple and safe way to integrate C++ object allocation
@@ -768,7 +767,6 @@ class MemoryPoolObject
 };
 
 
-
 // INLINING ///////////////////////////////////////////////////////////////////
 
 // ----------------------------------------------------------------------------
@@ -893,7 +891,6 @@ class STLSpecialAlloc
 #endif //DISABLE_GAMEMEMORY
 
 
-// ----------------------------------------------------------------------------
 /**
 	A simple utility class to ensure exception safety; this holds a MemoryPoolObject
 	and deletes it in its destructor. Especially useful for iterators!
@@ -910,7 +907,6 @@ class MemoryPoolObjectHolder
 };
 
 
-// ----------------------------------------------------------------------------
 /**
 	Sometimes you want to make a class's destructor protected so that it can only
 	be destroyed under special circumstances. MemoryPoolObject short-circuits this
@@ -924,4 +920,5 @@ ARGVIS:	void deleteInstance() { MemoryPoolObject::deleteInstance(); } public:
 
 #define EMPTY_DTOR(CLASS) inline CLASS::~CLASS() { }
 
+
 #endif // _GAME_MEMORY_H_

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/GlobalData.h

@@ -391,6 +391,9 @@ class GlobalData : public SubsystemInterface
 
 	Color m_hotKeyTextColor;					///< standard color for all hotkeys.
 
+  //THis is put on ice until later - M Lorenzen
+  //	Int m_cheaterHasBeenSpiedIfMyLowestBitIsTrue; ///< says it all.. this lives near other "colors" cause it is masquerading as one
+	
 	AsciiString m_specialPowerViewObjectName;	///< Created when certain special powers are fired so players can watch.
 
 	std::vector<AsciiString> m_standardPublicBones;
@@ -492,10 +495,13 @@ class GlobalData : public SubsystemInterface
 
 	Bool				m_isBreakableMovie;							///< if we enter a breakable movie, set this flag
 	Bool				m_breakTheMovie;								///< The user has hit escape!
-	
 	AsciiString m_modDir;
 	AsciiString m_modBIG;
 
+	//-allAdvice feature
+	//Bool m_allAdvice;
+
+
 	// the trailing '\' is included!
 	AsciiString getPath_UserData() const;
 

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

@@ -35,6 +35,7 @@
 // INCLUDES ///////////////////////////////////////////////////////////////////////////////////////
 #include "Lib/BaseType.h"
 #include "Common/BitFlags.h"
+#include "Common/BitFlagsIO.h"
 
 //-------------------------------------------------------------------------------------------------
 /** Kind of flags for determining groups of things that belong together

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

@@ -36,6 +36,19 @@
 #include "Common/GameMemory.h"
 #include "GameClient/TerrainRoads.h"
 
+
+
+class WorldHeightMapInterfaceClass
+{
+public:
+
+  virtual Int getBorderSize() = 0;
+  virtual Real getSeismicZVelocity(Int xIndex, Int yIndex) const = 0;
+  virtual void setSeismicZVelocity(Int xIndex, Int yIndex, Real value) = 0; 
+  virtual Real getBilinearSampleSeismicZVelocity( Int x, Int y) = 0;
+
+};
+
 /** MapObject class 
 Not ref counted.  Do not store pointers to this class.  */
 class WorldHeightMap;

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

@@ -567,6 +567,8 @@ class GameMessage : public MemoryPoolObject
 		MSG_DEBUG_KILL_OBJECT,
 #endif
 
+
+
 //*********************************************************************************************************
 		MSG_END_NETWORK_MESSAGES = 1999,						///< MARKER TO DELINEATE MESSAGES THAT GO OVER THE NETWORK
 //*********************************************************************************************************

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

@@ -73,4 +73,5 @@ struct MiscAudio
 };
 
 
-#endif /* _MISCAUDIO_H_ */
+#endif /* _MISCAUDIO_H_ */
+

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

@@ -34,6 +34,7 @@
 #include "Lib/BaseType.h"
 #include "Common/INI.h"
 #include "Common/BitFlags.h"
+#include "Common/BitFlagsIO.h"
 
 //-------------------------------------------------------------------------------------------------
 
@@ -83,6 +84,8 @@
 
 */
 
+#define NUM_MODELCONDITION_DOOR_STATES 4
+
 //-------------------------------------------------------------------------------------------------
 // IMPORTANT NOTE: you should endeavor to set up states such that the most "normal"
 // state is defined by the bit being off. That is, the typical "normal" condition

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

@@ -48,6 +48,7 @@ class Object;
 class Player;
 class Thing;
 class W3DModelDrawModuleData;	// ugh, hack (srj)
+class W3DTreeDrawModuleData; // ugh, hack (srj)
 struct FieldParse;
 
 // TYPES //////////////////////////////////////////////////////////////////////////////////////////
@@ -112,6 +113,8 @@ class ModuleData : public Snapshot
 
 	// ugh, hack
 	virtual const W3DModelDrawModuleData* getAsW3DModelDrawModuleData() const { return NULL; }
+	// ugh, hack
+	virtual const W3DTreeDrawModuleData* getAsW3DTreeDrawModuleData() const { return NULL; }
 	virtual StaticGameLODLevel getMinimumRequiredGameLOD() const { return (StaticGameLODLevel)0;}
 
 	static void buildFieldParse(MultiIniFieldParse& p) 

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/Player.h

@@ -316,6 +316,9 @@ class Player : public Snapshot
 	void toggleFreeBuild(){ m_DEMO_freeBuild = !m_DEMO_freeBuild; }
 	Bool buildsForFree() const { return m_DEMO_freeBuild; }
 
+#endif
+
+#if defined(_DEBUG) || defined(_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 	/// No time building cheat key
 	void toggleInstantBuild(){ m_DEMO_instantBuild = !m_DEMO_instantBuild; }
 	Bool buildsInstantly() const { return m_DEMO_instantBuild; }
@@ -770,6 +773,9 @@ class Player : public Snapshot
 #if defined(_DEBUG) || defined(_INTERNAL)
 	Bool									m_DEMO_ignorePrereqs;		///< Can I ignore prereq checks?
 	Bool									m_DEMO_freeBuild;				///< Can I build everything for no money?
+#endif
+
+#if defined(_DEBUG) || defined(_INTERNAL) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 	Bool									m_DEMO_instantBuild;		///< Can I build anything in one frame?
 #endif
 

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/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;
 
@@ -80,6 +100,7 @@ class SparseMatchFinder
 	//-------------------------------------------------------------------------------------------------
 
 	mutable MatchMap m_bestMatches;
+	//mutable HashMatchMap m_bestHashMatches;
 
 	//-------------------------------------------------------------------------------------------------
 	// METHODS

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/StackDump.h

@@ -29,8 +29,7 @@
 
 #ifndef IG_DEGBUG_STACKTRACE
 #define IG_DEBUG_STACKTRACE	1
-#endif
-
+#endif // Unsure about this one -ML 3/25/03
 #if defined(_DEBUG) || defined(_INTERNAL) || defined(IG_DEBUG_STACKTRACE)
 
 // Writes a stackdump (provide a callback : gets called per line)
@@ -70,6 +69,4 @@ __inline void DumpExceptionInfo( unsigned int u, EXCEPTION_POINTERS* e_info ) {}
 #endif
 
 extern AsciiString g_LastErrorDump;
-
-
 #endif // __STACKDUMP_H_

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

@@ -474,7 +474,7 @@ class Team : public MemoryPoolObject,
 		a convenience routine used to estimate the team's position by just returning the position
 		of the first member of the team
 		*/
-	const Coord3D* getEstimateTeamPosition(void);
+	const Coord3D* getEstimateTeamPosition(void) const;
 
 	/**
 		a convenience routine to move a team's units to another team.