[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