refactor(format): Remove trailing whitespace from game code files (#1425)

Author: xezon

Core/GameEngine/Include/Common/ArchiveFile.h

@@ -40,7 +40,7 @@ class File;
 /**
   *	An archive file is itself a collection of sub files. Each file inside the archive file
 	* has a unique name by which it can be accessed. The ArchiveFile object class is the
-	* runtime interface to the mix file and the sub files. Each file inside the mix 
+	* runtime interface to the mix file and the sub files. Each file inside the mix
 	* file can be accessed by the openFile().
 	*
 	* ArchiveFile interfaces can be created by the TheArchiveFileSystem object.
@@ -74,4 +74,4 @@ class ArchiveFile
 	DetailedArchivedDirectoryInfo m_rootDirectory;
 };
 
-#endif // __ARCHIVEFILE_H
+#endif // __ARCHIVEFILE_H

Core/GameEngine/Include/Common/ArchiveFileSystem.h

@@ -23,12 +23,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 //----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					                  
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //----------------------------------------------------------------------------
 //
 // Project:    Generals
@@ -49,7 +49,7 @@
 #define MUSIC_BIG "Music.big"
 
 //----------------------------------------------------------------------------
-//           Includes                                                      
+//           Includes
 //----------------------------------------------------------------------------
 
 #include "Common/SubsystemInterface.h"
@@ -90,7 +90,7 @@ typedef std::map<AsciiString, ArchivedFileInfo> ArchivedFileInfoMap;
 typedef std::map<AsciiString, ArchiveFile *> ArchiveFileMap;
 typedef std::map<AsciiString, AsciiString> ArchivedFileLocationMap; // first string is the file name, second one is the archive filename.
 
-class ArchivedDirectoryInfo 
+class ArchivedDirectoryInfo
 {
 public:
 	AsciiString								m_directoryName;
@@ -106,7 +106,7 @@ class ArchivedDirectoryInfo
 
 };
 
-class DetailedArchivedDirectoryInfo 
+class DetailedArchivedDirectoryInfo
 {
 public:
 	AsciiString												m_directoryName;
@@ -121,7 +121,7 @@ class DetailedArchivedDirectoryInfo
 	}
 };
 
-class ArchivedFileInfo 
+class ArchivedFileInfo
 {
 public:
 	AsciiString m_filename;
@@ -167,7 +167,7 @@ class ArchiveFileSystem : public SubsystemInterface
 
 	void					getFileListInDirectory(const AsciiString& currentDirectory, const AsciiString& originalDirectory, const AsciiString& searchName, FilenameList &filenameList, Bool searchSubdirectories) const; ///< search the given directory for files matching the searchName (egs. *.ini, *.rep).  Possibly search subdirectories.  Scans each Archive file.
 	Bool					getFileInfo(const AsciiString& filename, FileInfo *fileInfo) const; ///< see FileSystem.h
-	
+
 	virtual Bool	loadBigFilesFromDirectory(AsciiString dir, AsciiString fileMask, Bool overwrite = FALSE) = 0;
 
 	// Unprotected this for copy-protection routines
@@ -185,7 +185,7 @@ class ArchiveFileSystem : public SubsystemInterface
 extern ArchiveFileSystem *TheArchiveFileSystem;
 
 //----------------------------------------------------------------------------
-//           Inlining                                                       
+//           Inlining
 //----------------------------------------------------------------------------
 
 #endif // __ARCHIVEFILESYSTEM_H_

Core/GameEngine/Include/Common/AsciiString.h

@@ -22,14 +22,14 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: AsciiString.h 
+// FILE: AsciiString.h
 //-----------------------------------------------------------------------------
-//                                                                          
-//                       Westwood Studios Pacific.                          
-//                                                                          
-//                       Confidential Information					         
-//                Copyright (C) 2001 - All Rights Reserved                  
-//                                                                          
+//
+//                       Westwood Studios Pacific.
+//
+//                       Confidential Information
+//                Copyright (C) 2001 - All Rights Reserved
+//
 //-----------------------------------------------------------------------------
 //
 // Project:    RTS3
@@ -72,7 +72,7 @@ class UnicodeString;
 	type, rather analogous to 'int' -- when passed by value, a new string
 	is created, and modifying the new string doesn't modify the original.
 	This is done fairly efficiently, so that no new memory allocation is done
-	unless the string is actually modified. 
+	unless the string is actually modified.
 
 	Naturally, AsciiString handles all memory issues, so there's no need
 	to do anything to free memory... just allow the AsciiString's
@@ -84,7 +84,7 @@ class UnicodeString;
 class AsciiString
 {
 private:
-	
+
 	// Note, this is a Plain Old Data Structure... don't
 	// add a ctor/dtor, 'cuz they won't ever be called.
 	struct AsciiStringData
@@ -114,8 +114,8 @@ class AsciiString
 
 public:
 
-	enum 
-	{ 
+	enum
+	{
 		MAX_FORMAT_BUF_LEN = 2048,		///< max total len of string created by format/format_va
 		MAX_LEN = 32767							///< max total len of any AsciiString, in chars
 	};
@@ -142,7 +142,7 @@ class AsciiString
 	/**
 		Constructor -- from a literal string. Constructs an AsciiString
 		with the given string. Note that a copy of the string is made;
-		the input ptr is not saved. 
+		the input ptr is not saved.
 		Note that this is no longer explicit, as the conversion is almost
 		always wanted, anyhow.
 	*/
@@ -178,8 +178,8 @@ class AsciiString
 	*/
 	char getCharAt(int index) const;
 	/**
-		Return a pointer to the (null-terminated) string. Note that this is 
-		a const pointer: do NOT change this! It is imperative that it be 
+		Return a pointer to the (null-terminated) string. Note that this is
+		a const pointer: do NOT change this! It is imperative that it be
 		impossible (or at least, really difficuly) for someone to change our
 		private data, since it might be shared amongst other AsciiStrings.
 	*/
@@ -188,7 +188,7 @@ class AsciiString
 	/**
 		Makes sure there is room for a string of len+1 characters, and
 		returns a pointer to the string buffer.  This ensures that the
-		string buffer is NOT shared.  This is intended for the file reader, 
+		string buffer is NOT shared.  This is intended for the file reader,
 		that is reading new strings in from a file. jba.
 	*/
 	char* getBufferForRead(Int len);
@@ -250,7 +250,7 @@ class AsciiString
 
 	/**
 		Remove the final character in the string. If the string is empty,
-		do nothing. (This is a rather dorky method, but used a lot in 
+		do nothing. (This is a rather dorky method, but used a lot in
 		text editing, thus its presence here.)
 	*/
 	void removeLastChar();

Core/GameEngine/Include/Common/AudioAffect.h

@@ -32,7 +32,7 @@
 
 #include <Lib/BaseType.h>
 
-// if it is set by the options panel, use the system setting parameter. Otherwise, this will be 
+// if it is set by the options panel, use the system setting parameter. Otherwise, this will be
 // appended to whatever the current system volume is.
 enum AudioAffect CPP_11(: Int)
 {

Core/GameEngine/Include/Common/AudioEventInfo.h

@@ -69,7 +69,7 @@ enum SoundType CPP_11(: Int)
 	ST_PLAYER								= 0x0020,
 	ST_ALLIES								= 0x0040,
 	ST_ENEMIES							= 0x0080,
-	ST_EVERYONE							= 0x0100,	
+	ST_EVERYONE							= 0x0100,
 };
 
 extern const char *theAudioControlNames[];
@@ -97,11 +97,11 @@ struct AudioEventInfo : public MemoryPoolObject
 	Real m_minVolume;					// Clamped minimum value, useful when muting sound effects
 	Real m_pitchShiftMin;			// minimum pitch shift value
 	Real m_pitchShiftMax;			// maximum pitch shift value
-	Int m_delayMin;						// minimum delay before we'll fire up another one of these 
-	Int m_delayMax;						// maximum delay before we'll fire up another one of these 
+	Int m_delayMin;						// minimum delay before we'll fire up another one of these
+	Int m_delayMax;						// maximum delay before we'll fire up another one of these
 	Int m_limit;							// Limit to the number of these sounds that can be fired up simultaneously
 	Int m_loopCount;					// number of times to loop this sound
-	
+
 	AudioPriority m_priority;	// Priority of this sound
 	UnsignedInt m_type;								// Type of sound
 	UnsignedInt m_control;						// control of sound
@@ -119,8 +119,8 @@ struct AudioEventInfo : public MemoryPoolObject
 	Real m_maxDistance;			// greater than this distance and the sound behaves as though it is muted
 
 	AudioType m_soundType;	// This should be either Music, Streaming or SoundEffect
-	
-  
+
+
   // DynamicAudioEventInfo interfacing functions
   virtual Bool isLevelSpecific() const { return false; } ///< If true, this sound is only defined on the current level and can be deleted when that level ends
   virtual DynamicAudioEventInfo * getDynamicAudioEventInfo() { return NULL; }  ///< If this object is REALLY a DynamicAudioEventInfo, return a pointer to the derived class
@@ -129,7 +129,7 @@ struct AudioEventInfo : public MemoryPoolObject
   /// Is this a permenant sound? That is, if I start this sound up, will it ever end
   /// "on its own" or only if I explicitly kill it?
   Bool isPermanentSound() const { return BitIsSet( m_control, AC_LOOP ) && (m_loopCount == 0 );  }
-  
+
 	static const FieldParse m_audioEventInfo[];		///< the parse table for INI definition
 	const FieldParse *getFieldParse( void ) const { return m_audioEventInfo; }
 };

Core/GameEngine/Include/Common/AudioEventRTS.h

@@ -61,7 +61,7 @@ enum AudioPriority CPP_11(: Int);
 // You might want this to be memory pooled (I personally do), but it can't
 // because we allocate them on the stack frequently.
 class AudioEventRTS
-{	
+{
 public:
 	AudioEventRTS( );
 	AudioEventRTS( const AsciiString& eventName );
@@ -78,7 +78,7 @@ class AudioEventRTS
 	const AsciiString& getEventName( void ) const { return m_eventName; }
 
 	// generateFilename is separate from generatePlayInfo because generatePlayInfo should only be called once
-	// per triggered event. generateFilename will be called once per loop, or once to get each filename if 'all' is 
+	// per triggered event. generateFilename will be called once per loop, or once to get each filename if 'all' is
 	// specified.
 	void generateFilename( void );
 	AsciiString getFilename( void );
@@ -97,13 +97,13 @@ class AudioEventRTS
 	PortionToPlay getNextPlayPortion( void ) const;
 	void advanceNextPlayPortion( void );
 	void setNextPlayPortion( PortionToPlay ptp );
-	
+
 	void decreaseLoopCount( void );
 	Bool hasMoreLoops( void ) const;
-	
+
 	void setAudioEventInfo( const AudioEventInfo *eventInfo ) const;
 	const AudioEventInfo *getAudioEventInfo( void ) const;
-	
+
 	void setPlayingHandle( AudioHandle handle );	// for ID of this audio piece.
 	AudioHandle getPlayingHandle( void ); // for ID of this audio piece
 
@@ -115,7 +115,7 @@ class AudioEventRTS
 
 	Bool isDead() const { return m_ownerType == OT_Dead; }
 	OwnerType getOwnerType() const { return m_ownerType; }
-	
+
 	void setDrawableID( DrawableID drawID );
 	DrawableID getDrawableID( void );
 
@@ -147,11 +147,11 @@ class AudioEventRTS
 	void setPlayingAudioIndex( Int pai )  { m_playingAudioIndex = pai; };
 
 	Bool getUninterruptable( ) const { return m_uninterruptable; }
-	void setUninterruptable( Bool uninterruptable ) { m_uninterruptable = uninterruptable; } 
+	void setUninterruptable( Bool uninterruptable ) { m_uninterruptable = uninterruptable; }
 
 
-	// This will retrieve the appropriate position based on type.	
-	const Coord3D *getCurrentPosition( void );	
+	// This will retrieve the appropriate position based on type.
+	const Coord3D *getCurrentPosition( void );
 
 	// This will return the directory leading up to the appropriate type, including the trailing '\\'
 	// If localized is true, we'll append a language specifc directory to the end of the path.
@@ -164,7 +164,7 @@ class AudioEventRTS
 	AsciiString m_filenameToLoad;
 	mutable const AudioEventInfo *m_eventInfo;	// Mutable so that it can be modified even on const objects
 	AudioHandle m_playingHandle;
-	
+
 	AudioHandle m_killThisHandle;		///< Sometimes sounds will canabilize other sounds in order to take their handle away.
 																	///< This is one of those instances.
 
@@ -173,7 +173,7 @@ class AudioEventRTS
 	AsciiString m_decayName;				///< This is the filename that should be used during the decay.
 
 	AudioPriority m_priority;				///< This should be the priority as given by the event info, or the overrided priority.
-	Real m_volume;									///< This is the override for the volume. It will either be the normal 
+	Real m_volume;									///< This is the override for the volume. It will either be the normal
 	TimeOfDay m_timeOfDay;					///< This should be the current Time Of Day.
 
 	Coord3D m_positionOfAudio;			///< Position of the sound if no further positional updates are necessary
@@ -195,15 +195,15 @@ class AudioEventRTS
 	Int m_loopCount;								///< The current loop count value. Only valid if this is a looping type event or the override has been set.
 	Int m_playingAudioIndex;				///< The sound index we are currently playing. In the case of non-random, we increment this to move to the next sound
 	Int m_allCount;									///< If this sound is an ALL type, then this is how many sounds we have played so far.
-	
+
 	Int m_playerIndex;							///< The index of the player who owns this sound. Used for sounds that should have an owner, but don't have an object, etc.
 
 	PortionToPlay m_portionToPlayNext;	///< Which portion (attack, sound, decay) should be played next?
 };
 
 class DynamicAudioEventRTS : public MemoryPoolObject
-{	
-	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DynamicAudioEventRTS, "DynamicAudioEventRTS" )		
+{
+	MEMORY_POOL_GLUE_WITH_USERLOOKUP_CREATE(DynamicAudioEventRTS, "DynamicAudioEventRTS" )
 public:
 
 	DynamicAudioEventRTS() { }

Core/GameEngine/Include/Common/AudioRequest.h

@@ -49,7 +49,7 @@ struct AudioRequest : public MemoryPoolObject
 
 public:
 	RequestType m_request;
-	union 
+	union
 	{
 		AudioEventRTS *m_pendingEvent;
 		AudioHandle m_handleToInteractOn;

Core/GameEngine/Include/Common/AudioSettings.h

@@ -68,7 +68,7 @@ struct AudioSettings
 	UnsignedInt m_maxCacheSize;
 
 	Real m_minVolume;		// At volumes less than this, the sample will be culled.
-	
+
 	AsciiString m_preferred3DProvider[MAX_HW_PROVIDERS + 1];
 
 	//Defaults actually don't ever get changed!
@@ -98,7 +98,7 @@ struct AudioSettings
 	//Handles changing sound volume whenever the camera is close to the microphone.
   Real m_zoomMinDistance;			//If we're closer than the minimum distance, then apply the full bonus no matter how close.
   Real m_zoomMaxDistance;			//The maximum distance from microphone we need to be before benefiting from any bonus.
-	
+
   //NOTE: The higher this value is, the lower normal sounds will be! If you specify a sound volume value of 25%, then sounds will play
 	//between 75% and 100%, not 100% to 125%!
   Real m_zoomSoundVolumePercentageAmount;	//The amount of sound volume dedicated to zooming.

Core/GameEngine/Include/Common/CRCDebug.h

@@ -91,7 +91,7 @@
 
 	extern Int lastCRCDebugFrame;
 	extern Int lastCRCDebugIndex;
-	
+
 	extern Bool g_verifyClientCRC;
 	extern Bool g_clientDeepCRC;
 
@@ -130,4 +130,4 @@ extern Int NET_CRC_INTERVAL;
 extern Int REPLAY_CRC_INTERVAL;
 extern Bool TheDebugIgnoreSyncErrors;
 
-#endif // __CRCDEBUG_H__
+#endif // __CRCDEBUG_H__