diff --git a/Core/GameEngine/Include/Common/ArchiveFile.h b/Core/GameEngine/Include/Common/ArchiveFile.h index b62b61297d..7c3d1c7a8f 100644 --- a/Core/GameEngine/Include/Common/ArchiveFile.h +++ b/Core/GameEngine/Include/Common/ArchiveFile.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __ARCHIVEFILE_H -#define __ARCHIVEFILE_H - #include "Lib/BaseType.h" #include "Common/AsciiString.h" #include "Common/ArchiveFileSystem.h" @@ -73,5 +70,3 @@ class ArchiveFile File *m_file; ///< file pointer to the archive file on disk. Kept open so we don't have to continuously open and close the file all the time. DetailedArchivedDirectoryInfo m_rootDirectory; }; - -#endif // __ARCHIVEFILE_H diff --git a/Core/GameEngine/Include/Common/ArchiveFileSystem.h b/Core/GameEngine/Include/Common/ArchiveFileSystem.h index 9f216fb29c..a482e593b9 100644 --- a/Core/GameEngine/Include/Common/ArchiveFileSystem.h +++ b/Core/GameEngine/Include/Common/ArchiveFileSystem.h @@ -43,9 +43,6 @@ #pragma once -#ifndef __ARCHIVEFILESYSTEM_H_ -#define __ARCHIVEFILESYSTEM_H_ - #define MUSIC_BIG "Music.big" //---------------------------------------------------------------------------- @@ -180,5 +177,3 @@ extern ArchiveFileSystem *TheArchiveFileSystem; //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - -#endif // __ARCHIVEFILESYSTEM_H_ diff --git a/Core/GameEngine/Include/Common/AsciiString.h b/Core/GameEngine/Include/Common/AsciiString.h index c024d549b9..e978575720 100644 --- a/Core/GameEngine/Include/Common/AsciiString.h +++ b/Core/GameEngine/Include/Common/AsciiString.h @@ -45,9 +45,6 @@ #pragma once -#ifndef ASCIISTRING_H -#define ASCIISTRING_H - #include #include #include @@ -599,5 +596,3 @@ inline Bool operator>=(const AsciiString& s1, const char* s2) { return strcmp(s1.str(), s2) >= 0; } - -#endif // ASCIISTRING_H diff --git a/Core/GameEngine/Include/Common/AudioAffect.h b/Core/GameEngine/Include/Common/AudioAffect.h index 867ce255f0..f58cb9e18b 100644 --- a/Core/GameEngine/Include/Common/AudioAffect.h +++ b/Core/GameEngine/Include/Common/AudioAffect.h @@ -25,10 +25,8 @@ // EA Pacific // John McDonald, Jr // Do not distribute -#pragma once -#ifndef _AUDIOAFFECT_H_ -#define _AUDIOAFFECT_H_ +#pragma once #include @@ -44,5 +42,3 @@ enum AudioAffect CPP_11(: Int) AudioAffect_SystemSetting = 0x10, }; - -#endif // _AUDIOAFFECT_H_ diff --git a/Core/GameEngine/Include/Common/AudioEventInfo.h b/Core/GameEngine/Include/Common/AudioEventInfo.h index cebe6af4ec..ff412fcb6f 100644 --- a/Core/GameEngine/Include/Common/AudioEventInfo.h +++ b/Core/GameEngine/Include/Common/AudioEventInfo.h @@ -27,8 +27,6 @@ // Author: John K. McDonald, March 2002 #pragma once -#ifndef _H_AUDIOEVENTINFO_ -#define _H_AUDIOEVENTINFO_ #include "Common/AsciiString.h" #include "Common/GameMemory.h" @@ -135,5 +133,3 @@ struct AudioEventInfo : public MemoryPoolObject static const FieldParse m_audioEventInfo[]; ///< the parse table for INI definition const FieldParse *getFieldParse( void ) const { return m_audioEventInfo; } }; - -#endif /* _H_AUDIOEVENTINFO_ */ diff --git a/Core/GameEngine/Include/Common/AudioEventRTS.h b/Core/GameEngine/Include/Common/AudioEventRTS.h index bf52de40b3..5a6f0f4510 100644 --- a/Core/GameEngine/Include/Common/AudioEventRTS.h +++ b/Core/GameEngine/Include/Common/AudioEventRTS.h @@ -27,8 +27,6 @@ // Author: John K. McDonald, March 2002 #pragma once -#ifndef _H_AUDIOEVENTRTS_ -#define _H_AUDIOEVENTRTS_ #include "Common/AsciiString.h" #include "Common/GameAudio.h" @@ -212,6 +210,3 @@ class DynamicAudioEventRTS : public MemoryPoolObject AudioEventRTS m_event; }; EMPTY_DTOR(DynamicAudioEventRTS) - -#endif /* _H_AUDIOEVENTRTS_ */ - diff --git a/Core/GameEngine/Include/Common/AudioHandleSpecialValues.h b/Core/GameEngine/Include/Common/AudioHandleSpecialValues.h index 0c564b4a99..102f9ed860 100644 --- a/Core/GameEngine/Include/Common/AudioHandleSpecialValues.h +++ b/Core/GameEngine/Include/Common/AudioHandleSpecialValues.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _AUDIOHANDLESPECIALVALUES_H_ -#define _AUDIOHANDLESPECIALVALUES_H_ - enum AudioHandleSpecialValues CPP_11(: Int) { AHSV_Error = 0x00, @@ -41,5 +38,3 @@ enum AudioHandleSpecialValues CPP_11(: Int) AHSV_StopTheMusicFade, AHSV_FirstHandle }; - -#endif // _AUDIOHANDLESPECIALVALUES_H_ diff --git a/Core/GameEngine/Include/Common/AudioRandomValue.h b/Core/GameEngine/Include/Common/AudioRandomValue.h index 263189228c..4efc9c26b3 100644 --- a/Core/GameEngine/Include/Common/AudioRandomValue.h +++ b/Core/GameEngine/Include/Common/AudioRandomValue.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _AUDIO_RANDOM_VALUE_H_ -#define _AUDIO_RANDOM_VALUE_H_ - #include "Lib/BaseType.h" // do NOT use these functions directly, rather use the macros below @@ -43,5 +40,3 @@ extern Real GetGameAudioRandomValueReal( Real lo, Real hi, const char *file, int #define GameAudioRandomValueReal( lo, hi ) GetGameAudioRandomValueReal( lo, hi, __FILE__, __LINE__ ) //-------------------------------------------------------------------------------------------------------------- - -#endif // _AUDIO_RANDOM_VALUE_H_ diff --git a/Core/GameEngine/Include/Common/AudioRequest.h b/Core/GameEngine/Include/Common/AudioRequest.h index e8a8681644..a0321fdb48 100644 --- a/Core/GameEngine/Include/Common/AudioRequest.h +++ b/Core/GameEngine/Include/Common/AudioRequest.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _AUDIOREQUEST_H_ -#define _AUDIOREQUEST_H_ - #include "Common/GameAudio.h" #include "Common/GameMemory.h" @@ -57,5 +54,3 @@ struct AudioRequest : public MemoryPoolObject Bool m_usePendingEvent; Bool m_requiresCheckForSample; }; - -#endif // _AUDIOREQUEST_H_ diff --git a/Core/GameEngine/Include/Common/AudioSettings.h b/Core/GameEngine/Include/Common/AudioSettings.h index f71e9bfaa6..93a485e848 100644 --- a/Core/GameEngine/Include/Common/AudioSettings.h +++ b/Core/GameEngine/Include/Common/AudioSettings.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _AUDIOSETTINGS_H_ -#define _AUDIOSETTINGS_H_ - #include "Common/AsciiString.h" enum { MAX_HW_PROVIDERS = 4 }; @@ -103,5 +100,3 @@ struct AudioSettings //between 75% and 100%, not 100% to 125%! Real m_zoomSoundVolumePercentageAmount; //The amount of sound volume dedicated to zooming. }; - -#endif // _AUDIOSETTINGS_H_ diff --git a/Core/GameEngine/Include/Common/CRCDebug.h b/Core/GameEngine/Include/Common/CRCDebug.h index 77d806042e..1fbeffebe6 100644 --- a/Core/GameEngine/Include/Common/CRCDebug.h +++ b/Core/GameEngine/Include/Common/CRCDebug.h @@ -26,10 +26,7 @@ // Macros/functions/etc to help logging values for tracking down sync errors // Author: Matthew D. Campbell, June 2002 -// no #pragma once - we want to be able to conditionally define NO_DEBUG_CRC in indiv .cpp files - -#ifndef __CRCDEBUG_H__ -#define __CRCDEBUG_H__ +#pragma once #include "Common/Debug.h" @@ -129,5 +126,3 @@ extern Int NET_CRC_INTERVAL; extern Int REPLAY_CRC_INTERVAL; extern Bool TheDebugIgnoreSyncErrors; - -#endif // __CRCDEBUG_H__ diff --git a/Core/GameEngine/Include/Common/Debug.h b/Core/GameEngine/Include/Common/Debug.h index 67048157c5..0fd8814fdf 100644 --- a/Core/GameEngine/Include/Common/Debug.h +++ b/Core/GameEngine/Include/Common/Debug.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __DEBUG_H_ -#define __DEBUG_H_ - class AsciiString; #define NO_RELEASE_DEBUG_LOGGING @@ -260,5 +257,3 @@ class SimpleProfiler #endif // MACROS ////////////////////////////////////////////////////////////////// - -#endif // __DEBUG_H_ diff --git a/Core/GameEngine/Include/Common/DynamicAudioEventInfo.h b/Core/GameEngine/Include/Common/DynamicAudioEventInfo.h index c13dfbd591..145f895cc6 100644 --- a/Core/GameEngine/Include/Common/DynamicAudioEventInfo.h +++ b/Core/GameEngine/Include/Common/DynamicAudioEventInfo.h @@ -28,10 +28,6 @@ #pragma once - -#ifndef DYNAMICAUDIOEVENTINFO_H_INCLUDED -#define DYNAMICAUDIOEVENTINFO_H_INCLUDED - #include "Common/AudioEventInfo.h" #include "Common/BitFlags.h" @@ -155,8 +151,3 @@ inline Bool DynamicAudioEventInfo::wasPriorityOverriden() const { return m_overriddenFields.test( OVERRIDE_PRIORITY ); } - - - -#endif // DYNAMICAUDIOEVENTINFO_H_INCLUDED - diff --git a/Core/GameEngine/Include/Common/FileSystem.h b/Core/GameEngine/Include/Common/FileSystem.h index 14acf2eb7a..546242d32a 100644 --- a/Core/GameEngine/Include/Common/FileSystem.h +++ b/Core/GameEngine/Include/Common/FileSystem.h @@ -43,9 +43,6 @@ #pragma once -#ifndef __FILESYSTEM_H -#define __FILESYSTEM_H - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -182,7 +179,3 @@ extern FileSystem* TheFileSystem; //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - - -#endif // __WSYS_FILESYSTEM_H diff --git a/Core/GameEngine/Include/Common/FramePacer.h b/Core/GameEngine/Include/Common/FramePacer.h index 66955c4585..a4bb9fc337 100644 --- a/Core/GameEngine/Include/Common/FramePacer.h +++ b/Core/GameEngine/Include/Common/FramePacer.h @@ -15,6 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once #include "Common/FrameRateLimit.h" diff --git a/Core/GameEngine/Include/Common/GameAudio.h b/Core/GameEngine/Include/Common/GameAudio.h index 1aa90880b2..c88b9303ac 100644 --- a/Core/GameEngine/Include/Common/GameAudio.h +++ b/Core/GameEngine/Include/Common/GameAudio.h @@ -41,9 +41,6 @@ #pragma once -#ifndef __COMMON_GAMEAUDIO_H_ -#define __COMMON_GAMEAUDIO_H_ - // Includes #include "Lib/BaseType.h" #include "Common/STLTypedefs.h" @@ -431,5 +428,3 @@ class AudioManagerDummy : public AudioManager extern AudioManager *TheAudio; - -#endif // __COMMON_GAMEAUDIO_H_ diff --git a/Core/GameEngine/Include/Common/GameMemory.h b/Core/GameEngine/Include/Common/GameMemory.h index 65b1732e52..b2a3015165 100644 --- a/Core/GameEngine/Include/Common/GameMemory.h +++ b/Core/GameEngine/Include/Common/GameMemory.h @@ -45,9 +45,6 @@ #pragma once -#ifndef _GAME_MEMORY_H_ -#define _GAME_MEMORY_H_ - // Turn off memory pool checkpointing for now. #ifndef DISABLE_MEMORYPOOL_CHECKPOINTING #define DISABLE_MEMORYPOOL_CHECKPOINTING 1 @@ -913,6 +910,3 @@ class MemoryPoolObjectHolder #define EMPTY_DTOR(CLASS) inline CLASS::~CLASS() { } - - -#endif // _GAME_MEMORY_H_ diff --git a/Core/GameEngine/Include/Common/GameMusic.h b/Core/GameEngine/Include/Common/GameMusic.h index 1e3218d5ba..864c52f82a 100644 --- a/Core/GameEngine/Include/Common/GameMusic.h +++ b/Core/GameEngine/Include/Common/GameMusic.h @@ -41,10 +41,6 @@ #pragma once -#ifndef __COMMON_GAMEMUSIC_H_ -#define __COMMON_GAMEMUSIC_H_ - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -114,5 +110,3 @@ class MusicManager void setVolume( Real m_volume ); }; - -#endif // __COMMON_GAMEMUSIC_H_ diff --git a/Core/GameEngine/Include/Common/GameSounds.h b/Core/GameEngine/Include/Common/GameSounds.h index 3c7867eaf4..4f3a5f955e 100644 --- a/Core/GameEngine/Include/Common/GameSounds.h +++ b/Core/GameEngine/Include/Common/GameSounds.h @@ -40,8 +40,6 @@ //---------------------------------------------------------------------------- #pragma once -#ifndef __COMMON_GAMESOUNDS_H_ -#define __COMMON_GAMESOUNDS_H_ #include "Common/SubsystemInterface.h" #include "Common/GameAudio.h" @@ -98,6 +96,3 @@ class SoundManager : public SubsystemInterface UnsignedInt m_numPlaying2DSamples; UnsignedInt m_numPlaying3DSamples; }; - -#endif // __COMMON_GAMESOUNDS_H_ - diff --git a/Core/GameEngine/Include/Common/LocalFile.h b/Core/GameEngine/Include/Common/LocalFile.h index 92a574ebb3..db9568ee0e 100644 --- a/Core/GameEngine/Include/Common/LocalFile.h +++ b/Core/GameEngine/Include/Common/LocalFile.h @@ -43,11 +43,6 @@ #pragma once -#ifndef __LOCALFILE_H -#define __LOCALFILE_H - - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -134,6 +129,3 @@ class LocalFile : public File //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - -#endif // __LOCALFILE_H diff --git a/Core/GameEngine/Include/Common/LocalFileSystem.h b/Core/GameEngine/Include/Common/LocalFileSystem.h index ec9fbdc097..08f00af5d2 100644 --- a/Core/GameEngine/Include/Common/LocalFileSystem.h +++ b/Core/GameEngine/Include/Common/LocalFileSystem.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __LOCALFILESYSTEM_H -#define __LOCALFILESYSTEM_H - #include "Common/SubsystemInterface.h" #include "FileSystem.h" // for typedefs, etc. @@ -54,5 +51,3 @@ class LocalFileSystem : public SubsystemInterface }; extern LocalFileSystem *TheLocalFileSystem; - -#endif // __LOCALFILESYSTEM_H diff --git a/Core/GameEngine/Include/Common/MiscAudio.h b/Core/GameEngine/Include/Common/MiscAudio.h index 4fbcd0b412..fa7b47f3c1 100644 --- a/Core/GameEngine/Include/Common/MiscAudio.h +++ b/Core/GameEngine/Include/Common/MiscAudio.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _MISCAUDIO_H_ -#define _MISCAUDIO_H_ - #include "Common/AudioEventRTS.h" struct MiscAudio @@ -73,7 +70,3 @@ struct MiscAudio AudioEventRTS m_sabotageResetTimerBuilding; ///< When Saboteur hits a building AudioEventRTS m_aircraftWheelScreech; ///< When a jet lands on a runway. }; - - -#endif /* _MISCAUDIO_H_ */ - diff --git a/Core/GameEngine/Include/Common/RAMFile.h b/Core/GameEngine/Include/Common/RAMFile.h index cdad7f30f1..084aa8d857 100644 --- a/Core/GameEngine/Include/Common/RAMFile.h +++ b/Core/GameEngine/Include/Common/RAMFile.h @@ -43,11 +43,6 @@ #pragma once -#ifndef __RAMFILE_H -#define __RAMFILE_H - - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -130,6 +125,3 @@ class RAMFile : public File //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - -#endif // __WSYS_RAMFILE_H diff --git a/Core/GameEngine/Include/Common/RandomValue.h b/Core/GameEngine/Include/Common/RandomValue.h index bc174821ff..011477a337 100644 --- a/Core/GameEngine/Include/Common/RandomValue.h +++ b/Core/GameEngine/Include/Common/RandomValue.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _RANDOM_VALUE_H_ -#define _RANDOM_VALUE_H_ - #include "Lib/BaseType.h" extern void InitRandom( void ); @@ -40,5 +37,3 @@ extern UnsignedInt GetGameLogicRandomSeed( void ); ///< Get the seed (used for extern UnsignedInt GetGameLogicRandomSeedCRC( void );///< Get the seed (used for CRCs) //-------------------------------------------------------------------------------------------------------------- - -#endif // _RANDOM_VALUE_H_ diff --git a/Core/GameEngine/Include/Common/StreamingArchiveFile.h b/Core/GameEngine/Include/Common/StreamingArchiveFile.h index b1f97c0080..bf481b1978 100644 --- a/Core/GameEngine/Include/Common/StreamingArchiveFile.h +++ b/Core/GameEngine/Include/Common/StreamingArchiveFile.h @@ -43,11 +43,6 @@ #pragma once -#ifndef __STREAMINGARCHIVEFILE_H -#define __STREAMINGARCHIVEFILE_H - - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -114,6 +109,3 @@ class StreamingArchiveFile : public RAMFile //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - -#endif // __STREAMINGARCHIVEFILE_H diff --git a/Core/GameEngine/Include/Common/UnicodeString.h b/Core/GameEngine/Include/Common/UnicodeString.h index 151e5d4a20..52866c8f1f 100644 --- a/Core/GameEngine/Include/Common/UnicodeString.h +++ b/Core/GameEngine/Include/Common/UnicodeString.h @@ -45,9 +45,6 @@ #pragma once -#ifndef UNICODESTRING_H -#define UNICODESTRING_H - #include #include #include @@ -501,5 +498,3 @@ inline Bool operator>=(const UnicodeString& s1, const UnicodeString& s2) { return wcscmp(s1.str(), s2.str()) >= 0; } - -#endif // UNICODESTRING_H diff --git a/Core/GameEngine/Include/Common/Xfer.h b/Core/GameEngine/Include/Common/Xfer.h index d49e2f079c..f9c8228800 100644 --- a/Core/GameEngine/Include/Common/Xfer.h +++ b/Core/GameEngine/Include/Common/Xfer.h @@ -39,9 +39,6 @@ #pragma once -#ifndef __XFER_H_ -#define __XFER_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Science.h" #include "Common/Upgrade.h" @@ -191,6 +188,3 @@ class Xfer AsciiString m_identifier; ///< the string identifier }; - -#endif // __XFER_H_ - diff --git a/Core/GameEngine/Include/Common/XferCRC.h b/Core/GameEngine/Include/Common/XferCRC.h index 35bee5c6be..b57769e86d 100644 --- a/Core/GameEngine/Include/Common/XferCRC.h +++ b/Core/GameEngine/Include/Common/XferCRC.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __XFERCRC_H_ -#define __XFERCRC_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/Xfer.h" @@ -69,6 +66,3 @@ class XferCRC : public Xfer UnsignedInt m_crc; }; - -#endif // __XFERDISKWRITE_H_ - diff --git a/Core/GameEngine/Include/Common/XferDeepCRC.h b/Core/GameEngine/Include/Common/XferDeepCRC.h index 514ea80c1d..7125d41fe0 100644 --- a/Core/GameEngine/Include/Common/XferDeepCRC.h +++ b/Core/GameEngine/Include/Common/XferDeepCRC.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __XFERDEEPCRC_H_ -#define __XFERDEEPCRC_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/Xfer.h" #include "Common/XferCRC.h" @@ -64,6 +61,3 @@ class XferDeepCRC : public XferCRC FILE * m_fileFP; ///< pointer to file }; - -#endif // __XFERDEEPCRC_H_ - diff --git a/Core/GameEngine/Include/Common/XferLoad.h b/Core/GameEngine/Include/Common/XferLoad.h index 0d68e29271..0da4ed1424 100644 --- a/Core/GameEngine/Include/Common/XferLoad.h +++ b/Core/GameEngine/Include/Common/XferLoad.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __XFER_LOAD_H_ -#define __XFER_LOAD_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include #include "Common/Xfer.h" @@ -68,6 +65,3 @@ class XferLoad : public Xfer FILE * m_fileFP; ///< pointer to file }; - -#endif // __XFER_LOAD_H_ - diff --git a/Core/GameEngine/Include/Common/XferSave.h b/Core/GameEngine/Include/Common/XferSave.h index 58c3a315f4..f836910bee 100644 --- a/Core/GameEngine/Include/Common/XferSave.h +++ b/Core/GameEngine/Include/Common/XferSave.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __XFER_SAVE_H_ -#define __XFER_SAVE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/Xfer.h" @@ -73,6 +70,3 @@ class XferSave : public Xfer XferBlockData *m_blockStack; ///< stack of block data }; - -#endif // __XFER_SAVE_H_ - diff --git a/Core/GameEngine/Include/Common/crc.h b/Core/GameEngine/Include/Common/crc.h index 5f8fa51a7f..0cc7ae74ad 100644 --- a/Core/GameEngine/Include/Common/crc.h +++ b/Core/GameEngine/Include/Common/crc.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _CRC_H_ -#define _CRC_H_ - #include "Lib/BaseType.h" #ifdef RTS_DEBUG @@ -139,5 +136,3 @@ class CRC }; #endif - -#endif // _CRC_H_ diff --git a/Core/GameEngine/Include/Common/file.h b/Core/GameEngine/Include/Common/file.h index 536123db4e..80e6644591 100644 --- a/Core/GameEngine/Include/Common/file.h +++ b/Core/GameEngine/Include/Common/file.h @@ -43,11 +43,6 @@ #pragma once -#ifndef __FILE_H -#define __FILE_H - - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -227,9 +222,3 @@ inline const char* File::getName( void ) const { return m_nameStr.str(); } inline void File::setName( const char *name ) { m_nameStr.set(name); } inline Int File::getAccess( void ) const { return m_access; } inline void File::deleteOnClose( void ) { m_deleteOnClose = TRUE; } - - - - - -#endif // __FILE_H diff --git a/Core/GameEngine/Include/Common/simpleplayer.h b/Core/GameEngine/Include/Common/simpleplayer.h index b7dec2d1d6..ff93823701 100644 --- a/Core/GameEngine/Include/Common/simpleplayer.h +++ b/Core/GameEngine/Include/Common/simpleplayer.h @@ -16,9 +16,7 @@ ** along with this program. If not, see . */ - -#ifndef SIMPLEPLAYER_H -#define SIMPLEPLAYER_H +#pragma once #include "wmsdk.h" @@ -119,5 +117,3 @@ class CSimplePlayer : public IWMReaderCallback LPWSTR m_pszUrl; }; - -#endif // SIMPLEPLAYER_H diff --git a/Core/GameEngine/Include/Common/urllaunch.h b/Core/GameEngine/Include/Common/urllaunch.h index 136b6d1412..ca23690143 100644 --- a/Core/GameEngine/Include/Common/urllaunch.h +++ b/Core/GameEngine/Include/Common/urllaunch.h @@ -16,12 +16,8 @@ ** along with this program. If not, see . */ - -#ifndef URLLAUNCH_H -#define URLLAUNCH_H +#pragma once HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL ); HRESULT LaunchURL( LPCWSTR pszURL ); - -#endif // URLLAUNCH_H diff --git a/Core/GameEngine/Include/GameClient/ClientRandomValue.h b/Core/GameEngine/Include/GameClient/ClientRandomValue.h index af62e59cad..f5488a2666 100644 --- a/Core/GameEngine/Include/GameClient/ClientRandomValue.h +++ b/Core/GameEngine/Include/GameClient/ClientRandomValue.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _CLIENT_RANDOM_VALUE_H_ -#define _CLIENT_RANDOM_VALUE_H_ - #include "Lib/BaseType.h" // do NOT use these functions directly, rather use the macros below @@ -92,5 +89,3 @@ class GameClientRandomVariable }; //-------------------------------------------------------------------------------------------------------------- - -#endif // _CLIENT_RANDOM_VALUE_H_ diff --git a/Core/GameEngine/Include/GameClient/VideoPlayer.h b/Core/GameEngine/Include/GameClient/VideoPlayer.h index 58b35b65db..ce127e8903 100644 --- a/Core/GameEngine/Include/GameClient/VideoPlayer.h +++ b/Core/GameEngine/Include/GameClient/VideoPlayer.h @@ -41,10 +41,6 @@ #pragma once -#ifndef __GAMECLIENT_VIDEOPLAYER_H_ -#define __GAMECLIENT_VIDEOPLAYER_H_ - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -313,5 +309,3 @@ extern VideoPlayerInterface *TheVideoPlayer; //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - -#endif // __GAMECLIENT_VIDEOPLAYER_H_ diff --git a/Core/GameEngine/Include/GameClient/WindowVideoManager.h b/Core/GameEngine/Include/GameClient/WindowVideoManager.h index 12ff91f48b..ab0346b3e4 100644 --- a/Core/GameEngine/Include/GameClient/WindowVideoManager.h +++ b/Core/GameEngine/Include/GameClient/WindowVideoManager.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __WINDOWVIDEOMANAGER_H_ -#define __WINDOWVIDEOMANAGER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -183,5 +180,3 @@ inline void WindowVideo::setPlayType(WindowVideoPlayType playType){ m_playType = //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __WINDOWVIDEOMANAGER_H_ diff --git a/Core/GameEngine/Include/GameLogic/LogicRandomValue.h b/Core/GameEngine/Include/GameLogic/LogicRandomValue.h index 2427355f58..1ba4824304 100644 --- a/Core/GameEngine/Include/GameLogic/LogicRandomValue.h +++ b/Core/GameEngine/Include/GameLogic/LogicRandomValue.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _LOGIC_RANDOM_VALUE_H_ -#define _LOGIC_RANDOM_VALUE_H_ - #include "Lib/BaseType.h" // do NOT use these functions directly, rather use the macros below @@ -92,5 +89,3 @@ class GameLogicRandomVariable }; //-------------------------------------------------------------------------------------------------------------- - -#endif // _LOGIC_RANDOM_VALUE_H_ diff --git a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h index a601a98119..84f3dc3b7f 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __STDBIGFILE_H -#define __STDBIGFILE_H - #include "Common/ArchiveFile.h" #include "Common/AsciiString.h" #include "Common/List.h" @@ -54,5 +51,3 @@ class StdBIGFile : public ArchiveFile AsciiString m_name; ///< BIG file name AsciiString m_path; ///< BIG file path }; - -#endif // __STDBIGFILE_H diff --git a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h index 9b5a62a43f..45b45c793c 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __STDBIGFILESYSTEM_H -#define __STDBIGFILESYSTEM_H - #include "Common/ArchiveFileSystem.h" class StdBIGFileSystem : public ArchiveFileSystem @@ -56,5 +53,3 @@ class StdBIGFileSystem : public ArchiveFileSystem protected: }; - -#endif // __STDBIGFILESYSTEM_H diff --git a/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFile.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFile.h index 8b9a1c1e8c..97f5830b96 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFile.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFile.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __STDLOCALFILE_H -#define __STDLOCALFILE_H - #include "Common/LocalFile.h" class StdLocalFile : public LocalFile @@ -42,5 +39,3 @@ class StdLocalFile : public LocalFile protected: }; - -#endif // __STDLOCALFILE_H diff --git a/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h index ef92e62e6c..d2a32c2a84 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h @@ -28,8 +28,6 @@ #pragma once -#ifndef __STDLOCALFILESYSTEM_H -#define __STDLOCALFILESYSTEM_H #include "Common/LocalFileSystem.h" class StdLocalFileSystem : public LocalFileSystem @@ -53,5 +51,3 @@ class StdLocalFileSystem : public LocalFileSystem protected: }; - -#endif // __STDLOCALFILESYSTEM_H diff --git a/Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h b/Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h index 546bc53876..45a3d158bd 100644 --- a/Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h +++ b/Core/GameEngineDevice/Include/VideoDevice/Bink/BinkVideoPlayer.h @@ -41,10 +41,6 @@ #pragma once -#ifndef __VIDEODEVICE_BINKDEVICE_H_ -#define __VIDEODEVICE_BINKDEVICE_H_ - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -138,6 +134,3 @@ class BinkVideoPlayer : public VideoPlayer //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - -#endif // __VIDEODEVICE_BINKDEVICE_H_ diff --git a/Core/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h b/Core/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h index 221c918587..a4ab4fc454 100644 --- a/Core/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h +++ b/Core/GameEngineDevice/Include/VideoDevice/FFmpeg/FFmpegVideoPlayer.h @@ -28,10 +28,6 @@ #pragma once -#ifndef __VIDEODEVICE_FFMPEGDEVICE_H_ -#define __VIDEODEVICE_FFMPEGDEVICE_H_ - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -132,6 +128,3 @@ class FFmpegVideoPlayer : public VideoPlayer //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - -#endif // __VIDEODEVICE_FFMPEGDEVICE_H_ diff --git a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideoBuffer.h b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideoBuffer.h index c8427f4fa1..28bed8c6df 100644 --- a/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideoBuffer.h +++ b/Core/GameEngineDevice/Include/W3DDevice/GameClient/W3DVideoBuffer.h @@ -41,10 +41,6 @@ #pragma once -#ifndef __W3DDEVICE_GAMECLIENT_W3DVIDEOBUFFER_H_ -#define __W3DDEVICE_GAMECLIENT_W3DVIDEOBUFFER_H_ - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -101,5 +97,3 @@ class W3DVideoBuffer : public VideoBuffer //---------------------------------------------------------------------------- inline TextureClass* W3DVideoBuffer::texture( void ) { return m_texture; } - -#endif // __W3DDEVICE_GAMECLIENT_W3DVIDEOBUFFER_H_ diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h index 20dfbfa9b9..6d77772bbd 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __WIN32BIGFILE_H -#define __WIN32BIGFILE_H - #include "Common/ArchiveFile.h" #include "Common/AsciiString.h" #include "Common/List.h" @@ -54,5 +51,3 @@ class Win32BIGFile : public ArchiveFile AsciiString m_name; ///< BIG file name AsciiString m_path; ///< BIG file path }; - -#endif // __WIN32BIGFILE_H diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h index a0643b3ae9..fbad69d1ce 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __WIN32BIGFILESYSTEM_H -#define __WIN32BIGFILESYSTEM_H - #include "Common/ArchiveFileSystem.h" class Win32BIGFileSystem : public ArchiveFileSystem @@ -56,5 +53,3 @@ class Win32BIGFileSystem : public ArchiveFileSystem protected: }; - -#endif // __WIN32BIGFILESYSTEM_H diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h index dda97c40ad..43faf6ea80 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __WIN32LOCALFILE_H -#define __WIN32LOCALFILE_H - #include "Common/LocalFile.h" class Win32LocalFile : public LocalFile @@ -42,5 +39,3 @@ class Win32LocalFile : public LocalFile protected: }; - -#endif // __WIN32LOCALFILE_H diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h index 52f3bda1e2..7adf424986 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h @@ -28,8 +28,6 @@ #pragma once -#ifndef __WIN32LOCALFILESYSTEM_H -#define __WIN32LOCALFILESYSTEM_H #include "Common/LocalFileSystem.h" class Win32LocalFileSystem : public LocalFileSystem @@ -53,5 +51,3 @@ class Win32LocalFileSystem : public LocalFileSystem protected: }; - -#endif // __WIN32LOCALFILESYSTEM_H diff --git a/Core/Libraries/Include/Lib/BaseTypeCore.h b/Core/Libraries/Include/Lib/BaseTypeCore.h index 6b3bd90557..550bdd5adf 100644 --- a/Core/Libraries/Include/Lib/BaseTypeCore.h +++ b/Core/Libraries/Include/Lib/BaseTypeCore.h @@ -26,11 +26,8 @@ /////////////////////////////////////////////////////////////////////////////// // tell the compiler to only load this file once -#pragma once - -#ifndef _BASE_TYPE_CORE_H_ -#define _BASE_TYPE_CORE_H_ +#pragma once #include #include @@ -132,5 +129,3 @@ typedef bool Bool; // // note, the types below should use "long long", but MSVC doesn't support it yet typedef int64_t Int64; // 8 bytes typedef uint64_t UnsignedInt64; // 8 bytes - -#endif // _BASE_TYPE_CORE_H_ diff --git a/Core/Libraries/Include/rts/debug.h b/Core/Libraries/Include/rts/debug.h index 01508d27e9..d758693cbc 100644 --- a/Core/Libraries/Include/rts/debug.h +++ b/Core/Libraries/Include/rts/debug.h @@ -26,10 +26,7 @@ // // Proxy header for debug module ////////////////////////////////////////////////////////////////////////////// + #pragma once -#ifndef PROXY_DEBUG_H // Include guard -#define PROXY_DEBUG_H #include "../../Source/debug/debug.h" - -#endif // PROXY_DEBUG_H diff --git a/Core/Libraries/Include/rts/profile.h b/Core/Libraries/Include/rts/profile.h index 0f33c800e2..06faf42d04 100644 --- a/Core/Libraries/Include/rts/profile.h +++ b/Core/Libraries/Include/rts/profile.h @@ -26,10 +26,7 @@ // // Proxy header for profile module ////////////////////////////////////////////////////////////////////////////// + # pragma once -#ifndef PROXY_PROFILE_H // Include guard -#define PROXY_PROFILE_H #include "../../Source/profile/profile.h" - -#endif // PROXY_PROFILE_H diff --git a/Core/Libraries/Source/Compression/Compression.h b/Core/Libraries/Source/Compression/Compression.h index bea68a6b40..d93ac23226 100644 --- a/Core/Libraries/Source/Compression/Compression.h +++ b/Core/Libraries/Source/Compression/Compression.h @@ -22,9 +22,6 @@ #pragma once -#ifndef __COMPRESSION_H__ -#define __COMPRESSION_H__ - #include "Lib/BaseTypeCore.h" enum CompressionType @@ -67,5 +64,3 @@ class CompressionManager static CompressionType getPreferredCompression( void ); }; - -#endif // __COMPRESSION_H__ diff --git a/Core/Libraries/Source/Compression/EAC/btreecodex.h b/Core/Libraries/Source/Compression/EAC/btreecodex.h index cf28f5bea6..ed72b83597 100644 --- a/Core/Libraries/Source/Compression/EAC/btreecodex.h +++ b/Core/Libraries/Source/Compression/EAC/btreecodex.h @@ -18,16 +18,12 @@ /* Copyright (C) Electronic Arts Canada Inc. 1995-2002. All rights reserved. */ -#ifndef __BTRCODEX -#define __BTRCODEX 1 #ifdef __cplusplus extern "C" { #endif -#ifndef __CODEX_H -#error "Include codex.h before btreecodex.h" -#endif +#include "codex.h" /****************************************************************/ /* BTR Codex */ @@ -58,5 +54,4 @@ int GCALL BTREE_encode(void *compresseddata, const void *source, int sour #ifdef __cplusplus } #endif -#endif diff --git a/Core/Libraries/Source/Compression/EAC/codex.h b/Core/Libraries/Source/Compression/EAC/codex.h index 5fc6b96875..2b80d2171f 100644 --- a/Core/Libraries/Source/Compression/EAC/codex.h +++ b/Core/Libraries/Source/Compression/EAC/codex.h @@ -37,9 +37,6 @@ /* */ /*------------------------------------------------------------------*/ -#ifndef __CODEX_H -#define __CODEX_H 1 - #pragma once #ifdef __cplusplus @@ -117,5 +114,4 @@ int GCALL CODEX_encode(void *dest, const void *source, int sourcesize, int *opts #ifdef __cplusplus } #endif -#endif diff --git a/Core/Libraries/Source/Compression/EAC/gimex.h b/Core/Libraries/Source/Compression/EAC/gimex.h index 15800033c3..c1cc3325e1 100644 --- a/Core/Libraries/Source/Compression/EAC/gimex.h +++ b/Core/Libraries/Source/Compression/EAC/gimex.h @@ -63,9 +63,6 @@ gimex.h - Primary header file for the GIMEX API. /* */ /*------------------------------------------------------------------*/ -#ifndef __GIMEX_H -#define __GIMEX_H 1 - #pragma once #if defined(_MSC_VER) @@ -493,6 +490,4 @@ static __inline void gputi(void *dst, unsigned int data, int bytes) } } -#endif /* __GIMEX_H */ - /* END ABSTRACT */ diff --git a/Core/Libraries/Source/Compression/EAC/huffcodex.h b/Core/Libraries/Source/Compression/EAC/huffcodex.h index af1d756d4b..027a4f38b0 100644 --- a/Core/Libraries/Source/Compression/EAC/huffcodex.h +++ b/Core/Libraries/Source/Compression/EAC/huffcodex.h @@ -18,16 +18,12 @@ /* Copyright (C) Electronic Arts Canada Inc. 1995-2002. All rights reserved. */ -#ifndef __HUFCODEX -#define __HUFCODEX 1 #ifdef __cplusplus extern "C" { #endif -#ifndef __CODEX_H -#error "Include codex.h before huffcodex.h" -#endif +#include "codex.h" /****************************************************************/ /* HUF Codex */ @@ -70,5 +66,4 @@ int GCALL HUFF_encode(void *compresseddata, const void *source, int sourc #ifdef __cplusplus } #endif -#endif diff --git a/Core/Libraries/Source/Compression/EAC/refcodex.h b/Core/Libraries/Source/Compression/EAC/refcodex.h index 80fdb92c20..ca92f004b3 100644 --- a/Core/Libraries/Source/Compression/EAC/refcodex.h +++ b/Core/Libraries/Source/Compression/EAC/refcodex.h @@ -18,16 +18,12 @@ /* Copyright (C) Electronic Arts Canada Inc. 1995-2002. All rights reserved. */ -#ifndef __REFCODEX -#define __REFCODEX 1 #ifdef __cplusplus extern "C" { #endif -#ifndef __CODEX_H -#error "Include codex.h before refcodex.h" -#endif +#include "codex.h" /****************************************************************/ /* REF Codex */ @@ -70,5 +66,4 @@ int GCALL REF_encode(void *compresseddata, const void *source, int source #ifdef __cplusplus } #endif -#endif diff --git a/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.h b/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.h index 48afbcb4ec..0a14bd00af 100644 --- a/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.h +++ b/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.h @@ -20,9 +20,7 @@ // Compress/Decompression header. // Author: Jeff Brown, January 1999 - -#ifndef __compress_h -#define __compress_h +#pragma once #define MAP_EXTENSION ".map" #define LZH_EXTENSION ".nxz" @@ -36,5 +34,3 @@ UnsignedInt CalcNewSize (UnsignedInt rawSize); Bool DecompressMemory (void *inBufferVoid, Int inSize, void *outBufferVoid, Int& outSize); Bool CompressMemory (void *inBufferVoid, Int inSize, void *outBufferVoid, Int& outSize); - -#endif // __compress_h diff --git a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h index a7066e752d..a7c9171422 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h @@ -39,9 +39,6 @@ #pragma once -#ifndef AABTREE_H -#define AABTREE_H - #include "always.h" #include "refcount.h" #include "simplevec.h" @@ -348,5 +345,3 @@ inline void AABTreeClass::CullNodeStruct::Set_Poly_Count(uint32 count) WWASSERT(count < 0x7FFFFFFF); BackOrPolyCount = count; } - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h index 5bb16382cc..5c15c415bb 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h @@ -32,12 +32,8 @@ * * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef AGGREGATE_DEF_H -#define AGGREGATE_DEF_H - #include "proto.h" #include "rendobj.h" #include "w3d_file.h" @@ -252,6 +248,3 @@ class AggregateLoaderClass : public PrototypeLoaderClass // Global variables // extern AggregateLoaderClass _AggregateLoader; - - -#endif //__AGGREGATE_DEF_H diff --git a/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h b/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h index 7dbc81949b..1f8a3267a3 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h @@ -39,9 +39,6 @@ #pragma once -#ifndef __ANIMATEDSOUNDMGR_H -#define __ANIMATEDSOUNDMGR_H - #include "simplevec.h" #include "Vector.H" #include "hashtemplate.h" @@ -129,6 +126,3 @@ class AnimatedSoundMgrClass /////////////////////////////////////////////////////////////////// static ANIM_SOUND_LIST * Find_Sound_List (HAnimClass *anim); }; - - -#endif //__ANIMATEDSOUNDMGR_H diff --git a/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h b/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h index 682e03399b..bb25aa729c 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h @@ -18,9 +18,6 @@ #pragma once -#ifndef WW3D_ASSET_STATUS_H -#define WW3D_ASSET_STATUS_H - #include "always.h" #include "hashtemplate.h" @@ -62,5 +59,3 @@ class AssetStatusClass void Add_To_Report(int index, const char* name); }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h b/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h index b372ce241d..d12ceb63c5 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h @@ -18,9 +18,6 @@ #pragma once -#ifndef BITMAPHANDLER_H -#define BITMAPHANDLER_H - #include "always.h" #include "ww3dformat.h" #include "vector3.h" @@ -477,6 +474,3 @@ WWINLINE unsigned BitmapHandlerClass::Combine_A8R8G8B8( bgra1+=bgra3; return bgra1; } - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bwrender.h b/Core/Libraries/Source/WWVegas/WW3D2/bwrender.h index cd12f1f542..f5060d834e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/bwrender.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/bwrender.h @@ -38,10 +38,6 @@ #pragma once -#ifndef BWRENDER_H -#define BWRENDER_H - - #include "always.h" #include "vector2.h" #include "vector3.h" @@ -88,7 +84,3 @@ class BWRenderClass void Render_Triangles(const unsigned long* indices,int index_count); void Render_Triangle_Strip(const unsigned long* indices,int index_count); }; - - -#endif //BWRENDER_H - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/classid.h b/Core/Libraries/Source/WWVegas/WW3D2/classid.h index 12d3325983..a734133cfb 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/classid.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/classid.h @@ -32,12 +32,8 @@ * * *-------------------------------------------------------------------------*/ - #pragma once -#ifndef CLASSID_H -#define CLASSID_H - #include "always.h" /* @@ -58,6 +54,3 @@ enum ID_STREAMING_TEXTURE_CLASS, // StreamingTextureClass "texture.h" ID_STREAMING_TEXTURE_INSTANCE_CLASS, // StreamingTextureInstanceClass "texture.h" }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/collect.h b/Core/Libraries/Source/WWVegas/WW3D2/collect.h index 949fb697e0..c51e245b31 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/collect.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.h @@ -36,9 +36,6 @@ #pragma once -#ifndef COLLECT_H -#define COLLECT_H - #include "rendobj.h" #include "composite.h" #include "Vector.H" @@ -143,5 +140,3 @@ class CollectionLoaderClass : public PrototypeLoaderClass }; extern CollectionLoaderClass _CollectionLoader; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h b/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h index b5cc95ea7c..e4974a0054 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h @@ -38,9 +38,6 @@ #pragma once -#ifndef COLORSPACE_H -#define COLORSPACE_H - #include "dx8wrapper.h" #include @@ -153,7 +150,3 @@ inline void Recolor(unsigned& rgba, const Vector3 &hsv_shift) Recolor((Vector3&)rgba_v, hsv_shift); rgba = DX8Wrapper::Convert_Color(rgba_v); } - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/coltest.h b/Core/Libraries/Source/WWVegas/WW3D2/coltest.h index dccf1c011f..0601a81947 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/coltest.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/coltest.h @@ -37,12 +37,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef COLTEST_H -#define COLTEST_H - #include "always.h" #include "castres.h" #include "lineseg.h" @@ -310,6 +306,3 @@ inline bool OBBoxCollisionTestClass::Cast_To_Triangle(const TriClass & tri) { return CollisionMath::Collide(Box,Move,tri,Vector3(0,0,0),Result); } - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/coltype.h b/Core/Libraries/Source/WWVegas/WW3D2/coltype.h index 9509ecdc2d..b0f10f2cc4 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/coltype.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/coltype.h @@ -37,14 +37,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - -#ifndef COLTYPE_H -#define COLTYPE_H - - ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // // Collision 'Types' @@ -85,8 +79,3 @@ enum COLL_TYPE_CAMERA = COLL_TYPE_3, // camera collision (99% should match physical setting) COLL_TYPE_VEHICLE = COLL_TYPE_4, // vehicles will collide with physical and this. }; - - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/composite.h b/Core/Libraries/Source/WWVegas/WW3D2/composite.h index e1544db5d2..74bd0e26cb 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/composite.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/composite.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef COMPOSITE_H -#define COMPOSITE_H - #include "rendobj.h" #include "wwstring.h" @@ -91,7 +87,3 @@ class CompositeRenderObjClass : public RenderObjClass SphereClass ObjSphere; // object-space bounding sphere AABoxClass ObjBox; // object-space bounding box }; - - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h index 2a30ddeaf4..6d7cbc1aa6 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h @@ -38,9 +38,6 @@ #pragma once -#ifndef DECALSYS_H -#define DECALSYS_H - #include "always.h" #include "matrix3d.h" #include "matrix4.h" @@ -298,9 +295,3 @@ class MultiFixedPoolDecalSystemClass : public DecalSystemClass uint32 PoolCount; }; - - - - -#endif //DECALSYS_H - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/distlod.h b/Core/Libraries/Source/WWVegas/WW3D2/distlod.h index cfc543dd37..01e39339b1 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/distlod.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/distlod.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef DISTLOD_H -#define DISTLOD_H - #include "proto.h" #include "rendobj.h" #include "composite.h" @@ -240,5 +236,3 @@ class DistLODPrototypeClass : public W3DMPO, public PrototypeClass ** Instance of the loaders which the asset manager install */ extern DistLODLoaderClass _DistLODLoader; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dllist.h b/Core/Libraries/Source/WWVegas/WW3D2/dllist.h index 22159fb6d5..438268dfae 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dllist.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dllist.h @@ -38,10 +38,6 @@ #pragma once -#ifndef DLLIST_H -#define DLLIST_H - - template class DLNodeClass; template @@ -205,5 +201,3 @@ inline void DLListClass::Remove_Tail() else tail->succ=0; n->Remove(); } - -#endif //DLLIST_H diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h index 8369963076..38facb816f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h @@ -37,12 +37,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef DX8LIST_H -#define DX8LIST_H - #include "always.h" #include "multilist.h" @@ -66,7 +62,3 @@ typedef MultiListIterator DX8PolygonRendererListIterat class TextureTrackerClass; typedef MultiListClass TextureTrackerList; typedef MultiListIterator TextureTrackerListIterator; - - -#endif //DX8LIST_H - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h index 4ff33c75d7..ba850f7325 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h @@ -36,13 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef DX8_POLYGON_RENDERER_H -#define DX8_POLYGON_RENDERER_H - - #include "always.h" #include "meshmdl.h" #include "dx8list.h" @@ -155,5 +150,3 @@ inline void DX8PolygonRendererClass::Render_Sorted(/*const Matrix3D & tm,*/int b vertex_index_range); } - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h index eeb5881d9a..ad470a6df3 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h @@ -30,8 +30,7 @@ // $Header: $ //****************************************************************************************** -#ifndef DX8_WEBBROWSER_H -#define DX8_WEBBROWSER_H +#pragma once #include #include "d3d8.h" @@ -89,5 +88,3 @@ class DX8WebBrowser }; #endif - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h index 8db618340f..814c3aec38 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h @@ -32,12 +32,8 @@ * * *-------------------------------------------------------------------------*/ - #pragma once -#ifndef DYNAMESH_H -#define DYNAMESH_H - #include "meshgeometry.h" #include "meshmatdesc.h" #include "matinfo.h" @@ -576,5 +572,3 @@ class DynamicScreenMeshClass : public DynamicMeshClass { // tells when the triangle needs to be back flipped virtual bool Flip_Face( void) { return !DynamicMeshClass::Flip_Face(); } }; - -#endif // DYNAMESH diff --git a/Core/Libraries/Source/WWVegas/WW3D2/font3d.h b/Core/Libraries/Source/WWVegas/WW3D2/font3d.h index 78b7aa3b81..aecc6a55e2 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/font3d.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/font3d.h @@ -32,12 +32,8 @@ * * *---------------------------------------------------------------------------------------------*/ - #pragma once -#ifndef FONT3D_H -#define FONT3D_H - #include "always.h" #include "refcount.h" #include "vector4.h" @@ -216,6 +212,3 @@ class Font3DInstanceClass : public RefCountClass { void Build_Cached_Tables(); }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/formconv.h b/Core/Libraries/Source/WWVegas/WW3D2/formconv.h index 897ffab95e..55fbd18974 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/formconv.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/formconv.h @@ -39,9 +39,6 @@ #pragma once -#ifndef FORMCONV_H -#define FORMCONV_H - #include "ww3dformat.h" #include @@ -56,5 +53,3 @@ D3DFORMAT WW3DZFormat_To_D3DFormat(WW3DZFormat ww3d_zformat); WW3DZFormat D3DFormat_To_WW3DZFormat(D3DFORMAT d3d_format); void Init_D3D_To_WW3_Conversion(); - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h b/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h index 5ef31c4c11..26d6add36d 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef FRAMEGRAB_H -#define FRAMEGRAB_H - #ifndef ALWAYS_H #include "always.h" #endif @@ -111,5 +107,3 @@ class FrameGrabClass void ConvertFrame(void *BitmapPointer); }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hanim.h b/Core/Libraries/Source/WWVegas/WW3D2/hanim.h index 76b274eb47..e243e3630e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hanim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hanim.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef HANIM_H -#define HANIM_H - #include "always.h" #include "quat.h" #include "refcount.h" @@ -263,5 +259,3 @@ class HAnimComboClass { DynamicVectorClass HAnimComboData; }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h index 1f81a68ab5..144cdace01 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef HCANIM_H -#define HCANIM_H - #include "always.h" #include "quat.h" #include "refcount.h" @@ -129,7 +125,3 @@ class HCompressedAnimClass : public HAnimClass void add_bit_channel(TimeCodedBitChannelClass * newchan); }; - - -#endif // hcanim.h - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.H b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.H index d99343a88b..a14060eabf 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.H +++ b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.H @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef HMDLDEF_H -#define HMDLDEF_H - #include "always.h" #include "w3d_file.h" @@ -106,5 +102,3 @@ private: friend class HModelClass; friend class HLodClass; }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/htree.h b/Core/Libraries/Source/WWVegas/WW3D2/htree.h index a10da6988d..a3a2e42b71 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/htree.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/htree.h @@ -37,9 +37,6 @@ #pragma once -#ifndef HTREE_H -#define HTREE_H - #include "always.h" #include "pivot.h" #include "quat.h" @@ -204,7 +201,3 @@ WWINLINE const Matrix3D & HTreeClass::Get_Transform(int pivot) const return Pivot[pivot].Transform; } - - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/intersec.h b/Core/Libraries/Source/WWVegas/WW3D2/intersec.h index cc2a64c79b..06905a9145 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/intersec.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/intersec.h @@ -49,9 +49,6 @@ #pragma once -#ifndef INTERSEC_H -#define INTERSEC_H - #include "always.h" #include "matrix3d.h" #include "layer.h" @@ -397,6 +394,3 @@ class IntersectionClass static Vector3 _RayLocation, _RayDirection, _IntersectionNormal; }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/inttest.h b/Core/Libraries/Source/WWVegas/WW3D2/inttest.h index b5dafff8a7..720d0a007e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/inttest.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/inttest.h @@ -38,9 +38,6 @@ #pragma once -#ifndef INTTEST_H -#define INTTEST_H - #include "always.h" #include "aabox.h" #include "obbox.h" @@ -248,7 +245,3 @@ inline void OBBoxIntersectionTestClass::update_bounding_box(void) BoundingBox.Center = Box.Center; Box.Basis.Rotate_AABox_Extent(Box.Extent,&BoundingBox.Extent); } - - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/layer.h b/Core/Libraries/Source/WWVegas/WW3D2/layer.h index 35370ac278..527aca4ad2 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/layer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/layer.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef LAYER_H -#define LAYER_H - #include "always.h" #include "LISTNODE.H" #include "vector3.h" @@ -91,8 +87,3 @@ class LayerClass : public LayerNodeClass }; typedef List LayerListClass; - - -#endif //LAYER_H - - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h index 5b1dbbbad6..9c7ae3c9ee 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h @@ -36,9 +36,6 @@ #pragma once -#ifndef LINE3D_H -#define LINE3D_H - #include "always.h" #include "rendobj.h" #include "vector3.h" @@ -118,5 +115,3 @@ class Line3DClass : public W3DMPO, public RenderObjClass Vector4 Color; char SortLevel; }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h index 7f843a6942..11c0c145c9 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef MATINFO_H -#define MATINFO_H - #include "always.h" #include "wwdebug.h" #include "Vector.H" @@ -329,5 +325,3 @@ inline void MaterialInfoClass::Replace_Texture(int index, TextureClass *newTextu { REF_PTR_SET(Textures[index],newTexture); } - -#endif // MATINFO_H diff --git a/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h b/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h index b493d3f7b2..498ddb96b8 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h @@ -38,9 +38,6 @@ #pragma once -#ifndef MESHDAM_H -#define MESHDAM_H - #include "always.h" #include "vector3.h" #include "bittype.h" @@ -100,7 +97,5 @@ class DamageClass }; -#endif - #endif //0 diff --git a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h index 0edb32b311..0618719438 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h @@ -36,9 +36,6 @@ #pragma once -#ifndef METALMAP_H -#define METALMAP_H - #include class TextureClass; @@ -115,5 +112,3 @@ class MetalMapManagerClass { // Use 16-bit metal maps or not bool Use16Bit; }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h b/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h index e775336d53..106ca11512 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h @@ -18,9 +18,6 @@ #pragma once -#ifndef DX8_MISSING_TEXTURE_H -#define DX8_MISSING_TEXTURE_H - #include "always.h" struct IDirect3DTexture8; @@ -35,6 +32,3 @@ class MissingTexture static IDirect3DTexture8* _Get_Missing_Texture(); // Return a reference to missing texture static IDirect3DSurface8* _Create_Missing_Surface(); // Create new surface which contain missing texture image }; - - -#endif // DX8_MISSING_TEXTURE diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pivot.h b/Core/Libraries/Source/WWVegas/WW3D2/pivot.h index fbb1f285c8..f8ab446df9 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/pivot.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/pivot.h @@ -37,9 +37,6 @@ #pragma once -#ifndef PIVOT_H -#define PIVOT_H - #include "always.h" #include "vector3.h" #include "matrix3d.h" @@ -105,7 +102,3 @@ struct PivotClass #endif }; - - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h index 7f56345db0..fafa9da723 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h @@ -36,9 +36,6 @@ #pragma once -#ifndef POINTGR_H -#define POINTGR_H - #include "sharebuf.h" #include "shader.h" #include "vector4.h" @@ -234,7 +231,3 @@ class SegmentGroupClass : public PointGroupClass virtual ~SegmentGroupClass(void); }; - - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.h b/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.h index 315047b065..8eab24e855 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef POLYINFO_H -#define POLYINFO_H - #pragma once class TextureClass; @@ -87,6 +83,3 @@ class PolygonInfoClass VertexMaterialClass *VertexMaterial; ShaderClass *Shader; }; - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/predlod.h b/Core/Libraries/Source/WWVegas/WW3D2/predlod.h index 6739e1b529..f8bceca60a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/predlod.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/predlod.h @@ -36,9 +36,6 @@ #pragma once -#ifndef PREDLOD_H -#define PREDLOD_H - // This file contains the classes which support predictive LOD management // similar to that outlined in "Adaptive Display Algorithm for Interactive // Frame Rates During Visualization of Complex Virtual Environments", @@ -80,5 +77,3 @@ class PredictiveLODOptimizerClass { static int VisibleObjArraySize; }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h b/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h index e30a154e5e..d92d48d4dd 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h @@ -36,10 +36,6 @@ #pragma once -#ifndef __PRIM_ANIM_H -#define __PRIM_ANIM_H - - #include "simplevec.h" #include "chunkio.h" @@ -385,5 +381,3 @@ LERPAnimationChannelClass::Evaluate (float time) return value; } - -#endif //__PRIM_ANIM_H diff --git a/Core/Libraries/Source/WWVegas/WW3D2/projector.h b/Core/Libraries/Source/WWVegas/WW3D2/projector.h index 9e13bd86e9..24b8632af4 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/projector.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/projector.h @@ -37,8 +37,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef PROJECTOR_H -#define PROJECTOR_H +#pragma once #include "always.h" #include "matrix3d.h" @@ -85,8 +84,3 @@ class ProjectorClass MatrixMapperClass * Mapper; }; - - -#endif - - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.h b/Core/Libraries/Source/WWVegas/WW3D2/proto.h index 796bbf43d4..e1879f665b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/proto.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef PROTO_H -#define PROTO_H - #include "always.h" #include #include "w3d_file.h" @@ -175,7 +171,3 @@ class HModelLoaderClass : public PrototypeLoaderClass */ extern MeshLoaderClass _MeshLoader; extern HModelLoaderClass _HModelLoader; - - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proxy.h b/Core/Libraries/Source/WWVegas/WW3D2/proxy.h index 0d9404f7a1..faf45a367e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/proxy.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/proxy.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __PROXY_H -#define __PROXY_H - #include "wwstring.h" #include "matrix3d.h" @@ -107,7 +104,3 @@ ProxyClass::operator!= (const ProxyClass &src) { return ((Name != src.Name) || (Transform != src.Transform)); } - - -#endif //__PROXY_H - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h b/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h index faf8def582..2c40e1f54f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef RDDESC_H -#define RDDESC_H - #include "Vector.H" #include "wwstring.h" #include @@ -164,7 +160,3 @@ inline void RenderDeviceDescClass::add_resolution(int w,int h,int bits) ResArray.Add(ResolutionDescClass(w,h,bits)); } } - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h index 019f9faac8..d9f705e125 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h @@ -36,9 +36,6 @@ #pragma once -#ifndef RENDER2DSENTENCE_H -#define RENDER2DSENTENCE_H - #include "render2d.h" #include "refcount.h" #include "Vector.H" @@ -270,5 +267,3 @@ class Render2DSentenceClass { TextureClass * CurTexture; ShaderClass Shader; }; - -#endif // RENDER2DSENTENCE_H diff --git a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h index 4519c13530..aabc0c4c79 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h @@ -36,9 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef RENDEROBJECTRECYCLER_H -#define RENDEROBJECTRECYCLER_H +#pragma once #include "always.h" #include "robjlist.h" @@ -77,8 +75,3 @@ class RenderObjectRecyclerClass RefRenderObjListClass InactiveModels; }; - - - - -#endif //RENDEROBJECTRECYCLER_H diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h index b6eb7dbfb6..41440091ec 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h @@ -38,12 +38,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef RENDOBJ_H -#define RENDOBJ_H - #include "always.h" #include "refcount.h" #include "sphere.h" @@ -652,6 +648,3 @@ static const char* const TheAnimModeNames[] = }; static_assert(ARRAY_SIZE(TheAnimModeNames) == RenderObjClass::ANIM_MODE_COUNT + 1, "Incorrect array size"); #endif - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h index 78a78521ac..b4ab20f494 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h @@ -36,9 +36,6 @@ #pragma once -#ifndef RINGOBJ_H -#define RINGOBJ_H - #include "always.h" #include "rendobj.h" #include "w3d_file.h" @@ -361,8 +358,4 @@ class RingPrototypeClass : public W3DMPO, public PrototypeClass extern RingLoaderClass _RingLoader; -#endif // RINGOBJ_H - // EOF - ringobj,h - - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h b/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h index 822b4544b9..db3437f94b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef ROBJLIST_H -#define ROBJLIST_H - #ifndef ALWAYS_H #include "always.h" #endif @@ -59,7 +55,3 @@ typedef RefMultiListIterator RefRenderObjListIterator; typedef MultiListClass NonRefRenderObjListClass; typedef MultiListIterator NonRefRenderObjListIterator; - -#endif - - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/segline.h b/Core/Libraries/Source/WWVegas/WW3D2/segline.h index df6158bce1..576957a568 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/segline.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/segline.h @@ -36,9 +36,6 @@ #pragma once -#ifndef SEGLINE_H -#define SEGLINE_H - #include "rendobj.h" #include "shader.h" #include "simplevec.h" @@ -176,5 +173,3 @@ class SegmentedLineClass : public RenderObjClass // LineRenderer, contains most of the line settings. SegLineRendererClass LineRenderer; }; - -#endif // SEGLINE_H diff --git a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h index 61a6475421..f55809f1c2 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h @@ -36,8 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef SEGLINERENDERER_H -#define SEGLINERENDERER_H +#pragma once #include "always.h" #include "shader.h" @@ -206,7 +205,3 @@ inline void SegLineRendererClass::Set_UV_Offset_Rate(const Vector2 &rate) { UVOffsetDeltaPerMS = rate * 0.001f; } - - -#endif //SEGLINERENDERER_H - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h b/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h index 16de2a7e82..9040e4f5df 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h @@ -38,9 +38,6 @@ #pragma once -#ifndef SHATTERSYSTEM_H -#define SHATTERSYSTEM_H - #include "always.h" @@ -94,8 +91,3 @@ class ShatterSystem }; - - -#endif - - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h b/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h index 17ef69102a..2cca8aba34 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h @@ -36,9 +36,6 @@ #pragma once -#ifndef SNAPPTS_H -#define SNAPPTS_H - #include "refcount.h" #include "Vector.H" #include "vector3.h" @@ -58,5 +55,3 @@ class SnapPointsClass : public DynamicVectorClass, public RefCountClass ~SnapPointsClass(void) {} }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundlibrarybridge.h b/Core/Libraries/Source/WWVegas/WW3D2/soundlibrarybridge.h index e74644ca07..367fcc4573 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/soundlibrarybridge.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/soundlibrarybridge.h @@ -33,8 +33,8 @@ *--------------------------------------------------------------------------------------------- * Functions: * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef SOUNDLIBRARYBRIDGE_H -#define SOUNDLIBRARYBRIDGE_H + +#pragma once // Forward declarations. class Matrix3D; @@ -45,5 +45,3 @@ class SoundLibraryBridgeClass { virtual void Play_2D_Audio(const char * name) = 0; virtual void Stop_Playing_Audio(const char * name) = 0; }; - -#endif //SOUNDLIBRARYBRIDGE_H diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h index 19a643a0b5..c5ce0b6815 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __SOUNDROBJ_H -#define __SOUNDROBJ_H - // TheSuperHackers @build xezon 05/04/2025 Compile in WWAUDIO for Renegade's w3dview tool. #define noWWAUDIO 1 @@ -278,6 +275,3 @@ class SoundRenderObjLoaderClass : public PrototypeLoaderClass extern SoundRenderObjLoaderClass _SoundRenderObjLoader; #endif //noWWAUDIO (gth) removing dependency on wwaudio - -#endif //__SOUNDROBJ_H - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h index 3dc16a420d..5b854cf4fb 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h @@ -36,9 +36,6 @@ #pragma once -#ifndef SPHEREOBJ_H -#define SPHEREOBJ_H - #include "always.h" #include "rendobj.h" #include "w3d_file.h" @@ -470,8 +467,4 @@ class SpherePrototypeClass : public W3DMPO, public PrototypeClass */ extern SphereLoaderClass _SphereLoader; -#endif // SPHEREOBJ_H - // EOF - sphereobj,h - - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h b/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h index 12135bc499..d5e81a52fe 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h @@ -35,10 +35,8 @@ *---------------------------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef STATIC_SORT_LIST_H -#define STATIC_SORT_LIST_H +#pragma once #include "robjlist.h" #include "w3d_file.h" @@ -89,9 +87,3 @@ class DefaultStaticSortListClass : public StaticSortListClass RefRenderObjListClass SortLists[MAX_SORT_LEVEL + 1]; }; - - - - -#endif //STATIC_SORT_LIST_H - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/statistics.h b/Core/Libraries/Source/WWVegas/WW3D2/statistics.h index 2e62eaf7fc..1b89610cbc 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/statistics.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/statistics.h @@ -16,9 +16,6 @@ ** along with this program. If not, see . */ -#ifndef WW3D_STATISTICS_H -#define WW3D_STATISTICS_H - #pragma once #include "always.h" @@ -74,5 +71,3 @@ namespace Debug_Statistics #define DX8_RECORD_RENDER(polys,verts,shader) Debug_Statistics::Record_DX8_Polys_And_Vertices(polys,verts,shader) #define DX8_RECORD_SORTING_RENDER(polys,verts) Debug_Statistics::Record_Sorting_Polys_And_Vertices(polys,verts) #define DX8_RECORD_SKIN_RENDER(polys,verts) Debug_Statistics::Record_DX8_Skin_Polys_And_Vertices(polys,verts) - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streak.h b/Core/Libraries/Source/WWVegas/WW3D2/streak.h index b825848ca6..f0eb918425 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streak.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/streak.h @@ -36,9 +36,6 @@ #pragma once -#ifndef STREAK_H -#define STREAK_H - #include "rendobj.h" #include "shader.h" #include "simplevec.h" @@ -206,13 +203,3 @@ class StreakLineClass : public RenderObjClass SegLineRendererClass LineRenderer; StreakRendererClass StreakRenderer;//special, per-point alpha/color/size }; - - - - - - - - - -#endif // SEGLINE_H diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h index fc4e0ac5f0..a51033d565 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h @@ -36,8 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef STREAKRENDER_H -#define STREAKRENDER_H +#pragma once #include "always.h" #include "shader.h" @@ -222,6 +221,3 @@ inline void StreakRendererClass::Reset_Line(void) { // Empty } - -#endif //STREAKRENDER_H - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h b/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h index 337b2f869b..001840bb37 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h @@ -18,9 +18,6 @@ #pragma once -#ifndef WW3D2_STRIP_OPTIMIZER_H__ -#define WW3D2_STRIP_OPTIMIZER_H__ - #include "always.h" @@ -42,5 +39,3 @@ class StripOptimizerClass static int Get_Strip_Index_Count(const int* strips, int strips_count); }; - -#endif // WW3D2_STRIP_OPTIMIZER_H__ diff --git a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h index f6f7f2ffb1..f9986efb2b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h @@ -38,9 +38,6 @@ #pragma once -#ifndef SURFACECLASS_H -#define SURFACECLASS_H - #include "ww3dformat.h" #include "refcount.h" @@ -146,7 +143,3 @@ class SurfaceClass : public W3DMPO, public RefCountClass WW3DFormat SurfaceFormat; friend class TextureClass; }; - -#endif - - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h b/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h index 03259775ee..668ace7d1a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h @@ -32,12 +32,8 @@ * * *-------------------------------------------------------------------------*/ - #pragma once -#ifndef TEXTDRAW_H -#define TEXTDRAW_H - #include "always.h" #include "dynamesh.h" @@ -114,5 +110,3 @@ class TextDrawClass : public DynamicMeshClass Vector2 TranslateOffset; Vector2 PixelSize; }; - -#endif // TEXTDRAW_H diff --git a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h index a3ee0bf56a..193358f152 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h @@ -38,9 +38,6 @@ #pragma once -#ifndef VISRASTERIZER_H -#define VISRASTERIZER_H - #include "always.h" #include "matrix3d.h" #include "matrix4.h" @@ -206,6 +203,3 @@ class VisRasterizerClass SimpleVecClass TempVertexBuffer; }; - -#endif //VISRASTERIZER_H - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h b/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h index 3e02cae30d..363883df04 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef W3D_DEP_H -#define W3D_DEP_H +#pragma once #pragma warning (push, 3) #pragma warning (disable: 4018 4284 4786 4788) @@ -50,5 +49,3 @@ typedef std::list StringList; bool Get_W3D_Dependencies (const char *w3d_filename, StringList &files); - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_obsolete.h b/Core/Libraries/Source/WWVegas/WW3D2/w3d_obsolete.h index b511f308da..eb9a537f99 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_obsolete.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_obsolete.h @@ -34,13 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef W3D_OBSOLETE_H -#define W3D_OBSOLETE_H - - ///////////////////////////////////////////////////////////////////////////////////////////// // Obsolete chunk id's // At one point in time I was using the 'O' prefix to mean obsolete. Now we just move stuff @@ -326,6 +321,3 @@ struct W3dHModelAuxDataStruct float32 LODMax; uint32 FutureUse[32]; }; - - -#endif // W3D_OBSOLETE_H diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h index 53adc1a6a5..90b3da3e16 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef W3D_UTIL_H -#define W3D_UTIL_H - #include "always.h" #include "w3d_file.h" @@ -72,7 +68,3 @@ class W3dUtilityClass static void Convert_Shader(const ShaderClass & shader,W3dShaderStruct * set); }; - -#endif - - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h b/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h index aedc9f2cf2..c600f8ca70 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef W3DERR_H -#define W3DERR_H - #include "always.h" /* @@ -54,5 +50,3 @@ enum WW3DErrorType WW3D_ERROR_WINDOW_NOT_OPEN, WW3D_ERROR_INITIALIZATION_FAILED, }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h b/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h index f750e8db96..762ca32879 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h @@ -37,9 +37,6 @@ #pragma once -#ifndef W3DEXCLUSIONLIST_H -#define W3DEXCLUSIONLIST_H - #include "always.h" #include "Vector.H" #include "wwstring.h" @@ -76,7 +73,3 @@ class W3DExclusionListClass const DynamicVectorClass & Names; HashTemplateClass NameHash; }; - - - -#endif //EXCLUSIONLIST_H diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h b/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h index b5b6d9d204..e9f9d89874 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h @@ -41,9 +41,6 @@ #pragma once -#ifndef WW3DFORMAT_H -#define WW3DFORMAT_H - #include "always.h" #include "wwstring.h" @@ -203,5 +200,3 @@ void Get_WW3D_ZFormat_Name(WW3DZFormat format, StringClass& name); unsigned Get_Num_Depth_Bits(WW3DZFormat zformat); unsigned Get_Num_Stencil_Bits(WW3DZFormat zformat); - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h b/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h index 7081d689fe..d308fcab62 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h @@ -34,13 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - -#ifndef WW3DIDS_H -#define WW3DIDS_H - #include "saveloadids.h" /* @@ -71,5 +66,3 @@ enum WW3D_PERSIST_CHUNKID_LIGHT, WW3D_PERSIST_CHUNKID_DAZZLE, }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ww3dtrig.h b/Core/Libraries/Source/WWVegas/WW3D2/ww3dtrig.h index 33bd1bcb59..2720d320ca 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ww3dtrig.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ww3dtrig.h @@ -34,13 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef WW3DTRIG_H -#define WW3DTRIG_H - - /* ** The WW3D Library will check for debugging triggers using the following ID's ** Your application may install a trigger handler into the WWDebug library and then @@ -55,5 +50,3 @@ enum WW3D_TRIGGER_SURFACE_CACHE_STATS = 0x101, // display surface cache info in the debug window WW3D_TRIGGER_PROCESS_STATS = 0x102 // render stats for last frame only }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h b/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h index dadb2c6614..e5e4182652 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __AABTREESOUNDCULLCLASS_H -#define __AABTREESOUNDCULLCLASS_H - #include "aabtreecull.h" @@ -76,6 +72,3 @@ class AABTreeSoundCullClass : public AABTreeCullClass virtual void Save_Node_Contents (AABTreeNodeClass * node,ChunkSaveClass & csave) { }; }; - -#endif //__AABTREESOUNDCULLCLASS_H - diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h index 5b73431f2e..d65dd7f432 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __SOUNDOBJ_H -#define __SOUNDOBJ_H - #pragma warning (push, 3) #include "mss.h" #pragma warning (pop) @@ -457,6 +454,3 @@ class AudibleSoundDefinitionClass : public DefinitionClass // Misc UI info Vector3 m_AttenuationSphereColor; }; - - -#endif //__SOUNDOBJ_H diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h b/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h index 4771b4b9f4..0a268f93f4 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __AUDIO_EVENTS_H -#define __AUDIO_EVENTS_H - #include "simplevec.h" #include "bittype.h" @@ -207,7 +204,3 @@ AudioCallbackListClass::Remove_Callback (T pointer) return ; } - - -#endif //__AUDIO_EVENTS_H - diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h b/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h index 27be43b109..780db12a58 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __AUDIO_SAVE_LOAD_H -#define __AUDIO_SAVE_LOAD_H - #include "saveloadsubsystem.h" #include "Vector.H" #include "bittype.h" @@ -119,8 +115,3 @@ class DynamicAudioSaveLoadClass : public SaveLoadSubSystemClass //bool Save_Micro_Chunks (ChunkSaveClass &csave); //bool Load_Micro_Chunks (ChunkLoadClass &cload); }; - - -#endif //__AUDIO_SAVE_LOAD_H - - diff --git a/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.h b/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.h index de10ba6327..c200a290f5 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/FilteredSound.h @@ -36,10 +36,6 @@ #pragma once -#ifndef __FILTERED_SOUND_H -#define __FILTERED_SOUND_H - - #include "SoundPseudo3D.h" @@ -98,7 +94,3 @@ class FilteredSoundClass : public SoundPseudo3DClass ////////////////////////////////////////////////////////////////////// HPROVIDER m_hFilter; }; - - -#endif //__FILTERED_SOUND_H - diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Listener.h b/Core/Libraries/Source/WWVegas/WWAudio/Listener.h index 935bce87c0..8ecfdac993 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/Listener.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/Listener.h @@ -34,13 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __LISTENER_H -#define __LISTENER_H - - #include "Sound3D.h" @@ -140,6 +135,3 @@ class Listener3DClass : public Sound3DClass // Private member data ////////////////////////////////////////////////////////////////////// }; - - -#endif //__LISTENER_H diff --git a/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h b/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h index 85204542a9..780e40816d 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h @@ -32,9 +32,6 @@ #pragma once -#ifndef __LOGICAL_LISTENER_H -#define __LOGICAL_LISTENER_H - #include "SoundSceneObj.h" #include "bittype.h" #include "vector3.h" @@ -145,7 +142,3 @@ class LogicalListenerClass : public SoundSceneObjClass static uint32 m_OldestTimestamp; static uint32 m_NewestTimestamp; }; - - -#endif //__LOGICAL_LISTENER_H - diff --git a/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h b/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h index 332b8fb89f..fc25c02062 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h @@ -32,9 +32,6 @@ #pragma once -#ifndef __LOGICAL_SOUND_H -#define __LOGICAL_SOUND_H - #include "SoundSceneObj.h" #include "bittype.h" #include "vector3.h" @@ -145,7 +142,3 @@ class LogicalSoundClass : public SoundSceneObjClass uint32 m_NotifyDelayInMS; uint32 m_LastNotification; }; - - -#endif //__LOGICAL_SOUND_H - diff --git a/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h b/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h index 18ec8c22b8..af30e19fc0 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h @@ -32,9 +32,6 @@ #pragma once -#ifndef __PRIORITY_VECTOR_H -#define __PRIORITY_VECTOR_H - #include "Vector.H" //////////////////////////////////////////////////////////////////// @@ -113,6 +110,3 @@ __inline bool PriorityVectorClass::Add_High (T const &object) { return DynamicVectorClass::Add_Head (object); } - -#endif //__PRIORITY_VECTOR_H - diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h b/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h index 849d17b00a..f3c036f5fc 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __SOUND3DOBJ_H -#define __SOUND3DOBJ_H - #include "AudibleSound.h" #include "mempool.h" @@ -194,6 +191,3 @@ class Sound3DClass : public AudibleSoundClass bool m_IsStatic; unsigned int m_LastUpdate; }; - - -#endif //__SOUND3DOBJ_H diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h index b404123cd6..8e66f5b4ae 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __SOUNDBUFFER_H -#define __SOUNDBUFFER_H - #pragma warning (push, 3) #include "mss.h" #pragma warning (pop) @@ -173,6 +169,3 @@ class StreamSoundBufferClass : public SoundBufferClass // Protected member data ////////////////////////////////////////////////////////////////////// }; - - -#endif //__SOUNDBUFFER_H diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h index 51847357c3..1d21530414 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __SOUND_CHUNK_IDS_H -#define __SOUND_CHUNK_IDS_H - #include "saveloadids.h" #include "definitionclassids.h" @@ -75,6 +71,3 @@ enum { CLASSID_SOUND_DEF = CLASSID_SOUND, }; - - -#endif //__SOUND_CHUNK_IDS_H diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h index 682740cb41..c9aea3c389 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __SOUNDCULLOBJ_H -#define __SOUNDCULLOBJ_H - #include "SoundSceneObj.h" #include "cullsys.h" #include "refcount.h" @@ -167,5 +163,3 @@ SoundCullObjClass::Get_Bounding_Box (void) const m_AABox.Center = m_Transform.Get_Translation (); return m_AABox; } - -#endif //__SOUNDCULLOBJ_H diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundPseudo3D.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundPseudo3D.h index faf904527a..cd9e78e403 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundPseudo3D.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundPseudo3D.h @@ -36,10 +36,6 @@ #pragma once -#ifndef __SOUND_PSEUDO_3DOBJ_H -#define __SOUND_PSEUDO_3DOBJ_H - - #include "Sound3D.h" @@ -156,6 +152,3 @@ class SoundPseudo3DClass : public Sound3DClass // Private member data ////////////////////////////////////////////////////////////////////// }; - - -#endif //__SOUND_PSEUDO_3DOBJ_H diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h index 640390089c..a5f525aaa6 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __SOUNDSCENE_H -#define __SOUNDSCENE_H - #include "aabtreecull.h" #include "gridcull.h" #include "Listener.h" @@ -222,6 +218,3 @@ class SoundSceneClass bool m_IsBatchMode; }; - - -#endif //__SOUNDSCENE_H diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h index ce3dd73757..c6d63a410a 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h @@ -34,9 +34,6 @@ #pragma once -#ifndef __SOUND_SCENE_OBJ_H -#define __SOUND_SCENE_OBJ_H - #include "refcount.h" #include "WWAudio.h" #include "bittype.h" @@ -270,8 +267,3 @@ SoundSceneObjClass::Register_Callback m_pCallback = callback; return ; } - - - -#endif //__SOUND_SCENE_OBJ_H - diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Threads.h b/Core/Libraries/Source/WWVegas/WWAudio/Threads.h index d9f77a792d..8070525135 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/Threads.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/Threads.h @@ -32,9 +32,6 @@ #pragma once -#ifndef __WWAUDIO_THREADS_H -#define __WWAUDIO_THREADS_H - #include "windows.h" #include "Vector.H" #include "mutex.h" @@ -105,6 +102,3 @@ class WWAudioThreadsClass static CriticalSectionClass m_ListMutex; static bool m_IsShuttingDown; }; - -#endif //__WWAUDIO_THREADS_H - diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Utils.h b/Core/Libraries/Source/WWVegas/WWAudio/Utils.h index be17acb83b..ffff71bff5 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/Utils.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/Utils.h @@ -34,9 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __UTILS_H -#define __UTILS_H +#pragma once #pragma warning (push, 3) #include "mss.h" @@ -88,6 +86,3 @@ Get_Filename_From_Path (LPCTSTR path) // Return the filename part of the path return filename; } - - -#endif //__UTILS_H diff --git a/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h b/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h index 6fe21d0b56..1ee408d6df 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __WWAUDIO_H -#define __WWAUDIO_H - #include "always.h" #pragma warning (push, 3) #include "mss.h" @@ -579,6 +576,3 @@ class WWAudioClass float m_EffectsLevel; int m_ReverbRoomType; }; - - -#endif //__WWAUDIO_H diff --git a/Core/Libraries/Source/WWVegas/WWAudio/listenerhandle.h b/Core/Libraries/Source/WWVegas/WWAudio/listenerhandle.h index b4811acef5..1524b235f3 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/listenerhandle.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/listenerhandle.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __LISTENERHANDLE_H -#define __LISTENERHANDLE_H - #include "sound3dhandle.h" @@ -95,6 +92,3 @@ class ListenerHandleClass : public Sound3DHandleClass // Protected member data /////////////////////////////////////////////////////////////////// }; - - -#endif //__LISTENERHANDLE_H diff --git a/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.h b/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.h index 057a1e3f37..f76b8100b9 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __SOUND2DHANDLE_H -#define __SOUND2DHANDLE_H - #include "soundhandle.h" @@ -100,6 +97,3 @@ class Sound2DHandleClass : public SoundHandleClass /////////////////////////////////////////////////////////////////// HSAMPLE SampleHandle; }; - - -#endif //__SOUND2DHANDLE_H diff --git a/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.h b/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.h index d79fe8d2e9..2040057aa5 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __SOUND3DHANDLE_H -#define __SOUND3DHANDLE_H - #include "soundhandle.h" @@ -105,6 +102,3 @@ class Sound3DHandleClass : public SoundHandleClass /////////////////////////////////////////////////////////////////// H3DSAMPLE SampleHandle; }; - - -#endif //__SOUND3DHANDLE_H diff --git a/Core/Libraries/Source/WWVegas/WWAudio/soundhandle.h b/Core/Libraries/Source/WWVegas/WWAudio/soundhandle.h index 5457c40651..297a9ba2a3 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/soundhandle.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/soundhandle.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __SOUNDHANDLE_H -#define __SOUNDHANDLE_H - #include "WWAudio.h" ////////////////////////////////////////////////////////////////////// @@ -122,6 +119,3 @@ class SoundHandleClass /////////////////////////////////////////////////////////////////// SoundBufferClass * Buffer; }; - - -#endif //__SOUNDHANDLE_H diff --git a/Core/Libraries/Source/WWVegas/WWAudio/soundstreamhandle.h b/Core/Libraries/Source/WWVegas/WWAudio/soundstreamhandle.h index c90d8bc9f8..ee4699df02 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/soundstreamhandle.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/soundstreamhandle.h @@ -36,10 +36,6 @@ #pragma once -#ifndef __SOUNDSTREAMHANDLE_H -#define __SOUNDSTREAMHANDLE_H - - #include "soundhandle.h" @@ -107,6 +103,3 @@ class SoundStreamHandleClass : public SoundHandleClass HSAMPLE SampleHandle; HSTREAM StreamHandle; }; - - -#endif //__SOUNDSTREAMHANDLE_H diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h b/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h index fa12d75c7d..4d265cbbe6 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h @@ -36,9 +36,6 @@ #pragma once -#ifndef WWDEBUG_H -#define WWDEBUG_H - // TheSuperHackers @todo Recover WWDEBUG? #ifdef WWDEBUG #include @@ -175,5 +172,3 @@ void WWDebug_DBWin32_Message_Handler( const char * message); #define WWDEBUG_PROFILE_START(x) #define WWDEBUG_PROFILE_STOP(x) #endif - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwhack.h b/Core/Libraries/Source/WWVegas/WWDebug/wwhack.h index c1d922379d..97d0b7e695 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwhack.h +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwhack.h @@ -36,13 +36,8 @@ #pragma once -#ifndef WWHACK_H -#define WWHACK_H - /* ** FORCE_LINK is a hack to force a module in a lib to be linked into the EXE. */ #define FORCE_LINK( module ) void _Force_Link_ ## module( void ); _Force_Link_ ## module() #define DECLARE_FORCE_LINK( module ) void _Force_Link_ ## module( void ) {} - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.h b/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.h index 35f1101f4f..b994bbe16b 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.h +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.h @@ -36,12 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef WWMEMLOG_H -#define WWMEMLOG_H - #define LOG_MEMORY // Comment this out to disable memlog compiling in class MemLogClass; @@ -180,10 +176,3 @@ class WWMemorySampleClass #else #define WWMEMLOG( category ) #endif - - - - - - -#endif //WWMEMLOG_H diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.h b/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.h index 9d4a4d2299..ba76edea98 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.h +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwprofile.h @@ -37,10 +37,6 @@ #pragma once //#define ENABLE_TIME_AND_MEMORY_LOG - -#ifndef WWPROFILE_H -#define WWPROFILE_H - #include "wwstring.h" #ifdef _UNIX @@ -336,5 +332,3 @@ struct WWMemoryAndTimeLog ~WWMemoryAndTimeLog(); void Log_Intermediate(const char* text); }; - -#endif // WWPROFILE_H diff --git a/Core/Libraries/Source/WWVegas/WWDownload/Download.h b/Core/Libraries/Source/WWVegas/WWDownload/Download.h index 389a4abe33..bed1916507 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/Download.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/Download.h @@ -18,8 +18,7 @@ // Download.h : Declaration of the CDownload -#ifndef __DOWNLOAD_H_ -#define __DOWNLOAD_H_ +#pragma once //#include "../resource.h" // main symbols #include "WWDownload/ftp.h" @@ -95,5 +94,3 @@ class CDownload Cftp *m_Ftp; IDownload *Listener; }; - -#endif //__DOWNLOAD_H_ diff --git a/Core/Libraries/Source/WWVegas/WWDownload/DownloadDebug.h b/Core/Libraries/Source/WWVegas/WWDownload/DownloadDebug.h index 7a4d7872fa..4948c19cc6 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/DownloadDebug.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/DownloadDebug.h @@ -18,9 +18,6 @@ // DownloadDebug.h -#ifndef __DOWNLOADDEBUG_H_ -#define __DOWNLOADDEBUG_H_ +#pragma once #include "Common/Debug.h" - -#endif //__DOWNLOADDEBUG_H_ diff --git a/Core/Libraries/Source/WWVegas/WWDownload/Registry.h b/Core/Libraries/Source/WWVegas/WWDownload/Registry.h index 846fad6912..527e9adfde 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/Registry.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/Registry.h @@ -22,9 +22,6 @@ #pragma once -#ifndef __WWDOWNLOAD_REGISTRY_H__ -#define __WWDOWNLOAD_REGISTRY_H__ - #include /** @@ -46,5 +43,3 @@ bool SetStringInRegistry(std::string path, std::string key, std::string val); * Store an unsigned int in the registry - returns true on success */ bool SetUnsignedIntInRegistry(std::string path, std::string key, unsigned int val); - -#endif // __WWDOWNLOAD_REGISTRY_H__ diff --git a/Core/Libraries/Source/WWVegas/WWDownload/downloaddefs.h b/Core/Libraries/Source/WWVegas/WWDownload/downloaddefs.h index b7fbb15daf..d8d94d308a 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/downloaddefs.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/downloaddefs.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef _DOWNLOADDEFS_H -#define _DOWNLOADDEFS_H +#pragma once // CDownload statuses @@ -57,5 +56,3 @@ #define DOWNLOADEVENT_LOCALFILEOPENFAILED 5 #define DOWNLOADEVENT_TCPERROR 6 #define DOWNLOADEVENT_DISCONNECTERROR 7 - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWDownload/ftp.h b/Core/Libraries/Source/WWVegas/WWDownload/ftp.h index e12a1934b1..31c767482b 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/ftp.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/ftp.h @@ -18,9 +18,7 @@ // ftp.h : Declaration of the Cftp -#ifndef __FTP_H_ -#define __FTP_H_ - +#pragma once //#include "../resource.h" // main symbols @@ -113,5 +111,3 @@ class Cftp HRESULT SendCommand( LPCSTR pCommand, int iSize ); }; - -#endif //__FTP_H_ diff --git a/Core/Libraries/Source/WWVegas/WWDownload/ftpdefs.h b/Core/Libraries/Source/WWVegas/WWDownload/ftpdefs.h index 35fa5b6a87..1306a38ecb 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/ftpdefs.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/ftpdefs.h @@ -16,15 +16,10 @@ ** along with this program. If not, see . */ -#ifndef __FTPDEFS_H_INCLUDED__ -#define __FTPDEFS_H_INCLUDED__ - +#pragma once // CFtp return codes. #define FTP_SUCCEEDED S_OK #define FTP_FAILED MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 1 ) #define FTP_TRYING MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 2 ) - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWDownload/urlBuilder.h b/Core/Libraries/Source/WWVegas/WWDownload/urlBuilder.h index e802713f64..2d5ae532dd 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/urlBuilder.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/urlBuilder.h @@ -16,9 +16,7 @@ ** along with this program. If not, see . */ -#ifndef _URLBUILDER_H_ -#define _URLBUILDER_H_ +#pragma once + void FormatURLFromRegistry( std::string& gamePatchURL, std::string& mapPatchURL, std::string& configURL, std::string& motdURL ); - -#endif // _URLBUILDER_H_ diff --git a/Core/Libraries/Source/WWVegas/WWLib/BSEARCH.H b/Core/Libraries/Source/WWVegas/WWLib/BSEARCH.H index c1b9e8235c..aed9a03a44 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/BSEARCH.H +++ b/Core/Libraries/Source/WWVegas/WWLib/BSEARCH.H @@ -16,13 +16,8 @@ ** along with this program. If not, see . */ - #pragma once -#ifndef BSEARCH_H -#define BSEARCH_H - - /* ** Binary searching template. It can be faster than the built in C library ** version since the comparison function can be inlined. If the comparison @@ -71,6 +66,3 @@ T * Binary_Search(T * A, int n, T const & target) } return (NULL); } - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/BUFF.H b/Core/Libraries/Source/WWVegas/WWLib/BUFF.H index 933fe3c734..164b927e7b 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/BUFF.H +++ b/Core/Libraries/Source/WWVegas/WWLib/BUFF.H @@ -33,11 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once - -#ifndef CCBUFF_H -#define CCBUFF_H +#pragma once /* ** The "bool" integral type was defined by the C++ committee in @@ -88,6 +85,3 @@ class Buffer { */ bool IsAllocated; }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/CRC.H b/Core/Libraries/Source/WWVegas/WWLib/CRC.H index ffd96cb89f..e042b3d1e9 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/CRC.H +++ b/Core/Libraries/Source/WWVegas/WWLib/CRC.H @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef CRC_H -#define CRC_H +#pragma once #include @@ -127,6 +125,3 @@ public: // get the CRC of a null-terminated string static unsigned long String( const char *string, unsigned long crc = 0 ); }; - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWLib/CallbackHook.h b/Core/Libraries/Source/WWVegas/WWLib/CallbackHook.h index 45edb97b2e..23a26db662 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/CallbackHook.h +++ b/Core/Libraries/Source/WWVegas/WWLib/CallbackHook.h @@ -33,8 +33,7 @@ * ******************************************************************************/ -#ifndef __CALLBACKHOOK_H__ -#define __CALLBACKHOOK_H__ +#pragma once class CallbackHook { @@ -80,5 +79,3 @@ template class Callback : bool (*mCallback)(T); T mUserData; }; - -#endif // __CALLBACKHOOK_H__ diff --git a/Core/Libraries/Source/WWVegas/WWLib/Except.h b/Core/Libraries/Source/WWVegas/WWLib/Except.h index a425735b93..e67a4b1f64 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/Except.h +++ b/Core/Libraries/Source/WWVegas/WWLib/Except.h @@ -36,9 +36,6 @@ #pragma once -#ifndef EXCEPT_H -#define EXCEPT_H - #ifdef _MSC_VER #include "win.h" @@ -84,5 +81,3 @@ typedef struct tThreadInfoType { #endif //_MSC_VER - -#endif //EXCEPT_H diff --git a/Core/Libraries/Source/WWVegas/WWLib/FastAllocator.h b/Core/Libraries/Source/WWVegas/WWLib/FastAllocator.h index 5abc709b59..aba4727fe3 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/FastAllocator.h +++ b/Core/Libraries/Source/WWVegas/WWLib/FastAllocator.h @@ -27,10 +27,6 @@ // /////////////////////////////////////////////////////////////////////////////// - -#ifndef FASTALLOCATOR_H -#define FASTALLOCATOR_H - #pragma once //#define MEMORY_OVERWRITE_TEST @@ -724,16 +720,3 @@ void main(){ getchar(); } */ - - - -#endif //sentry - - - - - - - - - diff --git a/Core/Libraries/Source/WWVegas/WWLib/HASHLIST.H b/Core/Libraries/Source/WWVegas/WWLib/HASHLIST.H index 614598943f..1911b838f5 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/HASHLIST.H +++ b/Core/Libraries/Source/WWVegas/WWLib/HASHLIST.H @@ -44,9 +44,6 @@ #pragma once -#ifndef HASHLIST_H -#define HASHLIST_H - #pragma warning (push) #pragma warning (disable: 4786) @@ -628,23 +625,3 @@ void HashListClass::Move_To(HashListClass *newlist) } #pragma warning (pop) - -#endif // HASHLIST_H - - - - - - - - - - - - - - - - - - diff --git a/Core/Libraries/Source/WWVegas/WWLib/INDEX.H b/Core/Libraries/Source/WWVegas/WWLib/INDEX.H index 5d7ee9bf50..c38f4d81fc 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/INDEX.H +++ b/Core/Libraries/Source/WWVegas/WWLib/INDEX.H @@ -48,10 +48,8 @@ * IndexClass::~IndexClass -- Destructor for index handler object. * * compfunc -- Support function for bsearch and bsort. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef INDEX_H -#define INDEX_H +#pragma once #include "BSEARCH.H" @@ -721,8 +719,3 @@ typename IndexClass::NodeElement const * IndexClass::Search_ return(Binary_Search(IndexTable, IndexCount, node)); // return((NodeElement const *)bsearch(&node, &IndexTable[0], IndexCount, sizeof(IndexTable[0]), search_compfunc)); } - - -#endif - - diff --git a/Core/Libraries/Source/WWVegas/WWLib/INI.H b/Core/Libraries/Source/WWVegas/WWLib/INI.H index 237825802f..dcfa6a631c 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/INI.H +++ b/Core/Libraries/Source/WWVegas/WWLib/INI.H @@ -36,9 +36,6 @@ #pragma once -#ifndef INI_H -#define INI_H - #include //#include "listnode.h" @@ -240,5 +237,3 @@ class INIClass { */ static bool KeepBlankEntries; }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.H b/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.H index 8efdc45d89..159552c1e1 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.H @@ -33,11 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once - -#ifndef LISTNODE_H -#define LISTNODE_H +#pragma once /* ** Includes @@ -319,6 +316,3 @@ public: SECONDARY Get_Secondary() { return SecondaryValue; }; void Unlink() { Primary.Unlink(); Secondary.Unlink(); }; }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/MPU.H b/Core/Libraries/Source/WWVegas/WWLib/MPU.H index 70ffd0bb8b..2321fdcff4 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/MPU.H +++ b/Core/Libraries/Source/WWVegas/WWLib/MPU.H @@ -33,14 +33,10 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef MPU_H -#define MPU_H +#pragma once unsigned long Get_CPU_Clock(unsigned long & high); unsigned long Get_CPU_Rate(unsigned long & high); int Get_RDTSC_CPU_Speed(void); - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/PIPE.H b/Core/Libraries/Source/WWVegas/WWLib/PIPE.H index 86b9ba2019..2c88d93a14 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/PIPE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/PIPE.H @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef PIPE_H -#define PIPE_H +#pragma once /* ** A "push through" pipe interface abstract class used for such purposes as compression @@ -71,5 +69,3 @@ class Pipe Pipe(Pipe & rvalue); Pipe & operator = (Pipe const & pipe); }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/Point.h b/Core/Libraries/Source/WWVegas/WWLib/Point.h index f8b4d2c286..888f15fdef 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/Point.h +++ b/Core/Libraries/Source/WWVegas/WWLib/Point.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef POINT_H -#define POINT_H +#pragma once template class TRect; @@ -199,6 +197,3 @@ TPoint3D const operator * (T lvalue, TPoint3D const & rvalue) ** integer 3D points. */ typedef TPoint3D Point3D; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.H b/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.H index 54cfbc3e17..583fa3716e 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.H @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef RAMFILE_H -#define RAMFILE_H +#pragma once #include "WWFILE.H" @@ -104,8 +103,3 @@ class RAMFileClass : public FileClass */ bool IsAllocated; }; - - - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/RANDOM.H b/Core/Libraries/Source/WWVegas/WWLib/RANDOM.H index 93c6aef09d..2f677888bf 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/RANDOM.H +++ b/Core/Libraries/Source/WWVegas/WWLib/RANDOM.H @@ -34,10 +34,8 @@ * Functions: * * Pick_Random_Number -- Picks a random number between two values (inclusive). * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef RANDOM_H -#define RANDOM_H +#pragma once // "unreferenced inline function has been removed" Yea, so what? #pragma warning(disable : 4514) @@ -264,5 +262,3 @@ int Pick_Random_Number(T & generator, int minval, int maxval) */ return(pick + minval); } - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H b/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H index 4f064ad511..b3ee84191a 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H @@ -37,10 +37,8 @@ * RawFileClass::~RawFileClass -- Default deconstructor for a file object. * * RawFileClass::Is_Open -- Checks to see if the file is open or not. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef RAWFILE_Hx -#define RAWFILE_Hx +#pragma once //#include @@ -150,5 +148,3 @@ class RawFileClass : public FileClass unsigned short Date; unsigned short Time; }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/SLIST.H b/Core/Libraries/Source/WWVegas/WWLib/SLIST.H index fd4eb72a8d..343d7105e7 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/SLIST.H +++ b/Core/Libraries/Source/WWVegas/WWLib/SLIST.H @@ -50,10 +50,8 @@ * SList::Add_Tail -- Adds a list to the tail of the list * * *SList::Find_Node -- returns first node in list matching the input * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef __SLIST_H__ -#define __SLIST_H__ +#pragma once #include "SLNODE.H" @@ -539,5 +537,3 @@ inline SLNode *SList::Find_Node(T * data) const return cur; } - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/SLNODE.H b/Core/Libraries/Source/WWVegas/WWLib/SLNODE.H index 518db63f5b..7c703ff5e3 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/SLNODE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/SLNODE.H @@ -31,10 +31,8 @@ *-------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef __SLNODE_H__ -#define __SLNODE_H__ +#pragma once #ifndef ALWAYS_H #include "always.h" @@ -115,5 +113,3 @@ class SLNode : public GenericSLNode private: SLNode(void) {}; }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/STRAW.H b/Core/Libraries/Source/WWVegas/WWLib/STRAW.H index a40081f767..f8c78699df 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/STRAW.H +++ b/Core/Libraries/Source/WWVegas/WWLib/STRAW.H @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef STRAW_H -#define STRAW_H +#pragma once /* ** This is a demand driven data carrier. It will retrieve the byte request by passing @@ -69,6 +67,3 @@ class Straw Straw(Straw & rvalue); Straw & operator = (Straw const & pipe); }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/Signaler.h b/Core/Libraries/Source/WWVegas/WWLib/Signaler.h index 6f05802614..073d032498 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/Signaler.h +++ b/Core/Libraries/Source/WWVegas/WWLib/Signaler.h @@ -37,8 +37,7 @@ * ******************************************************************************/ -#ifndef __SIGNALER_H__ -#define __SIGNALER_H__ +#pragma once template class Signaler { @@ -79,7 +78,3 @@ template class Signaler private: Signaler* mConnection; }; - -#endif // __SIGNALER_H__ - - diff --git a/Core/Libraries/Source/WWVegas/WWLib/TARGA.H b/Core/Libraries/Source/WWVegas/WWLib/TARGA.H index c4bf9f10b4..f0e082a3f2 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/TARGA.H +++ b/Core/Libraries/Source/WWVegas/WWLib/TARGA.H @@ -16,8 +16,8 @@ ** along with this program. If not, see . */ -#ifndef _TARGA_H_ -#define _TARGA_H_ +#pragma once + /**************************************************************************** * * C O N F I D E N T I A L --- W E S T W O O D S T U D I O S @@ -315,6 +315,3 @@ class Targa int File_Read(void *buffer, int size); int File_Write(void *buffer, int size); }; - -#endif /* _TARGA_H_ */ - diff --git a/Core/Libraries/Source/WWVegas/WWLib/Vector.H b/Core/Libraries/Source/WWVegas/WWLib/Vector.H index 713937e5d7..8fb1ce0ef3 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/Vector.H +++ b/Core/Libraries/Source/WWVegas/WWLib/Vector.H @@ -50,10 +50,8 @@ * DynamicVectorClass::Uninitialized_Add -- Add an empty place to the vector. * * DynamicVectorClass::Insert -- insert an object at the desired index * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef VECTOR_H -#define VECTOR_H +#pragma once #include "always.h" #include @@ -1118,5 +1116,3 @@ bool Pointer_Vector_Remove(T const * ptr, VectorClass & vec) #ifdef _MSC_VER #pragma warning (default : 4702) // unreachable code, happens with some uses of these templates #endif - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/WWCOMUtil.h b/Core/Libraries/Source/WWVegas/WWLib/WWCOMUtil.h index af4019e05c..079d3a40f3 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/WWCOMUtil.h +++ b/Core/Libraries/Source/WWVegas/WWLib/WWCOMUtil.h @@ -34,8 +34,7 @@ * ******************************************************************************/ -#ifndef __WWCOMUTIL_H__ -#define __WWCOMUTIL_H__ +#pragma once #include @@ -56,5 +55,3 @@ bool RegisterCOMServer(const char* dllName); //! Unregister COM in-process DLL server bool UnregisterCOMServer(const char* dllName); - -#endif // __WWCOMUTIL_H__ diff --git a/Core/Libraries/Source/WWVegas/WWLib/WWFILE.H b/Core/Libraries/Source/WWVegas/WWLib/WWFILE.H index 728e03ffdf..16b1bbfa0a 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/WWFILE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/WWFILE.H @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef WWFILE_Hx -#define WWFILE_Hx +#pragma once #define YEAR(dt) (((dt & 0xFE000000) >> (9 + 16)) + 1980) #define MONTH(dt) ((dt & 0x01E00000) >> (5 + 16)) @@ -103,5 +101,3 @@ class FileClass int Printf_Indented(unsigned depth, char *str, ...); }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/XPIPE.H b/Core/Libraries/Source/WWVegas/WWLib/XPIPE.H index e84894e648..4de1947bbc 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/XPIPE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/XPIPE.H @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef XPIPE_H -#define XPIPE_H +#pragma once #include "BUFF.H" #include "PIPE.H" @@ -88,5 +86,3 @@ class FilePipe : public Pipe FilePipe & operator = (FilePipe const & pipe); }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.H b/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.H index eb66748675..c5e64cfbb9 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.H +++ b/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.H @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef XSTRAW_H -#define XSTRAW_H +#pragma once #include "BUFF.H" #include "STRAW.H" @@ -85,6 +83,3 @@ class FileStraw : public Straw FileStraw(FileStraw & rvalue); FileStraw & operator = (FileStraw const & pipe); }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/always.h b/Core/Libraries/Source/WWVegas/WWLib/always.h index e1af2f2ca4..2f0382f0b6 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/always.h +++ b/Core/Libraries/Source/WWVegas/WWLib/always.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef ALWAYS_H -#define ALWAYS_H +#pragma once #include "WWCommon.h" #include "WWDefines.h" @@ -255,6 +253,3 @@ template T max(T a,T b) #ifndef size_of #define size_of(typ,id) sizeof(((typ*)0)->id) #endif - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/argv.h b/Core/Libraries/Source/WWVegas/WWLib/argv.h index b9c52b823f..d85ad4906f 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/argv.h +++ b/Core/Libraries/Source/WWVegas/WWLib/argv.h @@ -37,10 +37,6 @@ #pragma once - -#ifndef ARGV_H -#define ARGV_H - #ifndef ALWAYS_H #include "always.h" #endif @@ -155,6 +151,3 @@ class ArgvClass enum {MAX_ARGC = 256}; static char *Argv[MAX_ARGC]; }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h b/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h index 93a07900d5..7bec6900cc 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h +++ b/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef B64PIPE_H -#define B64PIPE_H +#pragma once #include "PIPE.H" @@ -87,5 +85,3 @@ class Base64Pipe : public Pipe Base64Pipe(Base64Pipe & rvalue); Base64Pipe & operator = (Base64Pipe const & pipe); }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/b64straw.h b/Core/Libraries/Source/WWVegas/WWLib/b64straw.h index 7b6483fc6f..8ec279e430 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/b64straw.h +++ b/Core/Libraries/Source/WWVegas/WWLib/b64straw.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef B64STRAW_H -#define B64STRAW_H +#pragma once #include "STRAW.H" @@ -85,6 +83,3 @@ class Base64Straw : public Straw Base64Straw(Base64Straw & rvalue); Base64Straw & operator = (Base64Straw const & pipe); }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/base64.h b/Core/Libraries/Source/WWVegas/WWLib/base64.h index 22ba629c4a..301249cd19 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/base64.h +++ b/Core/Libraries/Source/WWVegas/WWLib/base64.h @@ -33,6 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once int Base64_Encode(void const * source, int slen, void * dest, int dlen); diff --git a/Core/Libraries/Source/WWVegas/WWLib/bfiofile.h b/Core/Libraries/Source/WWVegas/WWLib/bfiofile.h index 2955e054b7..be591c8b47 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/bfiofile.h +++ b/Core/Libraries/Source/WWVegas/WWLib/bfiofile.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef BFIOFILE_H -#define BFIOFILE_H +#pragma once #include "RAWFILE.H" @@ -92,5 +91,3 @@ class BufferIOFileClass : public RawFileClass long FilePos; long TrueFileStart; }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/binheap.h b/Core/Libraries/Source/WWVegas/WWLib/binheap.h index 31eafc978e..fa4aa9447a 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/binheap.h +++ b/Core/Libraries/Source/WWVegas/WWLib/binheap.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef BINARY_HEAP_CLASS_H -#define BINARY_HEAP_CLASS_H +#pragma once /*=============================================================================================*/ // Includes. @@ -314,6 +313,3 @@ class BinaryHeapClass // binary tree. bool Own_Array; }; - - -#endif //BINARY_HEAP_CLASS_H diff --git a/Core/Libraries/Source/WWVegas/WWLib/bittype.h b/Core/Libraries/Source/WWVegas/WWLib/bittype.h index d20c80ed24..fb16c80172 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/bittype.h +++ b/Core/Libraries/Source/WWVegas/WWLib/bittype.h @@ -34,10 +34,8 @@ *-------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef BITTYPE_H -#define BITTYPE_H +#pragma once typedef unsigned char uint8; typedef unsigned short uint16; @@ -67,5 +65,3 @@ typedef unsigned short wchar_t; #define _WCHAR_T_DEFINED #endif #endif - -#endif //BITTYPE_H diff --git a/Core/Libraries/Source/WWVegas/WWLib/bound.h b/Core/Libraries/Source/WWVegas/WWLib/bound.h index 22becc01de..8f526382a5 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/bound.h +++ b/Core/Libraries/Source/WWVegas/WWLib/bound.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef BOUND_H -#define BOUND_H +#pragma once template inline T Bound(T original, T minval, T maxval) @@ -53,7 +51,3 @@ T Bound(T original, T minval, T maxval) //float Bound(float, float, float); //double Bound(double, double, double); #endif - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWLib/bufffile.h b/Core/Libraries/Source/WWVegas/WWLib/bufffile.h index 4de9d659db..ddb6561278 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/bufffile.h +++ b/Core/Libraries/Source/WWVegas/WWLib/bufffile.h @@ -40,9 +40,6 @@ #pragma once -#ifndef BUFFFILE_H -#define BUFFFILE_H - #include "RAWFILE.H" @@ -79,5 +76,3 @@ class BufferedFileClass : public RawFileClass int BufferOffset; // The data already given out static int _DesiredBufferSize; }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/chunkio.h b/Core/Libraries/Source/WWVegas/WWLib/chunkio.h index e77d894625..47ce699b02 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/chunkio.h +++ b/Core/Libraries/Source/WWVegas/WWLib/chunkio.h @@ -34,10 +34,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef CHUNKIO_H -#define CHUNKIO_H +#pragma once #ifndef ALWAYS_H #include "always.h" @@ -372,7 +370,3 @@ class ChunkLoadClass */ #define OBSOLETE_MICRO_CHUNK(id) \ case (id): break; - - - -#endif // CHUNKIO_H diff --git a/Core/Libraries/Source/WWVegas/WWLib/cpudetect.h b/Core/Libraries/Source/WWVegas/WWLib/cpudetect.h index 0b7efd8996..76389cd91c 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/cpudetect.h +++ b/Core/Libraries/Source/WWVegas/WWLib/cpudetect.h @@ -38,9 +38,6 @@ #pragma once -#ifndef WWLIB_CPU_DETECT_H__ -#define WWLIB_CPU_DETECT_H__ - #include "always.h" #include "wwstring.h" @@ -320,6 +317,3 @@ struct CPUIDStruct CPUDetectClass::CPUID(Eax,Ebx,Ecx,Edx,cpuid_type); } }; - - -#endif // WWLIB_CPU_DETECT_H__ diff --git a/Core/Libraries/Source/WWVegas/WWLib/crandom.h b/Core/Libraries/Source/WWVegas/WWLib/crandom.h index 02667d8121..a383ae725a 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/crandom.h +++ b/Core/Libraries/Source/WWVegas/WWLib/crandom.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef CRANDOM_H -#define CRANDOM_H +#pragma once #ifndef ALWAYS_H #include "always.h" @@ -119,5 +118,3 @@ inline float CRandom::Get_Float( float min, float max ) ** be synced between other computers. Good for simple visual and sound effects. */ extern CRandom FreeRandom; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/crcpipe.h b/Core/Libraries/Source/WWVegas/WWLib/crcpipe.h index d709ae0bb0..b281ef33d2 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/crcpipe.h +++ b/Core/Libraries/Source/WWVegas/WWLib/crcpipe.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef CRCPIPE_H -#define CRCPIPE_H +#pragma once #include "CRC.H" #include "PIPE.H" @@ -60,5 +59,3 @@ class CRCPipe : public Pipe CRCPipe(CRCPipe & rvalue); CRCPipe & operator = (CRCPipe const & pipe); }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/crcstraw.h b/Core/Libraries/Source/WWVegas/WWLib/crcstraw.h index 6e0fa59678..9fac57cd0a 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/crcstraw.h +++ b/Core/Libraries/Source/WWVegas/WWLib/crcstraw.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef CRCSTRAW_H -#define CRCSTRAW_H +#pragma once #include "CRC.H" #include "STRAW.H" @@ -60,6 +59,3 @@ class CRCStraw : public Straw CRCStraw(CRCStraw & rvalue); CRCStraw & operator = (CRCStraw const & pipe); }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/cstraw.h b/Core/Libraries/Source/WWVegas/WWLib/cstraw.h index 146bba873a..1b775f38e6 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/cstraw.h +++ b/Core/Libraries/Source/WWVegas/WWLib/cstraw.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef CSTRAW_H -#define CSTRAW_H +#pragma once #include "BUFF.H" #include "STRAW.H" @@ -63,8 +61,3 @@ class CacheStraw : public Straw CacheStraw(CacheStraw & rvalue); CacheStraw & operator = (CacheStraw const & pipe); }; - - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWLib/ffactory.h b/Core/Libraries/Source/WWVegas/WWLib/ffactory.h index 706461fc38..7ecc2b6b81 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/ffactory.h +++ b/Core/Libraries/Source/WWVegas/WWLib/ffactory.h @@ -36,9 +36,6 @@ #pragma once -#ifndef FFACTORY_H -#define FFACTORY_H - #ifndef ALWAYS_H #include "always.h" #endif @@ -157,5 +154,3 @@ extern RawFileFactoryClass * _TheWritingFileFactory; // No simple file factory. jba. // (gth) re-enabling this because w3d view uses it extern SimpleFileFactoryClass * _TheSimpleFileFactory; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/gcd_lcm.h b/Core/Libraries/Source/WWVegas/WWLib/gcd_lcm.h index 0b1c3b5b56..e5ce3b0225 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/gcd_lcm.h +++ b/Core/Libraries/Source/WWVegas/WWLib/gcd_lcm.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef GCD_LCM_H -#define GCD_LCM_H +#pragma once #include "always.h" @@ -47,5 +45,3 @@ unsigned int Greatest_Common_Divisor(unsigned int a, unsigned int b); // The least common multiple (LCM) is the least integer of which given // positive integers are divisors. unsigned int Least_Common_Multiple(unsigned int a, unsigned int b); - -#endif // GCD_LCM_H diff --git a/Core/Libraries/Source/WWVegas/WWLib/hash.h b/Core/Libraries/Source/WWVegas/WWLib/hash.h index d43f3b7c57..c91e48c511 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/hash.h +++ b/Core/Libraries/Source/WWVegas/WWLib/hash.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef HASH_H -#define HASH_H - #include "always.h" class HashTableIteratorClass; @@ -113,6 +109,3 @@ class HashTableIteratorClass void Advance_Next( void ); }; - - -#endif // HASH_H diff --git a/Core/Libraries/Source/WWVegas/WWLib/hashcalc.h b/Core/Libraries/Source/WWVegas/WWLib/hashcalc.h index 97f303027e..a01fbf08ff 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/hashcalc.h +++ b/Core/Libraries/Source/WWVegas/WWLib/hashcalc.h @@ -33,12 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once - - -#ifndef HASHCALC_H -#define HASHCALC_H +#pragma once /* ** HashCalculatorClass @@ -66,7 +62,3 @@ template class HashCalculatorClass virtual int Num_Hash_Values(void) = 0; virtual int Get_Hash_Value(int index = 0) = 0; }; - - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/hashtab.h b/Core/Libraries/Source/WWVegas/WWLib/hashtab.h index ced524f0bb..7a66ce6bbc 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/hashtab.h +++ b/Core/Libraries/Source/WWVegas/WWLib/hashtab.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef HASHTAB_H -#define HASHTAB_H +#pragma once #if 0 @@ -121,7 +120,3 @@ Object * HashTableClass::Find(Key * key) const } #endif - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWLib/hashtemplate.h b/Core/Libraries/Source/WWVegas/WWLib/hashtemplate.h index fdd230d36b..79de6a2cad 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/hashtemplate.h +++ b/Core/Libraries/Source/WWVegas/WWLib/hashtemplate.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef HASH_TEMPLATE_H -#define HASH_TEMPLATE_H - #include "always.h" #include "wwstring.h" @@ -423,7 +419,3 @@ template <> inline unsigned int HashTemplateKeyClass::Get_Hash_Valu hval = hval + (hval>>5) + (hval>>10) + (hval >> 20); return hval; } - - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/incdec.h b/Core/Libraries/Source/WWVegas/WWLib/incdec.h index 8ce539067b..e8e8ae76ed 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/incdec.h +++ b/Core/Libraries/Source/WWVegas/WWLib/incdec.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef INCDEC_H -#define INCDEC_H +#pragma once /* ** These templates allow enumeration types to have simple bitwise @@ -64,5 +63,3 @@ template inline T operator --(T & a, int) a = (T)((int)a - (int)1); return(aa); } - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/inisup.h b/Core/Libraries/Source/WWVegas/WWLib/inisup.h index 5b5fbe8861..a93725e2a8 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/inisup.h +++ b/Core/Libraries/Source/WWVegas/WWLib/inisup.h @@ -33,8 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once +#pragma once /* ** This header defines generally unused member structures used by the INI class. diff --git a/Core/Libraries/Source/WWVegas/WWLib/iostruct.h b/Core/Libraries/Source/WWVegas/WWLib/iostruct.h index 666a192a9d..60f4b2cf4e 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/iostruct.h +++ b/Core/Libraries/Source/WWVegas/WWLib/iostruct.h @@ -36,9 +36,6 @@ #pragma once -#ifndef IOSTRUCT_H -#define IOSTRUCT_H - #ifndef BITTYPE_H #include "bittype.h" #endif @@ -72,8 +69,3 @@ struct IOQuaternionStruct { float32 Q[4]; }; - - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzo.h b/Core/Libraries/Source/WWVegas/WWLib/lzo.h index 8c47381a58..afecc22791 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzo.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzo.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef _LZO_H -#define _LZO_H +#pragma once #include "lzoconf.h" #include "lzo1x.h" @@ -100,7 +99,3 @@ class LZOCompressor static lzo_byte WorkBuffer[LZO1X_MEM_COMPRESS + 1]; static lzo_byte * EOWorkBuffer; }; - - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzo1x.h b/Core/Libraries/Source/WWVegas/WWLib/lzo1x.h index 2e7507c4bf..cae5f0e368 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzo1x.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzo1x.h @@ -59,9 +59,7 @@ markus.oberhumer@jk.uni-linz.ac.at */ - -#ifndef __LZO1X_H -#define __LZO1X_H +#pragma once #include "lzoconf.h" @@ -121,8 +119,6 @@ lzo1x_999_compress ( const lzo_byte *src, lzo_uint src_len, //} /* extern "C" */ //#endif -#endif /* already included */ - /* vi:ts=4 */ diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzo_conf.h b/Core/Libraries/Source/WWVegas/WWLib/lzo_conf.h index b6be1cfb92..8dfc79c325 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzo_conf.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzo_conf.h @@ -65,9 +65,7 @@ to change. */ - -#ifndef __LZO_CONF_H -#define __LZO_CONF_H +#pragma once #ifndef __LZOCONF_H # include "lzoconf.h" @@ -296,9 +294,6 @@ -#endif /* already included */ - /* vi:ts=4 */ - diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzoconf.h b/Core/Libraries/Source/WWVegas/WWLib/lzoconf.h index 60abbe6a52..b3bf5e85e9 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzoconf.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzoconf.h @@ -59,9 +59,7 @@ markus.oberhumer@jk.uni-linz.ac.at */ - -#ifndef __LZOCONF_H -#define __LZOCONF_H +#pragma once #define LZO_VERSION 0x0200 #define LZO_VERSION_STRING "0.20" @@ -228,8 +226,6 @@ LZO_EXTERN(int) _lzo_config_check(void); //} /* extern "C" */ //#endif -#endif /* already included */ - /* vi:ts=4 */ diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzopipe.h b/Core/Libraries/Source/WWVegas/WWLib/lzopipe.h index 7422c66d1d..5ec7ce525f 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzopipe.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzopipe.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef LZOPIPE_H -#define LZOPIPE_H +#pragma once #include "PIPE.H" @@ -97,6 +96,3 @@ class LZOPipe : public Pipe LZOPipe(LZOPipe & rvalue); LZOPipe & operator = (LZOPipe const & pipe); }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzostraw.h b/Core/Libraries/Source/WWVegas/WWLib/lzostraw.h index 9e9c4e17cd..aa44453786 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzostraw.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzostraw.h @@ -34,9 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef LZOSTRAW_H -#define LZOSTRAW_H - +#pragma once #include "STRAW.H" @@ -98,6 +96,3 @@ class LZOStraw : public Straw LZOStraw(LZOStraw & rvalue); LZOStraw & operator = (LZOStraw const & pipe); }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/mempool.h b/Core/Libraries/Source/WWVegas/WWLib/mempool.h index 6909818dd9..3eae0cf003 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/mempool.h +++ b/Core/Libraries/Source/WWVegas/WWLib/mempool.h @@ -42,12 +42,8 @@ * AutoPoolClass::operator delete -- overriden delete which calls the internal ObjectPool * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef MEMPOOL_H -#define MEMPOOL_H - #include "bittype.h" #include "wwdebug.h" #include "mutex.h" @@ -371,7 +367,3 @@ void AutoPoolClass::operator delete( void * memory ) if ( memory == 0 ) return; Allocator.Free_Object_Memory((T*)memory); } - - - -#endif // MEMPOOL_H diff --git a/Core/Libraries/Source/WWVegas/WWLib/mmsys.h b/Core/Libraries/Source/WWVegas/WWLib/mmsys.h index 7b804ded07..caf5335dc0 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/mmsys.h +++ b/Core/Libraries/Source/WWVegas/WWLib/mmsys.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef MMSYS_H -#define MMSYS_H +#pragma once /* ** This header just includes mmsystem.h with warning 4201 disabled @@ -45,5 +43,3 @@ #pragma warning(disable:4201) #include #pragma warning(default:4201) - -#endif // MMSYS_H diff --git a/Core/Libraries/Source/WWVegas/WWLib/multilist.h b/Core/Libraries/Source/WWVegas/WWLib/multilist.h index 23cb383ca8..f99c5613e5 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/multilist.h +++ b/Core/Libraries/Source/WWVegas/WWLib/multilist.h @@ -36,12 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef MULTILIST_H -#define MULTILIST_H - #include "always.h" #include "mempool.h" #include @@ -528,7 +524,3 @@ class PriorityMultiListIterator : public MultiListIterator MultiListNodeClass * OriginalHead; }; - - -#endif //LIST_CLASS_H - diff --git a/Core/Libraries/Source/WWVegas/WWLib/mutex.h b/Core/Libraries/Source/WWVegas/WWLib/mutex.h index 58f04872e5..cce5055f47 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/mutex.h +++ b/Core/Libraries/Source/WWVegas/WWLib/mutex.h @@ -16,9 +16,6 @@ ** along with this program. If not, see . */ -#ifndef MUTEX_H -#define MUTEX_H - #pragma once #include "always.h" @@ -203,5 +200,3 @@ class FastCriticalSectionClass friend class LockClass; }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/noinit.h b/Core/Libraries/Source/WWVegas/WWLib/noinit.h index efa714de2c..dfbe3b1573 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/noinit.h +++ b/Core/Libraries/Source/WWVegas/WWLib/noinit.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef NOINIT_H -#define NOINIT_H +#pragma once /********************************************************************** ** This class is solely used as a parameter to a constructor that does @@ -52,6 +51,3 @@ class NoInitClass { void operator () (void) const {}; }; #endif - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/notifier.h b/Core/Libraries/Source/WWVegas/WWLib/notifier.h index 696224bcd2..037dceb2c4 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/notifier.h +++ b/Core/Libraries/Source/WWVegas/WWLib/notifier.h @@ -35,8 +35,7 @@ * 06/28/02 KM Notify name change to avoid MAX conflicts * ******************************************************************************/ -#ifndef __NOTIFY_H__ -#define __NOTIFY_H__ +#pragma once // Reduce warning level for STL #if defined(_MSC_VER) @@ -272,5 +271,3 @@ class TypedEventPair A mItemA; B mItemB; }; - -#endif // __NOTIFY_H__ diff --git a/Core/Libraries/Source/WWVegas/WWLib/nstrdup.h b/Core/Libraries/Source/WWVegas/WWLib/nstrdup.h index 5cf3e1dfe2..5419dc2177 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/nstrdup.h +++ b/Core/Libraries/Source/WWVegas/WWLib/nstrdup.h @@ -36,9 +36,4 @@ #pragma once -#ifndef __NSTRDUP_H__ -#define __NSTRDUP_H__ - char * nstrdup(const char *str); - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/ntree.h b/Core/Libraries/Source/WWVegas/WWLib/ntree.h index 2ac6f52051..8aa9e1a621 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/ntree.h +++ b/Core/Libraries/Source/WWVegas/WWLib/ntree.h @@ -34,13 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __NTREE_H -#define __NTREE_H - - #include "refcount.h" #include "wwstring.h" @@ -562,5 +557,3 @@ void SortedNTreeLeafClass::Insertion_Sort (SortedNTreeLeafClass *start, So return ; } - -#endif //__NTREE_H diff --git a/Core/Libraries/Source/WWVegas/WWLib/rcfile.h b/Core/Libraries/Source/WWVegas/WWLib/rcfile.h index fe9f45fe6e..6a91465f53 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/rcfile.h +++ b/Core/Libraries/Source/WWVegas/WWLib/rcfile.h @@ -36,9 +36,6 @@ #pragma once -#ifndef RCFILE_H -#define RCFILE_H - #include "always.h" #include "WWFILE.H" #include "win.h" @@ -89,6 +86,3 @@ class ResourceFileClass : public FileClass unsigned char * EndOfFile; }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/readline.h b/Core/Libraries/Source/WWVegas/WWLib/readline.h index 6d25aa9c62..3fbda10412 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/readline.h +++ b/Core/Libraries/Source/WWVegas/WWLib/readline.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef READLINE_H -#define READLINE_H +#pragma once #include "STRAW.H" #include "WWFILE.H" @@ -45,5 +43,3 @@ int Read_Line(FileClass & file, char * buffer, int len, bool & eof); int Read_Line(Straw & file, char * buffer, int len, bool & eof); int Read_Line(Straw & file, wchar_t * buffer, int len, bool & eof); - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/realcrc.h b/Core/Libraries/Source/WWVegas/WWLib/realcrc.h index 884afe8a7e..c858e5f583 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/realcrc.h +++ b/Core/Libraries/Source/WWVegas/WWLib/realcrc.h @@ -33,15 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once - -#ifndef REALCRC_H -#define REALCRC_H +#pragma once unsigned long CRC_Memory( const unsigned char *data, unsigned long length, unsigned long crc = 0 ); unsigned long CRC_String( const char *string, unsigned long crc = 0 ); unsigned long CRC_Stringi( const char *string, unsigned long crc = 0 ); - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h b/Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h index cecd2cb670..fa2a880f37 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h +++ b/Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef REF_PTR_H -#define REF_PTR_H - #ifndef ALWAYS_H #include "always.h" #endif @@ -450,5 +446,3 @@ RefCountPtr Static_Cast(const RefCountPtr & base) { return RefCountPtr::Create_AddRef((Derived *)base.Peek()); } - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/refcount.h b/Core/Libraries/Source/WWVegas/WWLib/refcount.h index e20f77709e..7ebe68b9f4 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/refcount.h +++ b/Core/Libraries/Source/WWVegas/WWLib/refcount.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef REFCOUNT_H -#define REFCOUNT_H +#pragma once #ifndef ALWAYS_H #include "always.h" @@ -327,6 +325,3 @@ class RefCountValue mutable IntegerType NumRefs; }; - - -#endif // REFCOUNT_H diff --git a/Core/Libraries/Source/WWVegas/WWLib/regexpr.h b/Core/Libraries/Source/WWVegas/WWLib/regexpr.h index 34543f49e4..307ae03974 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/regexpr.h +++ b/Core/Libraries/Source/WWVegas/WWLib/regexpr.h @@ -20,10 +20,6 @@ #pragma once -#ifndef REGEXPR_H -#define REGEXPR_H - - /* ** RegularExpressionClass - This class encapsulates regular expression ** evaluation. It provides a nice and simple wrapper around the @@ -74,7 +70,3 @@ class RegularExpressionClass struct DataStruct; DataStruct *Data; }; - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWLib/registry.h b/Core/Libraries/Source/WWVegas/WWLib/registry.h index 896f2622e2..277058a9c4 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/registry.h +++ b/Core/Libraries/Source/WWVegas/WWLib/registry.h @@ -35,9 +35,6 @@ #pragma once -#ifndef REGISTRY_H -#define REGISTRY_H - #ifndef ALWAYS_H #include "always.h" #endif @@ -121,5 +118,3 @@ class RegistryClass { // static bool IsLocked; }; - -#endif // REGISTRY_H diff --git a/Core/Libraries/Source/WWVegas/WWLib/search.h b/Core/Libraries/Source/WWVegas/WWLib/search.h index c2c4beb189..0e8bc9c18a 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/search.h +++ b/Core/Libraries/Source/WWVegas/WWLib/search.h @@ -49,8 +49,7 @@ * compfunc -- Support function for bsearch and bsort. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef SEARCH_H -#define SEARCH_H +#pragma once /* ** The "bool" integral type was defined by the C++ comittee in @@ -692,8 +691,3 @@ IndexClass::NodeElement const * IndexClass::Search_For_Node(int id) const node.ID = id; return((NodeElement const *)bsearch(&node, &IndexTable[0], IndexCount, sizeof(IndexTable[0]), search_compfunc)); } - - -#endif - - diff --git a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h index d407c05d54..ce8fcf8584 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h +++ b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h @@ -33,10 +33,9 @@ *-------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once -#ifndef SHAREBUF_H -#define SHAREBUF_H #include "refcount.h" @@ -142,6 +141,3 @@ void ShareBufferClass::Clear(void) { memset(Array,0,Count * sizeof(T)); } - - -#endif // SHAREBUF_H diff --git a/Core/Libraries/Source/WWVegas/WWLib/simplevec.h b/Core/Libraries/Source/WWVegas/WWLib/simplevec.h index 0b0cb4387f..15be28017f 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/simplevec.h +++ b/Core/Libraries/Source/WWVegas/WWLib/simplevec.h @@ -49,9 +49,6 @@ #pragma once -#ifndef SIMPLEVEC_H -#define SIMPLEVEC_H - #include "always.h" #include #include // for memmove @@ -637,6 +634,3 @@ inline int SimpleDynVecClass::Find_Index(T const & object) #if (_MSC_VER >= 1200) #pragma warning (pop) #endif - -#endif // SIMPLEVEC_H - diff --git a/Core/Libraries/Source/WWVegas/WWLib/stimer.h b/Core/Libraries/Source/WWVegas/WWLib/stimer.h index 00d79ae882..54d080ba41 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/stimer.h +++ b/Core/Libraries/Source/WWVegas/WWLib/stimer.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef STIMER_H -#define STIMER_H +#pragma once /**************************************************************************** ** Timer constants. These are used when setting the countdown timer. @@ -61,5 +60,3 @@ class SystemTimerClass long operator () (void) const; operator long (void) const; }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/strtok_r.h b/Core/Libraries/Source/WWVegas/WWLib/strtok_r.h index e2ba1a177a..0d0d22d691 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/strtok_r.h +++ b/Core/Libraries/Source/WWVegas/WWLib/strtok_r.h @@ -36,11 +36,6 @@ #pragma once -#ifndef __STRTOK_R_H__ -#define __STRTOK_R_H__ - #ifndef _UNIX char *strtok_r(char *strptr, const char *delimiters, char **lasts); #endif - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/swap.h b/Core/Libraries/Source/WWVegas/WWLib/swap.h index 23587a32cf..b0a61e46c9 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/swap.h +++ b/Core/Libraries/Source/WWVegas/WWLib/swap.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef SWAP_H -#define SWAP_H +#pragma once /********************************************************************** ** Swaps two objects. @@ -48,5 +47,3 @@ void swap(T & left, T & right) left = right; right = temp; } - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/systimer.h b/Core/Libraries/Source/WWVegas/WWLib/systimer.h index 64b690fb9c..56db4c64b2 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/systimer.h +++ b/Core/Libraries/Source/WWVegas/WWLib/systimer.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #ifndef _SYSTIMER_H #include "always.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/textfile.h b/Core/Libraries/Source/WWVegas/WWLib/textfile.h index be9a385a01..11027774c3 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/textfile.h +++ b/Core/Libraries/Source/WWVegas/WWLib/textfile.h @@ -34,10 +34,6 @@ #pragma once -#ifndef __TEXT_FILE_H -#define __TEXT_FILE_H - - #include "RAWFILE.H" /////////////////////////////////////////////////////////////////////////////// @@ -77,7 +73,3 @@ class TextFileClass : public RawFileClass bool Read_Line (StringClass &string); bool Write_Line (const StringClass &string); }; - - -#endif //__TEXT_FILE_H - diff --git a/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.h b/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.h index 140db5f9ab..778b5934a3 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.h +++ b/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef TGATODXT_H -#define TGATODXT_H +#pragma once #pragma message ("(gth) disabling TGAtoDXTClass temporarily so I can test the WW libs merge...") #if 0 @@ -81,5 +80,3 @@ class TGAToDXTClass extern TGAToDXTClass _TGAToDXTConverter; #endif //0 - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/thread.h b/Core/Libraries/Source/WWVegas/WWLib/thread.h index 246bb9aa59..c55665a3cb 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/thread.h +++ b/Core/Libraries/Source/WWVegas/WWLib/thread.h @@ -16,9 +16,6 @@ ** along with this program. If not, see . */ -#ifndef THREAD_H -#define THREAD_H - #pragma once #include "always.h" @@ -97,5 +94,3 @@ class ThreadClass volatile unsigned long handle; int thread_priority; }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/trect.h b/Core/Libraries/Source/WWVegas/WWLib/trect.h index 5c3438f06c..b302888f5f 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/trect.h +++ b/Core/Libraries/Source/WWVegas/WWLib/trect.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef TRECT_H -#define TRECT_H +#pragma once #include "Point.h" @@ -217,7 +215,3 @@ TPoint2D const TPoint2D::Bias_To(TRect const & rect) const ** is composed of integers. */ typedef TRect Rect; - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWLib/trim.h b/Core/Libraries/Source/WWVegas/WWLib/trim.h index 770741601e..cdb550eaa9 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/trim.h +++ b/Core/Libraries/Source/WWVegas/WWLib/trim.h @@ -33,14 +33,10 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef TRIM_H -#define TRIM_H +#pragma once #include char * strtrim(char * buffer); wchar_t * wcstrim(wchar_t * buffer); - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/uarray.h b/Core/Libraries/Source/WWVegas/WWLib/uarray.h index 373bb59080..26904fcfe6 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/uarray.h +++ b/Core/Libraries/Source/WWVegas/WWLib/uarray.h @@ -36,10 +36,8 @@ * UniqueArrayClass::~UniqueArrayClass -- destructor * * UniqueArrayClass::Add -- Add an item to the array * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef UARRAY_H -#define UARRAY_H +#pragma once #ifndef HASHCALC_H #include "hashcalc.h" @@ -218,7 +216,3 @@ inline int UniqueArrayClass::Add(const T & new_item) return index; } - - -#endif // UARRAY_H - diff --git a/Core/Libraries/Source/WWVegas/WWLib/verchk.h b/Core/Libraries/Source/WWVegas/WWLib/verchk.h index 329e0fad99..2dbebead96 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/verchk.h +++ b/Core/Libraries/Source/WWVegas/WWLib/verchk.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __VERCHK_H -#define __VERCHK_H - #include // Obtain version information from the specified file. @@ -61,7 +57,3 @@ bool GetFileCreationTime(char* filename, FILETIME* createTime); // //////////////////////////////////////////////////////////////////////// int Compare_EXE_Version (int app_instance, const char *filename); - - -#endif //__VERCHK_H - diff --git a/Core/Libraries/Source/WWVegas/WWLib/visualc.h b/Core/Libraries/Source/WWVegas/WWLib/visualc.h index dbce128d2f..a400314d91 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/visualc.h +++ b/Core/Libraries/Source/WWVegas/WWLib/visualc.h @@ -33,6 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once #if defined(_MSC_VER) diff --git a/Core/Libraries/Source/WWVegas/WWLib/widestring.h b/Core/Libraries/Source/WWVegas/WWLib/widestring.h index ebba61df5b..9790e4a305 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/widestring.h +++ b/Core/Libraries/Source/WWVegas/WWLib/widestring.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __WIDESTRING_H -#define __WIDESTRING_H - #include #include #include "always.h" @@ -776,6 +773,3 @@ WideStringClass::Convert_To (StringClass &string) const { return (string.Copy_Wide (m_Buffer)); } - -#endif //__WIDESTRING_H - diff --git a/Core/Libraries/Source/WWVegas/WWLib/win.h b/Core/Libraries/Source/WWVegas/WWLib/win.h index 61b00ce05e..70ef32dc39 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/win.h +++ b/Core/Libraries/Source/WWVegas/WWLib/win.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef WIN_H -#define WIN_H +#pragma once /* ** This header file includes the Windows headers. If there are any special pragmas that need @@ -86,5 +84,3 @@ void __cdecl Print_Win32Error(unsigned long win32Error); #else // _WIN32 //#include // file does not exist #endif // _WIN32 - -#endif // WIN_H diff --git a/Core/Libraries/Source/WWVegas/WWLib/wwstring.h b/Core/Libraries/Source/WWVegas/WWLib/wwstring.h index 70d04b9c8b..1f30ccec7c 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/wwstring.h +++ b/Core/Libraries/Source/WWVegas/WWLib/wwstring.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __WWSTRING_H -#define __WWSTRING_H - #include "always.h" #include "mutex.h" #include "win.h" @@ -776,6 +773,3 @@ StringClass::Store_Length (int length) return ; } - -#endif //__WWSTRING_H - diff --git a/Core/Libraries/Source/WWVegas/WWMath/Vector3i.h b/Core/Libraries/Source/WWVegas/WWMath/Vector3i.h index c12ac8a4cc..d91f87b6c4 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/Vector3i.h +++ b/Core/Libraries/Source/WWVegas/WWMath/Vector3i.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef VECTOR3I_H -#define VECTOR3I_H - #include "always.h" class Vector3i @@ -137,5 +133,3 @@ WWINLINE unsigned short & Vector3i16::operator[] (int n) { return ((unsigned short *)this)[n]; } - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/aabox.h b/Core/Libraries/Source/WWVegas/WWMath/aabox.h index 6ab65a7f5c..eb0b29669f 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/aabox.h +++ b/Core/Libraries/Source/WWVegas/WWMath/aabox.h @@ -54,9 +54,6 @@ #pragma once -#ifndef AABOX_H -#define AABOX_H - #include "always.h" #include "matrix3d.h" #include "lineseg.h" @@ -672,6 +669,3 @@ WWINLINE void MinMaxAABoxClass::Translate(const Vector3 & pos) MinCorner+=pos; MaxCorner+=pos; } - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h b/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h index f8b2498f81..7d0928bc5a 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h +++ b/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef AABTREECULL_H -#define AABTREECULL_H - #include "cullsys.h" #include "aaplane.h" #include "wwmath.h" @@ -335,8 +331,3 @@ class AABTreeLinkClass : public CullLinkClass, public AutoPoolClassSet(0,0,0); (*normal)[Normal] = 1.0f; } - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h index 2e03b4881d..504429dc53 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef CARDINALSPLINE_H -#define CARDINALSPLINE_H - #include "hermitespline.h" /** @@ -96,7 +92,3 @@ class CardinalSpline1DClass : public HermiteSpline1DClass DynamicVectorClass Tightness; }; - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWMath/castres.h b/Core/Libraries/Source/WWVegas/WWMath/castres.h index f33b444bf7..69a577df6f 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/castres.h +++ b/Core/Libraries/Source/WWVegas/WWMath/castres.h @@ -36,9 +36,6 @@ #pragma once -#ifndef CASTRES_H -#define CASTRES_H - #include "always.h" #include "vector3.h" #include "bittype.h" @@ -68,6 +65,3 @@ struct CastResultStruct Vector3 ContactPoint; // This will be set to the point of collision if ComputeContactPoint is true }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h b/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h index dee3486755..e970ece445 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef CATMULLROMSPLINE_H -#define CATMULLROMSPLINE_H - #include "hermitespline.h" /** @@ -72,5 +68,3 @@ class CatmullRomSpline1DClass : public HermiteSpline1DClass virtual bool Save(ChunkSaveClass &csave); virtual bool Load(ChunkLoadClass &cload); }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmath.h b/Core/Libraries/Source/WWVegas/WWMath/colmath.h index 21d68c51ac..5c7d999a66 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmath.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmath.h @@ -36,9 +36,6 @@ #pragma once -#ifndef COLMATH_H -#define COLMATH_H - #ifndef ALWAYS_H #include "always.h" #endif @@ -306,5 +303,3 @@ inline CollisionMath::OverlapType CollisionMath::eval_overlap_collision(const Ca #define TRACK_COLLISION_OBBOX_OBBOX #define TRACK_COLLISION_OBBOX_OBBOX_HIT #endif - -#endif // COLMATH_H diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.h b/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.h index 94a52dc404..70b8c50c0b 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.h @@ -40,9 +40,6 @@ #pragma once -#ifndef COLMATHAABOX_H -#define COLMATHAABOX_H - #include "always.h" #include "aabox.h" #include "vector3.h" @@ -103,6 +100,3 @@ WWINLINE CollisionMath::OverlapType CollisionMath::Overlap_Test(const AABoxClass return BOTH; } - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.h b/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.h index a45efcfaa1..528ac9b688 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.h @@ -39,9 +39,6 @@ #pragma once -#ifndef COLMATHFRUSTUM_H -#define COLMATHFRUSTUM_H - #include "always.h" #include "aabox.h" #include "vector3.h" @@ -99,5 +96,3 @@ CollisionMath::Overlap_Test(const FrustumClass & frustum,const AABoxClass & box, } return OVERLAPPED; } - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathinlines.h b/Core/Libraries/Source/WWVegas/WWMath/colmathinlines.h index 171d59ee0a..d06e715bea 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathinlines.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathinlines.h @@ -38,14 +38,7 @@ #pragma once -#ifndef COLMATHINLINES_H -#define COLMATHINLINES_H - #include "colmathaabox.h" #include "colmathfrustum.h" #include "colmathline.h" #include "colmathplane.h" - -#endif - - diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathline.h b/Core/Libraries/Source/WWVegas/WWMath/colmathline.h index d2a890de2b..3dd52c2ebb 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathline.h @@ -36,8 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef COLMATHLINE_H -#define COLMATHLINE_H +#pragma once /* ** Inline collision functions dealing with line segments @@ -55,10 +54,3 @@ inline CollisionMath::OverlapType CollisionMath::Overlap_Test box.Init_Min_Max(min,max); return CollisionMath::Overlap_Test(box,line); } - - - - -#endif - - diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathplane.h b/Core/Libraries/Source/WWVegas/WWMath/colmathplane.h index 28d1e78c7c..dcf0027ec5 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathplane.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathplane.h @@ -39,9 +39,7 @@ * CollisionMath::Overlap_Test -- Tests overlap between a plane and an AABox * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef COLMATHPLANE_H -#define COLMATHPLANE_H +#pragma once #include "always.h" #include "plane.h" @@ -148,7 +146,3 @@ CollisionMath::Overlap_Test(const PlaneClass & plane,const AABoxClass & box) } return BOTH; } - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWMath/cullsys.h b/Core/Libraries/Source/WWVegas/WWMath/cullsys.h index a7215657fa..a493fd1641 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/cullsys.h +++ b/Core/Libraries/Source/WWVegas/WWMath/cullsys.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef CULLSYS_H -#define CULLSYS_H - #include "wwdebug.h" #include "stdlib.h" #include "refcount.h" @@ -194,6 +190,3 @@ class CullSystemClass friend class CullableClass; }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/culltype.h b/Core/Libraries/Source/WWVegas/WWMath/culltype.h index 0836b9fdca..83ebc08b3a 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/culltype.h +++ b/Core/Libraries/Source/WWVegas/WWMath/culltype.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef CULLTYPE_H -#define CULLTYPE_H - #include "always.h" /* @@ -55,6 +51,3 @@ typedef enum CULLTYPE CULL_INTERSECTING, // the object intersects an edge of the culling volume CULL_INSIDE // the object is completely inside the culling volume }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/curve.h b/Core/Libraries/Source/WWVegas/WWMath/curve.h index bdc4d7667b..5b27820dbf 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/curve.h +++ b/Core/Libraries/Source/WWVegas/WWMath/curve.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef CURVE_H -#define CURVE_H - #ifndef ALWAYS_H #include "always.h" #endif @@ -172,6 +168,3 @@ class LinearCurve1DClass : public Curve1DClass virtual bool Save(ChunkSaveClass &csave); virtual bool Load(ChunkLoadClass &cload); }; - - -#endif //CURVE_H diff --git a/Core/Libraries/Source/WWVegas/WWMath/euler.h b/Core/Libraries/Source/WWVegas/WWMath/euler.h index 00d010f89b..70dc0521cd 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/euler.h +++ b/Core/Libraries/Source/WWVegas/WWMath/euler.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef EULER_H -#define EULER_H - #include "always.h" #include "matrix3d.h" #include "quat.h" @@ -120,6 +116,3 @@ class EulerAnglesClass int Order; }; - - -#endif /*EULER_H*/ diff --git a/Core/Libraries/Source/WWVegas/WWMath/frustum.h b/Core/Libraries/Source/WWVegas/WWMath/frustum.h index a991e5bd38..0d46f6a692 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/frustum.h +++ b/Core/Libraries/Source/WWVegas/WWMath/frustum.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef FRUSTUM_H -#define FRUSTUM_H - #include "vector3.h" #include "plane.h" @@ -64,8 +60,3 @@ class FrustumClass Vector3 BoundMin; Vector3 BoundMax; }; - - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWMath/hermitespline.h b/Core/Libraries/Source/WWVegas/WWMath/hermitespline.h index 2faaa8148f..70d3f83bea 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/hermitespline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/hermitespline.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef HERMITE_H -#define HERMITE_H - #include "curve.h" /* @@ -136,6 +132,3 @@ class HermiteSpline1DClass : public Curve1DClass bool TangentsDirty; DynamicVectorClass Tangents; }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/lineseg.h b/Core/Libraries/Source/WWVegas/WWMath/lineseg.h index dace72280a..3e0f90a0f1 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/lineseg.h +++ b/Core/Libraries/Source/WWVegas/WWMath/lineseg.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef LINESEG_H -#define LINESEG_H - #include "always.h" #include "vector3.h" #include "castres.h" @@ -86,6 +82,3 @@ class LineSegClass Vector3 Dir; // normalized direction. float Length; // length of the segment }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h b/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h index 7658f87ec1..489adeff57 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h +++ b/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h @@ -36,9 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef LOOKUPTABLE_H -#define LOOKUPTABLE_H +#pragma once #include "always.h" #include "simplevec.h" @@ -156,6 +154,3 @@ class LookupTableMgrClass static RefMultiListClass Tables; }; - - -#endif // LOOKUPTABLE_H diff --git a/Core/Libraries/Source/WWVegas/WWMath/matrix3.h b/Core/Libraries/Source/WWVegas/WWMath/matrix3.h index 7c6f76058a..98fec5b56b 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/matrix3.h +++ b/Core/Libraries/Source/WWVegas/WWMath/matrix3.h @@ -56,12 +56,8 @@ * Matrix3x3::Rotate_Z -- Post-multiplies the matrix with a rotation about Z * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef Matrix3_H -#define Matrix3_H - #include "always.h" #include "vector3.h" #include "wwdebug.h" @@ -1026,5 +1022,3 @@ WWINLINE void Matrix3x3::Rotate_AABox_Extent(const Vector3 & extent,Vector3 * se } } } - -#endif /*Matrix3_H*/ diff --git a/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h b/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h index 8991287c60..66384b9c7b 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h +++ b/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h @@ -80,9 +80,6 @@ #pragma once -#ifndef MATRIX3D_H -#define MATRIX3D_H - #ifdef _UNIX #include "osdep.h" #endif @@ -1813,4 +1810,3 @@ class DynamicMatrix3D : public W3DMPO public: Matrix3D Mat; }; -#endif /* MATRIX3D_H */ diff --git a/Core/Libraries/Source/WWVegas/WWMath/matrix4.h b/Core/Libraries/Source/WWVegas/WWMath/matrix4.h index c1fa1afcf3..3da1991021 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/matrix4.h +++ b/Core/Libraries/Source/WWVegas/WWMath/matrix4.h @@ -56,13 +56,8 @@ * Matrix4x4::operator /= -- "divide equals" operator * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - -#ifndef MATRIX4_H -#define MATRIX4_H - #include "always.h" #include "vector4.h" #include "matrix3d.h" @@ -841,6 +836,3 @@ WWINLINE void Matrix4x4::Transform_Vector(const Matrix4x4 & A,const Vector4 & in out->Z = (A[2][0] * v->X + A[2][1] * v->Y + A[2][2] * v->Z + A[2][3] * v->W); out->W = (A[3][0] * v->X + A[3][1] * v->Y + A[3][2] * v->Z + A[3][3] * v->W); } - - -#endif /*MATRIX4_H*/ diff --git a/Core/Libraries/Source/WWVegas/WWMath/normalcone.h b/Core/Libraries/Source/WWVegas/WWMath/normalcone.h index e6ad9608aa..d4cd659e52 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/normalcone.h +++ b/Core/Libraries/Source/WWVegas/WWMath/normalcone.h @@ -43,8 +43,7 @@ ** -ehc */ -#ifndef NORMALCONE_H -#define NORMALCONE_H +#pragma once #include "vector3.h" #include "matrix3.h" @@ -239,5 +238,3 @@ inline float NormalCone::Smallest_Dot_Product(const Vector3 & Input) return dot1; return dot2; } - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/obbox.h b/Core/Libraries/Source/WWVegas/WWMath/obbox.h index 8b9c462829..4e3f7f141c 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/obbox.h +++ b/Core/Libraries/Source/WWVegas/WWMath/obbox.h @@ -43,9 +43,6 @@ #pragma once -#ifndef OBBOX_H -#define OBBOX_H - #include "always.h" #include "vector3.h" #include "matrix3.h" @@ -265,5 +262,3 @@ inline bool OBBoxClass::operator!= (const OBBoxClass &src) { return (Center != src.Center) || (Extent != src.Extent) || (Basis != src.Basis); } - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/ode.h b/Core/Libraries/Source/WWVegas/WWMath/ode.h index fe7b9574ac..24d159ba44 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/ode.h +++ b/Core/Libraries/Source/WWVegas/WWMath/ode.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef ODE_H -#define ODE_H - #include "always.h" #include "Vector.H" #include "wwdebug.h" @@ -127,6 +123,3 @@ class IntegrationSystem static void Runge_Kutta5_Integrate(ODESystemClass * odesys,float dt); }; - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWMath/plane.h b/Core/Libraries/Source/WWVegas/WWMath/plane.h index f40d6faf40..43f18f5eb1 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/plane.h +++ b/Core/Libraries/Source/WWVegas/WWMath/plane.h @@ -37,9 +37,6 @@ #pragma once -#ifndef PLANE_H -#define PLANE_H - #include "always.h" #include "vector3.h" #include "sphere.h" @@ -244,5 +241,3 @@ inline void PlaneClass::Intersect_Planes(const PlaneClass & a, const PlaneClass // find the point). line_dir->Normalize(); } - -#endif /*PLANE_H*/ diff --git a/Core/Libraries/Source/WWVegas/WWMath/pot.h b/Core/Libraries/Source/WWVegas/WWMath/pot.h index b2e7ab9ee6..8d5af74010 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/pot.h +++ b/Core/Libraries/Source/WWVegas/WWMath/pot.h @@ -36,8 +36,5 @@ #pragma once -#ifndef __POT_H__ -#define __POT_H__ int Find_POT(int val); unsigned int Find_POT_Log2(unsigned int val); -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/quat.h b/Core/Libraries/Source/WWVegas/WWMath/quat.h index 9515c8fb6c..1b43b0793f 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/quat.h +++ b/Core/Libraries/Source/WWVegas/WWMath/quat.h @@ -37,9 +37,6 @@ #pragma once -#ifndef QUAT_H -#define QUAT_H - #include "always.h" #include "wwmath.h" #include "matrix3.h" @@ -307,9 +304,3 @@ WWINLINE Quaternion & Quaternion::operator = (const Quaternion & source) return *this; } - - -#endif /* QUAT_H */ - - - diff --git a/Core/Libraries/Source/WWVegas/WWMath/rect.h b/Core/Libraries/Source/WWVegas/WWMath/rect.h index b3df9997f3..b99fd42c8a 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/rect.h +++ b/Core/Libraries/Source/WWVegas/WWMath/rect.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef RECT_H -#define RECT_H - #include "vector2.h" class RectClass @@ -101,6 +97,3 @@ class RectClass void Snap_To_Units( const Vector2 & u ) { Left = (int)(Left / u.X + 0.5f) * u.X; Right = (int)(Right / u.X + 0.5f) * u.X; Top = (int)(Top / u.Y + 0.5f) * u.Y; Bottom = (int)(Bottom / u.Y + 0.5f) * u.Y; } }; - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWMath/sphere.h b/Core/Libraries/Source/WWVegas/WWMath/sphere.h index f68035c493..1c8fc4ea97 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/sphere.h +++ b/Core/Libraries/Source/WWVegas/WWMath/sphere.h @@ -48,12 +48,8 @@ * operator * -- Transform a sphere * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef SPHERE_H -#define SPHERE_H - #include "always.h" #include "vector3.h" #include "matrix3d.h" @@ -543,8 +539,3 @@ inline SphereClass operator * (const Matrix3D & m, const SphereClass & s) { return Transform_Sphere(m,s); } - - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWMath/tcbspline.h b/Core/Libraries/Source/WWVegas/WWMath/tcbspline.h index 435d9174a1..23ec6b7e45 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/tcbspline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/tcbspline.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef TCBSPLINE_H -#define TCBSPLINE_H - #include "hermitespline.h" /* @@ -78,7 +74,3 @@ class TCBSpline3DClass : public HermiteSpline3DClass DynamicVectorClass Params; }; - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWMath/tri.h b/Core/Libraries/Source/WWVegas/WWMath/tri.h index 85fb69a3a1..77c9889e0b 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/tri.h +++ b/Core/Libraries/Source/WWVegas/WWMath/tri.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef TRI_H -#define TRI_H - #include "always.h" #include "vector4.h" #include "vector3.h" @@ -300,5 +296,3 @@ inline bool Cast_Semi_Infinite_Axis_Aligned_Ray_To_Triangle(const Vector3 &tri_p return retval; } - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/v3_rnd.h b/Core/Libraries/Source/WWVegas/WWMath/v3_rnd.h index 423f735e6d..c7d5581c6e 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/v3_rnd.h +++ b/Core/Libraries/Source/WWVegas/WWMath/v3_rnd.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef V3_RND_H -#define V3_RND_H +#pragma once #include "always.h" #include "vector3.h" @@ -226,8 +224,3 @@ class Vector3SolidCylinderRandomizer : public Vector3Randomizer { float Extent; float Radius; }; - - -#endif - - diff --git a/Core/Libraries/Source/WWVegas/WWMath/vector2.h b/Core/Libraries/Source/WWVegas/WWMath/vector2.h index 6c48a0894f..5396e4ee5a 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vector2.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vector2.h @@ -51,9 +51,6 @@ #pragma once -#ifndef VECTOR2_H -#define VECTOR2_H - #include "always.h" #include "wwmath.h" #include @@ -663,7 +660,3 @@ WWINLINE void Vector2::Lerp(const Vector2 & a,const Vector2 & b,float t,Vector2 set_result->X = (a.X + (b.X - a.X)*t); set_result->Y = (a.Y + (b.Y - a.Y)*t); } - - -#endif /* VECTOR2_H */ - diff --git a/Core/Libraries/Source/WWVegas/WWMath/vector2i.h b/Core/Libraries/Source/WWVegas/WWMath/vector2i.h index c58f15010f..0645d090a0 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vector2i.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vector2i.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef VECTOR2I_H -#define VECTOR2I_H - #include "always.h" class Vector2i @@ -106,6 +102,3 @@ WWINLINE void Vector2i::Swap(Vector2i & other) other.J ^= J; J ^= other.J; } - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/vector3.h b/Core/Libraries/Source/WWVegas/WWMath/vector3.h index f64b5ee7e8..092ac90aee 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vector3.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vector3.h @@ -65,9 +65,6 @@ #pragma once -#ifndef VECTOR3_H -#define VECTOR3_H - #include "always.h" #include "wwmath.h" #include @@ -932,6 +929,3 @@ WWINLINE unsigned long Vector3::Convert_To_ARGB( float alpha ) const (unsigned(Y*255.0f)<<8) | (unsigned(Z*255.0f)); } - -#endif /* Vector3_H */ - diff --git a/Core/Libraries/Source/WWVegas/WWMath/vector4.h b/Core/Libraries/Source/WWVegas/WWMath/vector4.h index 77bd478f35..7e89509239 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vector4.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vector4.h @@ -46,9 +46,6 @@ #pragma once -#ifndef VECTOR4_H -#define VECTOR4_H - #include "always.h" #include "wwmath.h" #include @@ -404,7 +401,3 @@ WWINLINE bool Vector4::Is_Valid(void) const { return (WWMath::Is_Valid_Float(X) && WWMath::Is_Valid_Float(Y) && WWMath::Is_Valid_Float(Z) && WWMath::Is_Valid_Float(W)); } - - -#endif /* VECTOR4_H */ - diff --git a/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.h b/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.h index c64e4f98c4..6fbf1a7e75 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __VEHICLE_CURVE_H -#define __VEHICLE_CURVE_H - #include "curve.h" #include "Vector.H" @@ -202,7 +198,3 @@ VehicleCurveClass::Clear_Keys (void) Curve3DClass::Clear_Keys (); return ; } - - -#endif //__VEHICLE_CURVE_H - diff --git a/Core/Libraries/Source/WWVegas/WWMath/vp.h b/Core/Libraries/Source/WWVegas/WWMath/vp.h index 5c029c1896..937188093f 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vp.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vp.h @@ -47,9 +47,6 @@ #pragma once -#ifndef VECTORPROCESSOR_H -#define VECTORPROCESSOR_H - class Vector2; class Vector3; class Vector4; @@ -87,5 +84,3 @@ class VectorProcessorClass static void ClampMin(float *dst, float *src, const float min, const int count); static void Power(float *dst, float *src, const float pow, const int count); }; - -#endif // VECTORPROCESSOR_H diff --git a/Core/Libraries/Source/WWVegas/WWMath/wwmath.h b/Core/Libraries/Source/WWVegas/WWMath/wwmath.h index eb2ff3e2c8..35372397a9 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/wwmath.h +++ b/Core/Libraries/Source/WWVegas/WWMath/wwmath.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef WWMATH_H -#define WWMATH_H - #include "always.h" #include #include @@ -658,5 +654,3 @@ WWINLINE float WWMath::Normalize_Angle(float angle) { return angle - (WWMATH_TWO_PI * Floor((angle + WWMATH_PI) / WWMATH_TWO_PI)); } - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/wwmathids.h b/Core/Libraries/Source/WWVegas/WWMath/wwmathids.h index d6f8d76695..786757d843 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/wwmathids.h +++ b/Core/Libraries/Source/WWVegas/WWMath/wwmathids.h @@ -36,8 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef WWMATHIDS_H -#define WWMATHIDS_H +#pragma once #include "saveloadids.h" @@ -59,8 +58,3 @@ enum WWMATH_CHUNKID_TCBSPLINE3D, WWMATH_CHUNKID_VEHICLECURVE }; - - - -#endif //WWMATHIDS_H - diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.h index a361c55989..471c39ceac 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __DEFINITION_H -#define __DEFINITION_H - #include "always.h" // SKB Remove because of G conflicts with CLASSID_?? #include "definitionclassids.h" @@ -187,6 +184,3 @@ DefinitionClass::Is_Valid_Config (StringClass &message) { return true; } - - -#endif //__DEFINITION_H diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionclassids.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionclassids.h index d71e531095..8d74a2d5a0 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionclassids.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionclassids.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __DEFINITION_CLASS_ID_H -#define __DEFINITION_CLASS_ID_H - #include "always.h" #include "bittype.h" @@ -100,7 +96,3 @@ SuperClassID_From_ClassID (uint32 class_id) return DEF_CLASSID_START + (num_ranges * DEF_CLASSID_RANGE); } - - -#endif //__DEFINITION_CLASS_ID_H - diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactory.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactory.h index 82fd3df802..a7230b95d4 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactory.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactory.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __DEFINITION_FACTORY_H -#define __DEFINITION_FACTORY_H - #include "always.h" #include "bittype.h" #include "definitionclassids.h" @@ -86,6 +83,3 @@ class DefinitionFactoryClass ////////////////////////////////////////////////////////////// friend class DefinitionFactoryMgrClass; }; - - -#endif //__DEFINITION_FACTORY_H diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.h index 579d671fe9..dd317f0759 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __DEFINITION_FACTORY_MGR_H -#define __DEFINITION_FACTORY_MGR_H - #include "always.h" #include "bittype.h" #include "definitionclassids.h" @@ -83,6 +80,3 @@ class DefinitionFactoryMgrClass ///////////////////////////////////////////////////////////////////// static DefinitionFactoryClass * _FactoryListHead; }; - - -#endif //__DEFINITION_FACTORY_MGR_H diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.h index 14499bfa48..31a10261bf 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.h @@ -34,13 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - -#ifndef __DEFINITION_MGR_H -#define __DEFINITION_MGR_H - #include "always.h" #include "saveload.h" #include "saveloadsubsystem.h" @@ -180,6 +175,3 @@ DefinitionMgrClass::Get_First (void) return definition; } - - -#endif //__DEFINITION_MGR_H diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/editable.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/editable.h index ed59f26dd2..059b5dcf9a 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/editable.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/editable.h @@ -41,14 +41,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - -#ifndef __EDITABLE_H -#define __EDITABLE_H - - #include "always.h" #include "persist.h" #include "parameter.h" @@ -329,9 +323,3 @@ EditableClass::Unlock_Parameter (int i) #define GENERIC_DEFID_PARAM(_class, data, root_class_id) #endif //PARAM_EDITING_ON - - -#endif //__EDITABLE_H - - - diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.h index fca6182e5e..f86d20bec5 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.h @@ -36,12 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __PARAMETER_H -#define __PARAMETER_H - #include "always.h" #include #include @@ -1153,7 +1149,3 @@ class SeparatorParameterClass : public ParameterClass // Copy methods virtual void Copy_Value (const ParameterClass &src); }; - - -#endif //__PARAMETER_H - diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h index 3d45194fab..22adf86cb2 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h @@ -34,15 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - - - -#ifndef __PARAMETER_LIST_H -#define __PARAMETER_LIST_H - #include "always.h" #include "Vector.H" #include "parameter.h" @@ -153,7 +146,3 @@ ParameterListClass::Free_Parameters (void) // m_Parameters.Delete_All (); return ; } - - -#endif //__PARAMETER_LIST_H - diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/parametertypes.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/parametertypes.h index 67998e1088..8964521f6f 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/parametertypes.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/parametertypes.h @@ -34,14 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - - -#ifndef __PARAMETER_TYPES_H -#define __PARAMETER_TYPES_H - #include "always.h" ////////////////////////////////////////////////////////////////////////////////// @@ -61,7 +55,3 @@ TYPE_MODELFILENAME } ParameterType;*/ - - -#endif //__PARAMETER_TYPES_H - diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/persist.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/persist.h index ed87e14387..8c544127cb 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/persist.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/persist.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef PERSIST_H -#define PERSIST_H - #include "always.h" #include "refcount.h" #include "postloadable.h" @@ -69,7 +65,3 @@ class PersistClass : public PostLoadableClass virtual bool Load (ChunkLoadClass &cload) { return true; } }; - - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h index f7ff4fa19c..0599936a17 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h @@ -34,15 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - - - -#ifndef PERSISTFACTORY_H -#define PERSISTFACTORY_H - #include "always.h" #include "bittype.h" #include "chunkio.h" @@ -136,6 +129,3 @@ SimplePersistFactoryClass::Save(ChunkSaveClass & csave,PersistClass * obj->Save(csave); csave.End_Chunk(); } - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.h index 4b77405531..8ce0566a07 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.h @@ -34,13 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - -#ifndef POINTERREMAP_H -#define POINTERREMAP_H - #ifdef _UNIX #include "osdep/osdep.h" #endif @@ -108,6 +103,3 @@ class PointerRemapClass DynamicVectorClass PointerRequestTable; DynamicVectorClass RefCountRequestTable; }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/postloadable.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/postloadable.h index f574daef44..d6c0e555f2 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/postloadable.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/postloadable.h @@ -36,9 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef POSTLOADABLE_H -#define POSTLOADABLE_H - +#pragma once ////////////////////////////////////////////////////////////////////////////////// // @@ -64,8 +62,3 @@ class PostLoadableClass bool IsPostLoadRegistered; }; - - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.h index bf03a3eccd..1b314da806 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.h @@ -34,13 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - -#ifndef SAVELOAD_H -#define SAVELOAD_H - #include "always.h" #include "pointerremap.h" #include "bittype.h" @@ -215,7 +210,3 @@ class SaveLoadSystemClass #define REQUEST_POINTER_REMAP(pp) SaveLoadSystemClass::Request_Pointer_Remap(pp) #define REQUEST_REF_COUNTED_POINTER_REMAP(pp) SaveLoadSystemClass::Request_Ref_Counted_Pointer_Remap(pp) #endif - - -#endif //SAVELOAD_H - diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadids.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadids.h index df9844f4ec..ee8e111ce1 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadids.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadids.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef SAVELOADIDS_H -#define SAVELOADIDS_H - ////////////////////////////////////////////////////////////////////////////////// // // Chunk ID Ranges. @@ -64,6 +60,3 @@ enum CHUNKID_WWMATH_BEGIN = 0x00080000, CHUNKID_WWTRANSLATEDB_BEGIN = 0x00090000 }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.h index 922ccd35d9..776dbae40f 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.h @@ -16,9 +16,6 @@ ** along with this program. If not, see . */ -#ifndef WWSAVELOADSTATUS_H -#define WWSAVELOADSTATUS_H - #pragma once #include "always.h" @@ -36,5 +33,3 @@ namespace SaveLoadStatus #define INIT_STATUS(t) SaveLoadStatus::Set_Status_Text(t,0) #define INIT_SUB_STATUS(t) SaveLoadStatus::Set_Status_Text(t,1) - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h index 74bdb0a106..46c7d98da2 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h @@ -34,14 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - -#ifndef SAVELOADSUBSYSTEM_H -#define SAVELOADSUBSYSTEM_H - - #include "always.h" #include "bittype.h" #include "postloadable.h" @@ -87,7 +81,3 @@ class SaveLoadSubSystemClass : public PostLoadableClass friend class SaveLoadSystemClass; }; - - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h index c18d86e051..b90eb038f9 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h @@ -16,10 +16,7 @@ ** along with this program. If not, see . */ - - -#ifndef __SIMPLE_DEFINITION_FACTORY_H -#define __SIMPLE_DEFINITION_FACTORY_H +#pragma once #include "definitionfactory.h" @@ -80,7 +77,4 @@ SimpleDefinitionFactoryClass::Get_Class_ID (void) const #define DECLARE_DEFINITION_FACTORY(_class, _id, _name) \ char _class ## Name[] = _name; \ -SimpleDefinitionFactoryClass<_class, _id, _class ## Name> \ - -#endif //__SIMPLE_DEFINITION_FACTORY_H - +SimpleDefinitionFactoryClass<_class, _id, _class ## Name> diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h index 3782b56894..af9f6dbd24 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h @@ -34,15 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - - - -#ifndef __SIMPLE_PARAMETER_H -#define __SIMPLE_PARAMETER_H - #include "always.h" #include "parameter.h" #include "vector2.h" @@ -240,6 +233,3 @@ class AngleParameterClass : public RangedParameterClass (data, name) { Set_Range (0.0F, 6.283185307F); } }; - -#endif //__SIMPLE_PARAMETER_H - diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h index 4327766be7..7c45af94f6 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __TWIDDLER_H -#define __TWIDDLER_H - #include "definition.h" #include "definitionclassids.h" @@ -122,7 +119,3 @@ TwiddlerClass::Set_Indirect_Class_ID (uint32 class_id) m_IndirectClassID = class_id; return ; } - - -#endif //__TWIDDLER_H - diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/wwsaveload.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/wwsaveload.h index 54a359c013..8863266b1b 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/wwsaveload.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/wwsaveload.h @@ -38,9 +38,6 @@ #pragma once -#ifndef WWSAVELOAD_H -#define WWSAVELOAD_H - /** ** WWSaveLoad ** The Init and Shutdown functions should be called once by the App. @@ -52,7 +49,3 @@ class WWSaveLoad static void Init(void); static void Shutdown(void); }; - - -#endif - diff --git a/Core/Libraries/Source/debug/_pch.h b/Core/Libraries/Source/debug/_pch.h index 12e4aea31b..a242090ae8 100644 --- a/Core/Libraries/Source/debug/_pch.h +++ b/Core/Libraries/Source/debug/_pch.h @@ -26,10 +26,8 @@ // // Precompiled header (module internal) ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef _PCH_H // Include guard -#define _PCH_H +#pragma once #include "debug.h" @@ -41,5 +39,3 @@ #include "internal.h" #include "internal_io.h" #include "internal_except.h" - -#endif // _PCH_H diff --git a/Core/Libraries/Source/debug/debug.h b/Core/Libraries/Source/debug/debug.h index ff6d044d2b..11b75830a1 100644 --- a/Core/Libraries/Source/debug/debug.h +++ b/Core/Libraries/Source/debug/debug.h @@ -26,10 +26,8 @@ // // Debugging module ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef DEBUG_H // Include guard -#define DEBUG_H +#pragma once /** \page lib_var Library variants @@ -103,5 +101,3 @@ #include "debug_cmd.h" #include "debug_stack.h" #include "debug_debug.h" - -#endif // DEBUG_H diff --git a/Core/Libraries/Source/debug/debug_cmd.h b/Core/Libraries/Source/debug/debug_cmd.h index 02104213da..3e7f0bc45c 100644 --- a/Core/Libraries/Source/debug/debug_cmd.h +++ b/Core/Libraries/Source/debug/debug_cmd.h @@ -26,10 +26,8 @@ // // Debug command interface ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef DEBUG_CMD_H // Include guard -#define DEBUG_CMD_H +#pragma once /** \interface DebugCmdInterface debug.h @@ -126,5 +124,3 @@ class DebugCmdInterface #endif ///@} - -#endif // DEBUG_CMD_H diff --git a/Core/Libraries/Source/debug/debug_debug.h b/Core/Libraries/Source/debug/debug_debug.h index 847273c698..956fa6f229 100644 --- a/Core/Libraries/Source/debug/debug_debug.h +++ b/Core/Libraries/Source/debug/debug_debug.h @@ -26,10 +26,8 @@ // // main Debug object (singleton) ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef DEBUG_DEBUG_H // Include guard -#define DEBUG_DEBUG_H +#pragma once /** \class Debug debug.h @@ -1227,5 +1225,3 @@ DLOG( "My HResult is: " << Debug::HResult(SomeHRESULTValue) << "\n" ); const char *DebugGetDefaultCommands(void); ///@} end of debug_fn group - -#endif // DEBUG_DEBUG_H diff --git a/Core/Libraries/Source/debug/debug_doc.h b/Core/Libraries/Source/debug/debug_doc.h index f7e4b17f48..364da4d85a 100644 --- a/Core/Libraries/Source/debug/debug_doc.h +++ b/Core/Libraries/Source/debug/debug_doc.h @@ -26,10 +26,8 @@ // // additional Doxygen module documentation ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef DEBUG_DOC_H // Include guard -#define DEBUG_DOC_H +#pragma once // This generates a small main page for Doxygen if a module only // documentation is built. @@ -704,5 +702,3 @@ void test(const Point2D &val) */ - -#endif // DEBUG_DOC_H diff --git a/Core/Libraries/Source/debug/debug_io.h b/Core/Libraries/Source/debug/debug_io.h index 4d9e0d9d7d..f1d14a7ec5 100644 --- a/Core/Libraries/Source/debug/debug_io.h +++ b/Core/Libraries/Source/debug/debug_io.h @@ -26,10 +26,8 @@ // // Debug I/O interface ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef DEBUG_IO_H // Include guard -#define DEBUG_IO_H +#pragma once /** \interface DebugIOInterface debug.h @@ -197,5 +195,3 @@ class DebugIOInterface #endif ///@} - -#endif // DEBUG_IO_H diff --git a/Core/Libraries/Source/debug/debug_macro.h b/Core/Libraries/Source/debug/debug_macro.h index 0a958b0878..b4b0f07400 100644 --- a/Core/Libraries/Source/debug/debug_macro.h +++ b/Core/Libraries/Source/debug/debug_macro.h @@ -26,10 +26,8 @@ // // Debugging macros ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef DEBUG_MACRO_H // Include guard -#define DEBUG_MACRO_H +#pragma once // I'm putting the documentation for the following macros // here because Doxygen otherwise includes the values of each macro @@ -389,5 +387,3 @@ sourcefname.cpp (123) : Hello world be forgotten. */ #define MESSAGE(a) message (__FILE__ "(" TOKEN_IT(__LINE__) ") : " a) - -#endif // DEBUG_MACRO_H diff --git a/Core/Libraries/Source/debug/debug_stack.h b/Core/Libraries/Source/debug/debug_stack.h index 54013b5187..fdb6677f8f 100644 --- a/Core/Libraries/Source/debug/debug_stack.h +++ b/Core/Libraries/Source/debug/debug_stack.h @@ -26,10 +26,8 @@ // // Stack walker ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef DEBUG_STACK_H // Include guard -#define DEBUG_STACK_H +#pragma once /// \brief stack walker class (singleton) class DebugStackwalk @@ -167,5 +165,3 @@ class DebugStackwalk \return debug instance */ Debug& operator<<(Debug &dbg, const DebugStackwalk::Signature &sig); - -#endif // DEBUG_STACK_H diff --git a/Core/Libraries/Source/debug/internal.h b/Core/Libraries/Source/debug/internal.h index a795edd82f..775bcc8445 100644 --- a/Core/Libraries/Source/debug/internal.h +++ b/Core/Libraries/Source/debug/internal.h @@ -26,10 +26,8 @@ // // Internal header ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef INTERNAL_H // Include guard -#define INTERNAL_H +#pragma once // make sure we're not omitting the frame pointer #pragma optimize("y",off) @@ -96,5 +94,3 @@ class DebugCmdInterfaceDebug: public DebugCmdInterface DebugFreeMemory(this); } }; - -#endif // INTERNAL_H diff --git a/Core/Libraries/Source/debug/internal_except.h b/Core/Libraries/Source/debug/internal_except.h index 450d30127e..2e17cd0f03 100644 --- a/Core/Libraries/Source/debug/internal_except.h +++ b/Core/Libraries/Source/debug/internal_except.h @@ -26,10 +26,8 @@ // // Unhandled exception handler ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef INTERNAL_EXCEPT_H // Include guard -#define INTERNAL_EXCEPT_H +#pragma once /// \internal exception handler class DebugExceptionhandler @@ -85,5 +83,3 @@ class DebugExceptionhandler */ static long __stdcall ExceptionFilter(struct _EXCEPTION_POINTERS* pExPtrs); }; - -#endif // INTERNAL_EXCEPT_H diff --git a/Core/Libraries/Source/debug/internal_io.h b/Core/Libraries/Source/debug/internal_io.h index 673c62e70c..8c2948cabf 100644 --- a/Core/Libraries/Source/debug/internal_io.h +++ b/Core/Libraries/Source/debug/internal_io.h @@ -26,10 +26,8 @@ // // Internal header: I/O classes ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef INTERNAL_IO_H // Include guard -#define INTERNAL_IO_H +#pragma once /// \internal \brief con debug I/O class class DebugIOCon: public DebugIOInterface @@ -251,5 +249,3 @@ class DebugIOOds: public DebugIOInterface static DebugIOInterface *Create(void); virtual void Delete(void); }; - -#endif // INTERNAL_IO_H diff --git a/Core/Libraries/Source/debug/test2/StdAfx.h b/Core/Libraries/Source/debug/test2/StdAfx.h index d0e0e14861..a435c4af8d 100644 --- a/Core/Libraries/Source/debug/test2/StdAfx.h +++ b/Core/Libraries/Source/debug/test2/StdAfx.h @@ -21,9 +21,6 @@ // are changed infrequently // -#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) -#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ - #pragma once #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers @@ -44,5 +41,3 @@ //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) diff --git a/Core/Libraries/Source/profile/_pch.h b/Core/Libraries/Source/profile/_pch.h index 36d6c1b1f4..598796c700 100644 --- a/Core/Libraries/Source/profile/_pch.h +++ b/Core/Libraries/Source/profile/_pch.h @@ -26,10 +26,8 @@ // // Precompiled header (module internal) ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef _PCH_H // Include guard -#define _PCH_H +#pragma once #define WIN32_LEAN_AND_MEAN #define STRICT @@ -37,5 +35,3 @@ #include "profile.h" #include "internal.h" - -#endif // _PCH_H diff --git a/Core/Libraries/Source/profile/internal.h b/Core/Libraries/Source/profile/internal.h index 71b99f3889..438c03c8ff 100644 --- a/Core/Libraries/Source/profile/internal.h +++ b/Core/Libraries/Source/profile/internal.h @@ -26,10 +26,8 @@ // // Internal header ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef INTERNAL_H // Include guard -#define INTERNAL_H +#pragma once #include "../debug/debug.h" #include "internal_funclevel.h" @@ -153,5 +151,3 @@ __forceinline void ProfileGetTime(__int64 &t) t = static_cast<__int64>(_rdtsc()); #endif } - -#endif // INTERNAL_H diff --git a/Core/Libraries/Source/profile/internal_cmd.h b/Core/Libraries/Source/profile/internal_cmd.h index b49a4bf982..b46cb1e17c 100644 --- a/Core/Libraries/Source/profile/internal_cmd.h +++ b/Core/Libraries/Source/profile/internal_cmd.h @@ -26,10 +26,8 @@ // // Profile module command interface ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef INTERNAL_CMD_H // Include guard -#define INTERNAL_CMD_H +#pragma once class ProfileCmdInterface: public DebugCmdInterface { @@ -56,5 +54,3 @@ class ProfileCmdInterface: public DebugCmdInterface unsigned argn, const char * const * argv); virtual void Delete(void) {} }; - -#endif // INTERNAL_CMD_H diff --git a/Core/Libraries/Source/profile/internal_funclevel.h b/Core/Libraries/Source/profile/internal_funclevel.h index 7a2d31f07c..81d6f81893 100644 --- a/Core/Libraries/Source/profile/internal_funclevel.h +++ b/Core/Libraries/Source/profile/internal_funclevel.h @@ -26,10 +26,8 @@ // // Function level profiling (internal header) ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef INTERNAL_FUNCLEVEL_H // Include guard -#define INTERNAL_FUNCLEVEL_H +#pragma once class ProfileFuncLevelTracer { @@ -357,5 +355,3 @@ inline ProfileFuncLevelTracer::Function *ProfileFuncLevelTracer::FunctionMap::Fi return e->funcPtr; return NULL; } - -#endif // INTERNAL_FUNCLEVEL_H diff --git a/Core/Libraries/Source/profile/internal_highlevel.h b/Core/Libraries/Source/profile/internal_highlevel.h index 072f37cf15..2d9c572755 100644 --- a/Core/Libraries/Source/profile/internal_highlevel.h +++ b/Core/Libraries/Source/profile/internal_highlevel.h @@ -26,10 +26,8 @@ // // High level profiling (internal header) ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef INTERNAL_HIGHLEVEL_H // Include guard -#define INTERNAL_HIGHLEVEL_H +#pragma once /// an internal high level profile ID class ProfileId @@ -242,5 +240,3 @@ class ProfileId /// next unused char in string buffer static unsigned stringBufUnused; }; - -#endif // INTERNAL_HIGHLEVEL_H diff --git a/Core/Libraries/Source/profile/internal_result.h b/Core/Libraries/Source/profile/internal_result.h index 7f6738051d..a62f082a39 100644 --- a/Core/Libraries/Source/profile/internal_result.h +++ b/Core/Libraries/Source/profile/internal_result.h @@ -26,10 +26,8 @@ // // Internal result functions ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef INTERNAL_RESULT_H // Include guard -#define INTERNAL_RESULT_H +#pragma once /// \brief Simple CSV format flat file result function, for all threads. class ProfileResultFileCSV: public ProfileResultInterface @@ -97,5 +95,3 @@ class ProfileResultFileDOT: public ProfileResultInterface char *m_frameName; int m_foldThreshold; }; - -#endif // INTERNAL_RESULT_H diff --git a/Core/Libraries/Source/profile/profile.h b/Core/Libraries/Source/profile/profile.h index b097d0c1f8..92dde861b8 100644 --- a/Core/Libraries/Source/profile/profile.h +++ b/Core/Libraries/Source/profile/profile.h @@ -26,10 +26,8 @@ // // Profiling module ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef PROFILE_H // Include guard -#define PROFILE_H +#pragma once // include all our public header files (use double quotes here) #include "profile_doc.h" @@ -205,5 +203,3 @@ class Profile /// CPU clock cycles/second static _int64 m_clockCycles; }; - -#endif // PROFILE_H diff --git a/Core/Libraries/Source/profile/profile_doc.h b/Core/Libraries/Source/profile/profile_doc.h index 643c763b1a..7fb82b37ab 100644 --- a/Core/Libraries/Source/profile/profile_doc.h +++ b/Core/Libraries/Source/profile/profile_doc.h @@ -26,10 +26,8 @@ // // additional Doxygen module documentation ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef PROFILE_DOC_H // Include guard -#define PROFILE_DOC_H +#pragma once // This generates a small main page for Doxygen if a module only // documentation is built. @@ -191,5 +189,3 @@ */ - -#endif // PROFILE_DOC_H diff --git a/Core/Libraries/Source/profile/profile_funclevel.h b/Core/Libraries/Source/profile/profile_funclevel.h index 9f138745f1..afe2227b0f 100644 --- a/Core/Libraries/Source/profile/profile_funclevel.h +++ b/Core/Libraries/Source/profile/profile_funclevel.h @@ -26,10 +26,8 @@ // // Function level profiling ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef PROFILE_FUNCLEVEL_H // Include guard -#define PROFILE_FUNCLEVEL_H +#pragma once /** \brief The function level profiler. @@ -218,5 +216,3 @@ class ProfileFuncLevel */ static ProfileFuncLevel Instance; }; - -#endif // PROFILE_FUNCLEVEL_H diff --git a/Core/Libraries/Source/profile/profile_highlevel.h b/Core/Libraries/Source/profile/profile_highlevel.h index ab94dd7e99..dea386181b 100644 --- a/Core/Libraries/Source/profile/profile_highlevel.h +++ b/Core/Libraries/Source/profile/profile_highlevel.h @@ -26,10 +26,8 @@ // // High level profiling ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef PROFILE_HIGHLEVEL_H // Include guard -#define PROFILE_HIGHLEVEL_H +#pragma once /// \internal internal Id representation class ProfileId; @@ -236,5 +234,3 @@ class ProfileHighLevel */ static ProfileHighLevel Instance; }; - -#endif // PROFILE_HIGHLEVEL_H diff --git a/Core/Libraries/Source/profile/profile_result.h b/Core/Libraries/Source/profile/profile_result.h index 77a720c9ab..64a619ebfd 100644 --- a/Core/Libraries/Source/profile/profile_result.h +++ b/Core/Libraries/Source/profile/profile_result.h @@ -26,10 +26,8 @@ // // Result function interface and result functions ////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef PROFILE_RESULT_H // Include guard -#define PROFILE_RESULT_H +#pragma once /** \brief Result function class. @@ -61,5 +59,3 @@ class ProfileResultInterface protected: ProfileResultInterface(void) {} }; - -#endif // PROFILE_RESULT_H diff --git a/Core/Tools/Autorun/ARGS.H b/Core/Tools/Autorun/ARGS.H index b4374361e1..fad81dea36 100644 --- a/Core/Tools/Autorun/ARGS.H +++ b/Core/Tools/Autorun/ARGS.H @@ -30,8 +30,7 @@ // //================================================================================================ -#ifndef ARGS_H -#define ARGS_H +#pragma once //---------------------------------------------------------------------------- // INCLUDES @@ -66,5 +65,3 @@ class Command_Line_Arguments }; extern Command_Line_Arguments *Args; - -#endif // ARGC_ARGV_H diff --git a/Core/Tools/Autorun/CDCNTRL.H b/Core/Tools/Autorun/CDCNTRL.H index a63785e11b..869fa2dd22 100644 --- a/Core/Tools/Autorun/CDCNTRL.H +++ b/Core/Tools/Autorun/CDCNTRL.H @@ -36,11 +36,6 @@ #pragma once - -#ifndef _CDCNTRL -#define _CDCNTRL - - //#include "always.h" //#include #define STRICT @@ -149,8 +144,3 @@ typedef struct _PARAMBLOCK { } PARAMBLOCK, *PPARAMBLOCK; #pragma pack() - - - -#endif //_CDCNTRL - diff --git a/Core/Tools/Autorun/CallbackHook.h b/Core/Tools/Autorun/CallbackHook.h index 6864412d26..1bbaac4a92 100644 --- a/Core/Tools/Autorun/CallbackHook.h +++ b/Core/Tools/Autorun/CallbackHook.h @@ -33,8 +33,7 @@ * ******************************************************************************/ -#ifndef CALLBACKHOOK_H -#define CALLBACKHOOK_H +#pragma once class CallbackHook { @@ -81,5 +80,3 @@ template class Callback : public CallbackHook bool (*mCallback)(T); T mUserData; }; - -#endif // CALLBACKHOOK_H diff --git a/Core/Tools/Autorun/DrawButton.h b/Core/Tools/Autorun/DrawButton.h index 3748e133b9..5cd3ba8341 100644 --- a/Core/Tools/Autorun/DrawButton.h +++ b/Core/Tools/Autorun/DrawButton.h @@ -31,8 +31,7 @@ * Last Update : October 5, 2000 [MML] * *----------------------------------------------------------------------*/ -#ifndef DRAWBUTTONS_H -#define DRAWBUTTONS_H +#pragma once #include #include @@ -99,10 +98,3 @@ class DrawButton char PressedBitmap[ _MAX_FNAME ]; char FocusBitmap [ _MAX_FNAME ]; }; - - - - - - -#endif diff --git a/Core/Tools/Autorun/GameText.h b/Core/Tools/Autorun/GameText.h index 581e55d2f8..df51f3810a 100644 --- a/Core/Tools/Autorun/GameText.h +++ b/Core/Tools/Autorun/GameText.h @@ -35,10 +35,6 @@ #pragma once -#ifndef __GAMECLIENT_GAMETEXT_H_ -#define __GAMECLIENT_GAMETEXT_H_ - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -77,6 +73,3 @@ extern GameTextInterface* CreateGameTextInterface( void ); //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - -#endif // __GAMECLIENT_GAMETEXT_H_ diff --git a/Core/Tools/Autorun/GetCD.h b/Core/Tools/Autorun/GetCD.h index e92efc7f88..8f33d0a54e 100644 --- a/Core/Tools/Autorun/GetCD.h +++ b/Core/Tools/Autorun/GetCD.h @@ -31,10 +31,6 @@ #pragma once -#ifndef GETCD_H -#define GETCD_H - - extern const char * _CD_Volume_Label[]; extern int _Num_Volumes; @@ -318,6 +314,3 @@ extern GetCDClass CDList; // Functions //----------------------------------------------------------------------------- bool CD_Volume_Verification ( int cd_drive, char *volume_label, char *volume_to_find ); - - -#endif // PLAYCD_H diff --git a/Core/Tools/Autorun/Locale_API.h b/Core/Tools/Autorun/Locale_API.h index 169acc7624..73cd605453 100644 --- a/Core/Tools/Autorun/Locale_API.h +++ b/Core/Tools/Autorun/Locale_API.h @@ -36,9 +36,6 @@ #pragma once -#ifndef LOCALE_API_H -#define LOCALE_API_H - #include /****************************************************************************/ @@ -63,5 +60,3 @@ const wchar_t* Locale_GetString ( int StringID, wchar_t *String=NULL ); */ bool Locale_Use_Multi_Language_Files ( void ); //int Locale_Get_Language_ID ( void ) { return LanguageID; }; - -#endif diff --git a/Core/Tools/Autorun/POINT.h b/Core/Tools/Autorun/POINT.h index 60b0347ffc..5c2df4f84b 100644 --- a/Core/Tools/Autorun/POINT.h +++ b/Core/Tools/Autorun/POINT.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef POINT_H -#define POINT_H +#pragma once #include //#include "always.h" @@ -237,6 +235,3 @@ TPoint3D const Cross_Product(TPoint3D const & lvalue, TPoint3D const & { return(lvalue.Cross_Product(rvalue)); } - - -#endif diff --git a/Core/Tools/Autorun/RECT.h b/Core/Tools/Autorun/RECT.h index 16cd920f10..4b554fa3a5 100644 --- a/Core/Tools/Autorun/RECT.h +++ b/Core/Tools/Autorun/RECT.h @@ -36,10 +36,8 @@ * Intersect -- Find the intersection between two rectangles. * * Intersect -- Simple intersect between two rectangles. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef RECT_H -#define RECT_H +#pragma once #include #include "POINT.h" @@ -303,6 +301,3 @@ TRect const Intersect(TRect const & rect1, TRect const & rect2) typedef TRect Rect; const Rect RECT_NONE(0,0,0,0); - -#endif - diff --git a/Core/Tools/Autorun/TTFont.h b/Core/Tools/Autorun/TTFont.h index 375194db20..56138857bf 100644 --- a/Core/Tools/Autorun/TTFont.h +++ b/Core/Tools/Autorun/TTFont.h @@ -35,10 +35,8 @@ *----------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/ -#pragma once -#ifndef TTFONT_H -#define TTFONT_H +#pragma once #include #include "POINT.h" @@ -299,6 +297,3 @@ extern TTFontClass *TTTextFontPtr; extern TTFontClass *TTTextFontPtr640; extern TTFontClass *TTTextFontPtr800; extern TTFontClass *TTLicenseFontPtr; - - -#endif diff --git a/Core/Tools/Autorun/Utils.h b/Core/Tools/Autorun/Utils.h index ad97b6bb4c..4a5ecb729c 100644 --- a/Core/Tools/Autorun/Utils.h +++ b/Core/Tools/Autorun/Utils.h @@ -33,10 +33,8 @@ *-------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef UTILS_H -#define UTILS_H +#pragma once #include @@ -70,6 +68,3 @@ wchar_t * Path_Remove_Back_Slash ( wchar_t *path ); void PlugInProductName ( char *szString, int nName ); void PlugInProductName ( char *szString, char *szName ); void PlugInProductName ( wchar_t *szString, const wchar_t *szName ); - - -#endif diff --git a/Core/Tools/Autorun/ViewHTML.h b/Core/Tools/Autorun/ViewHTML.h index 4a81337f53..9279465937 100644 --- a/Core/Tools/Autorun/ViewHTML.h +++ b/Core/Tools/Autorun/ViewHTML.h @@ -32,11 +32,8 @@ * ******************************************************************************/ -#ifndef VIEWHTML_H -#define VIEWHTML_H +#pragma once #include "CallbackHook.h" bool ViewHTML(const char* url, bool wait = false, const CallbackHook& callback = CallbackHook()); - -#endif // VIEWHTML_H diff --git a/Core/Tools/Autorun/WSYS_FileSystem.h b/Core/Tools/Autorun/WSYS_FileSystem.h index 6eb78c7b83..7906b70da7 100644 --- a/Core/Tools/Autorun/WSYS_FileSystem.h +++ b/Core/Tools/Autorun/WSYS_FileSystem.h @@ -37,11 +37,6 @@ #pragma once -#ifndef __WSYS_FILESYSTEM_H -#define __WSYS_FILESYSTEM_H - - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -90,7 +85,3 @@ extern FileSystem* TheFileSystem; //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - - -#endif // __WSYS_FILESYSTEM_H diff --git a/Core/Tools/Autorun/WSYS_RAMFile.h b/Core/Tools/Autorun/WSYS_RAMFile.h index 9529520a14..f890ee7f43 100644 --- a/Core/Tools/Autorun/WSYS_RAMFile.h +++ b/Core/Tools/Autorun/WSYS_RAMFile.h @@ -37,11 +37,6 @@ #pragma once -#ifndef __WSYS_RAMFILE_H -#define __WSYS_RAMFILE_H - - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -95,6 +90,3 @@ class RAMFile : public File //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - -#endif // __WSYS_RAMFILE_H diff --git a/Core/Tools/Autorun/WSYS_StdFile.h b/Core/Tools/Autorun/WSYS_StdFile.h index f79b3b383a..867c71e5c3 100644 --- a/Core/Tools/Autorun/WSYS_StdFile.h +++ b/Core/Tools/Autorun/WSYS_StdFile.h @@ -37,11 +37,6 @@ #pragma once -#ifndef __WSYS_STDFILE_H -#define __WSYS_STDFILE_H - - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -92,6 +87,3 @@ class StdFile : public File //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - -#endif // __WSYS_STDFILE_H diff --git a/Core/Tools/Autorun/WSYS_StdFileSystem.h b/Core/Tools/Autorun/WSYS_StdFileSystem.h index 3f278a4ec6..62a0ab21e2 100644 --- a/Core/Tools/Autorun/WSYS_StdFileSystem.h +++ b/Core/Tools/Autorun/WSYS_StdFileSystem.h @@ -37,11 +37,6 @@ #pragma once -#ifndef __WSYS_STDFILESYSTEM_H -#define __WSYS_STDFILESYSTEM_H - - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -86,7 +81,3 @@ class StdFileSystem : public FileSystem //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - - -#endif // __WSYS_STDFILESYSTEM_H diff --git a/Core/Tools/Autorun/WSYS_file.h b/Core/Tools/Autorun/WSYS_file.h index fa18771d28..34cd965d82 100644 --- a/Core/Tools/Autorun/WSYS_file.h +++ b/Core/Tools/Autorun/WSYS_file.h @@ -37,11 +37,6 @@ #pragma once -#ifndef __WSYS_FILE_H -#define __WSYS_FILE_H - - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -162,6 +157,3 @@ inline void File::deleteOnClose( void ) { m_deleteOnClose = TRUE;}; // include FileSystem.h as it will be used alot with File.h //#include "wsys/FileSystem.h" - - -#endif // __WSYS_FILE_H diff --git a/Core/Tools/Autorun/WinFix.H b/Core/Tools/Autorun/WinFix.H index bbd4fb91fb..60367d5337 100644 --- a/Core/Tools/Autorun/WinFix.H +++ b/Core/Tools/Autorun/WinFix.H @@ -47,10 +47,6 @@ #pragma once -#ifndef WINFIX_H -#define WINFIX_H - - /*----------------------------------------------------------------------------- ** Windows Version Information class. This is a global object that is used to ** store information about the specific OS that we are running under. This can @@ -145,5 +141,3 @@ class WindowsVersionInfo }; extern WindowsVersionInfo WinVersion; - -#endif diff --git a/Core/Tools/Autorun/Wnd_File.h b/Core/Tools/Autorun/Wnd_File.h index 40ac403c70..eabc7e861b 100644 --- a/Core/Tools/Autorun/Wnd_File.h +++ b/Core/Tools/Autorun/Wnd_File.h @@ -38,10 +38,8 @@ // James McNeill // //**************************************************************************** -#pragma once -#ifndef WND_FILE_H -#define WND_FILE_H +#pragma once //------------------------------------------------------------------------------ // include files... @@ -212,5 +210,3 @@ class StandardFileClass bool CD_File_Exists( char const *file_name ); // bool Find_File( char const *file_name ); #endif - -#endif // WND_FILE_H diff --git a/Core/Tools/Autorun/autorun.h b/Core/Tools/Autorun/autorun.h index 5a068c055c..65a10e1124 100644 --- a/Core/Tools/Autorun/autorun.h +++ b/Core/Tools/Autorun/autorun.h @@ -34,9 +34,7 @@ * *************************************************************************************************/ - -#ifndef AUTORUN_H -#define AUTORUN_H +#pragma once #include #include @@ -250,7 +248,3 @@ class MainWindow : public Window unsigned int Run_OpenFile (int cd_drive, const char *filename, bool wait = false); LRESULT Window_Proc ( HWND hWnd, UINT iMessage, WPARAM wParam, LPARAM lParam ); }; - - -#endif - diff --git a/Core/Tools/Autorun/gimex.h b/Core/Tools/Autorun/gimex.h index 291a495ae8..b1dd321c79 100644 --- a/Core/Tools/Autorun/gimex.h +++ b/Core/Tools/Autorun/gimex.h @@ -22,8 +22,7 @@ gimex.h - Graphics IMport EXport (GIMEX) v2.26 @ */ -#ifndef __GIMEX_H -#define __GIMEX_H 1 +#pragma once #ifdef __cplusplus extern "C" { @@ -299,9 +298,4 @@ unsigned long bswap(unsigned long val); #ifdef __cplusplus } #endif - -#endif /* __GIMEX_H */ /* END ABSTRACT */ - - - diff --git a/Core/Tools/Autorun/leanAndMeanAutorun.h b/Core/Tools/Autorun/leanAndMeanAutorun.h index 37c5b0d93e..5713622d7f 100644 --- a/Core/Tools/Autorun/leanAndMeanAutorun.h +++ b/Core/Tools/Autorun/leanAndMeanAutorun.h @@ -20,12 +20,7 @@ // Author: Mark Lorenzen, January 2003! // Description: Classes extracted from GameEngine for use in autorun without having to link the game to autorun /////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma once - -#ifndef __LEANANDMEANAUTORUN_H_ -#define __LEANANDMEANAUTORUN_H_ +#pragma once #define LEAN_AND_MEAN - -#endif //__LEANANDMEANAUTORUN_H_ diff --git a/Core/Tools/Autorun/locale.h b/Core/Tools/Autorun/locale.h index d9c0f3aa96..f4a5fb07ed 100644 --- a/Core/Tools/Autorun/locale.h +++ b/Core/Tools/Autorun/locale.h @@ -22,8 +22,7 @@ locale.h - REAL fonts @ */ -#ifndef __LOCALE_H -#define __LOCALE_H 1 +#pragma once //#ifdef __cplusplus //extern "C" { @@ -66,7 +65,4 @@ const char * LOCALE_getstring( int stringid ); /* use values in the .h fil //#ifdef __cplusplus //} //#endif - -#endif /* __LOCALE_H */ /* END ABSTRACT */ - diff --git a/Core/Tools/Babylon/Babylon.h b/Core/Tools/Babylon/Babylon.h index 753468abc1..22b3020573 100644 --- a/Core/Tools/Babylon/Babylon.h +++ b/Core/Tools/Babylon/Babylon.h @@ -19,9 +19,6 @@ // Babylon.h : main header file for the BABYLON application // -#if !defined(AFX_BABYLON_H__2BF3124B_3BA1_11D3_B9DA_006097B90D93__INCLUDED_) -#define AFX_BABYLON_H__2BF3124B_3BA1_11D3_B9DA_006097B90D93__INCLUDED_ - #pragma once #ifndef __AFXWIN_H__ @@ -68,5 +65,3 @@ extern LangID CurrentLanguage; //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_BABYLON_H__2BF3124B_3BA1_11D3_B9DA_006097B90D93__INCLUDED_) diff --git a/Core/Tools/Babylon/BabylonDlg.h b/Core/Tools/Babylon/BabylonDlg.h index e25913f92b..677e782611 100644 --- a/Core/Tools/Babylon/BabylonDlg.h +++ b/Core/Tools/Babylon/BabylonDlg.h @@ -19,9 +19,6 @@ // BabylonDlg.h : header file // -#if !defined(AFX_BABYLONDLG_H__2BF3124D_3BA1_11D3_B9DA_006097B90D93__INCLUDED_) -#define AFX_BABYLONDLG_H__2BF3124D_3BA1_11D3_B9DA_006097B90D93__INCLUDED_ - #pragma once #include "resource.h" @@ -150,5 +147,3 @@ extern CBabylonDlg *MainDLG; //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_BABYLONDLG_H__2BF3124D_3BA1_11D3_B9DA_006097B90D93__INCLUDED_) diff --git a/Core/Tools/Babylon/DlgProxy.h b/Core/Tools/Babylon/DlgProxy.h index c57cb1f6f2..2473539fb3 100644 --- a/Core/Tools/Babylon/DlgProxy.h +++ b/Core/Tools/Babylon/DlgProxy.h @@ -19,9 +19,6 @@ // DlgProxy.h : header file // -#if !defined(AFX_DLGPROXY_H__2BF3124F_3BA1_11D3_B9DA_006097B90D93__INCLUDED_) -#define AFX_DLGPROXY_H__2BF3124F_3BA1_11D3_B9DA_006097B90D93__INCLUDED_ - #pragma once class CBabylonDlg; @@ -73,5 +70,3 @@ class CBabylonDlgAutoProxy : public CCmdTarget //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_DLGPROXY_H__2BF3124F_3BA1_11D3_B9DA_006097B90D93__INCLUDED_) diff --git a/Core/Tools/Babylon/ExportDlg.h b/Core/Tools/Babylon/ExportDlg.h index dcc13196c3..af799753f6 100644 --- a/Core/Tools/Babylon/ExportDlg.h +++ b/Core/Tools/Babylon/ExportDlg.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EXPORTDLG_H__DDA81307_4F1A_11D3_B9DA_006097B90D93__INCLUDED_) -#define AFX_EXPORTDLG_H__DDA81307_4F1A_11D3_B9DA_006097B90D93__INCLUDED_ - #pragma once + // ExportDlg.h : header file // @@ -75,5 +73,3 @@ class CExportDlg : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EXPORTDLG_H__DDA81307_4F1A_11D3_B9DA_006097B90D93__INCLUDED_) diff --git a/Core/Tools/Babylon/GenerateDlg.h b/Core/Tools/Babylon/GenerateDlg.h index fc17778aef..1be84d2b50 100644 --- a/Core/Tools/Babylon/GenerateDlg.h +++ b/Core/Tools/Babylon/GenerateDlg.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_GENERATEDLG_H__959D0D41_50A5_11D3_B9DA_006097B90D93__INCLUDED_) -#define AFX_GENERATEDLG_H__959D0D41_50A5_11D3_B9DA_006097B90D93__INCLUDED_ - #pragma once + // GenerateDlg.h : header file // @@ -86,5 +84,3 @@ class CGenerateDlg : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_GENERATEDLG_H__959D0D41_50A5_11D3_B9DA_006097B90D93__INCLUDED_) diff --git a/Core/Tools/Babylon/MatchDlg.h b/Core/Tools/Babylon/MatchDlg.h index 1c1781be02..56fa8dacc0 100644 --- a/Core/Tools/Babylon/MatchDlg.h +++ b/Core/Tools/Babylon/MatchDlg.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_MATCHDLG_H__FA868061_4EA7_11D3_B9DA_006097B90D93__INCLUDED_) -#define AFX_MATCHDLG_H__FA868061_4EA7_11D3_B9DA_006097B90D93__INCLUDED_ - #pragma once + // MatchDlg.h : header file // @@ -70,5 +68,3 @@ extern BabylonLabel *MatchLabel; //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_MATCHDLG_H__FA868061_4EA7_11D3_B9DA_006097B90D93__INCLUDED_) diff --git a/Core/Tools/Babylon/ProceedDlg.h b/Core/Tools/Babylon/ProceedDlg.h index e806e11ade..ee42c7809b 100644 --- a/Core/Tools/Babylon/ProceedDlg.h +++ b/Core/Tools/Babylon/ProceedDlg.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_PROCEEDDLG_H__35C33E24_5AD8_11D3_B9DA_006097B90D93__INCLUDED_) -#define AFX_PROCEEDDLG_H__35C33E24_5AD8_11D3_B9DA_006097B90D93__INCLUDED_ - #pragma once + // ProceedDlg.h : header file // #define IDALWAYS 101 @@ -64,5 +62,3 @@ class ProceedDlg : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_PROCEEDDLG_H__35C33E24_5AD8_11D3_B9DA_006097B90D93__INCLUDED_) diff --git a/Core/Tools/Babylon/Report.h b/Core/Tools/Babylon/Report.h index 157083fdad..93a66d12cd 100644 --- a/Core/Tools/Babylon/Report.h +++ b/Core/Tools/Babylon/Report.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_REPORT_H__47F98BA1_70E3_11D3_B9DA_006097B90D93__INCLUDED_) -#define AFX_REPORT_H__47F98BA1_70E3_11D3_B9DA_006097B90D93__INCLUDED_ - #pragma once + // Report.h : header file // @@ -83,5 +81,3 @@ class CReport : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_REPORT_H__47F98BA1_70E3_11D3_B9DA_006097B90D93__INCLUDED_) diff --git a/Core/Tools/Babylon/RetranslateDlg.h b/Core/Tools/Babylon/RetranslateDlg.h index 0ee359092a..4c7354ff65 100644 --- a/Core/Tools/Babylon/RetranslateDlg.h +++ b/Core/Tools/Babylon/RetranslateDlg.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_RETRANSLATEDLG_H__19E25401_0ECB_11D4_B9DB_006097B90D93__INCLUDED_) -#define AFX_RETRANSLATEDLG_H__19E25401_0ECB_11D4_B9DB_006097B90D93__INCLUDED_ - #pragma once + // RetranslateDlg.h : header file // @@ -69,5 +67,3 @@ class RetranslateDlg : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_RETRANSLATEDLG_H__19E25401_0ECB_11D4_B9DB_006097B90D93__INCLUDED_) diff --git a/Core/Tools/Babylon/StdAfx.h b/Core/Tools/Babylon/StdAfx.h index d9921738ca..14880ad8a4 100644 --- a/Core/Tools/Babylon/StdAfx.h +++ b/Core/Tools/Babylon/StdAfx.h @@ -21,9 +21,6 @@ // are changed infrequently // -#if !defined(AFX_STDAFX_H__2BF31252_3BA1_11D3_B9DA_006097B90D93__INCLUDED_) -#define AFX_STDAFX_H__2BF31252_3BA1_11D3_B9DA_006097B90D93__INCLUDED_ - #pragma once #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers @@ -58,4 +55,3 @@ extern char AppTitle[]; //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. -#endif // !defined(AFX_STDAFX_H__2BF31252_3BA1_11D3_B9DA_006097B90D93__INCLUDED_) diff --git a/Core/Tools/Babylon/TransDB.h b/Core/Tools/Babylon/TransDB.h index f10bcf61be..fd508f9e18 100644 --- a/Core/Tools/Babylon/TransDB.h +++ b/Core/Tools/Babylon/TransDB.h @@ -21,8 +21,7 @@ // // -#ifndef __TRANSDB_H -#define __TRANSDB_H +#pragma once #include "olestring.h" #include "list.h" @@ -424,7 +423,3 @@ class DupNode : public ListNode extern TransDB* FirstTransDB ( void ); - - - -#endif // __TRANSDB_H diff --git a/Core/Tools/Babylon/VIEWDBSII.h b/Core/Tools/Babylon/VIEWDBSII.h index 21b77841b3..a9ea386653 100644 --- a/Core/Tools/Babylon/VIEWDBSII.h +++ b/Core/Tools/Babylon/VIEWDBSII.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_VIEWDBSII_H__AC697EE4_6D37_4F29_ACC7_8B260A33DA2E__INCLUDED_) -#define AFX_VIEWDBSII_H__AC697EE4_6D37_4F29_ACC7_8B260A33DA2E__INCLUDED_ - #pragma once + // VIEWDBSII.h : header file // @@ -64,5 +62,3 @@ class VIEWDBSII : public CDialog extern int ViewChanges; //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_VIEWDBSII_H__AC697EE4_6D37_4F29_ACC7_8B260A33DA2E__INCLUDED_) diff --git a/Core/Tools/Babylon/VerifyDlg.h b/Core/Tools/Babylon/VerifyDlg.h index 5b24565c9f..04964b6f3f 100644 --- a/Core/Tools/Babylon/VerifyDlg.h +++ b/Core/Tools/Babylon/VerifyDlg.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_VERIFYDLG_H__88E9C121_599B_11D3_B9DA_006097B90D93__INCLUDED_) -#define AFX_VERIFYDLG_H__88E9C121_599B_11D3_B9DA_006097B90D93__INCLUDED_ - #pragma once + // VerifyDlg.h : header file // @@ -79,5 +77,3 @@ class VerifyDlg : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_VERIFYDLG_H__88E9C121_599B_11D3_B9DA_006097B90D93__INCLUDED_) diff --git a/Core/Tools/Babylon/VerifyTextDlg.h b/Core/Tools/Babylon/VerifyTextDlg.h index 057b7d75d2..fca1dda0fd 100644 --- a/Core/Tools/Babylon/VerifyTextDlg.h +++ b/Core/Tools/Babylon/VerifyTextDlg.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_VERIFYTEXTDLG_H__39DB1C81_6B90_11D3_B9DA_006097B90D93__INCLUDED_) -#define AFX_VERIFYTEXTDLG_H__39DB1C81_6B90_11D3_B9DA_006097B90D93__INCLUDED_ - #pragma once + // VerifyTextDlg.h : header file // @@ -62,5 +60,3 @@ class CVerifyTextDlg : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_VERIFYTEXTDLG_H__39DB1C81_6B90_11D3_B9DA_006097B90D93__INCLUDED_) diff --git a/Core/Tools/Babylon/XLStuff.h b/Core/Tools/Babylon/XLStuff.h index e1849185da..90361bab44 100644 --- a/Core/Tools/Babylon/XLStuff.h +++ b/Core/Tools/Babylon/XLStuff.h @@ -21,8 +21,7 @@ // // -#ifndef XLSTUFF_H -#define XLSTUFF_H +#pragma once #include "BabylonDlg.h" typedef enum { @@ -256,7 +255,3 @@ int PutSection ( int row, const OLECHAR *title ); void SelectActiveSheet ( void ); int GetInt ( int row, int cell ); int GetString ( int row, int cell, OLECHAR *buffer ); - - - -#endif // XLSTUFF_H diff --git a/Core/Tools/Babylon/bin.h b/Core/Tools/Babylon/bin.h index a4915ea223..f928b15033 100644 --- a/Core/Tools/Babylon/bin.h +++ b/Core/Tools/Babylon/bin.h @@ -20,9 +20,7 @@ // Bin.h // - -#ifndef __BIN_H -#define __BIN_H +#pragma once #include "list.h" #include "olestring.h" @@ -103,6 +101,3 @@ class BinID }; - - -#endif // __BIN_H diff --git a/Core/Tools/Babylon/expimp.h b/Core/Tools/Babylon/expimp.h index adf558bd01..b15d0252dc 100644 --- a/Core/Tools/Babylon/expimp.h +++ b/Core/Tools/Babylon/expimp.h @@ -20,8 +20,7 @@ // expimp.h // -#ifndef __EXPIMP_H -#define __EXPIMP_H +#pragma once #include "TransDB.h" #include "BabylonDlg.h" @@ -107,4 +106,3 @@ int UpdateSentTranslations ( TransDB *db, const char *filename, CBabylonDlg *dlg int GenerateGameFiles ( TransDB *db, const char *filename, GNOPTIONS *option, LangID *languages, CBabylonDlg *dlg = NULL ); int GenerateReport ( TransDB *db, const char *filename, RPOPTIONS *options, LangID *languages, CBabylonDlg *dlg = NULL ); void ProcessWaves ( TransDB *db, const char *filename, CBabylonDlg *dlg ); -#endif diff --git a/Core/Tools/Babylon/fileops.h b/Core/Tools/Babylon/fileops.h index 174835192e..11a6bc0947 100644 --- a/Core/Tools/Babylon/fileops.h +++ b/Core/Tools/Babylon/fileops.h @@ -20,8 +20,7 @@ // File IO support // -#ifndef __FILEOPS_H -#define __FILEOPS_H +#pragma once static const int FA_NOFILE = 0; static const int FA_READONLY = 0x00000001; @@ -33,6 +32,3 @@ int FileExists ( const char *filename ); int FileAttribs ( const char *filename ); void MakeBackupFile ( const char *filename ); void RestoreBackupFile ( const char *filename ); - - -#endif // __FILEIO_H diff --git a/Core/Tools/Babylon/iff.h b/Core/Tools/Babylon/iff.h index c79d500fd1..7d1860032d 100644 --- a/Core/Tools/Babylon/iff.h +++ b/Core/Tools/Babylon/iff.h @@ -16,9 +16,7 @@ ** along with this program. If not, see . */ - -#ifndef __IFF_H -#define __IFF_H +#pragma once #define MakeID(a,b,c,d) ( (int) ( ( (int) (a) ) << 24 | ( (int) (b) ) << 16 | \ ( (int) (c) ) << 8 | ( (int) (d) ) ) ) @@ -122,6 +120,3 @@ int IFF_CloseChunk ( IFF_FILE * ); #define LtEn16(L) (L) #endif - - -#endif /* __IFF_H */ diff --git a/Core/Tools/Babylon/list.h b/Core/Tools/Babylon/list.h index 4de146bda4..944ae2b74b 100644 --- a/Core/Tools/Babylon/list.h +++ b/Core/Tools/Babylon/list.h @@ -16,10 +16,7 @@ ** along with this program. If not, see . */ - -#ifndef __LIST_H -#define __LIST_H - +#pragma once const int LOWEST_PRIORITY = (int ) 0x80000000; const int HIGHEST_PRIORITY = (int) 0x7fffffff; @@ -90,6 +87,3 @@ class ListSearch ListNode* LastNode ( List *new_head) { node = head = new_head; return Prev (); }; }; - - -#endif // __LIST_H diff --git a/Core/Tools/Babylon/loadsave.h b/Core/Tools/Babylon/loadsave.h index 977507a3f3..cde180af92 100644 --- a/Core/Tools/Babylon/loadsave.h +++ b/Core/Tools/Babylon/loadsave.h @@ -20,12 +20,8 @@ // loadsave.h // -#ifndef __LOADSAVE_H -#define __LOADSAVE_H +#pragma once int WriteMainDB(TransDB *db, const char *filename, CBabylonDlg *dlg ); int LoadMainDB(TransDB *db, const char *filename, void (*cb) (void ) = NULL ); int GetLabelCountDB ( char *filename ); - - -#endif diff --git a/Core/Tools/Babylon/olestring.h b/Core/Tools/Babylon/olestring.h index 577c86e800..1e3dd2908d 100644 --- a/Core/Tools/Babylon/olestring.h +++ b/Core/Tools/Babylon/olestring.h @@ -20,8 +20,7 @@ // OLEString // -#ifndef __OLESTRING_H -#define __OLESTRING_H +#pragma once const unsigned int OLESTRING_DEFAULT_SIZE = 256; @@ -55,7 +54,3 @@ template int SameFormat ( text *string1, text *string2 ); template void EncodeFormat ( text *string ); template void DecodeFormat ( text *string ); template int IsFormatTypeChar( text string1 ); - - - -#endif // __OLESTRING_H diff --git a/Core/Tools/Babylon/transcs.h b/Core/Tools/Babylon/transcs.h index f0a6c5de3f..559fa4f7eb 100644 --- a/Core/Tools/Babylon/transcs.h +++ b/Core/Tools/Babylon/transcs.h @@ -20,10 +20,6 @@ // transcs.h Translate char set // -#ifndef _TRANSCS_H -#define _TRANSCS_H - +#pragma once void CreateTranslationTable ( void ); - -#endif // _TRANSCS_H diff --git a/Core/Tools/CRCDiff/KVPair.h b/Core/Tools/CRCDiff/KVPair.h index a701b3a2a9..6ef7043b3a 100644 --- a/Core/Tools/CRCDiff/KVPair.h +++ b/Core/Tools/CRCDiff/KVPair.h @@ -23,8 +23,7 @@ // Description: Key/Value Pair class // --------------------------------------------------------------------------- -#ifndef __KVPAIR_H__ -#define __KVPAIR_H__ +#pragma once #include #include @@ -48,6 +47,3 @@ class KVPairClass protected: KeyValueMap m_map; }; - -#endif // __KVPAIR_H__ - diff --git a/Core/Tools/CRCDiff/debug.h b/Core/Tools/CRCDiff/debug.h index 8f1473ee9f..1945b6ef99 100644 --- a/Core/Tools/CRCDiff/debug.h +++ b/Core/Tools/CRCDiff/debug.h @@ -20,8 +20,7 @@ // Minimal debug info // Author: Matthew D. Campbell, Sept 2002 -#ifndef __DEBUG_H__ -#define __DEBUG_H__ +#pragma once #ifdef DEBUG @@ -35,6 +34,3 @@ void DebugLog( const char *fmt, ... ); #define DEBUG_LOG(x) {} #endif // DEBUG - -#endif // __DEBUG_H__ - diff --git a/Core/Tools/CRCDiff/expander.h b/Core/Tools/CRCDiff/expander.h index 8dcbe5873b..4373e87208 100644 --- a/Core/Tools/CRCDiff/expander.h +++ b/Core/Tools/CRCDiff/expander.h @@ -23,8 +23,7 @@ // Description: Key/value pair template expansion class // --------------------------------------------------------------------------- -#ifndef __EXPANDER_H__ -#define __EXPANDER_H__ +#pragma once #include #include @@ -49,6 +48,3 @@ class Expander std::string m_left; std::string m_right; }; - -#endif // __EXPANDER_H__ - diff --git a/Core/Tools/CRCDiff/misc.h b/Core/Tools/CRCDiff/misc.h index 6f394ff3c5..54bc699580 100644 --- a/Core/Tools/CRCDiff/misc.h +++ b/Core/Tools/CRCDiff/misc.h @@ -23,12 +23,8 @@ // Description: misc utils // --------------------------------------------------------------------------- -#ifndef __MISC_H__ -#define __MISC_H__ +#pragma once #include std::string intToString(int val); - -#endif // __MISC_H__ - diff --git a/Core/Tools/DebugWindow/DebugWindow.h b/Core/Tools/DebugWindow/DebugWindow.h index 2176235ab8..27d437e628 100644 --- a/Core/Tools/DebugWindow/DebugWindow.h +++ b/Core/Tools/DebugWindow/DebugWindow.h @@ -19,9 +19,6 @@ // DebugWindow.h : main header file for the DEBUGWINDOW DLL // -#if !defined(AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_) -#define AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_ - #pragma once #ifndef __AFXWIN_H__ @@ -66,5 +63,3 @@ class CDebugWindowApp : public CWinApp //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_) diff --git a/Core/Tools/DebugWindow/StdAfx.h b/Core/Tools/DebugWindow/StdAfx.h index fde63685f9..93949ef824 100644 --- a/Core/Tools/DebugWindow/StdAfx.h +++ b/Core/Tools/DebugWindow/StdAfx.h @@ -21,9 +21,6 @@ // are changed infrequently // -#if !defined(AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_) -#define AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_ - #pragma once #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers @@ -59,5 +56,3 @@ //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_) diff --git a/Core/Tools/ImagePacker/Include/ImageDirectory.h b/Core/Tools/ImagePacker/Include/ImageDirectory.h index ae2984c556..d2b64c33ef 100644 --- a/Core/Tools/ImagePacker/Include/ImageDirectory.h +++ b/Core/Tools/ImagePacker/Include/ImageDirectory.h @@ -40,9 +40,6 @@ #pragma once -#ifndef __IMAGEDIRECTORY_H_ -#define __IMAGEDIRECTORY_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -82,6 +79,3 @@ inline ImageDirectory::ImageDirectory( void ) } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __IMAGEDIRECTORY_H_ - diff --git a/Core/Tools/ImagePacker/Include/ImageInfo.h b/Core/Tools/ImagePacker/Include/ImageInfo.h index a5c8927c9e..3dce43dfc0 100644 --- a/Core/Tools/ImagePacker/Include/ImageInfo.h +++ b/Core/Tools/ImagePacker/Include/ImageInfo.h @@ -39,9 +39,6 @@ #pragma once -#ifndef __IMAGEINFO_H_ -#define __IMAGEINFO_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -111,6 +108,3 @@ class ImageInfo // INLINING /////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __IMAGEINFO_H_ - diff --git a/Core/Tools/ImagePacker/Include/ImagePacker.h b/Core/Tools/ImagePacker/Include/ImagePacker.h index 35a08b0066..b03abd8c86 100644 --- a/Core/Tools/ImagePacker/Include/ImagePacker.h +++ b/Core/Tools/ImagePacker/Include/ImagePacker.h @@ -39,9 +39,6 @@ #pragma once -#ifndef __IMAGEPACKER_H_ -#define __IMAGEPACKER_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -212,6 +209,3 @@ inline UnsignedInt ImagePacker::getGapMethod( void ) { return m_gapMethod; } // EXTERNALS ////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// extern ImagePacker *TheImagePacker; - -#endif // __IMAGEPACKER_H_ - diff --git a/Core/Tools/ImagePacker/Include/TexturePage.h b/Core/Tools/ImagePacker/Include/TexturePage.h index 93a9a4a462..c0bc646790 100644 --- a/Core/Tools/ImagePacker/Include/TexturePage.h +++ b/Core/Tools/ImagePacker/Include/TexturePage.h @@ -40,9 +40,6 @@ #pragma once -#ifndef __TEXTUREPAGE_H_ -#define __TEXTUREPAGE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -167,6 +164,3 @@ inline Int TexturePage::getWidth( void ) { return m_size.x; } inline Int TexturePage::getHeight( void ) { return m_size.y; } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __TEXTUREPAGE_H_ - diff --git a/Core/Tools/ImagePacker/Include/WinMain.h b/Core/Tools/ImagePacker/Include/WinMain.h index dc2cffc033..c5ebe3b4af 100644 --- a/Core/Tools/ImagePacker/Include/WinMain.h +++ b/Core/Tools/ImagePacker/Include/WinMain.h @@ -39,9 +39,6 @@ #pragma once -#ifndef __WINMAIN_H_ -#define __WINMAIN_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -57,6 +54,3 @@ // EXTERNALS ////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// extern HINSTANCE ApplicationHInstance; - -#endif // __WINMAIN_H_ - diff --git a/Core/Tools/ImagePacker/Include/WindowProc.h b/Core/Tools/ImagePacker/Include/WindowProc.h index 6d99831943..57886fd6c3 100644 --- a/Core/Tools/ImagePacker/Include/WindowProc.h +++ b/Core/Tools/ImagePacker/Include/WindowProc.h @@ -39,9 +39,6 @@ #pragma once -#ifndef __WINDOWPROC_H_ -#define __WINDOWPROC_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -69,6 +66,3 @@ extern BOOL CALLBACK PageErrorProc( HWND hWndDialog, UINT message, extern BOOL CALLBACK DirectorySelectProc( HWND hWndDialog, UINT message, WPARAM wParam, LPARAM lParam ); - -#endif // __WINDOWPROC_H_ - diff --git a/Core/Tools/Launcher/BFISH.H b/Core/Tools/Launcher/BFISH.H index 5d206620d0..5290954ee7 100644 --- a/Core/Tools/Launcher/BFISH.H +++ b/Core/Tools/Launcher/BFISH.H @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef BFISH_H -#define BFISH_H +#pragma once #include @@ -100,6 +99,3 @@ class BlowfishEngine { */ unsigned long bf_S[4][UCHAR_MAX+1]; }; - -#endif - diff --git a/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.h b/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.h index dd1f4723bf..976219ce74 100644 --- a/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.h +++ b/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.h @@ -34,8 +34,7 @@ * ******************************************************************************/ -#ifndef _DEBUGPRINT_H_ -#define _DEBUGPRINT_H_ +#pragma once #ifdef RTS_DEBUG @@ -61,5 +60,3 @@ extern char debugLogName[]; #define PrintWin32Error #endif // RTS_DEBUG - -#endif // _DEBUGPRINT_H_ diff --git a/Core/Tools/Launcher/Toolkit/Storage/File.h b/Core/Tools/Launcher/Toolkit/Storage/File.h index 6c629ffcb0..245c93f5a0 100644 --- a/Core/Tools/Launcher/Toolkit/Storage/File.h +++ b/Core/Tools/Launcher/Toolkit/Storage/File.h @@ -34,8 +34,7 @@ * ****************************************************************************/ -#ifndef FILE_H -#define FILE_H +#pragma once #include #include "Stream.h" @@ -149,5 +148,3 @@ class File : public Stream HANDLE mHandle; static const HANDLE INVALID_HANDLE; }; - -#endif // FILE_H diff --git a/Core/Tools/Launcher/Toolkit/Storage/Rights.h b/Core/Tools/Launcher/Toolkit/Storage/Rights.h index 6be60c6aa0..5414573fd8 100644 --- a/Core/Tools/Launcher/Toolkit/Storage/Rights.h +++ b/Core/Tools/Launcher/Toolkit/Storage/Rights.h @@ -34,8 +34,7 @@ * ****************************************************************************/ -#ifndef RIGHTS_H -#define RIGHTS_H +#pragma once // Access rights typedef enum @@ -44,5 +43,3 @@ typedef enum Rights_WriteOnly, Rights_ReadWrite, } ERights; - -#endif // RIGHTS_H diff --git a/Core/Tools/Launcher/Toolkit/Storage/Stream.h b/Core/Tools/Launcher/Toolkit/Storage/Stream.h index 8fc7b24f17..1803bd64d8 100644 --- a/Core/Tools/Launcher/Toolkit/Storage/Stream.h +++ b/Core/Tools/Launcher/Toolkit/Storage/Stream.h @@ -34,8 +34,7 @@ * ****************************************************************************/ -#ifndef STREAM_H -#define STREAM_H +#pragma once #include @@ -77,5 +76,3 @@ class Stream //! Flush the stream virtual void Flush(void) = 0; }; - -#endif // STREAM_H diff --git a/Core/Tools/Launcher/Toolkit/Support/RefCounted.h b/Core/Tools/Launcher/Toolkit/Support/RefCounted.h index b04986fa9b..314c71003d 100644 --- a/Core/Tools/Launcher/Toolkit/Support/RefCounted.h +++ b/Core/Tools/Launcher/Toolkit/Support/RefCounted.h @@ -37,8 +37,7 @@ * ******************************************************************************/ -#ifndef REFCOUNTED_H -#define REFCOUNTED_H +#pragma once #include @@ -82,5 +81,3 @@ class RefCounted unsigned int mRefCount; }; - -#endif // REFCOUNTED_H diff --git a/Core/Tools/Launcher/Toolkit/Support/RefPtr.h b/Core/Tools/Launcher/Toolkit/Support/RefPtr.h index a82bab8867..0e4e5c255d 100644 --- a/Core/Tools/Launcher/Toolkit/Support/RefPtr.h +++ b/Core/Tools/Launcher/Toolkit/Support/RefPtr.h @@ -65,8 +65,7 @@ * ******************************************************************************/ -#ifndef REFPTR_H -#define REFPTR_H +#pragma once #include "Visualc.h" #include "RefCounted.h" @@ -357,5 +356,3 @@ RefPtr Const_Cast(RefPtrConst& rhs) object.Attach(rhs.ReferencedObject()); return object; } - -#endif // RC_PTR_H diff --git a/Core/Tools/Launcher/Toolkit/Support/StringConvert.h b/Core/Tools/Launcher/Toolkit/Support/StringConvert.h index 5eb3ab587c..c7a1515f33 100644 --- a/Core/Tools/Launcher/Toolkit/Support/StringConvert.h +++ b/Core/Tools/Launcher/Toolkit/Support/StringConvert.h @@ -34,8 +34,7 @@ * ******************************************************************************/ -#ifndef STRINGCONVERT_H -#define STRINGCONVERT_H +#pragma once #include "UTypes.h" @@ -43,5 +42,3 @@ class UString; Char* UStringToANSI(const UString& string, Char* buffer, UInt bufferLength); Char* UnicodeToANSI(const WChar* string, Char* buffer, UInt bufferLength); - -#endif // STRINGCONVERT_H diff --git a/Core/Tools/Launcher/Toolkit/Support/UString.h b/Core/Tools/Launcher/Toolkit/Support/UString.h index 6168d87305..a9b23e20f8 100644 --- a/Core/Tools/Launcher/Toolkit/Support/UString.h +++ b/Core/Tools/Launcher/Toolkit/Support/UString.h @@ -34,8 +34,7 @@ * ******************************************************************************/ -#ifndef USTRING_H -#define USTRING_H +#pragma once #include "UTypes.h" #include "RefCounted.h" @@ -235,5 +234,3 @@ class UString WChar* mData; UInt mCapacity; }; - -#endif // USTRING_H diff --git a/Core/Tools/Launcher/Toolkit/Support/UTypes.h b/Core/Tools/Launcher/Toolkit/Support/UTypes.h index d5219a5096..77e5eaa8ba 100644 --- a/Core/Tools/Launcher/Toolkit/Support/UTypes.h +++ b/Core/Tools/Launcher/Toolkit/Support/UTypes.h @@ -34,8 +34,7 @@ * ******************************************************************************/ -#ifndef UTYPES_H -#define UTYPES_H +#pragma once //! Signed integer value typedef int Int; @@ -90,5 +89,3 @@ typedef enum {OFF = false, ON = true, PENDING = -1} TriState; #ifndef NULL #define NULL (0L) #endif - -#endif // UTYPES_H diff --git a/Core/Tools/Launcher/Toolkit/Support/Visualc.h b/Core/Tools/Launcher/Toolkit/Support/Visualc.h index f18fe1613e..e8bd635539 100644 --- a/Core/Tools/Launcher/Toolkit/Support/Visualc.h +++ b/Core/Tools/Launcher/Toolkit/Support/Visualc.h @@ -33,10 +33,8 @@ * $Revision: $ * ******************************************************************************/ -#pragma once -#ifndef _VISUALC_H_ -#define _VISUALC_H_ +#pragma once #if defined(_MSC_VER) @@ -87,4 +85,3 @@ #pragma warning(disable:4786) #endif // _MSC_VER -#endif // _VISUALC_H_ diff --git a/Core/Tools/Launcher/configfile.h b/Core/Tools/Launcher/configfile.h index c99d4897fb..19354c6009 100644 --- a/Core/Tools/Launcher/configfile.h +++ b/Core/Tools/Launcher/configfile.h @@ -26,8 +26,7 @@ Start Date : June 9, 1997 Last Update : June 17, 1997 \***************************************************************************/ -#ifndef CONFIGFILE_HEADER -#define CONFIGFILE_HEADER +#pragma once #include "dictionary.h" #include "wstring.h" @@ -51,5 +50,3 @@ class ConfigFile Dictionary dictionary; // stores the mappings from keys // to value strings }; - -#endif diff --git a/Core/Tools/Launcher/dialog.h b/Core/Tools/Launcher/dialog.h index c293e315bf..101db772c8 100644 --- a/Core/Tools/Launcher/dialog.h +++ b/Core/Tools/Launcher/dialog.h @@ -16,13 +16,10 @@ ** along with this program. If not, see . */ -#ifndef DIALOG_HEADER -#define DIALOG_HEADER +#pragma once #include"winblows.h" #include HWND Create_Patch_Dialog(void); extern HWND PatchDialog; - -#endif diff --git a/Core/Tools/Launcher/dictionary.h b/Core/Tools/Launcher/dictionary.h index 01a0386a01..640190a5b5 100644 --- a/Core/Tools/Launcher/dictionary.h +++ b/Core/Tools/Launcher/dictionary.h @@ -35,8 +35,7 @@ is working well, this is much faster than a linked list, but only if your hashing function is good. \****************************************************************************/ -#ifndef DICTIONARY_HEADER -#define DICTIONARY_HEADER +#pragma once #include #include @@ -582,5 +581,3 @@ void Dictionary::expand(void) } delete[](oldtable); } - -#endif diff --git a/Core/Tools/Launcher/filed.h b/Core/Tools/Launcher/filed.h index cbbacf79a9..f490b05d1c 100644 --- a/Core/Tools/Launcher/filed.h +++ b/Core/Tools/Launcher/filed.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef FILED_HEADER -#define FILED_HEADER +#pragma once #include "odevice.h" @@ -52,5 +51,3 @@ class FileD : public OutputDevice FILE *out; bool m_outputDebug; }; - -#endif diff --git a/Core/Tools/Launcher/findpatch.h b/Core/Tools/Launcher/findpatch.h index 89a773bbf5..f21669014b 100644 --- a/Core/Tools/Launcher/findpatch.h +++ b/Core/Tools/Launcher/findpatch.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef FINDPATCH_HEADER -#define FINDPATCH_HEADER +#pragma once #include #include @@ -29,5 +28,3 @@ int Find_Patch(OUT char *file,int maxlen, ConfigFile &config); bit8 Get_App_Dir(OUT char *file,int maxlen, ConfigFile &config, int index); void Delete_Patches(ConfigFile &config); - -#endif diff --git a/Core/Tools/Launcher/loadbmp.h b/Core/Tools/Launcher/loadbmp.h index df825349f1..e2614fbe6c 100644 --- a/Core/Tools/Launcher/loadbmp.h +++ b/Core/Tools/Launcher/loadbmp.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef LOADBMP_HEADER -#define LOADBMP_HEADER +#pragma once #include #include @@ -41,6 +40,3 @@ class LoadBmp HPALETTE PalHandle_; HWND WindowHandle_; }; - - -#endif diff --git a/Core/Tools/Launcher/monod.h b/Core/Tools/Launcher/monod.h index 494674c974..4f94fd065e 100644 --- a/Core/Tools/Launcher/monod.h +++ b/Core/Tools/Launcher/monod.h @@ -16,9 +16,7 @@ ** along with this program. If not, see . */ -#ifndef MONOD_HEADER -#define MONOD_HEADER - +#pragma once #include #include @@ -70,5 +68,3 @@ class MonoD : public OutputDevice HANDLE handle; #endif }; - -#endif diff --git a/Core/Tools/Launcher/odevice.h b/Core/Tools/Launcher/odevice.h index ccd45e01a8..8cb924ea42 100644 --- a/Core/Tools/Launcher/odevice.h +++ b/Core/Tools/Launcher/odevice.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef ODEVICE_HEADER -#define ODEVICE_HEADER +#pragma once // This virtual base class provides an interface for output devices // that can be used for the debugging package. @@ -28,5 +27,3 @@ class OutputDevice virtual ~OutputDevice() {}; virtual int print(const char *s,int len)=0; }; - -#endif diff --git a/Core/Tools/Launcher/patch.h b/Core/Tools/Launcher/patch.h index fcb6db3745..b724c59ff9 100644 --- a/Core/Tools/Launcher/patch.h +++ b/Core/Tools/Launcher/patch.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef PATCH_HEADER -#define PATCH_HEADER +#pragma once #include "winblows.h" #include "dialog.h" @@ -26,5 +25,3 @@ #include "process.h" void Apply_Patch(char *patchfile,ConfigFile &config,int skuIndex); - -#endif diff --git a/Core/Tools/Launcher/process.h b/Core/Tools/Launcher/process.h index b123b37399..d3f2625bee 100644 --- a/Core/Tools/Launcher/process.h +++ b/Core/Tools/Launcher/process.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef PROCESS_HEADER -#define PROCESS_HEADER +#pragma once #include #include "wstypes.h" @@ -41,6 +40,3 @@ class Process bit8 Read_Process_Info(ConfigFile &config,OUT Process &info, IN const char *key = NULL); bit8 Create_Process(Process &process); bit8 Wait_Process(Process &process, DWORD *exit_code=NULL); - - -#endif diff --git a/Core/Tools/Launcher/streamer.h b/Core/Tools/Launcher/streamer.h index 41a83a30cc..ec79562070 100644 --- a/Core/Tools/Launcher/streamer.h +++ b/Core/Tools/Launcher/streamer.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef STREAMER_HEADER -#define STREAMER_HEADER +#pragma once #include #include @@ -57,5 +56,3 @@ class Streamer : public streambuf OutputDevice *Output_Device; char *Buf; }; - -#endif diff --git a/Core/Tools/Launcher/wdebug.h b/Core/Tools/Launcher/wdebug.h index 816fa743b7..72f732b648 100644 --- a/Core/Tools/Launcher/wdebug.h +++ b/Core/Tools/Launcher/wdebug.h @@ -50,8 +50,7 @@ will you be ready to leave grasshopper. \*****************************************************************************/ -#ifndef WDEBUG_HEADER -#define WDEBUG_HEADER +#pragma once #include #include "odevice.h" @@ -189,5 +188,3 @@ class MsgManager static ostream *warnStream(void); static ostream *errorStream(void); }; - -#endif diff --git a/Core/Tools/Launcher/winblows.h b/Core/Tools/Launcher/winblows.h index 3d43acc06a..9e6d14ef1f 100644 --- a/Core/Tools/Launcher/winblows.h +++ b/Core/Tools/Launcher/winblows.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef WINBLOWS_HEADER -#define WINBLOWS_HEADER +#pragma once #define WIN32_LEAN_AND_MEAN #include @@ -33,5 +32,3 @@ extern int main(int argc, char *argv[]); int Print_WM(UINT wm,char *out); - -#endif diff --git a/Core/Tools/Launcher/wstring.h b/Core/Tools/Launcher/wstring.h index 94ddf203e0..00f39c2ffc 100644 --- a/Core/Tools/Launcher/wstring.h +++ b/Core/Tools/Launcher/wstring.h @@ -26,8 +26,7 @@ Start Date : June 1, 1997 Last Update : June 17, 1997 \****************************************************************************/ -#ifndef WSTRING_HEADER -#define WSTRING_HEADER +#pragma once #include #include @@ -83,5 +82,3 @@ class Wstring private: char *str; // Pointer to allocated string. }; - -#endif diff --git a/Core/Tools/Launcher/wstypes.h b/Core/Tools/Launcher/wstypes.h index 7bc8c565ca..d521a5872a 100644 --- a/Core/Tools/Launcher/wstypes.h +++ b/Core/Tools/Launcher/wstypes.h @@ -28,8 +28,7 @@ Last Update : June 17, 1997 Standard type definitions for the sake of portability and readability. \***************************************************************************/ -#ifndef WTYPES_HEADER -#define WTYPES_HEADER +#pragma once #ifndef TRUE #define TRUE 1 @@ -78,5 +77,3 @@ typedef unsigned int uint32; #define strncasecmp _strnicmp #define strcasecmp _stricmp #endif - -#endif diff --git a/Core/Tools/MapCacheBuilder/Include/WinMain.h b/Core/Tools/MapCacheBuilder/Include/WinMain.h index dc2cffc033..c5ebe3b4af 100644 --- a/Core/Tools/MapCacheBuilder/Include/WinMain.h +++ b/Core/Tools/MapCacheBuilder/Include/WinMain.h @@ -39,9 +39,6 @@ #pragma once -#ifndef __WINMAIN_H_ -#define __WINMAIN_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -57,6 +54,3 @@ // EXTERNALS ////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// extern HINSTANCE ApplicationHInstance; - -#endif // __WINMAIN_H_ - diff --git a/Core/Tools/PATCHGET/CHATAPI.H b/Core/Tools/PATCHGET/CHATAPI.H index bcb549fe6c..e0e9d90eb4 100644 --- a/Core/Tools/PATCHGET/CHATAPI.H +++ b/Core/Tools/PATCHGET/CHATAPI.H @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef CHATAPI_HEADER -#define CHATAPI_HEADER +#pragma once #include "COMINIT.H" #include @@ -46,5 +45,3 @@ void Update_If_Required(void); char const * Fetch_String(int id); } // namespace patchget - -#endif diff --git a/Core/Tools/PATCHGET/COMINIT.H b/Core/Tools/PATCHGET/COMINIT.H index 2836f791c3..c35f69a2de 100644 --- a/Core/Tools/PATCHGET/COMINIT.H +++ b/Core/Tools/PATCHGET/COMINIT.H @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef COMINIT_HEADER -#define COMINIT_HEADER +#pragma once namespace patchget { @@ -35,5 +34,3 @@ class ComInit }; } // namespace patchget - -#endif diff --git a/Core/Tools/PATCHGET/DownloadManager.h b/Core/Tools/PATCHGET/DownloadManager.h index 8b4a207757..443156920c 100644 --- a/Core/Tools/PATCHGET/DownloadManager.h +++ b/Core/Tools/PATCHGET/DownloadManager.h @@ -22,9 +22,6 @@ #pragma once -#ifndef __DOWNLOADMANAGER_H__ -#define __DOWNLOADMANAGER_H__ - #include "WWDownload/downloaddefs.h" #include "WWDownload/Download.h" #include @@ -96,5 +93,3 @@ class DownloadManager : public IDownload extern DownloadManager *TheDownloadManager; } // namespace patchget - -#endif // __DOWNLOADMANAGER_H__ diff --git a/Core/Tools/PATCHGET/PROCESS.H b/Core/Tools/PATCHGET/PROCESS.H index a1c9b61d87..4611eb3d13 100644 --- a/Core/Tools/PATCHGET/PROCESS.H +++ b/Core/Tools/PATCHGET/PROCESS.H @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef PROCESS_HEADER -#define PROCESS_HEADER +#pragma once #include #include "WSTYPES.H" @@ -42,5 +41,3 @@ bit8 Create_Process(Process &process); bit8 Wait_Process(Process &process, DWORD *exit_code=NULL); } // namespace patchget - -#endif diff --git a/Core/Tools/PATCHGET/Registry.h b/Core/Tools/PATCHGET/Registry.h index 3600d0fefb..644dbdcf2b 100644 --- a/Core/Tools/PATCHGET/Registry.h +++ b/Core/Tools/PATCHGET/Registry.h @@ -22,9 +22,6 @@ #pragma once -#ifndef __REGISTRY_H__ -#define __REGISTRY_H__ - #include namespace patchget @@ -51,5 +48,3 @@ bool SetStringInRegistry(std::string path, std::string key, std::string val); bool SetUnsignedIntInRegistry(std::string path, std::string key, unsigned int val); } // namespace patchget - -#endif // __REGISTRY_H__ diff --git a/Core/Tools/PATCHGET/WINBLOWS.H b/Core/Tools/PATCHGET/WINBLOWS.H index be4f13f034..534208b551 100644 --- a/Core/Tools/PATCHGET/WINBLOWS.H +++ b/Core/Tools/PATCHGET/WINBLOWS.H @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef WINBLOWS_HEADER -#define WINBLOWS_HEADER +#pragma once #define WIN32_LEAN_AND_MEAN #include @@ -33,5 +32,3 @@ extern int main(int argc, char *argv[]); int Print_WM(UINT wm,char *out); - -#endif diff --git a/Core/Tools/PATCHGET/WSTYPES.H b/Core/Tools/PATCHGET/WSTYPES.H index fc8b255ec3..df4ee9b894 100644 --- a/Core/Tools/PATCHGET/WSTYPES.H +++ b/Core/Tools/PATCHGET/WSTYPES.H @@ -28,8 +28,7 @@ Last Update : June 17, 1997 Standard type definitions for the sake of portability and readability. \***************************************************************************/ -#ifndef WTYPES_HEADER -#define WTYPES_HEADER +#pragma once #ifndef TRUE #define TRUE 1 @@ -70,5 +69,3 @@ typedef unsigned int uint32; #define strncasecmp _strnicmp #define strcasecmp _stricmp #endif - -#endif diff --git a/Core/Tools/PATCHGET/debug.h b/Core/Tools/PATCHGET/debug.h index 4a6a3a31dd..e61a99033a 100644 --- a/Core/Tools/PATCHGET/debug.h +++ b/Core/Tools/PATCHGET/debug.h @@ -20,8 +20,7 @@ // Minimal debug info // Author: Matthew D. Campbell, Sept 2002 -#ifndef __DEBUG_H__ -#define __DEBUG_H__ +#pragma once namespace patchget { @@ -71,6 +70,3 @@ void DebugLog( const char *fmt, ... ); #endif } // namespace patchget - -#endif // __DEBUG_H__ - diff --git a/Core/Tools/W3DView/AddToLineupDialog.h b/Core/Tools/W3DView/AddToLineupDialog.h index dbda01f2f2..5c331479da 100644 --- a/Core/Tools/W3DView/AddToLineupDialog.h +++ b/Core/Tools/W3DView/AddToLineupDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_ADDTOLINEUPDIALOG_H__AD8B92C5_25CB_11D4_8A1D_0090272E6F90__INCLUDED_) -#define AFX_ADDTOLINEUPDIALOG_H__AD8B92C5_25CB_11D4_8A1D_0090272E6F90__INCLUDED_ - #pragma once + // AddToLineupDialog.h : header file // @@ -63,5 +61,3 @@ class CAddToLineupDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_ADDTOLINEUPDIALOG_H__AD8B92C5_25CB_11D4_8A1D_0090272E6F90__INCLUDED_) diff --git a/Core/Tools/W3DView/AdvancedAnimSheet.h b/Core/Tools/W3DView/AdvancedAnimSheet.h index 05cbecf52e..691787da8d 100644 --- a/Core/Tools/W3DView/AdvancedAnimSheet.h +++ b/Core/Tools/W3DView/AdvancedAnimSheet.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_ADVANCEDANIMSHEET_H__67C01724_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_) -#define AFX_ADVANCEDANIMSHEET_H__67C01724_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_ - #pragma once + // AdvancedAnimSheet.h : header file // @@ -86,5 +84,3 @@ class CAdvancedAnimSheet : public CPropertySheet //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_ADVANCEDANIMSHEET_H__67C01724_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_) diff --git a/Core/Tools/W3DView/AggregateNameDialog.h b/Core/Tools/W3DView/AggregateNameDialog.h index 1444c63335..2d71d778dc 100644 --- a/Core/Tools/W3DView/AggregateNameDialog.h +++ b/Core/Tools/W3DView/AggregateNameDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_AGGREGATENAMEDIALOG_H__3F618448_CDEA_11D2_9FFC_00104B791122__INCLUDED_) -#define AFX_AGGREGATENAMEDIALOG_H__3F618448_CDEA_11D2_9FFC_00104B791122__INCLUDED_ - #pragma once + // AggregateNameDialog.h : header file // @@ -77,5 +75,3 @@ class AggregateNameDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_AGGREGATENAMEDIALOG_H__3F618448_CDEA_11D2_9FFC_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/AmbientLightDialog.h b/Core/Tools/W3DView/AmbientLightDialog.h index b3c61d17a7..1ffd5dca66 100644 --- a/Core/Tools/W3DView/AmbientLightDialog.h +++ b/Core/Tools/W3DView/AmbientLightDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_AMBIENTLIGHTDIALOG_H__D60CC3CE_5F94_11D2_9FC7_00104B791122__INCLUDED_) -#define AFX_AMBIENTLIGHTDIALOG_H__D60CC3CE_5F94_11D2_9FC7_00104B791122__INCLUDED_ - #pragma once + // AmbientLightDialog.h : header file // @@ -69,5 +67,3 @@ class CAmbientLightDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_AMBIENTLIGHTDIALOG_H__D60CC3CE_5F94_11D2_9FC7_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/AnimMixingPage.h b/Core/Tools/W3DView/AnimMixingPage.h index 13c2c63d79..50c6c369d0 100644 --- a/Core/Tools/W3DView/AnimMixingPage.h +++ b/Core/Tools/W3DView/AnimMixingPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_ANIMMIXINGPAGE_H__67C01722_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_) -#define AFX_ANIMMIXINGPAGE_H__67C01722_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_ - #pragma once + // AnimMixingPage.h : header file // @@ -71,5 +69,3 @@ class CAnimMixingPage : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_ANIMMIXINGPAGE_H__67C01722_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_) diff --git a/Core/Tools/W3DView/AnimReportPage.h b/Core/Tools/W3DView/AnimReportPage.h index 02542e2e46..8f5caac740 100644 --- a/Core/Tools/W3DView/AnimReportPage.h +++ b/Core/Tools/W3DView/AnimReportPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_ANIMREPORTPAGE_H__67C01723_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_) -#define AFX_ANIMREPORTPAGE_H__67C01723_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_ - #pragma once + // AnimReportPage.h : header file // @@ -72,5 +70,3 @@ class CAnimReportPage : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_ANIMREPORTPAGE_H__67C01723_7C0D_11D3_9A3A_0090272E6F90__INCLUDED_) diff --git a/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h b/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h index 6efbd765c2..9024d742c3 100644 --- a/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h +++ b/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_ANIMATEDSOUNDOPTIONSDIALOG_H__5FD0B3D4_3975_4315_B412_44586622684B__INCLUDED_) -#define AFX_ANIMATEDSOUNDOPTIONSDIALOG_H__5FD0B3D4_3975_4315_B412_44586622684B__INCLUDED_ - #pragma once + // AnimatedSoundOptionsDialog.h : header file // @@ -75,5 +73,3 @@ class AnimatedSoundOptionsDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_ANIMATEDSOUNDOPTIONSDIALOG_H__5FD0B3D4_3975_4315_B412_44586622684B__INCLUDED_) diff --git a/Core/Tools/W3DView/AnimationPropPage.h b/Core/Tools/W3DView/AnimationPropPage.h index 4a8901e6ff..0e035b0593 100644 --- a/Core/Tools/W3DView/AnimationPropPage.h +++ b/Core/Tools/W3DView/AnimationPropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_ANIMATIONPROPPAGE_H__9B07DA65_62B6_11D2_9FC7_00104B791122__INCLUDED_) -#define AFX_ANIMATIONPROPPAGE_H__9B07DA65_62B6_11D2_9FC7_00104B791122__INCLUDED_ - #pragma once + // AnimationPropPage.h : header file // @@ -62,5 +60,3 @@ class CAnimationPropPage : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_ANIMATIONPROPPAGE_H__9B07DA65_62B6_11D2_9FC7_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/AnimationSpeed.h b/Core/Tools/W3DView/AnimationSpeed.h index 3f82024290..0cd1c8894b 100644 --- a/Core/Tools/W3DView/AnimationSpeed.h +++ b/Core/Tools/W3DView/AnimationSpeed.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_ANIMATIONSPEED_H__D60CC3CD_5F94_11D2_9FC7_00104B791122__INCLUDED_) -#define AFX_ANIMATIONSPEED_H__D60CC3CD_5F94_11D2_9FC7_00104B791122__INCLUDED_ - #pragma once + // AnimationSpeed.h : header file // @@ -67,5 +65,3 @@ class CAnimationSpeed : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_ANIMATIONSPEED_H__D60CC3CD_5F94_11D2_9FC7_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/AssetInfo.h b/Core/Tools/W3DView/AssetInfo.h index 96a14f427f..b93944c093 100644 --- a/Core/Tools/W3DView/AssetInfo.h +++ b/Core/Tools/W3DView/AssetInfo.h @@ -34,13 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - -#ifndef __ASSET_INFO_H -#define __ASSET_INFO_H - #include "rendobj.h" #include "Utils.h" #include "AssetTypes.h" @@ -125,7 +120,3 @@ class AssetInfoClass DWORD m_dwUserData; RenderObjClass * m_pRenderObj; }; - - - -#endif //__ASSET_INFO_H diff --git a/Core/Tools/W3DView/AssetPropertySheet.h b/Core/Tools/W3DView/AssetPropertySheet.h index 79b49bfc7d..cb9446b6d0 100644 --- a/Core/Tools/W3DView/AssetPropertySheet.h +++ b/Core/Tools/W3DView/AssetPropertySheet.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_ASSETPROPERTYSHEET_H__FB40246D_5DFB_11D2_9FC7_00104B791122__INCLUDED_) -#define AFX_ASSETPROPERTYSHEET_H__FB40246D_5DFB_11D2_9FC7_00104B791122__INCLUDED_ - #pragma once + // AssetPropertySheet.h : header file // @@ -68,5 +66,3 @@ class CAssetPropertySheet : public CPropertySheet //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_ASSETPROPERTYSHEET_H__FB40246D_5DFB_11D2_9FC7_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/AssetTypes.h b/Core/Tools/W3DView/AssetTypes.h index f2f7bc8513..bb85e71c6d 100644 --- a/Core/Tools/W3DView/AssetTypes.h +++ b/Core/Tools/W3DView/AssetTypes.h @@ -34,13 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __ASSET_TYPES_H -#define __ASSET_TYPES_H - - typedef enum { TypeUnknown = -1, @@ -57,6 +52,3 @@ typedef enum TypeSound } ASSET_TYPE; - - -#endif //__ASSET_TYPES_H diff --git a/Core/Tools/W3DView/BackgroundBMPDialog.h b/Core/Tools/W3DView/BackgroundBMPDialog.h index 1d2f614bb5..71a86752a9 100644 --- a/Core/Tools/W3DView/BackgroundBMPDialog.h +++ b/Core/Tools/W3DView/BackgroundBMPDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_BACKGROUNDBMPDIALOG_H__5D8C201B_6380_11D2_9FC7_00104B791122__INCLUDED_) -#define AFX_BACKGROUNDBMPDIALOG_H__5D8C201B_6380_11D2_9FC7_00104B791122__INCLUDED_ - #pragma once + // BackgroundBMPDialog.h : header file // @@ -60,5 +58,3 @@ class CBackgroundBMPDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_BACKGROUNDBMPDIALOG_H__5D8C201B_6380_11D2_9FC7_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/BackgroundColorDialog.h b/Core/Tools/W3DView/BackgroundColorDialog.h index d56181535b..5999e968f0 100644 --- a/Core/Tools/W3DView/BackgroundColorDialog.h +++ b/Core/Tools/W3DView/BackgroundColorDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_BACKGROUNDCOLORDIALOG_H__AF3CDE8C_61EC_11D2_9FC7_00104B791122__INCLUDED_) -#define AFX_BACKGROUNDCOLORDIALOG_H__AF3CDE8C_61EC_11D2_9FC7_00104B791122__INCLUDED_ - #pragma once + // BackgroundColorDialog.h : header file // @@ -69,5 +67,3 @@ class CBackgroundColorDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_BACKGROUNDCOLORDIALOG_H__AF3CDE8C_61EC_11D2_9FC7_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/BackgroundObjectDialog.h b/Core/Tools/W3DView/BackgroundObjectDialog.h index 4204fd152d..0032e55126 100644 --- a/Core/Tools/W3DView/BackgroundObjectDialog.h +++ b/Core/Tools/W3DView/BackgroundObjectDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_BACKGROUNDOBJECTDIALOG_H__9B07DA63_62B6_11D2_9FC7_00104B791122__INCLUDED_) -#define AFX_BACKGROUNDOBJECTDIALOG_H__9B07DA63_62B6_11D2_9FC7_00104B791122__INCLUDED_ - #pragma once + // BackgroundObjectDialog.h : header file // @@ -61,5 +59,3 @@ class CBackgroundObjectDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_BACKGROUNDOBJECTDIALOG_H__9B07DA63_62B6_11D2_9FC7_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/BoneMgrDialog.h b/Core/Tools/W3DView/BoneMgrDialog.h index 7abc9840eb..b3eb773c93 100644 --- a/Core/Tools/W3DView/BoneMgrDialog.h +++ b/Core/Tools/W3DView/BoneMgrDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_BONEMGRDIALOG_H__66DA0E58_BFCA_11D2_9FFA_00104B791122__INCLUDED_) -#define AFX_BONEMGRDIALOG_H__66DA0E58_BFCA_11D2_9FFA_00104B791122__INCLUDED_ - #pragma once + // BoneMgrDialog.h : header file // @@ -105,5 +103,3 @@ class BoneMgrDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_BONEMGRDIALOG_H__66DA0E58_BFCA_11D2_9FFA_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/CameraDistanceDialog.h b/Core/Tools/W3DView/CameraDistanceDialog.h index f0645dd6f0..ffde9e0757 100644 --- a/Core/Tools/W3DView/CameraDistanceDialog.h +++ b/Core/Tools/W3DView/CameraDistanceDialog.h @@ -16,9 +16,6 @@ ** along with this program. If not, see . */ -#if !defined(AFX_CAMERADISTANCEDIALOG_H__548D3315_D582_4B97_8607_31B4659DF498__INCLUDED_) -#define AFX_CAMERADISTANCEDIALOG_H__548D3315_D582_4B97_8607_31B4659DF498__INCLUDED_ - #pragma once #include "resource.h" @@ -62,5 +59,3 @@ class CameraDistanceDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_CAMERADISTANCEDIALOG_H__548D3315_D582_4B97_8607_31B4659DF498__INCLUDED_) diff --git a/Core/Tools/W3DView/CameraSettingsDialog.h b/Core/Tools/W3DView/CameraSettingsDialog.h index 3dff682f59..bd94ce278f 100644 --- a/Core/Tools/W3DView/CameraSettingsDialog.h +++ b/Core/Tools/W3DView/CameraSettingsDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_CAMERASETTINGSDIALOG_H__7E43F424_8191_11D3_A064_00104B791122__INCLUDED_) -#define AFX_CAMERASETTINGSDIALOG_H__7E43F424_8191_11D3_A064_00104B791122__INCLUDED_ - #pragma once + // CameraSettingsDialog.h : header file // @@ -76,5 +74,3 @@ class CameraSettingsDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_CAMERASETTINGSDIALOG_H__7E43F424_8191_11D3_A064_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/ColorBar.h b/Core/Tools/W3DView/ColorBar.h index 295fb06145..a1efce422d 100644 --- a/Core/Tools/W3DView/ColorBar.h +++ b/Core/Tools/W3DView/ColorBar.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_COLORBAR_H__D1243F40_D4D2_11D2_8DDF_00104B6FD9E3__INCLUDED_) -#define AFX_COLORBAR_H__D1243F40_D4D2_11D2_8DDF_00104B6FD9E3__INCLUDED_ - #pragma once + // ColorBar.h : header file // @@ -246,5 +244,3 @@ class ColorBarClass : public CWnd //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_COLORBAR_H__D1243F40_D4D2_11D2_8DDF_00104B6FD9E3__INCLUDED_) diff --git a/Core/Tools/W3DView/ColorPicker.h b/Core/Tools/W3DView/ColorPicker.h index 42cf81c275..6d4941b0a1 100644 --- a/Core/Tools/W3DView/ColorPicker.h +++ b/Core/Tools/W3DView/ColorPicker.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_COLORPICKER_H__C943A7EC_CAA3_11D2_8DDF_00104B6FD9E3__INCLUDED_) -#define AFX_COLORPICKER_H__C943A7EC_CAA3_11D2_8DDF_00104B6FD9E3__INCLUDED_ - #pragma once + // ColorPicker.h : header file // @@ -155,5 +153,3 @@ class ColorPickerClass : public CWnd //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_COLORPICKER_H__C943A7EC_CAA3_11D2_8DDF_00104B6FD9E3__INCLUDED_) diff --git a/Core/Tools/W3DView/ColorPickerDialogClass.h b/Core/Tools/W3DView/ColorPickerDialogClass.h index 537d6cb9a9..64f6ea6e97 100644 --- a/Core/Tools/W3DView/ColorPickerDialogClass.h +++ b/Core/Tools/W3DView/ColorPickerDialogClass.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_COLORPICKERDIALOGCLASS_H__C943A7F1_CAA3_11D2_8DDF_00104B6FD9E3__INCLUDED_) -#define AFX_COLORPICKERDIALOGCLASS_H__C943A7F1_CAA3_11D2_8DDF_00104B6FD9E3__INCLUDED_ - #pragma once + // ColorPickerDialogClass.h : header file // @@ -130,5 +128,3 @@ class ColorPickerDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_COLORPICKERDIALOGCLASS_H__C943A7F1_CAA3_11D2_8DDF_00104B6FD9E3__INCLUDED_) diff --git a/Core/Tools/W3DView/ColorSelectionDialog.h b/Core/Tools/W3DView/ColorSelectionDialog.h index fa0fe11d20..3c42553ed3 100644 --- a/Core/Tools/W3DView/ColorSelectionDialog.h +++ b/Core/Tools/W3DView/ColorSelectionDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_OLORSELECTIONDIALOG_H__C0BCECAE_B6EA_11D2_9FF8_00104B791122__INCLUDED_) -#define AFX_OLORSELECTIONDIALOG_H__C0BCECAE_B6EA_11D2_9FF8_00104B791122__INCLUDED_ - #pragma once + // ColorSelectionDialog.h : header file // @@ -103,5 +101,3 @@ class ColorSelectionDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_OLORSELECTIONDIALOG_H__C0BCECAE_B6EA_11D2_9FF8_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/ColorUtils.h b/Core/Tools/W3DView/ColorUtils.h index 3b103b32f1..3eeb6a55bb 100644 --- a/Core/Tools/W3DView/ColorUtils.h +++ b/Core/Tools/W3DView/ColorUtils.h @@ -22,8 +22,7 @@ // // -#ifndef __COLORUTILS_H -#define __COLORUTILS_H +#pragma once ///////////////////////////////////////////////////////////////////////////// // Callbacks @@ -46,6 +45,3 @@ BOOL Set_Form_Original_Color (HWND form_wnd, int red, int green, int blue); BOOL Set_Update_Callback (HWND form_wnd, WWCTRL_COLORCALLBACK callback, void *arg=NULL); void RegisterColorPicker (HINSTANCE hinst); void RegisterColorBar (HINSTANCE hinst); - - -#endif //__COLORUTILS_H diff --git a/Core/Tools/W3DView/DataTreeView.h b/Core/Tools/W3DView/DataTreeView.h index 7267f54329..26bd64d870 100644 --- a/Core/Tools/W3DView/DataTreeView.h +++ b/Core/Tools/W3DView/DataTreeView.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_DATATREEVIEW_H__2BB39E40_5D3A_11D2_9FC6_00104B791122__INCLUDED_) -#define AFX_DATATREEVIEW_H__2BB39E40_5D3A_11D2_9FC6_00104B791122__INCLUDED_ - #pragma once + // DataTreeView.h : header file // @@ -173,6 +171,3 @@ class CDataTreeView : public CTreeView //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_DATATREEVIEW_H__2BB39E40_5D3A_11D2_9FC6_00104B791122__INCLUDED_) - diff --git a/Core/Tools/W3DView/DeviceSelectionDialog.h b/Core/Tools/W3DView/DeviceSelectionDialog.h index b89aa72d18..18d67c60ca 100644 --- a/Core/Tools/W3DView/DeviceSelectionDialog.h +++ b/Core/Tools/W3DView/DeviceSelectionDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_DEVICESELECTIONDIALOG_H__49E2DFF9_5D3F_11D2_9FC6_00104B791122__INCLUDED_) -#define AFX_DEVICESELECTIONDIALOG_H__49E2DFF9_5D3F_11D2_9FC6_00104B791122__INCLUDED_ - #pragma once + // DeviceSelectionDialog.h : header file // @@ -84,5 +82,3 @@ class CDeviceSelectionDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_DEVICESELECTIONDIALOG_H__49E2DFF9_5D3F_11D2_9FC6_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/DialogToolbar.h b/Core/Tools/W3DView/DialogToolbar.h index 03b40ae09f..09b160b6ab 100644 --- a/Core/Tools/W3DView/DialogToolbar.h +++ b/Core/Tools/W3DView/DialogToolbar.h @@ -34,13 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - -#ifndef __DIALOGTOOLBAR_H -#define __DIALOGTOOLBAR_H - #include "resource.h" ///////////////////////////////////////////////////////////////// @@ -97,7 +92,3 @@ class DialogToolbarClass : public CToolBar // void Enable_Button (int id, bool benable = true); }; - - -#endif //__DIALOGTOOLBAR_H - diff --git a/Core/Tools/W3DView/DirectoryDialog.h b/Core/Tools/W3DView/DirectoryDialog.h index 352c44baed..b0395a5151 100644 --- a/Core/Tools/W3DView/DirectoryDialog.h +++ b/Core/Tools/W3DView/DirectoryDialog.h @@ -34,20 +34,11 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __DIRECTORY_DIALOG_H -#define __DIRECTORY_DIALOG_H - - ///////////////////////////////////////////////////////////////////////// // // Prototypes // ///////////////////////////////////////////////////////////////////////// bool Browse_For_Folder (HWND parent_wnd, LPCTSTR initial_path, CString &path); - - -#endif //__DIRECTORY_DIALOG_H - diff --git a/Core/Tools/W3DView/EditLODDialog.h b/Core/Tools/W3DView/EditLODDialog.h index a777c28cd0..94187d1ea4 100644 --- a/Core/Tools/W3DView/EditLODDialog.h +++ b/Core/Tools/W3DView/EditLODDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EDITLODDIALOG_H__AF3CDE8E_61EC_11D2_9FC7_00104B791122__INCLUDED_) -#define AFX_EDITLODDIALOG_H__AF3CDE8E_61EC_11D2_9FC7_00104B791122__INCLUDED_ - #pragma once + // EditLODDialog.h : header file // @@ -76,5 +74,3 @@ class CEditLODDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EDITLODDIALOG_H__AF3CDE8E_61EC_11D2_9FC7_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/EmitterColorPropPage.h b/Core/Tools/W3DView/EmitterColorPropPage.h index 299235c4c9..4c33199bbb 100644 --- a/Core/Tools/W3DView/EmitterColorPropPage.h +++ b/Core/Tools/W3DView/EmitterColorPropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EMITTERCOLORPROPPAGE_H__83A8B83F_BA3B_11D2_9FFA_00104B791122__INCLUDED_) -#define AFX_EMITTERCOLORPROPPAGE_H__83A8B83F_BA3B_11D2_9FFA_00104B791122__INCLUDED_ - #pragma once + // EmitterColorPropPage.h : header file // @@ -128,5 +126,3 @@ class EmitterColorPropPageClass : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EMITTERCOLORPROPPAGE_H__83A8B83F_BA3B_11D2_9FFA_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/EmitterFramePropPage.h b/Core/Tools/W3DView/EmitterFramePropPage.h index 720b661e66..7e7c7cbf64 100644 --- a/Core/Tools/W3DView/EmitterFramePropPage.h +++ b/Core/Tools/W3DView/EmitterFramePropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EMITTERFRAMEPROPPAGE_H__6F068804_EAD5_4A19_BE03_C9C7B534E6E8__INCLUDED_) -#define AFX_EMITTERFRAMEPROPPAGE_H__6F068804_EAD5_4A19_BE03_C9C7B534E6E8__INCLUDED_ - #pragma once + // EmitterFramePropPage.h : header file // @@ -128,5 +126,3 @@ inline float EmitterFramePropPageClass::Denormalize_Frame(float normalized_val) //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EMITTERFRAMEPROPPAGE_H__6F068804_EAD5_4A19_BE03_C9C7B534E6E8__INCLUDED_) diff --git a/Core/Tools/W3DView/EmitterGeneralPropPage.h b/Core/Tools/W3DView/EmitterGeneralPropPage.h index 9073b34d49..bb81f4a261 100644 --- a/Core/Tools/W3DView/EmitterGeneralPropPage.h +++ b/Core/Tools/W3DView/EmitterGeneralPropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EMITTERGENERALPROPPAGE_H__83A8B83C_BA3B_11D2_9FFA_00104B791122__INCLUDED_) -#define AFX_EMITTERGENERALPROPPAGE_H__83A8B83C_BA3B_11D2_9FFA_00104B791122__INCLUDED_ - #pragma once + // EmitterGeneralPropPage.h : header file // @@ -128,5 +126,3 @@ class EmitterGeneralPropPageClass : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EMITTERGENERALPROPPAGE_H__83A8B83C_BA3B_11D2_9FFA_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/EmitterInstanceList.h b/Core/Tools/W3DView/EmitterInstanceList.h index 7ab4cc81bd..bb66fc2316 100644 --- a/Core/Tools/W3DView/EmitterInstanceList.h +++ b/Core/Tools/W3DView/EmitterInstanceList.h @@ -32,9 +32,6 @@ #pragma once -#ifndef __EMITTER_INSTANCE_LIST_H -#define __EMITTER_INSTANCE_LIST_H - #include "Vector.H" #include "part_ldr.h" #include "part_emt.h" @@ -108,5 +105,3 @@ class EmitterInstanceListClass : public ParticleEmitterDefClass DynamicVectorClass m_List; }; - -#endif //__EMITTER_INSTANCE_LIST_H diff --git a/Core/Tools/W3DView/EmitterLineGroupPropPage.h b/Core/Tools/W3DView/EmitterLineGroupPropPage.h index 681a9329f7..2a575eff3e 100644 --- a/Core/Tools/W3DView/EmitterLineGroupPropPage.h +++ b/Core/Tools/W3DView/EmitterLineGroupPropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EMITTERLINEGROUPPROPPAGE_H__51E7B2D1_1943_454E_B188_5F7D508D7203__INCLUDED_) -#define AFX_EMITTERLINEGROUPPROPPAGE_H__51E7B2D1_1943_454E_B188_5F7D508D7203__INCLUDED_ - #pragma once + // EmitterLineGroupPropPage.h : header file // @@ -110,5 +108,3 @@ class EmitterLineGroupPropPageClass : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EMITTERLINEGROUPPROPPAGE_H__51E7B2D1_1943_454E_B188_5F7D508D7203__INCLUDED_) diff --git a/Core/Tools/W3DView/EmitterLinePropPage.h b/Core/Tools/W3DView/EmitterLinePropPage.h index 033a33acb9..00f2c2feee 100644 --- a/Core/Tools/W3DView/EmitterLinePropPage.h +++ b/Core/Tools/W3DView/EmitterLinePropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EMITTERLINEPROPPAGE_H__BBD9ED4C_E752_439A_81D5_A4FA9A6F6FC8__INCLUDED_) -#define AFX_EMITTERLINEPROPPAGE_H__BBD9ED4C_E752_439A_81D5_A4FA9A6F6FC8__INCLUDED_ - #pragma once + // EmitterLinePropPage.h : header file // @@ -129,5 +127,3 @@ class EmitterLinePropPageClass : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EMITTERLINEPROPPAGE_H__BBD9ED4C_E752_439A_81D5_A4FA9A6F6FC8__INCLUDED_) diff --git a/Core/Tools/W3DView/EmitterParticlePropPage.h b/Core/Tools/W3DView/EmitterParticlePropPage.h index 8efdb04670..ae3702d755 100644 --- a/Core/Tools/W3DView/EmitterParticlePropPage.h +++ b/Core/Tools/W3DView/EmitterParticlePropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EMITTERPARTICLEPROPPAGE_H__83A8B83D_BA3B_11D2_9FFA_00104B791122__INCLUDED_) -#define AFX_EMITTERPARTICLEPROPPAGE_H__83A8B83D_BA3B_11D2_9FFA_00104B791122__INCLUDED_ - #pragma once + // EmitterParticlePropPage.h : header file // @@ -117,6 +115,3 @@ class EmitterParticlePropPageClass : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EMITTERPARTICLEPROPPAGE_H__83A8B83D_BA3B_11D2_9FFA_00104B791122__INCLUDED_) - diff --git a/Core/Tools/W3DView/EmitterPhysicsPropPage.h b/Core/Tools/W3DView/EmitterPhysicsPropPage.h index cfea64e26e..2b2c35cd60 100644 --- a/Core/Tools/W3DView/EmitterPhysicsPropPage.h +++ b/Core/Tools/W3DView/EmitterPhysicsPropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EMITTERPHYSICSPROPPAGE_H__83A8B83E_BA3B_11D2_9FFA_00104B791122__INCLUDED_) -#define AFX_EMITTERPHYSICSPROPPAGE_H__83A8B83E_BA3B_11D2_9FFA_00104B791122__INCLUDED_ - #pragma once + // EmitterPhysicsPropPage.h : header file // @@ -123,5 +121,3 @@ class EmitterPhysicsPropPageClass : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EMITTERPHYSICSPROPPAGE_H__83A8B83E_BA3B_11D2_9FFA_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/EmitterPropertySheet.h b/Core/Tools/W3DView/EmitterPropertySheet.h index 7561aa4c74..f0861029c8 100644 --- a/Core/Tools/W3DView/EmitterPropertySheet.h +++ b/Core/Tools/W3DView/EmitterPropertySheet.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EMITTERPROPERTYSHEET_H__83A8B844_BA3B_11D2_9FFA_00104B791122__INCLUDED_) -#define AFX_EMITTERPROPERTYSHEET_H__83A8B844_BA3B_11D2_9FFA_00104B791122__INCLUDED_ - #pragma once + // EmitterPropertySheet.h : header file // @@ -122,5 +120,3 @@ class EmitterPropertySheetClass : public CPropertySheet //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EMITTERPROPERTYSHEET_H__83A8B844_BA3B_11D2_9FFA_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/EmitterRotationPropPage.h b/Core/Tools/W3DView/EmitterRotationPropPage.h index 2ad7aaad06..aba163b3c0 100644 --- a/Core/Tools/W3DView/EmitterRotationPropPage.h +++ b/Core/Tools/W3DView/EmitterRotationPropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EMITTERROTATIONPROPPAGE_H__35F8A2F6_C91C_4750_BF06_100433C1ECBB__INCLUDED_) -#define AFX_EMITTERROTATIONPROPPAGE_H__35F8A2F6_C91C_4750_BF06_100433C1ECBB__INCLUDED_ - #pragma once + // EmitterRotationPropPage.h : header file // @@ -137,5 +135,3 @@ inline float EmitterRotationPropPageClass::Denormalize_Rotation(float normalized //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EMITTERROTATIONPROPPAGE_H__35F8A2F6_C91C_4750_BF06_100433C1ECBB__INCLUDED_) diff --git a/Core/Tools/W3DView/EmitterSizePropPage.h b/Core/Tools/W3DView/EmitterSizePropPage.h index fc932cba06..14e4ca369b 100644 --- a/Core/Tools/W3DView/EmitterSizePropPage.h +++ b/Core/Tools/W3DView/EmitterSizePropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EMITTERSIZEPROPPAGE_H__0CD2CBA3_1219_11D3_A034_00104B791122__INCLUDED_) -#define AFX_EMITTERSIZEPROPPAGE_H__0CD2CBA3_1219_11D3_A034_00104B791122__INCLUDED_ - #pragma once + // EmitterSizePropPage.h : header file // @@ -113,5 +111,3 @@ class EmitterSizePropPageClass : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EMITTERSIZEPROPPAGE_H__0CD2CBA3_1219_11D3_A034_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/EmitterUserPropPage.h b/Core/Tools/W3DView/EmitterUserPropPage.h index 90c6f9085f..514c98ab92 100644 --- a/Core/Tools/W3DView/EmitterUserPropPage.h +++ b/Core/Tools/W3DView/EmitterUserPropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EMITTERUSERPROPPAGE_H__83A8B840_BA3B_11D2_9FFA_00104B791122__INCLUDED_) -#define AFX_EMITTERUSERPROPPAGE_H__83A8B840_BA3B_11D2_9FFA_00104B791122__INCLUDED_ - #pragma once + // EmitterUserPropPage.h : header file // @@ -109,5 +107,3 @@ class EmitterUserPropPageClass : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EMITTERUSERPROPPAGE_H__83A8B840_BA3B_11D2_9FFA_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/GammaDialog.h b/Core/Tools/W3DView/GammaDialog.h index c855274625..43adf086f4 100644 --- a/Core/Tools/W3DView/GammaDialog.h +++ b/Core/Tools/W3DView/GammaDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_GAMMADIALOG_H__DA25161A_E783_44DE_8398_B311C20C3BE9__INCLUDED_) -#define AFX_GAMMADIALOG_H__DA25161A_E783_44DE_8398_B311C20C3BE9__INCLUDED_ - #pragma once + // GammaDialog.h : header file // @@ -61,5 +59,3 @@ class GammaDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_GAMMADIALOG_H__DA25161A_E783_44DE_8398_B311C20C3BE9__INCLUDED_) diff --git a/Core/Tools/W3DView/Globals.h b/Core/Tools/W3DView/Globals.h index 15205954b1..4486775017 100644 --- a/Core/Tools/W3DView/Globals.h +++ b/Core/Tools/W3DView/Globals.h @@ -25,9 +25,7 @@ // ///////////////////////////////////////////////////////////////////// -#ifndef __GLOBALS_H -#define __GLOBALS_H - +#pragma once ////////////////////////////////////////////////////// // Externs @@ -45,6 +43,3 @@ extern int g_iHeight; ////////////////////////////////////////////////////// const int DEFAULT_DEVICEINDEX = 1; const int DEFAULT_BITSPERPIX = 16; - - -#endif //__GLOBALS_H diff --git a/Core/Tools/W3DView/GraphicView.h b/Core/Tools/W3DView/GraphicView.h index 8ffa8b069c..8a6faa8b5d 100644 --- a/Core/Tools/W3DView/GraphicView.h +++ b/Core/Tools/W3DView/GraphicView.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_GRAPHICVIEW_H__2BB39E41_5D3A_11D2_9FC6_00104B791122__INCLUDED_) -#define AFX_GRAPHICVIEW_H__2BB39E41_5D3A_11D2_9FC6_00104B791122__INCLUDED_ - #pragma once + // GraphicView.h : header file // @@ -257,5 +255,3 @@ class CGraphicView : public CView //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_GRAPHICVIEW_H__2BB39E41_5D3A_11D2_9FC6_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/HierarchyPropPage.h b/Core/Tools/W3DView/HierarchyPropPage.h index 6260cf593a..bd70b4f939 100644 --- a/Core/Tools/W3DView/HierarchyPropPage.h +++ b/Core/Tools/W3DView/HierarchyPropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_HIERARCHYPROPPAGE_H__FB40246E_5DFB_11D2_9FC7_00104B791122__INCLUDED_) -#define AFX_HIERARCHYPROPPAGE_H__FB40246E_5DFB_11D2_9FC7_00104B791122__INCLUDED_ - #pragma once + // HierarchyPropPage.h : header file // @@ -68,5 +66,3 @@ class CHierarchyPropPage : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_HIERARCHYPROPPAGE_H__FB40246E_5DFB_11D2_9FC7_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/LODDefs.h b/Core/Tools/W3DView/LODDefs.h index 89df220e26..0d5602d521 100644 --- a/Core/Tools/W3DView/LODDefs.h +++ b/Core/Tools/W3DView/LODDefs.h @@ -34,10 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __LODDEFS_H -#define __LODDEFS_H - +#pragma once //////////////////////////////////////////////////////////////////////////// // @@ -102,7 +99,3 @@ __inline bool Is_Model_Part_of_LOD (LPCTSTR name, LPCTSTR base, LOD_NAMING_TYPE // Return the true/false result ccde return retval; } - - -#endif //__LODDEFS_H - diff --git a/Core/Tools/W3DView/MainFrm.h b/Core/Tools/W3DView/MainFrm.h index b6f70dc99d..67652f0a10 100644 --- a/Core/Tools/W3DView/MainFrm.h +++ b/Core/Tools/W3DView/MainFrm.h @@ -20,9 +20,6 @@ // ///////////////////////////////////////////////////////////////////////////// -#if !defined(AFX_MAINFRM_H__2BB39E2F_5D3A_11D2_9FC6_00104B791122__INCLUDED_) -#define AFX_MAINFRM_H__2BB39E2F_5D3A_11D2_9FC6_00104B791122__INCLUDED_ - #pragma once #include "DataTreeView.h" @@ -294,5 +291,3 @@ class CMainFrame : public CFrameWnd //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_MAINFRM_H__2BB39E2F_5D3A_11D2_9FC6_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/MeshPropPage.h b/Core/Tools/W3DView/MeshPropPage.h index 385470fa47..4286b4ea33 100644 --- a/Core/Tools/W3DView/MeshPropPage.h +++ b/Core/Tools/W3DView/MeshPropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_MESHPROPPAGE_H__FB40246F_5DFB_11D2_9FC7_00104B791122__INCLUDED_) -#define AFX_MESHPROPPAGE_H__FB40246F_5DFB_11D2_9FC7_00104B791122__INCLUDED_ - #pragma once + // MeshPropPage.h : header file // @@ -68,5 +66,3 @@ class CMeshPropPage : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_MESHPROPPAGE_H__FB40246F_5DFB_11D2_9FC7_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/OpacitySettingsDialog.h b/Core/Tools/W3DView/OpacitySettingsDialog.h index 79bcec9dd2..f362a012e5 100644 --- a/Core/Tools/W3DView/OpacitySettingsDialog.h +++ b/Core/Tools/W3DView/OpacitySettingsDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_OPACITYSETTINGSDIALOG_H__52B0C804_0D48_11D3_A031_00104B791122__INCLUDED_) -#define AFX_OPACITYSETTINGSDIALOG_H__52B0C804_0D48_11D3_A031_00104B791122__INCLUDED_ - #pragma once + // OpacitySettingsDialog.h : header file // @@ -77,5 +75,3 @@ class OpacitySettingsDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_OPACITYSETTINGSDIALOG_H__52B0C804_0D48_11D3_A031_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/OpacityVectorDialog.h b/Core/Tools/W3DView/OpacityVectorDialog.h index aa84a9468e..d2cc35fd87 100644 --- a/Core/Tools/W3DView/OpacityVectorDialog.h +++ b/Core/Tools/W3DView/OpacityVectorDialog.h @@ -16,9 +16,6 @@ ** along with this program. If not, see . */ -#if !defined(AFX_OPACITYVECTORDIALOG_H__E86BBE8C_F527_11D3_A08F_00104B791122__INCLUDED_) -#define AFX_OPACITYVECTORDIALOG_H__E86BBE8C_F527_11D3_A08F_00104B791122__INCLUDED_ - #pragma once #include "resource.h" @@ -99,5 +96,3 @@ class OpacityVectorDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_OPACITYVECTORDIALOG_H__E86BBE8C_F527_11D3_A08F_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h b/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h index 9ba5d783f3..2339682a1e 100644 --- a/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h +++ b/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_PARTICLEBLURTIMEKEYDIALOG_H__FCCD7E5F_E09A_450E_A1A4_0E401CC00C3B__INCLUDED_) -#define AFX_PARTICLEBLURTIMEKEYDIALOG_H__FCCD7E5F_E09A_450E_A1A4_0E401CC00C3B__INCLUDED_ - #pragma once + // ParticleBlurTimeKeyDialog.h : header file // @@ -74,5 +72,3 @@ class ParticleBlurTimeKeyDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_PARTICLEBLURTIMEKEYDIALOG_H__FCCD7E5F_E09A_450E_A1A4_0E401CC00C3B__INCLUDED_) diff --git a/Core/Tools/W3DView/ParticleFrameKeyDialog.h b/Core/Tools/W3DView/ParticleFrameKeyDialog.h index 1786ddfb10..03f045ec1e 100644 --- a/Core/Tools/W3DView/ParticleFrameKeyDialog.h +++ b/Core/Tools/W3DView/ParticleFrameKeyDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_PARTICLEFRAMEKEYDIALOG_H__43470F6A_86E2_44CF_8ED9_EE9B74D35908__INCLUDED_) -#define AFX_PARTICLEFRAMEKEYDIALOG_H__43470F6A_86E2_44CF_8ED9_EE9B74D35908__INCLUDED_ - #pragma once + // ParticleFrameKeyDialog.h : header file // @@ -75,5 +73,3 @@ class ParticleFrameKeyDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_PARTICLEFRAMEKEYDIALOG_H__43470F6A_86E2_44CF_8ED9_EE9B74D35908__INCLUDED_) diff --git a/Core/Tools/W3DView/ParticleRotationKeyDialog.h b/Core/Tools/W3DView/ParticleRotationKeyDialog.h index de812b7ae8..37df1e0f41 100644 --- a/Core/Tools/W3DView/ParticleRotationKeyDialog.h +++ b/Core/Tools/W3DView/ParticleRotationKeyDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_PARTICLEROTATIONKEYDIALOG_H__2B0B9CFD_19BC_4910_8AB2_813120740C69__INCLUDED_) -#define AFX_PARTICLEROTATIONKEYDIALOG_H__2B0B9CFD_19BC_4910_8AB2_813120740C69__INCLUDED_ - #pragma once + // ParticleRotationKeyDialog.h : header file // @@ -75,5 +73,3 @@ class ParticleRotationKeyDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_PARTICLEROTATIONKEYDIALOG_H__2B0B9CFD_19BC_4910_8AB2_813120740C69__INCLUDED_) diff --git a/Core/Tools/W3DView/ParticleSizeDialog.h b/Core/Tools/W3DView/ParticleSizeDialog.h index 1c2cd9a100..80bb2be66a 100644 --- a/Core/Tools/W3DView/ParticleSizeDialog.h +++ b/Core/Tools/W3DView/ParticleSizeDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_PARTICLESIZEDIALOG_H__0CD2CBA5_1219_11D3_A034_00104B791122__INCLUDED_) -#define AFX_PARTICLESIZEDIALOG_H__0CD2CBA5_1219_11D3_A034_00104B791122__INCLUDED_ - #pragma once + // ParticleSizeDialog.h : header file // @@ -74,5 +72,3 @@ class ParticleSizeDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_PARTICLESIZEDIALOG_H__0CD2CBA5_1219_11D3_A034_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/PlaySoundDialog.h b/Core/Tools/W3DView/PlaySoundDialog.h index 9652444bb4..eed77d841b 100644 --- a/Core/Tools/W3DView/PlaySoundDialog.h +++ b/Core/Tools/W3DView/PlaySoundDialog.h @@ -16,9 +16,6 @@ ** along with this program. If not, see . */ -#if !defined(AFX_PLAYSOUNDDIALOG_H__AD61372C_2DA3_11D3_A042_00104B791122__INCLUDED_) -#define AFX_PLAYSOUNDDIALOG_H__AD61372C_2DA3_11D3_A042_00104B791122__INCLUDED_ - #pragma once #include "resource.h" @@ -69,5 +66,3 @@ class PlaySoundDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_PLAYSOUNDDIALOG_H__AD61372C_2DA3_11D3_A042_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/ResolutionDialog.h b/Core/Tools/W3DView/ResolutionDialog.h index 8d8dfe4784..b826814f73 100644 --- a/Core/Tools/W3DView/ResolutionDialog.h +++ b/Core/Tools/W3DView/ResolutionDialog.h @@ -16,9 +16,6 @@ ** along with this program. If not, see . */ -#if !defined(AFX_RESOLUTIONDIALOG_H__6DB2FE81_D8CD_11D3_A086_00104B791122__INCLUDED_) -#define AFX_RESOLUTIONDIALOG_H__6DB2FE81_D8CD_11D3_A086_00104B791122__INCLUDED_ - #pragma once #include "resource.h" @@ -81,5 +78,3 @@ class ResolutionDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_RESOLUTIONDIALOG_H__6DB2FE81_D8CD_11D3_A086_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/RestrictedFileDialog.h b/Core/Tools/W3DView/RestrictedFileDialog.h index a247b6b63c..2c4e7640e5 100644 --- a/Core/Tools/W3DView/RestrictedFileDialog.h +++ b/Core/Tools/W3DView/RestrictedFileDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_RESTRICTEDFILEDIALOG_H__C461432A_D7EE_11D2_A00A_00104B791122__INCLUDED_) -#define AFX_RESTRICTEDFILEDIALOG_H__C461432A_D7EE_11D2_A00A_00104B791122__INCLUDED_ - #pragma once + // RestrictedFileDialog.h : header file // @@ -54,5 +52,3 @@ class RestrictedFileDialogClass : public CFileDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_RESTRICTEDFILEDIALOG_H__C461432A_D7EE_11D2_A00A_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/RingColorPropPage.h b/Core/Tools/W3DView/RingColorPropPage.h index c7bdeaec0c..63bd6d40a6 100644 --- a/Core/Tools/W3DView/RingColorPropPage.h +++ b/Core/Tools/W3DView/RingColorPropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_RINGCOLORPROPPAGE_H__E86BBE86_F527_11D3_A08F_00104B791122__INCLUDED_) -#define AFX_RINGCOLORPROPPAGE_H__E86BBE86_F527_11D3_A08F_00104B791122__INCLUDED_ - #pragma once + // RingColorPropPage.h : header file // @@ -111,6 +109,3 @@ class RingColorPropPageClass : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_RINGCOLORPROPPAGE_H__E86BBE86_F527_11D3_A08F_00104B791122__INCLUDED_) - diff --git a/Core/Tools/W3DView/RingGeneralPropPage.h b/Core/Tools/W3DView/RingGeneralPropPage.h index d727fa8dce..c09517824a 100644 --- a/Core/Tools/W3DView/RingGeneralPropPage.h +++ b/Core/Tools/W3DView/RingGeneralPropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_RINGGENERALPROPPAGE_H__E86BBE83_F527_11D3_A08F_00104B791122__INCLUDED_) -#define AFX_RINGGENERALPROPPAGE_H__E86BBE83_F527_11D3_A08F_00104B791122__INCLUDED_ - #pragma once + // RingGeneralPropPage.h : header file // @@ -116,5 +114,3 @@ class RingGeneralPropPageClass : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_RINGGENERALPROPPAGE_H__E86BBE83_F527_11D3_A08F_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/RingPropertySheet.h b/Core/Tools/W3DView/RingPropertySheet.h index d24340891f..d221010715 100644 --- a/Core/Tools/W3DView/RingPropertySheet.h +++ b/Core/Tools/W3DView/RingPropertySheet.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __RING_PROPERTY_SHEET_H -#define __RING_PROPERTY_SHEET_H - #include "RingColorPropPage.h" #include "RingGeneralPropPage.h" #include "RingSizePropPage.h" @@ -118,5 +114,3 @@ class RingPropertySheetClass : public CPropertySheet }; ///////////////////////////////////////////////////////////////////////////// - -#endif //__RING_PROPERTY_SHEET_H diff --git a/Core/Tools/W3DView/RingSizePropPage.h b/Core/Tools/W3DView/RingSizePropPage.h index 98d408f2fd..22def9c8f5 100644 --- a/Core/Tools/W3DView/RingSizePropPage.h +++ b/Core/Tools/W3DView/RingSizePropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_RINGSIZEPROPPAGE_H__E86BBE8A_F527_11D3_A08F_00104B791122__INCLUDED_) -#define AFX_RINGSIZEPROPPAGE_H__E86BBE8A_F527_11D3_A08F_00104B791122__INCLUDED_ - #pragma once + // RingSizePropPage.h : header file // @@ -120,5 +118,3 @@ class RingSizePropPageClass : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_RINGSIZEPROPPAGE_H__E86BBE8A_F527_11D3_A08F_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/SaveSettingsDialog.h b/Core/Tools/W3DView/SaveSettingsDialog.h index c667f60b7d..859caeda99 100644 --- a/Core/Tools/W3DView/SaveSettingsDialog.h +++ b/Core/Tools/W3DView/SaveSettingsDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SAVESETTINGSDIALOG_H__AF3CDE8D_61EC_11D2_9FC7_00104B791122__INCLUDED_) -#define AFX_SAVESETTINGSDIALOG_H__AF3CDE8D_61EC_11D2_9FC7_00104B791122__INCLUDED_ - #pragma once + // SaveSettingsDialog.h : header file // @@ -65,5 +63,3 @@ class CSaveSettingsDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SAVESETTINGSDIALOG_H__AF3CDE8D_61EC_11D2_9FC7_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/ScaleDialog.h b/Core/Tools/W3DView/ScaleDialog.h index c11ee87579..f01746b3c5 100644 --- a/Core/Tools/W3DView/ScaleDialog.h +++ b/Core/Tools/W3DView/ScaleDialog.h @@ -16,12 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SCALEDIALOG_H__E86BBE8B_F527_11D3_A08F_00104B791122__INCLUDED_) -#define AFX_SCALEDIALOG_H__E86BBE8B_F527_11D3_A08F_00104B791122__INCLUDED_ - #pragma once - #include "resource.h" ///////////////////////////////////////////////////////////////////////////// @@ -79,5 +75,3 @@ class ScaleDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SCALEDIALOG_H__E86BBE8B_F527_11D3_A08F_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/SceneLightDialog.h b/Core/Tools/W3DView/SceneLightDialog.h index d40888095e..0dc4c05a1d 100644 --- a/Core/Tools/W3DView/SceneLightDialog.h +++ b/Core/Tools/W3DView/SceneLightDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SCENELIGHTDIALOG_H__AF3CDE89_61EC_11D2_9FC7_00104B791122__INCLUDED_) -#define AFX_SCENELIGHTDIALOG_H__AF3CDE89_61EC_11D2_9FC7_00104B791122__INCLUDED_ - #pragma once + // SceneLightDialog.h : header file // @@ -120,5 +118,3 @@ class CSceneLightDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SCENELIGHTDIALOG_H__AF3CDE89_61EC_11D2_9FC7_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/ScreenCursor.h b/Core/Tools/W3DView/ScreenCursor.h index 16ea95c784..3227d2ddd9 100644 --- a/Core/Tools/W3DView/ScreenCursor.h +++ b/Core/Tools/W3DView/ScreenCursor.h @@ -30,13 +30,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - -#ifndef __SCREENCURSOR_H -#define __SCREENCURSOR_H - #include "resource.h" #include "rendobj.h" #include "Vector3i.h" @@ -109,6 +104,3 @@ class ScreenCursorClass : public RenderObjClass int m_Width; int m_Height; }; - - -#endif //__SCREENCURSOR_H diff --git a/Core/Tools/W3DView/SoundEditDialog.h b/Core/Tools/W3DView/SoundEditDialog.h index eee5cf651c..6cf71c059f 100644 --- a/Core/Tools/W3DView/SoundEditDialog.h +++ b/Core/Tools/W3DView/SoundEditDialog.h @@ -16,12 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SOUNDEDITDIALOG_H__376FEA4C_0A53_44FB_A6B5_DF0E96CF1DEF__INCLUDED_) -#define AFX_SOUNDEDITDIALOG_H__376FEA4C_0A53_44FB_A6B5_DF0E96CF1DEF__INCLUDED_ - #pragma once - #include "wwstring.h" #include "resource.h" #include "soundrobj.h" @@ -111,5 +107,3 @@ class SoundEditDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SOUNDEDITDIALOG_H__376FEA4C_0A53_44FB_A6B5_DF0E96CF1DEF__INCLUDED_) diff --git a/Core/Tools/W3DView/SphereColorPropPage.h b/Core/Tools/W3DView/SphereColorPropPage.h index 8ec3661cb6..a461d862c7 100644 --- a/Core/Tools/W3DView/SphereColorPropPage.h +++ b/Core/Tools/W3DView/SphereColorPropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SPHERECOLORPROPPAGE_H__E86BBE86_F527_11D3_A08F_00104B791122__INCLUDED_) -#define AFX_SPHERECOLORPROPPAGE_H__E86BBE86_F527_11D3_A08F_00104B791122__INCLUDED_ - #pragma once + // SphereColorPropPage.h : header file // @@ -120,6 +118,3 @@ class SphereColorPropPageClass : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SPHERECOLORPROPPAGE_H__E86BBE86_F527_11D3_A08F_00104B791122__INCLUDED_) - diff --git a/Core/Tools/W3DView/SphereGeneralPropPage.h b/Core/Tools/W3DView/SphereGeneralPropPage.h index b59c711b2b..f3e3c919ed 100644 --- a/Core/Tools/W3DView/SphereGeneralPropPage.h +++ b/Core/Tools/W3DView/SphereGeneralPropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SPHEREGENERALPROPPAGE_H__E86BBE83_F527_11D3_A08F_00104B791122__INCLUDED_) -#define AFX_SPHEREGENERALPROPPAGE_H__E86BBE83_F527_11D3_A08F_00104B791122__INCLUDED_ - #pragma once + // SphereGeneralPropPage.h : header file // @@ -114,5 +112,3 @@ class SphereGeneralPropPageClass : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SPHEREGENERALPROPPAGE_H__E86BBE83_F527_11D3_A08F_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/SpherePropertySheet.h b/Core/Tools/W3DView/SpherePropertySheet.h index 7a06c6a770..65b9a5777c 100644 --- a/Core/Tools/W3DView/SpherePropertySheet.h +++ b/Core/Tools/W3DView/SpherePropertySheet.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __SPHERE_PROPERTY_SHEET_H -#define __SPHERE_PROPERTY_SHEET_H - #include "SphereColorPropPage.h" #include "SphereGeneralPropPage.h" #include "SphereSizePropPage.h" @@ -118,5 +114,3 @@ class SpherePropertySheetClass : public CPropertySheet }; ///////////////////////////////////////////////////////////////////////////// - -#endif //__SPHERE_PROPERTY_SHEET_H diff --git a/Core/Tools/W3DView/SphereSizePropPage.h b/Core/Tools/W3DView/SphereSizePropPage.h index df141f2924..ac6657054e 100644 --- a/Core/Tools/W3DView/SphereSizePropPage.h +++ b/Core/Tools/W3DView/SphereSizePropPage.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SPHERESIZEPROPPAGE_H__E86BBE8A_F527_11D3_A08F_00104B791122__INCLUDED_) -#define AFX_SPHERESIZEPROPPAGE_H__E86BBE8A_F527_11D3_A08F_00104B791122__INCLUDED_ - #pragma once + // SphereSizePropPage.h : header file // @@ -112,5 +110,3 @@ class SphereSizePropPageClass : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SPHERESIZEPROPPAGE_H__E86BBE8A_F527_11D3_A08F_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/SphereUtils.h b/Core/Tools/W3DView/SphereUtils.h index d024c58c5c..cb60d55545 100644 --- a/Core/Tools/W3DView/SphereUtils.h +++ b/Core/Tools/W3DView/SphereUtils.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __SPHERE_UTILS -#define __SPHERE_UTILS - #include "sphereobj.h" ///////////////////////////////////////////////////////////// @@ -89,7 +86,3 @@ class SphereKeysClass int m_KeyCount; int m_MaxKeys; }; - - -#endif //__SPHERE_UTILS - diff --git a/Core/Tools/W3DView/StdAfx.h b/Core/Tools/W3DView/StdAfx.h index 36629a7fd7..c95bcb3a63 100644 --- a/Core/Tools/W3DView/StdAfx.h +++ b/Core/Tools/W3DView/StdAfx.h @@ -21,9 +21,6 @@ // are changed infrequently // -#if !defined(AFX_STDAFX_H__2BB39E2D_5D3A_11D2_9FC6_00104B791122__INCLUDED_) -#define AFX_STDAFX_H__2BB39E2D_5D3A_11D2_9FC6_00104B791122__INCLUDED_ - #pragma once #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers @@ -41,5 +38,3 @@ //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__2BB39E2D_5D3A_11D2_9FC6_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/TextureMgrDialog.h b/Core/Tools/W3DView/TextureMgrDialog.h index f79af2b8b4..0d6302b323 100644 --- a/Core/Tools/W3DView/TextureMgrDialog.h +++ b/Core/Tools/W3DView/TextureMgrDialog.h @@ -34,9 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#if !defined(AFX_TEXTUREMGRDIALOG_H__3F61844D_CDEA_11D2_9FFC_00104B791122__INCLUDED_) -#define AFX_TEXTUREMGRDIALOG_H__3F61844D_CDEA_11D2_9FFC_00104B791122__INCLUDED_ - #pragma once #include "Vector.H" @@ -249,5 +246,3 @@ class TextureMgrDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TEXTUREMGRDIALOG_H__3F61844D_CDEA_11D2_9FFC_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/TexturePathDialog.h b/Core/Tools/W3DView/TexturePathDialog.h index 0e7dc4968c..0d83bfe3df 100644 --- a/Core/Tools/W3DView/TexturePathDialog.h +++ b/Core/Tools/W3DView/TexturePathDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_TEXTUREPATHDIALOG_H__FD455E37_D28C_11D3_A085_00104B791122__INCLUDED_) -#define AFX_TEXTUREPATHDIALOG_H__FD455E37_D28C_11D3_A085_00104B791122__INCLUDED_ - #pragma once + // TexturePathDialog.h : header file // @@ -61,5 +59,3 @@ class TexturePathDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TEXTUREPATHDIALOG_H__FD455E37_D28C_11D3_A085_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/TextureSettingsDialog.h b/Core/Tools/W3DView/TextureSettingsDialog.h index 78c62cd514..8d19946823 100644 --- a/Core/Tools/W3DView/TextureSettingsDialog.h +++ b/Core/Tools/W3DView/TextureSettingsDialog.h @@ -30,9 +30,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#if !defined(AFX_TEXTURESETTINGSDIALOG_H__362C7398_D199_11D2_9FFD_00104B791122__INCLUDED_) -#define AFX_TEXTURESETTINGSDIALOG_H__362C7398_D199_11D2_9FFD_00104B791122__INCLUDED_ - #pragma once #ifdef WW3D_DX8 @@ -123,5 +120,3 @@ class TextureSettingsDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TEXTURESETTINGSDIALOG_H__362C7398_D199_11D2_9FFD_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/Toolbar.h b/Core/Tools/W3DView/Toolbar.h index c574836c88..9bb0a5a71f 100644 --- a/Core/Tools/W3DView/Toolbar.h +++ b/Core/Tools/W3DView/Toolbar.h @@ -23,9 +23,7 @@ // Declaration of a 'fancy' toolbar using hi-color buttons // -#ifndef __FANCYTOOLBAR_H -#define __FANCYTOOLBAR_H - +#pragma once ////////////////////////////////////////////////////////////// // @@ -164,5 +162,3 @@ class CFancyToolbar : public CControlBar int m_iButtons; int m_iCurrentButton; }; - -#endif // __FANCYTOOLBAR_H diff --git a/Core/Tools/W3DView/Utils.h b/Core/Tools/W3DView/Utils.h index 62e9410563..1e1168c599 100644 --- a/Core/Tools/W3DView/Utils.h +++ b/Core/Tools/W3DView/Utils.h @@ -23,8 +23,7 @@ // Module containing usefull misc. utility functions // -#ifndef __UTILS_H -#define __UTILS_H +#pragma once #include "Vector.H" @@ -158,5 +157,3 @@ bool Is_Real_LOD (const char *asset_name); // Prototype routines void Rename_Aggregate_Prototype (const char *old_name, const char *new_name); - -#endif //__UTILS_H diff --git a/Core/Tools/W3DView/Vector3RndCombo.H b/Core/Tools/W3DView/Vector3RndCombo.H index 8fe3c9500b..ac47806695 100644 --- a/Core/Tools/W3DView/Vector3RndCombo.H +++ b/Core/Tools/W3DView/Vector3RndCombo.H @@ -30,12 +30,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __VECTOR3RND_COMBO_H -#define __VECTOR3RND_COMBO_H - // Forward declarations class Vector3Randomizer; class Vector3; @@ -48,5 +44,3 @@ class Vector3; void Fill_Vector3_Rnd_Combo (HWND hcombobox); Vector3Randomizer * Vector3_Rnd_From_Combo_Index (int index, float value1, float value2 = 0, float value3 = 0); int Combo_Index_From_Vector3_Rnd (Vector3Randomizer *randomizer); - -#endif //__VECTOR3RND_COMBO_H diff --git a/Core/Tools/W3DView/ViewerAssetMgr.h b/Core/Tools/W3DView/ViewerAssetMgr.h index 6944fc92dd..3025ccbfbe 100644 --- a/Core/Tools/W3DView/ViewerAssetMgr.h +++ b/Core/Tools/W3DView/ViewerAssetMgr.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __VIEWER_ASSETMGR_H -#define __VIEWER_ASSETMGR_H - #include "assetmgr.h" @@ -87,6 +84,3 @@ class ViewerAssetMgrClass : public WW3DAssetManager /////////////////////////////////////////////////// DynamicVectorClass m_MissingTextureList; }; - - -#endif //__VIEWER_ASSETMGR_H diff --git a/Core/Tools/W3DView/ViewerScene.h b/Core/Tools/W3DView/ViewerScene.h index 73efa3d3e7..aac9078201 100644 --- a/Core/Tools/W3DView/ViewerScene.h +++ b/Core/Tools/W3DView/ViewerScene.h @@ -34,13 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - -#ifndef __VIEWER_SCENE_H -#define __VIEWER_SCENE_H - #include "scene.h" #include "aabox.h" #include "sphere.h" @@ -111,6 +106,3 @@ class ViewerSceneClass : public SimpleSceneClass RefRenderObjListClass LineUpList; RefRenderObjListClass LightList; }; - - -#endif //__VIEWER_SCENE_H diff --git a/Core/Tools/W3DView/VolumeRandomDialog.h b/Core/Tools/W3DView/VolumeRandomDialog.h index 50da8c9e72..10956f3122 100644 --- a/Core/Tools/W3DView/VolumeRandomDialog.h +++ b/Core/Tools/W3DView/VolumeRandomDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_VOLUMERANDOMDIALOG_H__F22DB07B_0EFF_11D3_A034_00104B791122__INCLUDED_) -#define AFX_VOLUMERANDOMDIALOG_H__F22DB07B_0EFF_11D3_A034_00104B791122__INCLUDED_ - #pragma once + // VolumeRandomDialog.h : header file // @@ -94,5 +92,3 @@ class VolumeRandomDialogClass : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_VOLUMERANDOMDIALOG_H__F22DB07B_0EFF_11D3_A034_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/W3DView.h b/Core/Tools/W3DView/W3DView.h index f4d26152ea..e7e3f1bde3 100644 --- a/Core/Tools/W3DView/W3DView.h +++ b/Core/Tools/W3DView/W3DView.h @@ -19,9 +19,6 @@ // W3DView.h : main header file for the W3DVIEW application // -#if !defined(AFX_W3DVIEW_H__2BB39E2B_5D3A_11D2_9FC6_00104B791122__INCLUDED_) -#define AFX_W3DVIEW_H__2BB39E2B_5D3A_11D2_9FC6_00104B791122__INCLUDED_ - #pragma once #ifndef __AFXWIN_H__ @@ -66,5 +63,3 @@ class CW3DViewApp : public CWinApp //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_W3DVIEW_H__2BB39E2B_5D3A_11D2_9FC6_00104B791122__INCLUDED_) diff --git a/Core/Tools/W3DView/W3DViewDoc.h b/Core/Tools/W3DView/W3DViewDoc.h index b3a3dfea68..cab9ffd9b1 100644 --- a/Core/Tools/W3DView/W3DViewDoc.h +++ b/Core/Tools/W3DView/W3DViewDoc.h @@ -20,9 +20,6 @@ // ///////////////////////////////////////////////////////////////////////////// -#if !defined(AFX_W3DVIEWDOC_H__2BB39E31_5D3A_11D2_9FC6_00104B791122__INCLUDED_) -#define AFX_W3DVIEWDOC_H__2BB39E31_5D3A_11D2_9FC6_00104B791122__INCLUDED_ - #pragma once #include "scene.h" @@ -335,7 +332,3 @@ class CW3DViewDoc : public CDocument //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_W3DVIEWDOC_H__2BB39E31_5D3A_11D2_9FC6_00104B791122__INCLUDED_) - - diff --git a/Core/Tools/W3DView/W3DViewView.h b/Core/Tools/W3DView/W3DViewView.h index 64dab24007..024b2af2af 100644 --- a/Core/Tools/W3DView/W3DViewView.h +++ b/Core/Tools/W3DView/W3DViewView.h @@ -20,9 +20,6 @@ // ///////////////////////////////////////////////////////////////////////////// -#if !defined(AFX_W3DVIEWVIEW_H__2BB39E33_5D3A_11D2_9FC6_00104B791122__INCLUDED_) -#define AFX_W3DVIEWVIEW_H__2BB39E33_5D3A_11D2_9FC6_00104B791122__INCLUDED_ - #pragma once class CW3DViewView : public CView @@ -73,5 +70,3 @@ inline CW3DViewDoc* CW3DViewView::GetDocument() //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_W3DVIEWVIEW_H__2BB39E33_5D3A_11D2_9FC6_00104B791122__INCLUDED_) diff --git a/Core/Tools/WW3D/max2w3d/AlphaModifier.h b/Core/Tools/WW3D/max2w3d/AlphaModifier.h index 47bf775459..e698b0e20e 100644 --- a/Core/Tools/WW3D/max2w3d/AlphaModifier.h +++ b/Core/Tools/WW3D/max2w3d/AlphaModifier.h @@ -34,10 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef ALPHA_MODIFIER_H -#define ALPHA_MODIFIER_H - +#pragma once #include #include "iparamm2.h" @@ -146,9 +143,3 @@ class AlphaModDlgProc : public ParamMap2UserDlgProc void SetThing(ReferenceTarget *m) {AlphaModifier = (AlphaModifierClass*)m;} }; - - -#endif //ALPHA_MODIFIER_H - - - diff --git a/Core/Tools/WW3D/max2w3d/ExportAllDlg.h b/Core/Tools/WW3D/max2w3d/ExportAllDlg.h index fc85abd06f..536e822a13 100644 --- a/Core/Tools/WW3D/max2w3d/ExportAllDlg.h +++ b/Core/Tools/WW3D/max2w3d/ExportAllDlg.h @@ -34,9 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef EXPORTALLDLG_H -#define EXPORTALLDLG_H +#pragma once #include "dllmain.h" #include "resource.h" @@ -76,6 +74,3 @@ class ExportAllDlg void OnBrowse (void); BOOL OnOK (void); // TRUE if ok to close dialog }; - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/FormClass.h b/Core/Tools/WW3D/max2w3d/FormClass.h index e70b1149af..9f12c95df3 100644 --- a/Core/Tools/WW3D/max2w3d/FormClass.h +++ b/Core/Tools/WW3D/max2w3d/FormClass.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __FORMCLASS_H -#define __FORMCLASS_H - #include @@ -66,5 +62,3 @@ class FormClass : public ParamDlg HWND m_hWnd; RECT m_FormRect; }; - -#endif //__FORMCLASS_H diff --git a/Core/Tools/WW3D/max2w3d/GameMtlDlg.h b/Core/Tools/WW3D/max2w3d/GameMtlDlg.h index e28a822969..e5fe6042b7 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlDlg.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlDlg.h @@ -34,13 +34,10 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - - - -#ifndef GAMEMTLDLG_H -#define GAMEMTLDLG_H +#pragma once class GameMtl; + class GameMtlPassDlg; @@ -114,6 +111,3 @@ class GameMtlDlg: public ParamDlg friend BOOL CALLBACK PassCountPanelDlgProc(HWND, UINT, WPARAM,LPARAM); friend class GameMtl; }; - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/GameMtlForm.h b/Core/Tools/WW3D/max2w3d/GameMtlForm.h index cf4033947f..6febb29d35 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlForm.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlForm.h @@ -34,10 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - - -#ifndef GAMEMTLFORM_H -#define GAMEMTLFORM_H +#pragma once #include "FormClass.h" @@ -60,5 +57,3 @@ class GameMtlFormClass : public FormClass GameMtl * TheMtl; // current mtl being edited. int PassIndex; // material pass that this form edits }; - -#endif diff --git a/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.h b/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.h index 0efa924bf5..27a47f9172 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.h @@ -34,11 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - - - -#ifndef GAMEMTLPASSDLG_H -#define GAMEMTLPASSDLG_H +#pragma once #include @@ -93,5 +89,3 @@ class GameMtlPassDlg: public ParamDlg GameMtlFormClass* Page[PAGE_COUNT]; }; - -#endif diff --git a/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.h b/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.h index 7c623ca5ef..298cf9bd35 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.h @@ -34,10 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - - -#ifndef GAMEMTLSHADERDLG_H -#define GAMEMTLSHADERDLG_H +#pragma once #include #include "GameMtlForm.h" @@ -66,5 +63,3 @@ class GameMtlShaderDlg : public GameMtlFormClass bool CompareShaderToBlendPreset(const ShaderBlendSettingPreset &blend_preset); void Set_Advanced_Defaults(void); }; - -#endif diff --git a/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.h b/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.h index 567af7be08..6c7bcebc14 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.h @@ -34,13 +34,10 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - - - -#ifndef GAMEMTLTEXTUREDLG_H -#define GAMEMTLTEXTUREDLG_H +#pragma once #include + #include "GameMtlForm.h" class GameMtl; @@ -81,10 +78,3 @@ class GameMtlTextureDlg : public GameMtlFormClass ICustButton * Stage0DisplayButton; ICustButton * Stage1DisplayButton; }; - - - - -#endif - - diff --git a/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.h b/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.h index c8b92a48b9..63b3caa9c7 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.h @@ -34,10 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - - -#ifndef GAMEMTLVERTEXMATERIALDLG_H -#define GAMEMTLVERTEXMATERIALDLG_H +#pragma once #include #include "GameMtlForm.h" @@ -71,6 +68,3 @@ class GameMtlVertexMaterialDlg : public GameMtlFormClass ISpinnerControl * ShininessSpin; ISpinnerControl * UVChannelSpin[MAX_STAGES]; }; - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/InputDlg.h b/Core/Tools/WW3D/max2w3d/InputDlg.h index 57a6420838..28beae3a67 100644 --- a/Core/Tools/WW3D/max2w3d/InputDlg.h +++ b/Core/Tools/WW3D/max2w3d/InputDlg.h @@ -34,10 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - - -#ifndef INPUTDLG_H -#define INPUTDLG_H +#pragma once #include "dllmain.h" #include "resource.h" @@ -81,6 +78,3 @@ class InputDlg LRESULT OnInitDialog (WPARAM wParam, LPARAM lParam); BOOL OnOK (void); }; - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/LightGlareSave.h b/Core/Tools/WW3D/max2w3d/LightGlareSave.h index 6fd1b38006..74aad4b041 100644 --- a/Core/Tools/WW3D/max2w3d/LightGlareSave.h +++ b/Core/Tools/WW3D/max2w3d/LightGlareSave.h @@ -38,9 +38,6 @@ #pragma once -#ifndef LIGHTGLARESAVE_H -#define LIGHTGLARESAVE_H - #include #include "w3d_file.h" #include "chunkio.h" @@ -76,7 +73,3 @@ class LightGlareSaveClass W3dLightGlareStruct GlareData; }; - - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/MeshDeform.h b/Core/Tools/WW3D/max2w3d/MeshDeform.h index 7d80686f86..5f50d7629e 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeform.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeform.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __MESH_DEFORM_H -#define __MESH_DEFORM_H +#pragma once #include #include "Vector.H" @@ -196,6 +194,3 @@ class MeshDeformClass : public OSModifier // Information CStr m_OperationName; }; - - -#endif //__MESH_DEFORM_H diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformData.h b/Core/Tools/WW3D/max2w3d/MeshDeformData.h index 43eaa9043b..9690b0cab8 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformData.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformData.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef __MESH_DEFORM_DATA_H -#define __MESH_DEFORM_DATA_H +#pragma once #include #include "Vector.H" @@ -122,7 +121,3 @@ class MeshDeformModData : public LocalModData int m_CurrentSet; SETS_LIST m_SetsList; }; - - -#endif //__MESH_DEFORM_DATA_H - diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformDefs.h b/Core/Tools/WW3D/max2w3d/MeshDeformDefs.h index b5f770b8d6..9b297fdbaa 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformDefs.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformDefs.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef __MESH_DEFORM_DEFS_H -#define __MESH_DEFORM_DEFS_H +#pragma once #include #include "Vector.H" @@ -94,7 +93,3 @@ typedef struct _VERT_INFO // /////////////////////////////////////////////////////////////////////////// typedef DynamicVectorClass DEFORM_LIST; - - -#endif //__MESH_DEFORM_DEFS_H - diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformPanel.h b/Core/Tools/WW3D/max2w3d/MeshDeformPanel.h index 8973d8bbc0..ffd5bfd567 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformPanel.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformPanel.h @@ -34,9 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __MESH_DEFORM_PANEL_H -#define __MESH_DEFORM_PANEL_H +#pragma once #include #include "resource.h" @@ -112,6 +110,3 @@ class MeshDeformPanelClass ICustButton * m_pLockSetsButton; MeshDeformClass * m_pMeshDeformer; }; - - -#endif //__MESH_DEFORM_PANEL_H diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSave.h b/Core/Tools/WW3D/max2w3d/MeshDeformSave.h index ccfa8c7578..92fdd47c0a 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformSave.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformSave.h @@ -35,8 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef __MESH_DEFORM_SAVE_H -#define __MESH_DEFORM_SAVE_H +#pragma once #include #include "Vector.H" @@ -106,5 +105,3 @@ class MeshDeformSaveClass DEFORM_SAVE_LIST m_DeformSets; unsigned int m_AlphaPasses; }; - -#endif //__MESH_DEFORM_SAVE_H diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSaveDefs.h b/Core/Tools/WW3D/max2w3d/MeshDeformSaveDefs.h index 8f9acb8d14..2202b6b66b 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformSaveDefs.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformSaveDefs.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef __MESH_DEFORM_SAVE_DEFS_H -#define __MESH_DEFORM_SAVE_DEFS_H +#pragma once #include @@ -109,6 +108,3 @@ struct DeformDataChunk Point3 Value; uint32 reserved[2]; }; - - -#endif //__MESH_DEFORM_SAVE_DEFS_H diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.h b/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.h index 2b26fa5555..633d72cc41 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.h @@ -35,8 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef __MESH_DEFORM_SAVE_SET_H -#define __MESH_DEFORM_SAVE_SET_H +#pragma once #include #include "Vector.H" @@ -134,5 +133,3 @@ class MeshDeformSaveSetClass KEYFRAME * m_CurrentKeyFrame; unsigned int m_Flags; }; - -#endif //__MESH_DEFORM_SAVE_SET_H diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSet.h b/Core/Tools/WW3D/max2w3d/MeshDeformSet.h index ea662cd992..da5110f014 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformSet.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformSet.h @@ -34,9 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __MESH_DEFORM_SET_H -#define __MESH_DEFORM_SET_H +#pragma once #include #include "Vector.H" @@ -179,7 +177,3 @@ class MeshDeformSetClass // List of key frames KEY_FRAME_LIST m_KeyFrames; }; - - -#endif //__MESH_DEFORM_DATA_H - diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformUndo.h b/Core/Tools/WW3D/max2w3d/MeshDeformUndo.h index 6394b43cb2..3483e0674e 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformUndo.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformUndo.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef __MESH_DEFORM_UNDO_H -#define __MESH_DEFORM_UNDO_H +#pragma once #include #include "Vector.H" @@ -150,6 +149,3 @@ class VertexColorRestoreClass : public VertexRestoreClass virtual void Copy_Vertex_State (DEFORM_LIST &list); virtual void Apply_Vertex_Data (DEFORM_LIST &list); }; - - -#endif //__MESH_DEFORM_UNDO_H diff --git a/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.h b/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.h index 56f96ce9b3..5b0875507b 100644 --- a/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.h +++ b/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.h @@ -34,9 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef PS2GAMEMTLSHADERDLG_H -#define PS2GAMEMTLSHADERDLG_H +#pragma once #include #include "GameMtlForm.h" @@ -67,5 +65,3 @@ class PS2GameMtlShaderDlg : public GameMtlFormClass bool CompareShaderToBlendPreset(const PS2ShaderBlendSettingPreset &blend_preset); void Set_Advanced_Defaults(void); }; - -#endif diff --git a/Core/Tools/WW3D/max2w3d/SceneSetupDlg.h b/Core/Tools/WW3D/max2w3d/SceneSetupDlg.h index efd55afcea..ce1d5de584 100644 --- a/Core/Tools/WW3D/max2w3d/SceneSetupDlg.h +++ b/Core/Tools/WW3D/max2w3d/SceneSetupDlg.h @@ -34,9 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef SCENESETUPDLG_H -#define SCENESETUPDLG_H +#pragma once // SceneSetupDlg.h : header file // @@ -91,5 +89,3 @@ class SceneSetupDlg // Protected Data Interface *m_MaxInterface; }; - -#endif diff --git a/Core/Tools/WW3D/max2w3d/SnapPoints.h b/Core/Tools/WW3D/max2w3d/SnapPoints.h index 922f136110..3ef1a76789 100644 --- a/Core/Tools/WW3D/max2w3d/SnapPoints.h +++ b/Core/Tools/WW3D/max2w3d/SnapPoints.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef SNAPPOINTS_H -#define SNAPPOINTS_H - #include "max.h" class ChunkSaveClass; @@ -55,5 +51,3 @@ class SnapPointsClass public: static void Export_Points(INode * scene_root,TimeValue time,ChunkSaveClass & csave); }; - -#endif diff --git a/Core/Tools/WW3D/max2w3d/TARGA.H b/Core/Tools/WW3D/max2w3d/TARGA.H index 05d9aa5c2b..02cf38aee4 100644 --- a/Core/Tools/WW3D/max2w3d/TARGA.H +++ b/Core/Tools/WW3D/max2w3d/TARGA.H @@ -16,8 +16,8 @@ ** along with this program. If not, see . */ -#ifndef _TARGA_H_ -#define _TARGA_H_ +#pragma once + /**************************************************************************** * * C O N F I D E N T I A L --- W E S T W O O D S T U D I O S @@ -315,6 +315,3 @@ class Targa int File_Read(void *buffer, int size); int File_Write(void *buffer, int size); }; - -#endif /* _TARGA_H_ */ - diff --git a/Core/Tools/WW3D/max2w3d/aabtreebuilder.h b/Core/Tools/WW3D/max2w3d/aabtreebuilder.h index bcdeaf9e07..7d7cfe9894 100644 --- a/Core/Tools/WW3D/max2w3d/aabtreebuilder.h +++ b/Core/Tools/WW3D/max2w3d/aabtreebuilder.h @@ -36,12 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef AABTREEBUILDER_H -#define AABTREEBUILDER_H - #include "always.h" #include "vector3.h" #include "vector3i.h" @@ -199,9 +195,3 @@ class AABTreeBuilderClass friend class AABTreeClass; }; - - - - -#endif //AABTREEBUILDER_H - diff --git a/Core/Tools/WW3D/max2w3d/animationcompressionsettings.h b/Core/Tools/WW3D/max2w3d/animationcompressionsettings.h index 112c94b518..921ad26d04 100644 --- a/Core/Tools/WW3D/max2w3d/animationcompressionsettings.h +++ b/Core/Tools/WW3D/max2w3d/animationcompressionsettings.h @@ -36,9 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __ANIMATION_COMPRESSION_SETTINGS_H -#define __ANIMATION_COMPRESSION_SETTINGS_H +#pragma once #include #include @@ -90,7 +88,3 @@ class AnimationCompressionSettingsDialogClass HWND Wnd; HWND ParentWnd; }; - - -#endif //__ANIMATION_COMPRESSION_SETTINGS_H - diff --git a/Core/Tools/WW3D/max2w3d/bchannel.h b/Core/Tools/WW3D/max2w3d/bchannel.h index 9507139d5f..594681ec01 100644 --- a/Core/Tools/WW3D/max2w3d/bchannel.h +++ b/Core/Tools/WW3D/max2w3d/bchannel.h @@ -34,9 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef BCHANNEL_H -#define BCHANNEL_H +#pragma once #ifndef ALWAYS_H #include "always.h" @@ -98,6 +96,3 @@ class BitChannelClass }; - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/boneicon.h b/Core/Tools/WW3D/max2w3d/boneicon.h index f111bd30ae..a9ecbd4207 100644 --- a/Core/Tools/WW3D/max2w3d/boneicon.h +++ b/Core/Tools/WW3D/max2w3d/boneicon.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef BONEICON_H -#define BONEICON_H +#pragma once struct VertexStruct { @@ -53,5 +51,3 @@ extern const int NumBoneIconVerts; extern const int NumBoneIconFaces; extern VertexStruct BoneIconVerts[]; extern FaceStruct BoneIconFaces[]; - -#endif diff --git a/Core/Tools/WW3D/max2w3d/bpick.h b/Core/Tools/WW3D/max2w3d/bpick.h index 6d6297c5d1..bb21289021 100644 --- a/Core/Tools/WW3D/max2w3d/bpick.h +++ b/Core/Tools/WW3D/max2w3d/bpick.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef BPICK_H -#define BPICK_H +#pragma once #include "max.h" //#include "dllmain.h" @@ -124,6 +122,3 @@ class BonePickerClass : public PickNodeCallback, public PickModeCallback, public }; extern BonePickerClass TheBonePicker; - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/colboxsave.h b/Core/Tools/WW3D/max2w3d/colboxsave.h index a9dc74f768..b044069be1 100644 --- a/Core/Tools/WW3D/max2w3d/colboxsave.h +++ b/Core/Tools/WW3D/max2w3d/colboxsave.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef COLBOXSAVE_H -#define COLBOXSAVE_H - #include #include "w3d_file.h" #include "chunkio.h" @@ -76,7 +72,3 @@ class CollisionBoxSaveClass W3dBoxStruct BoxData; // contains same information as the W3dOBBoxStruct }; - - - -#endif //COLBOXSAVE_H diff --git a/Core/Tools/WW3D/max2w3d/dazzlesave.h b/Core/Tools/WW3D/max2w3d/dazzlesave.h index 5d31ef36c0..0571edbbef 100644 --- a/Core/Tools/WW3D/max2w3d/dazzlesave.h +++ b/Core/Tools/WW3D/max2w3d/dazzlesave.h @@ -38,9 +38,6 @@ #pragma once -#ifndef DAZZLESAVE_H -#define DAZZLESAVE_H - #include #include "w3d_file.h" #include "chunkio.h" @@ -77,12 +74,3 @@ class DazzleSaveClass char DazzleType[128]; }; - - - - - - - -#endif //DAZZLESAVE_H - diff --git a/Core/Tools/WW3D/max2w3d/dllmain.h b/Core/Tools/WW3D/max2w3d/dllmain.h index 93c6fb9486..f3eec14c3f 100644 --- a/Core/Tools/WW3D/max2w3d/dllmain.h +++ b/Core/Tools/WW3D/max2w3d/dllmain.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef DLLMAIN_H -#define DLLMAIN_H +#pragma once #include @@ -47,5 +45,3 @@ extern HINSTANCE AppInstance; #define MAX_PATH_LENGTH _MAX_PATH TCHAR * Get_String(int id); - -#endif /*DLLMAIN_H*/ diff --git a/Core/Tools/WW3D/max2w3d/exportlog.h b/Core/Tools/WW3D/max2w3d/exportlog.h index 593bda0180..d9b4e58f23 100644 --- a/Core/Tools/WW3D/max2w3d/exportlog.h +++ b/Core/Tools/WW3D/max2w3d/exportlog.h @@ -36,9 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef EXPORTLOG_H -#define EXPORTLOG_H +#pragma once #include @@ -56,7 +54,3 @@ class ExportLog static void rprintf(const char *, ...); static void updatebar(float position, float total); }; - - -#endif //EXPORTLOG_H - diff --git a/Core/Tools/WW3D/max2w3d/floaterdialog.h b/Core/Tools/WW3D/max2w3d/floaterdialog.h index d4837cdc19..de6d7f0427 100644 --- a/Core/Tools/WW3D/max2w3d/floaterdialog.h +++ b/Core/Tools/WW3D/max2w3d/floaterdialog.h @@ -36,9 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef FLOATERDIALOG_H -#define FLOATERDIALOG_H +#pragma once #include @@ -68,8 +66,3 @@ class FloaterDialogClass DLGPROC ChildDialogProc; }; - - - -#endif //FLOATERDIALOG_H - diff --git a/Core/Tools/WW3D/max2w3d/gamemaps.h b/Core/Tools/WW3D/max2w3d/gamemaps.h index d2098b2217..d5240ee18d 100644 --- a/Core/Tools/WW3D/max2w3d/gamemaps.h +++ b/Core/Tools/WW3D/max2w3d/gamemaps.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef GAMEMAPS_H -#define GAMEMAPS_H +#pragma once #include #include "stdmat.h" @@ -110,6 +108,3 @@ class GameMapsClass: public ReferenceTarget IOResult Save(ISave * isave); IOResult Load(ILoad * iload); }; - - -#endif /*GAMEMAPS_H*/ diff --git a/Core/Tools/WW3D/max2w3d/gamemtl.h b/Core/Tools/WW3D/max2w3d/gamemtl.h index 3b07db3ca5..42df7ce8a5 100644 --- a/Core/Tools/WW3D/max2w3d/gamemtl.h +++ b/Core/Tools/WW3D/max2w3d/gamemtl.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef GAMEMTL_H -#define GAMEMTL_H +#pragma once #include #include "w3dmtl.h" @@ -366,8 +364,3 @@ class GameMtl: public Mtl }; Mtl * CreateGameMtl(); - -#endif - - - diff --git a/Core/Tools/WW3D/max2w3d/genlodextensiondialog.h b/Core/Tools/WW3D/max2w3d/genlodextensiondialog.h index a7bbfab0eb..c028e8a6fb 100644 --- a/Core/Tools/WW3D/max2w3d/genlodextensiondialog.h +++ b/Core/Tools/WW3D/max2w3d/genlodextensiondialog.h @@ -36,8 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef GENLODEXTENSIONDIALOG_H -#define GENLODEXTENSIONDIALOG_H +#pragma once #include @@ -87,8 +86,3 @@ class GenLodExtensionDialogClass friend BOOL CALLBACK _gen_lod_ext_dialog_proc(HWND Hwnd,UINT message,WPARAM wParam,LPARAM lParam); }; - - - - -#endif //GENLODEXTENSIONDIALOG_H diff --git a/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.h b/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.h index 50f6ee44bd..fcb8ef9614 100644 --- a/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.h +++ b/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.h @@ -36,8 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef GENMTLNAMESDIALOG_H -#define GENMTLNAMESDIALOG_H +#pragma once #include @@ -95,8 +94,3 @@ class GenMtlNamesDialogClass friend BOOL CALLBACK _gen_mtl_names_dialog_proc(HWND hwnd,UINT message,WPARAM wparam,LPARAM lparam); }; - - -#endif //GENMTLNAMESDIALOG_H - - diff --git a/Core/Tools/WW3D/max2w3d/geometryexportcontext.h b/Core/Tools/WW3D/max2w3d/geometryexportcontext.h index 679b15d38f..c1d83f18d8 100644 --- a/Core/Tools/WW3D/max2w3d/geometryexportcontext.h +++ b/Core/Tools/WW3D/max2w3d/geometryexportcontext.h @@ -36,9 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef GEOMETRYEXPORTCONTEXT_H -#define GEOMETRYEXPORTCONTEXT_H +#pragma once #include @@ -108,8 +106,3 @@ class GeometryExportContextClass int numHouseColors; ///MW: number of used house colors char * materialColorTexture; //MW: texture to hold material colors }; - - - -#endif //GEOMETRYEXPORTCONTEXT_H - diff --git a/Core/Tools/WW3D/max2w3d/geometryexporttask.h b/Core/Tools/WW3D/max2w3d/geometryexporttask.h index 5a0dbae27d..c7b16bf17a 100644 --- a/Core/Tools/WW3D/max2w3d/geometryexporttask.h +++ b/Core/Tools/WW3D/max2w3d/geometryexporttask.h @@ -36,8 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef GEOMETRYEXPORTTASK_H -#define GEOMETRYEXPORTTASK_H +#pragma once #include #include @@ -148,8 +147,3 @@ class GeometryExportTaskClass TimeValue CurTime; INode * Node; }; - - - -#endif //GEOMETRYEXPORTTASK_H - diff --git a/Core/Tools/WW3D/max2w3d/gridsnapmodifier.h b/Core/Tools/WW3D/max2w3d/gridsnapmodifier.h index 280911b232..b921e787df 100644 --- a/Core/Tools/WW3D/max2w3d/gridsnapmodifier.h +++ b/Core/Tools/WW3D/max2w3d/gridsnapmodifier.h @@ -36,12 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef GRIDSNAPMODIFIER_H -#define GRIDSNAPMODIFIER_H +#pragma once class ClassDesc; ClassDesc * Get_Grid_Snap_Modifier_Desc(void); - - -#endif //GRIDSNAPMODIFIER_H diff --git a/Core/Tools/WW3D/max2w3d/hiersave.h b/Core/Tools/WW3D/max2w3d/hiersave.h index ad379a21aa..fb88aae355 100644 --- a/Core/Tools/WW3D/max2w3d/hiersave.h +++ b/Core/Tools/WW3D/max2w3d/hiersave.h @@ -35,8 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef HIERSAVE_H -#define HIERSAVE_H +#pragma once #include "always.h" @@ -166,5 +165,3 @@ class HierarchySaveClass Matrix3 fixup_matrix(const Matrix3 & src) const; void Free(void); }; - -#endif /*HIERSAVE_H*/ diff --git a/Core/Tools/WW3D/max2w3d/hlodsave.h b/Core/Tools/WW3D/max2w3d/hlodsave.h index e24edb6df3..0adf30f7ac 100644 --- a/Core/Tools/WW3D/max2w3d/hlodsave.h +++ b/Core/Tools/WW3D/max2w3d/hlodsave.h @@ -34,9 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef HLODSAVE_H -#define HLODSAVE_H +#pragma once #include "always.h" @@ -123,7 +121,3 @@ class HLodSaveClass HLodArrayEntry aggregate_array; HLodArrayEntry proxy_array; }; - - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/logdlg.h b/Core/Tools/WW3D/max2w3d/logdlg.h index c902c564ba..9be2b8c7e6 100644 --- a/Core/Tools/WW3D/max2w3d/logdlg.h +++ b/Core/Tools/WW3D/max2w3d/logdlg.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef LOGDLG_H -#define LOGDLG_H +#pragma once #include @@ -82,6 +80,4 @@ volatile int status; }; -#endif - // EOF - logdlg.h diff --git a/Core/Tools/WW3D/max2w3d/maxworldinfo.h b/Core/Tools/WW3D/max2w3d/maxworldinfo.h index b1bebb58a7..d04603eb3a 100644 --- a/Core/Tools/WW3D/max2w3d/maxworldinfo.h +++ b/Core/Tools/WW3D/max2w3d/maxworldinfo.h @@ -36,9 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef MAXWORLDINFO_H -#define MAXWORLDINFO_H - +#pragma once #include #include "meshbuild.h" @@ -87,7 +85,3 @@ class MaxWorldInfoClass : public WorldInfoClass Matrix3 ExportTrans; bool SmoothBetweenMeshes; }; - - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/meshbuild.h b/Core/Tools/WW3D/max2w3d/meshbuild.h index dd71c7eb54..b8a5c794ce 100644 --- a/Core/Tools/WW3D/max2w3d/meshbuild.h +++ b/Core/Tools/WW3D/max2w3d/meshbuild.h @@ -36,9 +36,6 @@ #pragma once -#ifndef MESHBUILD_H -#define MESHBUILD_H - #include "always.h" #include "vector2.h" #include "vector3.h" @@ -373,5 +370,3 @@ inline const MeshBuilderClass::MeshStatsStruct & MeshBuilderClass::Get_Mesh_Stat assert(State == STATE_MESH_PROCESSED); return Stats; } - -#endif diff --git a/Core/Tools/WW3D/max2w3d/meshcon.h b/Core/Tools/WW3D/max2w3d/meshcon.h index 792b59abee..9e099841ac 100644 --- a/Core/Tools/WW3D/max2w3d/meshcon.h +++ b/Core/Tools/WW3D/max2w3d/meshcon.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef MESHCON_H -#define MESHCON_H - +#pragma once #ifndef ALWAYS_H #include "always.h" @@ -144,6 +141,3 @@ class MeshConnectionsClass }; - - -#endif /*MESHCON_H*/ diff --git a/Core/Tools/WW3D/max2w3d/meshsave.h b/Core/Tools/WW3D/max2w3d/meshsave.h index 66609518b9..0574d55b15 100644 --- a/Core/Tools/WW3D/max2w3d/meshsave.h +++ b/Core/Tools/WW3D/max2w3d/meshsave.h @@ -37,9 +37,6 @@ #pragma once -#ifndef MESHSAVE_H -#define MESHSAVE_H - #include "rawfile.h" // have to include this before Max.h #include #include "BITTYPE.H" @@ -216,9 +213,3 @@ class MeshSaveClass friend class DamageClass; }; - - - - - -#endif /*MESHSAVE_H*/ diff --git a/Core/Tools/WW3D/max2w3d/motion.h b/Core/Tools/WW3D/max2w3d/motion.h index 811d8f56de..5bde02b62f 100644 --- a/Core/Tools/WW3D/max2w3d/motion.h +++ b/Core/Tools/WW3D/max2w3d/motion.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef MOTION_H -#define MOTION_H - +#pragma once #ifndef ALWAYS_H #include "always.h" @@ -159,6 +156,3 @@ class MotionClass void init(void); }; - - -#endif /*MOTION_H*/ diff --git a/Core/Tools/WW3D/max2w3d/namedsel.h b/Core/Tools/WW3D/max2w3d/namedsel.h index 1c2c3722ff..28c7c71bec 100644 --- a/Core/Tools/WW3D/max2w3d/namedsel.h +++ b/Core/Tools/WW3D/max2w3d/namedsel.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef NAMEDSEL_H -#define NAMEDSEL_H - +#pragma once #include "max.h" @@ -78,6 +76,3 @@ class NamedSelSetList NAMED_SEL_NAME_CHUNK = 0x0023 }; }; - - -#endif /*NAMEDSEL_H*/ diff --git a/Core/Tools/WW3D/max2w3d/nullsave.h b/Core/Tools/WW3D/max2w3d/nullsave.h index b4c890272a..116c6ed95c 100644 --- a/Core/Tools/WW3D/max2w3d/nullsave.h +++ b/Core/Tools/WW3D/max2w3d/nullsave.h @@ -34,13 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef NULLSAVE_H -#define NULLSAVE_H - - #include #include "w3d_file.h" #include "chunkio.h" @@ -72,8 +67,3 @@ class NullSaveClass W3dNullObjectStruct NullData; }; - - - - -#endif //NULLSAVE_H diff --git a/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.h b/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.h index 0565e29e74..96fa0d295b 100644 --- a/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.h +++ b/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.h @@ -36,9 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __PRESET_EXPORT_OPTIONS_DIALOG_H -#define __PRESET_EXPORT_OPTIONS_DIALOG_H +#pragma once #include #include @@ -118,7 +116,3 @@ class PresetExportOptionsDialogClass HWND PaneWnds[PANE_MAX]; int CurrentPane; }; - - -#endif //__PRESET_EXPORT_OPTIONS_DIALOG_H - diff --git a/Core/Tools/WW3D/max2w3d/rcmenu.h b/Core/Tools/WW3D/max2w3d/rcmenu.h index 71ba817199..27a782c6d4 100644 --- a/Core/Tools/WW3D/max2w3d/rcmenu.h +++ b/Core/Tools/WW3D/max2w3d/rcmenu.h @@ -35,8 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef RCMENU_H -#define RCMENU_H +#pragma once #include "max.h" #include "dllmain.h" @@ -85,5 +84,3 @@ class RCMenuClass : public RightClickMenu }; extern RCMenuClass TheRCMenu; - -#endif diff --git a/Core/Tools/WW3D/max2w3d/simpdib.h b/Core/Tools/WW3D/max2w3d/simpdib.h index 8c066624f5..535446c851 100644 --- a/Core/Tools/WW3D/max2w3d/simpdib.h +++ b/Core/Tools/WW3D/max2w3d/simpdib.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef SIMPDIB_H -#define SIMPDIB_H +#pragma once #ifndef ALWAYS_H #include "always.h" @@ -77,6 +76,3 @@ class SimpleDIBClass int Pitch; // offset from DIBPixelBase to next row (can be negative for bottom-up DIBS) }; - - -#endif /*SIMPDIB_H*/ diff --git a/Core/Tools/WW3D/max2w3d/skin.h b/Core/Tools/WW3D/max2w3d/skin.h index f42f9a0ecd..ff5f7baf2a 100644 --- a/Core/Tools/WW3D/max2w3d/skin.h +++ b/Core/Tools/WW3D/max2w3d/skin.h @@ -34,9 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef SKIN_H -#define SKIN_H +#pragma once #include #include "simpmod.h" @@ -397,9 +395,3 @@ class SkinModifierClass : public Modifier, BonePickerUserClass */ friend BOOL CALLBACK _bone_influence_dialog_thunk(HWND hWnd,UINT message,WPARAM wParam,LPARAM lParam); }; - - - - -#endif - diff --git a/Core/Tools/WW3D/max2w3d/skindata.h b/Core/Tools/WW3D/max2w3d/skindata.h index 0aa3d681bc..6726465dc8 100644 --- a/Core/Tools/WW3D/max2w3d/skindata.h +++ b/Core/Tools/WW3D/max2w3d/skindata.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef SKINDATA_H -#define SKINDATA_H +#pragma once #include "max.h" #include "namedsel.h" @@ -157,6 +155,3 @@ class SkinDataClass : public LocalModData }; }; - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/util.h b/Core/Tools/WW3D/max2w3d/util.h index 44af73865e..96eb55e03f 100644 --- a/Core/Tools/WW3D/max2w3d/util.h +++ b/Core/Tools/WW3D/max2w3d/util.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef UTIL_H -#define UTIL_H +#pragma once #ifndef ALWAYS_H #include "always.h" @@ -112,6 +110,3 @@ INode *Find_Named_Node (char *nodename, INode *root); delete [] pobject; \ pobject = NULL; \ } \ - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/vchannel.h b/Core/Tools/WW3D/max2w3d/vchannel.h index 9d28860db1..fbe8beb7f4 100644 --- a/Core/Tools/WW3D/max2w3d/vchannel.h +++ b/Core/Tools/WW3D/max2w3d/vchannel.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef VCHANNEL_H -#define VCHANNEL_H +#pragma once #ifndef ALWAYS_H #include "always.h" @@ -136,5 +134,3 @@ class VectorChannelClass bool SaveAdaptiveDelta(ChunkSaveClass & csave, BitChannelClass *binmov); }; - -#endif /*VCHANNEL_H*/ diff --git a/Core/Tools/WW3D/max2w3d/vxl.h b/Core/Tools/WW3D/max2w3d/vxl.h index 56554989f2..7941bdc9eb 100644 --- a/Core/Tools/WW3D/max2w3d/vxl.h +++ b/Core/Tools/WW3D/max2w3d/vxl.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef VXL_H -#define VXL_H +#pragma once #ifndef ALWAYS_H #include "always.h" @@ -139,6 +137,3 @@ class VoxelClass // returns the position of the center of voxel(i,j,k) Point3 Voxel_Position(int i,int j,int k); }; - - -#endif /*VXL_H*/ diff --git a/Core/Tools/WW3D/max2w3d/vxldbg.h b/Core/Tools/WW3D/max2w3d/vxldbg.h index ec3663a8d8..8a734b8a74 100644 --- a/Core/Tools/WW3D/max2w3d/vxldbg.h +++ b/Core/Tools/WW3D/max2w3d/vxldbg.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef VXLDBG_H -#define VXLDBG_H +#pragma once #ifndef ALWAYS_H #include "always.h" @@ -76,7 +74,3 @@ class VoxelDebugWindowClass void update_display(void); }; - - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/vxllayer.h b/Core/Tools/WW3D/max2w3d/vxllayer.h index e1dcdf2487..31705cf76c 100644 --- a/Core/Tools/WW3D/max2w3d/vxllayer.h +++ b/Core/Tools/WW3D/max2w3d/vxllayer.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef VXLLAYER_H -#define VXLLAYER_H +#pragma once #include @@ -144,6 +142,3 @@ class VoxelLayerClass int bitmap_width; int bitmap_height; }; - - -#endif /*VXLLAYER_H*/ diff --git a/Core/Tools/WW3D/max2w3d/w3d_file.h b/Core/Tools/WW3D/max2w3d/w3d_file.h index fce09375a3..57fd907a71 100644 --- a/Core/Tools/WW3D/max2w3d/w3d_file.h +++ b/Core/Tools/WW3D/max2w3d/w3d_file.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef W3D_FILE_H -#define W3D_FILE_H - #include "always.h" #include "BITTYPE.H" #include "iostruct.h" @@ -2074,6 +2070,3 @@ struct W3dSoundRObjHeaderStruct ** Include the obsolete structures and chunk ID's */ #include "w3d_obsolete.h" - - -#endif // W3D_FILE_H diff --git a/Core/Tools/WW3D/max2w3d/w3d_obsolete.h b/Core/Tools/WW3D/max2w3d/w3d_obsolete.h index 08171b6061..6d36fd2ac2 100644 --- a/Core/Tools/WW3D/max2w3d/w3d_obsolete.h +++ b/Core/Tools/WW3D/max2w3d/w3d_obsolete.h @@ -34,13 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef W3D_OBSOLETE_H -#define W3D_OBSOLETE_H - - ///////////////////////////////////////////////////////////////////////////////////////////// // Obsolete chunk id's // At one point in time I was using the 'O' prefix to mean obsolete. Now we just move stuff @@ -326,6 +321,3 @@ struct W3dHModelAuxDataStruct float32 LODMax; uint32 FutureUse[32]; }; - - -#endif // W3D_OBSOLETE_H diff --git a/Core/Tools/WW3D/max2w3d/w3dappdata.h b/Core/Tools/WW3D/max2w3d/w3dappdata.h index 833a9dc418..a79acf429a 100644 --- a/Core/Tools/WW3D/max2w3d/w3dappdata.h +++ b/Core/Tools/WW3D/max2w3d/w3dappdata.h @@ -36,8 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef W3DAPPDATA_H -#define W3DAPPDATA_H +#pragma once #include @@ -409,7 +408,3 @@ struct W3DDazzleAppDataStruct unsigned int UnUsed[4]; char DazzleType[128]; }; - - -#endif - diff --git a/Core/Tools/WW3D/max2w3d/w3ddesc.h b/Core/Tools/WW3D/max2w3d/w3ddesc.h index bd843dfe65..2eb3ce2d8a 100644 --- a/Core/Tools/WW3D/max2w3d/w3ddesc.h +++ b/Core/Tools/WW3D/max2w3d/w3ddesc.h @@ -35,8 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef W3DDESC_H -#define W3DDESC_H +#pragma once #include "always.h" #include @@ -59,6 +58,3 @@ class W3dClassDesc : public ClassDesc Class_ID ClassID(); const TCHAR * Category(); }; - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/w3ddlg.h b/Core/Tools/WW3D/max2w3d/w3ddlg.h index a04cf54a26..49801726ba 100644 --- a/Core/Tools/WW3D/max2w3d/w3ddlg.h +++ b/Core/Tools/WW3D/max2w3d/w3ddlg.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef W3DDLG_H -#define W3DDLG_H +#pragma once #include "always.h" #include @@ -102,6 +100,3 @@ class W3dOptionsDialogClass int UnitsType; float UnitsScale; }; - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/w3dexp.h b/Core/Tools/WW3D/max2w3d/w3dexp.h index 3ad3aab222..df69186b38 100644 --- a/Core/Tools/WW3D/max2w3d/w3dexp.h +++ b/Core/Tools/WW3D/max2w3d/w3dexp.h @@ -35,8 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef W3DEXP_H -#define W3DEXP_H +#pragma once #include "always.h" #include @@ -117,6 +116,3 @@ class W3dExportClass : public SceneExport void End_Progress_Bar(void); }; - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/w3dmtl.h b/Core/Tools/WW3D/max2w3d/w3dmtl.h index 592520554d..7238563086 100644 --- a/Core/Tools/WW3D/max2w3d/w3dmtl.h +++ b/Core/Tools/WW3D/max2w3d/w3dmtl.h @@ -36,9 +36,6 @@ #pragma once -#ifndef W3DMTL_H -#define W3DMTL_H - #include "always.h" #include "w3d_file.h" #include "Vector.H" @@ -305,7 +302,3 @@ class W3dMaterialDescClass DynamicVectorClass < TexClass > Textures; }; - - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/w3dutil.h b/Core/Tools/WW3D/max2w3d/w3dutil.h index 3bb2f62277..ad1e6a4e57 100644 --- a/Core/Tools/WW3D/max2w3d/w3dutil.h +++ b/Core/Tools/WW3D/max2w3d/w3dutil.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef W3DUTIL_H -#define W3DUTIL_H +#pragma once #include #include "utilapi.h" @@ -126,5 +124,3 @@ W3DAppData0Struct * GetW3DAppData0 (INode *node); W3DAppData1Struct * GetW3DAppData1 (INode *node); W3DAppData2Struct * GetW3DAppData2 (INode *node); W3DDazzleAppDataStruct * GetW3DDazzleAppData(INode *node); - -#endif diff --git a/Core/Tools/WW3D/pluglib/BITTYPE.H b/Core/Tools/WW3D/pluglib/BITTYPE.H index ccd0ebe22a..803142c16f 100644 --- a/Core/Tools/WW3D/pluglib/BITTYPE.H +++ b/Core/Tools/WW3D/pluglib/BITTYPE.H @@ -28,8 +28,7 @@ * *****************************************************************/ -#ifndef BITTYPE_H -#define BITTYPE_H +#pragma once typedef unsigned char uint8; typedef unsigned short uint16; @@ -41,6 +40,3 @@ typedef signed long sint32; typedef float float32; typedef double float64; - - -#endif //BITTYPE_H diff --git a/Core/Tools/WW3D/pluglib/EULER.H b/Core/Tools/WW3D/pluglib/EULER.H index 76f28c018a..9901ed406e 100644 --- a/Core/Tools/WW3D/pluglib/EULER.H +++ b/Core/Tools/WW3D/pluglib/EULER.H @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef EULER_H -#define EULER_H +#pragma once #include @@ -114,6 +112,3 @@ private: int Order; }; - - -#endif /*EULER_H*/ diff --git a/Core/Tools/WW3D/pluglib/PROGRESS.H b/Core/Tools/WW3D/pluglib/PROGRESS.H index c32b4f4eab..bb57b2d952 100644 --- a/Core/Tools/WW3D/pluglib/PROGRESS.H +++ b/Core/Tools/WW3D/pluglib/PROGRESS.H @@ -35,8 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef PROGRESS_H -#define PROGRESS_H +#pragma once #include "always.h" @@ -121,5 +120,3 @@ private: BOOL Cancel_Requested; }; - -#endif /* PROGRESS_H */ diff --git a/Core/Tools/WW3D/pluglib/Vector.H b/Core/Tools/WW3D/pluglib/Vector.H index e19e8bedce..893ee38c06 100644 --- a/Core/Tools/WW3D/pluglib/Vector.H +++ b/Core/Tools/WW3D/pluglib/Vector.H @@ -50,8 +50,7 @@ * DynamicVectorClass::Uninitialized_Add -- Add an empty place to the vector. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef VECTOR_H -#define VECTOR_H +#pragma once #include "noinit.h" #include @@ -1001,7 +1000,3 @@ bool Pointer_Vector_Remove(T const * ptr, VectorClass & vec) } return(false); } - - -#endif - diff --git a/Core/Tools/WW3D/pluglib/WWmatrix3.h b/Core/Tools/WW3D/pluglib/WWmatrix3.h index f22c4e5246..3611036e39 100644 --- a/Core/Tools/WW3D/pluglib/WWmatrix3.h +++ b/Core/Tools/WW3D/pluglib/WWmatrix3.h @@ -53,12 +53,8 @@ * Matrix3::Rotate_Z -- Post-multiplies the matrix with a rotation about Z * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef Matrix3_H -#define Matrix3_H - #include "always.h" #include "vector3.h" //#include "wwdebug.h" @@ -1005,5 +1001,3 @@ inline void Matrix3::Transpose_Rotate_Vector(const Matrix3 & A,const Vector3 & i out->Y = (A[0][1] * v->X + A[1][1] * v->Y + A[2][1] * v->Z); out->Z = (A[0][2] * v->X + A[1][2] * v->Y + A[2][2] * v->Z); } - -#endif /*Matrix3_H*/ diff --git a/Core/Tools/WW3D/pluglib/aaplane.h b/Core/Tools/WW3D/pluglib/aaplane.h index 8eca4a2497..0e7cb97e02 100644 --- a/Core/Tools/WW3D/pluglib/aaplane.h +++ b/Core/Tools/WW3D/pluglib/aaplane.h @@ -36,9 +36,6 @@ #pragma once -#ifndef AAPLANE_H -#define AAPLANE_H - #include "always.h" #include "vector3.h" @@ -77,5 +74,3 @@ inline void AAPlaneClass::Get_Normal(Vector3 * normal) const normal->Set(0,0,0); (*normal)[Normal] = 1.0f; } - -#endif diff --git a/Core/Tools/WW3D/pluglib/always.h b/Core/Tools/WW3D/pluglib/always.h index ab90fd3613..79a856d238 100644 --- a/Core/Tools/WW3D/pluglib/always.h +++ b/Core/Tools/WW3D/pluglib/always.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef ALWAYS_H -#define ALWAYS_H +#pragma once // Disable warning about exception handling not being enabled. It's used as part of STL - in a part of STL we don't use. #pragma warning(disable : 4530) @@ -163,6 +161,3 @@ template T max(T a,T b) #ifndef size_of #define size_of(typ,id) sizeof(((typ*)0)->id) #endif - - -#endif diff --git a/Core/Tools/WW3D/pluglib/bool.h b/Core/Tools/WW3D/pluglib/bool.h index a83cc6e5fe..323d7c747b 100644 --- a/Core/Tools/WW3D/pluglib/bool.h +++ b/Core/Tools/WW3D/pluglib/bool.h @@ -33,6 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once #if !defined(TRUE_FALSE_DEFINED) && !defined(__BORLANDC__) && (_MSC_VER < 1100) && !defined(__WATCOMC__) diff --git a/Core/Tools/WW3D/pluglib/borlandc.h b/Core/Tools/WW3D/pluglib/borlandc.h index b62a09ff41..61b945dd0a 100644 --- a/Core/Tools/WW3D/pluglib/borlandc.h +++ b/Core/Tools/WW3D/pluglib/borlandc.h @@ -33,6 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once #if !defined(BORLANDC_H) && defined(__BORLANDC__) diff --git a/Core/Tools/WW3D/pluglib/chunkio.h b/Core/Tools/WW3D/pluglib/chunkio.h index 3f5f44f00d..3481762211 100644 --- a/Core/Tools/WW3D/pluglib/chunkio.h +++ b/Core/Tools/WW3D/pluglib/chunkio.h @@ -34,10 +34,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef CHUNKIO_H -#define CHUNKIO_H +#pragma once #ifndef ALWAYS_H #include "always.h" @@ -372,7 +370,3 @@ class ChunkLoadClass */ #define OBSOLETE_MICRO_CHUNK(id) \ case (id): break; - - - -#endif // CHUNKIO_H diff --git a/Core/Tools/WW3D/pluglib/errclass.h b/Core/Tools/WW3D/pluglib/errclass.h index 67d699bcdd..60c26fa0cf 100644 --- a/Core/Tools/WW3D/pluglib/errclass.h +++ b/Core/Tools/WW3D/pluglib/errclass.h @@ -35,8 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef ERRCLASS_H -#define ERRCLASS_H +#pragma once #include @@ -83,6 +82,3 @@ inline ErrorClass & ErrorClass::operator = (const ErrorClass & that) return *this; } - - -#endif //ERRCLASS_H diff --git a/Core/Tools/WW3D/pluglib/hashcalc.h b/Core/Tools/WW3D/pluglib/hashcalc.h index 97f303027e..a01fbf08ff 100644 --- a/Core/Tools/WW3D/pluglib/hashcalc.h +++ b/Core/Tools/WW3D/pluglib/hashcalc.h @@ -33,12 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once - - -#ifndef HASHCALC_H -#define HASHCALC_H +#pragma once /* ** HashCalculatorClass @@ -66,7 +62,3 @@ template class HashCalculatorClass virtual int Num_Hash_Values(void) = 0; virtual int Get_Hash_Value(int index = 0) = 0; }; - - - -#endif diff --git a/Core/Tools/WW3D/pluglib/hsv.h b/Core/Tools/WW3D/pluglib/hsv.h index 277cc9f35e..67842cf556 100644 --- a/Core/Tools/WW3D/pluglib/hsv.h +++ b/Core/Tools/WW3D/pluglib/hsv.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef HSV_H -#define HSV_H +#pragma once class RGBClass; class HSVClass; @@ -77,5 +76,3 @@ class HSVClass unsigned char Saturation; unsigned char Value; }; - -#endif diff --git a/Core/Tools/WW3D/pluglib/iostruct.h b/Core/Tools/WW3D/pluglib/iostruct.h index 4444b4f830..7cd4bed0cb 100644 --- a/Core/Tools/WW3D/pluglib/iostruct.h +++ b/Core/Tools/WW3D/pluglib/iostruct.h @@ -33,15 +33,13 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once - #pragma once -#ifndef IOSTRUCT_H -#define IOSTRUCT_H +#pragma once #ifndef BITTYPE_H + #include "BITTYPE.H" #endif @@ -74,8 +72,3 @@ struct IOQuaternionStruct { float32 Q[4]; }; - - - -#endif - diff --git a/Core/Tools/WW3D/pluglib/matrix3d.h b/Core/Tools/WW3D/pluglib/matrix3d.h index 9f37207ac6..9d3ba1296e 100644 --- a/Core/Tools/WW3D/pluglib/matrix3d.h +++ b/Core/Tools/WW3D/pluglib/matrix3d.h @@ -72,9 +72,6 @@ #pragma once -#ifndef MATRIX3D_H -#define MATRIX3D_H - #ifdef _UNIX #include "osdep.h" #endif @@ -1510,5 +1507,3 @@ inline void Matrix3D::Inverse_Rotate_Vector(const Matrix3D & A,const Vector3 & i out->Y = (A[0][1] * v->X + A[1][1] * v->Y + A[2][1] * v->Z); out->Z = (A[0][2] * v->X + A[1][2] * v->Y + A[2][2] * v->Z); } - -#endif /* MATRIX3D_H */ diff --git a/Core/Tools/WW3D/pluglib/matrix4.h b/Core/Tools/WW3D/pluglib/matrix4.h index cd432941b8..08b43d2179 100644 --- a/Core/Tools/WW3D/pluglib/matrix4.h +++ b/Core/Tools/WW3D/pluglib/matrix4.h @@ -52,12 +52,8 @@ * Matrix4::operator /= -- "divide equals" operator * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef MATRIX4_H -#define MATRIX4_H - #include "always.h" #include "vector4.h" #include "matrix3d.h" @@ -710,5 +706,3 @@ inline void Matrix4::Transform_Vector(const Matrix4 & A,const Vector3 & in,Vecto out->Y = (A[1][0] * v->X + A[1][1] * v->Y + A[1][2] * v->Z + A[1][3]); out->Z = (A[2][0] * v->X + A[2][1] * v->Y + A[2][2] * v->Z + A[2][3]); } - -#endif /*MATRIX4_H*/ diff --git a/Core/Tools/WW3D/pluglib/nodefilt.h b/Core/Tools/WW3D/pluglib/nodefilt.h index 92e07d26a3..a8c0a43ed5 100644 --- a/Core/Tools/WW3D/pluglib/nodefilt.h +++ b/Core/Tools/WW3D/pluglib/nodefilt.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef NODEFILT_H -#define NODEFILT_H +#pragma once #include "always.h" #include @@ -172,7 +170,3 @@ class VisibleSelectedINodeFilter : public INodeFilterClass public: virtual BOOL Accept_Node(INode * node, TimeValue time); }; - - - -#endif /*NODEFILT_H*/ diff --git a/Core/Tools/WW3D/pluglib/nodelist.h b/Core/Tools/WW3D/pluglib/nodelist.h index 4dfc702cc2..2b0f377e41 100644 --- a/Core/Tools/WW3D/pluglib/nodelist.h +++ b/Core/Tools/WW3D/pluglib/nodelist.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef NODELIST_H -#define NODELIST_H +#pragma once #include "always.h" #include @@ -97,6 +95,3 @@ class INodeCompareClass // returns >0 if nodea > node b. virtual int operator() (INode * nodea,INode * nodeb) const = 0; }; - - -#endif /*NODELIST_H*/ diff --git a/Core/Tools/WW3D/pluglib/noinit.h b/Core/Tools/WW3D/pluglib/noinit.h index efa714de2c..dfbe3b1573 100644 --- a/Core/Tools/WW3D/pluglib/noinit.h +++ b/Core/Tools/WW3D/pluglib/noinit.h @@ -34,8 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef NOINIT_H -#define NOINIT_H +#pragma once /********************************************************************** ** This class is solely used as a parameter to a constructor that does @@ -52,6 +51,3 @@ class NoInitClass { void operator () (void) const {}; }; #endif - - -#endif diff --git a/Core/Tools/WW3D/pluglib/palette.h b/Core/Tools/WW3D/pluglib/palette.h index 29f833bcb4..37fd35125c 100644 --- a/Core/Tools/WW3D/pluglib/palette.h +++ b/Core/Tools/WW3D/pluglib/palette.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef PALETTE_H -#define PALETTE_H +#pragma once #include "rgb.h" @@ -74,6 +72,3 @@ class PaletteClass protected: RGBClass Palette[COLOR_COUNT]; }; - - -#endif diff --git a/Core/Tools/WW3D/pluglib/plane.h b/Core/Tools/WW3D/pluglib/plane.h index 62f2740485..0d6d809679 100644 --- a/Core/Tools/WW3D/pluglib/plane.h +++ b/Core/Tools/WW3D/pluglib/plane.h @@ -35,8 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef PLANE_H -#define PLANE_H +#pragma once #ifndef VECTOR3_H #include "vector3.h" @@ -93,7 +92,3 @@ inline bool In_Front(const Vector3 & point,const PlaneClass & plane) double dist = point * plane.N; return (dist > plane.D); } - - - -#endif /*PLANE_H*/ diff --git a/Core/Tools/WW3D/pluglib/rawfile.h b/Core/Tools/WW3D/pluglib/rawfile.h index 53a012c052..40d81d696a 100644 --- a/Core/Tools/WW3D/pluglib/rawfile.h +++ b/Core/Tools/WW3D/pluglib/rawfile.h @@ -37,10 +37,8 @@ * RawFileClass::~RawFileClass -- Default deconstructor for a file object. * * RawFileClass::Is_Open -- Checks to see if the file is open or not. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef RAWFILE_Hx -#define RAWFILE_Hx +#pragma once //#include @@ -197,7 +195,3 @@ inline char const * RawFileClass::File_Name(void) const { return(Filename); } - - - -#endif diff --git a/Core/Tools/WW3D/pluglib/realcrc.h b/Core/Tools/WW3D/pluglib/realcrc.h index 884afe8a7e..c858e5f583 100644 --- a/Core/Tools/WW3D/pluglib/realcrc.h +++ b/Core/Tools/WW3D/pluglib/realcrc.h @@ -33,15 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once - -#ifndef REALCRC_H -#define REALCRC_H +#pragma once unsigned long CRC_Memory( const unsigned char *data, unsigned long length, unsigned long crc = 0 ); unsigned long CRC_String( const char *string, unsigned long crc = 0 ); unsigned long CRC_Stringi( const char *string, unsigned long crc = 0 ); - - -#endif diff --git a/Core/Tools/WW3D/pluglib/rgb.h b/Core/Tools/WW3D/pluglib/rgb.h index 422dcc373d..8803b13d20 100644 --- a/Core/Tools/WW3D/pluglib/rgb.h +++ b/Core/Tools/WW3D/pluglib/rgb.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef RGB_H -#define RGB_H +#pragma once class PaletteClass; class HSVClass; @@ -89,5 +87,3 @@ class RGBClass }; extern RGBClass const BlackColor; - -#endif diff --git a/Core/Tools/WW3D/pluglib/uarray.h b/Core/Tools/WW3D/pluglib/uarray.h index e19f3b57e6..7c61de4728 100644 --- a/Core/Tools/WW3D/pluglib/uarray.h +++ b/Core/Tools/WW3D/pluglib/uarray.h @@ -36,10 +36,8 @@ * UniqueArrayClass::~UniqueArrayClass -- destructor * * UniqueArrayClass::Add -- Add an item to the array * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef UARRAY_H -#define UARRAY_H +#pragma once #ifndef HASHCALC_H #include "hashcalc.h" @@ -220,7 +218,3 @@ inline int UniqueArrayClass::Add(const T & new_item) return index; } - - -#endif // UARRAY_H - diff --git a/Core/Tools/WW3D/pluglib/vector2.h b/Core/Tools/WW3D/pluglib/vector2.h index 541027fc92..df1431b514 100644 --- a/Core/Tools/WW3D/pluglib/vector2.h +++ b/Core/Tools/WW3D/pluglib/vector2.h @@ -51,9 +51,6 @@ #pragma once -#ifndef VECTOR2_H -#define VECTOR2_H - #include "always.h" #include "wwmath.h" #include @@ -632,7 +629,3 @@ inline void Vector2::Lerp(const Vector2 & a,const Vector2 & b,float t,Vector2 * set_result->X = (a.X + (b.X - a.X)*t); set_result->Y = (a.Y + (b.Y - a.Y)*t); } - - -#endif /* VECTOR2_H */ - diff --git a/Core/Tools/WW3D/pluglib/vector3.h b/Core/Tools/WW3D/pluglib/vector3.h index 54ae725372..1148df55a5 100644 --- a/Core/Tools/WW3D/pluglib/vector3.h +++ b/Core/Tools/WW3D/pluglib/vector3.h @@ -65,9 +65,6 @@ #pragma once -#ifndef VECTOR3_H -#define VECTOR3_H - #include "always.h" #include "wwmath.h" #include @@ -923,6 +920,3 @@ WWINLINE unsigned long Vector3::Convert_To_ARGB( void ) const (unsigned(Y*255.0f)<<8) | (unsigned(Z*255.0f)); } - -#endif /* Vector3_H */ - diff --git a/Core/Tools/WW3D/pluglib/vector3i.h b/Core/Tools/WW3D/pluglib/vector3i.h index 17cb241c45..4f65ee531c 100644 --- a/Core/Tools/WW3D/pluglib/vector3i.h +++ b/Core/Tools/WW3D/pluglib/vector3i.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef VECTOR3I_H -#define VECTOR3I_H - #include "always.h" class Vector3i @@ -88,5 +84,3 @@ WWINLINE int& Vector3i::operator[] (int n) { return ((int*)this)[n]; } - -#endif diff --git a/Core/Tools/WW3D/pluglib/vector4.h b/Core/Tools/WW3D/pluglib/vector4.h index 4fb3608437..cc2223bc75 100644 --- a/Core/Tools/WW3D/pluglib/vector4.h +++ b/Core/Tools/WW3D/pluglib/vector4.h @@ -46,9 +46,6 @@ #pragma once -#ifndef VECTOR4_H -#define VECTOR4_H - #include "always.h" #include "wwmath.h" #include @@ -382,7 +379,3 @@ inline bool Vector4::Is_Valid(void) const { return (WWMath::Is_Valid_Float(X) && WWMath::Is_Valid_Float(Y) && WWMath::Is_Valid_Float(Z) && WWMath::Is_Valid_Float(W)); } - - -#endif /* VECTOR4_H */ - diff --git a/Core/Tools/WW3D/pluglib/visualc.h b/Core/Tools/WW3D/pluglib/visualc.h index 2093d7edb0..2d23ad8d83 100644 --- a/Core/Tools/WW3D/pluglib/visualc.h +++ b/Core/Tools/WW3D/pluglib/visualc.h @@ -33,6 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once #if defined(_MSC_VER) diff --git a/Core/Tools/WW3D/pluglib/w3d_file.h b/Core/Tools/WW3D/pluglib/w3d_file.h index b29a6780c2..44c0747975 100644 --- a/Core/Tools/WW3D/pluglib/w3d_file.h +++ b/Core/Tools/WW3D/pluglib/w3d_file.h @@ -35,9 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef W3D_FILE_H -#define W3D_FILE_H +#pragma once #include "always.h" @@ -883,7 +881,3 @@ struct W3dTileMapPartitionStruct W3dVectorStruct Min; // min corner of the bounding box W3dVectorStruct Max; // max corner of the bounding box }; - - - -#endif diff --git a/Core/Tools/WW3D/pluglib/w3dquat.h b/Core/Tools/WW3D/pluglib/w3dquat.h index 86d034c080..a6219a3bf8 100644 --- a/Core/Tools/WW3D/pluglib/w3dquat.h +++ b/Core/Tools/WW3D/pluglib/w3dquat.h @@ -37,9 +37,6 @@ #pragma once -#ifndef QUAT_H -#define QUAT_H - #include "always.h" #include "wwmath.h" #include "WWmatrix3.h" @@ -253,8 +250,3 @@ inline bool Quaternion::Is_Valid(void) const WWMath::Is_Valid_Float(Z) && WWMath::Is_Valid_Float(W) ); } - -#endif /* QUAT_H */ - - - diff --git a/Core/Tools/WW3D/pluglib/watcom.h b/Core/Tools/WW3D/pluglib/watcom.h index 775dcc13a7..c8b7db5c24 100644 --- a/Core/Tools/WW3D/pluglib/watcom.h +++ b/Core/Tools/WW3D/pluglib/watcom.h @@ -33,6 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once #if !defined(WATCOM_H) && defined(__WATCOMC__) diff --git a/Core/Tools/WW3D/pluglib/win.h b/Core/Tools/WW3D/pluglib/win.h index faaae191dc..009b4e7412 100644 --- a/Core/Tools/WW3D/pluglib/win.h +++ b/Core/Tools/WW3D/pluglib/win.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef WIN_H -#define WIN_H +#pragma once /* ** This header file includes the Windows headers. If there are any special pragmas that need @@ -85,5 +83,3 @@ void __cdecl Print_Win32Error(unsigned long win32Error); #else // _WINDOWS #include #endif // _WINDOWS - -#endif // WIN_H diff --git a/Core/Tools/WW3D/pluglib/wwfile.h b/Core/Tools/WW3D/pluglib/wwfile.h index dc15835633..1ae0e39403 100644 --- a/Core/Tools/WW3D/pluglib/wwfile.h +++ b/Core/Tools/WW3D/pluglib/wwfile.h @@ -33,10 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef WWFILE_Hx -#define WWFILE_Hx +#pragma once #ifdef _UNIX #include "osdep.h" @@ -106,5 +104,3 @@ class FileClass int Printf_Indented(unsigned depth, char *str, ...); }; - -#endif diff --git a/Core/Tools/WW3D/pluglib/wwmath.h b/Core/Tools/WW3D/pluglib/wwmath.h index 5387bdf95e..9bb2cc9bcc 100644 --- a/Core/Tools/WW3D/pluglib/wwmath.h +++ b/Core/Tools/WW3D/pluglib/wwmath.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef WWMATH_H -#define WWMATH_H - #include "always.h" #include #include @@ -251,5 +247,3 @@ inline bool WWMath::Is_Valid_Double(double x) } return true; } - -#endif diff --git a/Core/Tools/mangler/crc.h b/Core/Tools/mangler/crc.h index fbd057f424..0ff76e0ce9 100644 --- a/Core/Tools/mangler/crc.h +++ b/Core/Tools/mangler/crc.h @@ -16,11 +16,8 @@ ** along with this program. If not, see . */ -#ifndef __CRC_H__ -#define __CRC_H__ +#pragma once void Build_Packet_CRC(unsigned char *buf, int len); // len includes 4-byte CRC at head bool Passes_CRC_Check(unsigned char *buf, int len); // len includes 4-byte CRC at head void Add_CRC(unsigned long *crc, unsigned long val); - -#endif // __CRC_H__ diff --git a/Core/Tools/mangler/endian.h b/Core/Tools/mangler/endian.h index 9c31d5e428..9cf4efffa3 100644 --- a/Core/Tools/mangler/endian.h +++ b/Core/Tools/mangler/endian.h @@ -16,10 +16,7 @@ ** along with this program. If not, see . */ -#ifndef __ENDIAN_H__ -#define __ENDIAN_H__ - - +#pragma once /* ** Network order is big-endian. @@ -59,7 +56,3 @@ template inline T Endian(T val) return (retval); } - - -#endif //__ENDIAN_H__ - diff --git a/Core/Tools/mangler/mangler.h b/Core/Tools/mangler/mangler.h index c9cb28ed87..4368290acd 100644 --- a/Core/Tools/mangler/mangler.h +++ b/Core/Tools/mangler/mangler.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef __MANGLER_H__ -#define __MANGLER_H__ +#pragma once // Packet should consist of a GlobalHeaderType followed by a GlobalPacketType with the fields set as // indicated. @@ -75,5 +74,3 @@ struct ManglerData { #if !defined(__GNUC__) #pragma pack(pop) #endif - -#endif // __MANGLER_H__ diff --git a/Core/Tools/mangler/wlib/arraylist.h b/Core/Tools/mangler/wlib/arraylist.h index b7d23d6df1..58c8481842 100644 --- a/Core/Tools/mangler/wlib/arraylist.h +++ b/Core/Tools/mangler/wlib/arraylist.h @@ -44,8 +44,7 @@ that don't belong to them, etc... \****************************************************************************/ -#ifndef ARRAYLIST_HEADER -#define ARRAYLIST_HEADER +#pragma once #include #include @@ -704,6 +703,3 @@ bit8 ArrayList::shrinkVector(void) return(TRUE); } - - -#endif diff --git a/Core/Tools/mangler/wlib/configfile.h b/Core/Tools/mangler/wlib/configfile.h index ed765cf2d6..eba5a02c81 100644 --- a/Core/Tools/mangler/wlib/configfile.h +++ b/Core/Tools/mangler/wlib/configfile.h @@ -26,8 +26,7 @@ Start Date : June 9, 1997 Last Update : May 13, 1999 \***************************************************************************/ -#ifndef CONFIGFILE_HEADER -#define CONFIGFILE_HEADER +#pragma once #include "wstypes.h" #include "dictionary.h" @@ -72,5 +71,3 @@ class ConfigFile // are allowed so you don't need to worry about an outer lock around the enumerate CritSec Critsec_; // lock around dictionary }; - -#endif diff --git a/Core/Tools/mangler/wlib/critsec.h b/Core/Tools/mangler/wlib/critsec.h index 7bba850033..687667d74d 100644 --- a/Core/Tools/mangler/wlib/critsec.h +++ b/Core/Tools/mangler/wlib/critsec.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef CRITSEC_HEADER -#define CRITSEC_HEADER +#pragma once #include "wstypes.h" #ifdef _WIN32 @@ -58,5 +57,3 @@ class CritSec mutable int RefCount_; // Reference count #endif }; - -#endif diff --git a/Core/Tools/mangler/wlib/dictionary.h b/Core/Tools/mangler/wlib/dictionary.h index 52839bcf13..2a21b5273b 100644 --- a/Core/Tools/mangler/wlib/dictionary.h +++ b/Core/Tools/mangler/wlib/dictionary.h @@ -35,10 +35,7 @@ is working well, this is much faster than a linked list, but only if your hashing function is good. \****************************************************************************/ - -#ifndef DICTIONARY_HEADER -#define DICTIONARY_HEADER - +#pragma once #include #include @@ -675,7 +672,3 @@ void Dictionary::expand(void) } delete[](oldtable); } - - -#endif - diff --git a/Core/Tools/mangler/wlib/filed.h b/Core/Tools/mangler/wlib/filed.h index eee97e1cf2..2d00ab1afa 100644 --- a/Core/Tools/mangler/wlib/filed.h +++ b/Core/Tools/mangler/wlib/filed.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef FILED_HEADER -#define FILED_HEADER +#pragma once #include "odevice.h" @@ -47,5 +46,3 @@ class FileD : public OutputDevice FILE *out; }; - -#endif diff --git a/Core/Tools/mangler/wlib/linkedlist.h b/Core/Tools/mangler/wlib/linkedlist.h index ead1736ad6..8589c3c45c 100644 --- a/Core/Tools/mangler/wlib/linkedlist.h +++ b/Core/Tools/mangler/wlib/linkedlist.h @@ -33,8 +33,7 @@ Copies of the data are stored instead of a pointer to the original. If you want to store pointers then the template should be of a pointer type. \****************************************************************************/ -#ifndef LINKEDLIST_HEADER -#define LINKEDLIST_HEADER +#pragma once #include #include @@ -491,5 +490,3 @@ template sint32 LinkedList::length(void) { return(Entries); } - -#endif diff --git a/Core/Tools/mangler/wlib/mboxd.h b/Core/Tools/mangler/wlib/mboxd.h index 3c4d0f5dde..a45eff3700 100644 --- a/Core/Tools/mangler/wlib/mboxd.h +++ b/Core/Tools/mangler/wlib/mboxd.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef MBOXD_HEADER -#define MBOXD_HEADER +#pragma once #include "odevice.h" @@ -36,5 +35,3 @@ class MboxD : public OutputDevice } }; - -#endif diff --git a/Core/Tools/mangler/wlib/monod.h b/Core/Tools/mangler/wlib/monod.h index 494674c974..4f94fd065e 100644 --- a/Core/Tools/mangler/wlib/monod.h +++ b/Core/Tools/mangler/wlib/monod.h @@ -16,9 +16,7 @@ ** along with this program. If not, see . */ -#ifndef MONOD_HEADER -#define MONOD_HEADER - +#pragma once #include #include @@ -70,5 +68,3 @@ class MonoD : public OutputDevice HANDLE handle; #endif }; - -#endif diff --git a/Core/Tools/mangler/wlib/odevice.h b/Core/Tools/mangler/wlib/odevice.h index ccd45e01a8..8cb924ea42 100644 --- a/Core/Tools/mangler/wlib/odevice.h +++ b/Core/Tools/mangler/wlib/odevice.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef ODEVICE_HEADER -#define ODEVICE_HEADER +#pragma once // This virtual base class provides an interface for output devices // that can be used for the debugging package. @@ -28,5 +27,3 @@ class OutputDevice virtual ~OutputDevice() {}; virtual int print(const char *s,int len)=0; }; - -#endif diff --git a/Core/Tools/mangler/wlib/sem4.h b/Core/Tools/mangler/wlib/sem4.h index 1ffe33f6a8..175663dea1 100644 --- a/Core/Tools/mangler/wlib/sem4.h +++ b/Core/Tools/mangler/wlib/sem4.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef SEM4_HEADER -#define SEM4_HEADER +#pragma once #include #ifndef _WINDOWS @@ -60,5 +59,3 @@ class Sem4 sint32 GetValue(int *sval) const; sint32 Destroy(void); }; - -#endif diff --git a/Core/Tools/mangler/wlib/stderrd.h b/Core/Tools/mangler/wlib/stderrd.h index abc8b5e0ec..3af596103e 100644 --- a/Core/Tools/mangler/wlib/stderrd.h +++ b/Core/Tools/mangler/wlib/stderrd.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef STDERRD_HEADER -#define STDERRD_HEADER +#pragma once #include "odevice.h" @@ -35,5 +34,3 @@ class StderrD : public OutputDevice return(len); } }; - -#endif diff --git a/Core/Tools/mangler/wlib/stdoutd.h b/Core/Tools/mangler/wlib/stdoutd.h index 5170fc1f5c..a7f51a76da 100644 --- a/Core/Tools/mangler/wlib/stdoutd.h +++ b/Core/Tools/mangler/wlib/stdoutd.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef STDOUTD_HEADER -#define STDOUTD_HEADER +#pragma once #include "odevice.h" @@ -36,5 +35,3 @@ class StdoutD : public OutputDevice return(len); } }; - -#endif diff --git a/Core/Tools/mangler/wlib/streamer.h b/Core/Tools/mangler/wlib/streamer.h index ce94139cd0..d0121a89be 100644 --- a/Core/Tools/mangler/wlib/streamer.h +++ b/Core/Tools/mangler/wlib/streamer.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef STREAMER_HEADER -#define STREAMER_HEADER +#pragma once #include #include @@ -63,5 +62,3 @@ class Streamer : public streambuf OutputDevice *Output_Device; char* Buf; }; - -#endif diff --git a/Core/Tools/mangler/wlib/syslogd.h b/Core/Tools/mangler/wlib/syslogd.h index ee427b6418..5cf2c7bf0a 100644 --- a/Core/Tools/mangler/wlib/syslogd.h +++ b/Core/Tools/mangler/wlib/syslogd.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef SYSLOGD_HEADER -#define SYSLOGD_HEADER +#pragma once #include #include @@ -44,5 +43,3 @@ class SyslogD : public OutputDevice private: int priority; }; - -#endif diff --git a/Core/Tools/mangler/wlib/threadfac.h b/Core/Tools/mangler/wlib/threadfac.h index 3441735005..027de9be53 100644 --- a/Core/Tools/mangler/wlib/threadfac.h +++ b/Core/Tools/mangler/wlib/threadfac.h @@ -20,8 +20,7 @@ // Platform independent thread creation (Win32 & POSIX) // -#ifndef THREADFAC_HEADER -#define THREADFAC_HEADER +#pragma once #ifdef _WIN32 #include @@ -120,5 +119,3 @@ class Runnable static int ThreadCount_; static CritSec CritSec_; // to protect ThreadCount_ }; - -#endif diff --git a/Core/Tools/mangler/wlib/threadsafe.h b/Core/Tools/mangler/wlib/threadsafe.h index 551ffe837b..bc5492885d 100644 --- a/Core/Tools/mangler/wlib/threadsafe.h +++ b/Core/Tools/mangler/wlib/threadsafe.h @@ -31,8 +31,7 @@ #ifdef _REENTRANT -#ifndef THREADSAFE_HEADER -#define THREADSAFE_HEADER +#pragma once #define strtok ("strtok() is not MT-SAFE!") #define ascctime ("asctime() is not MT-SAFE!") @@ -57,6 +56,4 @@ #define pclose ("pclose() is not MT-SAFE!") #define ctermid ("ctermid() is not MT-SAFE!") #define getlogin ("getlogin() is not MT-SAFE!"); - -#endif // THREADSAFE_HEADER #endif // _REENTRANT diff --git a/Core/Tools/mangler/wlib/timezone.h b/Core/Tools/mangler/wlib/timezone.h index b7fe3ec5f1..3849cad000 100644 --- a/Core/Tools/mangler/wlib/timezone.h +++ b/Core/Tools/mangler/wlib/timezone.h @@ -25,8 +25,7 @@ only tells you info about what the daylight savings info is now, not 5 minutes from now, not 2 hours ago. Oh well. \****************************************************************************/ -#ifndef _TIMEZONE_H_ -#define _TIMEZONE_H_ +#pragma once // Just fill in both the timezone description and its offset from GMT void GetTimezoneInfo(const char * &timezone_str, int &timezone_offset); @@ -36,6 +35,3 @@ const char * TimezoneString(void); // Returns the offset from GMT of the current timezone int TimezoneOffset(void); - -#endif // _TIMEZONE_H_ - diff --git a/Core/Tools/mangler/wlib/ustring.h b/Core/Tools/mangler/wlib/ustring.h index 7796dfb3dd..c06e0d0674 100644 --- a/Core/Tools/mangler/wlib/ustring.h +++ b/Core/Tools/mangler/wlib/ustring.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef USTRING_HEADER -#define USTRING_HEADER +#pragma once #include #include @@ -57,5 +56,3 @@ class UstringT : public basic_string > }; typedef UstringT Ustring; - -#endif diff --git a/Core/Tools/mangler/wlib/wdebug.h b/Core/Tools/mangler/wlib/wdebug.h index 493a0ae90b..ef7e6e922d 100644 --- a/Core/Tools/mangler/wlib/wdebug.h +++ b/Core/Tools/mangler/wlib/wdebug.h @@ -50,8 +50,7 @@ will you be ready to leave grasshopper. \*****************************************************************************/ -#ifndef WDEBUG_HEADER -#define WDEBUG_HEADER +#pragma once #define USE_DEBUG_SEM @@ -310,5 +309,3 @@ class MsgManager static ostream *warnStream(void); static ostream *errorStream(void); }; - -#endif diff --git a/Core/Tools/mangler/wlib/wstring.h b/Core/Tools/mangler/wlib/wstring.h index 8b58b0e676..dc3cf29dd7 100644 --- a/Core/Tools/mangler/wlib/wstring.h +++ b/Core/Tools/mangler/wlib/wstring.h @@ -26,8 +26,7 @@ Start Date : June 1, 1997 Last Update : June 17, 1997 \****************************************************************************/ -#ifndef WSTRING_HEADER -#define WSTRING_HEADER +#pragma once #include #include @@ -89,5 +88,3 @@ class Wstring char *str; // Pointer to allocated string. int strsize; // allocated data length }; - -#endif diff --git a/Core/Tools/mangler/wlib/wstypes.h b/Core/Tools/mangler/wlib/wstypes.h index baa5d72884..8ac37ead63 100644 --- a/Core/Tools/mangler/wlib/wstypes.h +++ b/Core/Tools/mangler/wlib/wstypes.h @@ -28,8 +28,7 @@ Last Update : June 17, 1997 Standard type definitions for the sake of portability and readability. \***************************************************************************/ -#ifndef WSTYPES_HEADER -#define WSTYPES_HEADER +#pragma once #ifdef _REENTRANT // reentrant = threaded // Headers with non threadsafe libs need to come before my hacky @@ -114,5 +113,3 @@ typedef double float64; #define strncasecmp _strnicmp #define strcasecmp _stricmp #endif - -#endif diff --git a/Core/Tools/mangler/wlib/wtime.h b/Core/Tools/mangler/wlib/wtime.h index be8adb38c5..d76259ce68 100644 --- a/Core/Tools/mangler/wlib/wtime.h +++ b/Core/Tools/mangler/wlib/wtime.h @@ -20,9 +20,8 @@ wtime Neal Kettler \****************************************************************************/ -#ifndef WTIME_HEADER -#define WTIME_HEADER +#pragma once #include #include @@ -124,5 +123,3 @@ class Wtime uint32 usec; // microseconds (millionths of a second) bit8 sign; // for time differences 0 = pos 1 = neg }; - -#endif diff --git a/Core/Tools/mangler/wlib/xtime.h b/Core/Tools/mangler/wlib/xtime.h index 0492095a00..8c66f80b0f 100644 --- a/Core/Tools/mangler/wlib/xtime.h +++ b/Core/Tools/mangler/wlib/xtime.h @@ -29,9 +29,7 @@ Hopefully by then somebody will replace the lame time() function :-) \****************************************************************************/ -#ifndef XTIME_HEADER -#define XTIME_HEADER - +#pragma once #include #include @@ -142,5 +140,3 @@ class Xtime sint32 day_; // days since Jan 1, 0 sint32 msec_; // milliseconds (thousandths of a sec) }; - -#endif diff --git a/Core/Tools/mangler/wnet/tcp.h b/Core/Tools/mangler/wnet/tcp.h index 9bfd465d71..e414cf0865 100644 --- a/Core/Tools/mangler/wnet/tcp.h +++ b/Core/Tools/mangler/wnet/tcp.h @@ -21,8 +21,7 @@ TCP Neal Kettler neal@westwood.com \****************************************************************************/ -#ifndef TCP_HEADER -#define TCP_HEADER +#pragma once #include #include @@ -195,5 +194,3 @@ class TCP bit8 SetOutputDelay(sint32 delay) { outputDelay=delay; return(TRUE); }; }; - -#endif diff --git a/Core/Tools/mangler/wnet/udp.h b/Core/Tools/mangler/wnet/udp.h index 118eb100ad..b409398132 100644 --- a/Core/Tools/mangler/wnet/udp.h +++ b/Core/Tools/mangler/wnet/udp.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef UDP_HEADER -#define UDP_HEADER +#pragma once #include #include @@ -110,5 +109,3 @@ class UDP int GetInputBuffer(void); int GetOutputBuffer(void); }; - -#endif diff --git a/Core/Tools/matchbot/debug.h b/Core/Tools/matchbot/debug.h index a9ac87b270..1df2a06947 100644 --- a/Core/Tools/matchbot/debug.h +++ b/Core/Tools/matchbot/debug.h @@ -20,8 +20,7 @@ // Minimal debug info // Author: Matthew D. Campbell, Sept 2002 -#ifndef __DEBUG_H__ -#define __DEBUG_H__ +#pragma once #ifdef DEBUG @@ -41,6 +40,3 @@ void DebugLog( const char *fmt, ... ); #define DEBUG_LOG(x) {} #endif // DEBUG - -#endif // __DEBUG_H__ - diff --git a/Core/Tools/matchbot/encrypt.h b/Core/Tools/matchbot/encrypt.h index af2091e534..f4c204a647 100644 --- a/Core/Tools/matchbot/encrypt.h +++ b/Core/Tools/matchbot/encrypt.h @@ -16,13 +16,8 @@ ** along with this program. If not, see . */ -#ifndef ENCRYPT_HEADER -#define ENCRYPT_HEADER +#pragma once #define MAX_ENCRYPTED_STRING 8 //char *do_encrypt(char *, char *); char *do_encrypt(char *); - -#endif - - diff --git a/Core/Tools/matchbot/generals.h b/Core/Tools/matchbot/generals.h index 0cdd581ec9..a00619d704 100644 --- a/Core/Tools/matchbot/generals.h +++ b/Core/Tools/matchbot/generals.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef __GENERALS_H__ -#define __GENERALS_H__ +#pragma once #ifdef _WIN32 #include @@ -189,6 +188,3 @@ class GeneralsClientMatcher : public MatcherClass private: } ; - -#endif /* __GENERALS_H__ */ - diff --git a/Core/Tools/matchbot/global.h b/Core/Tools/matchbot/global.h index adb3cd0da0..577df4b2c2 100644 --- a/Core/Tools/matchbot/global.h +++ b/Core/Tools/matchbot/global.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef __GLOBAL_H__ -#define __GLOBAL_H__ +#pragma once #ifdef _WIN32 #include @@ -52,6 +51,3 @@ extern GlobalClass Global; // Log rotation functions void rotateOutput(void); void rotateParanoid(void); - -#endif - diff --git a/Core/Tools/matchbot/matcher.h b/Core/Tools/matchbot/matcher.h index c143966387..2d35c8e32f 100644 --- a/Core/Tools/matchbot/matcher.h +++ b/Core/Tools/matchbot/matcher.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef __MATCHER_H__ -#define __MATCHER_H__ +#pragma once #ifdef _WIN32 #include @@ -88,6 +87,3 @@ class MatcherClass time_t m_lastRotation; }; - -#endif /* __MATCHER_H__ */ - diff --git a/Core/Tools/matchbot/mydebug.h b/Core/Tools/matchbot/mydebug.h index 77af17fea2..91227b3cfa 100644 --- a/Core/Tools/matchbot/mydebug.h +++ b/Core/Tools/matchbot/mydebug.h @@ -50,8 +50,7 @@ will you be ready to leave grasshopper. \*****************************************************************************/ -#ifndef MYDEBUG_HEADER -#define MYDEBUG_HEADER +#pragma once #define USE_SEM @@ -130,5 +129,3 @@ class MyMsgManager static ostream *paranoidStream(void); }; - -#endif diff --git a/Core/Tools/matchbot/rand.h b/Core/Tools/matchbot/rand.h index 59eadee1e8..73ae3ec9be 100644 --- a/Core/Tools/matchbot/rand.h +++ b/Core/Tools/matchbot/rand.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef __RAND_H__ -#define __RAND_H__ +#pragma once #include @@ -40,6 +39,3 @@ class RandClass unsigned int seed[6]; }; - -#endif /* __RAND_H__ */ - diff --git a/Core/Tools/matchbot/wlib/arraylist.h b/Core/Tools/matchbot/wlib/arraylist.h index b7d23d6df1..58c8481842 100644 --- a/Core/Tools/matchbot/wlib/arraylist.h +++ b/Core/Tools/matchbot/wlib/arraylist.h @@ -44,8 +44,7 @@ that don't belong to them, etc... \****************************************************************************/ -#ifndef ARRAYLIST_HEADER -#define ARRAYLIST_HEADER +#pragma once #include #include @@ -704,6 +703,3 @@ bit8 ArrayList::shrinkVector(void) return(TRUE); } - - -#endif diff --git a/Core/Tools/matchbot/wlib/configfile.h b/Core/Tools/matchbot/wlib/configfile.h index ed765cf2d6..eba5a02c81 100644 --- a/Core/Tools/matchbot/wlib/configfile.h +++ b/Core/Tools/matchbot/wlib/configfile.h @@ -26,8 +26,7 @@ Start Date : June 9, 1997 Last Update : May 13, 1999 \***************************************************************************/ -#ifndef CONFIGFILE_HEADER -#define CONFIGFILE_HEADER +#pragma once #include "wstypes.h" #include "dictionary.h" @@ -72,5 +71,3 @@ class ConfigFile // are allowed so you don't need to worry about an outer lock around the enumerate CritSec Critsec_; // lock around dictionary }; - -#endif diff --git a/Core/Tools/matchbot/wlib/critsec.h b/Core/Tools/matchbot/wlib/critsec.h index 7bba850033..687667d74d 100644 --- a/Core/Tools/matchbot/wlib/critsec.h +++ b/Core/Tools/matchbot/wlib/critsec.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef CRITSEC_HEADER -#define CRITSEC_HEADER +#pragma once #include "wstypes.h" #ifdef _WIN32 @@ -58,5 +57,3 @@ class CritSec mutable int RefCount_; // Reference count #endif }; - -#endif diff --git a/Core/Tools/matchbot/wlib/dictionary.h b/Core/Tools/matchbot/wlib/dictionary.h index 52839bcf13..2a21b5273b 100644 --- a/Core/Tools/matchbot/wlib/dictionary.h +++ b/Core/Tools/matchbot/wlib/dictionary.h @@ -35,10 +35,7 @@ is working well, this is much faster than a linked list, but only if your hashing function is good. \****************************************************************************/ - -#ifndef DICTIONARY_HEADER -#define DICTIONARY_HEADER - +#pragma once #include #include @@ -675,7 +672,3 @@ void Dictionary::expand(void) } delete[](oldtable); } - - -#endif - diff --git a/Core/Tools/matchbot/wlib/filed.h b/Core/Tools/matchbot/wlib/filed.h index eee97e1cf2..2d00ab1afa 100644 --- a/Core/Tools/matchbot/wlib/filed.h +++ b/Core/Tools/matchbot/wlib/filed.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef FILED_HEADER -#define FILED_HEADER +#pragma once #include "odevice.h" @@ -47,5 +46,3 @@ class FileD : public OutputDevice FILE *out; }; - -#endif diff --git a/Core/Tools/matchbot/wlib/linkedlist.h b/Core/Tools/matchbot/wlib/linkedlist.h index ead1736ad6..8589c3c45c 100644 --- a/Core/Tools/matchbot/wlib/linkedlist.h +++ b/Core/Tools/matchbot/wlib/linkedlist.h @@ -33,8 +33,7 @@ Copies of the data are stored instead of a pointer to the original. If you want to store pointers then the template should be of a pointer type. \****************************************************************************/ -#ifndef LINKEDLIST_HEADER -#define LINKEDLIST_HEADER +#pragma once #include #include @@ -491,5 +490,3 @@ template sint32 LinkedList::length(void) { return(Entries); } - -#endif diff --git a/Core/Tools/matchbot/wlib/mboxd.h b/Core/Tools/matchbot/wlib/mboxd.h index 3c4d0f5dde..a45eff3700 100644 --- a/Core/Tools/matchbot/wlib/mboxd.h +++ b/Core/Tools/matchbot/wlib/mboxd.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef MBOXD_HEADER -#define MBOXD_HEADER +#pragma once #include "odevice.h" @@ -36,5 +35,3 @@ class MboxD : public OutputDevice } }; - -#endif diff --git a/Core/Tools/matchbot/wlib/monod.h b/Core/Tools/matchbot/wlib/monod.h index 494674c974..4f94fd065e 100644 --- a/Core/Tools/matchbot/wlib/monod.h +++ b/Core/Tools/matchbot/wlib/monod.h @@ -16,9 +16,7 @@ ** along with this program. If not, see . */ -#ifndef MONOD_HEADER -#define MONOD_HEADER - +#pragma once #include #include @@ -70,5 +68,3 @@ class MonoD : public OutputDevice HANDLE handle; #endif }; - -#endif diff --git a/Core/Tools/matchbot/wlib/odevice.h b/Core/Tools/matchbot/wlib/odevice.h index ccd45e01a8..8cb924ea42 100644 --- a/Core/Tools/matchbot/wlib/odevice.h +++ b/Core/Tools/matchbot/wlib/odevice.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef ODEVICE_HEADER -#define ODEVICE_HEADER +#pragma once // This virtual base class provides an interface for output devices // that can be used for the debugging package. @@ -28,5 +27,3 @@ class OutputDevice virtual ~OutputDevice() {}; virtual int print(const char *s,int len)=0; }; - -#endif diff --git a/Core/Tools/matchbot/wlib/sem4.h b/Core/Tools/matchbot/wlib/sem4.h index 1ffe33f6a8..175663dea1 100644 --- a/Core/Tools/matchbot/wlib/sem4.h +++ b/Core/Tools/matchbot/wlib/sem4.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef SEM4_HEADER -#define SEM4_HEADER +#pragma once #include #ifndef _WINDOWS @@ -60,5 +59,3 @@ class Sem4 sint32 GetValue(int *sval) const; sint32 Destroy(void); }; - -#endif diff --git a/Core/Tools/matchbot/wlib/stderrd.h b/Core/Tools/matchbot/wlib/stderrd.h index abc8b5e0ec..3af596103e 100644 --- a/Core/Tools/matchbot/wlib/stderrd.h +++ b/Core/Tools/matchbot/wlib/stderrd.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef STDERRD_HEADER -#define STDERRD_HEADER +#pragma once #include "odevice.h" @@ -35,5 +34,3 @@ class StderrD : public OutputDevice return(len); } }; - -#endif diff --git a/Core/Tools/matchbot/wlib/stdoutd.h b/Core/Tools/matchbot/wlib/stdoutd.h index 5170fc1f5c..a7f51a76da 100644 --- a/Core/Tools/matchbot/wlib/stdoutd.h +++ b/Core/Tools/matchbot/wlib/stdoutd.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef STDOUTD_HEADER -#define STDOUTD_HEADER +#pragma once #include "odevice.h" @@ -36,5 +35,3 @@ class StdoutD : public OutputDevice return(len); } }; - -#endif diff --git a/Core/Tools/matchbot/wlib/streamer.h b/Core/Tools/matchbot/wlib/streamer.h index ce94139cd0..d0121a89be 100644 --- a/Core/Tools/matchbot/wlib/streamer.h +++ b/Core/Tools/matchbot/wlib/streamer.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef STREAMER_HEADER -#define STREAMER_HEADER +#pragma once #include #include @@ -63,5 +62,3 @@ class Streamer : public streambuf OutputDevice *Output_Device; char* Buf; }; - -#endif diff --git a/Core/Tools/matchbot/wlib/syslogd.h b/Core/Tools/matchbot/wlib/syslogd.h index ee427b6418..5cf2c7bf0a 100644 --- a/Core/Tools/matchbot/wlib/syslogd.h +++ b/Core/Tools/matchbot/wlib/syslogd.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef SYSLOGD_HEADER -#define SYSLOGD_HEADER +#pragma once #include #include @@ -44,5 +43,3 @@ class SyslogD : public OutputDevice private: int priority; }; - -#endif diff --git a/Core/Tools/matchbot/wlib/threadfac.h b/Core/Tools/matchbot/wlib/threadfac.h index 3441735005..027de9be53 100644 --- a/Core/Tools/matchbot/wlib/threadfac.h +++ b/Core/Tools/matchbot/wlib/threadfac.h @@ -20,8 +20,7 @@ // Platform independent thread creation (Win32 & POSIX) // -#ifndef THREADFAC_HEADER -#define THREADFAC_HEADER +#pragma once #ifdef _WIN32 #include @@ -120,5 +119,3 @@ class Runnable static int ThreadCount_; static CritSec CritSec_; // to protect ThreadCount_ }; - -#endif diff --git a/Core/Tools/matchbot/wlib/threadsafe.h b/Core/Tools/matchbot/wlib/threadsafe.h index 551ffe837b..bc5492885d 100644 --- a/Core/Tools/matchbot/wlib/threadsafe.h +++ b/Core/Tools/matchbot/wlib/threadsafe.h @@ -31,8 +31,7 @@ #ifdef _REENTRANT -#ifndef THREADSAFE_HEADER -#define THREADSAFE_HEADER +#pragma once #define strtok ("strtok() is not MT-SAFE!") #define ascctime ("asctime() is not MT-SAFE!") @@ -57,6 +56,4 @@ #define pclose ("pclose() is not MT-SAFE!") #define ctermid ("ctermid() is not MT-SAFE!") #define getlogin ("getlogin() is not MT-SAFE!"); - -#endif // THREADSAFE_HEADER #endif // _REENTRANT diff --git a/Core/Tools/matchbot/wlib/timezone.h b/Core/Tools/matchbot/wlib/timezone.h index b7fe3ec5f1..3849cad000 100644 --- a/Core/Tools/matchbot/wlib/timezone.h +++ b/Core/Tools/matchbot/wlib/timezone.h @@ -25,8 +25,7 @@ only tells you info about what the daylight savings info is now, not 5 minutes from now, not 2 hours ago. Oh well. \****************************************************************************/ -#ifndef _TIMEZONE_H_ -#define _TIMEZONE_H_ +#pragma once // Just fill in both the timezone description and its offset from GMT void GetTimezoneInfo(const char * &timezone_str, int &timezone_offset); @@ -36,6 +35,3 @@ const char * TimezoneString(void); // Returns the offset from GMT of the current timezone int TimezoneOffset(void); - -#endif // _TIMEZONE_H_ - diff --git a/Core/Tools/matchbot/wlib/ustring.h b/Core/Tools/matchbot/wlib/ustring.h index 7796dfb3dd..c06e0d0674 100644 --- a/Core/Tools/matchbot/wlib/ustring.h +++ b/Core/Tools/matchbot/wlib/ustring.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef USTRING_HEADER -#define USTRING_HEADER +#pragma once #include #include @@ -57,5 +56,3 @@ class UstringT : public basic_string > }; typedef UstringT Ustring; - -#endif diff --git a/Core/Tools/matchbot/wlib/wdebug.h b/Core/Tools/matchbot/wlib/wdebug.h index 07ab528543..1a363ccca9 100644 --- a/Core/Tools/matchbot/wlib/wdebug.h +++ b/Core/Tools/matchbot/wlib/wdebug.h @@ -50,8 +50,7 @@ will you be ready to leave grasshopper. \*****************************************************************************/ -#ifndef WDEBUG_HEADER -#define WDEBUG_HEADER +#pragma once #define USE_DEBUG_SEM @@ -314,5 +313,3 @@ class MsgManager static ostream *warnStream(void); static ostream *errorStream(void); }; - -#endif diff --git a/Core/Tools/matchbot/wlib/wstring.h b/Core/Tools/matchbot/wlib/wstring.h index 8b58b0e676..dc3cf29dd7 100644 --- a/Core/Tools/matchbot/wlib/wstring.h +++ b/Core/Tools/matchbot/wlib/wstring.h @@ -26,8 +26,7 @@ Start Date : June 1, 1997 Last Update : June 17, 1997 \****************************************************************************/ -#ifndef WSTRING_HEADER -#define WSTRING_HEADER +#pragma once #include #include @@ -89,5 +88,3 @@ class Wstring char *str; // Pointer to allocated string. int strsize; // allocated data length }; - -#endif diff --git a/Core/Tools/matchbot/wlib/wstypes.h b/Core/Tools/matchbot/wlib/wstypes.h index baa5d72884..8ac37ead63 100644 --- a/Core/Tools/matchbot/wlib/wstypes.h +++ b/Core/Tools/matchbot/wlib/wstypes.h @@ -28,8 +28,7 @@ Last Update : June 17, 1997 Standard type definitions for the sake of portability and readability. \***************************************************************************/ -#ifndef WSTYPES_HEADER -#define WSTYPES_HEADER +#pragma once #ifdef _REENTRANT // reentrant = threaded // Headers with non threadsafe libs need to come before my hacky @@ -114,5 +113,3 @@ typedef double float64; #define strncasecmp _strnicmp #define strcasecmp _stricmp #endif - -#endif diff --git a/Core/Tools/matchbot/wlib/wtime.h b/Core/Tools/matchbot/wlib/wtime.h index be8adb38c5..d76259ce68 100644 --- a/Core/Tools/matchbot/wlib/wtime.h +++ b/Core/Tools/matchbot/wlib/wtime.h @@ -20,9 +20,8 @@ wtime Neal Kettler \****************************************************************************/ -#ifndef WTIME_HEADER -#define WTIME_HEADER +#pragma once #include #include @@ -124,5 +123,3 @@ class Wtime uint32 usec; // microseconds (millionths of a second) bit8 sign; // for time differences 0 = pos 1 = neg }; - -#endif diff --git a/Core/Tools/matchbot/wlib/xtime.h b/Core/Tools/matchbot/wlib/xtime.h index 0492095a00..8c66f80b0f 100644 --- a/Core/Tools/matchbot/wlib/xtime.h +++ b/Core/Tools/matchbot/wlib/xtime.h @@ -29,9 +29,7 @@ Hopefully by then somebody will replace the lame time() function :-) \****************************************************************************/ -#ifndef XTIME_HEADER -#define XTIME_HEADER - +#pragma once #include #include @@ -142,5 +140,3 @@ class Xtime sint32 day_; // days since Jan 1, 0 sint32 msec_; // milliseconds (thousandths of a sec) }; - -#endif diff --git a/Core/Tools/matchbot/wnet/tcp.h b/Core/Tools/matchbot/wnet/tcp.h index 9bfd465d71..e414cf0865 100644 --- a/Core/Tools/matchbot/wnet/tcp.h +++ b/Core/Tools/matchbot/wnet/tcp.h @@ -21,8 +21,7 @@ TCP Neal Kettler neal@westwood.com \****************************************************************************/ -#ifndef TCP_HEADER -#define TCP_HEADER +#pragma once #include #include @@ -195,5 +194,3 @@ class TCP bit8 SetOutputDelay(sint32 delay) { outputDelay=delay; return(TRUE); }; }; - -#endif diff --git a/Core/Tools/matchbot/wnet/udp.h b/Core/Tools/matchbot/wnet/udp.h index 118eb100ad..b409398132 100644 --- a/Core/Tools/matchbot/wnet/udp.h +++ b/Core/Tools/matchbot/wnet/udp.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef UDP_HEADER -#define UDP_HEADER +#pragma once #include #include @@ -110,5 +109,3 @@ class UDP int GetInputBuffer(void); int GetOutputBuffer(void); }; - -#endif diff --git a/Core/Tools/timingTest/StdAfx.h b/Core/Tools/timingTest/StdAfx.h index ee6dc64133..fd99f02206 100644 --- a/Core/Tools/timingTest/StdAfx.h +++ b/Core/Tools/timingTest/StdAfx.h @@ -21,9 +21,6 @@ // are changed infrequently // -#if !defined(AFX_STDAFX_H__2E1EE76B_62B6_41EC_9B2E_E7B1677E0D6E__INCLUDED_) -#define AFX_STDAFX_H__2E1EE76B_62B6_41EC_9B2E_E7B1677E0D6E__INCLUDED_ - #pragma once #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers @@ -34,5 +31,3 @@ //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__2E1EE76B_62B6_41EC_9B2E_E7B1677E0D6E__INCLUDED_) diff --git a/Core/Tools/wolSetup/StdAfx.h b/Core/Tools/wolSetup/StdAfx.h index c19b0aa099..9c16d70d2f 100644 --- a/Core/Tools/wolSetup/StdAfx.h +++ b/Core/Tools/wolSetup/StdAfx.h @@ -21,9 +21,6 @@ // are changed infrequently // -#if !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) -#define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ - #pragma once #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers @@ -35,5 +32,3 @@ //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_) diff --git a/Core/Tools/wolSetup/WOLAPI/chatdefs.h b/Core/Tools/wolSetup/WOLAPI/chatdefs.h index bcd83f50b0..e0175d7574 100644 --- a/Core/Tools/wolSetup/WOLAPI/chatdefs.h +++ b/Core/Tools/wolSetup/WOLAPI/chatdefs.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef CHATDEFS_HEADER -#define CHATDEFS_HEADER +#pragma once // gks 11/3/1999: version numbers for SetClientVersion // GMU 01/12/01 : bumped CHAT_VERSION_MINOR to 15 @@ -168,6 +167,3 @@ #define CHAN_MODE_KEY 0x0100 #define CHAN_MODE_BAN 0x0200 #define CHAN_MODE_LIMIT 0x0400 - - -#endif diff --git a/Core/Tools/wolSetup/WOLAPI/downloaddefs.h b/Core/Tools/wolSetup/WOLAPI/downloaddefs.h index a5a3bf4ceb..cd78d834a1 100644 --- a/Core/Tools/wolSetup/WOLAPI/downloaddefs.h +++ b/Core/Tools/wolSetup/WOLAPI/downloaddefs.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef _DOWNLOADDEFS_H -#define _DOWNLOADDEFS_H +#pragma once // CDownload statuses @@ -56,5 +55,3 @@ #define DOWNLOADEVENT_LOCALFILEOPENFAILED 5 #define DOWNLOADEVENT_TCPERROR 6 #define DOWNLOADEVENT_DISCONNECTERROR 7 - -#endif diff --git a/Core/Tools/wolSetup/WOLAPI/ftpdefs.h b/Core/Tools/wolSetup/WOLAPI/ftpdefs.h index 35fa5b6a87..1306a38ecb 100644 --- a/Core/Tools/wolSetup/WOLAPI/ftpdefs.h +++ b/Core/Tools/wolSetup/WOLAPI/ftpdefs.h @@ -16,15 +16,10 @@ ** along with this program. If not, see . */ -#ifndef __FTPDEFS_H_INCLUDED__ -#define __FTPDEFS_H_INCLUDED__ - +#pragma once // CFtp return codes. #define FTP_SUCCEEDED S_OK #define FTP_FAILED MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 1 ) #define FTP_TRYING MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 2 ) - - -#endif diff --git a/Core/Tools/wolSetup/WOLAPI/netutildefs.h b/Core/Tools/wolSetup/WOLAPI/netutildefs.h index 5f3840c10e..926bc1f2fa 100644 --- a/Core/Tools/wolSetup/WOLAPI/netutildefs.h +++ b/Core/Tools/wolSetup/WOLAPI/netutildefs.h @@ -16,9 +16,7 @@ ** along with this program. If not, see . */ -#ifndef NETUTILDEFS_HEADER -#define NETUTILDEFS_HEADER - +#pragma once #define NETUTIL_E_ERROR MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 100) #define NETUTIL_E_BUSY MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 101) @@ -28,5 +26,3 @@ #define NETUTIL_E_CANTVERIFY MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 257) #define NETUTIL_S_FINISHED MAKE_HRESULT( SEVERITY_SUCCESS, FACILITY_ITF, 500) - -#endif diff --git a/Core/Tools/wolSetup/verchk.h b/Core/Tools/wolSetup/verchk.h index d83f7cf5ba..4584bc1632 100644 --- a/Core/Tools/wolSetup/verchk.h +++ b/Core/Tools/wolSetup/verchk.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef __VERCHK_H__ -#define __VERCHK_H__ +#pragma once #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN @@ -27,6 +26,3 @@ // Obtain version information from the specified file. bool GetVersionInfo(char* filename, VS_FIXEDFILEINFO* fileInfo); bool loadWolapi( char *filename ); - -#endif // __VERCHK_H__ - diff --git a/Core/Tools/wolSetup/wolSetup.h b/Core/Tools/wolSetup/wolSetup.h index 1241952d56..80350df119 100644 --- a/Core/Tools/wolSetup/wolSetup.h +++ b/Core/Tools/wolSetup/wolSetup.h @@ -19,8 +19,7 @@ // FILE: wolSetup.h ////////////////////////////////////////////////////// // Author: Matthew D. Campbell, December 2001 -#ifndef __WOLSETUP_H__ -#define __WOLSETUP_H__ +#pragma once #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN @@ -42,5 +41,3 @@ extern char g_generalsSerial[]; // TheSuperHackers @todo Check if this should be returning unsigned long. static int MAJOR(unsigned long x) { return (((x) & 0xffff0000) >> 16); } static int MINOR(unsigned long x) { return ((x) & 0xffff); } - -#endif // __WOLSETUP_H__ diff --git a/Generals/Code/GameEngine/Include/Common/ActionManager.h b/Generals/Code/GameEngine/Include/Common/ActionManager.h index 2a66e6dfec..54e982788e 100644 --- a/Generals/Code/GameEngine/Include/Common/ActionManager.h +++ b/Generals/Code/GameEngine/Include/Common/ActionManager.h @@ -34,9 +34,6 @@ #pragma once -#ifndef __ACTIONMANAGER_H_ -#define __ACTIONMANAGER_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/SubsystemInterface.h" @@ -110,5 +107,3 @@ class ActionManager : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern ActionManager *TheActionManager; - -#endif // end __ACTIONMANAGER_H_ diff --git a/Generals/Code/GameEngine/Include/Common/BattleHonors.h b/Generals/Code/GameEngine/Include/Common/BattleHonors.h index a7c94c9816..96ed04409f 100644 --- a/Generals/Code/GameEngine/Include/Common/BattleHonors.h +++ b/Generals/Code/GameEngine/Include/Common/BattleHonors.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __BATTLE_HONORS_H_ -#define __BATTLE_HONORS_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -123,5 +120,3 @@ enum //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __BATTLE_HONORS_H_ diff --git a/Generals/Code/GameEngine/Include/Common/BezierSegment.h b/Generals/Code/GameEngine/Include/Common/BezierSegment.h index e859d1460f..b16df7d8ce 100644 --- a/Generals/Code/GameEngine/Include/Common/BezierSegment.h +++ b/Generals/Code/GameEngine/Include/Common/BezierSegment.h @@ -28,8 +28,6 @@ // DO NOT DISTRIBUTE #pragma once -#ifndef __BEZIERSEGMENT_H__ -#define __BEZIERSEGMENT_H__ #include #include "Common/STLTypedefs.h" @@ -69,5 +67,3 @@ class BezierSegment public: // He get's friendly access. friend class BezFwdIterator; }; - -#endif /* __BEZIERSEGMENT_H__ */ diff --git a/Generals/Code/GameEngine/Include/Common/BitFlags.h b/Generals/Code/GameEngine/Include/Common/BitFlags.h index 2126b37c1f..b923379633 100644 --- a/Generals/Code/GameEngine/Include/Common/BitFlags.h +++ b/Generals/Code/GameEngine/Include/Common/BitFlags.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BitFlags_H_ -#define __BitFlags_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" @@ -329,6 +326,3 @@ class BitFlags }; - -#endif // __BitFlags_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/BitFlagsIO.h b/Generals/Code/GameEngine/Include/Common/BitFlagsIO.h index e010df5b61..2d7be09044 100644 --- a/Generals/Code/GameEngine/Include/Common/BitFlagsIO.h +++ b/Generals/Code/GameEngine/Include/Common/BitFlagsIO.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BitFlagsIO_H_ -#define __BitFlagsIO_H_ - #include "Common/BitFlags.h" #include "Common/INI.h" #include "Common/Xfer.h" @@ -229,5 +226,3 @@ void BitFlags::xfer(Xfer* xfer) } } - -#endif diff --git a/Generals/Code/GameEngine/Include/Common/BorderColors.h b/Generals/Code/GameEngine/Include/Common/BorderColors.h index e88316df7e..d9395537cc 100644 --- a/Generals/Code/GameEngine/Include/Common/BorderColors.h +++ b/Generals/Code/GameEngine/Include/Common/BorderColors.h @@ -18,6 +18,7 @@ // jkmcd + #pragma once struct BorderColor diff --git a/Generals/Code/GameEngine/Include/Common/BuildAssistant.h b/Generals/Code/GameEngine/Include/Common/BuildAssistant.h index 6df0c153b1..40573cae97 100644 --- a/Generals/Code/GameEngine/Include/Common/BuildAssistant.h +++ b/Generals/Code/GameEngine/Include/Common/BuildAssistant.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __BUILDASSISTANT_H_ -#define __BUILDASSISTANT_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" #include "Lib/BaseType.h" @@ -212,6 +209,3 @@ class BuildAssistant : public SubsystemInterface // EXTERN ///////////////////////////////////////////////////////////////////////////////////////// extern BuildAssistant *TheBuildAssistant; - -#endif // __BUILDASSISTANT_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/CDManager.h b/Generals/Code/GameEngine/Include/Common/CDManager.h index df0b031115..2b5a60b157 100644 --- a/Generals/Code/GameEngine/Include/Common/CDManager.h +++ b/Generals/Code/GameEngine/Include/Common/CDManager.h @@ -43,10 +43,6 @@ #pragma once -#ifndef _COMMON_CDMANAGER_H_ -#define _COMMON_CDMANAGER_H_ - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -187,5 +183,3 @@ class CDManager : public CDManagerInterface extern CDManagerInterface *TheCDManager; CDManagerInterface* CreateCDManager( void ); - -#endif // _COMMON_CDMANAGER_H_ diff --git a/Generals/Code/GameEngine/Include/Common/ClientUpdateModule.h b/Generals/Code/GameEngine/Include/Common/ClientUpdateModule.h index 04f6c510dc..c90e0adffa 100644 --- a/Generals/Code/GameEngine/Include/Common/ClientUpdateModule.h +++ b/Generals/Code/GameEngine/Include/Common/ClientUpdateModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __ClientUpdateModule_H_ -#define __ClientUpdateModule_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include @@ -63,7 +60,3 @@ class ClientUpdateModule : public DrawableModule inline ClientUpdateModule::ClientUpdateModule( Thing *thing, const ModuleData* moduleData ) : DrawableModule( thing, moduleData ) { } inline ClientUpdateModule::~ClientUpdateModule() { } //------------------------------------------------------------------------------------------------- - - -#endif // __ClientUpdateModule_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/CommandLine.h b/Generals/Code/GameEngine/Include/Common/CommandLine.h index fe458850ba..48e078dc3d 100644 --- a/Generals/Code/GameEngine/Include/Common/CommandLine.h +++ b/Generals/Code/GameEngine/Include/Common/CommandLine.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _COMMAND_LINE_H_ -#define _COMMAND_LINE_H_ - class CommandLine { public: @@ -38,5 +35,3 @@ class CommandLine static void parseCommandLineForStartup(); static void parseCommandLineForEngineInit(); }; - -#endif // _COMMAND_LINE_H_ diff --git a/Generals/Code/GameEngine/Include/Common/CriticalSection.h b/Generals/Code/GameEngine/Include/Common/CriticalSection.h index a20081eb3d..b44a88f2ff 100644 --- a/Generals/Code/GameEngine/Include/Common/CriticalSection.h +++ b/Generals/Code/GameEngine/Include/Common/CriticalSection.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __CRITICALSECTION_H__ -#define __CRITICALSECTION_H__ - #include "Common/PerfTimer.h" #ifdef PERF_TIMERS @@ -102,5 +99,3 @@ extern CriticalSection *TheUnicodeStringCriticalSection; extern CriticalSection *TheDmaCriticalSection; extern CriticalSection *TheMemoryPoolCriticalSection; extern CriticalSection *TheDebugLogCriticalSection; - -#endif /* __CRITICALSECTION_H__ */ diff --git a/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h b/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h index abf7971cc2..d5631fb4e4 100644 --- a/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __CUSTOMMATCHPREFERENCES_H__ -#define __CUSTOMMATCHPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -79,5 +76,3 @@ class CustomMatchPreferences : public UserPreferences void setDisallowNonAsianText( Bool val ); }; - -#endif // __CUSTOMMATCHPREFERENCES_H__ diff --git a/Generals/Code/GameEngine/Include/Common/DamageFX.h b/Generals/Code/GameEngine/Include/Common/DamageFX.h index 586c78569b..0b6e3ad711 100644 --- a/Generals/Code/GameEngine/Include/Common/DamageFX.h +++ b/Generals/Code/GameEngine/Include/Common/DamageFX.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _DamageFX_H_ -#define _DamageFX_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameCommon.h" #include "Common/NameKeyGenerator.h" @@ -164,6 +161,3 @@ class DamageFXStore : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern DamageFXStore *TheDamageFXStore; - -#endif // _DamageFX_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/DataChunk.h b/Generals/Code/GameEngine/Include/Common/DataChunk.h index 8a045d4e50..9c0e747d9c 100644 --- a/Generals/Code/GameEngine/Include/Common/DataChunk.h +++ b/Generals/Code/GameEngine/Include/Common/DataChunk.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _DATA_CHUNK_H_ -#define _DATA_CHUNK_H_ - #include "Common/GameMemory.h" #include "Common/Dict.h" #include "Common/MapReaderWriterInfo.h" @@ -232,7 +229,3 @@ class DataChunkInput NameKeyType readNameKey(void); }; - - - -#endif // _DATA_CHUNK_H_ diff --git a/Generals/Code/GameEngine/Include/Common/Dict.h b/Generals/Code/GameEngine/Include/Common/Dict.h index 8fed08c913..80f26dc7b7 100644 --- a/Generals/Code/GameEngine/Include/Common/Dict.h +++ b/Generals/Code/GameEngine/Include/Common/Dict.h @@ -45,9 +45,6 @@ #pragma once -#ifndef Dict_H -#define Dict_H - #include "Common/Errors.h" #include "Common/NameKeyGenerator.h" @@ -362,7 +359,3 @@ inline Dict::DataType Dict::getNthType(Int n) const return DICT_NONE; return m_data->peek()[n].getType(); } - -#endif // Dict_H - - diff --git a/Generals/Code/GameEngine/Include/Common/Directory.h b/Generals/Code/GameEngine/Include/Common/Directory.h index 744334b06e..7d1f0adf7e 100644 --- a/Generals/Code/GameEngine/Include/Common/Directory.h +++ b/Generals/Code/GameEngine/Include/Common/Directory.h @@ -27,10 +27,8 @@ // Desc: Directory info class /////////////////////////////////////////////////////////////////////////////////////////////////// #if (0) -#pragma once -#ifndef __DIRECTORY_H__ -#define __DIRECTORY_H__ +#pragma once // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" @@ -90,6 +88,4 @@ class Directory //------------------------------------------------------------------------------------------------- -#endif // __DIRECTORY_H__ - #endif diff --git a/Generals/Code/GameEngine/Include/Common/DisabledTypes.h b/Generals/Code/GameEngine/Include/Common/DisabledTypes.h index 526b609809..31fd14a0b7 100644 --- a/Generals/Code/GameEngine/Include/Common/DisabledTypes.h +++ b/Generals/Code/GameEngine/Include/Common/DisabledTypes.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DISABLED_TYPES_H_ -#define __DISABLED_TYPES_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" @@ -109,6 +106,3 @@ extern const char *TheDisabledNames[]; extern DisabledMaskType DISABLEDMASK_NONE; // inits to all zeroes extern DisabledMaskType DISABLEDMASK_ALL; // inits to all bits set. void initDisabledMasks(); - -#endif // __DISABLED_TYPES_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/DiscreteCircle.h b/Generals/Code/GameEngine/Include/Common/DiscreteCircle.h index d9f17898bf..1ec8fcd5ab 100644 --- a/Generals/Code/GameEngine/Include/Common/DiscreteCircle.h +++ b/Generals/Code/GameEngine/Include/Common/DiscreteCircle.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DISCRETECIRCLE_H__ -#define __DISCRETECIRCLE_H__ - //------------------------------------------------------------------------------------------------- /** One horizontal line of the circle we are going to generate, the points drawn should be from @@ -74,6 +71,3 @@ class DiscreteCircle void generateEdgePairs(Int xCenter, Int yCenter, Int radius); void removeDuplicates(); }; - -#endif /* __DISCRETECIRCLE_H__ */ - diff --git a/Generals/Code/GameEngine/Include/Common/DrawModule.h b/Generals/Code/GameEngine/Include/Common/DrawModule.h index 4da0325bff..b9e458a64a 100644 --- a/Generals/Code/GameEngine/Include/Common/DrawModule.h +++ b/Generals/Code/GameEngine/Include/Common/DrawModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DRAWMODULE_H_ -#define __DRAWMODULE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Module.h" @@ -248,7 +245,3 @@ class RenderCost int m_boneCount; int m_shadowDrawCount; }; - - -#endif // __DRAWMODULE_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/Energy.h b/Generals/Code/GameEngine/Include/Common/Energy.h index 70c5b6d64a..ecdda0f2f6 100644 --- a/Generals/Code/GameEngine/Include/Common/Energy.h +++ b/Generals/Code/GameEngine/Include/Common/Energy.h @@ -44,9 +44,6 @@ #pragma once -#ifndef _ENERGY_H_ -#define _ENERGY_H_ - // INLCUDES ///////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" @@ -118,6 +115,3 @@ class Energy : public Snapshot Int m_energyConsumption; ///< level of energy consumption, in kw Player *m_owner; ///< Tight pointer to the Player I am intrinsic to. }; - -#endif // _ENERGY_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/Errors.h b/Generals/Code/GameEngine/Include/Common/Errors.h index 380ffa5537..2c2cec27c6 100644 --- a/Generals/Code/GameEngine/Include/Common/Errors.h +++ b/Generals/Code/GameEngine/Include/Common/Errors.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __ERRORS_H_ -#define __ERRORS_H_ - /** An ErrorCode is the repository for failure modes. In almost all situations, these values will be THROWN, not returned as error codes. Feel free @@ -68,5 +65,3 @@ enum ErrorCode CPP_11(: UnsignedInt) ERROR_LAST }; - -#endif // __ERRORS_H_ diff --git a/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h b/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h index 816541db52..bdc82b65de 100644 --- a/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h +++ b/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __FUNCTIONLEXICON_H_ -#define __FUNCTIONLEXICON_H_ - #include "Common/SubsystemInterface.h" #include "Common/NameKeyGenerator.h" #include "Common/GameMemory.h" @@ -149,6 +146,3 @@ inline WindowLayoutShutdownFunc FunctionLexicon::winLayoutShutdownFunc( NameKeyT // EXTERNALS /////////////////////////////////////////////////////////////////////////////////////////////////// extern FunctionLexicon *TheFunctionLexicon; ///< function dictionary external - -#endif // end __FUNCTIONLEXICON_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/GameCommon.h b/Generals/Code/GameEngine/Include/Common/GameCommon.h index e83eea3bb3..77d9eb99d8 100644 --- a/Generals/Code/GameEngine/Include/Common/GameCommon.h +++ b/Generals/Code/GameEngine/Include/Common/GameCommon.h @@ -47,9 +47,6 @@ #pragma once -#ifndef _GAMECOMMON_H_ -#define _GAMECOMMON_H_ - // ---------------------------------------------------------------------------------------------- #include "Lib/BaseType.h" #include "WWCommon.h" @@ -489,6 +486,3 @@ enum Relationship CPP_11(: Int) // TheRelationShipNames is defined in Common/GameCommon.cpp extern const char *const TheRelationshipNames[]; - -#endif // _GAMECOMMON_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/GameEngine.h b/Generals/Code/GameEngine/Include/Common/GameEngine.h index 8dc44e396e..0846229246 100644 --- a/Generals/Code/GameEngine/Include/Common/GameEngine.h +++ b/Generals/Code/GameEngine/Include/Common/GameEngine.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _GAME_ENGINE_H_ -#define _GAME_ENGINE_H_ - #include "Common/SubsystemInterface.h" #include "Common/GameType.h" @@ -118,5 +115,3 @@ extern GameEngine *CreateGameEngine( void ); /// The entry point for the game system extern Int GameMain(); - -#endif // _GAME_ENGINE_H_ diff --git a/Generals/Code/GameEngine/Include/Common/GameLOD.h b/Generals/Code/GameEngine/Include/Common/GameLOD.h index 520dc648e2..0e3390d77c 100644 --- a/Generals/Code/GameEngine/Include/Common/GameLOD.h +++ b/Generals/Code/GameEngine/Include/Common/GameLOD.h @@ -33,9 +33,6 @@ #pragma once -#ifndef _GAME_LOD_H_ -#define _GAME_LOD_H_ - enum ParticlePriorityType CPP_11(: Int); #define MAX_LOD_PRESETS_PER_LEVEL 32 //number of hardware configs preset for each low,medium,high,veryhigh @@ -256,4 +253,3 @@ ParticlePriorityType GameLODManager::getMinDynamicParticleSkipPriority(void) } extern GameLODManager *TheGameLODManager; -#endif // _GAME_LOD_H_ diff --git a/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h b/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h index f92900749c..603b93c219 100644 --- a/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __GAMESPYMISCPREFERENCES_H__ -#define __GAMESPYMISCPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -57,5 +54,3 @@ class GameSpyMiscPreferences : public UserPreferences Int getMaxMessagesPerUpdate( void ); }; - -#endif // __GAMESPYMISCPREFERENCES_H__ diff --git a/Generals/Code/GameEngine/Include/Common/GameState.h b/Generals/Code/GameEngine/Include/Common/GameState.h index 6145744246..5259cc99da 100644 --- a/Generals/Code/GameEngine/Include/Common/GameState.h +++ b/Generals/Code/GameEngine/Include/Common/GameState.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GAME_STATE_H_ -#define __GAME_STATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" #include "Common/Snapshot.h" @@ -238,6 +235,3 @@ extern GameState *TheGameState; UnicodeString getUnicodeTimeBuffer(SYSTEMTIME timeVal); UnicodeString getUnicodeDateBuffer(SYSTEMTIME timeVal); - - -#endif // end __GAME_STATE_H_ diff --git a/Generals/Code/GameEngine/Include/Common/GameStateMap.h b/Generals/Code/GameEngine/Include/Common/GameStateMap.h index 3f2bc2508a..bbfad135a5 100644 --- a/Generals/Code/GameEngine/Include/Common/GameStateMap.h +++ b/Generals/Code/GameEngine/Include/Common/GameStateMap.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GAME_STATE_MAP_H_ -#define __GAME_STATE_MAP_H_ - // INLCUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" #include "Common/SubsystemInterface.h" @@ -69,5 +66,3 @@ class GameStateMap : public SubsystemInterface, // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern GameStateMap *TheGameStateMap; - -#endif // end __GAME_STATE_MAP_H_ diff --git a/Generals/Code/GameEngine/Include/Common/GameType.h b/Generals/Code/GameEngine/Include/Common/GameType.h index 203e91bdb6..23a9a12928 100644 --- a/Generals/Code/GameEngine/Include/Common/GameType.h +++ b/Generals/Code/GameEngine/Include/Common/GameType.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _GAME_TYPE_H_ -#define _GAME_TYPE_H_ - #include "Lib/BaseType.h" // the default size of the world map @@ -192,6 +189,3 @@ enum WeaponSlotType CPP_11(: Int) enum PathfindLayerEnum CPP_11(: Int) {LAYER_INVALID = 0, LAYER_GROUND = 1, LAYER_WALL = 15, LAYER_LAST=15}; //------------------------------------------------------------------------------------------------- - -#endif // _GAME_TYPE_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/Geometry.h b/Generals/Code/GameEngine/Include/Common/Geometry.h index daa963ce5f..9501c2c9d4 100644 --- a/Generals/Code/GameEngine/Include/Common/Geometry.h +++ b/Generals/Code/GameEngine/Include/Common/Geometry.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GEOMETRY_H_ -#define __GEOMETRY_H_ - #include "Lib/BaseType.h" #include "Common/AsciiString.h" #include "Common/Snapshot.h" @@ -195,6 +192,3 @@ class GeometryInfo : public Snapshot #endif }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/Common/GlobalData.h b/Generals/Code/GameEngine/Include/Common/GlobalData.h index 30d3cf663b..f2ee30eaf1 100644 --- a/Generals/Code/GameEngine/Include/Common/GlobalData.h +++ b/Generals/Code/GameEngine/Include/Common/GlobalData.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _GLOBALDATA_H_ -#define _GLOBALDATA_H_ - #include "Common/GameCommon.h" // ensure we get DUMP_PERF_STATS, or not #include "Common/AsciiString.h" #include "Common/GameType.h" @@ -586,5 +583,3 @@ inline const GlobalData* const& TheGlobalData = TheWritableGlobalData; #else #define TheGlobalData ((const GlobalData*)TheWritableGlobalData) #endif - -#endif diff --git a/Generals/Code/GameEngine/Include/Common/Handicap.h b/Generals/Code/GameEngine/Include/Common/Handicap.h index 6770f503fa..2ffabc9458 100644 --- a/Generals/Code/GameEngine/Include/Common/Handicap.h +++ b/Generals/Code/GameEngine/Include/Common/Handicap.h @@ -44,9 +44,6 @@ #pragma once -#ifndef _HANDICAP_H_ -#define _HANDICAP_H_ - #include "Lib/BaseType.h" // ---------------------------------------------------------------------------------------------- @@ -117,5 +114,3 @@ class Handicap static ThingType getBestThingType(const ThingTemplate *tmpl); }; - -#endif // _HANDICAP_H_ diff --git a/Generals/Code/GameEngine/Include/Common/INI.h b/Generals/Code/GameEngine/Include/Common/INI.h index defb17dd40..861f61f7e4 100644 --- a/Generals/Code/GameEngine/Include/Common/INI.h +++ b/Generals/Code/GameEngine/Include/Common/INI.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __INI_H_ -#define __INI_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include // for offsetof, which we don't use but everyone who includes us does #include "Common/STLTypedefs.h" @@ -414,6 +411,3 @@ class INI char m_curBlockStart[ INI_MAX_CHARS_PER_LINE ]; ///< first line of cur block #endif }; - -#endif // __INI_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h b/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h index 38b4e89460..1801f0c519 100644 --- a/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h +++ b/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __IGNORE_PREFERENCES_H_ -#define __IGNORE_PREFERENCES_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -82,5 +79,3 @@ class IgnorePreferences : public UserPreferences //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __IGNORE_PREFERENCES_H_ diff --git a/Generals/Code/GameEngine/Include/Common/KindOf.h b/Generals/Code/GameEngine/Include/Common/KindOf.h index 1185b4100f..8dbec5da7c 100644 --- a/Generals/Code/GameEngine/Include/Common/KindOf.h +++ b/Generals/Code/GameEngine/Include/Common/KindOf.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __KINDOF_H_ -#define __KINDOF_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" @@ -189,6 +186,3 @@ inline void FLIP_KINDOFMASK(KindOfMaskType& m) // defined in Common/System/Kindof.cpp extern KindOfMaskType KINDOFMASK_NONE; // inits to all zeroes - -#endif // __KINDOF_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/LadderPreferences.h b/Generals/Code/GameEngine/Include/Common/LadderPreferences.h index b23f2ebb5d..e28d63721e 100644 --- a/Generals/Code/GameEngine/Include/Common/LadderPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/LadderPreferences.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __LADDERPREFERENCES_H__ -#define __LADDERPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -76,5 +73,3 @@ class LadderPreferences : public UserPreferences private: LadderPrefMap m_ladders; }; - -#endif // __LADDERPREFERENCES_H__ diff --git a/Generals/Code/GameEngine/Include/Common/Language.h b/Generals/Code/GameEngine/Include/Common/Language.h index d03ed08d98..da786c4c8a 100644 --- a/Generals/Code/GameEngine/Include/Common/Language.h +++ b/Generals/Code/GameEngine/Include/Common/Language.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __LANGUAGE_H_ -#define __LANGUAGE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -102,6 +99,3 @@ typedef enum // EXTERNALS ////////////////////////////////////////////////////////////////// extern LanguageID OurLanguage; ///< our current language definition - -#endif // __LANGUAGE_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/LatchRestore.h b/Generals/Code/GameEngine/Include/Common/LatchRestore.h index 5c3b1b2231..eb516c4b7e 100644 --- a/Generals/Code/GameEngine/Include/Common/LatchRestore.h +++ b/Generals/Code/GameEngine/Include/Common/LatchRestore.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __LATCHRESTORE_H__ -#define __LATCHRESTORE_H__ - /* The purpose of the LatchRestore class is to allow you to override member variables for the scope of a function. Here's the code that this saves: @@ -111,7 +108,3 @@ class LatchRestore whereToRestore = valueToRestore; } }; - - -#endif /* __LATCHRESTORE_H__ */ - diff --git a/Generals/Code/GameEngine/Include/Common/List.h b/Generals/Code/GameEngine/Include/Common/List.h index a0156de3ef..7aad58c07a 100644 --- a/Generals/Code/GameEngine/Include/Common/List.h +++ b/Generals/Code/GameEngine/Include/Common/List.h @@ -43,10 +43,6 @@ #pragma once - -#ifndef __WSYS_LIST_H -#define __WSYS_LIST_H - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -177,5 +173,3 @@ inline LListNode* LList::lastNode( void ) { return m_head.prev();} ; inline void LList::setSortMode( SortMode new_mode ) { m_sortMode = new_mode; }; inline Bool LList::isEmpty( void ) { return !m_head.inList(); }; inline void LList::destroy( void ) { clear();}; - -#endif // __GDF_LIST_H_ diff --git a/Generals/Code/GameEngine/Include/Common/MapObject.h b/Generals/Code/GameEngine/Include/Common/MapObject.h index 84f1e7b16b..9b29e983ad 100644 --- a/Generals/Code/GameEngine/Include/Common/MapObject.h +++ b/Generals/Code/GameEngine/Include/Common/MapObject.h @@ -29,9 +29,6 @@ #pragma once -#ifndef MapObject_H -#define MapObject_H - #include "Common/Dict.h" #include "Common/GameMemory.h" #include "GameClient/TerrainRoads.h" @@ -170,6 +167,3 @@ class MapObject : public MemoryPoolObject static Dict* getWorldDict() { return &TheWorldDict; } static Int countMapObjectsWithOwner(const AsciiString& n); }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h b/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h index b25483cea7..733d6d26c9 100644 --- a/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h +++ b/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _MAP_READER_WRITER_INFO_H_ -#define _MAP_READER_WRITER_INFO_H_ - #define K_HEIGHT_MAP_VERSION_1 1 // Height map cell = 5.0 #define K_HEIGHT_MAP_VERSION_2 2 // Height map cell = 10.0 #define K_HEIGHT_MAP_VERSION_3 3 // Added m_borderSize @@ -117,8 +114,6 @@ class FileInputStream : public ChunkInputStream }; */ -#endif // _MAP_READER_WRITER_INFO_H_ - /* rev K_HEIGHT_MAP_VERSION_4 diff --git a/Generals/Code/GameEngine/Include/Common/MessageStream.h b/Generals/Code/GameEngine/Include/Common/MessageStream.h index 6b70355b19..057ade8916 100644 --- a/Generals/Code/GameEngine/Include/Common/MessageStream.h +++ b/Generals/Code/GameEngine/Include/Common/MessageStream.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _MESSAGE_STREAM_H_ -#define _MESSAGE_STREAM_H_ - #include "Common/GameCommon.h" // ensure we get DUMP_PERF_STATS, or not #include "Common/SubsystemInterface.h" #include "Lib/BaseType.h" @@ -806,5 +803,3 @@ extern CommandList *TheCommandList; * construct a valid 2D bounding region. */ extern void buildRegion( const ICoord2D *anchor, const ICoord2D *dest, IRegion2D *region ); - -#endif // _MESSAGE_STREAM_H_ diff --git a/Generals/Code/GameEngine/Include/Common/MissionStats.h b/Generals/Code/GameEngine/Include/Common/MissionStats.h index 01994f6aac..e57116f8c7 100644 --- a/Generals/Code/GameEngine/Include/Common/MissionStats.h +++ b/Generals/Code/GameEngine/Include/Common/MissionStats.h @@ -44,9 +44,6 @@ #pragma once -#ifndef _MISSIONSTATS_H_ -#define _MISSIONSTATS_H_ - #include "Lib/BaseType.h" #include "Common/GameCommon.h" #include "Common/Snapshot.h" @@ -85,6 +82,3 @@ class MissionStats : public Snapshot Int m_buildingsLost; ///< how many of our buildings were destroyed? //Int m_whoLastHurtMe; ///< last Player to destroy one of my units }; - -#endif // _MISSIONSTATS_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/ModelState.h b/Generals/Code/GameEngine/Include/Common/ModelState.h index 9291c89666..5997dd8e2e 100644 --- a/Generals/Code/GameEngine/Include/Common/ModelState.h +++ b/Generals/Code/GameEngine/Include/Common/ModelState.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _ModelState_H_ -#define _ModelState_H_ - #include "Lib/BaseType.h" #include "Common/INI.h" #include "Common/BitFlags.h" @@ -232,6 +229,3 @@ typedef BitFlags ModelConditionFlags; //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- - -#endif // _ModelState_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/Module.h b/Generals/Code/GameEngine/Include/Common/Module.h index bf0750a55c..78a26efb02 100644 --- a/Generals/Code/GameEngine/Include/Common/Module.h +++ b/Generals/Code/GameEngine/Include/Common/Module.h @@ -31,9 +31,6 @@ #pragma once -#ifndef __MODULE_H_ -#define __MODULE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" @@ -314,7 +311,3 @@ class DrawableModule : public Module //------------------------------------------------------------------------------------------------- /** VARIOUS MODULE INTERFACES */ //------------------------------------------------------------------------------------------------- - - -#endif // __MODULE_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/ModuleFactory.h b/Generals/Code/GameEngine/Include/Common/ModuleFactory.h index 9437d10823..f3f4182f90 100644 --- a/Generals/Code/GameEngine/Include/Common/ModuleFactory.h +++ b/Generals/Code/GameEngine/Include/Common/ModuleFactory.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __MODULEFACTORY_H_ -#define __MODULEFACTORY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include @@ -126,6 +123,3 @@ class ModuleFactory : public SubsystemInterface, public Snapshot // EXTERN ///////////////////////////////////////////////////////////////////////////////////////// extern ModuleFactory *TheModuleFactory; ///< singleton definition - -#endif // __MODULEFACTORY_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/Money.h b/Generals/Code/GameEngine/Include/Common/Money.h index bf3908a5be..b14e6d19c5 100644 --- a/Generals/Code/GameEngine/Include/Common/Money.h +++ b/Generals/Code/GameEngine/Include/Common/Money.h @@ -44,9 +44,6 @@ #pragma once -#ifndef _MONEY_H_ -#define _MONEY_H_ - #include "Lib/BaseType.h" #include "Common/Debug.h" #include "Common/Snapshot.h" @@ -106,6 +103,3 @@ class Money : public Snapshot UnsignedInt m_money; ///< amount of money Int m_playerIndex; ///< what is my player index? }; - -#endif // _MONEY_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h b/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h index a6e9c92f37..9cfb403465 100644 --- a/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h +++ b/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _MULTIPLAYERSETTINGS_H_ -#define _MULTIPLAYERSETTINGS_H_ - #include "GameClient/Color.h" // FORWARD DECLARATIONS /////////////////////////////////////////////////////////////////////////// @@ -127,5 +124,3 @@ class MultiplayerSettings : public SubsystemInterface // singleton extern MultiplayerSettings *TheMultiplayerSettings; - -#endif diff --git a/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h b/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h index dd1d6bcbaf..01d237638d 100644 --- a/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h +++ b/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __NAMEKEYGENERATOR_H_ -#define __NAMEKEYGENERATOR_H_ - #include "Lib/BaseType.h" #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" @@ -160,6 +157,3 @@ class StaticNameKey // ugh, this is a little hokey, but lets us pretend that a StaticNameKey == NameKeyType inline operator NameKeyType() const { return key(); } }; - -#endif // __NAMEKEYGENERATOR_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/OSDisplay.h b/Generals/Code/GameEngine/Include/Common/OSDisplay.h index 3545f4aa6c..1385a944b1 100644 --- a/Generals/Code/GameEngine/Include/Common/OSDisplay.h +++ b/Generals/Code/GameEngine/Include/Common/OSDisplay.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __OSDISPLAY_H__ -#define __OSDISPLAY_H__ - #include "Lib/BaseType.h" class AsciiString; @@ -66,5 +63,3 @@ OSDisplayButtonType OSDisplayWarningBox(AsciiString p, AsciiString m, UnsignedIn // TheSuperHackers @feature Tell the Operating System that the game is considered busy // and we would not like the display screen and/or system to shut off. void OSDisplaySetBusyState(Bool busyDisplay, Bool busySystem); - -#endif /* __OSDISPLAY_H__ */ diff --git a/Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h b/Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h index 200431fe62..f443ad0ac7 100644 --- a/Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h +++ b/Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __OBJECT_STATUS_TYPES_H -#define __OBJECT_STATUS_TYPES_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" @@ -125,5 +122,3 @@ inline void FLIP_OBJECT_STATUS_MASK( ObjectStatusMaskType& m ) // defined in Common/System/ObjectStatusTypes.cpp extern ObjectStatusMaskType OBJECT_STATUS_MASK_NONE; // inits to all zeroes - -#endif /* __OBJECT_STATUS_TYPES_H */ diff --git a/Generals/Code/GameEngine/Include/Common/Overridable.h b/Generals/Code/GameEngine/Include/Common/Overridable.h index 3aed1815ef..f395127884 100644 --- a/Generals/Code/GameEngine/Include/Common/Overridable.h +++ b/Generals/Code/GameEngine/Include/Common/Overridable.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _OVERRIDABLE_H_ -#define _OVERRIDABLE_H_ - #include "Common/GameMemory.h" /* @@ -124,6 +121,3 @@ __inline Overridable::~Overridable() { deleteInstance(m_nextOverride); } - - -#endif /* _OVERRIDABLE_H_ */ diff --git a/Generals/Code/GameEngine/Include/Common/Override.h b/Generals/Code/GameEngine/Include/Common/Override.h index 3811bec8ec..d89ee69324 100644 --- a/Generals/Code/GameEngine/Include/Common/Override.h +++ b/Generals/Code/GameEngine/Include/Common/Override.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _OVERRIDE_H_ -#define _OVERRIDE_H_ - #include "Common/Overridable.h" /* @@ -136,6 +133,3 @@ OVERRIDE::operator const T*( ) const { return operator*(); } - -#endif /* _OVERRIDE_H_ */ - diff --git a/Generals/Code/GameEngine/Include/Common/PartitionSolver.h b/Generals/Code/GameEngine/Include/Common/PartitionSolver.h index 3bf3cc377c..6487bb7448 100644 --- a/Generals/Code/GameEngine/Include/Common/PartitionSolver.h +++ b/Generals/Code/GameEngine/Include/Common/PartitionSolver.h @@ -38,8 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_PARTITIONSOLVER_ -#define _H_PARTITIONSOLVER_ // INCLUDES /////////////////////////////////////////////////////////////////// @@ -83,5 +81,3 @@ class PartitionSolver void solve(void); const SolutionVec& getSolution( void ) const; }; - -#endif /* _H_PARTITIONSOLVER_ */ diff --git a/Generals/Code/GameEngine/Include/Common/PerfMetrics.h b/Generals/Code/GameEngine/Include/Common/PerfMetrics.h index 43a5dd0db6..f2d82d8615 100644 --- a/Generals/Code/GameEngine/Include/Common/PerfMetrics.h +++ b/Generals/Code/GameEngine/Include/Common/PerfMetrics.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __PERFMETRICS_H__ -#define __PERFMETRICS_H__ - // For load timings enum { PERFMETRICS_LOAD_STARTFRAME = 0 }; enum { PERFMETRICS_LOAD_STOPFRAME = 1 }; @@ -42,7 +39,3 @@ enum { PERFMETRICS_LOGIC_STOPFRAME = 1000 }; // For showing metrics enum { PERFMETRICS_BETWEEN_METRICS = 150 }; - -#endif /* __PERFMETRICS_H__ */ - - diff --git a/Generals/Code/GameEngine/Include/Common/PerfTimer.h b/Generals/Code/GameEngine/Include/Common/PerfTimer.h index 0ff80a461b..071b35b348 100644 --- a/Generals/Code/GameEngine/Include/Common/PerfTimer.h +++ b/Generals/Code/GameEngine/Include/Common/PerfTimer.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __PERFTIMER_H__ -#define __PERFTIMER_H__ - #include "Utility/intrin_compat.h" #if defined(RTS_DEBUG) @@ -315,5 +312,3 @@ extern void StatMetricsDisplay( DebugDisplayInterface *dd, void *, FILE *fp ); #define IGNORE_PERF_TIMER(id) #endif // PERF_TIMERS - -#endif /* __PERFTIMER_H__ */ diff --git a/Generals/Code/GameEngine/Include/Common/Player.h b/Generals/Code/GameEngine/Include/Common/Player.h index df1e60782a..722af4d604 100644 --- a/Generals/Code/GameEngine/Include/Common/Player.h +++ b/Generals/Code/GameEngine/Include/Common/Player.h @@ -44,9 +44,6 @@ #pragma once -#ifndef _PLAYER_H_ -#define _PLAYER_H_ - #include "Common/Debug.h" #include "Common/Energy.h" #include "Common/GameType.h" @@ -793,5 +790,3 @@ class Player : public Snapshot Bool m_isPlayerDead; }; - -#endif // _PLAYER_H_ diff --git a/Generals/Code/GameEngine/Include/Common/PlayerList.h b/Generals/Code/GameEngine/Include/Common/PlayerList.h index 8dc008e9ae..2f0362b489 100644 --- a/Generals/Code/GameEngine/Include/Common/PlayerList.h +++ b/Generals/Code/GameEngine/Include/Common/PlayerList.h @@ -44,9 +44,6 @@ #pragma once -#ifndef _PLAYERLIST_H_ -#define _PLAYERLIST_H_ - #include "Common/SubsystemInterface.h" #include "Common/GameCommon.h" #include "Common/NameKeyGenerator.h" @@ -171,5 +168,3 @@ class PlayerList : public SubsystemInterface, // ---------------------------------------------------------------------------------------------- extern PlayerList *ThePlayerList; ///< singleton instance of PlayerList - -#endif // _PLAYERLIST_H_ diff --git a/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h b/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h index fe00b24358..80f3eba14b 100644 --- a/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h +++ b/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h @@ -44,9 +44,6 @@ #pragma once -#ifndef _PLAYERTEMPLATE_H_ -#define _PLAYERTEMPLATE_H_ - #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" #include "Common/Debug.h" @@ -214,5 +211,3 @@ class PlayerTemplateStore : public SubsystemInterface // ---------------------------------------------------------------------------------------------- extern PlayerTemplateStore *ThePlayerTemplateStore; ///< singleton instance of PlayerTemplateStore - -#endif // _PLAYERTEMPLATE_H_ diff --git a/Generals/Code/GameEngine/Include/Common/ProductionPrerequisite.h b/Generals/Code/GameEngine/Include/Common/ProductionPrerequisite.h index c36323bb5e..a6f97ad35d 100644 --- a/Generals/Code/GameEngine/Include/Common/ProductionPrerequisite.h +++ b/Generals/Code/GameEngine/Include/Common/ProductionPrerequisite.h @@ -42,9 +42,6 @@ #pragma once -#ifndef __ProductionPrerequisite_H_ -#define __ProductionPrerequisite_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -121,5 +118,3 @@ class ProductionPrerequisite }; //----------------------------------------------------------------------------- - -#endif diff --git a/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h b/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h index 38301af8b6..fdf0d8fe99 100644 --- a/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __QUICKMATCHPREFERENCES_H__ -#define __QUICKMATCHPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -78,5 +75,3 @@ class QuickMatchPreferences : public UserPreferences void setSide(Int val); Int getSide( void ); }; - -#endif // __QUICKMATCHPREFERENCES_H__ diff --git a/Generals/Code/GameEngine/Include/Common/QuotedPrintable.h b/Generals/Code/GameEngine/Include/Common/QuotedPrintable.h index d4b481a851..af373e9bb6 100644 --- a/Generals/Code/GameEngine/Include/Common/QuotedPrintable.h +++ b/Generals/Code/GameEngine/Include/Common/QuotedPrintable.h @@ -29,13 +29,8 @@ #pragma once -#ifndef __QUOTEDPRINTABLE_H__ -#define __QUOTEDPRINTABLE_H__ - UnicodeString QuotedPrintableToUnicodeString(AsciiString original); AsciiString UnicodeStringToQuotedPrintable(UnicodeString original); AsciiString QuotedPrintableToAsciiString(AsciiString original); AsciiString AsciiStringToQuotedPrintable(AsciiString original); - -#endif // __QUOTEDPRINTABLE_H__ diff --git a/Generals/Code/GameEngine/Include/Common/Radar.h b/Generals/Code/GameEngine/Include/Common/Radar.h index 92099de16c..3a1dc99ef9 100644 --- a/Generals/Code/GameEngine/Include/Common/Radar.h +++ b/Generals/Code/GameEngine/Include/Common/Radar.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __RADAR_H_ -#define __RADAR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/SubsystemInterface.h" @@ -311,8 +308,3 @@ class RadarDummy : public Radar virtual void clearShroud() { } virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) { } }; - -#endif // __RADAR_H_ - - - diff --git a/Generals/Code/GameEngine/Include/Common/Recorder.h b/Generals/Code/GameEngine/Include/Common/Recorder.h index bbaa17a3f2..5d59d9bc48 100644 --- a/Generals/Code/GameEngine/Include/Common/Recorder.h +++ b/Generals/Code/GameEngine/Include/Common/Recorder.h @@ -22,7 +22,6 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once #include "Common/MessageStream.h" diff --git a/Generals/Code/GameEngine/Include/Common/Registry.h b/Generals/Code/GameEngine/Include/Common/Registry.h index fff1c836aa..83ecb7dd24 100644 --- a/Generals/Code/GameEngine/Include/Common/Registry.h +++ b/Generals/Code/GameEngine/Include/Common/Registry.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __REGISTRY_H__ -#define __REGISTRY_H__ - #include /** @@ -47,5 +44,3 @@ AsciiString GetRegistryLanguage(void); // convenience function AsciiString GetRegistryGameName(void); // convenience function UnsignedInt GetRegistryVersion(void); // convenience function UnsignedInt GetRegistryMapPackVersion(void); // convenience function - -#endif // __REGISTRY_H__ diff --git a/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h b/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h index 0f9f052a6b..437f6d2fdd 100644 --- a/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h +++ b/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h @@ -30,9 +30,6 @@ #pragma once -#ifndef RESOURCE_GATHER_MANAGER_H -#define RESOURCE_GATHER_MANAGER_H - #include "Common/GameType.h" #include "Common/Snapshot.h" @@ -72,5 +69,3 @@ class ResourceGatheringManager : public MemoryPoolObject, objectIDList m_supplyCenters; }; - -#endif diff --git a/Generals/Code/GameEngine/Include/Common/STLTypedefs.h b/Generals/Code/GameEngine/Include/Common/STLTypedefs.h index 6a6b7c9d2c..6d5e8176f3 100644 --- a/Generals/Code/GameEngine/Include/Common/STLTypedefs.h +++ b/Generals/Code/GameEngine/Include/Common/STLTypedefs.h @@ -44,9 +44,6 @@ #pragma once -#ifndef __STLTYPEDEFS_H__ -#define __STLTYPEDEFS_H__ - //----------------------------------------------------------------------------- // srj sez: this must come first, first, first. #define _STLP_USE_NEWALLOC 1 @@ -297,5 +294,3 @@ namespace rts }; } // namespace rts - -#endif /* __STLTYPEDEFS_H__ */ diff --git a/Generals/Code/GameEngine/Include/Common/Science.h b/Generals/Code/GameEngine/Include/Common/Science.h index 235e3e279e..f7bfcd6ce0 100644 --- a/Generals/Code/GameEngine/Include/Common/Science.h +++ b/Generals/Code/GameEngine/Include/Common/Science.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SCIENCE_H_ -#define __SCIENCE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Overridable.h" #include "Common/NameKeyGenerator.h" @@ -134,7 +131,3 @@ class ScienceStore : public SubsystemInterface }; extern ScienceStore* TheScienceStore; - - -#endif // __SCIENCE_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/ScopedMutex.h b/Generals/Code/GameEngine/Include/Common/ScopedMutex.h index fa898d94dc..aadd9531e2 100644 --- a/Generals/Code/GameEngine/Include/Common/ScopedMutex.h +++ b/Generals/Code/GameEngine/Include/Common/ScopedMutex.h @@ -23,9 +23,6 @@ #pragma once -#ifndef __SCOPEDMUTEX_H__ -#define __SCOPEDMUTEX_H__ - class ScopedMutex { private: @@ -42,5 +39,3 @@ class ScopedMutex ReleaseMutex(m_mutex); } }; - -#endif /* __SCOPEDMUTEX_H__ */ diff --git a/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h b/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h index f9d0be05b2..98bf12b894 100644 --- a/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h +++ b/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __SCOREKEEPER_H_ -#define __SCOREKEEPER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -141,5 +138,3 @@ inline void ScoreKeeper::addMoneyEarned( Int money ) { m_totalMoneyEarned + //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __SCOREKEEPER_H_ diff --git a/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h b/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h index 2e444e203b..ce1c68254d 100644 --- a/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h +++ b/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __SKIRMISHBATTLEHONORS_H__ -#define __SKIRMISHBATTLEHONORS_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -96,5 +93,3 @@ void InsertBattleHonor(GameWindow *list, const Image *image, Bool enabled, Int i void BattleHonorTooltip(GameWindow *window, WinInstanceData *instData, UnsignedInt mouse); - -#endif // __SKIRMISHBATTLEHONORS_H__ diff --git a/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h b/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h index d2b7f6a3e7..855fd78744 100644 --- a/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __SKIRMISHPREFERENCES_H__ -#define __SKIRMISHPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -58,5 +55,3 @@ class SkirmishPreferences : public UserPreferences AsciiString getPreferredMap(void); // convenience function Bool usesSystemMapDir(void); // convenience function }; - -#endif // __SKIRMISHPREFERENCES_H__ diff --git a/Generals/Code/GameEngine/Include/Common/Snapshot.h b/Generals/Code/GameEngine/Include/Common/Snapshot.h index 6922d9d0f7..e8a3ef7434 100644 --- a/Generals/Code/GameEngine/Include/Common/Snapshot.h +++ b/Generals/Code/GameEngine/Include/Common/Snapshot.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __SNAPSHOT_H_ -#define __SNAPSHOT_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" @@ -68,6 +65,3 @@ friend class XferCRC; virtual void loadPostProcess( void ) = 0; }; - -#endif // __SNAPSHOT_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h b/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h index 5ffb8c457a..8d983f3a84 100644 --- a/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h +++ b/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SparseMatchFinder_H_ -#define __SparseMatchFinder_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/BitFlags.h" #include "Common/STLTypedefs.h" @@ -243,6 +240,3 @@ class SparseMatchFinder } }; - -#endif // __SparseMatchFinder_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/SpecialPower.h b/Generals/Code/GameEngine/Include/Common/SpecialPower.h index 9d5f19c509..8317c3e104 100644 --- a/Generals/Code/GameEngine/Include/Common/SpecialPower.h +++ b/Generals/Code/GameEngine/Include/Common/SpecialPower.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __SPECIALPOWER_H_ -#define __SPECIALPOWER_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameMemory.h" @@ -188,5 +185,3 @@ class SpecialPowerStore : public SubsystemInterface // EXTERNAL /////////////////////////////////////////////////////////////////////////////////////// extern SpecialPowerStore *TheSpecialPowerStore; - -#endif // end __SPECIALPOWER_H_ diff --git a/Generals/Code/GameEngine/Include/Common/SpecialPowerMaskType.h b/Generals/Code/GameEngine/Include/Common/SpecialPowerMaskType.h index ec9265d780..f72371b0e8 100644 --- a/Generals/Code/GameEngine/Include/Common/SpecialPowerMaskType.h +++ b/Generals/Code/GameEngine/Include/Common/SpecialPowerMaskType.h @@ -27,13 +27,9 @@ // JKMCD Aug 2002 #pragma once -#ifndef __SPECIALPOWERMASKTYPE_H__ -#define __SPECIALPOWERMASKTYPE_H__ #include "Common/BitFlags.h" #include "Common/BitFlagsIO.h" #include "Common/SpecialPowerType.h" typedef BitFlags SpecialPowerMaskType; - -#endif /* __SPECIALPOWERMASKTYPE_H__ */ diff --git a/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h b/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h index b967da9992..4fc2a6031d 100644 --- a/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h +++ b/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h @@ -27,8 +27,6 @@ // JKMCD Aug 2002 #pragma once -#ifndef __SPECIALPOWERTYPE_H__ -#define __SPECIALPOWERTYPE_H__ // ------------------------------------------------------------------------------------------------ // don't forget to add new strings to SpecialPowerMaskType::s_bitNameList[] @@ -97,5 +95,3 @@ enum SpecialPowerType CPP_11(: Int) }; // Definition of these names is located in SpecialPower.cpp - -#endif /* __SPECIALPOWERTYPE_H__ */ diff --git a/Generals/Code/GameEngine/Include/Common/StackDump.h b/Generals/Code/GameEngine/Include/Common/StackDump.h index c19680f461..9a0e836dcf 100644 --- a/Generals/Code/GameEngine/Include/Common/StackDump.h +++ b/Generals/Code/GameEngine/Include/Common/StackDump.h @@ -24,9 +24,6 @@ #pragma once -#ifndef __STACKDUMP_H_ -#define __STACKDUMP_H_ - #ifndef IG_DEGBUG_STACKTRACE #define IG_DEBUG_STACKTRACE 1 #endif @@ -70,6 +67,3 @@ __inline void DumpExceptionInfo( unsigned int u, EXCEPTION_POINTERS* e_info ) {} #endif extern AsciiString g_LastErrorDump; - - -#endif // __STACKDUMP_H_ diff --git a/Generals/Code/GameEngine/Include/Common/StateMachine.h b/Generals/Code/GameEngine/Include/Common/StateMachine.h index e99df25c17..30897106e7 100644 --- a/Generals/Code/GameEngine/Include/Common/StateMachine.h +++ b/Generals/Code/GameEngine/Include/Common/StateMachine.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _STATE_MACHINE_H_ -#define _STATE_MACHINE_H_ - #include "Common/GameMemory.h" #include "Common/GameType.h" #include "Common/ModelState.h" @@ -486,6 +483,3 @@ inline void deleteInstance(StateMachine* machine) if (machine != NULL) machine->Release_Ref(); } - - -#endif // _STATE_MACHINE_H_ diff --git a/Generals/Code/GameEngine/Include/Common/StatsCollector.h b/Generals/Code/GameEngine/Include/Common/StatsCollector.h index af78def921..9b67159c40 100644 --- a/Generals/Code/GameEngine/Include/Common/StatsCollector.h +++ b/Generals/Code/GameEngine/Include/Common/StatsCollector.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __STATSCOLLECTOR_H_ -#define __STATSCOLLECTOR_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -119,5 +116,3 @@ class StatsCollector // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- extern StatsCollector* TheStatsCollector; ///< we need a singleton - -#endif // __STATSCOLLECTOR_H_ diff --git a/Generals/Code/GameEngine/Include/Common/SubsystemInterface.h b/Generals/Code/GameEngine/Include/Common/SubsystemInterface.h index b8bc60d0d7..56b67014a3 100644 --- a/Generals/Code/GameEngine/Include/Common/SubsystemInterface.h +++ b/Generals/Code/GameEngine/Include/Common/SubsystemInterface.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SUBSYSTEMINTERFACE_H_ -#define __SUBSYSTEMINTERFACE_H_ - #include "Common/INI.h" #include "Common/STLTypedefs.h" @@ -165,6 +162,3 @@ class SubsystemInterfaceList }; extern SubsystemInterfaceList* TheSubsystemList; - -#endif // __SUBSYSTEMINTERFACE_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/SystemInfo.h b/Generals/Code/GameEngine/Include/Common/SystemInfo.h index aeacb184ed..8b08868eab 100644 --- a/Generals/Code/GameEngine/Include/Common/SystemInfo.h +++ b/Generals/Code/GameEngine/Include/Common/SystemInfo.h @@ -28,11 +28,4 @@ #pragma once -#ifndef __SYSTEMINFO_H__ -#define __SYSTEMINFO_H__ - extern const Bool TheSystemIsUnicode; - - - -#endif /* __SYSTEMINFO_H__ */ diff --git a/Generals/Code/GameEngine/Include/Common/Team.h b/Generals/Code/GameEngine/Include/Common/Team.h index 6db1a8da1d..1f3bd75793 100644 --- a/Generals/Code/GameEngine/Include/Common/Team.h +++ b/Generals/Code/GameEngine/Include/Common/Team.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _TEAM_H_ -#define _TEAM_H_ - #include "Common/GameType.h" #include "Common/Snapshot.h" #include "Common/Thing.h" @@ -756,5 +753,3 @@ const AsciiString& Team::getName(void) const // ------------------------------------------------------------------------ - -#endif // _TEAM_H_ diff --git a/Generals/Code/GameEngine/Include/Common/Terrain.h b/Generals/Code/GameEngine/Include/Common/Terrain.h index 3d20810c15..dd6ea409a3 100644 --- a/Generals/Code/GameEngine/Include/Common/Terrain.h +++ b/Generals/Code/GameEngine/Include/Common/Terrain.h @@ -32,14 +32,9 @@ #pragma once -#ifndef __TERRAIN_H_ -#define __TERRAIN_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// // DEFINE ///////////////////////////////////////////////////////////////////// #define MAX_TERRAIN_NAME_LEN 64 ///< max size of map filename with extenstion - -#endif // end __TERRAIN_H_ diff --git a/Generals/Code/GameEngine/Include/Common/TerrainTypes.h b/Generals/Code/GameEngine/Include/Common/TerrainTypes.h index 9715b282d3..012393a484 100644 --- a/Generals/Code/GameEngine/Include/Common/TerrainTypes.h +++ b/Generals/Code/GameEngine/Include/Common/TerrainTypes.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __TERRAINTYPE_H_ -#define __TERRAINTYPE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "Common/SubsystemInterface.h" @@ -205,6 +202,3 @@ class TerrainTypeCollection : public SubsystemInterface // EXTERNAL /////////////////////////////////////////////////////////////////////////////////////// extern TerrainTypeCollection *TheTerrainTypes; - -#endif // __TERRAINTYPE_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/Thing.h b/Generals/Code/GameEngine/Include/Common/Thing.h index 13e0a3b89c..838480831e 100644 --- a/Generals/Code/GameEngine/Include/Common/Thing.h +++ b/Generals/Code/GameEngine/Include/Common/Thing.h @@ -48,9 +48,6 @@ #pragma once -#ifndef __THING_H_ -#define __THING_H_ - //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -197,6 +194,3 @@ class Thing : public MemoryPoolObject //----------------------------------------------------------------------------- // Externals //----------------------------------------------------------------------------- - -#endif // $label - diff --git a/Generals/Code/GameEngine/Include/Common/ThingFactory.h b/Generals/Code/GameEngine/Include/Common/ThingFactory.h index a6dd2b3d30..4d4871aedb 100644 --- a/Generals/Code/GameEngine/Include/Common/ThingFactory.h +++ b/Generals/Code/GameEngine/Include/Common/ThingFactory.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __THINGFACTORY_H_ -#define __THINGFACTORY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" @@ -134,7 +131,3 @@ class ThingFactory : public SubsystemInterface // EXTERN ///////////////////////////////////////////////////////////////////////////////////////// extern ThingFactory *TheThingFactory; ///< the template singleton - - -#endif // __THINGFACTORY_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/ThingSort.h b/Generals/Code/GameEngine/Include/Common/ThingSort.h index c12eb63731..e35702922c 100644 --- a/Generals/Code/GameEngine/Include/Common/ThingSort.h +++ b/Generals/Code/GameEngine/Include/Common/ThingSort.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __THINGSORT_H_ -#define __THINGSORT_H_ - #include "GameCommon.h" //------------------------------------------------------------------------------------------------- @@ -78,6 +75,3 @@ static const char *const EditorSortingNames[] = }; static_assert(ARRAY_SIZE(EditorSortingNames) == ES_NUM_SORTING_TYPES + 1, "Incorrect array size"); #endif - -#endif // __THINGSORT_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/ThingTemplate.h b/Generals/Code/GameEngine/Include/Common/ThingTemplate.h index 2be32629a6..1e0eb5617d 100644 --- a/Generals/Code/GameEngine/Include/Common/ThingTemplate.h +++ b/Generals/Code/GameEngine/Include/Common/ThingTemplate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __THINGTEMPLATE_H_ -#define __THINGTEMPLATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" @@ -765,6 +762,3 @@ class ThingTemplate : public Overridable //----------------------------------------------------------------------------- // Externals //----------------------------------------------------------------------------- - -#endif // __THINGTEMPLATE_H_ - diff --git a/Generals/Code/GameEngine/Include/Common/TunnelTracker.h b/Generals/Code/GameEngine/Include/Common/TunnelTracker.h index 79851d503f..0680ac5fca 100644 --- a/Generals/Code/GameEngine/Include/Common/TunnelTracker.h +++ b/Generals/Code/GameEngine/Include/Common/TunnelTracker.h @@ -29,9 +29,6 @@ #pragma once -#ifndef TUNNEL_TRACKER_H -#define TUNNEL_TRACKER_H - #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/Snapshot.h" @@ -95,5 +92,3 @@ class TunnelTracker : public MemoryPoolObject, ObjectID m_curNemesisID; ///< If we have team(s) guarding a tunnel network system, this is one of the current targets. UnsignedInt m_nemesisTimestamp; ///< We only keep nemesis for a couple of seconds. }; - -#endif diff --git a/Generals/Code/GameEngine/Include/Common/UnitTimings.h b/Generals/Code/GameEngine/Include/Common/UnitTimings.h index 26b3ebb200..2aef897e2f 100644 --- a/Generals/Code/GameEngine/Include/Common/UnitTimings.h +++ b/Generals/Code/GameEngine/Include/Common/UnitTimings.h @@ -29,11 +29,4 @@ #pragma once -#ifndef __UNITTIMINGS_H_ -#define __UNITTIMINGS_H_ - - #define dontDO_UNIT_TIMINGS - -#endif - diff --git a/Generals/Code/GameEngine/Include/Common/Upgrade.h b/Generals/Code/GameEngine/Include/Common/Upgrade.h index e443c1f9f7..f85b56389c 100644 --- a/Generals/Code/GameEngine/Include/Common/Upgrade.h +++ b/Generals/Code/GameEngine/Include/Common/Upgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __UPGRADE_H_ -#define __UPGRADE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" @@ -263,5 +260,3 @@ class UpgradeCenter : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern UpgradeCenter *TheUpgradeCenter; - -#endif // end __UPGRADE_H_ diff --git a/Generals/Code/GameEngine/Include/Common/UserPreferences.h b/Generals/Code/GameEngine/Include/Common/UserPreferences.h index abe79797fb..f3f1b9cb9a 100644 --- a/Generals/Code/GameEngine/Include/Common/UserPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/UserPreferences.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __USERPREFERENCES_H__ -#define __USERPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -167,5 +164,3 @@ class LANPreferences : public UserPreferences Int getNumRemoteIPs(void); // convenience function UnicodeString getRemoteIPEntry(Int i); // convenience function }; - -#endif // __USERPREFERENCES_H__ diff --git a/Generals/Code/GameEngine/Include/Common/WellKnownKeys.h b/Generals/Code/GameEngine/Include/Common/WellKnownKeys.h index 0b22b74f45..67cacd62e2 100644 --- a/Generals/Code/GameEngine/Include/Common/WellKnownKeys.h +++ b/Generals/Code/GameEngine/Include/Common/WellKnownKeys.h @@ -45,9 +45,6 @@ #pragma once -#ifndef _H_WELLKNOWNKEYS -#define _H_WELLKNOWNKEYS - #include "Common/NameKeyGenerator.h" #ifdef INSTANTIATE_WELL_KNOWN_KEYS @@ -846,5 +843,3 @@ DEFINE_KEY(Player_7_Start) DEFINE_KEY(Player_8_Start) // --------------------------------------------------------------------------------------- - -#endif // _H_WELLKNOWNKEYS diff --git a/Generals/Code/GameEngine/Include/Common/encrypt.h b/Generals/Code/GameEngine/Include/Common/encrypt.h index d57d2ddb96..e441432f9e 100644 --- a/Generals/Code/GameEngine/Include/Common/encrypt.h +++ b/Generals/Code/GameEngine/Include/Common/encrypt.h @@ -28,16 +28,9 @@ #pragma once -#ifndef ENCRYPT_HEADER -#define ENCRYPT_HEADER - // This routine is non-reentrant, as it returns a static buffer!!! // Valid input is 4-8 characters, and can contain letters and numbers and '.' and '/' #define MAX_ENCRYPTED_STRING 8 const char *EncryptString(const char *); - -#endif - - diff --git a/Generals/Code/GameEngine/Include/Common/version.h b/Generals/Code/GameEngine/Include/Common/version.h index 9e1953a97a..088a0f7217 100644 --- a/Generals/Code/GameEngine/Include/Common/version.h +++ b/Generals/Code/GameEngine/Include/Common/version.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __VERSION_H__ -#define __VERSION_H__ - #include /** @@ -120,5 +117,3 @@ class Version }; extern Version *TheVersion; - -#endif // __VERSION_H__ diff --git a/Generals/Code/GameEngine/Include/GameClient/Anim2D.h b/Generals/Code/GameEngine/Include/GameClient/Anim2D.h index ef856aa9c9..e3853a3710 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Anim2D.h +++ b/Generals/Code/GameEngine/Include/GameClient/Anim2D.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __ANIM_2D_H_ -#define __ANIM_2D_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" @@ -222,5 +219,3 @@ class Anim2DCollection : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern Anim2DCollection *TheAnim2DCollection; - -#endif // end __ANIM_2D_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h b/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h index 85a5a1229e..a3e72e0dae 100644 --- a/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h +++ b/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h @@ -47,9 +47,6 @@ #pragma once -#ifndef __ANIMATEWINDOWMANAGER_H_ -#define __ANIMATEWINDOWMANAGER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -236,5 +233,3 @@ namespace wnd //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __ANIMATEWINDOWMANAGER_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/CDCheck.h b/Generals/Code/GameEngine/Include/GameClient/CDCheck.h index bf1eddb3f6..e5e3a8921e 100644 --- a/Generals/Code/GameEngine/Include/GameClient/CDCheck.h +++ b/Generals/Code/GameEngine/Include/GameClient/CDCheck.h @@ -29,12 +29,7 @@ #pragma once -#ifndef __CDCHECK_H_ -#define __CDCHECK_H_ - typedef void (*gameStartCallback) (void); Bool IsFirstCDPresent(void); void CheckForCDAtGameStart( gameStartCallback callback ); - -#endif //__CDCHECK_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h b/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h index e39c383962..2ea11594e4 100644 --- a/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h +++ b/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __CAMPAIGN_MANAGER_H_ -#define __CAMPAIGN_MANAGER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -164,5 +161,3 @@ class CampaignManager : public Snapshot // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- extern CampaignManager *TheCampaignManager; - -#endif // __CAMPAIGN_MANAGER_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/Color.h b/Generals/Code/GameEngine/Include/GameClient/Color.h index 568c211f6a..87c497de18 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Color.h +++ b/Generals/Code/GameEngine/Include/GameClient/Color.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __COLOR_H_ -#define __COLOR_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -88,6 +85,3 @@ extern void GameGetColorComponents( Color color, extern void GameGetColorComponentsReal( Color color, Real *red, Real *green, Real *blue, Real *alpha ); extern Color GameDarkenColor( Color color, Int percent = 10 ); - -#endif // __COLOR_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h b/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h index 4e74662202..b7f5e88b5d 100644 --- a/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _H_CommandXlat -#define _H_CommandXlat - #include "GameClient/InGameUI.h" enum GUICommandType CPP_11(: Int); @@ -124,5 +121,3 @@ class PickAndPlayInfo }; extern void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type msgType, PickAndPlayInfo *info = NULL ); - -#endif diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h index dc8d880f68..c8b686550b 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __CONTROLBAR_H_ -#define __CONTROLBAR_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameType.h" @@ -1029,6 +1026,3 @@ class ControlBar : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern ControlBar *TheControlBar; - -#endif // end __CONTROLBAR_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBarResizer.h b/Generals/Code/GameEngine/Include/GameClient/ControlBarResizer.h index 12979abc96..62b82e01ad 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ControlBarResizer.h +++ b/Generals/Code/GameEngine/Include/GameClient/ControlBarResizer.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __CONTROL_BAR_RESIZER_H_ -#define __CONTROL_BAR_RESIZER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -103,5 +100,3 @@ class ControlBarResizer //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __CONTROL_BAR_RESIZER_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h b/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h index a3aadd11cd..7c4852c262 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h +++ b/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __CONTROL_BAR_SCHEME_H_ -#define __CONTROL_BAR_SCHEME_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -287,5 +284,3 @@ class ControlBarSchemeManager //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __CONTROL_BAR_SCHEME_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/Credits.h b/Generals/Code/GameEngine/Include/GameClient/Credits.h index 48aaf014ed..bba068bd64 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Credits.h +++ b/Generals/Code/GameEngine/Include/GameClient/Credits.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __CREDITS_H_ -#define __CREDITS_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -165,4 +162,3 @@ class CreditsManager: public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- extern CreditsManager *TheCredits; -#endif // __CREDITS_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h b/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h index 0aada8a492..528c06c256 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h +++ b/Generals/Code/GameEngine/Include/GameClient/DebugDisplay.h @@ -43,10 +43,6 @@ #pragma once -#ifndef __GAMECLIENT_DEBUGDISPLAY_H -#define __GAMECLIENT_DEBUGDISPLAY_H - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -149,7 +145,3 @@ extern void AudioDebugDisplay( DebugDisplayInterface *debugDisplay, void *userDa //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - - -#endif // __GAMECLIENT_DEBUGDISPLAY_H diff --git a/Generals/Code/GameEngine/Include/GameClient/Diplomacy.h b/Generals/Code/GameEngine/Include/GameClient/Diplomacy.h index 0011d93d7d..a26861cf43 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Diplomacy.h +++ b/Generals/Code/GameEngine/Include/GameClient/Diplomacy.h @@ -28,13 +28,8 @@ #pragma once -#ifndef __DIPLOMACY_H__ -#define __DIPLOMACY_H__ - void PopulateInGameDiplomacyPopup( void ); void UpdateDiplomacyBriefingText(AsciiString newText, Bool clear); typedef std::list BriefingList; BriefingList* GetBriefingTextList(void); - -#endif // #ifndef __DIPLOMACY_H__ diff --git a/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h b/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h index a9423f5b13..457c263feb 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h +++ b/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __DISCONNECTDIALOG_H -#define __DISCONNECTDIALOG_H - #include "GameNetwork/DisconnectManager.h" enum DisconnectMenuStateType CPP_11(: Int) { @@ -79,5 +75,3 @@ class DisconnectMenu { }; extern DisconnectMenu *TheDisconnectMenu; - -#endif // #ifndef __DISCONNECTDIALOG_H diff --git a/Generals/Code/GameEngine/Include/GameClient/Display.h b/Generals/Code/GameEngine/Include/GameClient/Display.h index b7878dcda3..6036450c29 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Display.h +++ b/Generals/Code/GameEngine/Include/GameClient/Display.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _GAME_DISPLAY_H_ -#define _GAME_DISPLAY_H_ - #include #include "Common/SubsystemInterface.h" #include "View.h" @@ -234,6 +231,3 @@ typedef struct _DisplaySettings Int bitDepth; //Color Depth Bool windowed; //Window mode TRUE: we're windowed, FALSE: we're not windowed } DisplaySettings; - - -#endif // _GAME_DISPLAY_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/DisplayString.h b/Generals/Code/GameEngine/Include/GameClient/DisplayString.h index eaa479fdcf..164ad25bbb 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DisplayString.h +++ b/Generals/Code/GameEngine/Include/GameClient/DisplayString.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __DISPLAYSTRING_H_ -#define __DISPLAYSTRING_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -129,6 +126,3 @@ inline void DisplayString::notifyTextChanged( void ) {} inline DisplayString *DisplayString::next( void ) { return m_next; } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __DISPLAYSTRING_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/DisplayStringManager.h b/Generals/Code/GameEngine/Include/GameClient/DisplayStringManager.h index 2fe0260011..6ce394d3fe 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DisplayStringManager.h +++ b/Generals/Code/GameEngine/Include/GameClient/DisplayStringManager.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DISPLAYSTRINGMANAGER_H_ -#define __DISPLAYSTRINGMANAGER_H_ - #include "Common/SubsystemInterface.h" #include "GameClient/DisplayString.h" @@ -66,6 +63,3 @@ class DisplayStringManager : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern DisplayStringManager *TheDisplayStringManager; ///< singleton extern - -#endif // __DISPLAYSTRINGMANAGER_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/DrawGroupInfo.h b/Generals/Code/GameEngine/Include/GameClient/DrawGroupInfo.h index d00e0a720b..0637bd8ec4 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DrawGroupInfo.h +++ b/Generals/Code/GameEngine/Include/GameClient/DrawGroupInfo.h @@ -27,8 +27,6 @@ // Author: John K. McDonald, March 2002 #pragma once -#ifndef _H_DRAWGROUPINFO_ -#define _H_DRAWGROUPINFO_ struct DrawGroupInfo { @@ -64,5 +62,3 @@ struct DrawGroupInfo }; extern DrawGroupInfo *TheDrawGroupInfo; - -#endif /* _H_DRAWGROUPINFO */ diff --git a/Generals/Code/GameEngine/Include/GameClient/Drawable.h b/Generals/Code/GameEngine/Include/GameClient/Drawable.h index d1b46bd278..a1451e8391 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Drawable.h +++ b/Generals/Code/GameEngine/Include/GameClient/Drawable.h @@ -27,8 +27,6 @@ // Author: Michael S. Booth, March 2001 #pragma once -#ifndef _DRAWABLE_H_ -#define _DRAWABLE_H_ #include "Common/AudioEventRTS.h" #include "Common/GameType.h" @@ -760,5 +758,3 @@ class StDrawableDirtyStuffLocker } }; #endif - -#endif // _DRAWABLE_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/DrawableInfo.h b/Generals/Code/GameEngine/Include/GameClient/DrawableInfo.h index dd4c9cbcf3..1b469cc39c 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DrawableInfo.h +++ b/Generals/Code/GameEngine/Include/GameClient/DrawableInfo.h @@ -27,8 +27,6 @@ // Author: Mark Wilczynski, August 2002 #pragma once -#ifndef _DRAWABLEINFO_H_ -#define _DRAWABLEINFO_H_ #include "Common/GameType.h" @@ -55,5 +53,3 @@ struct DrawableInfo GhostObject *m_ghostObject; ///winGetHiliteBorderColor( 2 ); } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETCHECKBOX_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h b/Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h index f9d83b7605..5619581ef5 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __GADGETCOMBOBOX_H_ -#define __GADGETCOMBOBOX_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -193,6 +190,3 @@ inline GameWindow *GadgetComboBoxGetEditBox( GameWindow *g ) } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETLISTBOX_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h b/Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h index 70798aa911..850e4af4ba 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __GADGETLISTBOX_H_ -#define __GADGETLISTBOX_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -208,6 +205,3 @@ inline GameWindow *GadgetListBoxGetDownButton( GameWindow *g ) } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETLISTBOX_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetProgressBar.h b/Generals/Code/GameEngine/Include/GameClient/GadgetProgressBar.h index 0f3989b1f6..a4ce368485 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetProgressBar.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetProgressBar.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __GADGETPROGRESSBAR_H_ -#define __GADGETPROGRESSBAR_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -141,6 +138,3 @@ inline const Image * GadgetProgressBarGetHiliteBarImageCenter( GameWindow *g ) inline const Image * GadgetProgressBarGetHiliteBarImageSmallCenter( GameWindow *g ) { return g->winGetHiliteImage( 7 ); } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETPROGRESSBAR_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetPushButton.h b/Generals/Code/GameEngine/Include/GameClient/GadgetPushButton.h index 1f7a8b62c4..5a8691a392 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetPushButton.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetPushButton.h @@ -58,9 +58,6 @@ #pragma once -#ifndef __GADGETPUSHBUTTON_H_ -#define __GADGETPUSHBUTTON_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -172,6 +169,3 @@ inline void GadgetButtonSetLeftEnabledImage( GameWindow *g, const Image *image ) inline void GadgetButtonSetMiddleEnabledImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 5, image ); } inline void GadgetButtonSetRightEnabledImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 6, image ); } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETPUSHBUTTON_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetRadioButton.h b/Generals/Code/GameEngine/Include/GameClient/GadgetRadioButton.h index c1a7b13721..331927813c 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetRadioButton.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetRadioButton.h @@ -64,9 +64,6 @@ #pragma once -#ifndef __GADGETRADIOBUTTON_H_ -#define __GADGETRADIOBUTTON_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -147,6 +144,3 @@ inline const Image *GadgetRadioGetSelectedCheckedBoxImage( GameWindow *g ) // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETRADIOBUTTON_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetSlider.h b/Generals/Code/GameEngine/Include/GameClient/GadgetSlider.h index 8fbf3b74ad..3ffc2a4500 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetSlider.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetSlider.h @@ -53,9 +53,6 @@ #pragma once -#ifndef __GADGETSLIDER_H_ -#define __GADGETSLIDER_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -440,6 +437,3 @@ inline Color GadgetSliderGetHiliteSelectedThumbBorderColor( GameWindow *g ) } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETSLIDER_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetStaticText.h b/Generals/Code/GameEngine/Include/GameClient/GadgetStaticText.h index 8296d583cf..83090aec76 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetStaticText.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetStaticText.h @@ -55,9 +55,6 @@ #pragma once -#ifndef __GADGETSTATICTEXT_H_ -#define __GADGETSTATICTEXT_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -101,6 +98,3 @@ inline Color GadgetStaticTextGetHiliteColor( GameWindow *g ) { return g inline Color GadgetStaticTextGetHiliteBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 0 ); } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETSTATICTEXT_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetTabControl.h b/Generals/Code/GameEngine/Include/GameClient/GadgetTabControl.h index d068718ff0..17a91ba631 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetTabControl.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetTabControl.h @@ -44,9 +44,6 @@ #pragma once -#ifndef __GADGETTABCONTROL_H_ -#define __GADGETTABCONTROL_H_ - enum { GTC_BACKGROUND = 0, @@ -274,6 +271,3 @@ inline Color GadgetTabControlGetHiliteBorderColorBackground( GameWindow *g ) // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETTABCONTROL_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetTextEntry.h b/Generals/Code/GameEngine/Include/GameClient/GadgetTextEntry.h index 0ea8fc7847..b7efd3251f 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetTextEntry.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetTextEntry.h @@ -50,9 +50,6 @@ #pragma once -#ifndef __GADGETTEXTENTRY_H_ -#define __GADGETTEXTENTRY_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -124,6 +121,3 @@ inline Color GadgetTextEntryGetHiliteColor( GameWindow *g ) { return g->w inline Color GadgetTextEntryGetHiliteBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 0 ); } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETTEXTENTRY_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/GameClient.h b/Generals/Code/GameEngine/Include/GameClient/GameClient.h index d2aa198e5a..16b1f1d7a4 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameClient.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameClient.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _GAME_INTERFACE_H_ -#define _GAME_INTERFACE_H_ - #include "Common/GameType.h" #include "Common/MessageStream.h" // for GameMessageTranslator #include "Common/Snapshot.h" @@ -275,5 +272,3 @@ extern GameClient *TheGameClient; // m_roadBuffer = NULL // m_shroud = NULL // TheRadar = RadarDummy - -#endif // _GAME_INTERFACE_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/GameFont.h b/Generals/Code/GameEngine/Include/GameClient/GameFont.h index 5ee75283e1..2307e00547 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameFont.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameFont.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GAMEFONT_H_ -#define __GAMEFONT_H_ - #include "Common/SubsystemInterface.h" #include "Lib/BaseType.h" #include "Common/AsciiString.h" @@ -106,6 +103,3 @@ inline GameFont *FontLibrary::nextFont( GameFont *font ) // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern FontLibrary *TheFontLibrary; ///< font library external - -#endif // __GAMEFONT_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/GameInfoWindow.h b/Generals/Code/GameEngine/Include/GameClient/GameInfoWindow.h index c4aa41f403..a7c8dea16b 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameInfoWindow.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameInfoWindow.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GAMEINFOWINDOW_H_ -#define __GAMEINFOWINDOW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/GameWindow.h" #include "GameNetwork/LANGameInfo.h" @@ -41,6 +38,3 @@ extern void CreateLANGameInfoWindow( GameWindow *sizeAndPosWin ); extern void DestroyGameInfoWindow(void); extern void RefreshGameInfoWindow(GameInfo *gameInfo, UnicodeString gameName); extern void HideGameInfoWindow(Bool hide); - -#endif // __GAMEINFOWINDOW_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/GameText.h b/Generals/Code/GameEngine/Include/GameClient/GameText.h index b67070eec9..65d9ce60fb 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameText.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameText.h @@ -42,10 +42,6 @@ #pragma once -#ifndef __GAMECLIENT_GAMETEXT_H_ -#define __GAMECLIENT_GAMETEXT_H_ - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -129,5 +125,3 @@ extern GameTextInterface* CreateGameTextInterface( void ); #endif #endif // ENABLE_GAMETEXT_SUBSTITUTES - -#endif // __GAMECLIENT_GAMETEXT_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindow.h b/Generals/Code/GameEngine/Include/GameClient/GameWindow.h index ad34564485..05bcc41d18 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameWindow.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameWindow.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __GAMEWINDOW_H_ -#define __GAMEWINDOW_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -502,6 +499,3 @@ extern void GameWinDefaultTooltip( GameWindow *window, extern const char *const WindowStatusNames[]; extern const char *const WindowStyleNames[]; - -#endif // __GAMEWINDOW_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindowGlobal.h b/Generals/Code/GameEngine/Include/GameClient/GameWindowGlobal.h index 68d0b03aab..d27d107b9e 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameWindowGlobal.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameWindowGlobal.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __GAMEWINDOWGLOBAL_H_ -#define __GAMEWINDOWGLOBAL_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -64,6 +61,3 @@ /////////////////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// - -#endif // __GAMEWINDOWGLOBAL_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindowID.h b/Generals/Code/GameEngine/Include/GameClient/GameWindowID.h index f2b37448c2..9d5eec2be5 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameWindowID.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameWindowID.h @@ -47,9 +47,6 @@ #pragma once -#ifndef __GAMEWINDOWID_H_ -#define __GAMEWINDOWID_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -84,6 +81,3 @@ // INLINING /////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GAMEWINDOWID_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindowManager.h b/Generals/Code/GameEngine/Include/GameClient/GameWindowManager.h index 8a1638e2c3..6b14f7bba2 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameWindowManager.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameWindowManager.h @@ -31,10 +31,6 @@ #pragma once -#ifndef __GAMEWINDOWMANAGER_H_ -#define __GAMEWINDOWMANAGER_H_ - - #include "Common/STLTypedefs.h" #include "Common/SubsystemInterface.h" #include "GameClient/WindowLayout.h" @@ -416,6 +412,3 @@ class GameWindowManagerDummy : public GameWindowManager virtual GameWinDrawFunc getTextEntryImageDrawFunc() { return NULL; } virtual GameWinDrawFunc getTextEntryDrawFunc() { return NULL; } }; - -#endif // __GAMEWINDOWMANAGER_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h b/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h index 35ed971446..c267fa9f03 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __GAME_WINDOW_TRANSITIONS_H_ -#define __GAME_WINDOW_TRANSITIONS_H_ - #include "Common/GameCommon.h" //----------------------------------------------------------------------------- @@ -696,5 +693,3 @@ void PushButtonImageDrawThree(GameWindow *window, Int alpha ); // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- extern GameWindowTransitionsHandler *TheTransitionHandler; -#endif // __GAME_WINDOW_TRANSITIONS_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/GlobalLanguage.h b/Generals/Code/GameEngine/Include/GameClient/GlobalLanguage.h index 2f7d1557de..531df38574 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GlobalLanguage.h +++ b/Generals/Code/GameEngine/Include/GameClient/GlobalLanguage.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __GLOBAL_LANGUAGE_H_ -#define __GLOBAL_LANGUAGE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -122,4 +119,3 @@ class GlobalLanguage : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- extern GlobalLanguage *TheGlobalLanguageData; -#endif // __GLOBAL_LANGUAGE_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/GraphDraw.h b/Generals/Code/GameEngine/Include/GameClient/GraphDraw.h index c14d4f4459..97cc938851 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GraphDraw.h +++ b/Generals/Code/GameEngine/Include/GameClient/GraphDraw.h @@ -47,8 +47,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once -#ifndef __GRAPHDRAW_H__ -#define __GRAPHDRAW_H__ #include "Common/PerfTimer.h" #include "Common/STLTypedefs.h" @@ -85,6 +83,3 @@ extern GraphDraw *TheGraphDraw; #endif /* PERF_TIMERS */ - -#endif /* __GRAPHDRAW_H__ */ - diff --git a/Generals/Code/GameEngine/Include/GameClient/HeaderTemplate.h b/Generals/Code/GameEngine/Include/GameClient/HeaderTemplate.h index 2ca6cb49e5..15f8816c37 100644 --- a/Generals/Code/GameEngine/Include/GameClient/HeaderTemplate.h +++ b/Generals/Code/GameEngine/Include/GameClient/HeaderTemplate.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __HEADER_TEMPLATE_H_ -#define __HEADER_TEMPLATE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -116,4 +113,3 @@ class HeaderTemplateManager // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- extern HeaderTemplateManager *TheHeaderTemplateManager; -#endif // __HEADER_TEMPLATE_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/HintSpy.h b/Generals/Code/GameEngine/Include/GameClient/HintSpy.h index 5fddacd4f3..06ae41156f 100644 --- a/Generals/Code/GameEngine/Include/GameClient/HintSpy.h +++ b/Generals/Code/GameEngine/Include/GameClient/HintSpy.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _H_HintSpy -#define _H_HintSpy - #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- @@ -39,5 +36,3 @@ class HintSpyTranslator : public GameMessageTranslator virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); virtual ~HintSpyTranslator() { } }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameClient/HotKey.h b/Generals/Code/GameEngine/Include/GameClient/HotKey.h index 85f98f3cf8..84becd005d 100644 --- a/Generals/Code/GameEngine/Include/GameClient/HotKey.h +++ b/Generals/Code/GameEngine/Include/GameClient/HotKey.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __HOT_KEY_H_ -#define __HOT_KEY_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -113,6 +110,3 @@ extern HotKeyManager *TheHotKeyManager; //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __HOT_KEY_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/IMEManager.h b/Generals/Code/GameEngine/Include/GameClient/IMEManager.h index 637576a145..be703e1bb4 100644 --- a/Generals/Code/GameEngine/Include/GameClient/IMEManager.h +++ b/Generals/Code/GameEngine/Include/GameClient/IMEManager.h @@ -43,10 +43,6 @@ #pragma once -#ifndef __GAMECLIENT_IMEMANAGER_H -#define __GAMECLIENT_IMEMANAGER_H - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -115,7 +111,3 @@ extern IMEManagerInterface *CreateIMEManagerInterface( void ); //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - - -#endif // __GAMECLIENT_IMEMANAGER_H diff --git a/Generals/Code/GameEngine/Include/GameClient/Image.h b/Generals/Code/GameEngine/Include/GameClient/Image.h index 0fc166c55f..71f9089a46 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Image.h +++ b/Generals/Code/GameEngine/Include/GameClient/Image.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __IMAGE_H_ -#define __IMAGE_H_ - #include "Common/AsciiString.h" #include "Common/GameMemory.h" #include "Common/SubsystemInterface.h" @@ -167,6 +164,3 @@ inline UnsignedInt Image::getStatus( void ) const { return m_status; } // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern ImageCollection *TheMappedImageCollection; ///< mapped images - -#endif // __IMAGE_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/InGameUI.h b/Generals/Code/GameEngine/Include/GameClient/InGameUI.h index f5d0a3c7f6..b00567e185 100644 --- a/Generals/Code/GameEngine/Include/GameClient/InGameUI.h +++ b/Generals/Code/GameEngine/Include/GameClient/InGameUI.h @@ -30,9 +30,6 @@ #pragma once -#ifndef _IN_GAME_UI_H_ -#define _IN_GAME_UI_H_ - #include "Common/GameCommon.h" #include "Common/GameType.h" #include "Common/MessageStream.h" // for GameMessageTranslator @@ -909,5 +906,3 @@ friend class Drawable; // for selection/deselection transactions // the singleton extern InGameUI *TheInGameUI; - -#endif // _IN_GAME_UI_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h b/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h index 9cb65a7555..a6e19e19bc 100644 --- a/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h +++ b/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h @@ -53,9 +53,6 @@ #pragma once -#ifndef __KEYDEFS_H_ -#define __KEYDEFS_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #ifndef DIRECTINPUT_VERSION @@ -257,5 +254,3 @@ enum // INLINING /////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __KEYDEFS_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/Keyboard.h b/Generals/Code/GameEngine/Include/GameClient/Keyboard.h index 818c83fa79..638df5a3a3 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Keyboard.h +++ b/Generals/Code/GameEngine/Include/GameClient/Keyboard.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __KEYBOARD_H_ -#define __KEYBOARD_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -168,5 +165,3 @@ class Keyboard : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////// extern Keyboard *TheKeyboard; - -#endif // __KEYBOARD_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/LanguageFilter.h b/Generals/Code/GameEngine/Include/GameClient/LanguageFilter.h index 91929436f4..da533ce974 100644 --- a/Generals/Code/GameEngine/Include/GameClient/LanguageFilter.h +++ b/Generals/Code/GameEngine/Include/GameClient/LanguageFilter.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __LANGUAGEFILTER_H -#define __LANGUAGEFILTER_H - #include "Common/STLTypedefs.h" #include "Common/AsciiString.h" #include "Common/UnicodeString.h" @@ -85,5 +81,3 @@ class LanguageFilter : public SubsystemInterface { extern LanguageFilter *TheLanguageFilter; LanguageFilter * createLanguageFilter(); - -#endif //#define __LANGUAGEFILTER_H diff --git a/Generals/Code/GameEngine/Include/GameClient/Line2D.h b/Generals/Code/GameEngine/Include/GameClient/Line2D.h index 24843061d4..218ebb40b8 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Line2D.h +++ b/Generals/Code/GameEngine/Include/GameClient/Line2D.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __LINE2D_H_ -#define __LINE2D_H_ - typedef std::vector Coord2DVector; typedef std::vector Coord3DVector; @@ -85,7 +82,3 @@ extern Bool PointInsideArea2D( const Coord3D *ptToTest, ///< outU will return the U value determined. This is a shortcut for panning extern void ShortestDistancePointToSegment2D( const Coord2D *a, const Coord2D *b, const Coord2D *pt, Real *outDistance, Coord2D *outPosition, Real *outU ); - - -#endif // __LINE2D_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/LoadScreen.h b/Generals/Code/GameEngine/Include/GameClient/LoadScreen.h index 716cc7ebcd..f0f2ac53fe 100644 --- a/Generals/Code/GameEngine/Include/GameClient/LoadScreen.h +++ b/Generals/Code/GameEngine/Include/GameClient/LoadScreen.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _LOADSCREEN_H_ -#define _LOADSCREEN_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -244,5 +241,3 @@ class MapTransferLoadScreen : public LoadScreen GameWindow *m_timeoutText; Int m_oldTimeout; ///< old val, so we can call processTimeout() every frame and not touch the GUI }; - -#endif //_LOADSCREEN_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h b/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h index 6cafbab541..8aa865f59a 100644 --- a/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _H_LookAtXlat -#define _H_LookAtXlat - #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- @@ -91,5 +88,3 @@ class LookAtTranslator : public GameMessageTranslator }; extern LookAtTranslator *TheLookAtTranslator; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameClient/MapUtil.h b/Generals/Code/GameEngine/Include/GameClient/MapUtil.h index 0d3eb599f6..866a7039cc 100644 --- a/Generals/Code/GameEngine/Include/GameClient/MapUtil.h +++ b/Generals/Code/GameEngine/Include/GameClient/MapUtil.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __MAPUTIL_H__ -#define __MAPUTIL_H__ - #include "Common/AsciiString.h" #include "Common/UnicodeString.h" @@ -132,4 +129,3 @@ Bool parseMapPreviewChunk(DataChunkInput &file, DataChunkInfo *info, void *userD void findDrawPositions( Int startX, Int startY, Int width, Int height, Region3D extent, ICoord2D *ul, ICoord2D *lr ); Bool WouldMapTransfer( const AsciiString& mapName ); -#endif // __MAPUTIL_H__ diff --git a/Generals/Code/GameEngine/Include/GameClient/MessageBox.h b/Generals/Code/GameEngine/Include/GameClient/MessageBox.h index 635e425190..cf5951e099 100644 --- a/Generals/Code/GameEngine/Include/GameClient/MessageBox.h +++ b/Generals/Code/GameEngine/Include/GameClient/MessageBox.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __MESSAGEBOX_H_ -#define __MESSAGEBOX_H_ - #include "GameClient/GameWindowManager.h" GameWindow *MessageBoxYesNo(UnicodeString titleString,UnicodeString bodyString,GameWinMsgBoxFunc yesCallback,GameWinMsgBoxFunc noCallback); ///< convenience function for displaying a Message box with Yes and No buttons @@ -47,5 +44,3 @@ GameWindow *MessageBoxOk(UnicodeString titleString,UnicodeString bodyString,Game GameWindow *MessageBoxCancel(UnicodeString titleString,UnicodeString bodyString,GameWinMsgBoxFunc cancelCallback);///< convenience function for displaying a Message box with Cancel button - -#endif //__MESSAGEBOX_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h b/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h index ebbc5a24b4..497f78f901 100644 --- a/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h +++ b/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _H_MetaEvent -#define _H_MetaEvent - #include "Common/SubsystemInterface.h" #include "GameClient/InGameUI.h" @@ -402,5 +399,3 @@ class MetaMap : public SubsystemInterface }; extern MetaMap *TheMetaMap; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h b/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h index 608e446140..f3296be380 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h +++ b/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __ANIMPARTICLESYSBONEUPDATE_H_ -#define __ANIMPARTICLESYSBONEUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" @@ -59,6 +56,3 @@ class AnimatedParticleSysBoneClientUpdate : public ClientUpdateModule UnsignedInt m_life; }; - -#endif // __ANIMPARTICLESYSBONEUPDATE_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h b/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h index 9249fd299a..d50ac63373 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h +++ b/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BEACONCLIENTUPDATE_H_ -#define __BEACONCLIENTUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" @@ -75,6 +72,3 @@ class BeaconClientUpdate : public ClientUpdateModule UnsignedInt m_lastRadarPulse; }; - -#endif // __BEACONCLIENTUPDATE_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h b/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h index b76f6efb83..e2046660e7 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h +++ b/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SWAYCLIENTUPDATE_H_ -#define __SWAYCLIENTUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" @@ -70,6 +67,3 @@ class SwayClientUpdate : public ClientUpdateModule void updateSway(void); }; - -#endif // __SWAYCLIENTUPDATE_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/Mouse.h b/Generals/Code/GameEngine/Include/GameClient/Mouse.h index a8c4090a13..0b4b979c90 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Mouse.h +++ b/Generals/Code/GameEngine/Include/GameClient/Mouse.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __MOUSE_H_ -#define __MOUSE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -440,5 +437,3 @@ class MouseDummy : public Mouse // EXTERNALS ////////////////////////////////////////////////////////////////// extern Mouse *TheMouse; ///< extern mouse singleton definition - -#endif // _MOUSE_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h b/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h index 4970317cfc..0ccc11899b 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h +++ b/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _PARTICLE_SYS_H_ -#define _PARTICLE_SYS_H_ - #include #include "Common/AsciiString.h" #include "Common/GameMemory.h" @@ -829,6 +826,3 @@ extern ParticleSystemManager *TheParticleSystemManager; class DebugDisplayInterface; extern void ParticleSystemDebugDisplay( DebugDisplayInterface *dd, void *, FILE *fp = NULL ); - - -#endif // _PARTICLE_SYS_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h b/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h index 9be1c48569..3d367d3c95 100644 --- a/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h +++ b/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _H_PlaceEventTranslator -#define _H_PlaceEventTranslator - #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- @@ -43,5 +40,3 @@ class PlaceEventTranslator : public GameMessageTranslator ~PlaceEventTranslator(); virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h b/Generals/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h index 536c9b942e..1e82c6d0e7 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h +++ b/Generals/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h @@ -50,9 +50,6 @@ #pragma once -#ifndef __PROCESSANIMATEWINDOW_H_ -#define __PROCESSANIMATEWINDOW_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -265,5 +262,3 @@ Real m_speedUpRatio; // how fast the windows speed up //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __PROCESSANIMATEWINDOW_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h b/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h index 59cf86b1a2..c1b3bd5ad1 100644 --- a/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h +++ b/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _RadiusDecal_H_ -#define _RadiusDecal_H_ - #include "Common/GameCommon.h" #include "Common/GameType.h" #include "GameClient/Color.h" @@ -91,5 +88,3 @@ class RadiusDecalTemplate static void parseRadiusDecalTemplate(INI* ini, void *instance, void * store, const void* /*userData*/); }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameClient/RayEffect.h b/Generals/Code/GameEngine/Include/GameClient/RayEffect.h index 8c30df89b6..f7442da69b 100644 --- a/Generals/Code/GameEngine/Include/GameClient/RayEffect.h +++ b/Generals/Code/GameEngine/Include/GameClient/RayEffect.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __RAYEFFECT_H_ -#define __RAYEFFECT_H_ - // INCLUDE //////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/SubsystemInterface.h" @@ -91,6 +88,3 @@ class RayEffectSystem : public SubsystemInterface // EXTERN ///////////////////////////////////////////////////////////////////////////////////////// extern RayEffectSystem *TheRayEffects; ///< the ray effects singleton external - -#endif // $label - diff --git a/Generals/Code/GameEngine/Include/GameClient/SelectionInfo.h b/Generals/Code/GameEngine/Include/GameClient/SelectionInfo.h index a3dcd3c3f6..e0d07c059a 100644 --- a/Generals/Code/GameEngine/Include/GameClient/SelectionInfo.h +++ b/Generals/Code/GameEngine/Include/GameClient/SelectionInfo.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __SELECTIONINFO_H__ -#define __SELECTIONINFO_H__ - #include "GameClient/InGameUI.h" // This structure gives you a rough idea about the counts of the kinds of guys in the @@ -100,6 +97,3 @@ extern void translatePickTypesToKindof(UnsignedInt pickTypes, KindOfMaskType& ou // userData should be a pointer to a PickDrawableStruct, which is defined in // above. extern Bool addDrawableToList( Drawable *draw, void *userData ); - - -#endif /* __SELECTIONINFO_H__ */ diff --git a/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h b/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h index baf49b9afe..c6df1833a8 100644 --- a/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _H_SelectionXlat -#define _H_SelectionXlat - #include "GameClient/InGameUI.h" class ThingTemplate; @@ -75,5 +72,3 @@ class SelectionTranslator : public GameMessageTranslator Bool CanSelectDrawable( const Drawable *draw, Bool dragSelecting ); extern SelectionTranslator *TheSelectionTranslator; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameClient/Shadow.h b/Generals/Code/GameEngine/Include/GameClient/Shadow.h index 2a3c842362..0ea345a84f 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Shadow.h +++ b/Generals/Code/GameEngine/Include/GameClient/Shadow.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __SHADOW_H_ -#define __SHADOW_H_ - // // skeleton definition of shadow types // @@ -213,6 +210,3 @@ class ProjectedShadowManager }; extern ProjectedShadowManager *TheProjectedShadowManager; - -#endif // __SHADOW_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/Shell.h b/Generals/Code/GameEngine/Include/GameClient/Shell.h index 01788c3e48..4e0f88c471 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Shell.h +++ b/Generals/Code/GameEngine/Include/GameClient/Shell.h @@ -94,9 +94,6 @@ #pragma once -#ifndef __SHELL_H_ -#define __SHELL_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// // FORWARD REFERENCES ///////////////////////////////////////////////////////////////////////////// @@ -206,6 +203,3 @@ class Shell : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern Shell *TheShell; ///< the shell external interface - -#endif // __SHELL_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/ShellHooks.h b/Generals/Code/GameEngine/Include/GameClient/ShellHooks.h index 7e7e426ea5..d6fe041860 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ShellHooks.h +++ b/Generals/Code/GameEngine/Include/GameClient/ShellHooks.h @@ -28,9 +28,6 @@ #pragma once -#ifndef SHELLHOOKS_H -#define SHELLHOOKS_H - // // This enumeration holds all the shell script hooks that we currently have, If you are going to // add more, it's important to keep the enum lined up with the names in TheShellHookNames located @@ -82,6 +79,3 @@ enum extern const char *const TheShellHookNames[]; ///< Contains a list of the text representation of the shell hooks Used in WorldBuilder and in the shell. void SignalUIInteraction(Int interaction); - -#endif // SHELLHOOKS_H - diff --git a/Generals/Code/GameEngine/Include/GameClient/ShellMenuScheme.h b/Generals/Code/GameEngine/Include/GameClient/ShellMenuScheme.h index cb6f4e4b48..3219b1a87c 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ShellMenuScheme.h +++ b/Generals/Code/GameEngine/Include/GameClient/ShellMenuScheme.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __SHELL_MENU_SCHEME_H_ -#define __SHELL_MENU_SCHEME_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -153,5 +150,3 @@ class ShellMenuSchemeManager //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __SHELL_MENU_SCHEME_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/Statistics.h b/Generals/Code/GameEngine/Include/GameClient/Statistics.h index bab9f5481f..8031fe35fd 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Statistics.h +++ b/Generals/Code/GameEngine/Include/GameClient/Statistics.h @@ -38,8 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_STATISTICS_ -#define _H_STATISTICS_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" @@ -62,5 +60,3 @@ extern Real Normalize(Real valueToNormalize, Real minRange, Real maxRange); // same as Normalize, except that output will be in the range [outRangeMin, outRangeMax] extern Real NormalizeToRange(Real valueToNormalize, Real minRange, Real maxRange, Real outRangeMin, Real outRangeMax); - -#endif /* _H_STATISTICS_ */ diff --git a/Generals/Code/GameEngine/Include/GameClient/TerrainRoads.h b/Generals/Code/GameEngine/Include/GameClient/TerrainRoads.h index fade346ea4..c0c4ee72fc 100644 --- a/Generals/Code/GameEngine/Include/GameClient/TerrainRoads.h +++ b/Generals/Code/GameEngine/Include/GameClient/TerrainRoads.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __TERRAINROADS_H_ -#define __TERRAINROADS_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "Common/SubsystemInterface.h" @@ -230,5 +227,3 @@ class TerrainRoadCollection : public SubsystemInterface // EXTERNAL //////////////////////////////////////////////////////////////////////////////////////// extern TerrainRoadCollection *TheTerrainRoads; - -#endif // __TERRAINROADS_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/TerrainVisual.h b/Generals/Code/GameEngine/Include/GameClient/TerrainVisual.h index 29cc26146e..a6cb48cb63 100644 --- a/Generals/Code/GameEngine/Include/GameClient/TerrainVisual.h +++ b/Generals/Code/GameEngine/Include/GameClient/TerrainVisual.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __TERRAINVISUAL_H_ -#define __TERRAINVISUAL_H_ - #include "Common/Terrain.h" #include "Common/Snapshot.h" @@ -174,5 +171,3 @@ class TerrainVisual : public Snapshot, // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern TerrainVisual *TheTerrainVisual; ///< singleton extern - -#endif // end __TERRAINVISUAL_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/View.h b/Generals/Code/GameEngine/Include/GameClient/View.h index 0b426e6465..9882babcc3 100644 --- a/Generals/Code/GameEngine/Include/GameClient/View.h +++ b/Generals/Code/GameEngine/Include/GameClient/View.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _VIEW_H_ -#define _VIEW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Snapshot.h" @@ -337,5 +334,3 @@ class ViewLocation // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern View *TheTacticalView; ///< the main tactical interface to the game world - -#endif // _VIEW_H_ diff --git a/Generals/Code/GameEngine/Include/GameClient/Water.h b/Generals/Code/GameEngine/Include/GameClient/Water.h index 9b75beea25..7814c543bd 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Water.h +++ b/Generals/Code/GameEngine/Include/GameClient/Water.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __WATER_H_ -#define __WATER_H_ - // INLCLUDES ////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Overridable.h" @@ -125,6 +122,3 @@ EMPTY_DTOR(WaterTransparencySetting) extern WaterSetting WaterSettings[ TIME_OF_DAY_COUNT ]; extern OVERRIDE TheWaterTransparency; - -#endif // __WATER_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/WinInstanceData.h b/Generals/Code/GameEngine/Include/GameClient/WinInstanceData.h index 6ab4afe173..242dbeca0a 100644 --- a/Generals/Code/GameEngine/Include/GameClient/WinInstanceData.h +++ b/Generals/Code/GameEngine/Include/GameClient/WinInstanceData.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __WININSTANCEDATA_H_ -#define __WININSTANCEDATA_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -216,6 +213,3 @@ inline Int WinInstanceData::getTooltipTextLength( void ) } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __WININSTANCEDATA_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/WindowLayout.h b/Generals/Code/GameEngine/Include/GameClient/WindowLayout.h index 10edd8c602..155c6e91bb 100644 --- a/Generals/Code/GameEngine/Include/GameClient/WindowLayout.h +++ b/Generals/Code/GameEngine/Include/GameClient/WindowLayout.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __WINDOWLAYOUT_H_ -#define __WINDOWLAYOUT_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameClient/GameWindow.h" @@ -121,6 +118,3 @@ inline void WindowLayout::runShutdown( void *userData ) { if( m_shutdown ) m_shu inline void WindowLayout::setInit( WindowLayoutInitFunc init ) { m_init = init; } inline void WindowLayout::setUpdate( WindowLayoutUpdateFunc update ) { m_update = update; } inline void WindowLayout::setShutdown( WindowLayoutShutdownFunc shutdown ) {m_shutdown = shutdown;} - -#endif // __WINDOWLAYOUT_H_ - diff --git a/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h b/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h index d991f27240..d04f20d0ba 100644 --- a/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _H_WindowXlat -#define _H_WindowXlat - #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- @@ -42,5 +39,3 @@ class WindowTranslator : public GameMessageTranslator ~WindowTranslator(); virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/AI.h b/Generals/Code/GameEngine/Include/GameLogic/AI.h index f1a0b29af6..30e6e84925 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AI.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AI.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _AI_H_ -#define _AI_H_ - #include "Common/Snapshot.h" #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" @@ -1014,6 +1011,3 @@ class AIGroup : public MemoryPoolObject, public Snapshot mutable VecObjectID m_lastRequestedIDList; ///< this is used so we can return by reference, saving a copy }; - - -#endif // _AI_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIDock.h b/Generals/Code/GameEngine/Include/GameLogic/AIDock.h index 34d04d9b56..994f7cd808 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIDock.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIDock.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _AI_DOCK_H_ -#define _AI_DOCK_H_ - #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" @@ -203,6 +200,3 @@ class AIDockMoveToExitState : public AIInternalMoveToState EMPTY_DTOR(AIDockMoveToExitState) //----------------------------------------------------------------------------------------------------------- - - -#endif // _AI_DOCK_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h b/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h index 940b33b33d..45d6863d69 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h @@ -38,8 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_AIGUARD_ -#define _H_AIGUARD_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" @@ -263,5 +261,3 @@ class AIGuardAttackAggressorState : public State }; //-------------------------------------------------------------------------------------- - -#endif /* _H_AIGUARD_ */ diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h b/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h index 64785c1d20..a66480e02e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _PATHFIND_H_ -#define _PATHFIND_H_ - #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/Snapshot.h" @@ -980,6 +977,3 @@ inline Bool PathfindCell::isObstaclePresent( ObjectID objID ) const return false; } - - -#endif // _PATHFIND_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h b/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h index 8a568fa165..e4a8ab352b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _AI_PLAYER_H_ -#define _AI_PLAYER_H_ - #include "Common/GameMemory.h" #include "Common/Snapshot.h" @@ -293,8 +290,3 @@ class AIPlayer : public MemoryPoolObject, ObjectID m_curWarehouseID; }; - -#endif // _AI_PLAYER_H_ - - - diff --git a/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h b/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h index 7f403cc9c9..6c80a102ed 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _AI_SKIRMISH_PLAYER_H_ -#define _AI_SKIRMISH_PLAYER_H_ - #include "Common/GameMemory.h" #include "GameLogic/AIPlayer.h" @@ -118,8 +115,3 @@ class AISkirmishPlayer : public AIPlayer Player *m_currentEnemy; }; - -#endif // _AI_SKIRMISH_PLAYER_H_ - - - diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h b/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h index 202df2c20a..03f0de0e73 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _AI_STATE_MACHINE_H_ -#define _AI_STATE_MACHINE_H_ - #include "Lib/BaseType.h" #include "Common/AudioEventRTS.h" @@ -1263,5 +1260,3 @@ class AIFaceState : public State Bool m_canTurnInPlace; }; EMPTY_DTOR(AIFaceState) - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h b/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h index d692c60525..ec7efe9423 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h @@ -38,8 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_AITNGUARD_ -#define _H_AITNGUARD_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" @@ -246,5 +244,3 @@ class AITNGuardAttackAggressorState : public State }; //-------------------------------------------------------------------------------------- - -#endif /* _H_AIGUARD_ */ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Armor.h b/Generals/Code/GameEngine/Include/GameLogic/Armor.h index 766612d9df..798de573a9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Armor.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Armor.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _Armor_H_ -#define _Armor_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" #include "Common/STLTypedefs.h" @@ -129,6 +126,3 @@ class ArmorStore : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern ArmorStore *TheArmorStore; - -#endif // _Armor_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h b/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h index 95f0bbf0fa..277f5eac20 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h @@ -26,9 +26,6 @@ #pragma once -#ifndef _ArmorSet_H_ -#define _ArmorSet_H_ - #include "Lib/BaseType.h" #include "Common/GameType.h" #include "Common/SparseMatchFinder.h" @@ -93,5 +90,3 @@ class ArmorTemplateSet //------------------------------------------------------------------------------------------------- typedef std::vector ArmorTemplateSetVector; - -#endif // _ArmorSet_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h b/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h index cee7a59fa6..1a3637e75a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h +++ b/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h @@ -29,9 +29,6 @@ #pragma once -#ifndef CAVE_SYSTEM_H -#define CAVE_SYSTEM_H - class Object; class TunnelTracker; // The player owns one such object for his Tunnels, so instead of duplicating // so much code, this SubSystem will manage all of the Cave systems. @@ -73,4 +70,3 @@ class CaveSystem : public SubsystemInterface, }; extern CaveSystem *TheCaveSystem; -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h b/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h index 7fc199cae1..7e4e4da313 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h +++ b/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h @@ -29,9 +29,6 @@ #pragma once -#ifndef CRATE_SYSTEM_H -#define CRATE_SYSTEM_H - #include "Common/INI.h" #include "Common/Overridable.h" #include "Common/Override.h" @@ -113,4 +110,3 @@ class CrateSystem : public SubsystemInterface }; extern CrateSystem *TheCrateSystem; -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Damage.h b/Generals/Code/GameEngine/Include/GameLogic/Damage.h index 9d324e4247..452fde8ce2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Damage.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Damage.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DAMAGE_H_ -#define __DAMAGE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Snapshot.h" @@ -354,6 +351,3 @@ class DamageInfo : public Snapshot virtual void loadPostProcess( void ){ } }; - -#endif // __DAMAGE_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h b/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h index 58420b5931..d524772aac 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h @@ -29,9 +29,6 @@ #pragma once -#ifndef EXPERIENCE_TRACKER_H -#define EXPERIENCE_TRACKER_H - #include "Common/GameCommon.h" #include "Common/GameType.h" #include "Common/GameMemory.h" @@ -75,5 +72,3 @@ class ExperienceTracker : public MemoryPoolObject, public Snapshot ObjectID m_experienceSink; ///< ID of object I have pledged my experience point gains to Real m_experienceScalar; ///< Scales any experience gained by this multiplier. }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/FPUControl.h b/Generals/Code/GameEngine/Include/GameLogic/FPUControl.h index d4cc362196..8ea15e213f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/FPUControl.h +++ b/Generals/Code/GameEngine/Include/GameLogic/FPUControl.h @@ -29,14 +29,9 @@ #pragma once -#ifndef __FPUCONTROL_H__ -#define __FPUCONTROL_H__ - /** * setFPMode sets the FPU internal precision and rounding mode. As DirectX is not guaranteed to * leave the FPU in a good state, we must call this at the start of GameLogic::update() and * anywhere that touches DirectX inside GameLogic loops (LoadScreen). */ void setFPMode( void ); - -#endif // __FPUCONTROL_H__ diff --git a/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h b/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h index 4525c36dbc..46637984e5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h +++ b/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h @@ -29,9 +29,6 @@ #pragma once -#ifndef FIRING_TRACKER_H -#define FIRING_TRACKER_H - #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/AudioEventRTS.h" @@ -91,6 +88,3 @@ class FiringTracker : public UpdateModule UnsignedInt m_frameToStopLoopingSound; ///< if sound is looping, frame to stop looping it (or zero if not looping) AudioHandle m_audioHandle; }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h index 512e0ee5a1..c08589f493 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h +++ b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _GAME_LOGIC_H_ -#define _GAME_LOGIC_H_ - #include "Common/GameCommon.h" // ensure we get DUMP_PERF_STATS, or not #include "Common/GameType.h" #include "Common/Snapshot.h" @@ -425,6 +422,3 @@ inline Object* GameLogic::findObjectByID( ObjectID id ) // the singleton extern GameLogic *TheGameLogic; - -#endif // _GAME_LOGIC_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h b/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h index 1d36beb225..9335f8b0de 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h +++ b/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _GHOSTOBJECT_H_ -#define _GHOSTOBJECT_H_ - #include "Lib/BaseType.h" #include "Common/Snapshot.h" @@ -113,5 +110,3 @@ inline Bool GhostObjectManager::trackAllPlayers() const // the singleton extern GhostObjectManager *TheGhostObjectManager; - -#endif // _GHOSTOBJECT_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h b/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h index 2c10426ee2..5a97f704ae 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __Locomotor_H_ -#define __Locomotor_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" #include "Common/Override.h" @@ -495,6 +492,3 @@ class LocomotorStore : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern LocomotorStore *TheLocomotorStore; - -#endif // __Locomotor_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h b/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h index af118cdc7b..a450366de2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h +++ b/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __LocomotorSet_H_ -#define __LocomotorSet_H_ - // no, please do NOT include this. //#include "GameLogic/Locomotor.h" #include "Common/GameCommon.h" @@ -110,5 +107,3 @@ class LocomotorSet : public Snapshot inline Bool isDownhillOnly( void ) const { return m_downhillOnly; }; }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h index 6c176b0ebb..8994262dc8 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _AI_UPDATE_H_ -#define _AI_UPDATE_H_ - #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/AI.h" #include "GameLogic/AIStateMachine.h" @@ -787,6 +784,3 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface //------------------------------------------------------------------------------------------------------------ // Inlines // - -#endif // _AI_UPDATE_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h index 1566395ba2..354e593357 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __ACTIVEBODY_H_ -#define __ACTIVEBODY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DamageFX.h" #include "GameLogic/Module/BodyModule.h" @@ -152,6 +149,3 @@ class ActiveBody : public BodyModule mutable const DamageFX* m_curDamageFX; }; - -#endif // __ACTIVEBODY_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h index d0ce50b2e0..5592170002 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __ACTIVE_SHROUD_UPGRADE_H_ -#define __ACTIVE_SHROUD_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -75,6 +72,3 @@ class ActiveShroudUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; - -#endif // __ACTIVE_SHROUD_UPGRADE_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h index d521ed8fd7..35f8c146df 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __ARMOR_UPGRADE_H_ -#define __ARMOR_UPGRADE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -90,5 +87,3 @@ class ArmorUpgrade : public UpgradeModule //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __ARMOR_UPGRADE_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h index bdb8925ee3..9a7cba0a7d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __ASSAULT_TRANSPORT_AI_UPDATE_H -#define __ASSAULT_TRANSPORT_AI_UPDATE_H - #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" @@ -123,6 +120,3 @@ class AssaultTransportAIUpdate : public AIUpdateInterface, public AssaultTranspo Bool m_isAttackObject; Bool m_newOccupantsAreNewMembers; }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h index 258f66b9f2..532cc02aed 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _ASSISTED_TARGETING_UPDATE_H -#define _ASSISTED_TARGETING_UPDATE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -76,6 +73,3 @@ class AssistedTargetingUpdate : public UpdateModule private: void makeFeedbackLaser( const ThingTemplate *laserTemplate, const Object *from, const Object *to ); }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h index 283eef0ce2..b0df5fec9d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __AUTO_DEPOSIT_UPDATE_H_ -#define __AUTO_DEPOSIT_UPDATE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -131,5 +128,3 @@ class AutoDepositUpdate : public UpdateModule //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __AUTO_DEPOSIT_UPDATE_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h index 895393f8e7..5786e66863 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __AUTO_FIND_HEALING_UPDATE_H_ -#define __AUTO_FIND_HEALING_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" @@ -80,7 +77,3 @@ class AutoFindHealingUpdate : public UpdateModule protected: Int m_nextScanFrames; }; - - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h index 91116aec25..a1cfcafdb0 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h @@ -33,9 +33,6 @@ #pragma once -#ifndef __AutoHealBehavior_H_ -#define __AutoHealBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/BehaviorModule.h" @@ -177,6 +174,3 @@ class AutoHealBehavior : public UpdateModule, Bool m_stopped; }; - -#endif // __AutoHealBehavior_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h index bca99c27f5..813fbe822a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __BAIKONUR_LAUNCH_POWER_H_ -#define __BAIKONUR_LAUNCH_POWER_H_ - #include "GameLogic/Module/SpecialPowerModule.h" class Object; @@ -85,5 +82,3 @@ class BaikonurLaunchPower : public SpecialPowerModule protected: }; - -#endif // __BAIKONUR_LAUNCH_POWER_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h index 8277a8aa04..d481f0634d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BASE_REGENERATE_UPDATE_H_ -#define __BASE_REGENERATE_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/Module/DamageModule.h" @@ -81,5 +78,3 @@ class BaseRegenerateUpdate : public UpdateModule, private: }; - -#endif // end __BASE_REGENERATE_UPDATE_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h index 517c825aff..a746cd0b46 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BATTLE_PLAN_UPDATE_H_ -#define __BATTLE_PLAN_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/SpecialPowerUpdateModule.h" @@ -190,7 +187,3 @@ class BattlePlanUpdate : public UpdateModule, public SpecialPowerUpdateInterface ObjectID m_visionObjectID; }; - - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h index ed25d3636a..6feb21738a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BehaviorModule_H_ -#define __BehaviorModule_H_ - #include "Common/GameType.h" #include "Common/Module.h" @@ -263,5 +260,3 @@ class LandMineInterface }; //------------------------------------------------------------------------------------------------- - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h index 707b66b75e..f63a0e6525 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BODYMODULE_H_ -#define __BODYMODULE_H_ - #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/ArmorSet.h" @@ -293,5 +290,3 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface }; inline BodyModule::BodyModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ), m_damageScalar(1.0f) { } inline BodyModule::~BodyModule() { } - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h index 54f03833a8..b1959cb10f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BONEFXDAMAGE_H_ -#define __BONEFXDAMAGE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DamageModule.h" @@ -66,5 +63,3 @@ class BoneFXDamage : public DamageModule virtual void onObjectCreated(); }; - -#endif // end __BONEFXDAMAGE_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h index 333645cfdd..9f6ff668e7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BONEFXUPDATE_H_ -#define __BONEFXUPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/UpdateModule.h" @@ -277,5 +274,3 @@ class BoneFXUpdate : public UpdateModule Bool m_bonesResolved[BODYDAMAGETYPE_COUNT]; Bool m_active; }; - -#endif // end __BONEFXUPDATE_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h index 6f5731ec8a..cdb1919498 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BRIDGE_BEHAVIOR_H_ -#define __BRIDGE_BEHAVIOR_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameClient/TerrainRoads.h" @@ -197,5 +194,3 @@ class BridgeBehavior : public UpdateModule, UnsignedInt m_deathFrame; ///< frame we died on }; - -#endif // end __BRIDGE_DAMAGE_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h index f6916ffc48..0c725e5da4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BRIDGE_SCAFFOLD_BEHAVIOR_H_ -#define __BRIDGE_SCAFFOLD_BEHAVIOR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpdateModule.h" @@ -112,6 +109,3 @@ class BridgeScaffoldBehavior : public UpdateModule, Coord3D m_targetPos; ///< current target position for our motion type }; - - -#endif // end __BRIDGE_SCAFFOLD_BEHAVIOR_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h index 22a5e5012c..53f5b79bad 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BRIDGE_TOWER_BEHAVIOR_H_ -#define __BRIDGE_TOWER_BEHAVIOR_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DamageModule.h" @@ -95,5 +92,3 @@ class BridgeTowerBehavior : public BehaviorModule, BridgeTowerType m_type; ///< type of tower (positioning) we are }; - -#endif // end __BRIDGE_TOWER_DAMAGE_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h index 8cd1a557cc..553c99822e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h @@ -44,9 +44,6 @@ #pragma once -#ifndef __CashBountyPower_H_ -#define __CashBountyPower_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -127,5 +124,3 @@ class CashBountyPower : public SpecialPowerModule Real findBounty() const; }; - -#endif // __CashBountyPower_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h index b26b9b5820..de38921697 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __CASHHACKSPECIALPOWER_H_ -#define __CASHHACKSPECIALPOWER_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" @@ -85,6 +82,3 @@ class CashHackSpecialPower : public SpecialPowerModule Int findAmountToSteal() const; }; - -#endif // end __CASHHACKSPECIALPOWER_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h index 6be302af5b..a5ee0e8aca 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h @@ -31,9 +31,6 @@ #pragma once -#ifndef __CAVE_CONTAIN_H_ -#define __CAVE_CONTAIN_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" #include "GameLogic/Module/OpenContain.h" @@ -126,5 +123,3 @@ class CaveContain : public OpenContain, public CreateModuleInterface, public Cav Team *m_originalTeam; ///< our original team before we were garrisoned }; - -#endif // end __CAVE_CONTAIN_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h index 3ae892792f..08fc5d2dcf 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef CHECKPOINT_UPDATE_H -#define CHECKPOINT_UPDATE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" @@ -88,6 +85,3 @@ class CheckpointUpdate : public UpdateModule void checkForAlliesAndEnemies( void ); }; - -#endif // end CHECKPOINT_UPDATE_H - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h index 40682190d1..fc8102420d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _ChinookAIUpdate_H_ -#define _ChinookAIUpdate_H_ - #include "GameLogic/AIStateMachine.h" #include "GameLogic/Module/SupplyTruckAIUpdate.h" @@ -122,6 +119,3 @@ class ChinookAIUpdate : public SupplyTruckAIUpdate ObjectID m_airfieldForHealing; Bool m_hasPendingCommand; }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h index 67b9d59724..fbdc7f8977 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h @@ -43,9 +43,6 @@ #pragma once -#ifndef __CLEANUP_AREA_POWER_H_ -#define __CLEANUP_AREA_POWER_H_ - //----------------------------------------------------------------------------- #include "GameLogic/Module/SpecialPowerModule.h" @@ -75,5 +72,3 @@ class CleanupAreaPower : public SpecialPowerModule virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ); }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h index 68cf5f1067..a9d12e58ee 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __CLEANUP_HAZARD_UPDATE_H_ -#define __CLEANUP_HAZARD_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" @@ -91,7 +88,3 @@ class CleanupHazardUpdate : public UpdateModule Coord3D m_pos; Real m_moveRange; }; - - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h index 3f45b62909..2f1dde3040 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __CollideModule_H_ -#define __CollideModule_H_ - #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" @@ -100,5 +97,3 @@ class CollideModule : public BehaviorModule, inline CollideModule::CollideModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { } inline CollideModule::~CollideModule() { } //------------------------------------------------------------------------------------------------- - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h index 51e0771ed6..95efb7be17 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __COMMAND_BUTTON_HUNT_UPDATE_H_ -#define __COMMAND_BUTTON_HUNT_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" @@ -85,7 +82,3 @@ class CommandButtonHuntUpdate : public UpdateModule AsciiString m_commandButtonName; const CommandButton *m_commandButton; }; - - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h index 1e9e646fe6..271d87744c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _COMMAND_SET_UPGRADE_H -#define _COMMAND_SET_UPGRADE_H - #include "GameLogic/Module/UpgradeModule.h" //----------------------------------------------------------------------------- @@ -65,6 +62,3 @@ class CommandSetUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; -#endif // _COMMAND_SET_UPGRADE_H - - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h index 728b9b2f97..a07b9a856b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __ContainModule_H_ -#define __ContainModule_H_ - #include "Common/Module.h" //------------------------------------------------------------------------------------------------- @@ -183,5 +180,3 @@ class ContainModuleInterface } }; //------------------------------------------------------------------------------------------------- - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h index 998ac8a821..a9cee09e8c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h @@ -30,9 +30,6 @@ #pragma once -#ifndef CONVERT_TO_CAR_BOMB_CRATE_COLLIDE_H_ -#define CONVERT_TO_CAR_BOMB_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -89,5 +86,3 @@ class ConvertToCarBombCrateCollide : public CrateCollide virtual Bool isRailroad() const { return FALSE;}; virtual Bool isCarBombCrateCollide() const { return TRUE; } }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h index 0f2aac6e38..653737df53 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h @@ -33,9 +33,6 @@ #pragma once -#ifndef CONVERT_TO_HIJACKED_VEHICLE_CRATE_COLLIDE_H_ -#define CONVERT_TO_HIJACKED_VEHICLE_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -83,5 +80,3 @@ class ConvertToHijackedVehicleCrateCollide : public CrateCollide virtual Bool isHijackedVehicleCrateCollide() const { return TRUE; } }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h index 54f316d979..594ead4b3a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __COST_MODIFIER_UPGRADE_H_ -#define __COST_MODIFIER_UPGRADE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -115,5 +112,3 @@ class CostModifierUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; - -#endif // __COST_MODIFIER_UPGRADE_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h index 52a38d3de7..d560519cd0 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h @@ -29,9 +29,6 @@ #pragma once -#ifndef CRATE_COLLIDE_H_ -#define CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" @@ -93,5 +90,3 @@ class CrateCollide : public CollideModule virtual Bool isValidToExecute( const Object *other ) const; }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h index 83b611623d..90dccafc31 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _CREATE_CRATE_DIE_H_ -#define _CREATE_CRATE_DIE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" @@ -96,5 +93,3 @@ class CreateCrateDie : public DieModule Object *createCrate( CrateTemplate const *currentCrateData ); }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h index 77f0420f16..698b9f7232 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __CreateModule_H_ -#define __CreateModule_H_ - #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" @@ -85,5 +82,3 @@ class CreateModule : public BehaviorModule, public CreateModuleInterface Bool m_needToRunOnBuildComplete; ///< Prevent the multiple calling of onBuildComplete }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h index ff3ca65133..e8b61f9d90 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _CREATE_OBJECT_DIE_H_ -#define _CREATE_OBJECT_DIE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" @@ -71,6 +68,3 @@ class CreateObjectDie : public DieModule virtual void onDie( const DamageInfo *damageInfo ); }; - -#endif // _CREATE_OBJECT_DIE_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h index 45cb3d877a..4c81de8af1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __CrushDie_H_ -#define __CrushDie_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" @@ -101,6 +98,3 @@ class CrushDie : public DieModule virtual void onDie( const DamageInfo *damageInfo ); }; - -#endif // __CrushDie_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h index c3a766c8d4..6be4b92796 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DAMDIE_H_ -#define __DAMDIE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" @@ -64,5 +61,3 @@ class DamDie : public DieModule virtual void onDie( const DamageInfo *damageInfo ); }; - -#endif // end __DAMDIE_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h index 450dda3ea3..2487b2f3d2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DamageModule_H_ -#define __DamageModule_H_ - #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/Module/BehaviorModule.h" @@ -113,5 +110,3 @@ class DamageModule : public BehaviorModule, public DamageModuleInterface inline DamageModule::DamageModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { } inline DamageModule::~DamageModule() { } //------------------------------------------------------------------------------------------------- - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h index 743e150491..414402c641 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h @@ -30,9 +30,6 @@ #pragma once -#ifndef _DEFAULT_PRODUCTION_EXIT_UPDATE_H -#define _DEFAULT_PRODUCTION_EXIT_UPDATE_H - #include "GameLogic/Module/UpdateModule.h" #include "Common/INI.h" #include "Lib/BaseType.h" @@ -114,5 +111,3 @@ inline const Coord3D *DefaultProductionExitUpdate::getRallyPoint( void ) const return NULL; } - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h index 20f3a4b4c0..953ac68945 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h @@ -32,9 +32,6 @@ #pragma once -#ifndef __DEFECTORSPECIALPOWER_H_ -#define __DEFECTORSPECIALPOWER_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" @@ -81,5 +78,3 @@ class DefectorSpecialPower : public SpecialPowerModule protected: }; -#endif // end DefectorSpecialPower - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h index 84e85eefa1..d5d3f63eb7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __DELAYED_UPGRADE_H_ -#define __DELAYED_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -82,7 +79,3 @@ class DelayedUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; - - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h index 1317976ba9..5e0811dc40 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DELAYED_WEAPON_SET_UPGRADE_UPDATE_H_ -#define __DELAYED_WEAPON_SET_UPGRADE_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -69,5 +66,3 @@ class DelayedWeaponSetUpgradeUpdate : public UpdateModule, public DelayedUpgrade protected: }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h index dbd40b3d5d..fcb180e8f9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DELETION_UPDATE_H_ -#define __DELETION_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -86,6 +83,3 @@ class DeletionUpdate : public UpdateModule UnsignedInt m_dieFrame; ///< frame we die on }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h index 46a77a34d4..f82fd57a74 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _DELIVER_PAYLOAD_AI_UPDATE_H_ -#define _DELIVER_PAYLOAD_AI_UPDATE_H_ - #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" #include "GameClient/RadiusDecal.h" @@ -381,6 +378,3 @@ class DeliverPayloadAIUpdate : public AIUpdateInterface }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h index 69c4d2f668..ecb65aef27 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DEMO_TRAP_UPDATE_H_ -#define __DEMO_TRAP_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" @@ -86,7 +83,3 @@ class DemoTrapUpdate : public UpdateModule Int m_nextScanFrames; Bool m_detonated; }; - - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h index eaec166a87..2c0a9ebfb5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DEMORALIZE_SPECIAL_POWER_H_ -#define __DEMORALIZE_SPECIAL_POWER_H_ - #ifdef ALLOW_DEMORALIZE // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// @@ -82,6 +79,3 @@ class DemoralizeSpecialPower : public SpecialPowerModule }; #endif // ALLOW_DEMORALIZE - - -#endif // end __DEMORALIZE_SPECIAL_POWER_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h index 4953f8c9c6..19223d5057 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DEPLOY_STYLE_AI_UPDATE_H -#define __DEPLOY_STYLE_AI_UPDATE_H - #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" @@ -125,6 +122,3 @@ class DeployStyleAIUpdate : public AIUpdateInterface Bool m_isGuardingPosition; Bool m_overriddenAttack; }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h index c734e9fa37..f2b8cce909 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DestroyDie_H_ -#define __DestroyDie_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "Common/INI.h" @@ -53,6 +50,3 @@ class DestroyDie : public DieModule virtual void onDie( const DamageInfo *damageInfo ); }; - -#endif // __DestroyDie_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h index 898fd69848..569b2bf541 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DestroyModule_H_ -#define __DestroyModule_H_ - #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" @@ -66,5 +63,3 @@ class DestroyModule : public BehaviorModule, public DestroyModuleInterface protected: }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h index 86c513cc56..ac770552fe 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DieModule_H_ -#define __DieModule_H_ - #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/Module/BehaviorModule.h" @@ -108,5 +105,3 @@ class DieModule : public BehaviorModule, public DieModuleInterface }; inline DieModule::DieModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { } inline DieModule::~DieModule() { } - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h index 2fca5ae1cd..a6add30d44 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _DOCK_UPDATE_H_ -#define _DOCK_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" @@ -156,5 +153,3 @@ class DockUpdate : public UpdateModule , public DockUpdateInterface void loadDockPositions(); ///< load all the dock positions Coord3D computeApproachPosition( Int positionIndex, Object *forWhom ); ///< Do a smart lookup of this bone position }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h index 31a33564dd..1488eecb0d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DOZERAIUPDATE_H_ -#define __DOZERAIUPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/AIUpdate.h" @@ -305,7 +302,3 @@ class DozerAIUpdate : public AIUpdateInterface, public DozerAIInterface void createMachines( void ); ///< create our behavior machines we need }; - - -#endif // __DOZERAIUPDATE_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h index 1442b35891..5c565545a7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _DumbProjectileBehavior_H_ -#define _DumbProjectileBehavior_H_ - #include "Common/GameType.h" #include "Common/GlobalData.h" #include "Common/STLTypedefs.h" @@ -121,6 +118,3 @@ class DumbProjectileBehavior : public UpdateModule, public ProjectileUpdateInter #endif }; - -#endif // _DumbProjectileBehavior_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h index 68d5b93659..eaf2eef4d5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DYNAMIC_GEOMETRY_INFO_UPDATE_H_ -#define __DYNAMIC_GEOMETRY_INFO_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Geometry.h" #include "GameLogic/Module/UpdateModule.h" @@ -102,7 +99,3 @@ class DynamicGeometryInfoUpdate : public UpdateModule Real m_finalMinorRadius; }; - - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h index 959c7700c3..aeb8eb9d75 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DYNAMIC_SHROUD_RANGE_UPDATE_H_ -#define __DYNAMIC_SHROUD_RANGE_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameClient/RadiusDecal.h"///< For the pseudo-wireframe decal effect @@ -129,6 +126,3 @@ class DynamicShroudClearingRangeUpdate : public UpdateModule RadiusDecal m_gridDecal[GRID_FX_DECAL_COUNT];///< For the pseudo-wireframe decal effect }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h index 0b62ad0301..2472decda5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __EMPUPDATE_H_ -#define __EMPUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -123,6 +120,3 @@ class EMPUpdate : public UpdateModule }; - -#endif // __EMPUPDATE_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h index eb9c538a18..0cadd3fbba 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _EjectPilotDie_H_ -#define _EjectPilotDie_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "Common/INI.h" @@ -72,6 +69,3 @@ class EjectPilotDie : public DieModule virtual DieModuleInterface* getEjectPilotDieInterface( void ) {return this; } }; - -#endif // _EjectPilotDie_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h index 943ddd387b..4d39ec7875 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __EnemyNearUpdate_H_ -#define __EnemyNearUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" @@ -84,6 +81,3 @@ class EnemyNearUpdate : public UpdateModule void checkForEnemies( void ); }; - -#endif // end __EnemyNearUpdate_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h index f25cf0745d..6456872aaa 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __EXPERIENCE_SCALAR_UPGRADE_H_ -#define __EXPERIENCE_SCALAR_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -72,7 +69,3 @@ class ExperienceScalarUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; - - -#endif // __DEFAULTDIE_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h index 5df435992a..6e3da93801 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FXListDie_H_ -#define __FXListDie_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" @@ -84,7 +81,3 @@ class FXListDie : public DieModule virtual void onDie( const DamageInfo *damageInfo ); }; - - -#endif // __FXListDie_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h index 62c8be440f..90a7187987 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __FIRE_OCL_AFTER_WEAPON_COOLDOWN_UPDATE_H -#define __FIRE_OCL_AFTER_WEAPON_COOLDOWN_UPDATE_H - class UpgradeMuxData; #include "GameLogic/Module/UpdateModule.h" @@ -101,6 +98,3 @@ class FireOCLAfterWeaponCooldownUpdate : public UpdateModule, public UpgradeMux UnsignedInt m_startFrame; }; - -#endif // __FIRE_OCL_AFTER_WEAPON_COOLDOWN_UPDATE_H - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h index 9ddfdc5475..3f2c921286 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FIRE_SPREAD_UPDATE_H_ -#define __FIRE_SPREAD_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -76,6 +73,3 @@ class FireSpreadUpdate : public UpdateModule UnsignedInt calcNextSpreadDelay(); }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h index 8b171f4cf0..0ec32bde61 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FireWeaponCollide_H_ -#define __FireWeaponCollide_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" #include "GameLogic/Weapon.h" @@ -80,7 +77,3 @@ class FireWeaponCollide : public CollideModule Bool m_everFired; }; - - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h index 12da6020c5..123e2c2e90 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FIRE_WEAPON_UPDATE_H_ -#define __FIRE_WEAPON_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/Weapon.h" @@ -71,6 +68,3 @@ class FireWeaponUpdate : public UpdateModule Weapon* m_weapon; }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h index c4727d7232..77003163c1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FireWeaponWhenDamagedBehavior_H_ -#define __FireWeaponWhenDamagedBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpgradeModule.h" @@ -167,6 +164,3 @@ class FireWeaponWhenDamagedBehavior : public UpdateModule, Weapon *m_continuousWeaponRubble; }; - -#endif // __FireWeaponWhenDamagedBehavior_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h index 32d151c01d..60772c23e3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FireWeaponWhenDeadBehavior_H_ -#define __FireWeaponWhenDeadBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" @@ -121,6 +118,3 @@ class FireWeaponWhenDeadBehavior : public BehaviorModule, virtual Bool isSubObjectsUpgrade() { return false; } }; - -#endif // __FireWeaponWhenDeadBehavior_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h index fc8d3ea0ec..2e368c1950 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FIRESTORM_DYNAMIC_GEOMETRY_INFO_UPDATE_H_ -#define __FIRESTORM_DYNAMIC_GEOMETRY_INFO_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Geometry.h" #include "GameLogic/Module/DynamicGeometryInfoUpdate.h" @@ -84,7 +81,3 @@ class FirestormDynamicGeometryInfoUpdate : public DynamicGeometryInfoUpdate Bool m_scorchPlaced; ///< TRUE once we have placed the scorch mark UnsignedInt m_lastDamageFrame; ///< frame we last did damage on }; - - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h index e1799e99d6..33ee283915 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FLAMMABLE_UPDATE_H_ -#define __FLAMMABLE_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameLogic/Module/DamageModule.h" @@ -114,6 +111,3 @@ class FlammableUpdate : public UpdateModule, public DamageModuleInterface ObjectID m_flameSource; UnsignedInt m_lastFlameDamageDealt; }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h index cea36b9053..0c174ee602 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FLOATUPDATE_H_ -#define __FLOATUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -74,5 +71,3 @@ class FloatUpdate : public UpdateModule Bool m_enabled; ///< enabled }; - -#endif // end __FLOATUPDATE_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h index e5fadba33c..b2c9a74d98 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GARRISONCONTAIN_H_ -#define __GARRISONCONTAIN_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" #include "Common/ModelState.h" @@ -211,6 +208,3 @@ class GarrisonContain : public OpenContain Bool m_rallyValid; ///< TRUE when m_exitRallyPoint is valid }; - -#endif // __GARRISONCONTAIN_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h index 56407dc0d3..91b1d68177 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GenerateMinefieldBehavior_H_ -#define __GenerateMinefieldBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" @@ -122,6 +119,3 @@ class GenerateMinefieldBehavior : public BehaviorModule, void placeMinesAroundRect(const Coord3D& pos, Real majorRadius, Real minorRadius, const ThingTemplate* mineTemplate); Object* placeMineAt(const Coord3D& pt, const ThingTemplate* mineTemplate, Team* team, const Object* producer); }; - -#endif // __GenerateMinefieldBehavior_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h index 0c6ab86a8e..c6731172ed 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GRANTUPGRADECREATE_H_ -#define __GRANTUPGRADECREATE_H_ - #define DEFINE_OBJECT_STATUS_NAMES // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// @@ -77,6 +74,3 @@ class GrantUpgradeCreate : public CreateModule protected: }; - -#endif // __GRANTUPGRADECREATE_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h index c9016e0ed6..7c161b47fa 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __HACK_INTERNET_AI_UPDATE_H -#define __HACK_INTERNET_AI_UPDATE_H - #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" @@ -225,6 +222,3 @@ class HackInternetAIUpdate : public AIUpdateInterface, public HackInternetAIInte AICommandParmsStorage m_pendingCommand; Bool m_hasPendingCommand; }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h index 43f74a841b..def1c32bdf 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __HEALCONTAIN_H_ -#define __HEALCONTAIN_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" @@ -73,5 +70,3 @@ class HealContain : public OpenContain Bool doHeal( Object *obj, UnsignedInt framesForFullHeal ); ///< do the heal on an object }; - -#endif // end __HEALCONTAIN_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h index 500eb1f471..8768958c1a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h @@ -29,9 +29,6 @@ #pragma once -#ifndef HEAL_CRATE_COLLIDE_H_ -#define HEAL_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -56,5 +53,3 @@ class HealCrateCollide : public CrateCollide /// This is the game logic execution function that all real CrateCollides will implement virtual Bool executeCrateBehavior( Object *other ); }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h index cd6b494c07..85892be371 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __HEIGHTDIEUPDATE_H_ -#define __HEIGHTDIEUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -79,5 +76,3 @@ class HeightDieUpdate : public UpdateModule UnsignedInt m_earliestDeathFrame; ///< Earliest we are allowed to think about dying }; - -#endif // end __HEIGHTDIEUPDATE_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h index c9c47d718e..2fe350c6b6 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __HelicopterSlowDeathBehavior_H_ -#define __HelicopterSlowDeathBehavior_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameLogic/Module/SlowDeathBehavior.h" @@ -113,5 +110,3 @@ class HelicopterSlowDeathBehavior : public SlowDeathBehavior AudioEventRTS m_deathSound; ///< Sound played during death sequence. }; - -#endif // end __HelicopterSlowDeathBehavior_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h index 54e7d1e44e..bb721a431e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __HIGHLANDER_BODY_H -#define __HIGHLANDER_BODY_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" @@ -57,6 +54,3 @@ class HighlanderBody : public ActiveBody protected: }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h index 582293c3ec..374e0e3c42 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h @@ -34,9 +34,6 @@ #pragma once -#ifndef __HIJACKER_UPDATE_H -#define __HIJACKER_UPDATE_H - #include "GameLogic/Module/UpdateModule.h" //------------------------------------------------------------------------------------------------- @@ -92,6 +89,3 @@ class HijackerUpdate : public UpdateModule // of target vehicle if it has one }; - -#endif // __HIJACKER_UPDATE_H - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h index 180af4eeea..2c73c868f0 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h @@ -31,9 +31,6 @@ #pragma once -#ifndef __HIVE_STRUCTURE_BODY_H -#define __HIVE_STRUCTURE_BODY_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/StructureBody.h" #include "GameLogic/Damage.h" @@ -81,6 +78,3 @@ class HiveStructureBody : public StructureBody virtual void attemptDamage( DamageInfo *damageInfo ); ///< try to damage this object }; - -#endif // __HIVE_STRUCTURE_BODY_H - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h index a1979e0f41..69556de729 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __HordeUpdate_H_ -#define __HordeUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" @@ -122,6 +119,3 @@ class HordeUpdate : public UpdateModule, public HordeUpdateInterface Bool m_hasFlag; }; - -#endif // __HordeUpdate_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h index 0179b29a1d..c430234a5d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __IMMORTAL_BODY_H -#define __IMMORTAL_BODY_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" @@ -57,6 +54,3 @@ class ImmortalBody : public ActiveBody protected: }; - -#endif // __STRUCTUREBODY_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h index 6b8cb43a0c..bc1708bbf3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __INACTIVEBODY_H_ -#define __INACTIVEBODY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BodyModule.h" @@ -68,6 +65,3 @@ class InactiveBody : public BodyModule private: Bool m_dieCalled; }; - -#endif // __INACTIVEBODY_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h index e82b2f547e..1eb543cc56 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __InstantDeathBehavior_H_ -#define __InstantDeathBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" @@ -76,6 +73,3 @@ class InstantDeathBehavior : public DieModule virtual void onDie( const DamageInfo *damageInfo ); }; - -#endif // __InstantDeathBehavior_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h index 2d62ab1d59..c1b5facba1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _JET_AI_UPDATE_H_ -#define _JET_AI_UPDATE_H_ - #include "Common/STLTypedefs.h" #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" @@ -170,6 +167,3 @@ class JetAIUpdate : public AIUpdateInterface inline Bool getFlag(FlagType f) const { return (m_flags & (1<::const_iterator m_templateNameIterator; }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h index 7513d45a4d..0b1943bb8b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h @@ -30,9 +30,6 @@ #pragma once -#ifndef _SPAWN_POINT_PRODUCTION_EXIT_UPDATE_H -#define _SPAWN_POINT_PRODUCTION_EXIT_UPDATE_H - #include "GameLogic/Module/UpdateModule.h" #include "Common/INI.h" #include "Lib/BaseType.h" @@ -100,5 +97,3 @@ class SpawnPointProductionExitUpdate : public UpdateModule, public ExitInterface void initializeBonePositions(); ///< Look up the bone positions and store them in world space coords void revalidateOccupiers(); ///< Do a lookup on all our ID's and clear the dead ones. }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h index 7adfaa9d7e..0696e6e113 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __SPECIAL_ABILITY_H_ -#define __SPECIAL_ABILITY_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" @@ -65,5 +62,3 @@ class SpecialAbility : public SpecialPowerModule protected: }; - -#endif // end __SPECIAL_ABILITY_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h index ad65047822..d7eca3b994 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SPECIAL_ABILITY_UPDATE_H -#define __SPECIAL_ABILITY_UPDATE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" @@ -274,5 +271,3 @@ class SpecialAbilityUpdate : public UpdateModule, public SpecialPowerUpdateInter Bool m_withinStartAbilityRange; Bool m_doDisableFXParticles; // smaller targets cause this flag to toggle, making the particle effect more sparse }; - -#endif // _SPECIAL_POWER_UPDATE_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h index 74fb7bd83b..7d332abe48 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _SPECIAL_POWER_COMPLETION_DIE_H_ -#define _SPECIAL_POWER_COMPLETION_DIE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" @@ -89,6 +86,4 @@ class SpecialPowerCompletionDie : public DieModule }; -#endif // _SPECIAL_POWER_COMPLETION_DIE_H_ - // Creator is stored as ID, so a failed lookup just means that he died first and noone cares that we are going. diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h index 59ebde1636..7d6d705f88 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _SPECIAL_POWER_CREATE_H_ -#define _SPECIAL_POWER_CREATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" @@ -57,5 +54,3 @@ class SpecialPowerCreate : public CreateModule protected: }; - -#endif // _SPECIAL_POWER_CREATE_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h index 4ba9b4920e..00b87fac76 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SPECIALPOWERMODULE_H_ -#define __SPECIALPOWERMODULE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/Module.h" @@ -169,6 +166,3 @@ class SpecialPowerModule : public BehaviorModule, Real m_pausedPercent; }; - -#endif // end __SPECIALPOWERMODULE_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h index adc89c1f8a..41f95ad25d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SPECIAL_POWER_UPDATE_MODULE_H -#define __SPECIAL_POWER_UPDATE_MODULE_H - #include "Common/Module.h" #include "Common/GameType.h" @@ -49,5 +46,3 @@ class SpecialPowerUpdateInterface virtual void setSpecialPowerOverridableDestination( const Coord3D *loc ) = 0; virtual Bool isPowerCurrentlyInUse( const CommandButton *command = NULL ) const = 0; }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h index 8c7b9e3311..09afaa6281 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SPY_VISION_SPECIAL_POWER_H_ -#define __SPY_VISION_SPECIAL_POWER_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" @@ -73,5 +70,3 @@ class SpyVisionSpecialPower : public SpecialPowerModule protected: }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h index 22390e03b2..8f294cd529 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h @@ -31,9 +31,6 @@ #pragma once -#ifndef _SPY_VISION_UPDATE_H -#define _SPY_VISION_UPDATE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -73,6 +70,3 @@ class SpyVisionUpdate : public UpdateModule UnsignedInt m_deactivateFrame; }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h index 1bd3fd6f45..b8ea501847 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SquishCollide_H_ -#define __SquishCollide_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" @@ -58,6 +55,3 @@ class SquishCollide : public CollideModule protected: }; - -#endif // __SquishCollide_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h index 4f74e5b7b9..6e572c40c3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __StatusBitsUpgrade_H_ -#define __StatusBitsUpgrade_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -106,7 +103,3 @@ class StatusBitsUpgrade : public UpgradeModule //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __StatusBitsUpgrade_H_ - - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h index f17e759696..3790710fc4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __STEALTHDETECTOR_UPDATE_H_ -#define __STEALTHDETECTOR_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -97,7 +94,3 @@ class StealthDetectorUpdate : public UpdateModule Bool m_enabled; }; - - -#endif // __STEALTHDETECTOR_UPDATE_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h index 0d970c75a0..87cf4908b3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __STEALTH_UPDATE_H_ -#define __STEALTH_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -171,7 +168,3 @@ class StealthUpdate : public UpdateModule Bool m_xferRestoreDisguise; //Tells us we need to restore our disguise }; - - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h index 58c646b043..d6a860c17c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __STEALTH_UPGRADE_H_ -#define __STEALTH_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -57,7 +54,3 @@ class StealthUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; - - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h index 14f6996d68..a9f089efa3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __STICK_BOMB_UPDATE_H -#define __STICK_BOMB_UPDATE_H - #include "GameLogic/Module/UpdateModule.h" //------------------------------------------------------------------------------------------------- @@ -89,6 +86,3 @@ class StickyBombUpdate : public UpdateModule UnsignedInt m_dieFrame; UnsignedInt m_nextPingFrame; }; - -#endif // __STICK_BOMB_UPDATE_H - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureBody.h index 7d72bb88a8..33f8ff3b78 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureBody.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __STRUCTUREBODY_H_ -#define __STRUCTUREBODY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" @@ -79,6 +76,3 @@ class StructureBody : public ActiveBody ObjectID m_constructorObjectID; ///< object that built this structure }; - -#endif // __STRUCTUREBODY_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h index 8082a44728..3c21400835 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __StructureCollapseUpdate_H_ -#define __StructureCollapseUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" @@ -149,6 +146,3 @@ class StructureCollapseUpdate : public UpdateModule, Real m_currentHeight; }; - -#endif // __StructureCollapseUpdate_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h index cea5ad278b..f4e6379dc1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __StructureToppleUpdate_H_ -#define __StructureToppleUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpdateModule.h" @@ -196,6 +193,3 @@ class StructureToppleUpdate : public UpdateModule, Real m_buildingHeight; }; - -#endif // __StructureToppleUpdate_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h index ba13e3d7ab..dfc24b45e1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __SUB_OBJECTS_UPGRADE_H -#define __SUB_OBJECTS_UPGRADE_H - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -88,7 +85,3 @@ class SubObjectsUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return true; } }; - -#endif - - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h index e756aed35d..8f18f034c1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _SUPPLY_CENTER_CREATE_H_ -#define _SUPPLY_CENTER_CREATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" @@ -57,5 +54,3 @@ class SupplyCenterCreate : public CreateModule protected: }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h index 7eb03dc65d..fea5c20041 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _SUPPLY_CENTER_DOCK_UPDATE_H_ -#define _SUPPLY_CENTER_DOCK_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" @@ -70,5 +67,3 @@ class SupplyCenterDockUpdate : public DockUpdate }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h index 613ce0bde8..ba9d02f11f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h @@ -30,9 +30,6 @@ #pragma once -#ifndef _SUPPLY_CENTER_PRODUCTION_EXIT_UPDATE_H -#define _SUPPLY_CENTER_PRODUCTION_EXIT_UPDATE_H - #include "GameLogic/Module/UpdateModule.h" class Object; @@ -112,6 +109,3 @@ inline const Coord3D *SupplyCenterProductionExitUpdate::getRallyPoint( void ) co return NULL; } - - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h index e8cd82142c..6bb66bb753 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _SUPPLY_TRUCK_AI_UPDATE_H_ -#define _SUPPLY_TRUCK_AI_UPDATE_H_ - #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" @@ -235,5 +232,3 @@ class SupplyTruckAIUpdate : public AIUpdateInterface, public SupplyTruckAIInterf AudioEventRTS m_suppliesDepletedVoice; ///< Sound played when I take the last box. }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h index 18668ae3f2..382a01be5a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _SUPPLY_WAREHOUSE_CREATE_H_ -#define _SUPPLY_WAREHOUSE_CREATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" @@ -56,6 +53,3 @@ class SupplyWarehouseCreate : public CreateModule protected: }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h index 9b056de759..18b6e9440b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _SUPPLY_WAREHOUSE_CRIPPLING_BEHAVIOR_H -#define _SUPPLY_WAREHOUSE_CRIPPLING_BEHAVIOR_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DamageModule.h" @@ -90,6 +87,3 @@ class SupplyWarehouseCripplingBehavior : public UpdateModule, UnsignedInt m_healingSupressedUntilFrame; UnsignedInt m_nextHealingFrame; }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h index 25c1461050..b91526d912 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _SUPPLY_WAREHOUSE_DOCK_UPDATE_H_ -#define _SUPPLY_WAREHOUSE_DOCK_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" @@ -78,5 +75,3 @@ class SupplyWarehouseDockUpdate : public DockUpdate Int m_boxesStored; }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h index b9eece4b9f..11354d2e81 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __TECH_BUILDING_BEHAVIOR_H_ -#define __TECH_BUILDING_BEHAVIOR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "GameLogic/Module/UpdateModule.h" @@ -80,5 +77,3 @@ class TechBuildingBehavior : public UpdateModule, protected: }; - -#endif // end __TECH_BUILDING_BEHAVIOR_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h index 929c2d7d40..6513153d78 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __TENSILEFORMATIONUPDATE_H_ -#define __TENSILEFORMATIONUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -90,5 +87,3 @@ class TensileFormationUpdate : public UpdateModule AudioEventRTS m_crackSound; }; - -#endif // end __TENSILEFORMATIONUPDATE_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h index 9dd967edf7..f2e029c3ef 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __TOPPLEUPDATE_H_ -#define __TOPPLEUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/CollideModule.h" @@ -127,6 +124,3 @@ class ToppleUpdate : public UpdateModule, ObjectID m_stumpID; ///< stump generated, if any }; - -#endif // end __TOPPLEUPDATE_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h index 3dd27ce220..6bdd3318c0 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __TRANSITIONDAMAGEFX_H_ -#define __TRANSITIONDAMAGEFX_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/DamageModule.h" @@ -263,5 +260,3 @@ class TransitionDamageFX : public DamageModule ParticleSystemID m_particleSystemID[ BODYDAMAGETYPE_COUNT ][ DAMAGE_MODULE_MAX_FX ]; }; - -#endif // end __TRANSITIONDAMAGEFX diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h index bd9ab4007c..6ef47631dc 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _TRANSPORT_AI_UPDATE_H_ -#define _TRANSPORT_AI_UPDATE_H_ - #include "GameLogic/Module/AIUpdate.h" //------------------------------------------------------------------------------------------------- @@ -65,6 +62,3 @@ class TransportAIUpdate : public AIUpdateInterface virtual void privateAttackPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource );///< Extension. Also tell occupants to attackPosition virtual void privateForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource );///< Extension. Also tell occupants to forceAttackObject }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TransportContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TransportContain.h index e580cf009c..1c0bf81914 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TransportContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TransportContain.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __TransportContain_H_ -#define __TransportContain_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" @@ -108,6 +105,3 @@ class TransportContain : public OpenContain UnsignedInt m_frameExitNotBusy; }; - -#endif // __TransportContain_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h index 3a89b8dc21..e164131f88 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __TUNNEL_CONTAIN_H_ -#define __TUNNEL_CONTAIN_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" #include "GameLogic/Module/HealContain.h" @@ -132,5 +129,3 @@ class TunnelContain : public OpenContain, public CreateModuleInterface Bool m_isCurrentlyRegistered; ///< Keeps track if this is registered with the player, so we don't double remove and mess up }; - -#endif // end __TUNNEL_CONTAIN_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h index fad2f097a8..b1ad7f5895 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h @@ -29,9 +29,6 @@ #pragma once -#ifndef UNIT_CRATE_COLLIDE_H_ -#define UNIT_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -84,5 +81,3 @@ class UnitCrateCollide : public CrateCollide protected: }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h index 8cfaf86cb7..f277ccaec5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h @@ -31,9 +31,6 @@ #pragma once -#ifndef __UNPAUSE_SPECIAL_POWER_UPGRADE_H_ -#define __UNPAUSE_SPECIAL_POWER_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -75,6 +72,3 @@ class UnpauseSpecialPowerUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h index 881049d0c7..f5e7c462ea 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __UpdateModule_H_ -#define __UpdateModule_H_ - #include "Common/Module.h" #include "Common/GameType.h" #include "Common/DisabledTypes.h" @@ -372,5 +369,3 @@ class DelayedUpgradeUpdateInterface virtual Bool isTriggeredBy( UpgradeMaskType potentialMask ) = 0; ///< If you were an upgrade, would you trigger for this? virtual void setDelay( UnsignedInt startingDelay ) = 0; ///< Start the upgrade doing countdown }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h index a9051a1641..e8781d3162 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __UPGRADEDIE_H -#define __UPGRADEDIE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" @@ -78,6 +75,3 @@ class UpgradeDie : public DieModule virtual void onDie( const DamageInfo *damageInfo ); }; - -#endif // __UPGRADEDIE_H - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h index 7c941701fc..6cce9a1fda 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __UPGRADE_MODULE_H_ -#define __UPGRADE_MODULE_H_ - #include "Common/Module.h" #include "Common/STLTypedefs.h" #include "Common/Upgrade.h" @@ -199,6 +196,3 @@ class UpgradeModule : public BehaviorModule, public UpgradeMux }; inline UpgradeModule::UpgradeModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { } inline UpgradeModule::~UpgradeModule() { } - - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h index 31d68842d9..a07a65287a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h @@ -29,9 +29,6 @@ #pragma once -#ifndef VETERANCY_CRATE_COLLIDE_H_ -#define VETERANCY_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -93,5 +90,3 @@ class VeterancyCrateCollide : public CrateCollide Int getLevelsToGain() const; }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h index fa91ff248b..fbf0129636 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __VETERANCY_GAIN_CREATE_H_ -#define __VETERANCY_GAIN_CREATE_H_ - #define DEFINE_VETERANCY_NAMES // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameCommon.h" @@ -70,6 +67,3 @@ class VeterancyGainCreate : public CreateModule protected: }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h index 67d0ce049f..3b94033618 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _WANDER_AI_UPDATE_H_ -#define _WANDER_AI_UPDATE_H_ - #include "GameLogic/Module/AIUpdate.h" //------------------------------------------------------------------------------------------------- @@ -63,6 +60,3 @@ class WanderAIUpdate : public AIUpdateInterface virtual AIStateMachine* makeStateMachine(); }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h index f0e0fab214..16dbd2577f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __WATERWAVE_H_ -#define __WATERWAVE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -111,5 +108,3 @@ class WaveGuideUpdate : public UpdateModule Coord3D m_finalDestination; ///< the final destination of the waveguide path }; - -#endif // end __WATERWAVE_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h index caefb0a3e6..79c1f42c7a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __WEAPON_BONUS_UPGRADE_H_ -#define __WEAPON_BONUS_UPGRADE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -90,7 +87,3 @@ class WeaponBonusUpgrade : public UpgradeModule //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __WEAPON_BONUS_UPGRADE_H_ - - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h index 18081017c6..acb4df3d52 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __WEAPON_SET_UPGRADE_H_ -#define __WEAPON_SET_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -57,7 +54,3 @@ class WeaponSetUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; - - -#endif // __DEFAULTDIE_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h index fd3020a27a..a124c77aff 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __WORKER_AI_UPDATE_H_ -#define __WORKER_AI_UPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" @@ -263,7 +260,3 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public AudioEventRTS m_suppliesDepletedVoice; ///< Sound played when I take the last box. }; - - -#endif // __WORKER_AI_UPDATE_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Object.h b/Generals/Code/GameEngine/Include/GameLogic/Object.h index 9719adc2fa..5b64240b59 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Object.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Object.h @@ -27,8 +27,6 @@ // Author: Michael S. Booth, October 2000 #pragma once -#ifndef _OBJECT_H_ -#define _OBJECT_H_ #include "Lib/BaseType.h" #include "ref_ptr.h" @@ -785,5 +783,3 @@ AsciiString DebugDescribeObject(const Object *obj); #ifdef DEBUG_OBJECT_ID_EXISTS extern ObjectID TheObjectIDToDebug; #endif - -#endif // _OBJECT_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h index 428abe8a99..594532122b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h @@ -32,9 +32,6 @@ #pragma once -#ifndef _ObjectCreationList_H_ -#define _ObjectCreationList_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" @@ -219,6 +216,3 @@ class ObjectCreationListStore : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern ObjectCreationListStore *TheObjectCreationListStore; - -#endif // _ObjectCreationList_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h index e09a59530d..03f15d38e3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _OBJECT_ITER_H_ -#define _OBJECT_ITER_H_ - #include "Common/GameType.h" #include "Common/GameMemory.h" @@ -155,7 +152,3 @@ class SimpleObjectIterator : public ObjectIterator */ Int getCount() { return m_clumpCount; } }; - - -#endif // _OBJECT_ITER_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h index 89682ffe2e..5fdf12c639 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h @@ -27,8 +27,6 @@ // JKMCD Aug 2002 #pragma once -#ifndef __OBJECTSCRIPTSTATUSBITS_H__ -#define __OBJECTSCRIPTSTATUSBITS_H__ //------------------------------------------------------------------------------------------------- /** Object status bits */ @@ -42,6 +40,3 @@ enum ObjectScriptStatusBit CPP_11(: Int) OBJECT_STATUS_SCRIPT_TARGETABLE = 0x10, ///< This unit can be targeted by the player, but not autoacquired. // NOTE: Object currently only uses a Byte for this, so if you add status bits, you may need to enlarge that field. }; - -#endif /* __OBJECTSCRIPTSTATUSBITS_H__ */ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h index afe0ff7f5d..0309c09bd4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __OBJECT_TYPES_H__ -#define __OBJECT_TYPES_H__ - #include "Common/AsciiString.h" #include "Common/Snapshot.h" @@ -87,5 +84,3 @@ class ObjectTypes : public MemoryPoolObject, Bool canBuildAny(Player *player); }; EMPTY_DTOR(ObjectTypes) - -#endif /* __OBJECT_TYPES_H__ */ diff --git a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h index d2715e96a7..f924fa3a0a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h +++ b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __PARTITIONMANAGER_H_ -#define __PARTITIONMANAGER_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -1559,6 +1556,3 @@ class CellOutwardIterator // Externals //----------------------------------------------------------------------------- extern PartitionManager *ThePartitionManager; ///< object manager singleton - -#endif // __PARTITIONMANAGER_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/PolygonTrigger.h b/Generals/Code/GameEngine/Include/GameLogic/PolygonTrigger.h index c189d96743..2cd94188ee 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/PolygonTrigger.h +++ b/Generals/Code/GameEngine/Include/GameLogic/PolygonTrigger.h @@ -33,9 +33,6 @@ #pragma once -#ifndef PolygonTrigger_H -#define PolygonTrigger_H - #include "Common/GameMemory.h" #include "Common/Snapshot.h" #include "Common/STLTypedefs.h" @@ -141,5 +138,3 @@ class PolygonTrigger : public MemoryPoolObject, const WaterHandle* getWaterHandle(void) const; Bool isValid(void) const; }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameLogic/Powers.h b/Generals/Code/GameEngine/Include/GameLogic/Powers.h index ecdf1634eb..53438b1244 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Powers.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Powers.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __POWERS_H_ -#define __POWERS_H_ - // // skeleton definition of unit powers // @@ -58,6 +55,3 @@ static const char *const PowerNames[] = }; static_assert(ARRAY_SIZE(PowerNames) == POWERS_NUM_POWERS + 1, "Incorrect array size"); #endif // end DEFINE_POWER_NAMES - -#endif // __POWERS_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/RankInfo.h b/Generals/Code/GameEngine/Include/GameLogic/RankInfo.h index 44aaf8d8e9..581928a9ef 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/RankInfo.h +++ b/Generals/Code/GameEngine/Include/GameLogic/RankInfo.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __RankInfo_H_ -#define __RankInfo_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Science.h" #include "Common/UnicodeString.h" @@ -76,7 +73,3 @@ class RankInfoStore : public SubsystemInterface }; extern RankInfoStore* TheRankInfoStore; - - -#endif // __RankInfo_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h b/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h index a5aa954df7..4a9d99212c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SCRIPTACTIONS_H_ -#define __SCRIPTACTIONS_H_ - class ScriptAction; class GameWindow; class Team; @@ -378,8 +375,3 @@ class ScriptActions : public ScriptActionsInterface void deleteAllUnmanned(); }; - - -#endif // end __SCRIPTACTIONS_H_ - - diff --git a/Generals/Code/GameEngine/Include/GameLogic/ScriptConditions.h b/Generals/Code/GameEngine/Include/GameLogic/ScriptConditions.h index dce81aee57..4bc9c058c8 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ScriptConditions.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ScriptConditions.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SCRIPTCONDITIONS_H_ -#define __SCRIPTCONDITIONS_H_ - class Condition; class ObjectTypes; class Parameter; @@ -187,6 +184,3 @@ class ScriptConditions : public ScriptConditionsInterface }; - - -#endif // end __SCRIPTCONDITIONS_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h b/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h index e363b2a434..bc025c88d8 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SCRIPTENGINE_H_ -#define __SCRIPTENGINE_H_ - #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/STLTypedefs.h" @@ -489,6 +486,3 @@ class ScriptEngine : public SubsystemInterface, }; extern ScriptEngine *TheScriptEngine; ///< singleton definition - - -#endif // end __SCRIPTENGINE_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Scripts.h b/Generals/Code/GameEngine/Include/GameLogic/Scripts.h index 77f6130f13..70428cc389 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Scripts.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Scripts.h @@ -29,9 +29,6 @@ #pragma once -#ifndef SCRIPTS_H -#define SCRIPTS_H - #include "Common/Snapshot.h" #include "GameNetwork/NetworkDefs.h" #include "Common/ObjectStatusTypes.h" @@ -1108,6 +1105,3 @@ class ScriptList : public MemoryPoolObject, public Snapshot /// are read, and the caller is responsible for deleting the scripts. static Int getReadScripts(ScriptList *scriptLists[MAX_PLAYER_COUNT]); }; - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/SidesList.h b/Generals/Code/GameEngine/Include/GameLogic/SidesList.h index f544b3d107..cb1033fa5c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/SidesList.h +++ b/Generals/Code/GameEngine/Include/GameLogic/SidesList.h @@ -29,9 +29,6 @@ #pragma once -#ifndef SIDESLIST_H -#define SIDESLIST_H - #include "Common/Dict.h" #include "Common/Errors.h" #include "Common/GameType.h" @@ -390,7 +387,3 @@ inline Bool BuildListInfo::isBuildable( void ) return false; } - - -#endif - diff --git a/Generals/Code/GameEngine/Include/GameLogic/Squad.h b/Generals/Code/GameEngine/Include/GameLogic/Squad.h index e877e0626d..d76b358b9d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Squad.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Squad.h @@ -38,8 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_SQAUD_ -#define _H_SQAUD_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" @@ -96,5 +94,3 @@ class Squad : public MemoryPoolObject, public Snapshot void aiGroupFromSquad(AIGroup* aiGroupToFill); }; EMPTY_DTOR(Squad) - -#endif /* _H_SQAUD_ */ diff --git a/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h b/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h index 12f94106dc..30ccb58394 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h +++ b/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __TERRAINLOGIC_H_ -#define __TERRAINLOGIC_H_ - #include "Common/GameMemory.h" #include "Common/Snapshot.h" #include "Common/STLTypedefs.h" @@ -379,4 +376,3 @@ extern TerrainLogic *TheTerrainLogic; ///< singleton definition extern void makeAlignToNormalMatrix( Real angle, const Coord3D& pos, const Coord3D& normal, Matrix3D& mtx); extern Bool LineInRegion( const Coord2D *p1, const Coord2D *p2, const Region2D *clipRegion ); -#endif // end __TERRAINLOGIC_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h b/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h index 2ace9dd797..3a2570aaae 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h +++ b/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _TURRETAI_H_ -#define _TURRETAI_H_ - #include "Common/StateMachine.h" #include "Common/GameMemory.h" @@ -373,6 +370,3 @@ class TurretAI : public MemoryPoolObject, public Snapshot, public NotifyWeaponFi mutable Bool m_targetWasSetByIdleMood : 1; }; - -#endif // end _TURRETAI_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h b/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h index f857155d43..3fca822233 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h +++ b/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __VICTORYCONDITIONS_H__ -#define __VICTORYCONDITIONS_H__ - #include "Common/SubsystemInterface.h" #include "Lib/BaseType.h" @@ -79,5 +76,3 @@ class VictoryConditionsInterface : public SubsystemInterface VictoryConditionsInterface * createVictoryConditions( void ); extern VictoryConditionsInterface *TheVictoryConditions; - -#endif // __VICTORYCONDITIONS_H__ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Weapon.h b/Generals/Code/GameEngine/Include/GameLogic/Weapon.h index dda3d86b33..cc98bb2703 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Weapon.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Weapon.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __WEAPON_H_ -#define __WEAPON_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameCommon.h" @@ -854,6 +851,3 @@ class WeaponStore : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern WeaponStore *TheWeaponStore; - -#endif // __WEAPON_H_ - diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h index 93125eda6b..d8642d3123 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h +++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h @@ -27,9 +27,5 @@ // JKMCD Aug 2002 #pragma once -#ifndef __WEAPONBONUSCONDITIONFLAGS_H__ -#define __WEAPONBONUSCONDITIONFLAGS_H__ typedef UnsignedInt WeaponBonusConditionFlags; - -#endif /* __WEAPONBONUSCONDITIONFLAGS_H__ */ diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h index 51638bb3e4..30af7e2edf 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h +++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h @@ -26,9 +26,6 @@ #pragma once -#ifndef _WeaponSet_H_ -#define _WeaponSet_H_ - #include "Lib/BaseType.h" #include "Common/GameType.h" #include "Common/KindOf.h" @@ -245,5 +242,3 @@ class WeaponSet : public Snapshot static ModelConditionFlags getModelConditionForWeaponSlot(WeaponSlotType wslot, WeaponSetConditionType a); }; - -#endif // _WeaponSet_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h index 70c8c3fb7b..f57263f6c0 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h +++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h @@ -27,11 +27,7 @@ // JKMCD Aug 2002 #pragma once -#ifndef __WEAPONSETFLAGS_H__ -#define __WEAPONSETFLAGS_H__ #include "GameLogic/WeaponSetType.h" typedef BitFlags WeaponSetFlags; - -#endif /* __WEAPONSETFLAGS_H__ */ diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h index 94efcfbf41..b34868e60c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h +++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h @@ -27,8 +27,6 @@ // JKMCD Aug 2002 #pragma once -#ifndef __WEAPONSETTYPE_H__ -#define __WEAPONSETTYPE_H__ //------------------------------------------------------------------------------------------------- // IMPORTANT NOTE: you should endeavor to set up states such that the most "normal" @@ -53,5 +51,3 @@ enum WeaponSetType CPP_11(: Int) WEAPONSET_COUNT }; - -#endif /* __WEAPONSETTYPE_H__ */ diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h index e45e6a25fa..0a80eb8bd1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h +++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h @@ -27,8 +27,6 @@ // JKMCD Aug 2002 #pragma once -#ifndef __WEAPONSTATUS_H__ -#define __WEAPONSTATUS_H__ enum WeaponStatus CPP_11(: Int) { @@ -40,5 +38,3 @@ enum WeaponStatus CPP_11(: Int) WEAPON_STATUS_COUNT }; - -#endif /* __WEAPONSTATUS_H__ */ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/Connection.h b/Generals/Code/GameEngine/Include/GameNetwork/Connection.h index 8e7f12e4f7..1cd335e367 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/Connection.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/Connection.h @@ -35,9 +35,6 @@ #pragma once -#ifndef __CONNECTION_H -#define __CONNECTION_H - #include "GameNetwork/NetCommandList.h" #include "GameNetwork/User.h" #include "GameNetwork/Transport.h" @@ -102,5 +99,3 @@ class Connection : public MemoryPoolObject Int m_numRetries; ///< The number of retries for the last second. time_t m_retryMetricsTime; ///< The start time of the current retry metrics thing. }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameNetwork/ConnectionManager.h b/Generals/Code/GameEngine/Include/GameNetwork/ConnectionManager.h index d871e2be9d..8588a3350b 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/ConnectionManager.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/ConnectionManager.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __CONNECTIONMANAGER_H -#define __CONNECTIONMANAGER_H - #include "GameNetwork/Connection.h" #include "GameNetwork/NetCommandList.h" #include "GameNetwork/Transport.h" @@ -217,5 +214,3 @@ class ConnectionManager FileProgressMap s_fileProgressMap[MAX_SLOTS]; // ----------------------------------------------------------------------------- }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h b/Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h index 4024fc11cb..9b0b16dccf 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __DISCONNECTMANAGER_H -#define __DISCONNECTMANAGER_H - #include "GameNetwork/NetCommandRef.h" #include "Lib/BaseType.h" //#include "GameNetwork/ConnectionManager.h" @@ -128,6 +124,3 @@ class DisconnectManager Int m_pingsRecieved; UnsignedInt m_pingFrame; }; - - -#endif // #ifndef __DISCONNECTMANAGER_H diff --git a/Generals/Code/GameEngine/Include/GameNetwork/DownloadManager.h b/Generals/Code/GameEngine/Include/GameNetwork/DownloadManager.h index aa7ab67958..25dc35b13b 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/DownloadManager.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/DownloadManager.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __DOWNLOADMANAGER_H__ -#define __DOWNLOADMANAGER_H__ - #include "WWDownload/downloaddefs.h" #include "WWDownload/Download.h" @@ -94,5 +91,3 @@ class DownloadManager : public IDownload }; extern DownloadManager *TheDownloadManager; - -#endif // __DOWNLOADMANAGER_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/FileTransfer.h b/Generals/Code/GameEngine/Include/GameNetwork/FileTransfer.h index 4d7379f15a..e1ca2d1e27 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/FileTransfer.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/FileTransfer.h @@ -29,8 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once -#ifndef __FILE_TRANSFER_H__ -#define __FILE_TRANSFER_H__ class GameInfo; @@ -48,5 +46,3 @@ AsciiString GetReadmeFromMap( AsciiString path ); // The meat of file (map) transfers Bool DoAnyMapTransfers(GameInfo *game); - -#endif // __FILE_TRANSFER_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/FirewallHelper.h b/Generals/Code/GameEngine/Include/GameNetwork/FirewallHelper.h index 137255c2e4..9a61f82ba8 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/FirewallHelper.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/FirewallHelper.h @@ -48,9 +48,6 @@ #pragma once -#ifndef __FIREWALLHELPER_H -#define __FIREWALLHELPER_H - class UDP; #define NUM_TEST_PORTS 4 @@ -308,7 +305,3 @@ class FirewallHelperClass { extern FirewallHelperClass *TheFirewallHelper; FirewallHelperClass * createFirewallHelper(); - - -#endif // __FIREWALLHELPER_H - diff --git a/Generals/Code/GameEngine/Include/GameNetwork/FrameData.h b/Generals/Code/GameEngine/Include/GameNetwork/FrameData.h index 7317032f63..51e0428e91 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/FrameData.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/FrameData.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __FRAMEDATA_H -#define __FRAMEDATA_H - #include "Lib/BaseType.h" #include "GameNetwork/NetCommandList.h" @@ -65,5 +61,3 @@ class FrameData { UnsignedInt m_lastFailedCC; UnsignedInt m_lastFailedFrameCC; }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameNetwork/FrameDataManager.h b/Generals/Code/GameEngine/Include/GameNetwork/FrameDataManager.h index 04740852c1..2069b49673 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/FrameDataManager.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/FrameDataManager.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __FRAMEDATAMANAGER_H -#define __FRAMEDATAMANAGER_H - #include "GameNetwork/NetworkDefs.h" #include "GameNetwork/FrameData.h" @@ -63,5 +59,3 @@ class FrameDataManager : public MemoryPoolObject Bool m_isQuitting; UnsignedInt m_quitFrame; }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameNetwork/FrameMetrics.h b/Generals/Code/GameEngine/Include/GameNetwork/FrameMetrics.h index 19bac6f74c..7661f3a16e 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/FrameMetrics.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/FrameMetrics.h @@ -26,9 +26,6 @@ #pragma once -#ifndef __FRAMEMETRICS_H -#define __FRAMEMETRICS_H - #include "Lib/BaseType.h" #include "GameNetwork/NetworkDefs.h" @@ -70,5 +67,3 @@ class FrameMetrics { UnsignedInt m_cushionIndex; ///< The next index to use for the cushion list. Int m_minimumCushion; ///< The average cushion for the history. }; - -#endif // __FRAMEMETRICS_H diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GUIUtil.h b/Generals/Code/GameEngine/Include/GameNetwork/GUIUtil.h index d904eb0d87..4f7db27a35 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GUIUtil.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GUIUtil.h @@ -27,9 +27,6 @@ #pragma once -#ifndef __GUIUTIL_H__ -#define __GUIUTIL_H__ - class GameWindow; class GameInfo; @@ -52,5 +49,3 @@ void EnableAcceptControls(Bool Enabled, GameInfo *myGame, GameWindow *comboPlaye GameWindow *comboColor[], GameWindow *comboPlayerTemplate[], GameWindow *comboTeam[], GameWindow *buttonAccept[], GameWindow *buttonStart, GameWindow *buttonMapStartPosition[], Int slotNum = -1); - -#endif // __GUIUTIL_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h b/Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h index 871cd5583f..103287154d 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __GAMEINFO_H__ -#define __GAMEINFO_H__ - #include "Common/Snapshot.h" #include "GameNetwork/NetworkDefs.h" #include "GameNetwork/FirewallHelper.h" @@ -284,5 +281,3 @@ class SkirmishGameInfo : public GameInfo, public Snapshot }; extern SkirmishGameInfo *TheSkirmishGameInfo; - -#endif // __GAMEINFO_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameMessageParser.h b/Generals/Code/GameEngine/Include/GameNetwork/GameMessageParser.h index 1c5c1cb875..25783f2740 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameMessageParser.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameMessageParser.h @@ -22,7 +22,6 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once #include "Common/MessageStream.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h index 3379625ec5..0f80d91bf2 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __GameSpy_H__ -#define __GameSpy_H__ - #include "gamespy/peer/peer.h" #include "GameClient/Color.h" @@ -143,6 +140,3 @@ enum GameSpyColors CPP_11(: Int) { }; extern const Color GameSpyColor[GSCOLOR_MAX]; - - -#endif // __GameSpy_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h index 6a2cac82b7..d9cd0fe2ed 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h @@ -28,10 +28,5 @@ #pragma once -#ifndef __BUDDYDEFS_H__ -#define __BUDDYDEFS_H__ - void HandleBuddyResponses(void); void PopulateOldBuddyMessages(void); - -#endif // __BUDDYDEFS_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h index b2719023bc..1aea93930b 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __BUDDYTHREAD_H__ -#define __BUDDYTHREAD_H__ - #include "gamespy/gp/gp.h" #define MAX_BUDDY_CHAT_LEN 128 @@ -172,6 +169,3 @@ class GameSpyBuddyMessageQueueInterface }; extern GameSpyBuddyMessageQueueInterface *TheGameSpyBuddyMessageQueue; - - -#endif // __BUDDYTHREAD_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h index 561c2f232a..b16659e775 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GSCONFIG_H__ -#define __GSCONFIG_H__ - #include "Common/AsciiString.h" #include "Common/STLTypedefs.h" @@ -78,5 +75,3 @@ class GameSpyConfigInterface }; extern GameSpyConfigInterface *TheGameSpyConfig; - -#endif // __GSCONFIG_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h index 4cb190ca0f..b9cc6af3b2 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __GAMERESULTSTHREAD_H__ -#define __GAMERESULTSTHREAD_H__ - #include "Common/SubsystemInterface.h" // this class encapsulates a request for the thread @@ -76,6 +73,3 @@ class GameResultsInterface : public SubsystemInterface }; extern GameResultsInterface *TheGameResultsQueue; - - -#endif // __GAMERESULTSTHREAD_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h index b7f1ba5383..c9944902c9 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __LADDERDEFS_H__ -#define __LADDERDEFS_H__ - #include "Common/UnicodeString.h" #include "Common/AsciiString.h" #include "Common/STLTypedefs.h" @@ -84,5 +81,3 @@ class LadderList }; extern LadderList *TheLadderList; - -#endif // __LADDERDEFS_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h index 1390032b61..a28bf1cc4a 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __LOBBYUTILS_H__ -#define __LOBBYUTILS_H__ - class GameWindow; GameWindow *GetGameListBox( void ); @@ -53,5 +50,3 @@ enum GameSortType CPP_11(: Int) Bool HandleSortButton( NameKeyType sortButton ); void PopulateLobbyPlayerListbox(void); - -#endif // __LOBBYUTILS_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h index db8f31f05f..c3dec63f6d 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __MAINMENUUTILS_H__ -#define __MAINMENUUTILS_H__ - void HTTPThinkWrapper( void ); void StopAsyncDNSCheck( void ); void StartPatchCheck( void ); @@ -60,5 +57,3 @@ void HandleOverallStats( const OverallStats& USA, const OverallStats& China, con void CheckNumPlayersOnline( void ); void HandleNumPlayersOnline( Int numPlayersOnline ); - -#endif // __MAINMENUUTILS_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h index a5951ea389..5ed37aa8f7 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __PEERDEFS_H__ -#define __PEERDEFS_H__ - #include "gamespy/peer/peer.h" #include "gamespy/gp/gp.h" @@ -298,5 +295,3 @@ extern Int GetAdditionalDisconnectsFromUserFile(Int playerID); void SetUpGameSpy( const char *motdBuffer, const char *configBuffer ); void TearDownGameSpy( void ); - -#endif // __PEERDEFS_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h index 5bd21cb33c..5cc3b606fc 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __PEERDEFSIMPLEMENTATION_H__ -#define __PEERDEFSIMPLEMENTATION_H__ - #include "GameNetwork/GameSpy/PeerDefs.h" #include "GameNetwork/GameSpy/PersistentStorageThread.h" @@ -180,5 +177,3 @@ class GameSpyInfo : public GameSpyInfoInterface Int m_additionalDisconnects; }; - -#endif // __PEERDEFS_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h index 0cdf0ca30c..113f6a0af9 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __PEERTHREAD_H__ -#define __PEERTHREAD_H__ - #include "gamespy/peer/peer.h" #include "GameNetwork/NetworkDefs.h" @@ -385,5 +382,3 @@ class GameSpyPeerMessageQueueInterface }; extern GameSpyPeerMessageQueueInterface *TheGameSpyPeerMessageQueue; - -#endif // __PEERTHREAD_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h index cfa09d7cd4..62d84b887a 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __PERSISTENTSTORAGEDEFS_H__ -#define __PERSISTENTSTORAGEDEFS_H__ - enum LocaleType CPP_11(: Int) { LOC_UNKNOWN = 0, @@ -43,5 +40,3 @@ void UpdateLocalPlayerStats(void); void SetLookAtPlayer( Int id, AsciiString nick ); void PopulatePlayerInfoWindows( AsciiString parentWindowName ); - -#endif // __PERSISTENTSTORAGEDEFS_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h index 430f5e0cd7..348b1b2f35 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __PERSISTENTSTORAGETHREAD_H__ -#define __PERSISTENTSTORAGETHREAD_H__ - #include "gamespy/gstats/gpersist.h" #define MAX_BUDDY_CHAT_LEN 128 @@ -182,6 +179,3 @@ class GameSpyPSMessageQueueInterface }; extern GameSpyPSMessageQueueInterface *TheGameSpyPSMessageQueue; - - -#endif // __PERSISTENTSTORAGETHREAD_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h index 0ed1204918..aab2e51609 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __PINGTHREAD_H__ -#define __PINGTHREAD_H__ - // this class encapsulates a request for the thread class PingRequest { @@ -78,6 +75,3 @@ class PingerInterface }; extern PingerInterface *ThePinger; - - -#endif // __PINGTHREAD_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h index 3262fea6c5..5f7572a343 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __STAGINGROOMGAMEINFO_H__ -#define __STAGINGROOMGAMEINFO_H__ - #include "GameNetwork/GameInfo.h" #include "GameNetwork/Transport.h" @@ -157,5 +154,3 @@ class GameSpyStagingRoom : public GameInfo }; extern GameSpyStagingRoom *TheGameSpyGame; - -#endif // __STAGINGROOMGAMEINFO_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h index be97c956eb..ace441eaf0 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h @@ -28,10 +28,5 @@ #pragma once -#ifndef __GAMESPY_THREADUTILS_H__ -#define __GAMESPY_THREADUTILS_H__ - std::wstring MultiByteToWideCharSingleLine( const char *orig ); std::string WideCharStringToMultiByte( const WideChar *orig ); - -#endif // __GAMESPY_THREADUTILS_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyChat.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyChat.h index c5c67f5f36..4b56c34b8e 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyChat.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyChat.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __GAMESPYCHAT_H__ -#define __GAMESPYCHAT_H__ - #include "gamespy/peer/peer.h" class GameWindow; @@ -56,5 +53,3 @@ void RoomMessageCallback(PEER peer, RoomType roomType, void PlayerMessageCallback(PEER peer, const char * nick, const char * message, MessageType messageType, void * param); ///< Called when a private message is received from another player. - -#endif // __GAMESPYCHAT_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGP.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGP.h index 340a5f4962..df001959ed 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGP.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGP.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __GAMESPYGP_H__ -#define __GAMESPYGP_H__ - #include "gamespy/gp/gp.h" void GPRecvBuddyRequestCallback(GPConnection * connection, GPRecvBuddyRequestArg * arg, void * param); @@ -43,5 +40,3 @@ void GameSpyUpdateBuddyOverlay(void); extern GPConnection *TheGPConnection; Bool IsGameSpyBuddy(GPProfile id); - -#endif // __GAMESPYGP_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h index b59136697f..daba3ca64f 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h @@ -29,10 +29,6 @@ #pragma once #error this file is obsolete - -#ifndef __GAMESPYGAMEINFO_H__ -#define __GAMESPYGAMEINFO_H__ - #include "gamespy/peer/peer.h" #include "GameNetwork/GameInfo.h" @@ -94,5 +90,3 @@ void WOLDisplaySlotList( void ); void GameSpyStartGame( void ); void GameSpyLaunchGame( void ); Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverPort, UnsignedInt& localIP); - -#endif // __LANGAMEINFO_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h index 76a505e754..e56f238c1c 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __GAMESPYOVERLAY_H__ -#define __GAMESPYOVERLAY_H__ - #include "Common/NameKeyGenerator.h" #include "GameClient/WindowLayout.h" #include "GameClient/Gadget.h" @@ -66,4 +63,3 @@ void GameSpyToggleOverlay( GSOverlayType ); void GameSpyUpdateOverlays( void ); void ReOpenPlayerInfo( void ); void CheckReOpenPlayerInfo(void ); -#endif // __GAMESPYOVERLAY_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyPersistentStorage.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyPersistentStorage.h index d16363b63e..d5f4028f55 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyPersistentStorage.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyPersistentStorage.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __GAMESPYPersistentStorage_H__ -#define __GAMESPYPersistentStorage_H__ - class GameSpyPlayerInfoInterface : public SubsystemInterface { public: @@ -58,5 +55,3 @@ class GameSpyPlayerInfoInterface : public SubsystemInterface GameSpyPlayerInfoInterface *createGameSpyPlayerInfo( void ); extern GameSpyPlayerInfoInterface *TheGameSpyPlayerInfo; - -#endif // __GAMESPYPersistentStorage_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyThread.h index 2a06a2ddeb..03046f692a 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyThread.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __GAMESPYTHREAD_H__ -#define __GAMESPYTHREAD_H__ - #include "mutex.h" #include "thread.h" @@ -63,5 +60,3 @@ class GameSpyThreadClass : public ThreadClass extern GameSpyThreadClass *TheGameSpyThread; extern MutexClass TheGameSpyMutex; - -#endif // __GAMESPYTHREAD_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/IPEnumeration.h b/Generals/Code/GameEngine/Include/GameNetwork/IPEnumeration.h index 38a1cea22e..cef08e33aa 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/IPEnumeration.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/IPEnumeration.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _IPENUMERATION_H_ -#define _IPENUMERATION_H_ - #include "GameNetwork/Transport.h" /** @@ -78,6 +75,3 @@ class IPEnumeration EnumeratedIP *m_IPlist; Bool m_isWinsockInitialized; }; - - -#endif // _IPENUMERATION_H_ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/LANAPI.h b/Generals/Code/GameEngine/Include/GameNetwork/LANAPI.h index 5bfcc13465..b4503653e8 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/LANAPI.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/LANAPI.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _LANAPI_H_ -#define _LANAPI_H_ - #include "GameNetwork/Transport.h" #include "GameNetwork/NetworkInterface.h" #include "GameNetwork/NetworkDefs.h" @@ -413,6 +410,3 @@ struct LANMessage }; }; #pragma pack(pop) - - -#endif // _LANAPI_H_ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h b/Generals/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h index 15e492f3bb..48d5ee28a8 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h @@ -27,10 +27,8 @@ // Author: Chris Huybregts, October 2001 // Description: LAN API Callbacks header /////////////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef _LANAPI_CALLBACKS_H_ -#define _LANAPI_CALLBACKS_H_ +#pragma once #include "Common/NameKeyGenerator.h" #include "GameClient/Shell.h" @@ -83,7 +81,3 @@ enum PostToLanGameType CPP_11(: Int){ SEND_GAME_OPTS = 0, POST_TO_LAN_GAME_TYPE_COUNT }; //the utility function mentioned above void PostToLanGameOptions(PostToLanGameType post); - - - -#endif //_LANAPI_CALLBACKS_H_ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/LANGameInfo.h b/Generals/Code/GameEngine/Include/GameNetwork/LANGameInfo.h index a892e2d060..69504d50bb 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/LANGameInfo.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/LANGameInfo.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __LANGAMEINFO_H__ -#define __LANGAMEINFO_H__ - #include "GameNetwork/GameInfo.h" #include "GameNetwork/LANPlayer.h" @@ -180,6 +177,3 @@ void LANDisplayGameOptions( void ); ///< Displays the game options according to AsciiString GenerateGameOptionsString( void ); Bool ParseGameOptionsString(LANGameInfo *game, AsciiString options); - - -#endif // __LANGAMEINFO_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/LANPlayer.h b/Generals/Code/GameEngine/Include/GameNetwork/LANPlayer.h index 5f8e2d4a15..e87f3880b6 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/LANPlayer.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/LANPlayer.h @@ -28,10 +28,6 @@ #pragma once -#ifndef _LANPLAYER_H_ -#define _LANPLAYER_H_ - - /** * LAN player class. This is for players sitting in the lobby. Players are * uniquely identified by their IP addresses. @@ -65,5 +61,3 @@ class LANPlayer LANPlayer *m_next; ///< Linked list pointer UnsignedInt m_IP; ///< Player's IP }; - -#endif //_LANPLAYER_H_ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NAT.h b/Generals/Code/GameEngine/Include/GameNetwork/NAT.h index 3a11aeb960..499b84d6ff 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NAT.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NAT.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __NAT_H -#define __NAT_H - #include "Lib/BaseType.h" #include "GameNetwork/NetworkInterface.h" #include "GameNetwork/FirewallHelper.h" @@ -158,5 +155,3 @@ class NAT { }; extern NAT *TheNAT; - -#endif // #ifndef __NAT_H diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandList.h b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandList.h index c28d2114e5..2497f904fd 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandList.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandList.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __NETCOMMANDLIST_H -#define __NETCOMMANDLIST_H - #include "Common/GameMemory.h" #include "GameNetwork/NetCommandRef.h" @@ -70,5 +66,3 @@ class NetCommandList : public MemoryPoolObject NetCommandRef *m_last; ///< Tail of the list. NetCommandRef *m_lastMessageInserted; ///< The last message that was inserted to this list. }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h index 0b169e0443..4c585bb355 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __NETCOMMANDMSG_H -#define __NETCOMMANDMSG_H - #include "Lib/BaseType.h" #include "GameNetwork/NetworkDefs.h" #include "Common/UnicodeString.h" @@ -517,4 +514,3 @@ class NetFrameResendRequestCommandMsg : public NetCommandMsg protected: UnsignedInt m_frameToResend; }; -#endif diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandRef.h b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandRef.h index ae3b90c614..a5321e4df2 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandRef.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandRef.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __NETCOMMANDREF_H -#define __NETCOMMANDREF_H - #include "GameNetwork/NetCommandMsg.h" #include "Common/GameMemory.h" @@ -148,5 +144,3 @@ inline UnsignedByte NetCommandRef::getRelay() const { return m_relay; } - -#endif // #ifndef __NETCOMMANDREF_H diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h index e56c9cfd9b..e61f43d7e1 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h @@ -27,9 +27,6 @@ #pragma once -#ifndef __NETCOMMANDWRAPPERLIST_H -#define __NETCOMMANDWRAPPERLIST_H - #include "GameNetwork/NetCommandList.h" class NetCommandWrapperListNode : public MemoryPoolObject @@ -79,5 +76,3 @@ class NetCommandWrapperList : public MemoryPoolObject NetCommandWrapperListNode *m_list; }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetPacket.h b/Generals/Code/GameEngine/Include/GameNetwork/NetPacket.h index df66ed8535..bf657ae5c0 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetPacket.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetPacket.h @@ -32,14 +32,10 @@ for the data, but at least that wouldn't be repeating code, that would be specialized code. */ - - #pragma once -#ifndef __NETPACKET_H -#define __NETPACKET_H - #include "NetworkDefs.h" + #include "GameNetwork/NetCommandList.h" #include "Common/MessageStream.h" #include "Common/GameMemory.h" @@ -236,5 +232,3 @@ class NetPacket : public MemoryPoolObject UnsignedByte m_lastCommandType; UnsignedByte m_lastRelay; }; - -#endif // __NETPACKET_H diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h index ae10c9cf76..138aaeb9db 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __NETWORKDEFS_H -#define __NETWORKDEFS_H - #include "Lib/BaseType.h" #include "Common/MessageStream.h" @@ -212,5 +208,3 @@ class NetworkInterface; extern NetworkInterface *TheNetwork; #define PRINTF_IP_AS_4_INTS(ip) ((ip) >> 24) & 0xff, ((ip) >> 16) & 0xff, ((ip) >> 8 ) & 0xff, (ip) & 0xff - -#endif diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetworkInterface.h b/Generals/Code/GameEngine/Include/GameNetwork/NetworkInterface.h index d1b58ad019..74e3942ced 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetworkInterface.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetworkInterface.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _NETWORK_INTERFACE_H_ -#define _NETWORK_INTERFACE_H_ - #include "Common/MessageStream.h" #include "GameNetwork/ConnectionManager.h" #include "GameNetwork/User.h" @@ -137,5 +134,3 @@ class NetworkInterface : public SubsystemInterface * a 32-bit unsigned integer. */ UnsignedInt ResolveIP(AsciiString host); - -#endif // _NETWORK_INTERFACE_H_ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/RankPointValue.h b/Generals/Code/GameEngine/Include/GameNetwork/RankPointValue.h index 9c58ef84ef..973eaedf5c 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/RankPointValue.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/RankPointValue.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __RANK_POINT_VALUE_H_ -#define __RANK_POINT_VALUE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -101,5 +98,3 @@ Int CalculateRank( const PSPlayerStats& stats ); Int GetFavoriteSide( const PSPlayerStats& stats ); const Image* LookupSmallRankImage(Int side, Int rankPoints); extern RankPoints *TheRankPointValues; - -#endif // __RANK_POINT_VALUE_H_ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/Transport.h b/Generals/Code/GameEngine/Include/GameNetwork/Transport.h index 87f361e511..8701cddd6c 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/Transport.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/Transport.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _TRANSPORT_H_ -#define _TRANSPORT_H_ - #include "GameNetwork/udp.h" #include "GameNetwork/NetworkDefs.h" @@ -101,5 +98,3 @@ class Transport //: public MemoryPoolObject Bool isGeneralsPacket( TransportMessage *msg ); }; - -#endif // _TRANSPORT_H_ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/User.h b/Generals/Code/GameEngine/Include/GameNetwork/User.h index 185fc1cef6..959137cc0c 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/User.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/User.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __USER_H -#define __USER_H - #include "GameNetwork/NetworkDefs.h" #include "Common/UnicodeString.h" @@ -58,5 +55,3 @@ class User : public MemoryPoolObject UnsignedInt m_ipaddr; }; EMPTY_DTOR(User) - -#endif diff --git a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h b/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h index d2b39e1a94..e2a0207616 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h @@ -27,8 +27,7 @@ // IDispatch for a COM object with a type library. // -#ifndef _FEBDISPATCH_H__ -#define _FEBDISPATCH_H__ +#pragma once #include extern CComModule _Module; @@ -102,5 +101,3 @@ public C private: ITypeInfo *m_ptinfo; }; - -#endif diff --git a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h b/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h index 7c98c1fc95..8122da61ae 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h @@ -42,9 +42,6 @@ #pragma once -#ifndef __WEBBROWSER_H__ -#define __WEBBROWSER_H__ - #include "Common/SubsystemInterface.h" #include #include @@ -125,4 +122,3 @@ class WebBrowser : }; extern CComObject *TheWebBrowser; -#endif // __WEBBROWSER_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/networkutil.h b/Generals/Code/GameEngine/Include/GameNetwork/networkutil.h index 5f6cfe292d..de7dc46c70 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/networkutil.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/networkutil.h @@ -22,10 +22,7 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __NETWORKUTIL_H -#define __NETWORKUTIL_H #include "GameNetwork/NetworkDefs.h" #include "GameNetwork/NetworkInterface.h" @@ -55,5 +52,3 @@ inline UnsignedInt AssembleIp(UnsignedByte a, UnsignedByte b, UnsignedByte c, Un ((UnsignedInt)(c) << 8) | ((UnsignedInt)(d)); } - -#endif diff --git a/Generals/Code/GameEngine/Include/GameNetwork/udp.h b/Generals/Code/GameEngine/Include/GameNetwork/udp.h index 21bdc5c845..f7dedc7ca0 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/udp.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/udp.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef UDP_HEADER -#define UDP_HEADER - #ifdef _UNIX #include #endif @@ -127,5 +123,3 @@ class UDP #ifdef DEBUG_LOGGING AsciiString GetWSAErrorString( Int error ); #endif - -#endif diff --git a/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h b/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h index f8fb6c72ce..4c773345d0 100644 --- a/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h +++ b/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h @@ -26,8 +26,7 @@ // Be careful what you stick in here, because putting files that change often in here will // tend to cheese people's goats. -#ifndef __PRERTS_H__ -#define __PRERTS_H__ +#pragma once //----------------------------------------------------------------------------- // srj sez: this must come first, first, first. @@ -126,5 +125,3 @@ class STLSpecialAlloc; #include "Common/Thing.h" #include "Common/UnicodeString.h" - -#endif /* __PRERTS_H__ */ diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h index a1e5c81764..f964eb5c91 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h @@ -41,9 +41,6 @@ #pragma once -#ifndef __W3DCONVERT_H_ -#define __W3DCONVERT_H_ - //============================================================================= // Includes //============================================================================= @@ -62,7 +59,3 @@ extern void PixelScreenToW3DLogicalScreen( Int screenX, Int screenY, //============================================================================= // Type Defines //============================================================================= - - -#endif // _W3DCONVERT_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h index 4bd9e33b12..8cb5492aef 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3DFUNCTIONLEXICON_H_ -#define __W3DFUNCTIONLEXICON_H_ - #include "Common/FunctionLexicon.h" //------------------------------------------------------------------------------------------------- @@ -52,6 +49,3 @@ class W3DFunctionLexicon : public FunctionLexicon protected: }; - -#endif // __W3DFUNCTIONLEXICON_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h index 9472c4cf08..ec8c53ceec 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h @@ -32,9 +32,6 @@ #pragma once -#ifndef __W3DMODULEFACTORY_H_ -#define __W3DMODULEFACTORY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ModuleFactory.h" @@ -49,5 +46,3 @@ class W3DModuleFactory : public ModuleFactory virtual void init( void ); }; - -#endif // __W3DMODULEFACTORY_H_ diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h index e1e0b41b6f..2a4f0b554e 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h @@ -31,9 +31,6 @@ #pragma once -#ifndef __W3DRADAR_H_ -#define __W3DRADAR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Radar.h" #include "WW3D2/ww3dformat.h" @@ -127,6 +124,3 @@ class W3DRadar : public Radar std::vector m_cachedHeroObjectList; //< cache of hero objects for drawing icons in radar overlay }; - - -#endif // __W3DRADAR_H_ diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h index fc63ec394e..53bb89ba59 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h @@ -31,9 +31,6 @@ #pragma once -#ifndef __W3DTHINGFACTORY_H_ -#define __W3DTHINGFACTORY_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/ThingFactory.h" @@ -47,6 +44,3 @@ class W3DThingFactory : public ThingFactory W3DThingFactory( void ); virtual ~W3DThingFactory( void ); }; - -#endif // __W3DTHINGFACTORY_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h index 52cc395bc6..e94fa96159 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __HEIGHTMAP_H_ -#define __HEIGHTMAP_H_ - #include "always.h" #include "rendobj.h" #include "w3d_file.h" @@ -325,4 +321,3 @@ class HeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHook }; extern HeightMapRenderObjClass *TheTerrainRenderObject; -#endif // end __HEIGHTMAP_H_ diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h index 4e01c6449a..db06b6189e 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3D_DEBRIS_DRAW_H_ -#define __W3D_DEBRIS_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/DrawModule.h" @@ -98,6 +95,3 @@ class W3DDebrisDraw : public DrawModule, public DebrisDrawInterface Shadow* m_shadow; ///< Updates/Renders shadows of this object }; - -#endif // __W3D_DEBRIS_DRAW_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h index 2c85c154a1..fb6b4bfbf6 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3DDEFAULTDRAW_H_ -#define __W3DDEFAULTDRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/DrawModule.h" @@ -75,6 +72,3 @@ class W3DDefaultDraw : public DrawModule Shadow* m_shadow; ///< Updates/Renders shadows of this object #endif }; - -#endif // __W3DDEFAULTDRAW_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h index 66ffe8d490..070288bd88 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h @@ -34,9 +34,6 @@ #pragma once -#ifndef _W3D_DEPENDENCY_MODEL_DRAW_H_ -#define _W3D_DEPENDENCY_MODEL_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" @@ -69,6 +66,3 @@ class W3DDependencyModelDraw : public W3DModelDraw protected: Bool m_dependencyCleared; // The thing we depend on will clear this, and we will relatch it after we draw. }; - -#endif // _W3D_DEPENDENCY_MODEL_DRAW_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h index 8def16b269..122af0b5aa 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3DLASERDRAW_H_ -#define __W3DLASERDRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" //#include "WW3D2/Line3D.h" @@ -99,6 +96,3 @@ class W3DLaserDraw : public DrawModule, public LaserDrawInterface Bool m_selfDirty; // not saved }; - -#endif // __W3DLASERDRAW_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h index 6829691cb4..2589bcb7c4 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3DModelDraw_H_ -#define __W3DModelDraw_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ModelState.h" #include "Common/DrawModule.h" @@ -514,6 +511,3 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface void hideGarrisonFlags(Bool hide); #endif }; - -#endif // __W3DModelDraw_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h index d7162df818..88f7297770 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h @@ -30,9 +30,6 @@ #pragma once -#ifndef _W3D_OVERLORD_TANK_DRAW_H_ -#define _W3D_OVERLORD_TANK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DTankDraw.h" @@ -70,6 +67,3 @@ class W3DOverlordTankDraw : public W3DTankDraw protected: }; - -#endif - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h index 57e4accb5d..8c1fc03ded 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3DPOLICECARDRAW_H_ -#define __W3DPOLICECARDRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "W3DDevice/GameClient/Module/W3DTruckDraw.h" @@ -63,6 +60,3 @@ class W3DPoliceCarDraw : public W3DTruckDraw Real m_curFrame; }; - -#endif // __W3DPOLICECARDRAW_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h index 98b9f715d0..3ceeaaae5a 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _W3D_PROJECTILE_STREAM_DRAW_H_ -#define _W3D_PROJECTILE_STREAM_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "GameLogic/Module/ProjectileStreamUpdate.h" // I am the draw module for this update. Very tight. @@ -83,6 +80,3 @@ class W3DProjectileStreamDraw : public DrawModule SegmentedLineClass *m_allLines[MAX_PROJECTILE_STREAM]; ///< Persist, so I can ensure they live a full cycle, and minimize re-creates by holding on Int m_linesValid; }; - -#endif - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h index bc72924606..58d0febbeb 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3DRopeDraw_H_ -#define __W3DRopeDraw_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" @@ -93,6 +90,3 @@ class W3DRopeDraw : public DrawModule, public RopeDrawInterface void buildSegments(); }; - -#endif // __W3DRopeDraw_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h index 02dbdfce62..5458195d7d 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _W3D_SCIENCE_MODEL_DRAW_H_ -#define _W3D_SCIENCE_MODEL_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" @@ -63,6 +60,3 @@ class W3DScienceModelDraw : public W3DModelDraw protected: }; - -#endif - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h index 84348872d2..44caa00fa8 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _W3D_SUPPLY_DRAW_H_ -#define _W3D_SUPPLY_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" @@ -65,6 +62,3 @@ class W3DSupplyDraw : public W3DModelDraw Int m_totalBones; Int m_lastNumberShown; }; - -#endif // _W3D_TRUCK_DRAW_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h index 50ef527f40..b01db7f931 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _W3D_TANK_DRAW_H_ -#define _W3D_TANK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "GameClient/ParticleSys.h" @@ -105,6 +102,3 @@ class W3DTankDraw : public W3DModelDraw void updateTreadObjects(void); ///< update pointers to sub-objects like treads. void updateTreadPositions(Real uvDelta); ///< update uv coordinates on each tread }; - -#endif // _W3D_TANK_DRAW_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h index df48c1782f..a69530f3f8 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _W3D_TANKTRUCK_DRAW_H_ -#define _W3D_TANKTRUCK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "Common/AudioEventRTS.h" @@ -152,6 +149,3 @@ class W3DTankTruckDraw : public W3DModelDraw void updateTreadObjects(void); ///< update pointers to sub-objects like treads. void updateTreadPositions(Real uvDelta); ///< update uv coordinates on each tread }; - -#endif // _W3D_TANKTRUCK_DRAW_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h index 4f1aa84b3a..335f12a86d 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3DTRACERDRAW_H_ -#define __W3DTRACERDRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" @@ -73,6 +70,3 @@ class W3DTracerDraw : public DrawModule, public TracerDrawInterface Real m_opacity; ///< opacity of the tracer }; - -#endif // __W3DTRACERDRAW_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h index 604fd0a585..510a375a7f 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _W3D_TRUCK_DRAW_H_ -#define _W3D_TRUCK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "Common/AudioEventRTS.h" @@ -141,6 +138,3 @@ class W3DTruckDraw : public W3DModelDraw void enableEmitters( Bool enable ); ///< stop creating debris from the tank treads void updateBones( void ); }; - -#endif // _W3D_TRUCK_DRAW_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h index 93119a37ee..3e56c41f69 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h @@ -28,9 +28,6 @@ #pragma once -#ifndef TERRAINTEX_H -#define TERRAINTEX_H - //#define DO_8STAGE_TERRAIN_PASS //optimized terrain rendering for Nvidia based cards #include "WW3D2/texture.h" @@ -141,7 +138,3 @@ class CloudMapTerrainTextureClass : public TextureClass void restore(void); }; - - - -#endif //TEXTURE_H diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h index fdce9faf22..2912c673ca 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h @@ -28,9 +28,6 @@ #pragma once -#ifndef TileData_H -#define TileData_H - #include #include "Lib/BaseType.h" @@ -104,5 +101,3 @@ class TileData : public RefCountClass Bool hasRGBDataForWidth(Int width); UnsignedByte *getRGBDataForWidth(Int width); }; - -#endif diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h index a609dc14bc..baae21cb17 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h @@ -44,9 +44,6 @@ #pragma once -#ifndef W3DASSETMANAGER_H -#define W3DASSETMANAGER_H - #include "assetmgr.h" #include "Lib/BaseType.h" @@ -113,6 +110,3 @@ class W3DAssetManager: public WW3DAssetManager void Recolor_ParticleEmitter(RenderObjClass *robj, const Vector3 &hsv_shift); void Recolor_Asset(RenderObjClass *robj, const Vector3 &hsv_shift);*/ }; - -#endif - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h index 80459d302d..978eff7386 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h @@ -38,8 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_W3DASSETMANAGEREXPOSED_ -#define _H_W3DASSETMANAGEREXPOSED_ // INCLUDES /////////////////////////////////////////////////////////////////// // DEFINES //////////////////////////////////////////////////////////////////// @@ -52,5 +50,3 @@ // so this function is here. It should only be called by the particle editor, // @todo Remove this function when we are no longer editing particles. void ReloadAllTextures(void); - -#endif /* _H_W3DASSETMANAGEREXPOSED_ */ diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h index ccad86647a..8227e1a272 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h @@ -44,9 +44,6 @@ #pragma once -#ifndef __W3DBIB_BUFFER_H_ -#define __W3DBIB_BUFFER_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -131,5 +128,3 @@ friend class HeightMapRenderObjClass; void allocateBibBuffers(void); ///< Allocates the buffers. void freeBibBuffers(void); ///< Frees the index and vertex buffers. }; - -#endif // end __W3DBIB_BUFFER_H_ diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h index 6f13ad2728..ad5359665f 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h @@ -44,9 +44,6 @@ #pragma once -#ifndef __W3DBRIDGE_BUFFER_H_ -#define __W3DBRIDGE_BUFFER_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -187,5 +184,3 @@ friend class HeightMapRenderObjClass; void cull(CameraClass * camera); ///< Culls the bridges. void freeBridgeBuffers(void); ///< Frees the index and vertex buffers. }; - -#endif // end __W3DBRIDGE_BUFFER_H_ diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h index 7f7f915c88..40e18524de 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _W3D_VERTEX_BUFFER_MANAGER -#define _W3D_VERTEX_BUFFER_MANAGER - #include "Lib/BaseType.h" #include "dx8vertexbuffer.h" #include "dx8indexbuffer.h" @@ -185,5 +182,3 @@ class W3DBufferManager }; extern W3DBufferManager *TheW3DBufferManager; //singleton - -#endif //_W3D_VERTEX_BUFFER_MANAGER diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h index 707081a37a..1682a72178 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h @@ -44,9 +44,6 @@ #pragma once -#ifndef __W3DCUSTOM_EDGING_H_ -#define __W3DCUSTOM_EDGING_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -107,5 +104,3 @@ friend class HeightMapRenderObjClass; void freeEdgingBuffers(void); ///< Frees the index and vertex buffers. void loadEdgingsInVertexAndIndexBuffers(WorldHeightMap *pMap, Int minX, Int maxX, Int minY, Int maxY); }; - -#endif // end __W3DCUSTOM_EDGING_H_ diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h index ef2bc8ee61..3786750238 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h @@ -24,13 +24,8 @@ #pragma once -#ifndef __W3DCUSTOMSCENE_H_ -#define __W3DCUSTOMSCENE_H_ - enum CustomScenePassModes CPP_11(: Int) { SCENE_PASS_DEFAULT, SCENE_PASS_ALPHA_MASK }; - -#endif //W3DCUSTOMSCENE diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h index 95bbdc38cd..fed9f5c571 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h @@ -43,10 +43,6 @@ #pragma once -#ifndef __W3DDEVICE_GAMECLIENT_W3DDEBUGDISPLAY_H -#define __W3DDEVICE_GAMECLIENT_W3DDEBUGDISPLAY_H - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -98,7 +94,3 @@ class W3DDebugDisplay : public DebugDisplay //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - - -#endif // __W3DDEVICE_GAMECLIENT_W3DDEBUGDISPLAY_H diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h index 1b4f486aa1..80fe0dc65b 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __W3D_DEBUG_ICONS_H_ -#define __W3D_DEBUG_ICONS_H_ - #include "always.h" #include "rendobj.h" #include "vertmaterial.h" @@ -77,5 +73,3 @@ class W3DDebugIcons : public RenderObjClass static void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); }; #endif // RTS_DEBUG - -#endif // end __W3D_DEBUG_ICONS_H_ diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h index 7f4cdeacee..018e27ef81 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h @@ -33,9 +33,6 @@ #pragma once -#ifndef __W3DDISPLAY_H_ -#define __W3DDISPLAY_H_ - #include "GameClient/Display.h" #include "WW3D2/lightenvironment.h" @@ -202,5 +199,3 @@ class W3DDisplay : public Display W3DDebugDisplay *m_nativeDebugDisplay; ///< W3D specific debug display interface }; - -#endif // end __W3DDISPLAY_H_ diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h index e86909b6d8..c08629bb4d 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h @@ -47,9 +47,6 @@ #pragma once -#ifndef __W3DDISPLAYSTRING_H_ -#define __W3DDISPLAYSTRING_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -119,6 +116,3 @@ class W3DDisplayString : public DisplayString inline void W3DDisplayString::usingResources( UnsignedInt frame ) { m_lastResourceFrame = frame; } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __W3DDISPLAYSTRING_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h index 9ecc561e2c..4c52fe44f9 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _W3DDISPLAYSTRINGMANAGER_H_ -#define _W3DDISPLAYSTRINGMANAGER_H_ - #include "GameClient/DisplayStringManager.h" #include "W3DDevice/GameClient/W3DDisplayString.h" @@ -76,6 +73,3 @@ class W3DDisplayStringManager : public DisplayStringManager DisplayString *m_formationLetterDisplayString; }; - -#endif // _W3DDISPLAYSTRINGMANAGER_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h index b75c63b297..deed969ea7 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h @@ -28,9 +28,6 @@ #pragma once -#ifndef W3D_DYNAMIC_LIGHT_H -#define W3D_DYNAMIC_LIGHT_H - #include "WW3D2/light.h" #include "Lib/BaseType.h" class HeightMapRenderObjClass; @@ -81,7 +78,3 @@ friend class HeightMapRenderObjClass; // Cull returns true if the terrain vertex at x,y is outside of the light's influence. Bool cull(Int x, Int y ) {return (xm_maxX||y>m_maxY);} }; - - - -#endif //TEXTURE_H diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h index 04f31346a1..9005e915cc 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h @@ -31,12 +31,8 @@ // /////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __W3DFILESYSTEM_H_ -#define __W3DFILESYSTEM_H_ - #include "WWLib/ffactory.h" #include "Common/ArchiveFileSystem.h" #include "Common/file.h" @@ -100,4 +96,3 @@ class W3DFileSystem : public FileFactoryClass { }; extern W3DFileSystem *TheW3DFileSystem; -#endif diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h index bf67cb32b3..d3fd1d245c 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __W3DGUICALLBACKS_H_ -#define __W3DGUICALLBACKS_H_ - class GameWindow; class WindowLayout; class WinInstanceData; @@ -67,6 +64,3 @@ extern void W3DNoDraw( GameWindow *window, WinInstanceData *instData ); extern void W3DDrawMapPreview( GameWindow *window, WinInstanceData *instData ); void W3DMainMenuInit( WindowLayout *layout, void *userData ); - -#endif // __W3DGUICALLBACKS_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h index 69114d2f79..71a5c97e74 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __W3DGADGET_H_ -#define __W3DGADGET_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -89,6 +86,3 @@ extern void W3DGadgetStaticTextDraw( GameWindow *window, WinInstanceData *instDa extern void W3DGadgetStaticTextImageDraw( GameWindow *window, WinInstanceData *instData ); extern void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData ); extern void W3DGadgetTextEntryImageDraw( GameWindow *window, WinInstanceData *instData ); - -#endif // __W3DGADGET_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h index 848dbd7198..5190395b81 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h @@ -34,9 +34,6 @@ #pragma once -#ifndef __W3DGAMEINTERFACE_H_ -#define __W3DGAMEINTERFACE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -126,5 +123,3 @@ inline Mouse *W3DGameClient::createMouse( void ) TheWin32Mouse = mouse; ///< global cheat for the WndProc() return mouse; } - -#endif // end __W3DGAMEINTERFACE_H_ diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h index b053e9e2a0..6c79aa8888 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __W3DGAMEFONT_H_ -#define __W3DGAMEFONT_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -80,6 +77,3 @@ class W3DFontLibrary : public FontLibrary // INLINING /////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __W3DGAMEFONT_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h index 4e9530f703..b72d30f9d6 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __W3DGAMEWINDOW_H_ -#define __W3DGAMEWINDOW_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -100,6 +97,3 @@ class W3DGameWindow : public GameWindow // EXTERNALS ////////////////////////////////////////////////////////////////// extern void W3DGameWinDefaultDraw( GameWindow *window, WinInstanceData *instData ); - -#endif // __W3DGAMEWINDOW_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h index afb335c74f..6fba18ef01 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h @@ -31,9 +31,6 @@ #pragma once -#ifndef __W3DGAMEWINDOWMANAGER_H_ -#define __W3DGAMEWINDOWMANAGER_H_ - #include "GameClient/GameWindowManager.h" #include "W3DDevice/GameClient/W3DGameWindow.h" #include "W3DDevice/GameClient/W3DGadget.h" @@ -107,6 +104,3 @@ inline GameWinDrawFunc W3DGameWindowManager::getStaticTextImageDrawFunc( void ) inline GameWinDrawFunc W3DGameWindowManager::getStaticTextDrawFunc( void ) { return W3DGadgetStaticTextDraw; } inline GameWinDrawFunc W3DGameWindowManager::getTextEntryImageDrawFunc( void ) { return W3DGadgetTextEntryImageDraw; } inline GameWinDrawFunc W3DGameWindowManager::getTextEntryDrawFunc( void ) { return W3DGadgetTextEntryDraw; } - -#endif // __W3DGAMEWINDOWMANAGER_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h index c7b3a8490e..1a8fe3a24f 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h @@ -33,9 +33,6 @@ #pragma once -#ifndef __W3DINGAMEUI_H_ -#define __W3DINGAMEUI_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -85,5 +82,3 @@ class W3DInGameUI : public InGameUI RenderObjClass *m_buildingPlacementArrow; }; - -#endif // end __W3DINGAMEUI_H_ diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h index 2291792aba..62f23b2ecd 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __W3DMirror_H_ -#define __W3DMirror_H_ - #include "always.h" #include "rendobj.h" #include "w3d_file.h" @@ -115,5 +111,3 @@ class MirrorRenderObjClass : public RenderObjClass void renderWater(void); void renderWaterMesh(void); }; - -#endif // end __W3DMirror_H_ diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h index 77a910c32a..bbb14f2b9a 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __W3DMOUSE_H_ -#define __W3DMOUSE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -110,5 +107,3 @@ class W3DMouse : public Win32Mouse // INLINING /////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __W3DMOUSE_H_ diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h index d7231a4646..fb66197064 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h @@ -27,9 +27,6 @@ #pragma once -#ifndef __W3DParticleSys_H_ -#define __W3DParticleSys_H_ - #include "GameClient/ParticleSys.h" #include "WW3D2/pointgr.h" #include "WW3D2/streak.h" @@ -63,5 +60,3 @@ class W3DParticleSystemManager : public ParticleSystemManager ShareBufferClass *m_angleBuffer; ///< array of particle orientations Bool m_readyToRender; ///< if true, it is OK to render }; - -#endif // end __W3DParticleSys_H_ diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h index d1d9b42ec7..f7162e23fd 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __W3DPOLY_H_ -#define __W3DPOLY_H_ - #include "vector3.h" #include "plane.h" #include "simplevec.h" @@ -66,5 +63,3 @@ class ClipPolyClass SimpleDynVecClass Verts; }; - -#endif //__W3DPOLY_H_ diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h index 6546d18695..b9697f2ba2 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h @@ -30,10 +30,8 @@ // // /////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef __W3D_PROJECTED_SHADOW_H_ -#define __W3D_PROJECTED_SHADOW_H_ +#pragma once #include "GameClient/Shadow.h" @@ -136,5 +134,3 @@ class W3DProjectedShadow : public Shadow Int m_flags; /// custom rendering flags virtual void release(void) {TheW3DProjectedShadowManager->removeShadow(this);} ///; } inline AudioManager *Win32GameEngine::createAudioManager( void ) { return NEW MilesAudioManager; } - -#endif // end __WIN32GAMEENGINE_H_ diff --git a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h index 90e004f1ab..f4641a287b 100644 --- a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h +++ b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __WIN32DIKEYBOARD_H_ -#define __WIN32DIKEYBOARD_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #ifndef DIRECTINPUT_VERSION # define DIRECTINPUT_VERSION 0x800 @@ -101,6 +98,3 @@ class DirectInputKeyboard : public Keyboard // INLINING /////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __WIN32DIKEYBOARD_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h index 09a2e40877..a0c531ff77 100644 --- a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h +++ b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h @@ -39,9 +39,6 @@ #pragma once -#ifndef __WIN32DIMOUSE_H_ -#define __WIN32DIMOUSE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #ifndef DIRECTINPUT_VERSION # define DIRECTINPUT_VERSION 0x800 @@ -100,6 +97,3 @@ class DirectInputMouse : public Mouse // INLINING /////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __WIN32DIMOUSE_H_ - diff --git a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h index 1f7b83e36a..2ba373ba1d 100644 --- a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h +++ b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __WIN32MOUSE_H_ -#define __WIN32MOUSE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -115,6 +112,3 @@ class Win32Mouse : public Mouse // INLINING /////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __WIN32MOUSE_H_ - diff --git a/Generals/Code/Libraries/Include/Lib/BaseType.h b/Generals/Code/Libraries/Include/Lib/BaseType.h index f704dab8f4..79c091ada8 100644 --- a/Generals/Code/Libraries/Include/Lib/BaseType.h +++ b/Generals/Code/Libraries/Include/Lib/BaseType.h @@ -26,11 +26,8 @@ /////////////////////////////////////////////////////////////////////////////// // tell the compiler to only load this file once -#pragma once - -#ifndef _BASE_TYPE_H_ -#define _BASE_TYPE_H_ +#pragma once #include "Lib/BaseTypeCore.h" #include "Lib/trig.h" @@ -385,5 +382,3 @@ struct RGBAColorInt UnsignedInt red, green, blue, alpha; // range between 0 and 255 }; - -#endif // _BASE_TYPE_H_ diff --git a/Generals/Code/Libraries/Include/Lib/trig.h b/Generals/Code/Libraries/Include/Lib/trig.h index a84f327005..569f1ff349 100644 --- a/Generals/Code/Libraries/Include/Lib/trig.h +++ b/Generals/Code/Libraries/Include/Lib/trig.h @@ -21,13 +21,10 @@ // Author: Sondra Iverson, March 1998 // Converted to Generals by Matthew D. Campbell, February 2002 -#ifndef _TRIG_H_ -#define _TRIG_H_ +#pragma once Real Sin(Real); Real Cos(Real); Real Tan(Real); Real ACos(Real); Real ASin(Real x); - -#endif // _TRIG_H_ diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h index 1b88047d1e..9098dfb60e 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h @@ -36,12 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef AABTREEBUILDER_H -#define AABTREEBUILDER_H - #include "always.h" #include "vector3.h" #include "Vector3i.h" @@ -200,9 +196,3 @@ class AABTreeBuilderClass friend class AABTreeClass; }; - - - - -#endif //AABTREEBUILDER_H - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h index 06fc905d96..add343dadc 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h @@ -40,9 +40,6 @@ #pragma once -#ifndef ANIMOBJ_H -#define ANIMOBJ_H - #include "always.h" #include "composite.h" #include "htree.h" @@ -321,7 +318,3 @@ inline void Animatable3DObjClass::Combo_Update( const Matrix3D & root, HAnimComb } Set_Hierarchy_Valid(true); } - - - -#endif //ANIMOBJ_H diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h index d0bd5f626e..fd7964f20b 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef ASSETMGR_H -#define ASSETMGR_H - #include "always.h" #include "Vector.H" #include "htreemgr.h" @@ -435,5 +431,3 @@ class WW3DAssetManager // Font3DInstance need access to the Font3DData friend class Font3DInstanceClass; }; - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h index 2c2e956d44..b09e595ecb 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h @@ -36,9 +36,6 @@ #pragma once -#ifndef BMP2D_H -#define BMP2D_H - #include "dynamesh.h" class Bitmap2DObjClass : public DynamicScreenMeshClass @@ -53,5 +50,3 @@ class Bitmap2DObjClass : public DynamicScreenMeshClass virtual RenderObjClass * Clone(void) const; virtual int Class_ID(void) const { return CLASSID_BITMAP2D; } }; - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h index 9949e216c2..2ef2495017 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h @@ -36,9 +36,6 @@ #pragma once -#ifndef BOXROBJ_H -#define BOXROBJ_H - #include "always.h" #include "rendobj.h" #include "w3d_file.h" @@ -257,9 +254,3 @@ class BoxPrototypeClass : public W3DMPO, public PrototypeClass ** Instance of the loader which the asset manager installs */ extern BoxLoaderClass _BoxLoader; - - - - -#endif - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h index a1a1bbabca..db25bf9260 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h @@ -45,9 +45,6 @@ #pragma once -#ifndef CAMERA_H -#define CAMERA_H - #include "always.h" #include "rendobj.h" #include "plane.h" @@ -449,6 +446,3 @@ inline const Vector3 * CameraClass::Get_View_Space_Frustum_Corners(void) const const FrustumClass & frustum = Get_View_Space_Frustum(); return frustum.Corners; } - - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h index 4db8ee8bcd..5c59019771 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h @@ -18,9 +18,6 @@ #pragma once -#ifndef DAZZLE_H -#define DAZZLE_H - #include "always.h" #include "vector3.h" #include "matrix3d.h" @@ -392,5 +389,3 @@ class DazzleLoaderClass : public PrototypeLoaderClass }; extern DazzleLoaderClass _DazzleLoader; - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h index 148c3f1733..2b3b92a10e 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h @@ -18,9 +18,6 @@ // 08/06/02 KM Added cube map and volume texture support -#ifndef DDSFILE_H -#define DDSFILE_H - #pragma once #include "always.h" @@ -277,5 +274,3 @@ class DDSFileClass }; // ---------------------------------------------------------------------------- - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h index 53765c4357..c18d46bfad 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h @@ -38,9 +38,6 @@ #pragma once -#ifndef DECALMSH_H -#define DECALMSH_H - #include "always.h" #include "bittype.h" #include "simplevec.h" @@ -286,7 +283,3 @@ inline uint32 SkinDecalMeshClass::Get_Decal_ID(int decal_index) { return Decals[decal_index].DecalID; } - - -#endif //DECALMSH_H - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h index fe3e5b98fd..b988cf269a 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h @@ -39,9 +39,6 @@ #pragma once -#ifndef DX8CAPS_H -#define DX8CAPS_H - #include "always.h" #include "ww3dformat.h" #include @@ -284,6 +281,3 @@ class DX8Caps int MaxSimultaneousTextures; IDirect3D8* Direct3D; // warning XDK name conflict KJM }; - - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h index 5e34850b22..a7adf40f71 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h @@ -39,12 +39,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef DX8_FVF_H -#define DX8_FVF_H - #include "always.h" #include #ifdef WWDEBUG @@ -283,6 +279,3 @@ class FVFInfoClass : public W3DMPO inline void Set_FVF(unsigned fvf) const { FVF=fvf; } inline void Set_FVF_Size(unsigned size) const { fvf_size=size; } }; - - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h index 32b5678e91..4d78c097a1 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h @@ -38,9 +38,6 @@ #pragma once -#ifndef DX8INDEXBUFFER_H -#define DX8INDEXBUFFER_H - #include "always.h" #include "wwdebug.h" #include "refcount.h" @@ -201,6 +198,3 @@ class SortingIndexBufferClass : public IndexBufferClass protected: unsigned short* index_buffer; }; - -#endif //DX8INDEXBUFFER_H - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h index 513c4b8ee0..5e8b1b932c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h @@ -36,12 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef DX8_RENDERER_H -#define DX8_RENDERER_H - #include "always.h" #include "wwstring.h" #include "simplevec.h" @@ -337,5 +333,3 @@ class DX8MeshRendererClass }; extern DX8MeshRendererClass TheDX8MeshRenderer; - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h index 5dda0eff70..1059e5521f 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h @@ -38,9 +38,6 @@ #pragma once -#ifndef DX8TEXTUREMANAGER_H -#define DX8TEXTUREMANAGER_H - #include "always.h" #include "texture.h" #include "dx8wrapper.h" @@ -135,5 +132,3 @@ class DX8TextureManagerClass private: static TextureTrackerList Managed_Textures; }; - -#endif // ifdef TEXTUREMANAGER diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h index d90e76437a..9c77bd48ec 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h @@ -38,9 +38,6 @@ #pragma once -#ifndef DX8VERTEXBUFFER_H -#define DX8VERTEXBUFFER_H - #include "always.h" #include "wwdebug.h" #include "refcount.h" @@ -257,6 +254,3 @@ class SortingVertexBufferClass : public VertexBufferClass public: SortingVertexBufferClass(unsigned short VertexCount); }; - - -#endif //DX8VERTEXBUFFER_H diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h index c5fbb6220a..699532358d 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h @@ -38,9 +38,6 @@ #pragma once -#ifndef DX8_WRAPPER_H -#define DX8_WRAPPER_H - #include "always.h" #include "dllist.h" #include "d3d8.h" @@ -1340,6 +1337,3 @@ WWINLINE RenderStateStruct& RenderStateStruct::operator= (const RenderStateStruc return *this; } - - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h index 671dda56e7..203caef9ef 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef HANIMMGR_H -#define HANIMMGR_H - #include "always.h" #include "hash.h" #include "wwstring.h" @@ -111,5 +107,3 @@ class HAnimManagerIterator : public HashTableIteratorClass { HAnimManagerIterator( HAnimManagerClass & manager ) : HashTableIteratorClass( *manager.AnimPtrTable ) {} HAnimClass * Get_Current_Anim( void ); }; - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h index 1eeb3f43ad..c80f7ebb3b 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef HLOD_H -#define HLOD_H - #ifndef ANIMOBJ_H #include "animobj.h" #endif @@ -388,6 +384,3 @@ class HLodPrototypeClass : public W3DMPO, public PrototypeClass ** Instance of the loaders which the asset manager install */ extern HLodLoaderClass _HLodLoader; - - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h index fae2bf0a6f..984fc2c4cf 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h @@ -38,9 +38,6 @@ #pragma once -#ifndef HMORPHANIM_H -#define HMORPHANIM_H - #include "always.h" #include "hanim.h" #include "simplevec.h" @@ -180,9 +177,3 @@ class TimeCodedMorphKeysClass friend class HMorphAnimClass; }; - - - -#endif - - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h index ce514e5e11..7e1642a12c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h @@ -38,9 +38,6 @@ #pragma once -#ifndef HRAWANIM_H -#define HRAWANIM_H - #include "always.h" #include "hanim.h" @@ -131,9 +128,3 @@ class HRawAnimClass : public HAnimClass void add_bit_channel(BitChannelClass * newchan); }; - - - - -#endif - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h index af26b8ce57..981c5db91c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef HTREEMGR_H -#define HTREEMGR_H - #include "always.h" #include "bittype.h" @@ -88,6 +84,3 @@ class HTreeManagerClass HTreeClass * TreePtr[MAX_TREES]; // TODO: no no! make this dynamic... }; - - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h index 0b80cd382c..4e0099d19c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef LIGHT_H -#define LIGHT_H - #include "always.h" #include "rendobj.h" #include "w3derr.h" @@ -177,5 +173,3 @@ class LightClass : public RenderObjClass Vector3 SpotDirection; //bool Donut; ///does this light only apply at edges }; - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h index 16aba18ea2..832d2ce4d6 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h @@ -38,9 +38,6 @@ #pragma once -#ifndef LIGHTENVIRONMENT_H -#define LIGHTENVIRONMENT_H - #include "always.h" #include "vector3.h" @@ -157,7 +154,3 @@ class LightEnvironmentClass OutputLightStruct OutputLights[MAX_LIGHTS]; // ouput lights }; - - -#endif //LIGHTENVIRONMENT_H - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h index 63a6ac4556..f9a33656f5 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h @@ -39,9 +39,6 @@ #pragma once -#ifndef VERTEXMAPPER_H -#define VERTEXMAPPER_H - #include "refcount.h" #include "w3d_file.h" #include "w3derr.h" @@ -495,5 +492,3 @@ class BumpEnvTextureMapperClass : public LinearOffsetTextureMapperClass ** Utility functions */ void Reset_All_Texture_Mappers(RenderObjClass *robj, bool make_unique); - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h index 41b888efe3..ab7dcfc4fa 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h @@ -38,9 +38,6 @@ #pragma once -#ifndef MATPASS_H -#define MATPASS_H - #ifndef REFCOUNT_H #include "refcount.h" #endif @@ -124,6 +121,3 @@ inline TextureClass * MaterialPassClass::Peek_Texture(int stage) const WWASSERT(stage < MAX_TEX_STAGES); return Texture[stage]; } - - -#endif // MATPASS_H diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h index 84d9e502a6..1e9f8ecc21 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h @@ -37,9 +37,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef MATRIXMAPPER_H -#define MATRIXMAPPER_H +#pragma once #include "always.h" #include "bittype.h" @@ -140,5 +138,3 @@ inline const Matrix4x4 & MatrixMapperClass::Get_Texture_Transform(void) const { return ViewToTexture; } - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h index 6c8c695e9d..00e019f094 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef MESH_H -#define MESH_H - #include "always.h" #include "rendobj.h" #include "bittype.h" @@ -206,6 +202,3 @@ inline MeshModelClass * MeshClass::Peek_Model(void) // model. This is useful for stuff like making a RenderObjects' polys sort. //void Set_MeshModel_Flag(RenderObjClass *robj, MeshModelClass::FlagsType flag, int onoff); void Set_MeshModel_Flag(RenderObjClass *robj, int flag, int onoff); - -#endif /*MESH_H*/ - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h index 5e3678b13f..bf07f427bd 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h @@ -40,9 +40,6 @@ #pragma once -#ifndef MESHBUILD_H -#define MESHBUILD_H - #include "always.h" #include "vector2.h" #include "vector3.h" @@ -380,5 +377,3 @@ inline const MeshBuilderClass::MeshStatsStruct & MeshBuilderClass::Get_Mesh_Stat assert(State == STATE_MESH_PROCESSED); return Stats; } - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h index fcfe8534ac..3f2d7637d9 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h @@ -36,8 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef MESHGEOMETRY_H -#define MESHGEOMETRY_H +#pragma once #include "always.h" #include "refcount.h" @@ -286,6 +285,3 @@ inline uint8 MeshGeometryClass::Get_Poly_Surface_Type(int poly_index) const uint8 *type = PolySurfaceType->Get_Array(); return type[poly_index]; } - -#endif //MESHGEOMETRY_H - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h index d63338f661..2926692389 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h @@ -36,8 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef MESHMATDESC_H -#define MESHMATDESC_H +#pragma once #include "always.h" #include "vector2.h" @@ -490,6 +489,3 @@ inline void MeshMatDescClass::Disable_Backface_Culling(void) } } } - -#endif //MESHMATDESC_H - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h index 6aa03693fa..2a48ea3b17 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef MESHMDL_H -#define MESHMDL_H - #include "vector2.h" #include "vector3.h" #include "vector4.h" @@ -384,8 +380,3 @@ inline void MeshModelClass::Apply_Deformation (const SphereClass &sphere, float MeshDeformer.Apply (*this, sphere, percent, additive); } #endif - - - -#endif - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h index a5a3cc27bb..5a3e7a9b0c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef MOTCHAN_H -#define MOTCHAN_H - #include "always.h" #include "bittype.h" #include "w3d_file.h" @@ -323,6 +319,3 @@ class TimeCodedBitChannelClass : public W3DMPO friend class HCompressedAnimClass; }; - - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h index 4730b0fbe9..4817c36236 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef NULL_H -#define NULL_H - #ifndef RENDOBJ_H #include "rendobj.h" #endif @@ -97,7 +93,3 @@ class NullLoaderClass : public PrototypeLoaderClass ** automatically install at creation time */ extern NullLoaderClass _NullLoader; - - -#endif - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h index 6f3c919e4a..a70cf24f65 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h @@ -33,10 +33,8 @@ *-------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef PART_BUF_H -#define PART_BUF_H +#pragma once #include "rendobj.h" #include "pointgr.h" @@ -427,6 +425,3 @@ class ParticleBufferClass : public RenderObjClass // being per-buffer later if we wish. Default is NO_MAX_SCREEN_SIZE. static float LODMaxScreenSizes[17]; }; - -#endif // PART_BUF_H - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h index 166cb94c77..96f6cf4ce8 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h @@ -33,10 +33,8 @@ *-------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef PART_EMT_H -#define PART_EMT_H +#pragma once #include "rendobj.h" #include "RANDOM.H" @@ -337,7 +335,3 @@ class ParticleEmitterClass : public RenderObjClass // all particle emitters. static bool DebugDisable; }; - -#endif // PART_EMT_H - - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h index fce723ec72..9d319cf38c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h @@ -32,13 +32,8 @@ * * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __PART_EMT_LDR_H -#define __PART_EMT_LDR_H - - #include "proto.h" #include "rendobj.h" #include "w3d_file.h" @@ -368,6 +363,3 @@ class ParticleEmitterLoaderClass : public PrototypeLoaderClass // Global variables // extern ParticleEmitterLoaderClass _ParticleEmitterLoader; - - -#endif //__PART_EMT_LDR_H diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h index af30c886c7..a9bf9a5169 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef RENDER2D_H -#define RENDER2D_H - #include "always.h" #include "simplevec.h" #include "vector2.h" @@ -232,5 +228,3 @@ class Render2DTextClass : public Render2DClass { void Draw_Char( WCHAR ch, unsigned long color ); }; - -#endif // RENDER2D_H diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h index 6e56ff1a52..1387caaad5 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h @@ -37,13 +37,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef RINFO_H -#define RINFO_H - - #include "always.h" #include "bittype.h" #include "ww3d.h" @@ -161,7 +156,3 @@ class SpecialRenderInfoClass : public RenderInfoClass SpecialRenderInfoClass & operator = (const RenderInfoClass &); }; - - - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h index fc802936d5..8f7d0b78c7 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef SCENE_H -#define SCENE_H - #include "always.h" #include "refcount.h" #include "vector3.h" @@ -263,5 +259,3 @@ class SimpleSceneClass : public SceneClass virtual void Customized_Render(RenderInfoClass & rinfo); virtual void Post_Render_Processing(RenderInfoClass& rinfo); }; - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.h index cc8fe6f4be..634a948762 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef SHADER_H -#define SHADER_H - #include "always.h" class DX8Wrapper; @@ -460,5 +456,3 @@ inline void ShaderClass::Reset() Set_Post_Detail_Alpha_Func(DETAILALPHA_DISABLE); Set_NPatch_Enable(NPATCH_DISABLE); } - -#endif //SHADER_H diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h index 93097a0e7d..fec9b565c5 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h @@ -18,9 +18,6 @@ #pragma once -#ifndef SORTING_RENDERER_H -#define SORTING_RENDERER_H - #include "always.h" class SortingNodeStruct; @@ -63,6 +60,3 @@ class SortingRendererClass static void _Enable_Triangle_Draw(bool enable) { _EnableTriangleDraw=enable; } static bool _Is_Triangle_Draw_Enabled() { return _EnableTriangleDraw; } }; - -#endif - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texproject.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texproject.h index 4b1d43f386..88ebc09e64 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texproject.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texproject.h @@ -38,9 +38,6 @@ #pragma once -#ifndef TEXPROJECT_H -#define TEXPROJECT_H - #include "always.h" #include "matrix3d.h" #include "matrix4.h" @@ -231,7 +228,3 @@ class TexProjectClass : public ProjectorClass, public CullableClass, public Mult */ typedef RefMultiListClass TexProjListClass; typedef RefMultiListIterator TexProjListIterator; - - -#endif - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.h index b677bb9826..3f2f2de4bd 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef TEXTURE_H -#define TEXTURE_H - #include "always.h" #include "refcount.h" #include "chunkio.h" @@ -262,5 +258,3 @@ void Save_Texture(TextureClass * texture, ChunkSaveClass & csave); // TheSuperHackers @todo TextureBaseClass abstraction typedef TextureClass TextureBaseClass; - -#endif //TEXTURE_H diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h index e3566cc23b..e3e9857267 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h @@ -37,8 +37,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef TEXTUREFILTER_H -#define TEXTUREFILTER_H +#pragma once #ifndef DX8_WRAPPER_H //#include "dx8wrapper.h" @@ -129,5 +128,3 @@ class TextureFilterClass TxtAddrMode UAddressMode; TxtAddrMode VAddressMode; }; - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h index 5c3866b097..534dc47018 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h @@ -16,9 +16,6 @@ ** along with this program. If not, see . */ -#ifndef TEXTURELOADER_H -#define TEXTURELOADER_H - #pragma once #include "always.h" @@ -134,7 +131,3 @@ class TextureLoadTaskClass : public W3DMPO void Set_D3D_Texture(IDirect3DTexture8* texture); }; - -#endif - - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h index ca4fb232fe..b61e427117 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h @@ -16,9 +16,6 @@ ** along with this program. If not, see . */ -#ifndef TEXTURETHUMBNAIL_H -#define TEXTURETHUMBNAIL_H - #pragma once #include "always.h" @@ -49,5 +46,3 @@ class ThumbnailClass }; // ---------------------------------------------------------------------------- - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h index e9b918dd9e..b0575f1a46 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef VERTMATERIAL_H -#define VERTMATERIAL_H - #include "always.h" #include "refcount.h" @@ -315,6 +311,3 @@ inline bool VertexMaterialClass::Are_Mappers_Time_Variant(void) const } return false; } - -#endif //VERTMATERIAL_H - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h index a13d450c2a..d550e2ddf0 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef W3D_FILE_H -#define W3D_FILE_H - #include "always.h" #include "bittype.h" #include "iostruct.h" @@ -2275,6 +2271,3 @@ struct W3dShdSubMeshHeaderStruct ** Include the obsolete structures and chunk ID's */ #include "w3d_obsolete.h" - - -#endif // W3D_FILE_H diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h index c4fd44916d..0d99448e53 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef WW3D_H -#define WW3D_H - #include "always.h" #include "vector3.h" #include "layer.h" @@ -456,7 +452,3 @@ struct RenderStatistics long UserStat1; long UserStat2; }; - - - -#endif diff --git a/Generals/Code/Main/WinMain.h b/Generals/Code/Main/WinMain.h index b580e4da60..ad23e9ffdc 100644 --- a/Generals/Code/Main/WinMain.h +++ b/Generals/Code/Main/WinMain.h @@ -30,8 +30,7 @@ // /////////////////////////////////////////////////////////////////////////////// -#ifndef __WINMAIN_H_ -#define __WINMAIN_H_ +#pragma once // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -43,6 +42,3 @@ extern HINSTANCE ApplicationHInstance; ///< our application instance extern HWND ApplicationHWnd; ///< our application window handle extern Win32Mouse *TheWin32Mouse; ///< global for win32 mouse only! - -#endif // end __WINMAIN_H_ - diff --git a/Generals/Code/Tools/GUIEdit/Include/DialogProc.h b/Generals/Code/Tools/GUIEdit/Include/DialogProc.h index a388326a19..aab3989768 100644 --- a/Generals/Code/Tools/GUIEdit/Include/DialogProc.h +++ b/Generals/Code/Tools/GUIEdit/Include/DialogProc.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __DIALOGPROC_H_ -#define __DIALOGPROC_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -69,6 +66,3 @@ extern BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message, WPARAM wParam, LPARAM lParam ); extern BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message, WPARAM wParam, LPARAM lParam ); - -#endif // __DIALOGPROC_H_ - diff --git a/Generals/Code/Tools/GUIEdit/Include/EditWindow.h b/Generals/Code/Tools/GUIEdit/Include/EditWindow.h index c25db71e25..8d2a34503e 100644 --- a/Generals/Code/Tools/GUIEdit/Include/EditWindow.h +++ b/Generals/Code/Tools/GUIEdit/Include/EditWindow.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __EDITWINDOW_H_ -#define __EDITWINDOW_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #include @@ -203,6 +200,3 @@ inline ICoord2D EditWindow::getDragMoveOrigin( void ) { return m_dragMoveOrigin; // EXTERNALS ////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// extern EditWindow *TheEditWindow; ///< edit window singleton extern - -#endif // __EDITWINDOW_H_ - diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h b/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h index 46dd674c10..5432ab4fcf 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GUIEDIT_H_ -#define __GUIEDIT_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include #include @@ -374,6 +371,3 @@ inline AsciiString GUIEdit::getLayoutShutdown( void ) { return m_layoutShutdownS // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern GUIEdit *TheEditor; ///< editor application singleton - -#endif // __GUIEDIT_H_ - diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEditColor.h b/Generals/Code/Tools/GUIEdit/Include/GUIEditColor.h index 278ad862ac..13cd34a10c 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEditColor.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEditColor.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __GUIEDITCOLOR_H_ -#define __GUIEDITCOLOR_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -96,6 +93,3 @@ struct HSVColorReal // EXTERNALS ////////////////////////////////////////////////////////////////// extern RGBColorInt *SelectColor( Int red, Int green, Int blue, Int alpha, Int mouseX = 0, Int mouseY = 0 ); - -#endif // __GUIEDITCOLOR_H_ - diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h b/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h index 18e81ad4cd..dda18bf3ae 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __GUIEDITDISPLAY_H_ -#define __GUIEDITDISPLAY_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -137,6 +134,3 @@ class GUIEditDisplay : public Display // INLINING /////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GUIEDITDISPLAY_H_ - diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h b/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h index ab4461e747..d79cb6085e 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h @@ -34,9 +34,6 @@ #pragma once -#ifndef __GUIEDITWINDOWMANAGER_H_ -#define __GUIEDITWINDOWMANAGER_H_ - #include #include "W3DDevice/GameClient/W3DGameWindowManager.h" @@ -114,6 +111,3 @@ inline GameWindow *GUIEditWindowManager::getClipboardDupeList( void ) { return m // EXTERN ///////////////////////////////////////////////////////////////////////////////////////// extern GUIEditWindowManager *TheGUIEditWindowManager; ///< editor use only - -#endif // __GUIEDITWINDOWMANAGER_H_ - diff --git a/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h b/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h index d9532598de..c622a266c8 100644 --- a/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h +++ b/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __HIERARCHYVIEW_H_ -#define __HIERARCHYVIEW_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #include @@ -152,6 +149,3 @@ inline GameWindow *HierarchyView::getPopupTarget( void ) { return m_popupTarget; // EXTERNALS ////////////////////////////////////////////////////////////////// extern HierarchyView *TheHierarchyView; ///< singleton for our view - -#endif // __CONTROLPALETTE_H_ - diff --git a/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h b/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h index 40171d567b..550c035c87 100644 --- a/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h +++ b/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __LAYOUTSCHEME_H_ -#define __LAYOUTSCHEME_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -147,6 +144,3 @@ inline GameFont *LayoutScheme::getFont( void ) { return m_font; } // EXTERNALS ////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// extern LayoutScheme *TheDefaultScheme; - -#endif // end __LAYOUTSCHEME_H_ - diff --git a/Generals/Code/Tools/GUIEdit/Include/Properties.h b/Generals/Code/Tools/GUIEdit/Include/Properties.h index 4f93364dd4..dacacce825 100644 --- a/Generals/Code/Tools/GUIEdit/Include/Properties.h +++ b/Generals/Code/Tools/GUIEdit/Include/Properties.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __PROPERTIES_H_ -#define __PROPERTIES_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -425,6 +422,3 @@ extern Color GetPropsDisabledTextColor( void ); extern Color GetPropsDisabledTextBorderColor( void ); extern Color GetPropsHiliteTextColor( void ); extern Color GetPropsHiliteTextBorderColor( void ); - -#endif // __PROPERTIES_H_ - diff --git a/Generals/Code/Tools/GUIEdit/Include/WinMain.h b/Generals/Code/Tools/GUIEdit/Include/WinMain.h index 0fcb785ad6..219ea88a00 100644 --- a/Generals/Code/Tools/GUIEdit/Include/WinMain.h +++ b/Generals/Code/Tools/GUIEdit/Include/WinMain.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __WINMAIN_H_ -#define __WINMAIN_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -65,6 +62,3 @@ extern HWND ApplicationHWnd; ///< application main window handle extern HINSTANCE ApplicationHInstance; ///< application main instance handle extern Win32Mouse *TheWin32Mouse; ///< the mouse for win processing - -#endif // __WINMAIN_H_ - diff --git a/Generals/Code/Tools/ParticleEditor/CButtonShowColor.h b/Generals/Code/Tools/ParticleEditor/CButtonShowColor.h index acc01bf1c1..b11567c625 100644 --- a/Generals/Code/Tools/ParticleEditor/CButtonShowColor.h +++ b/Generals/Code/Tools/ParticleEditor/CButtonShowColor.h @@ -18,9 +18,6 @@ #pragma once -#ifndef _H_CBUTTONSHOWCOLOR_ -#define _H_CBUTTONSHOWCOLOR_ - #include "Lib/BaseType.h" class CButtonShowColor : public CButton @@ -44,5 +41,3 @@ class CButtonShowColor : public CButton DECLARE_MESSAGE_MAP(); }; - -#endif /* _H_CBUTTONSHOWCOLOR_ */ diff --git a/Generals/Code/Tools/ParticleEditor/CParticleEditorPage.h b/Generals/Code/Tools/ParticleEditor/CParticleEditorPage.h index 194e5bf0b5..2e933110eb 100644 --- a/Generals/Code/Tools/ParticleEditor/CParticleEditorPage.h +++ b/Generals/Code/Tools/ParticleEditor/CParticleEditorPage.h @@ -18,7 +18,6 @@ #pragma once - struct CParticleEditorPage : public CDialog { UINT m_templateID; diff --git a/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.h b/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.h index 4d0b2df8b7..5a3be36cca 100644 --- a/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.h +++ b/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.h @@ -32,8 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_EMISSIONTYPEPANELS_ -#define _H_EMISSIONTYPEPANELS_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" @@ -134,5 +132,3 @@ class EmissionPanelCylinder : public ISwapablePanel afx_msg void OnParticleSystemEdit(); DECLARE_MESSAGE_MAP() }; - -#endif /* _H_EMISSIONTYPEPANELS_ */ diff --git a/Generals/Code/Tools/ParticleEditor/ISwapablePanel.h b/Generals/Code/Tools/ParticleEditor/ISwapablePanel.h index 1224f1fc81..7d3dd89fcb 100644 --- a/Generals/Code/Tools/ParticleEditor/ISwapablePanel.h +++ b/Generals/Code/Tools/ParticleEditor/ISwapablePanel.h @@ -33,8 +33,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_ISWAPABLEPANEL_ -#define _H_ISWAPABLEPANEL_ #include "Lib/BaseType.h" @@ -50,5 +48,3 @@ interface ISwapablePanel : public CDialog virtual void performUpdate( IN Bool toUI ) = 0; virtual void InitPanel( void ) = 0; }; - -#endif /* _H_ISWAPABLEPANEL_ */ diff --git a/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.h b/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.h index f3a7776f69..4cd07683ea 100644 --- a/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.h +++ b/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.h @@ -32,8 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_MOREPARMSDIALOG_ -#define _H_MOREPARMSDIALOG_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" @@ -60,5 +58,3 @@ class MoreParmsDialog : public CDialog afx_msg void OnParticleSystemEdit(); DECLARE_MESSAGE_MAP() }; - -#endif /* _H_MOREPARMSDIALOG_ */ diff --git a/Generals/Code/Tools/ParticleEditor/ParticleEditor.h b/Generals/Code/Tools/ParticleEditor/ParticleEditor.h index 2400ce5fa5..5c2b350047 100644 --- a/Generals/Code/Tools/ParticleEditor/ParticleEditor.h +++ b/Generals/Code/Tools/ParticleEditor/ParticleEditor.h @@ -19,9 +19,6 @@ // DebugWindow.h : main header file for the DEBUGWINDOW DLL // -#if !defined(AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_) -#define AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_ - #pragma once #ifndef __AFXWIN_H__ @@ -66,5 +63,3 @@ class CDebugWindowApp : public CWinApp //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_) diff --git a/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.h b/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.h index e273a8bf4c..93b05b4b5d 100644 --- a/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.h +++ b/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.h @@ -32,8 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_PARTICLETYPEPANELS_ -#define _H_PARTICLETYPEPANELS_ #include "Resource.h" #include "ISwapablePanel.h" @@ -98,5 +96,3 @@ class ParticlePanelStreak : public ParticlePanelParticle afx_msg void OnParticleSystemEdit(); DECLARE_MESSAGE_MAP() }; - -#endif /* _H_PARTICLETYPEPANELS_ */ diff --git a/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.h b/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.h index c1b9b05c96..f3d5ffe6f6 100644 --- a/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.h +++ b/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.h @@ -32,13 +32,8 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_SHADERTYPEPANELS_ -#define _H_SHADERTYPEPANELS_ // INCLUDES /////////////////////////////////////////////////////////////////// // DEFINES //////////////////////////////////////////////////////////////////// // TYPE DEFINES /////////////////////////////////////////////////////////////// // FORWARD DECLARATIONS /////////////////////////////////////////////////////// - - -#endif /* _H_SHADERTYPEPANELS_ */ diff --git a/Generals/Code/Tools/ParticleEditor/StdAfx.h b/Generals/Code/Tools/ParticleEditor/StdAfx.h index 96d372d67f..099ec6dbe0 100644 --- a/Generals/Code/Tools/ParticleEditor/StdAfx.h +++ b/Generals/Code/Tools/ParticleEditor/StdAfx.h @@ -21,9 +21,6 @@ // are changed infrequently // -#if !defined(AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_) -#define AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_ - #pragma once #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers @@ -73,5 +70,3 @@ //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_) diff --git a/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.h b/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.h index 7b67da3e42..e6b499af11 100644 --- a/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.h +++ b/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.h @@ -32,8 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_VELOCITYTYPEPANELS_ -#define _H_VELOCITYTYPEPANELS_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" @@ -134,5 +132,3 @@ class VelocityPanelOutward : public ISwapablePanel afx_msg void OnParticleSystemEdit(); DECLARE_MESSAGE_MAP() }; - -#endif /* _H_VELOCITYTYPEPANELS_ */ diff --git a/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h b/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h index 11b00a39ac..7cc7b305f3 100644 --- a/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef AUTOEDGEOUTTOOL_H -#define AUTOEDGEOUTTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -43,6 +40,3 @@ class AutoEdgeOutTool : public Tool virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); virtual void activate(); ///< Become the current tool. }; - - -#endif //TOOL_H diff --git a/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h b/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h index b13d8c74d9..b8ee509478 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h +++ b/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_BASEBUILDPROPS_H__71A01D97_E81A_45F8_982D_57D83E5342DF__INCLUDED_) -#define AFX_BASEBUILDPROPS_H__71A01D97_E81A_45F8_982D_57D83E5342DF__INCLUDED_ - #pragma once + // BaseBuildProps.h : header file // @@ -72,5 +70,3 @@ class BaseBuildProps : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_BASEBUILDPROPS_H__71A01D97_E81A_45F8_982D_57D83E5342DF__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h b/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h index da4e1c5ca9..14bc29938d 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef BLEND_EDGE_TOOL_H -#define BLEND_EDGE_TOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -47,6 +44,3 @@ class BlendEdgeTool : public Tool virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); }; - - -#endif //TOOL_H diff --git a/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h b/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h index 99f55d540f..00f661fa1b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h +++ b/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_BlendMaterial_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_) -#define AFX_BlendMaterial_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_ - #pragma once + // BlendMaterial.h : header file // @@ -86,5 +84,3 @@ class BlendMaterial : public COptionsPanel //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_BlendMaterial_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/BorderTool.h b/Generals/Code/Tools/WorldBuilder/include/BorderTool.h index 9435fa9a2d..dcf9864c09 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BorderTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BorderTool.h @@ -17,6 +17,7 @@ */ #pragma once + #include "Tool.h" class BorderTool : public Tool diff --git a/Generals/Code/Tools/WorldBuilder/include/BrushTool.h b/Generals/Code/Tools/WorldBuilder/include/BrushTool.h index a631a9475c..19c829ca14 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BrushTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BrushTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef BRUSHTOOL_H -#define BRUSHTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -64,6 +61,3 @@ class BrushTool : public Tool virtual Bool followsTerrain(void) {return false;}; }; - - -#endif //BRUSHTOOL_H diff --git a/Generals/Code/Tools/WorldBuilder/include/BuildList.h b/Generals/Code/Tools/WorldBuilder/include/BuildList.h index 223831ff2a..26b7b28e03 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BuildList.h +++ b/Generals/Code/Tools/WorldBuilder/include/BuildList.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_BuildList_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_) -#define AFX_BuildList_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_ - #pragma once + // BuildList.h : header file // @@ -107,5 +105,3 @@ class BuildList : public COptionsPanel, public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_BuildList_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h b/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h index 6932e78ec8..0a4b00ab25 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef BUILDLISTTOOL_H -#define BUILDLISTTOOL_H - #include "Tool.h" #include "Common/AsciiString.h" #include "PickUnitDialog.h" @@ -78,6 +75,3 @@ class BuildListTool : public Tool virtual void activate(); ///< Become the current tool. virtual void deactivate(); ///< Become not the current tool. }; - - -#endif //TOOL_H diff --git a/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h b/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h index 3abdbc54ec..5b98bb34f6 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h +++ b/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h @@ -18,9 +18,6 @@ #pragma once -#ifndef _H_CBUTTONSHOWCOLOR_ -#define _H_CBUTTONSHOWCOLOR_ - class CButtonShowColor : public CButton { protected: @@ -42,5 +39,3 @@ class CButtonShowColor : public CButton DECLARE_MESSAGE_MAP(); }; - -#endif /* _H_CBUTTONSHOWCOLOR_ */ diff --git a/Generals/Code/Tools/WorldBuilder/include/CUndoable.h b/Generals/Code/Tools/WorldBuilder/include/CUndoable.h index 333b52161c..aef477a1ba 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CUndoable.h +++ b/Generals/Code/Tools/WorldBuilder/include/CUndoable.h @@ -22,9 +22,6 @@ #pragma once -#ifndef CUNDOABLE_H -#define CUNDOABLE_H - #include "Lib/BaseType.h" #include "../../GameEngine/Include/Common/MapObject.h" #include "../../GameEngine/Include/Common/GameCommon.h" @@ -388,6 +385,3 @@ class DeletePolygonUndoable : public Undoable virtual void Do(void); virtual void Undo(void); }; - - -#endif //CUNDOABLE_H diff --git a/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h b/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h index 7478b71f88..95863f9cd0 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_CAMERAOPTIONS_H__4EF4F775_1290_47AE_817F_9340BA3A898C__INCLUDED_) -#define AFX_CAMERAOPTIONS_H__4EF4F775_1290_47AE_817F_9340BA3A898C__INCLUDED_ - #pragma once + // CameraOptions.h : header file // @@ -86,5 +84,3 @@ class CameraOptions : public CDialog, public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_CAMERAOPTIONS_H__4EF4F775_1290_47AE_817F_9340BA3A898C__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/CellWidth.h b/Generals/Code/Tools/WorldBuilder/include/CellWidth.h index 4008f5bc3e..9b8c8fc88e 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CellWidth.h +++ b/Generals/Code/Tools/WorldBuilder/include/CellWidth.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_CELLWIDTH_H__E4023BA4_28DE_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_CELLWIDTH_H__E4023BA4_28DE_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once + // CellWidth.h : header file // @@ -63,5 +61,3 @@ class CellWidth : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_CELLWIDTH_H__E4023BA4_28DE_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h b/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h index 087fa1184d..26f4cffbee 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_ContourOptions_H__7B56E24C_582E_4530_A451_873397C8852D__INCLUDED_) -#define AFX_ContourOptions_H__7B56E24C_582E_4530_A451_873397C8852D__INCLUDED_ - #pragma once + // ContourOptions.h : header file // @@ -84,5 +82,3 @@ class ContourOptions : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_ContourOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/DrawObject.h b/Generals/Code/Tools/WorldBuilder/include/DrawObject.h index 677ead6d0b..e2b39381de 100644 --- a/Generals/Code/Tools/WorldBuilder/include/DrawObject.h +++ b/Generals/Code/Tools/WorldBuilder/include/DrawObject.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef __DRAW_OBJECT_H_ -#define __DRAW_OBJECT_H_ +#pragma once #include "always.h" #include "rendobj.h" @@ -171,5 +170,3 @@ class DrawObject : public RenderObjClass void BuildRectFromSegmentAndWidth(const Coord3D* b, const Coord3D* t, Real width, Coord3D* outBL, Coord3D* outTL, Coord3D* outBR, Coord3D* outTR); - -#endif // end __DRAW_OBJECT_H_ diff --git a/Generals/Code/Tools/WorldBuilder/include/EditAction.h b/Generals/Code/Tools/WorldBuilder/include/EditAction.h index 4712026c32..d060b685f3 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditAction.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditAction.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EditAction_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_) -#define AFX_EditAction_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_ - #pragma once + // EditAction.h : header file // @@ -78,5 +76,3 @@ class EditAction : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EditAction_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/EditCondition.h b/Generals/Code/Tools/WorldBuilder/include/EditCondition.h index 99a72465d6..b6f04353a5 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditCondition.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditCondition.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EDITCONDITION_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_) -#define AFX_EDITCONDITION_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_ - #pragma once + // EditCondition.h : header file // @@ -77,5 +75,3 @@ class EditCondition : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EDITCONDITION_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h b/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h index 4688d613bd..f2dc677090 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EDITCOORDPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_) -#define AFX_EDITCOORDPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_ - #pragma once + // EditCoordParameter.h : header file // #include "GameLogic/Scripts.h" @@ -70,5 +68,3 @@ friend class EditParameter; //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EDITCOORDPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/EditGroup.h b/Generals/Code/Tools/WorldBuilder/include/EditGroup.h index ba96159898..2a3585f808 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditGroup.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditGroup.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EDITGROUP_H__712F9978_4300_4625_9364_39E903FA3284__INCLUDED_) -#define AFX_EDITGROUP_H__712F9978_4300_4625_9364_39E903FA3284__INCLUDED_ - #pragma once + // EditGroup.h : header file // @@ -63,5 +61,3 @@ class EditGroup : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EDITGROUP_H__712F9978_4300_4625_9364_39E903FA3284__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h b/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h index c07b727a04..6f1c4dd965 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EDITOBJPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_) -#define AFX_EDITOBJPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_ - #pragma once + // EditObjectParameter.h : header file // #include "GameLogic/Scripts.h" @@ -73,5 +71,3 @@ friend class EditParameter; //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EDITOBJPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/EditParameter.h b/Generals/Code/Tools/WorldBuilder/include/EditParameter.h index a8460fdcaf..082e10b3c6 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditParameter.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditParameter.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EDITPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_) -#define AFX_EDITPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_ - #pragma once + // EditParameter.h : header file // #include "GameLogic/Scripts.h" @@ -127,5 +125,3 @@ class EditParameter : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EDITPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h b/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h index 95bba4e266..fa38ca049d 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EXPORTSCRIPTSOPTIONS_H__706D8D87_E01C_431A_ADB8_DFC4CA8A8422__INCLUDED_) -#define AFX_EXPORTSCRIPTSOPTIONS_H__706D8D87_E01C_431A_ADB8_DFC4CA8A8422__INCLUDED_ - #pragma once + // ExportScriptsOptions.h : header file // @@ -71,5 +69,3 @@ class ExportScriptsOptions : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EXPORTSCRIPTSOPTIONS_H__706D8D87_E01C_431A_ADB8_DFC4CA8A8422__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h b/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h index b9c2b226f4..44929f34ae 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef EYEDROPPERTOOL_H -#define EYEDROPPERTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -43,6 +40,3 @@ class EyedropperTool : public Tool virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); virtual void activate(); ///< Become the current tool. }; - - -#endif //TOOL_H diff --git a/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h b/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h index ac547dd9ef..2cd482dd5f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_FEATHEROPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) -#define AFX_FEATHEROPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_ - #pragma once + // brushoptions.h : header file // @@ -93,5 +91,3 @@ class FeatherOptions : public COptionsPanel , public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_FEATHEROPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h b/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h index 0f59030c27..f606a6c890 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef FEATHERTOOL_H -#define FEATHERTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /**************************************************************************/ @@ -56,6 +53,3 @@ class FeatherTool : public Tool virtual WorldHeightMapEdit *getHeightMap(void) {return m_htMapEditCopy;}; virtual void activate(); ///< Become the current tool. }; - - -#endif //FEATHERTOOL_H diff --git a/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h b/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h index 0d92aca58e..8c11eefa41 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_FenceOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_) -#define AFX_FenceOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_ - #pragma once + // FenceOptions.h : header file // @@ -94,5 +92,3 @@ class FenceOptions : public COptionsPanel //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_FenceOptions_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/FenceTool.h b/Generals/Code/Tools/WorldBuilder/include/FenceTool.h index b12a7ac734..67b9b3423f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FenceTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/FenceTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef FenceTool_H -#define FenceTool_H - #include "Tool.h" class WorldHeightMapEdit; class MapObject; @@ -57,6 +54,3 @@ class FenceTool : public Tool virtual void activate(); ///< Become the current tool. virtual void deactivate(); ///< Become not the current tool. }; - - -#endif //FenceTool_H diff --git a/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h b/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h index db4810d245..1801fcc33f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef FloodFillTool_H -#define FloodFillTool_H - #include "Tool.h" class WorldHeightMapEdit; /************************************************************************** @@ -51,6 +48,3 @@ class FloodFillTool : public Tool void setAdjustCliffs(Bool val) {m_adjustCliffTextures = val;} }; - - -#endif //TOOL_H diff --git a/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h b/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h index 7b441c70f1..f38d6251bb 100644 --- a/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_GLOBALLIGHTOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) -#define AFX_GLOBALLIGHTOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_ - #pragma once + // GLOBALLIGHTOPTIONS.h : header file // @@ -137,5 +135,3 @@ class GlobalLightOptions : public CDialog , public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_GLOBALLIGHTOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h b/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h index 487718ffe8..22df766d48 100644 --- a/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h @@ -16,9 +16,6 @@ ** along with this program. If not, see . */ -#ifndef GROVEOPTIONS_H -#define GROVEOPTIONS_H - #pragma once #include @@ -78,5 +75,3 @@ class GroveOptions : public COptionsPanel }; extern GroveOptions *TheGroveOptions; - -#endif diff --git a/Generals/Code/Tools/WorldBuilder/include/GroveTool.h b/Generals/Code/Tools/WorldBuilder/include/GroveTool.h index d9c5b8193f..3cfbedaa6e 100644 --- a/Generals/Code/Tools/WorldBuilder/include/GroveTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/GroveTool.h @@ -21,9 +21,6 @@ #pragma once -#ifndef GroveTool_H -#define GroveTool_H - #include "Lib/BaseType.h" #include "Tool.h" #include "Common/MapObject.h" @@ -61,6 +58,3 @@ class GroveTool : public Tool virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); }; - - -#endif //TOOL_H diff --git a/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h b/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h index 9c5c91a97e..2364347156 100644 --- a/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef HandScrollTool_H -#define HandScrollTool_H - #include "Tool.h" /************************************************************************** HandScrollTool @@ -53,6 +50,3 @@ class HandScrollTool : public Tool virtual void activate(); ///< Become the current tool. virtual Bool followsTerrain(void) {return false;}; }; - - -#endif //TOOL_H diff --git a/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h b/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h index 46a2df55a3..6312a67db7 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h @@ -18,9 +18,6 @@ #pragma once -#ifndef __IMPASSABLEOPTIONS_H__ -#define __IMPASSABLEOPTIONS_H__ - class ImpassableOptions : public CDialog { public: @@ -46,5 +43,3 @@ class ImpassableOptions : public CDialog afx_msg void OnPreview(); DECLARE_MESSAGE_MAP() }; - -#endif /* __IMPASSABLEOPTIONS_H__ */ diff --git a/Generals/Code/Tools/WorldBuilder/include/LayersList.h b/Generals/Code/Tools/WorldBuilder/include/LayersList.h index f5bad9f49a..2dbbcb0dd1 100644 --- a/Generals/Code/Tools/WorldBuilder/include/LayersList.h +++ b/Generals/Code/Tools/WorldBuilder/include/LayersList.h @@ -32,8 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_LAYERSLIST_ -#define _H_LAYERSLIST_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" @@ -160,5 +158,3 @@ class LayersList : public CDialog }; extern LayersList *TheLayersList; - -#endif /* _H_LAYERSLIST_ */ diff --git a/Generals/Code/Tools/WorldBuilder/include/LightOptions.h b/Generals/Code/Tools/WorldBuilder/include/LightOptions.h index 77f7557c5d..e08e6b0759 100644 --- a/Generals/Code/Tools/WorldBuilder/include/LightOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/LightOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_LightOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_) -#define AFX_LightOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_ - #pragma once + // LightOptions.h : header file // #include "OptionsPanel.h" @@ -76,5 +74,3 @@ class LightOptions : public COptionsPanel //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_LightOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/MainFrm.h b/Generals/Code/Tools/WorldBuilder/include/MainFrm.h index be3b403517..54e353ee81 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MainFrm.h +++ b/Generals/Code/Tools/WorldBuilder/include/MainFrm.h @@ -20,9 +20,6 @@ // ///////////////////////////////////////////////////////////////////////////// -#if !defined(AFX_MAINFRM_H__371EC7AB_29D3_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_MAINFRM_H__371EC7AB_29D3_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once #include "Lib/BaseType.h" @@ -153,5 +150,3 @@ class CMainFrame : public CFrameWnd //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_MAINFRM_H__371EC7AB_29D3_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/MapPreview.h b/Generals/Code/Tools/WorldBuilder/include/MapPreview.h index ce129172ba..d5aa64c475 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MapPreview.h +++ b/Generals/Code/Tools/WorldBuilder/include/MapPreview.h @@ -39,9 +39,6 @@ #pragma once -#ifndef __MAP_PREVIEW_H_ -#define __MAP_PREVIEW_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -84,5 +81,3 @@ class MapPreview //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __MAP_PREVIEW_H_ diff --git a/Generals/Code/Tools/WorldBuilder/include/MapSettings.h b/Generals/Code/Tools/WorldBuilder/include/MapSettings.h index 6c71ac6fce..8fc0810a06 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MapSettings.h +++ b/Generals/Code/Tools/WorldBuilder/include/MapSettings.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_MAPSETTINGS_H__21749744_4DF4_462C_8DD4_FEEC1003DCFE__INCLUDED_) -#define AFX_MAPSETTINGS_H__21749744_4DF4_462C_8DD4_FEEC1003DCFE__INCLUDED_ - #pragma once + // MapSettings.h : header file // @@ -63,5 +61,3 @@ class MapSettings : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_MAPSETTINGS_H__21749744_4DF4_462C_8DD4_FEEC1003DCFE__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h b/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h index 506790c532..0e6515be6f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_MESHMOLDOPTIONS_H__D5E62CB9_2830_4FA1_8306_DE18DD971087__INCLUDED_) -#define AFX_MESHMOLDOPTIONS_H__D5E62CB9_2830_4FA1_8306_DE18DD971087__INCLUDED_ - #pragma once + // MeshMoldOptions.h : header file // #include "WBPopupSlider.h" @@ -112,5 +110,3 @@ class MeshMoldOptions : public COptionsPanel , public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_MESHMOLDOPTIONS_H__D5E62CB9_2830_4FA1_8306_DE18DD971087__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h b/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h index b95dafda95..e945bb5979 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef MESHMOLDTOOL_H -#define MESHMOLDTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -65,6 +62,3 @@ class MeshMoldTool : public Tool static void updateMeshLocation(Bool changePreview); }; - - -#endif //MESHMOLDTOOL_H diff --git a/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h b/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h index 4bfa7e93e9..d81891a47b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_MoundOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_) -#define AFX_MoundOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_ - #pragma once + // MoundOptions.h : header file // #include "WBPopupSlider.h" @@ -98,5 +96,3 @@ class MoundOptions : public COptionsPanel , public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_MoundOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/MoundTool.h b/Generals/Code/Tools/WorldBuilder/include/MoundTool.h index 09b139fc43..4e57d8eff9 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MoundTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/MoundTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef MOUND_TOOL_H -#define MOUND_TOOL_H - #include "Tool.h" class WorldHeightMapEdit; /************************************************************************* @@ -72,4 +69,3 @@ class DigTool : public MoundTool DigTool(void); }; -#endif //MoundTool_H diff --git a/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h b/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h index 7970238579..00d6dee362 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h +++ b/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h @@ -22,11 +22,6 @@ #pragma once -#ifndef MYTOOLBAR_H -#define MYTOOLBAR_H - - - /************************************************************************* ** CellSizeToolBar ***************************************************************************/ @@ -47,7 +42,3 @@ class CellSizeToolBar : public CDialogBar static void CellSizeChanged(Int cellSize); }; - - - -#endif //MYTOOLBAR_H diff --git a/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h b/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h index 4761abc684..9ae6fde449 100644 --- a/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h +++ b/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_NEWHEIGHTMAP_H__239CD6A3_2919_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_NEWHEIGHTMAP_H__239CD6A3_2919_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once + // NewHeightMap.h : header file // @@ -83,5 +81,3 @@ class CNewHeightMap : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_NEWHEIGHTMAP_H__239CD6A3_2919_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h b/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h index a1875c06c7..3b94fd9b70 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_ObjectOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_) -#define AFX_ObjectOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_ - #pragma once + // ObjectOptions.h : header file // @@ -103,5 +101,3 @@ class ObjectOptions : public COptionsPanel //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_ObjectOptions_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h b/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h index 5be3831383..cc9b5259e9 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h +++ b/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_OBJECTPREVIEW_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_) -#define AFX_OBJECTPREVIEW_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_ - #pragma once + // ObjectPreview.h : header file // @@ -70,5 +68,3 @@ class ObjectPreview : public CWnd //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_OBJECTPREVIEW_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h b/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h index 1c2483ffe1..613f678474 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef OBJECTTOOL_H -#define OBJECTTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -53,6 +50,3 @@ class ObjectTool : public Tool virtual void activate(); ///< Become the current tool. virtual void deactivate(); ///< Become not the current tool. }; - - -#endif //TOOL_H diff --git a/Generals/Code/Tools/WorldBuilder/include/OpenMap.h b/Generals/Code/Tools/WorldBuilder/include/OpenMap.h index 48d32d19c7..80d679ccd8 100644 --- a/Generals/Code/Tools/WorldBuilder/include/OpenMap.h +++ b/Generals/Code/Tools/WorldBuilder/include/OpenMap.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_OPENMAP_H__D3FD3B43_B0B7_42F6_BB77_2380A8B9945B__INCLUDED_) -#define AFX_OPENMAP_H__D3FD3B43_B0B7_42F6_BB77_2380A8B9945B__INCLUDED_ - #pragma once + // OpenMap.h : header file // @@ -74,5 +72,3 @@ class OpenMap : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_OPENMAP_H__D3FD3B43_B0B7_42F6_BB77_2380A8B9945B__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h b/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h index e43fd756c8..ff459a0e90 100644 --- a/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h +++ b/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_OPTIONSPANEL_H__CB473165_D123_42D9_AE80_32F16928E3AE__INCLUDED_) -#define AFX_OPTIONSPANEL_H__CB473165_D123_42D9_AE80_32F16928E3AE__INCLUDED_ - #pragma once + // OptionsPanel.h : header file // @@ -66,5 +64,3 @@ class COptionsPanel : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_OPTIONSPANEL_H__CB473165_D123_42D9_AE80_32F16928E3AE__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h b/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h index b263b23c5f..c6a58c0e32 100644 --- a/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_PICKUNITDIALOG_H__B4C16E7D_FEED_472B_95FC_496D4C9006F5__INCLUDED_) -#define AFX_PICKUNITDIALOG_H__B4C16E7D_FEED_472B_95FC_496D4C9006F5__INCLUDED_ - #pragma once + // PickUnitDialog.h : header file // @@ -110,5 +108,3 @@ class ReplaceUnitDialog : public PickUnitDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_PICKUNITDIALOG_H__B4C16E7D_FEED_472B_95FC_496D4C9006F5__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/PointerTool.h b/Generals/Code/Tools/WorldBuilder/include/PointerTool.h index f57dc06be9..962a46946a 100644 --- a/Generals/Code/Tools/WorldBuilder/include/PointerTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/PointerTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef POINTER_TOOL_H -#define POINTER_TOOL_H - #include "PolygonTool.h" class WorldHeightMapEdit; #include "../../GameEngine/Include/Common/MapObject.h" @@ -77,6 +74,3 @@ class PointerTool : public PolygonTool static void clearSelection(void); ///< Clears the selected objects selected flags. static Bool allowPick(MapObject* pMapObj, WbView* pView); }; - - -#endif //POINTER_TOOL_H diff --git a/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h b/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h index c92fffabc7..e4f52559fc 100644 --- a/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef POLYGONTOOL_H -#define POLYGONTOOL_H - #include "Tool.h" class WorldHeightMapEdit; class MapObject; @@ -84,7 +81,3 @@ class PolygonTool : public Tool virtual void activate(); ///< Become the current tool. virtual void deactivate(); ///< Become not the current tool. }; - - -#endif //POLYGONTOOL_H - diff --git a/Generals/Code/Tools/WorldBuilder/include/RampOptions.h b/Generals/Code/Tools/WorldBuilder/include/RampOptions.h index ff3f941ec2..1d6828ae48 100644 --- a/Generals/Code/Tools/WorldBuilder/include/RampOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/RampOptions.h @@ -32,8 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_RAMPOPTIONS_ -#define _H_RAMPOPTIONS_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "OptionsPanel.h" @@ -62,5 +60,3 @@ class RampOptions : public COptionsPanel }; extern RampOptions* TheRampOptions; - -#endif /* _H_RAMPOPTIONS_ */ diff --git a/Generals/Code/Tools/WorldBuilder/include/RampTool.h b/Generals/Code/Tools/WorldBuilder/include/RampTool.h index 230272b071..0b5718ac81 100644 --- a/Generals/Code/Tools/WorldBuilder/include/RampTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/RampTool.h @@ -32,8 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_RAMPTOOL_ -#define _H_RAMPTOOL_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "Tool.h" @@ -64,6 +62,3 @@ class RampTool : public Tool void drawFeedback(Coord3D* endPoint); void applyRamp(CWorldBuilderDoc* pDoc); }; - - -#endif /* _H_RAMPTOOL_ */ diff --git a/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h b/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h index 12e309c8d9..1536469cbf 100644 --- a/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_RoadOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_) -#define AFX_RoadOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_ - #pragma once + // RoadOptions.h : header file // @@ -105,5 +103,3 @@ class RoadOptions : public COptionsPanel //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_RoadOptions_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/RoadTool.h b/Generals/Code/Tools/WorldBuilder/include/RoadTool.h index e629f781de..1abd0aa7bc 100644 --- a/Generals/Code/Tools/WorldBuilder/include/RoadTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/RoadTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef RoadTool_H -#define RoadTool_H - #include "Tool.h" #include "W3DDevice/GameClient/WorldHeightMap.h" class WorldHeightMapEdit; @@ -58,6 +55,3 @@ class RoadTool : public Tool virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); virtual void activate(); ///< Become the current tool. }; - - -#endif //TOOL_H diff --git a/Generals/Code/Tools/WorldBuilder/include/SaveMap.h b/Generals/Code/Tools/WorldBuilder/include/SaveMap.h index 7b38f14236..4a849ff5ec 100644 --- a/Generals/Code/Tools/WorldBuilder/include/SaveMap.h +++ b/Generals/Code/Tools/WorldBuilder/include/SaveMap.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SAVEMAP_H__BCE93FF1_DA04_4F63_A483_D89BF1F49E32__INCLUDED_) -#define AFX_SAVEMAP_H__BCE93FF1_DA04_4F63_A483_D89BF1F49E32__INCLUDED_ - #pragma once + // SaveMap.h : header file // @@ -76,5 +74,3 @@ class SaveMap : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SAVEMAP_H__BCE93FF1_DA04_4F63_A483_D89BF1F49E32__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h b/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h index 93528c6e4c..1fdae4e413 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SCORCHOPTIONS_H__33FD4D9A_2C39_4494_A4EF_A20CEC76A95D__INCLUDED_) -#define AFX_SCORCHOPTIONS_H__33FD4D9A_2C39_4494_A4EF_A20CEC76A95D__INCLUDED_ - #pragma once + // ScorchOptions.h : header file // @@ -92,5 +90,3 @@ class ScorchOptions : public COptionsPanel, public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SCORCHOPTIONS_H__33FD4D9A_2C39_4494_A4EF_A20CEC76A95D__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h b/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h index 5783ade6e6..0cdc3039b0 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h @@ -21,9 +21,6 @@ #pragma once -#ifndef SCORCHTOOL_H -#define SCORCHTOOL_H - #include "Tool.h" class WorldHeightMapEdit; class MapObject; @@ -51,6 +48,3 @@ class ScorchTool : public Tool virtual void activate(); ///< Become the current tool. virtual void deactivate(); ///< Become not the current tool. }; - - -#endif //SCORCHTOOL_H diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h index be64576582..98fc05ef6f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SCRIPTACTIONSFALSE_H__227F217F_458B_4020_B6E9_6EB25E228FD5__INCLUDED_) -#define AFX_SCRIPTACTIONSFALSE_H__227F217F_458B_4020_B6E9_6EB25E228FD5__INCLUDED_ - #pragma once + // ScriptActionsFalse.h : header file // class Script; @@ -86,5 +84,3 @@ class ScriptActionsFalse : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SCRIPTACTIONSFALSE_H__227F217F_458B_4020_B6E9_6EB25E228FD5__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h index 2224106323..3f41b7efd7 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SCRIPTACTIONSTRUE_H__D8CAEC29_8B71_461C_B1B8_DF55624330AA__INCLUDED_) -#define AFX_SCRIPTACTIONSTRUE_H__D8CAEC29_8B71_461C_B1B8_DF55624330AA__INCLUDED_ - #pragma once + // ScriptActionsTrue.h : header file // class Script; @@ -86,5 +84,3 @@ class ScriptActionsTrue : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SCRIPTACTIONSTRUE_H__D8CAEC29_8B71_461C_B1B8_DF55624330AA__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h b/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h index c54e51eaff..6233557c5d 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_ScriptConditionsDlg_H__EEFDFF65_2440_4AFE_B5D6_9E887C8C2DED__INCLUDED_) -#define AFX_ScriptConditionsDlg_H__EEFDFF65_2440_4AFE_B5D6_9E887C8C2DED__INCLUDED_ - #pragma once + // ScriptConditionsDlg.h : header file // class Script; @@ -91,5 +89,3 @@ class ScriptConditionsDlg : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_ScriptConditionsDlg_H__EEFDFF65_2440_4AFE_B5D6_9E887C8C2DED__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h b/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h index 9625b2295d..2e3e305579 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SCRIPTDIALOG_H__885FEF28_85F9_4556_9908_1BEC0B6E4C62__INCLUDED_) -#define AFX_SCRIPTDIALOG_H__885FEF28_85F9_4556_9908_1BEC0B6E4C62__INCLUDED_ - #pragma once + // ScriptDialog.h : header file // @@ -156,5 +154,3 @@ class ScriptDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SCRIPTDIALOG_H__885FEF28_85F9_4556_9908_1BEC0B6E4C62__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h b/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h index 027f1ed648..9ee638472b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SCRIPTPROPERTIES_H__CE62125B_9FAB_4EF0_A8B5_36DD5393A2B0__INCLUDED_) -#define AFX_SCRIPTPROPERTIES_H__CE62125B_9FAB_4EF0_A8B5_36DD5393A2B0__INCLUDED_ - #pragma once + // ScriptProperties.h : header file // class Script; @@ -83,5 +81,3 @@ class ScriptProperties : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SCRIPTPROPERTIES_H__CE62125B_9FAB_4EF0_A8B5_36DD5393A2B0__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h b/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h index ce8ba069c7..a310883828 100644 --- a/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h +++ b/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SELECTMACROTEXTURE_H__0AB61BFA_3A67_40CB_A38F_7067F6BA352B__INCLUDED_) -#define AFX_SELECTMACROTEXTURE_H__0AB61BFA_3A67_40CB_A38F_7067F6BA352B__INCLUDED_ - #pragma once + // SelectMacrotexture.h : header file // @@ -63,5 +61,3 @@ class SelectMacrotexture : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SELECTMACROTEXTURE_H__0AB61BFA_3A67_40CB_A38F_7067F6BA352B__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h b/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h index e657fb9898..1af6e29d51 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SHADOWOPTIONS_H__25CB23E2_9E42_44D4_BE83_4B89F87746DE__INCLUDED_) -#define AFX_SHADOWOPTIONS_H__25CB23E2_9E42_44D4_BE83_4B89F87746DE__INCLUDED_ - #pragma once + // ShadowOptions.h : header file // @@ -69,5 +67,3 @@ class ShadowOptions : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SHADOWOPTIONS_H__25CB23E2_9E42_44D4_BE83_4B89F87746DE__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/SplashScreen.h b/Generals/Code/Tools/WorldBuilder/include/SplashScreen.h index 4eac25f595..49d935e040 100644 --- a/Generals/Code/Tools/WorldBuilder/include/SplashScreen.h +++ b/Generals/Code/Tools/WorldBuilder/include/SplashScreen.h @@ -18,9 +18,6 @@ #pragma once -#ifndef __SPLASHSCREEN_H__ -#define __SPLASHSCREEN_H__ - class SplashScreen : public CDialog { protected: @@ -40,5 +37,3 @@ class SplashScreen : public CDialog DECLARE_MESSAGE_MAP() }; - -#endif /* __SPLASHSCREEN_H__ */ diff --git a/Generals/Code/Tools/WorldBuilder/include/StdAfx.h b/Generals/Code/Tools/WorldBuilder/include/StdAfx.h index d0736dfc88..26fcc9b8c7 100644 --- a/Generals/Code/Tools/WorldBuilder/include/StdAfx.h +++ b/Generals/Code/Tools/WorldBuilder/include/StdAfx.h @@ -21,9 +21,6 @@ // are changed infrequently // -#if !defined(AFX_STDAFX_H__FBA41347_2826_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_STDAFX_H__FBA41347_2826_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers @@ -47,5 +44,3 @@ //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__FBA41347_2826_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h b/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h index 13a623fadc..f588f65aaa 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h +++ b/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_TEAMBEHAVIOR_H__40A707E0_08CB_4544_9FF1_AF0DACAB02A6__INCLUDED_) -#define AFX_TEAMBEHAVIOR_H__40A707E0_08CB_4544_9FF1_AF0DACAB02A6__INCLUDED_ - #pragma once + // TeamBehavior.h : header file // @@ -78,5 +76,3 @@ class TeamBehavior : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TEAMBEHAVIOR_H__40A707E0_08CB_4544_9FF1_AF0DACAB02A6__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h b/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h index a8e15ae9ac..40c599c748 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h +++ b/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h @@ -18,9 +18,6 @@ #pragma once -#ifndef __TEAMGENERIC_H__ -#define __TEAMGENERIC_H__ - class Dict; class TeamGeneric : public CPropertyPage @@ -48,5 +45,3 @@ class TeamGeneric : public CPropertyPage afx_msg void OnScriptAdjust(); DECLARE_MESSAGE_MAP() }; - -#endif diff --git a/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h b/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h index aa8b87276c..58b74c8edb 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h +++ b/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_TEAMIDENTITY_H__B37DB2FD_297F_4D0E_AACD_193BE30C6C85__INCLUDED_) -#define AFX_TEAMIDENTITY_H__B37DB2FD_297F_4D0E_AACD_193BE30C6C85__INCLUDED_ - #pragma once + // TeamIdentity.h : header file // class Dict; @@ -96,5 +94,3 @@ class TeamIdentity : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TEAMIDENTITY_H__B37DB2FD_297F_4D0E_AACD_193BE30C6C85__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h b/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h index 0710734f01..cce3eb0069 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h +++ b/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_TEAMREINFORCEMENT_H__29B5C0C7_10E8_4869_8B43_815422C51C24__INCLUDED_) -#define AFX_TEAMREINFORCEMENT_H__29B5C0C7_10E8_4869_8B43_815422C51C24__INCLUDED_ - #pragma once + // TeamReinforcement.h : header file // @@ -68,5 +66,3 @@ class TeamReinforcement : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TEAMREINFORCEMENT_H__29B5C0C7_10E8_4869_8B43_815422C51C24__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h b/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h index 341cdf6ecf..5018911070 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h +++ b/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_TERRAINMATERIAL_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_) -#define AFX_TERRAINMATERIAL_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_ - #pragma once + // terrainmaterial.h : header file // @@ -111,5 +109,3 @@ class TerrainMaterial : public COptionsPanel, public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TERRAINMATERIAL_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h b/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h index ac72979a27..6032a53b6f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h +++ b/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_TERRAINMODAL_H__F013E9EF_2DE1_4084_97A8_5B87466535FC__INCLUDED_) -#define AFX_TERRAINMODAL_H__F013E9EF_2DE1_4084_97A8_5B87466535FC__INCLUDED_ - #pragma once + // TerrainModal.h : header file // @@ -80,5 +78,3 @@ class TerrainModal : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TERRAINMODAL_H__F013E9EF_2DE1_4084_97A8_5B87466535FC__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h b/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h index 558f4f16ad..eeb972b450 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h +++ b/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_TERRAINSWATCHES_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_) -#define AFX_TERRAINSWATCHES_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_ - #pragma once + // TerrainSwatches.h : header file // @@ -64,5 +62,3 @@ class TerrainSwatches : public CWnd //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TERRAINSWATCHES_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/TileTool.h b/Generals/Code/Tools/WorldBuilder/include/TileTool.h index 349e7b34d9..9d227e538a 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TileTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/TileTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef TILETOOL_H -#define TILETOOL_H - #include "Tool.h" class WorldHeightMapEdit; /************************************************************************* @@ -69,4 +66,3 @@ class BigTileTool : public TileTool virtual Int getWidth(void) {return m_currentWidth;}; }; -#endif //TOOL_H diff --git a/Generals/Code/Tools/WorldBuilder/include/Tool.h b/Generals/Code/Tools/WorldBuilder/include/Tool.h index f940ef5466..70515caca9 100644 --- a/Generals/Code/Tools/WorldBuilder/include/Tool.h +++ b/Generals/Code/Tools/WorldBuilder/include/Tool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef TOOL_H -#define TOOL_H - #include "Lib/BaseType.h" #include "Common/STLTypedefs.h" @@ -88,6 +85,3 @@ class Tool Int widthOutside, CWorldBuilderDoc *pDoc, VecHeightMapIndexes* allIndices); }; - - -#endif //TOOL_H diff --git a/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h b/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h index c0da4f3937..129b12204f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h +++ b/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_WBFRAMEWND_H__83965AA4_8750_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_WBFRAMEWND_H__83965AA4_8750_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once + // WBFrameWnd.h : header file // @@ -100,5 +98,3 @@ class CWB3dFrameWnd : public CMainFrame //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WBFRAMEWND_H__83965AA4_8750_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h b/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h index 449a936410..0cf36b5305 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h +++ b/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h @@ -16,8 +16,7 @@ ** along with this program. If not, see . */ -#ifndef __WBHEIGHTMAP_H_ -#define __WBHEIGHTMAP_H_ +#pragma once #include "W3DDevice/GameClient/HeightMap.h" @@ -46,5 +45,3 @@ class WBHeightMap : public HeightMapRenderObjClass Bool m_drawEntireMap; Bool m_flattenHeights; }; - -#endif // end __WBHEIGHTMAP_H_ diff --git a/Generals/Code/Tools/WorldBuilder/include/WBPopupSlider.h b/Generals/Code/Tools/WorldBuilder/include/WBPopupSlider.h index 3b9d38952a..733b31b7f2 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WBPopupSlider.h +++ b/Generals/Code/Tools/WorldBuilder/include/WBPopupSlider.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_WBPopupSliderButton_H__8B217F41_937B_11D1_8CA3_00A024CDC039__INCLUDED_) -#define AFX_WBPopupSliderButton_H__8B217F41_937B_11D1_8CA3_00A024CDC039__INCLUDED_ - #pragma once + // WBPopupSliderButton.h : header file // @@ -178,5 +176,3 @@ class PopupSlider : public CWnd //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WBPopupSliderButton_H__8B217F41_937B_11D1_8CA3_00A024CDC039__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h b/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h index 26232d992f..fe2e8fa083 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h +++ b/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h @@ -22,9 +22,6 @@ #pragma once -#ifndef WHeightMapEdit_H -#define WHeightMapEdit_H - #include "W3DDevice/GameClient/WorldHeightMap.h" class DataChunkOutput; @@ -168,5 +165,3 @@ class WorldHeightMapEdit : public WorldHeightMap // outHandle: 0 means BL, 1 means TL, 2 means TR, 3 means BR void findBoundaryNear(Coord3D *pt, float okDistance, Int *outNdx, Int *outHandle); }; - -#endif diff --git a/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h b/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h index f1b3521d9d..9cf098f0e3 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_WaterOptions_H__6B56E20C_582E_4132_A251_87902218852C__INCLUDED_) -#define AFX_WaterOptions_H__6B56E20C_582E_4132_A251_87902218852C__INCLUDED_ - #pragma once + // WaterOptions.h : header file // #include "WBPopupSlider.h" @@ -102,5 +100,3 @@ class WaterOptions : public COptionsPanel, public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WaterOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/WaterTool.h b/Generals/Code/Tools/WorldBuilder/include/WaterTool.h index 5f022790cc..075dd466f2 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WaterTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/WaterTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef WaterTool_H -#define WaterTool_H - #include "PolygonTool.h" class WorldHeightMapEdit; class MapObject; @@ -62,6 +59,3 @@ class WaterTool : public PolygonTool void fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); PolygonTrigger *adjustSpacing(PolygonTrigger *trigger, Real spacing); }; - - -#endif //WaterTool_H diff --git a/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h b/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h index b9ceee0be6..3a4feaabd3 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_WaypointOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_) -#define AFX_WaypointOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_ - #pragma once + // WaypointOptions.h : header file // #include "OptionsPanel.h" @@ -92,5 +90,3 @@ class WaypointOptions : public COptionsPanel //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WaypointOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h b/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h index 3ebf216b55..5ca7deb3a3 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef WAYPOINTTOOL_H -#define WAYPOINTTOOL_H - #include "Tool.h" class WorldHeightMapEdit; class MapObject; @@ -58,6 +55,3 @@ class WaypointTool : public Tool virtual void activate(); ///< Become the current tool. virtual void deactivate(); ///< Become not the current tool. }; - - -#endif //WAYPOINTTOOL_H diff --git a/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h b/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h index bef771d37a..5ea8f22dde 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h +++ b/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h @@ -19,9 +19,6 @@ // WorldBuilder.h : main header file for the WORLDBUILDER application // -#if !defined(AFX_WORLDBUILDER_H__FBA41345_2826_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_WORLDBUILDER_H__FBA41345_2826_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once #ifndef __AFXWIN_H__ @@ -194,5 +191,3 @@ inline CWorldBuilderApp *WbApp() { return (CWorldBuilderApp*)::AfxGetApp(); } //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WORLDBUILDER_H__FBA41345_2826_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h index 4ae17cbc75..01f04ea829 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h +++ b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h @@ -20,9 +20,6 @@ // ///////////////////////////////////////////////////////////////////////////// -#if !defined(AFX_WORLDBUILDERDOC_H__FBA4134D_2826_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_WORLDBUILDERDOC_H__FBA4134D_2826_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once #include "Lib/BaseType.h" @@ -211,5 +208,3 @@ class CWorldBuilderDoc : public CDocument //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WORLDBUILDERDOC_H__FBA4134D_2826_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h index fe11cce4dd..a6dbf378b2 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h +++ b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h @@ -20,9 +20,6 @@ // ///////////////////////////////////////////////////////////////////////////// -#if !defined(AFX_WORLDBUILDERVIEW_H__FBA4134F_2826_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_WORLDBUILDERVIEW_H__FBA4134F_2826_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once #include "Lib/BaseType.h" @@ -159,5 +156,3 @@ class CWorldBuilderView : public WbView //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WORLDBUILDERVIEW_H__FBA4134F_2826_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/addplayerdialog.h b/Generals/Code/Tools/WorldBuilder/include/addplayerdialog.h index 8f8c58afa4..2222f54b99 100644 --- a/Generals/Code/Tools/WorldBuilder/include/addplayerdialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/addplayerdialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_ADDPLAYERDIALOG_H__96179004_35C9_436A_A302_A777E77F8F04__INCLUDED_) -#define AFX_ADDPLAYERDIALOG_H__96179004_35C9_436A_A302_A777E77F8F04__INCLUDED_ - #pragma once + // addplayerdialog.h : header file // @@ -69,5 +67,3 @@ class AddPlayerDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_ADDPLAYERDIALOG_H__96179004_35C9_436A_A302_A777E77F8F04__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/brushoptions.h b/Generals/Code/Tools/WorldBuilder/include/brushoptions.h index 4c489a6cad..fe9a13b162 100644 --- a/Generals/Code/Tools/WorldBuilder/include/brushoptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/brushoptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_BRUSHOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) -#define AFX_BRUSHOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_ - #pragma once + // brushoptions.h : header file // @@ -95,5 +93,3 @@ class BrushOptions : public COptionsPanel , public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_BRUSHOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/euladialog.h b/Generals/Code/Tools/WorldBuilder/include/euladialog.h index b131641dce..87eb399ba1 100644 --- a/Generals/Code/Tools/WorldBuilder/include/euladialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/euladialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EULADIALOG_H__9F6A134E_C2A3_425E_8485_F90B1A5F9B58__INCLUDED_) -#define AFX_EULADIALOG_H__9F6A134E_C2A3_425E_8485_F90B1A5F9B58__INCLUDED_ - #pragma once + // euladialog.h : header file // @@ -58,5 +56,3 @@ class EulaDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EULADIALOG_H__9F6A134E_C2A3_425E_8485_F90B1A5F9B58__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h b/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h index 38b0887b22..8579629282 100644 --- a/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h +++ b/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_MAPOBJECTPROPS_H__44517B9E_12AB_4E2C_B49B_D6BB65C59649__INCLUDED_) -#define AFX_MAPOBJECTPROPS_H__44517B9E_12AB_4E2C_B49B_D6BB65C59649__INCLUDED_ - #pragma once + // mapobjectprops.h : header file // @@ -153,5 +151,3 @@ class MapObjectProps : public COptionsPanel, public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_MAPOBJECTPROPS_H__44517B9E_12AB_4E2C_B49B_D6BB65C59649__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h b/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h index 0691db5ec8..3ec9c41051 100644 --- a/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h +++ b/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_PLAYERLISTDLG_H__103B4125_78ED_48A8_9DBB_289DDC6B0208__INCLUDED_) -#define AFX_PLAYERLISTDLG_H__103B4125_78ED_48A8_9DBB_289DDC6B0208__INCLUDED_ - #pragma once + // playerlistdlg.h : header file // @@ -86,5 +84,3 @@ class PlayerListDlg : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_PLAYERLISTDLG_H__103B4125_78ED_48A8_9DBB_289DDC6B0208__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/propedit.h b/Generals/Code/Tools/WorldBuilder/include/propedit.h index c595380124..34c9c0beaa 100644 --- a/Generals/Code/Tools/WorldBuilder/include/propedit.h +++ b/Generals/Code/Tools/WorldBuilder/include/propedit.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_PROPEDIT_H__93C02F45_592B_4CFD_A092_7445559D26EB__INCLUDED_) -#define AFX_PROPEDIT_H__93C02F45_592B_4CFD_A092_7445559D26EB__INCLUDED_ - #pragma once + // propedit.h : header file // @@ -71,5 +69,3 @@ class PropEdit : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_PROPEDIT_H__93C02F45_592B_4CFD_A092_7445559D26EB__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h b/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h index 719facf67c..536bcd4ac7 100644 --- a/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_TEAMSDIALOG_H__1410F415_1597_4EAF_AE0B_42DACDEB35B9__INCLUDED_) -#define AFX_TEAMSDIALOG_H__1410F415_1597_4EAF_AE0B_42DACDEB35B9__INCLUDED_ - #pragma once + // teamsdialog.h : header file // @@ -95,5 +93,3 @@ class CTeamsDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TEAMSDIALOG_H__1410F415_1597_4EAF_AE0B_42DACDEB35B9__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/wbview.h b/Generals/Code/Tools/WorldBuilder/include/wbview.h index b168e2958f..9b8a879c2c 100644 --- a/Generals/Code/Tools/WorldBuilder/include/wbview.h +++ b/Generals/Code/Tools/WorldBuilder/include/wbview.h @@ -16,9 +16,6 @@ ** along with this program. If not, see . */ -#if !defined(AFX_WBVIEW_H__875234A1_8815_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_WBVIEW_H__875234A1_8815_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once #include "Lib/BaseType.h" @@ -243,5 +240,3 @@ class WbView : public CView //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WBVIEW_H__875234A1_8815_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/Generals/Code/Tools/WorldBuilder/include/wbview3d.h b/Generals/Code/Tools/WorldBuilder/include/wbview3d.h index a020e778e1..f1f38c74c0 100644 --- a/Generals/Code/Tools/WorldBuilder/include/wbview3d.h +++ b/Generals/Code/Tools/WorldBuilder/include/wbview3d.h @@ -20,10 +20,8 @@ // Class to encapsulate height map. // Author: Steven Johnson, Aug 2001 -#if !defined(AFX_WBVIEW3D_H__832D8241_87F6_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_WBVIEW3D_H__832D8241_87F6_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once + // wbview3d.h : header file // @@ -302,5 +300,3 @@ inline Bool WbView3d::getShowWireframe() { return m_showWireframe; } //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WBVIEW3D_H__832D8241_87F6_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/Generals/Libraries/Source/WWVegas/WWLib/WWDefines.h b/Generals/Libraries/Source/WWVegas/WWLib/WWDefines.h index eb25d597db..6a2b0d6fc9 100644 --- a/Generals/Libraries/Source/WWVegas/WWLib/WWDefines.h +++ b/Generals/Libraries/Source/WWVegas/WWLib/WWDefines.h @@ -23,6 +23,3 @@ // Interpolation is certainly desired for animations that move and rotate meshes, but may not be // desired for animations that teleport meshes from one location to another, such as blinking lights. // @todo Implement a new flag per animation file to opt-out of interpolation. -#ifndef WW3D_ENABLE_RAW_ANIM_INTERPOLATION -#define WW3D_ENABLE_RAW_ANIM_INTERPOLATION (1) -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h b/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h index a4306ca783..910b7dc699 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __ACADEMY_STATS_H -#define __ACADEMY_STATS_H - #include "Lib/BaseType.h" #include "Common/Debug.h" #include "Common/Snapshot.h" @@ -277,6 +274,3 @@ class AcademyStats : public Snapshot //35) Did the player ever create a "Firestorm" with his MiGs or Inferno Cannons? UnsignedInt m_firestormsCreated; }; - -#endif // __ACADEMY_STATS_H - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h b/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h index 6fbb6aecb5..125c3d0d12 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h @@ -34,9 +34,6 @@ #pragma once -#ifndef __ACTIONMANAGER_H_ -#define __ACTIONMANAGER_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/SubsystemInterface.h" @@ -111,5 +108,3 @@ class ActionManager : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern ActionManager *TheActionManager; - -#endif // end __ACTIONMANAGER_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BattleHonors.h b/GeneralsMD/Code/GameEngine/Include/Common/BattleHonors.h index b6eaf0d241..c9a727ce61 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BattleHonors.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BattleHonors.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __BATTLE_HONORS_H_ -#define __BATTLE_HONORS_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -120,5 +117,3 @@ enum //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __BATTLE_HONORS_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BezierSegment.h b/GeneralsMD/Code/GameEngine/Include/Common/BezierSegment.h index eeac112407..eb8dd12b6f 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BezierSegment.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BezierSegment.h @@ -28,8 +28,6 @@ // DO NOT DISTRIBUTE #pragma once -#ifndef __BEZIERSEGMENT_H__ -#define __BEZIERSEGMENT_H__ #include #include "Common/STLTypedefs.h" @@ -69,5 +67,3 @@ class BezierSegment public: // He get's friendly access. friend class BezFwdIterator; }; - -#endif /* __BEZIERSEGMENT_H__ */ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h b/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h index 2ff5141486..fccf3c2ed9 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BitFlags_H_ -#define __BitFlags_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" @@ -329,6 +326,3 @@ class BitFlags }; - -#endif // __BitFlags_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BitFlagsIO.h b/GeneralsMD/Code/GameEngine/Include/Common/BitFlagsIO.h index 91208bdb2a..2c9d8ba8aa 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BitFlagsIO.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BitFlagsIO.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BitFlagsIO_H_ -#define __BitFlagsIO_H_ - #include "Common/BitFlags.h" #include "Common/INI.h" #include "Common/Xfer.h" @@ -229,5 +226,3 @@ void BitFlags::xfer(Xfer* xfer) } } - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BorderColors.h b/GeneralsMD/Code/GameEngine/Include/Common/BorderColors.h index f00adef01a..52eed56e6d 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BorderColors.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BorderColors.h @@ -18,6 +18,7 @@ // jkmcd + #pragma once struct BorderColor diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h b/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h index 94445b7d95..23dad11fca 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __BUILDASSISTANT_H_ -#define __BUILDASSISTANT_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" #include "Lib/BaseType.h" @@ -215,6 +212,3 @@ class BuildAssistant : public SubsystemInterface // EXTERN ///////////////////////////////////////////////////////////////////////////////////////// extern BuildAssistant *TheBuildAssistant; - -#endif // __BUILDASSISTANT_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/CDManager.h b/GeneralsMD/Code/GameEngine/Include/Common/CDManager.h index 20a19bac8c..8cd22d55d1 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/CDManager.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/CDManager.h @@ -43,10 +43,6 @@ #pragma once -#ifndef _COMMON_CDMANAGER_H_ -#define _COMMON_CDMANAGER_H_ - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -187,5 +183,3 @@ class CDManager : public CDManagerInterface extern CDManagerInterface *TheCDManager; CDManagerInterface* CreateCDManager( void ); - -#endif // _COMMON_CDMANAGER_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ClientUpdateModule.h b/GeneralsMD/Code/GameEngine/Include/Common/ClientUpdateModule.h index 633cfe8b59..182fd49a12 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ClientUpdateModule.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ClientUpdateModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __ClientUpdateModule_H_ -#define __ClientUpdateModule_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include @@ -63,7 +60,3 @@ class ClientUpdateModule : public DrawableModule inline ClientUpdateModule::ClientUpdateModule( Thing *thing, const ModuleData* moduleData ) : DrawableModule( thing, moduleData ) { } inline ClientUpdateModule::~ClientUpdateModule() { } //------------------------------------------------------------------------------------------------- - - -#endif // __ClientUpdateModule_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/CommandLine.h b/GeneralsMD/Code/GameEngine/Include/Common/CommandLine.h index fe458850ba..48e078dc3d 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/CommandLine.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/CommandLine.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _COMMAND_LINE_H_ -#define _COMMAND_LINE_H_ - class CommandLine { public: @@ -38,5 +35,3 @@ class CommandLine static void parseCommandLineForStartup(); static void parseCommandLineForEngineInit(); }; - -#endif // _COMMAND_LINE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/CriticalSection.h b/GeneralsMD/Code/GameEngine/Include/Common/CriticalSection.h index 12f47d970e..b27261582a 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/CriticalSection.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/CriticalSection.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __CRITICALSECTION_H__ -#define __CRITICALSECTION_H__ - #include "Common/PerfTimer.h" #ifdef PERF_TIMERS @@ -104,5 +101,3 @@ extern CriticalSection *TheUnicodeStringCriticalSection; extern CriticalSection *TheDmaCriticalSection; extern CriticalSection *TheMemoryPoolCriticalSection; extern CriticalSection *TheDebugLogCriticalSection; - -#endif /* __CRITICALSECTION_H__ */ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/CustomMatchPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/CustomMatchPreferences.h index 0690bb4db0..bd16ba4c12 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/CustomMatchPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/CustomMatchPreferences.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __CUSTOMMATCHPREFERENCES_H__ -#define __CUSTOMMATCHPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -90,5 +87,3 @@ class CustomMatchPreferences : public UserPreferences Bool getUseStats( void ) const; void setUseStats( Bool useStats ); }; - -#endif // __CUSTOMMATCHPREFERENCES_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h b/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h index fd30fb8233..bca57a3ce7 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _DamageFX_H_ -#define _DamageFX_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameCommon.h" #include "Common/NameKeyGenerator.h" @@ -164,6 +161,3 @@ class DamageFXStore : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern DamageFXStore *TheDamageFXStore; - -#endif // _DamageFX_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DataChunk.h b/GeneralsMD/Code/GameEngine/Include/Common/DataChunk.h index 98ccf6b5ec..438580c5b3 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DataChunk.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DataChunk.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _DATA_CHUNK_H_ -#define _DATA_CHUNK_H_ - #include "Common/GameMemory.h" #include "Common/Dict.h" #include "Common/MapReaderWriterInfo.h" @@ -232,7 +229,3 @@ class DataChunkInput NameKeyType readNameKey(void); }; - - - -#endif // _DATA_CHUNK_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Dict.h b/GeneralsMD/Code/GameEngine/Include/Common/Dict.h index 8c32432c4b..8ce7f08680 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Dict.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Dict.h @@ -45,9 +45,6 @@ #pragma once -#ifndef Dict_H -#define Dict_H - #include "Common/Errors.h" #include "Common/NameKeyGenerator.h" @@ -362,7 +359,3 @@ inline Dict::DataType Dict::getNthType(Int n) const return DICT_NONE; return m_data->peek()[n].getType(); } - -#endif // Dict_H - - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Directory.h b/GeneralsMD/Code/GameEngine/Include/Common/Directory.h index 261883ed75..dce65db078 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Directory.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Directory.h @@ -27,10 +27,8 @@ // Desc: Directory info class /////////////////////////////////////////////////////////////////////////////////////////////////// #if (0) -#pragma once -#ifndef __DIRECTORY_H__ -#define __DIRECTORY_H__ +#pragma once // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" @@ -90,6 +88,4 @@ class Directory //------------------------------------------------------------------------------------------------- -#endif // __DIRECTORY_H__ - #endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h b/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h index c9d6464caa..2dc05b2962 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DISABLED_TYPES_H_ -#define __DISABLED_TYPES_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" @@ -114,6 +111,3 @@ inline void FLIP_DISABLEDMASK(DisabledMaskType& m) extern DisabledMaskType DISABLEDMASK_NONE; // inits to all zeroes extern DisabledMaskType DISABLEDMASK_ALL; // inits to all bits set. void initDisabledMasks(); - -#endif // __DISABLED_TYPES_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DiscreteCircle.h b/GeneralsMD/Code/GameEngine/Include/Common/DiscreteCircle.h index ad9cc2a5d4..c85159f365 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DiscreteCircle.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DiscreteCircle.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DISCRETECIRCLE_H__ -#define __DISCRETECIRCLE_H__ - //------------------------------------------------------------------------------------------------- /** One horizontal line of the circle we are going to generate, the points drawn should be from @@ -74,6 +71,3 @@ class DiscreteCircle void generateEdgePairs(Int xCenter, Int yCenter, Int radius); void removeDuplicates(); }; - -#endif /* __DISCRETECIRCLE_H__ */ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h b/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h index 6f0d3d940d..2f9cfd1572 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DRAWMODULE_H_ -#define __DRAWMODULE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Module.h" @@ -256,7 +253,3 @@ class RenderCost int m_boneCount; int m_shadowDrawCount; }; - - -#endif // __DRAWMODULE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Energy.h b/GeneralsMD/Code/GameEngine/Include/Common/Energy.h index 61adae476f..6887530f70 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Energy.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Energy.h @@ -44,9 +44,6 @@ #pragma once -#ifndef _ENERGY_H_ -#define _ENERGY_H_ - // INLCUDES ///////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" @@ -123,6 +120,3 @@ class Energy : public Snapshot UnsignedInt m_powerSabotagedTillFrame; ///< If power is sabotaged, the frame will be greater than now. Player *m_owner; ///< Tight pointer to the Player I am intrinsic to. }; - -#endif // _ENERGY_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Errors.h b/GeneralsMD/Code/GameEngine/Include/Common/Errors.h index 79f5d079a3..4b8316b087 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Errors.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Errors.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __ERRORS_H_ -#define __ERRORS_H_ - /** An ErrorCode is the repository for failure modes. In almost all situations, these values will be THROWN, not returned as error codes. Feel free @@ -68,5 +65,3 @@ enum ErrorCode CPP_11(: UnsignedInt) ERROR_LAST }; - -#endif // __ERRORS_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/FunctionLexicon.h b/GeneralsMD/Code/GameEngine/Include/Common/FunctionLexicon.h index 9f03292d6f..b4873899b9 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/FunctionLexicon.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/FunctionLexicon.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __FUNCTIONLEXICON_H_ -#define __FUNCTIONLEXICON_H_ - #include "Common/SubsystemInterface.h" #include "Common/NameKeyGenerator.h" #include "Common/GameMemory.h" @@ -149,6 +146,3 @@ inline WindowLayoutShutdownFunc FunctionLexicon::winLayoutShutdownFunc( NameKeyT // EXTERNALS /////////////////////////////////////////////////////////////////////////////////////////////////// extern FunctionLexicon *TheFunctionLexicon; ///< function dictionary external - -#endif // end __FUNCTIONLEXICON_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h b/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h index 2ce08a130f..5cf1b10b62 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h @@ -47,11 +47,6 @@ #pragma once -#ifndef _GAMECOMMON_H_ -#define _GAMECOMMON_H_ - - - #define DONT_ALLOW_DEBUG_CHEATS_IN_RELEASE ///< Take of the DONT to get cheats back in to release //#define _CAMPEA_DEMO @@ -508,6 +503,3 @@ enum Relationship CPP_11(: Int) // TheRelationShipNames is defined in Common/GameCommon.cpp extern const char *const TheRelationshipNames[]; - -#endif // _GAMECOMMON_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h b/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h index 5ce1fed5a7..62d3502eed 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _GAME_ENGINE_H_ -#define _GAME_ENGINE_H_ - #include "Common/SubsystemInterface.h" #include "Common/GameType.h" @@ -117,5 +114,3 @@ extern GameEngine *CreateGameEngine( void ); /// The entry point for the game system extern Int GameMain(); - -#endif // _GAME_ENGINE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h b/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h index 7b3b206f3e..3eb6c8b3c5 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h @@ -33,9 +33,6 @@ #pragma once -#ifndef _GAME_LOD_H_ -#define _GAME_LOD_H_ - enum ParticlePriorityType CPP_11(: Int); #define MAX_LOD_PRESETS_PER_LEVEL 32 //number of hardware configs preset for each low,medium,high,veryhigh @@ -257,4 +254,3 @@ ParticlePriorityType GameLODManager::getMinDynamicParticleSkipPriority(void) } extern GameLODManager *TheGameLODManager; -#endif // _GAME_LOD_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h index 44749ab8e6..25bc00d3ff 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __GAMESPYMISCPREFERENCES_H__ -#define __GAMESPYMISCPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -57,5 +54,3 @@ class GameSpyMiscPreferences : public UserPreferences Int getMaxMessagesPerUpdate( void ); }; - -#endif // __GAMESPYMISCPREFERENCES_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameState.h b/GeneralsMD/Code/GameEngine/Include/Common/GameState.h index b073fdd4b3..6d67933dd7 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameState.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameState.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GAME_STATE_H_ -#define __GAME_STATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" #include "Common/Snapshot.h" @@ -238,6 +235,3 @@ extern GameState *TheGameState; UnicodeString getUnicodeTimeBuffer(SYSTEMTIME timeVal); UnicodeString getUnicodeDateBuffer(SYSTEMTIME timeVal); - - -#endif // end __GAME_STATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameStateMap.h b/GeneralsMD/Code/GameEngine/Include/Common/GameStateMap.h index f719f95aac..af4f258754 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameStateMap.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameStateMap.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GAME_STATE_MAP_H_ -#define __GAME_STATE_MAP_H_ - // INLCUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" #include "Common/SubsystemInterface.h" @@ -69,5 +66,3 @@ class GameStateMap : public SubsystemInterface, // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern GameStateMap *TheGameStateMap; - -#endif // end __GAME_STATE_MAP_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameType.h b/GeneralsMD/Code/GameEngine/Include/Common/GameType.h index 2110d8138b..a079f07f81 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameType.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameType.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _GAME_TYPE_H_ -#define _GAME_TYPE_H_ - #include "Lib/BaseType.h" // the default size of the world map @@ -192,6 +189,3 @@ enum WeaponSlotType CPP_11(: Int) enum PathfindLayerEnum CPP_11(: Int) {LAYER_INVALID = 0, LAYER_GROUND = 1, LAYER_WALL = 15, LAYER_LAST=15}; //------------------------------------------------------------------------------------------------- - -#endif // _GAME_TYPE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h b/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h index 4d745501e5..1efebfb6a8 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GEOMETRY_H_ -#define __GEOMETRY_H_ - #include "Lib/BaseType.h" #include "Common/AsciiString.h" #include "Common/Snapshot.h" @@ -195,6 +192,3 @@ class GeometryInfo : public Snapshot #endif }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h index 60573a5ab9..a4659e77ae 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _GLOBALDATA_H_ -#define _GLOBALDATA_H_ - #include "Common/GameCommon.h" // ensure we get DUMP_PERF_STATS, or not #include "Common/AsciiString.h" #include "Common/GameType.h" @@ -598,5 +595,3 @@ inline const GlobalData* const& TheGlobalData = TheWritableGlobalData; #else #define TheGlobalData ((const GlobalData*)TheWritableGlobalData) #endif - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Handicap.h b/GeneralsMD/Code/GameEngine/Include/Common/Handicap.h index cf4810350d..47d52abf64 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Handicap.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Handicap.h @@ -44,9 +44,6 @@ #pragma once -#ifndef _HANDICAP_H_ -#define _HANDICAP_H_ - #include "Lib/BaseType.h" // ---------------------------------------------------------------------------------------------- @@ -117,5 +114,3 @@ class Handicap static ThingType getBestThingType(const ThingTemplate *tmpl); }; - -#endif // _HANDICAP_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/INI.h b/GeneralsMD/Code/GameEngine/Include/Common/INI.h index 33259945e8..957fd56bae 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/INI.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/INI.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __INI_H_ -#define __INI_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include // for offsetof, which we don't use but everyone who includes us does #include "Common/STLTypedefs.h" @@ -426,6 +423,3 @@ class INI char m_curBlockStart[ INI_MAX_CHARS_PER_LINE ]; ///< first line of cur block #endif }; - -#endif // __INI_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/IgnorePreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/IgnorePreferences.h index c89077442d..dc223cf403 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/IgnorePreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/IgnorePreferences.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __IGNORE_PREFERENCES_H_ -#define __IGNORE_PREFERENCES_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -82,5 +79,3 @@ class IgnorePreferences : public UserPreferences //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __IGNORE_PREFERENCES_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h b/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h index 104a384305..6b899dcca5 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __KINDOF_H_ -#define __KINDOF_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" @@ -219,6 +216,3 @@ inline void FLIP_KINDOFMASK(KindOfMaskType& m) extern KindOfMaskType KINDOFMASK_NONE; // inits to all zeroes extern KindOfMaskType KINDOFMASK_FS; // Initializes all FS types for faction structures. void initKindOfMasks(); - -#endif // __KINDOF_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/LadderPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/LadderPreferences.h index a5e1de6a1a..ca5c7e6519 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/LadderPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/LadderPreferences.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __LADDERPREFERENCES_H__ -#define __LADDERPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -76,5 +73,3 @@ class LadderPreferences : public UserPreferences private: LadderPrefMap m_ladders; }; - -#endif // __LADDERPREFERENCES_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Language.h b/GeneralsMD/Code/GameEngine/Include/Common/Language.h index cc1b80e263..912b090bd8 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Language.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Language.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __LANGUAGE_H_ -#define __LANGUAGE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -102,6 +99,3 @@ typedef enum // EXTERNALS ////////////////////////////////////////////////////////////////// extern LanguageID OurLanguage; ///< our current language definition - -#endif // __LANGUAGE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/LatchRestore.h b/GeneralsMD/Code/GameEngine/Include/Common/LatchRestore.h index 82f73a29e7..a3bbe9c2ad 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/LatchRestore.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/LatchRestore.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __LATCHRESTORE_H__ -#define __LATCHRESTORE_H__ - /* The purpose of the LatchRestore class is to allow you to override member variables for the scope of a function. Here's the code that this saves: @@ -111,7 +108,3 @@ class LatchRestore whereToRestore = valueToRestore; } }; - - -#endif /* __LATCHRESTORE_H__ */ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/List.h b/GeneralsMD/Code/GameEngine/Include/Common/List.h index 99a96145fc..8790d5bb9a 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/List.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/List.h @@ -43,10 +43,6 @@ #pragma once - -#ifndef __WSYS_LIST_H -#define __WSYS_LIST_H - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -177,5 +173,3 @@ inline LListNode* LList::lastNode( void ) { return m_head.prev();} ; inline void LList::setSortMode( SortMode new_mode ) { m_sortMode = new_mode; }; inline Bool LList::isEmpty( void ) { return !m_head.inList(); }; inline void LList::destroy( void ) { clear();}; - -#endif // __GDF_LIST_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MapObject.h b/GeneralsMD/Code/GameEngine/Include/Common/MapObject.h index 64cd77ddac..1438662ecc 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MapObject.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MapObject.h @@ -29,9 +29,6 @@ #pragma once -#ifndef MapObject_H -#define MapObject_H - #include "Common/Dict.h" #include "Common/GameMemory.h" #include "GameClient/TerrainRoads.h" @@ -183,6 +180,3 @@ class MapObject : public MemoryPoolObject static Dict* getWorldDict() { return &TheWorldDict; } static Int countMapObjectsWithOwner(const AsciiString& n); }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h b/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h index 65fe2d7ecb..7d9b0ab3cb 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _MAP_READER_WRITER_INFO_H_ -#define _MAP_READER_WRITER_INFO_H_ - #define K_HEIGHT_MAP_VERSION_1 1 // Height map cell = 5.0 #define K_HEIGHT_MAP_VERSION_2 2 // Height map cell = 10.0 #define K_HEIGHT_MAP_VERSION_3 3 // Added m_borderSize @@ -119,8 +116,6 @@ class FileInputStream : public ChunkInputStream }; */ -#endif // _MAP_READER_WRITER_INFO_H_ - /* rev K_HEIGHT_MAP_VERSION_4 diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h index 4bc25f74e6..915a2756ba 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _MESSAGE_STREAM_H_ -#define _MESSAGE_STREAM_H_ - #include "Common/GameCommon.h" // ensure we get DUMP_PERF_STATS, or not #include "Common/SubsystemInterface.h" #include "Lib/BaseType.h" @@ -840,5 +837,3 @@ extern CommandList *TheCommandList; * construct a valid 2D bounding region. */ extern void buildRegion( const ICoord2D *anchor, const ICoord2D *dest, IRegion2D *region ); - -#endif // _MESSAGE_STREAM_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MissionStats.h b/GeneralsMD/Code/GameEngine/Include/Common/MissionStats.h index 9bd4a99175..a1cc8e0924 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MissionStats.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MissionStats.h @@ -44,9 +44,6 @@ #pragma once -#ifndef _MISSIONSTATS_H_ -#define _MISSIONSTATS_H_ - #include "Lib/BaseType.h" #include "Common/GameCommon.h" #include "Common/Snapshot.h" @@ -85,6 +82,3 @@ class MissionStats : public Snapshot Int m_buildingsLost; ///< how many of our buildings were destroyed? //Int m_whoLastHurtMe; ///< last Player to destroy one of my units }; - -#endif // _MISSIONSTATS_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h b/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h index 41efd75267..84593b6083 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _ModelState_H_ -#define _ModelState_H_ - #include "Lib/BaseType.h" #include "Common/INI.h" #include "Common/BitFlags.h" @@ -260,6 +257,3 @@ typedef BitFlags ModelConditionFlags; //------------------------------------------------------------------------------------------------- //------------------------------------------------------------------------------------------------- - -#endif // _ModelState_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Module.h b/GeneralsMD/Code/GameEngine/Include/Common/Module.h index 3cbe964276..0c4619a9de 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Module.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Module.h @@ -31,9 +31,6 @@ #pragma once -#ifndef __MODULE_H_ -#define __MODULE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" @@ -318,7 +315,3 @@ class DrawableModule : public Module //------------------------------------------------------------------------------------------------- /** VARIOUS MODULE INTERFACES */ //------------------------------------------------------------------------------------------------- - - -#endif // __MODULE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h b/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h index 72f635d86f..a7af21cd32 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h @@ -36,9 +36,6 @@ #pragma once -#ifndef __MODULEFACTORY_H_ -#define __MODULEFACTORY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include @@ -126,6 +123,3 @@ class ModuleFactory : public SubsystemInterface, public Snapshot // EXTERN ///////////////////////////////////////////////////////////////////////////////////////// extern ModuleFactory *TheModuleFactory; ///< singleton definition - -#endif // __MODULEFACTORY_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Money.h b/GeneralsMD/Code/GameEngine/Include/Common/Money.h index 9b17177669..aa19879f43 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Money.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Money.h @@ -44,9 +44,6 @@ #pragma once -#ifndef _MONEY_H_ -#define _MONEY_H_ - #include "Lib/BaseType.h" #include "Common/Debug.h" #include "Common/Snapshot.h" @@ -106,6 +103,3 @@ class Money : public Snapshot UnsignedInt m_money; ///< amount of money Int m_playerIndex; ///< what is my player index? }; - -#endif // _MONEY_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MultiplayerSettings.h b/GeneralsMD/Code/GameEngine/Include/Common/MultiplayerSettings.h index e185ad4c7c..7518ef2660 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MultiplayerSettings.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MultiplayerSettings.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _MULTIPLAYERSETTINGS_H_ -#define _MULTIPLAYERSETTINGS_H_ - #include "GameClient/Color.h" #include "Common/Money.h" @@ -143,5 +140,3 @@ class MultiplayerSettings : public SubsystemInterface // singleton extern MultiplayerSettings *TheMultiplayerSettings; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h b/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h index ecede5c75d..bc98672b29 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __NAMEKEYGENERATOR_H_ -#define __NAMEKEYGENERATOR_H_ - #include "Lib/BaseType.h" #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" @@ -158,6 +155,3 @@ class StaticNameKey // ugh, this is a little hokey, but lets us pretend that a StaticNameKey == NameKeyType inline operator NameKeyType() const { return key(); } }; - -#endif // __NAMEKEYGENERATOR_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h b/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h index 2d6ec58577..f5039a1713 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __OSDISPLAY_H__ -#define __OSDISPLAY_H__ - #include "Lib/BaseType.h" class AsciiString; @@ -66,5 +63,3 @@ OSDisplayButtonType OSDisplayWarningBox(AsciiString p, AsciiString m, UnsignedIn // TheSuperHackers @feature Tell the Operating System that the game is considered busy // and we would not like the display screen and/or system to shut off. void OSDisplaySetBusyState(Bool busyDisplay, Bool busySystem); - -#endif /* __OSDISPLAY_H__ */ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h b/GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h index 3ee41e52a2..df19b3743e 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __OBJECT_STATUS_TYPES_H -#define __OBJECT_STATUS_TYPES_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" @@ -141,5 +138,3 @@ inline void FLIP_OBJECT_STATUS_MASK( ObjectStatusMaskType& m ) // defined in Common/System/ObjectStatusTypes.cpp extern ObjectStatusMaskType OBJECT_STATUS_MASK_NONE; // inits to all zeroes - -#endif /* __OBJECT_STATUS_TYPES_H */ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h b/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h index 6fda0ac4e5..03ae479dd0 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _OVERRIDABLE_H_ -#define _OVERRIDABLE_H_ - #include "Common/GameMemory.h" /* @@ -124,6 +121,3 @@ __inline Overridable::~Overridable() { deleteInstance(m_nextOverride); } - - -#endif /* _OVERRIDABLE_H_ */ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Override.h b/GeneralsMD/Code/GameEngine/Include/Common/Override.h index bbd914d67d..45cd955858 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Override.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Override.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _OVERRIDE_H_ -#define _OVERRIDE_H_ - #include "Common/Overridable.h" /* @@ -136,6 +133,3 @@ OVERRIDE::operator const T*( ) const { return operator*(); } - -#endif /* _OVERRIDE_H_ */ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h b/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h index f16d6e7fb7..39c0951281 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h @@ -38,8 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_PARTITIONSOLVER_ -#define _H_PARTITIONSOLVER_ // INCLUDES /////////////////////////////////////////////////////////////////// @@ -83,5 +81,3 @@ class PartitionSolver void solve(void); const SolutionVec& getSolution( void ) const; }; - -#endif /* _H_PARTITIONSOLVER_ */ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PerfMetrics.h b/GeneralsMD/Code/GameEngine/Include/Common/PerfMetrics.h index 1b09cbe86e..9d3eb19584 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/PerfMetrics.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/PerfMetrics.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __PERFMETRICS_H__ -#define __PERFMETRICS_H__ - // For load timings enum { PERFMETRICS_LOAD_STARTFRAME = 0 }; enum { PERFMETRICS_LOAD_STOPFRAME = 1 }; @@ -42,7 +39,3 @@ enum { PERFMETRICS_LOGIC_STOPFRAME = 1000 }; // For showing metrics enum { PERFMETRICS_BETWEEN_METRICS = 150 }; - -#endif /* __PERFMETRICS_H__ */ - - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h b/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h index af90becc69..b2a4c60d05 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __PERFTIMER_H__ -#define __PERFTIMER_H__ - #include "Utility/intrin_compat.h" #if defined(RTS_DEBUG) @@ -321,5 +318,3 @@ extern void StatMetricsDisplay( DebugDisplayInterface *dd, void *, FILE *fp ); #define IGNORE_PERF_TIMER(id) #endif // PERF_TIMERS - -#endif /* __PERFTIMER_H__ */ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Player.h b/GeneralsMD/Code/GameEngine/Include/Common/Player.h index 2e1dd36b2e..8dd358a09a 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Player.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Player.h @@ -44,9 +44,6 @@ #pragma once -#ifndef _PLAYER_H_ -#define _PLAYER_H_ - #include "Common/AcademyStats.h" #include "Common/Debug.h" #include "Common/Energy.h" @@ -832,5 +829,3 @@ class Player : public Snapshot Bool m_isPlayerDead; Bool m_logicalRetaliationModeEnabled; }; - -#endif // _PLAYER_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h b/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h index 752c0c31f8..7fe0641a24 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h @@ -44,9 +44,6 @@ #pragma once -#ifndef _PLAYERLIST_H_ -#define _PLAYERLIST_H_ - #include "Common/SubsystemInterface.h" #include "Common/GameCommon.h" #include "Common/NameKeyGenerator.h" @@ -171,5 +168,3 @@ class PlayerList : public SubsystemInterface, // ---------------------------------------------------------------------------------------------- extern PlayerList *ThePlayerList; ///< singleton instance of PlayerList - -#endif // _PLAYERLIST_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PlayerTemplate.h b/GeneralsMD/Code/GameEngine/Include/Common/PlayerTemplate.h index 399051816b..032e1a5d0f 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/PlayerTemplate.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/PlayerTemplate.h @@ -44,9 +44,6 @@ #pragma once -#ifndef _PLAYERTEMPLATE_H_ -#define _PLAYERTEMPLATE_H_ - #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" #include "Common/Debug.h" @@ -233,5 +230,3 @@ class PlayerTemplateStore : public SubsystemInterface // ---------------------------------------------------------------------------------------------- extern PlayerTemplateStore *ThePlayerTemplateStore; ///< singleton instance of PlayerTemplateStore - -#endif // _PLAYERTEMPLATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ProductionPrerequisite.h b/GeneralsMD/Code/GameEngine/Include/Common/ProductionPrerequisite.h index 4ac3201869..ad9d1f833b 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ProductionPrerequisite.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ProductionPrerequisite.h @@ -42,9 +42,6 @@ #pragma once -#ifndef __ProductionPrerequisite_H_ -#define __ProductionPrerequisite_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -121,5 +118,3 @@ class ProductionPrerequisite }; //----------------------------------------------------------------------------- - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/QuickmatchPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/QuickmatchPreferences.h index 72b14c9c3e..9abf5abf80 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/QuickmatchPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/QuickmatchPreferences.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __QUICKMATCHPREFERENCES_H__ -#define __QUICKMATCHPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -78,5 +75,3 @@ class QuickMatchPreferences : public UserPreferences void setSide(Int val); Int getSide( void ); }; - -#endif // __QUICKMATCHPREFERENCES_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/QuotedPrintable.h b/GeneralsMD/Code/GameEngine/Include/Common/QuotedPrintable.h index 708d7fe03a..5f50ebfbf0 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/QuotedPrintable.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/QuotedPrintable.h @@ -29,13 +29,8 @@ #pragma once -#ifndef __QUOTEDPRINTABLE_H__ -#define __QUOTEDPRINTABLE_H__ - UnicodeString QuotedPrintableToUnicodeString(AsciiString original); AsciiString UnicodeStringToQuotedPrintable(UnicodeString original); AsciiString QuotedPrintableToAsciiString(AsciiString original); AsciiString AsciiStringToQuotedPrintable(AsciiString original); - -#endif // __QUOTEDPRINTABLE_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Radar.h b/GeneralsMD/Code/GameEngine/Include/Common/Radar.h index a180be8cfd..4214b70ab1 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Radar.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Radar.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __RADAR_H_ -#define __RADAR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/SubsystemInterface.h" @@ -313,8 +310,3 @@ class RadarDummy : public Radar virtual void clearShroud() { } virtual void setShroudLevel(Int x, Int y, CellShroudStatus setting) { } }; - -#endif // __RADAR_H_ - - - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h b/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h index 461b38cd87..5ba791be25 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Recorder.h @@ -22,7 +22,6 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once #include "Common/MessageStream.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Registry.h b/GeneralsMD/Code/GameEngine/Include/Common/Registry.h index 1949270243..9ec63c2c19 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Registry.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Registry.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __REGISTRY_H__ -#define __REGISTRY_H__ - #include /** @@ -51,5 +48,3 @@ AsciiString GetRegistryLanguage(void); // convenience function AsciiString GetRegistryGameName(void); // convenience function UnsignedInt GetRegistryVersion(void); // convenience function UnsignedInt GetRegistryMapPackVersion(void); // convenience function - -#endif // __REGISTRY_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ResourceGatheringManager.h b/GeneralsMD/Code/GameEngine/Include/Common/ResourceGatheringManager.h index 64ed503860..265081de2b 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ResourceGatheringManager.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ResourceGatheringManager.h @@ -30,9 +30,6 @@ #pragma once -#ifndef RESOURCE_GATHER_MANAGER_H -#define RESOURCE_GATHER_MANAGER_H - #include "Common/GameType.h" #include "Common/Snapshot.h" @@ -72,5 +69,3 @@ class ResourceGatheringManager : public MemoryPoolObject, objectIDList m_supplyCenters; }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h b/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h index 939d27af6b..48eef5289e 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h @@ -44,9 +44,6 @@ #pragma once -#ifndef __STLTYPEDEFS_H__ -#define __STLTYPEDEFS_H__ - //----------------------------------------------------------------------------- // srj sez: this must come first, first, first. #define _STLP_USE_NEWALLOC 1 @@ -297,5 +294,3 @@ namespace rts }; } // namespace rts - -#endif /* __STLTYPEDEFS_H__ */ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Science.h b/GeneralsMD/Code/GameEngine/Include/Common/Science.h index a94ed801bd..689b507845 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Science.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Science.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SCIENCE_H_ -#define __SCIENCE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Overridable.h" #include "Common/NameKeyGenerator.h" @@ -134,7 +131,3 @@ class ScienceStore : public SubsystemInterface }; extern ScienceStore* TheScienceStore; - - -#endif // __SCIENCE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ScopedMutex.h b/GeneralsMD/Code/GameEngine/Include/Common/ScopedMutex.h index 45a5b85202..c6c85bf9cd 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ScopedMutex.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ScopedMutex.h @@ -23,9 +23,6 @@ #pragma once -#ifndef __SCOPEDMUTEX_H__ -#define __SCOPEDMUTEX_H__ - class ScopedMutex { private: @@ -45,5 +42,3 @@ class ScopedMutex ReleaseMutex(m_mutex); } }; - -#endif /* __SCOPEDMUTEX_H__ */ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h b/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h index 8b0e59a045..d014819688 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __SCOREKEEPER_H_ -#define __SCOREKEEPER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -141,5 +138,3 @@ inline void ScoreKeeper::addMoneyEarned( Int money ) { m_totalMoneyEarned + //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __SCOREKEEPER_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h index 66f0586213..6826ab14f4 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __SKIRMISHBATTLEHONORS_H__ -#define __SKIRMISHBATTLEHONORS_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -108,5 +105,3 @@ void InsertBattleHonor(GameWindow *list, const Image *image, Bool enabled, Int i void BattleHonorTooltip(GameWindow *window, WinInstanceData *instData, UnsignedInt mouse); - -#endif // __SKIRMISHBATTLEHONORS_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h index 21fcd61b85..ef1dc739a2 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __SKIRMISHPREFERENCES_H__ -#define __SKIRMISHPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -64,5 +61,3 @@ class SkirmishPreferences : public UserPreferences Money getStartingCash(void) const; void setStartingCash( const Money &startingCash ); }; - -#endif // __SKIRMISHPREFERENCES_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Snapshot.h b/GeneralsMD/Code/GameEngine/Include/Common/Snapshot.h index 563ee01d72..d6f8586f74 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Snapshot.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Snapshot.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __SNAPSHOT_H_ -#define __SNAPSHOT_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" @@ -68,6 +65,3 @@ friend class XferCRC; virtual void loadPostProcess( void ) = 0; }; - -#endif // __SNAPSHOT_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h b/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h index 787b6b0939..c85dc0c618 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SparseMatchFinder_H_ -#define __SparseMatchFinder_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/BitFlags.h" #include "Common/STLTypedefs.h" @@ -245,6 +242,3 @@ class SparseMatchFinder } }; - -#endif // __SparseMatchFinder_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h index bc17eff0a6..c1aa8e794d 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __SPECIALPOWER_H_ -#define __SPECIALPOWER_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameMemory.h" @@ -191,5 +188,3 @@ class SpecialPowerStore : public SubsystemInterface // EXTERNAL /////////////////////////////////////////////////////////////////////////////////////// extern SpecialPowerStore *TheSpecialPowerStore; - -#endif // end __SPECIALPOWER_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerMaskType.h b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerMaskType.h index 8b3bc1a9b7..fafff1ad21 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerMaskType.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerMaskType.h @@ -27,13 +27,9 @@ // JKMCD Aug 2002 #pragma once -#ifndef __SPECIALPOWERMASKTYPE_H__ -#define __SPECIALPOWERMASKTYPE_H__ #include "Common/BitFlags.h" #include "Common/BitFlagsIO.h" #include "Common/SpecialPowerType.h" typedef BitFlags SpecialPowerMaskType; - -#endif /* __SPECIALPOWERMASKTYPE_H__ */ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h index 2e2d0e292c..163f410ddb 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h @@ -27,8 +27,6 @@ // JKMCD Aug 2002 #pragma once -#ifndef __SPECIALPOWERTYPE_H__ -#define __SPECIALPOWERTYPE_H__ // ------------------------------------------------------------------------------------------------ // don't forget to add new strings to SpecialPowerMaskType::s_bitNameList[] @@ -134,5 +132,3 @@ enum SpecialPowerType CPP_11(: Int) }; // Definition of these names is located in SpecialPower.cpp - -#endif /* __SPECIALPOWERTYPE_H__ */ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h b/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h index d8110cf247..5c2990fe3a 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h @@ -24,9 +24,6 @@ #pragma once -#ifndef __STACKDUMP_H_ -#define __STACKDUMP_H_ - #ifndef IG_DEGBUG_STACKTRACE #define IG_DEBUG_STACKTRACE 1 #endif // Unsure about this one -ML 3/25/03 @@ -69,4 +66,3 @@ __inline void DumpExceptionInfo( unsigned int u, EXCEPTION_POINTERS* e_info ) {} #endif extern AsciiString g_LastErrorDump; -#endif // __STACKDUMP_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h index 1c1802b8fd..2425fc2682 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _STATE_MACHINE_H_ -#define _STATE_MACHINE_H_ - #include "Common/GameMemory.h" #include "Common/GameType.h" #include "Common/ModelState.h" @@ -488,6 +485,3 @@ inline void deleteInstance(StateMachine* machine) if (machine != NULL) machine->Release_Ref(); } - - -#endif // _STATE_MACHINE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StatsCollector.h b/GeneralsMD/Code/GameEngine/Include/Common/StatsCollector.h index c881bbc249..a840699015 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/StatsCollector.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/StatsCollector.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __STATSCOLLECTOR_H_ -#define __STATSCOLLECTOR_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -119,5 +116,3 @@ class StatsCollector // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- extern StatsCollector* TheStatsCollector; ///< we need a singleton - -#endif // __STATSCOLLECTOR_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SubsystemInterface.h b/GeneralsMD/Code/GameEngine/Include/Common/SubsystemInterface.h index fec6c93c4d..4ef134f756 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SubsystemInterface.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SubsystemInterface.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SUBSYSTEMINTERFACE_H_ -#define __SUBSYSTEMINTERFACE_H_ - #include "Common/INI.h" #include "Common/STLTypedefs.h" @@ -169,6 +166,3 @@ class SubsystemInterfaceList }; extern SubsystemInterfaceList* TheSubsystemList; - -#endif // __SUBSYSTEMINTERFACE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SystemInfo.h b/GeneralsMD/Code/GameEngine/Include/Common/SystemInfo.h index 5df92618a4..c2d1f06282 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SystemInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SystemInfo.h @@ -28,11 +28,4 @@ #pragma once -#ifndef __SYSTEMINFO_H__ -#define __SYSTEMINFO_H__ - extern const Bool TheSystemIsUnicode; - - - -#endif /* __SYSTEMINFO_H__ */ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Team.h b/GeneralsMD/Code/GameEngine/Include/Common/Team.h index 645aa08c6f..1f2b6f7606 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Team.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Team.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _TEAM_H_ -#define _TEAM_H_ - #include "Common/GameType.h" #include "Common/Snapshot.h" #include "Common/Thing.h" @@ -756,5 +753,3 @@ const AsciiString& Team::getName(void) const // ------------------------------------------------------------------------ - -#endif // _TEAM_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Terrain.h b/GeneralsMD/Code/GameEngine/Include/Common/Terrain.h index e5ff47b501..69ce929983 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Terrain.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Terrain.h @@ -32,14 +32,9 @@ #pragma once -#ifndef __TERRAIN_H_ -#define __TERRAIN_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// // DEFINE ///////////////////////////////////////////////////////////////////// #define MAX_TERRAIN_NAME_LEN 64 ///< max size of map filename with extenstion - -#endif // end __TERRAIN_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h b/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h index 6858c5e255..1668c6a09b 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __TERRAINTYPE_H_ -#define __TERRAINTYPE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "Common/SubsystemInterface.h" @@ -243,6 +240,3 @@ class TerrainTypeCollection : public SubsystemInterface // EXTERNAL /////////////////////////////////////////////////////////////////////////////////////// extern TerrainTypeCollection *TheTerrainTypes; - -#endif // __TERRAINTYPE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Thing.h b/GeneralsMD/Code/GameEngine/Include/Common/Thing.h index e278e7f19f..b4e25f0020 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Thing.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Thing.h @@ -48,9 +48,6 @@ #pragma once -#ifndef __THING_H_ -#define __THING_H_ - //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -197,6 +194,3 @@ class Thing : public MemoryPoolObject //----------------------------------------------------------------------------- // Externals //----------------------------------------------------------------------------- - -#endif // $label - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h b/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h index 281b666855..facde87438 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __THINGFACTORY_H_ -#define __THINGFACTORY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" @@ -134,7 +131,3 @@ class ThingFactory : public SubsystemInterface // EXTERN ///////////////////////////////////////////////////////////////////////////////////////// extern ThingFactory *TheThingFactory; ///< the template singleton - - -#endif // __THINGFACTORY_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h b/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h index a7029d622a..621f798a87 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __THINGSORT_H_ -#define __THINGSORT_H_ - #include "GameCommon.h" //------------------------------------------------------------------------------------------------- @@ -78,6 +75,3 @@ static const char *const EditorSortingNames[] = }; static_assert(ARRAY_SIZE(EditorSortingNames) == ES_NUM_SORTING_TYPES + 1, "Incorrect array size"); #endif - -#endif // __THINGSORT_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h b/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h index 14fbd7a4e7..2064295107 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __THINGTEMPLATE_H_ -#define __THINGTEMPLATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" @@ -787,6 +784,3 @@ class ThingTemplate : public Overridable //----------------------------------------------------------------------------- // Externals //----------------------------------------------------------------------------- - -#endif // __THINGTEMPLATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h b/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h index 595442cf58..b628e5b1c8 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h @@ -29,9 +29,6 @@ #pragma once -#ifndef TUNNEL_TRACKER_H -#define TUNNEL_TRACKER_H - #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/Snapshot.h" @@ -95,5 +92,3 @@ class TunnelTracker : public MemoryPoolObject, ObjectID m_curNemesisID; ///< If we have team(s) guarding a tunnel network system, this is one of the current targets. UnsignedInt m_nemesisTimestamp; ///< We only keep nemesis for a couple of seconds. }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/UnitTimings.h b/GeneralsMD/Code/GameEngine/Include/Common/UnitTimings.h index 5c57fa3b53..e49be63c64 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/UnitTimings.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/UnitTimings.h @@ -29,11 +29,4 @@ #pragma once -#ifndef __UNITTIMINGS_H_ -#define __UNITTIMINGS_H_ - - #define dont_DO_UNIT_TIMINGS - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h b/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h index afcc79b82a..07aa657a65 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __UPGRADE_H_ -#define __UPGRADE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" @@ -266,5 +263,3 @@ class UpgradeCenter : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern UpgradeCenter *TheUpgradeCenter; - -#endif // end __UPGRADE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h index b62a0afbe2..1e26fabe05 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __USERPREFERENCES_H__ -#define __USERPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -176,5 +173,3 @@ class LANPreferences : public UserPreferences void setSuperweaponRestricted( Bool superweaponRestricted); void setStartingCash( const Money & startingCash ); }; - -#endif // __USERPREFERENCES_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/WellKnownKeys.h b/GeneralsMD/Code/GameEngine/Include/Common/WellKnownKeys.h index fbdcf3883c..419990cbbe 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/WellKnownKeys.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/WellKnownKeys.h @@ -45,9 +45,6 @@ #pragma once -#ifndef _H_WELLKNOWNKEYS -#define _H_WELLKNOWNKEYS - #include "Common/NameKeyGenerator.h" #ifdef INSTANTIATE_WELL_KNOWN_KEYS @@ -920,5 +917,3 @@ DEFINE_KEY(Player_7_Start) DEFINE_KEY(Player_8_Start) // --------------------------------------------------------------------------------------- - -#endif // _H_WELLKNOWNKEYS diff --git a/GeneralsMD/Code/GameEngine/Include/Common/encrypt.h b/GeneralsMD/Code/GameEngine/Include/Common/encrypt.h index c7ee67670b..ff030f10d6 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/encrypt.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/encrypt.h @@ -28,16 +28,9 @@ #pragma once -#ifndef ENCRYPT_HEADER -#define ENCRYPT_HEADER - // This routine is non-reentrant, as it returns a static buffer!!! // Valid input is 4-8 characters, and can contain letters and numbers and '.' and '/' #define MAX_ENCRYPTED_STRING 8 const char *EncryptString(const char *); - -#endif - - diff --git a/GeneralsMD/Code/GameEngine/Include/Common/version.h b/GeneralsMD/Code/GameEngine/Include/Common/version.h index 895f0f9f82..5c139fb614 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/version.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/version.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __VERSION_H__ -#define __VERSION_H__ - #include /** @@ -120,5 +117,3 @@ class Version }; extern Version *TheVersion; - -#endif // __VERSION_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h index b8346c589f..eed24494d8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __ANIM_2D_H_ -#define __ANIM_2D_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" @@ -222,5 +219,3 @@ class Anim2DCollection : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern Anim2DCollection *TheAnim2DCollection; - -#endif // end __ANIM_2D_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h index 4ff9fa972f..bd74f4c3d8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h @@ -47,9 +47,6 @@ #pragma once -#ifndef __ANIMATEWINDOWMANAGER_H_ -#define __ANIMATEWINDOWMANAGER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -236,5 +233,3 @@ namespace wnd //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __ANIMATEWINDOWMANAGER_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/CDCheck.h b/GeneralsMD/Code/GameEngine/Include/GameClient/CDCheck.h index 328d245a5c..067a026f58 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/CDCheck.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/CDCheck.h @@ -29,12 +29,7 @@ #pragma once -#ifndef __CDCHECK_H_ -#define __CDCHECK_H_ - typedef void (*gameStartCallback) (void); Bool IsFirstCDPresent(void); void CheckForCDAtGameStart( gameStartCallback callback ); - -#endif //__CDCHECK_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h index 163732c13b..f82e5a64b0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __CAMPAIGN_MANAGER_H_ -#define __CAMPAIGN_MANAGER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -176,5 +173,3 @@ class CampaignManager : public Snapshot // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- extern CampaignManager *TheCampaignManager; - -#endif // __CAMPAIGN_MANAGER_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ChallengeGenerals.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ChallengeGenerals.h index 2de644e034..fb8456685e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ChallengeGenerals.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ChallengeGenerals.h @@ -29,10 +29,6 @@ #pragma once -#ifndef __CHALLENGEGENERALS_H_ -#define __CHALLENGEGENERALS_H_ - - // INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Overridable.h" @@ -156,5 +152,3 @@ class ChallengeGenerals // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern ChallengeGenerals *TheChallengeGenerals; extern ChallengeGenerals *createChallengeGenerals( void ); - -#endif // end __CHALLENGEGENERALS_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Color.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Color.h index 3c8789b364..34f4a5f296 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Color.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Color.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __COLOR_H_ -#define __COLOR_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -88,6 +85,3 @@ extern void GameGetColorComponents( Color color, extern void GameGetColorComponentsReal( Color color, Real *red, Real *green, Real *blue, Real *alpha ); extern Color GameDarkenColor( Color color, Int percent = 10 ); - -#endif // __COLOR_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h index bed98764ac..2017aba7ac 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _H_CommandXlat -#define _H_CommandXlat - #include "GameClient/InGameUI.h" enum GUICommandType CPP_11(: Int); @@ -125,5 +122,3 @@ class PickAndPlayInfo }; extern void pickAndPlayUnitVoiceResponse( const DrawableList *list, GameMessage::Type msgType, PickAndPlayInfo *info = NULL ); - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h index 770a70f4e5..e15b68975c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __CONTROLBAR_H_ -#define __CONTROLBAR_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameType.h" @@ -1049,6 +1046,3 @@ class ControlBar : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern ControlBar *TheControlBar; - -#endif // end __CONTROLBAR_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarResizer.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarResizer.h index 264384d031..089d52d7fa 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarResizer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarResizer.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __CONTROL_BAR_RESIZER_H_ -#define __CONTROL_BAR_RESIZER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -103,5 +100,3 @@ class ControlBarResizer //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __CONTROL_BAR_RESIZER_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h index 96735b2320..19f4db3105 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __CONTROL_BAR_SCHEME_H_ -#define __CONTROL_BAR_SCHEME_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -289,5 +286,3 @@ class ControlBarSchemeManager //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __CONTROL_BAR_SCHEME_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Credits.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Credits.h index 45c2971203..a4a1782e84 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Credits.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Credits.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __CREDITS_H_ -#define __CREDITS_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -165,4 +162,3 @@ class CreditsManager: public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- extern CreditsManager *TheCredits; -#endif // __CREDITS_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h index 25a2a01d4b..c6e3c8aa0c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DebugDisplay.h @@ -43,10 +43,6 @@ #pragma once -#ifndef __GAMECLIENT_DEBUGDISPLAY_H -#define __GAMECLIENT_DEBUGDISPLAY_H - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -149,7 +145,3 @@ extern void AudioDebugDisplay( DebugDisplayInterface *debugDisplay, void *userDa //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - - -#endif // __GAMECLIENT_DEBUGDISPLAY_H diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Diplomacy.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Diplomacy.h index 4248f51fe6..83547b01d9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Diplomacy.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Diplomacy.h @@ -28,13 +28,8 @@ #pragma once -#ifndef __DIPLOMACY_H__ -#define __DIPLOMACY_H__ - void PopulateInGameDiplomacyPopup( void ); void UpdateDiplomacyBriefingText(AsciiString newText, Bool clear); typedef std::list BriefingList; BriefingList* GetBriefingTextList(void); - -#endif // #ifndef __DIPLOMACY_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h index 3578157169..7cbcde1bac 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __DISCONNECTDIALOG_H -#define __DISCONNECTDIALOG_H - #include "GameNetwork/DisconnectManager.h" enum DisconnectMenuStateType CPP_11(: Int) { @@ -79,5 +75,3 @@ class DisconnectMenu { }; extern DisconnectMenu *TheDisconnectMenu; - -#endif // #ifndef __DISCONNECTDIALOG_H diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h index 7b889b9c0b..aba8118685 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _GAME_DISPLAY_H_ -#define _GAME_DISPLAY_H_ - #include #include "Common/SubsystemInterface.h" #include "View.h" @@ -235,6 +232,3 @@ typedef struct _DisplaySettings Int bitDepth; //Color Depth Bool windowed; //Window mode TRUE: we're windowed, FALSE: we're not windowed } DisplaySettings; - - -#endif // _GAME_DISPLAY_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayString.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayString.h index a500097618..7c206d5b25 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayString.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayString.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __DISPLAYSTRING_H_ -#define __DISPLAYSTRING_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -129,6 +126,3 @@ inline void DisplayString::notifyTextChanged( void ) {} inline DisplayString *DisplayString::next( void ) { return m_next; } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __DISPLAYSTRING_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayStringManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayStringManager.h index 08b39b9660..bc3b70d56a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayStringManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayStringManager.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DISPLAYSTRINGMANAGER_H_ -#define __DISPLAYSTRINGMANAGER_H_ - #include "Common/SubsystemInterface.h" #include "GameClient/DisplayString.h" @@ -66,6 +63,3 @@ class DisplayStringManager : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern DisplayStringManager *TheDisplayStringManager; ///< singleton extern - -#endif // __DISPLAYSTRINGMANAGER_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DrawGroupInfo.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DrawGroupInfo.h index f613c43b74..7e2cf1a5ff 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DrawGroupInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DrawGroupInfo.h @@ -27,8 +27,6 @@ // Author: John K. McDonald, March 2002 #pragma once -#ifndef _H_DRAWGROUPINFO_ -#define _H_DRAWGROUPINFO_ struct DrawGroupInfo { @@ -64,5 +62,3 @@ struct DrawGroupInfo }; extern DrawGroupInfo *TheDrawGroupInfo; - -#endif /* _H_DRAWGROUPINFO */ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h index f13506474e..0ab9bf05c6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h @@ -27,8 +27,6 @@ // Author: Michael S. Booth, March 2001 #pragma once -#ifndef _DRAWABLE_H_ -#define _DRAWABLE_H_ #include "Common/AudioEventRTS.h" #include "Common/GameType.h" @@ -804,5 +802,3 @@ class StDrawableDirtyStuffLocker } }; #endif - -#endif // _DRAWABLE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DrawableInfo.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DrawableInfo.h index 938ebcf48f..356bc358ba 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DrawableInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DrawableInfo.h @@ -27,8 +27,6 @@ // Author: Mark Wilczynski, August 2002 #pragma once -#ifndef _DRAWABLEINFO_H_ -#define _DRAWABLEINFO_H_ #include "Common/GameType.h" @@ -55,5 +53,3 @@ struct DrawableInfo GhostObject *m_ghostObject; ///winGetHiliteBorderColor( 2 ); } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETCHECKBOX_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetComboBox.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetComboBox.h index fbadf3f23e..0c1ac74524 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetComboBox.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetComboBox.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __GADGETCOMBOBOX_H_ -#define __GADGETCOMBOBOX_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -193,6 +190,3 @@ inline GameWindow *GadgetComboBoxGetEditBox( GameWindow *g ) } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETLISTBOX_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetListBox.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetListBox.h index 3b504c7152..60b7737d7b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetListBox.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetListBox.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __GADGETLISTBOX_H_ -#define __GADGETLISTBOX_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -208,6 +205,3 @@ inline GameWindow *GadgetListBoxGetDownButton( GameWindow *g ) } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETLISTBOX_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetProgressBar.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetProgressBar.h index fc4cba7dbc..6d53b156da 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetProgressBar.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetProgressBar.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __GADGETPROGRESSBAR_H_ -#define __GADGETPROGRESSBAR_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -141,6 +138,3 @@ inline const Image * GadgetProgressBarGetHiliteBarImageCenter( GameWindow *g ) inline const Image * GadgetProgressBarGetHiliteBarImageSmallCenter( GameWindow *g ) { return g->winGetHiliteImage( 7 ); } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETPROGRESSBAR_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetPushButton.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetPushButton.h index 5221e6a13e..53d485e4d2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetPushButton.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetPushButton.h @@ -58,9 +58,6 @@ #pragma once -#ifndef __GADGETPUSHBUTTON_H_ -#define __GADGETPUSHBUTTON_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -172,6 +169,3 @@ inline void GadgetButtonSetLeftEnabledImage( GameWindow *g, const Image *image ) inline void GadgetButtonSetMiddleEnabledImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 5, image ); } inline void GadgetButtonSetRightEnabledImage( GameWindow *g, const Image *image ) { g->winSetEnabledImage( 6, image ); } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETPUSHBUTTON_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetRadioButton.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetRadioButton.h index ee0b0271ee..ca4fd50069 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetRadioButton.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetRadioButton.h @@ -64,9 +64,6 @@ #pragma once -#ifndef __GADGETRADIOBUTTON_H_ -#define __GADGETRADIOBUTTON_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -147,6 +144,3 @@ inline const Image *GadgetRadioGetSelectedCheckedBoxImage( GameWindow *g ) // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETRADIOBUTTON_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetSlider.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetSlider.h index e8920a7e7b..8eb102efae 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetSlider.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetSlider.h @@ -53,9 +53,6 @@ #pragma once -#ifndef __GADGETSLIDER_H_ -#define __GADGETSLIDER_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -440,6 +437,3 @@ inline Color GadgetSliderGetHiliteSelectedThumbBorderColor( GameWindow *g ) } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETSLIDER_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetStaticText.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetStaticText.h index fbe6207899..325c04b49c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetStaticText.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetStaticText.h @@ -55,9 +55,6 @@ #pragma once -#ifndef __GADGETSTATICTEXT_H_ -#define __GADGETSTATICTEXT_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -101,6 +98,3 @@ inline Color GadgetStaticTextGetHiliteColor( GameWindow *g ) { return g inline Color GadgetStaticTextGetHiliteBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 0 ); } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETSTATICTEXT_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTabControl.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTabControl.h index 3e5d9ccf54..d4bb0d9a05 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTabControl.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTabControl.h @@ -44,9 +44,6 @@ #pragma once -#ifndef __GADGETTABCONTROL_H_ -#define __GADGETTABCONTROL_H_ - enum { GTC_BACKGROUND = 0, @@ -274,6 +271,3 @@ inline Color GadgetTabControlGetHiliteBorderColorBackground( GameWindow *g ) // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETTABCONTROL_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTextEntry.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTextEntry.h index 892ddeca43..dde3a09bec 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTextEntry.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTextEntry.h @@ -50,9 +50,6 @@ #pragma once -#ifndef __GADGETTEXTENTRY_H_ -#define __GADGETTEXTENTRY_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -124,6 +121,3 @@ inline Color GadgetTextEntryGetHiliteColor( GameWindow *g ) { return g->w inline Color GadgetTextEntryGetHiliteBorderColor( GameWindow *g ) { return g->winGetHiliteBorderColor( 0 ); } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GADGETTEXTENTRY_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h index 41e0fab1c0..3a0d32e59f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _GAME_INTERFACE_H_ -#define _GAME_INTERFACE_H_ - #include "Common/GameType.h" #include "Common/MessageStream.h" // for GameMessageTranslator #include "Common/Snapshot.h" @@ -306,5 +303,3 @@ extern GameClient *TheGameClient; // m_roadBuffer = NULL // m_shroud = NULL // TheRadar = RadarDummy - -#endif // _GAME_INTERFACE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameFont.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameFont.h index bf5d10f233..08ce4da1ec 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameFont.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameFont.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GAMEFONT_H_ -#define __GAMEFONT_H_ - #include "Common/SubsystemInterface.h" #include "Lib/BaseType.h" #include "Common/AsciiString.h" @@ -106,6 +103,3 @@ inline GameFont *FontLibrary::nextFont( GameFont *font ) // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern FontLibrary *TheFontLibrary; ///< font library external - -#endif // __GAMEFONT_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameInfoWindow.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameInfoWindow.h index 2095ce903a..c49fc678dd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameInfoWindow.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameInfoWindow.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GAMEINFOWINDOW_H_ -#define __GAMEINFOWINDOW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/GameWindow.h" #include "GameNetwork/LANGameInfo.h" @@ -41,6 +38,3 @@ extern void CreateLANGameInfoWindow( GameWindow *sizeAndPosWin ); extern void DestroyGameInfoWindow(void); extern void RefreshGameInfoWindow(GameInfo *gameInfo, UnicodeString gameName); extern void HideGameInfoWindow(Bool hide); - -#endif // __GAMEINFOWINDOW_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameText.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameText.h index a627db34b9..500c4ecd22 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameText.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameText.h @@ -42,10 +42,6 @@ #pragma once -#ifndef __GAMECLIENT_GAMETEXT_H_ -#define __GAMECLIENT_GAMETEXT_H_ - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -129,5 +125,3 @@ extern GameTextInterface* CreateGameTextInterface( void ); #endif #endif // ENABLE_GAMETEXT_SUBSTITUTES - -#endif // __GAMECLIENT_GAMETEXT_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h index 0c49d5ba71..18f652a9df 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __GAMEWINDOW_H_ -#define __GAMEWINDOW_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -504,6 +501,3 @@ extern void GameWinDefaultTooltip( GameWindow *window, extern const char *const WindowStatusNames[]; extern const char *const WindowStyleNames[]; - -#endif // __GAMEWINDOW_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowGlobal.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowGlobal.h index 6a116836ec..38cd12ec2c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowGlobal.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowGlobal.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __GAMEWINDOWGLOBAL_H_ -#define __GAMEWINDOWGLOBAL_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -64,6 +61,3 @@ /////////////////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// - -#endif // __GAMEWINDOWGLOBAL_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowID.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowID.h index 7b290f6203..d4b6816d37 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowID.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowID.h @@ -47,9 +47,6 @@ #pragma once -#ifndef __GAMEWINDOWID_H_ -#define __GAMEWINDOWID_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -84,6 +81,3 @@ // INLINING /////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GAMEWINDOWID_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowManager.h index 9cb85cd001..22616dff9d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowManager.h @@ -31,10 +31,6 @@ #pragma once -#ifndef __GAMEWINDOWMANAGER_H_ -#define __GAMEWINDOWMANAGER_H_ - - #include "Common/STLTypedefs.h" #include "Common/SubsystemInterface.h" #include "GameClient/WindowLayout.h" @@ -416,6 +412,3 @@ class GameWindowManagerDummy : public GameWindowManager virtual GameWinDrawFunc getTextEntryImageDrawFunc() { return NULL; } virtual GameWinDrawFunc getTextEntryDrawFunc() { return NULL; } }; - -#endif // __GAMEWINDOWMANAGER_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h index 8fb89c4e15..fcd6bca92d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __GAME_WINDOW_TRANSITIONS_H_ -#define __GAME_WINDOW_TRANSITIONS_H_ - #include "Common/GameCommon.h" //----------------------------------------------------------------------------- @@ -696,5 +693,3 @@ void PushButtonImageDrawThree(GameWindow *window, Int alpha ); // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- extern GameWindowTransitionsHandler *TheTransitionHandler; -#endif // __GAME_WINDOW_TRANSITIONS_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GlobalLanguage.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GlobalLanguage.h index d3a0a79d44..aa9aa794a2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GlobalLanguage.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GlobalLanguage.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __GLOBAL_LANGUAGE_H_ -#define __GLOBAL_LANGUAGE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -123,4 +120,3 @@ class GlobalLanguage : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- extern GlobalLanguage *TheGlobalLanguageData; -#endif // __GLOBAL_LANGUAGE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GraphDraw.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GraphDraw.h index 97f80dd637..12ab92af41 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GraphDraw.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GraphDraw.h @@ -47,8 +47,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once -#ifndef __GRAPHDRAW_H__ -#define __GRAPHDRAW_H__ #include "Common/PerfTimer.h" #include "Common/STLTypedefs.h" @@ -85,6 +83,3 @@ extern GraphDraw *TheGraphDraw; #endif /* PERF_TIMERS */ - -#endif /* __GRAPHDRAW_H__ */ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/HeaderTemplate.h b/GeneralsMD/Code/GameEngine/Include/GameClient/HeaderTemplate.h index 48aa9db100..4ee31cf727 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/HeaderTemplate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/HeaderTemplate.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __HEADER_TEMPLATE_H_ -#define __HEADER_TEMPLATE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -116,4 +113,3 @@ class HeaderTemplateManager // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- extern HeaderTemplateManager *TheHeaderTemplateManager; -#endif // __HEADER_TEMPLATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h b/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h index 0c4cc1998c..e8c45b0d03 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _H_HintSpy -#define _H_HintSpy - #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- @@ -39,5 +36,3 @@ class HintSpyTranslator : public GameMessageTranslator virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); virtual ~HintSpyTranslator() { } }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h b/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h index 628f14a119..690b324252 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __HOT_KEY_H_ -#define __HOT_KEY_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -113,6 +110,3 @@ extern HotKeyManager *TheHotKeyManager; //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __HOT_KEY_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/IMEManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/IMEManager.h index 0d2fd5af4a..dace4e4092 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/IMEManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/IMEManager.h @@ -43,10 +43,6 @@ #pragma once -#ifndef __GAMECLIENT_IMEMANAGER_H -#define __GAMECLIENT_IMEMANAGER_H - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -115,7 +111,3 @@ extern IMEManagerInterface *CreateIMEManagerInterface( void ); //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - - -#endif // __GAMECLIENT_IMEMANAGER_H diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h index 274ff1944a..25ec6e0cf3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __IMAGE_H_ -#define __IMAGE_H_ - #include "Common/AsciiString.h" #include "Common/GameMemory.h" #include "Common/SubsystemInterface.h" @@ -169,6 +166,3 @@ inline UnsignedInt Image::getStatus( void ) const { return m_status; } // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern ImageCollection *TheMappedImageCollection; ///< mapped images - -#endif // __IMAGE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h b/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h index 4b12206c40..21bd126c77 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h @@ -30,9 +30,6 @@ #pragma once -#ifndef _IN_GAME_UI_H_ -#define _IN_GAME_UI_H_ - #include "Common/GameCommon.h" #include "Common/GameType.h" #include "Common/MessageStream.h" // for GameMessageTranslator @@ -931,5 +928,3 @@ friend class Drawable; // for selection/deselection transactions // the singleton extern InGameUI *TheInGameUI; - -#endif // _IN_GAME_UI_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h b/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h index c767bb0815..8d61ed62d3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h @@ -53,9 +53,6 @@ #pragma once -#ifndef __KEYDEFS_H_ -#define __KEYDEFS_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #ifndef DIRECTINPUT_VERSION @@ -257,5 +254,3 @@ enum // INLINING /////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __KEYDEFS_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Keyboard.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Keyboard.h index 692a0b06d6..770a7338fd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Keyboard.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Keyboard.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __KEYBOARD_H_ -#define __KEYBOARD_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -168,5 +165,3 @@ class Keyboard : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////// extern Keyboard *TheKeyboard; - -#endif // __KEYBOARD_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/LanguageFilter.h b/GeneralsMD/Code/GameEngine/Include/GameClient/LanguageFilter.h index a68ea5e694..ed65bc68dd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/LanguageFilter.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/LanguageFilter.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __LANGUAGEFILTER_H -#define __LANGUAGEFILTER_H - #include "Common/STLTypedefs.h" #include "Common/AsciiString.h" #include "Common/UnicodeString.h" @@ -85,5 +81,3 @@ class LanguageFilter : public SubsystemInterface { extern LanguageFilter *TheLanguageFilter; LanguageFilter * createLanguageFilter(); - -#endif //#define __LANGUAGEFILTER_H diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Line2D.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Line2D.h index d97915252b..ba8031e8d7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Line2D.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Line2D.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __LINE2D_H_ -#define __LINE2D_H_ - typedef std::vector Coord2DVector; typedef std::vector Coord3DVector; @@ -85,7 +82,3 @@ extern Bool PointInsideArea2D( const Coord3D *ptToTest, ///< outU will return the U value determined. This is a shortcut for panning extern void ShortestDistancePointToSegment2D( const Coord2D *a, const Coord2D *b, const Coord2D *pt, Real *outDistance, Coord2D *outPosition, Real *outU ); - - -#endif // __LINE2D_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/LoadScreen.h b/GeneralsMD/Code/GameEngine/Include/GameClient/LoadScreen.h index ee05410a44..a70892d2f5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/LoadScreen.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/LoadScreen.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _LOADSCREEN_H_ -#define _LOADSCREEN_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -327,5 +324,3 @@ class MapTransferLoadScreen : public LoadScreen GameWindow *m_timeoutText; Int m_oldTimeout; ///< old val, so we can call processTimeout() every frame and not touch the GUI }; - -#endif //_LOADSCREEN_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h index 6f9611154f..d69dfe4858 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _H_LookAtXlat -#define _H_LookAtXlat - #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- @@ -91,5 +88,3 @@ class LookAtTranslator : public GameMessageTranslator }; extern LookAtTranslator *TheLookAtTranslator; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/MapUtil.h b/GeneralsMD/Code/GameEngine/Include/GameClient/MapUtil.h index 0561d84f77..94eb59ce6e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/MapUtil.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/MapUtil.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __MAPUTIL_H__ -#define __MAPUTIL_H__ - #include "Common/AsciiString.h" #include "Common/UnicodeString.h" @@ -135,4 +132,3 @@ Bool parseMapPreviewChunk(DataChunkInput &file, DataChunkInfo *info, void *userD void findDrawPositions( Int startX, Int startY, Int width, Int height, Region3D extent, ICoord2D *ul, ICoord2D *lr ); Bool WouldMapTransfer( const AsciiString& mapName ); -#endif // __MAPUTIL_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/MessageBox.h b/GeneralsMD/Code/GameEngine/Include/GameClient/MessageBox.h index df78e475e7..a3232268b8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/MessageBox.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/MessageBox.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __MESSAGEBOX_H_ -#define __MESSAGEBOX_H_ - #include "GameClient/GameWindowManager.h" GameWindow *MessageBoxYesNo(UnicodeString titleString,UnicodeString bodyString,GameWinMsgBoxFunc yesCallback,GameWinMsgBoxFunc noCallback); ///< convenience function for displaying a Message box with Yes and No buttons @@ -47,5 +44,3 @@ GameWindow *MessageBoxOk(UnicodeString titleString,UnicodeString bodyString,Game GameWindow *MessageBoxCancel(UnicodeString titleString,UnicodeString bodyString,GameWinMsgBoxFunc cancelCallback);///< convenience function for displaying a Message box with Cancel button - -#endif //__MESSAGEBOX_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h b/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h index 562d8faafb..f096807b8d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _H_MetaEvent -#define _H_MetaEvent - #include "Common/SubsystemInterface.h" #include "GameClient/InGameUI.h" @@ -402,5 +399,3 @@ class MetaMap : public SubsystemInterface }; extern MetaMap *TheMetaMap; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h index 6fffd55be6..cc1b8dc4d6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __ANIMPARTICLESYSBONEUPDATE_H_ -#define __ANIMPARTICLESYSBONEUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" @@ -59,6 +56,3 @@ class AnimatedParticleSysBoneClientUpdate : public ClientUpdateModule UnsignedInt m_life; }; - -#endif // __ANIMPARTICLESYSBONEUPDATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h index 6c319dbc7c..06ba80e7e4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BEACONCLIENTUPDATE_H_ -#define __BEACONCLIENTUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" @@ -75,6 +72,3 @@ class BeaconClientUpdate : public ClientUpdateModule UnsignedInt m_lastRadarPulse; }; - -#endif // __BEACONCLIENTUPDATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h index 6a695147b3..95aa0dcdcb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SWAYCLIENTUPDATE_H_ -#define __SWAYCLIENTUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" @@ -70,6 +67,3 @@ class SwayClientUpdate : public ClientUpdateModule void updateSway(void); }; - -#endif // __SWAYCLIENTUPDATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h index 7211ea4f82..d26d97317d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __MOUSE_H_ -#define __MOUSE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -441,5 +438,3 @@ class MouseDummy : public Mouse // EXTERNALS ////////////////////////////////////////////////////////////////// extern Mouse *TheMouse; ///< extern mouse singleton definition - -#endif // _MOUSE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ParabolicEase.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ParabolicEase.h index ef13c49a50..3334def572 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ParabolicEase.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ParabolicEase.h @@ -23,9 +23,9 @@ // Ease in and out based on a parabolic function. // Author: Robert Minsk May 12, 2003 // ============================================================================ + #pragma once -#ifndef _PARABOLICEASE_H -#define _PARABOLICEASE_H + // ============================================================================ #include "Lib/BaseType.h" // ============================================================================ @@ -89,4 +89,3 @@ class ParabolicEase }; // ============================================================================ -#endif // _PARABOLICEASE_H diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h index 9b56bff6ff..beeb444c17 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _PARTICLE_SYS_H_ -#define _PARTICLE_SYS_H_ - #include #include "Common/AsciiString.h" #include "Common/GameMemory.h" @@ -822,6 +819,3 @@ extern ParticleSystemManager *TheParticleSystemManager; class DebugDisplayInterface; extern void ParticleSystemDebugDisplay( DebugDisplayInterface *dd, void *, FILE *fp = NULL ); - - -#endif // _PARTICLE_SYS_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h b/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h index b4dd1f28a0..188173300d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _H_PlaceEventTranslator -#define _H_PlaceEventTranslator - #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- @@ -43,5 +40,3 @@ class PlaceEventTranslator : public GameMessageTranslator ~PlaceEventTranslator(); virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h index 172f89e49d..e498f8907b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h @@ -50,9 +50,6 @@ #pragma once -#ifndef __PROCESSANIMATEWINDOW_H_ -#define __PROCESSANIMATEWINDOW_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -265,5 +262,3 @@ Real m_speedUpRatio; // how fast the windows speed up //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __PROCESSANIMATEWINDOW_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h b/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h index 5cc365bb77..6a434dc399 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _RadiusDecal_H_ -#define _RadiusDecal_H_ - #include "Common/GameCommon.h" #include "Common/GameType.h" #include "GameClient/Color.h" @@ -91,5 +88,3 @@ class RadiusDecalTemplate static void parseRadiusDecalTemplate(INI* ini, void *instance, void * store, const void* /*userData*/); }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h b/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h index b3d192be9c..2a2d1bc417 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __RAYEFFECT_H_ -#define __RAYEFFECT_H_ - // INCLUDE //////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/SubsystemInterface.h" @@ -91,6 +88,3 @@ class RayEffectSystem : public SubsystemInterface // EXTERN ///////////////////////////////////////////////////////////////////////////////////////// extern RayEffectSystem *TheRayEffects; ///< the ray effects singleton external - -#endif // $label - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionInfo.h b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionInfo.h index c1516db6af..509c592357 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionInfo.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __SELECTIONINFO_H__ -#define __SELECTIONINFO_H__ - #include "GameClient/InGameUI.h" // This structure gives you a rough idea about the counts of the kinds of guys in the @@ -102,6 +99,3 @@ extern void translatePickTypesToKindof(UnsignedInt pickTypes, KindOfMaskType& ou // userData should be a pointer to a PickDrawableStruct, which is defined in // above. extern Bool addDrawableToList( Drawable *draw, void *userData ); - - -#endif /* __SELECTIONINFO_H__ */ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h index 9bd3a05a1c..f3bd0827b7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _H_SelectionXlat -#define _H_SelectionXlat - #include "GameClient/InGameUI.h" class ThingTemplate; @@ -83,5 +80,3 @@ class SelectionTranslator : public GameMessageTranslator Bool CanSelectDrawable( const Drawable *draw, Bool dragSelecting ); extern SelectionTranslator *TheSelectionTranslator; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h index f9b728a827..3b8347c9d1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __SHADOW_H_ -#define __SHADOW_H_ - // // skeleton definition of shadow types // @@ -213,6 +210,3 @@ class ProjectedShadowManager }; extern ProjectedShadowManager *TheProjectedShadowManager; - -#endif // __SHADOW_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h index af1415f3f3..cacd073eeb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h @@ -94,9 +94,6 @@ #pragma once -#ifndef __SHELL_H_ -#define __SHELL_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// // FORWARD REFERENCES ///////////////////////////////////////////////////////////////////////////// @@ -206,6 +203,3 @@ class Shell : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern Shell *TheShell; ///< the shell external interface - -#endif // __SHELL_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ShellHooks.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ShellHooks.h index 3741f42104..addd9f559b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ShellHooks.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ShellHooks.h @@ -28,9 +28,6 @@ #pragma once -#ifndef SHELLHOOKS_H -#define SHELLHOOKS_H - // // This enumeration holds all the shell script hooks that we currently have, If you are going to // add more, it's important to keep the enum lined up with the names in TheShellHookNames located @@ -82,6 +79,3 @@ enum extern const char *const TheShellHookNames[]; ///< Contains a list of the text representation of the shell hooks Used in WorldBuilder and in the shell. void SignalUIInteraction(Int interaction); - -#endif // SHELLHOOKS_H - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ShellMenuScheme.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ShellMenuScheme.h index a61740a0d0..08265632fd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ShellMenuScheme.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ShellMenuScheme.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __SHELL_MENU_SCHEME_H_ -#define __SHELL_MENU_SCHEME_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -153,5 +150,3 @@ class ShellMenuSchemeManager //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __SHELL_MENU_SCHEME_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Smudge.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Smudge.h index 59e5e28878..2522d5f670 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Smudge.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Smudge.h @@ -20,9 +20,6 @@ #pragma once -#ifndef _SMUDGE_H_ -#define _SMUDGE_H_ - #include "WW3D2/dllist.h" #include "WWMath/vector2.h" #include "WWMath/vector3.h" @@ -97,5 +94,3 @@ class SmudgeManager }; extern SmudgeManager *TheSmudgeManager; /// TheWaterTransparency; - -#endif // __WATER_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/WinInstanceData.h b/GeneralsMD/Code/GameEngine/Include/GameClient/WinInstanceData.h index 8c83d6bb06..0d06d1252f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/WinInstanceData.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/WinInstanceData.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __WININSTANCEDATA_H_ -#define __WININSTANCEDATA_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -216,6 +213,3 @@ inline Int WinInstanceData::getTooltipTextLength( void ) } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __WININSTANCEDATA_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowLayout.h b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowLayout.h index 7e1a14b1ae..a4bdf6ce2b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowLayout.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowLayout.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __WINDOWLAYOUT_H_ -#define __WINDOWLAYOUT_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameClient/GameWindow.h" @@ -121,6 +118,3 @@ inline void WindowLayout::runShutdown( void *userData ) { if( m_shutdown ) m_shu inline void WindowLayout::setInit( WindowLayoutInitFunc init ) { m_init = init; } inline void WindowLayout::setUpdate( WindowLayoutUpdateFunc update ) { m_update = update; } inline void WindowLayout::setShutdown( WindowLayoutShutdownFunc shutdown ) {m_shutdown = shutdown;} - -#endif // __WINDOWLAYOUT_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h index c271123e5e..ce1714939d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _H_WindowXlat -#define _H_WindowXlat - #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- @@ -42,5 +39,3 @@ class WindowTranslator : public GameMessageTranslator ~WindowTranslator(); virtual GameMessageDisposition translateGameMessage(const GameMessage *msg); }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h index fb2b226ea9..50427c2fb1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _AI_H_ -#define _AI_H_ - #include "Common/Snapshot.h" #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" @@ -1055,6 +1052,3 @@ class AIGroup : public MemoryPoolObject, public Snapshot mutable VecObjectID m_lastRequestedIDList; ///< this is used so we can return by reference, saving a copy }; - - -#endif // _AI_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h index 3ec253bc81..a50a6de5f5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _AI_DOCK_H_ -#define _AI_DOCK_H_ - #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" @@ -203,6 +200,3 @@ class AIDockMoveToExitState : public AIInternalMoveToState EMPTY_DTOR(AIDockMoveToExitState) //----------------------------------------------------------------------------------------------------------- - - -#endif // _AI_DOCK_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h index 20843c872e..a9f6a68501 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h @@ -38,8 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_AIGUARD_ -#define _H_AIGUARD_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" @@ -272,5 +270,3 @@ class AIGuardAttackAggressorState : public State }; //-------------------------------------------------------------------------------------- - -#endif /* _H_AIGUARD_ */ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h index 66b819cfa8..ba9eb252ea 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h @@ -36,8 +36,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef __AI_GUARD_RETALIATION_H -#define __AI_GUARD_RETALIATION_H // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" @@ -257,5 +255,3 @@ class AIGuardRetaliateAttackAggressorState : public State }; //-------------------------------------------------------------------------------------- - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h index 28b300711c..a76f26cc52 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _PATHFIND_H_ -#define _PATHFIND_H_ - #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/Snapshot.h" @@ -988,6 +985,3 @@ inline Bool PathfindCell::isObstaclePresent( ObjectID objID ) const return false; } - - -#endif // _PATHFIND_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h index 97e4336884..84aedef91d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _AI_PLAYER_H_ -#define _AI_PLAYER_H_ - #include "Common/GameMemory.h" #include "Common/Snapshot.h" @@ -297,8 +294,3 @@ class AIPlayer : public MemoryPoolObject, ObjectID m_curWarehouseID; }; - -#endif // _AI_PLAYER_H_ - - - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h index bef0582104..623e2ef249 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _AI_SKIRMISH_PLAYER_H_ -#define _AI_SKIRMISH_PLAYER_H_ - #include "Common/GameMemory.h" #include "GameLogic/AIPlayer.h" @@ -118,8 +115,3 @@ class AISkirmishPlayer : public AIPlayer Player *m_currentEnemy; }; - -#endif // _AI_SKIRMISH_PLAYER_H_ - - - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h index b63f072eb6..3171df36bc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _AI_STATE_MACHINE_H_ -#define _AI_STATE_MACHINE_H_ - #include "Lib/BaseType.h" #include "Common/AudioEventRTS.h" @@ -1327,5 +1324,3 @@ class AIFaceState : public State Bool m_canTurnInPlace; }; EMPTY_DTOR(AIFaceState) - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h index d9b211aab9..c5a34a6944 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h @@ -38,8 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_AITNGUARD_ -#define _H_AITNGUARD_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" @@ -246,5 +244,3 @@ class AITNGuardAttackAggressorState : public State }; //-------------------------------------------------------------------------------------- - -#endif /* _H_AIGUARD_ */ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h index 48250566ed..8e876d7813 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _Armor_H_ -#define _Armor_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" #include "Common/STLTypedefs.h" @@ -129,6 +126,3 @@ class ArmorStore : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern ArmorStore *TheArmorStore; - -#endif // _Armor_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h index 88896774e0..44e199a89f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h @@ -26,9 +26,6 @@ #pragma once -#ifndef _ArmorSet_H_ -#define _ArmorSet_H_ - #include "Lib/BaseType.h" #include "Common/GameType.h" #include "Common/SparseMatchFinder.h" @@ -96,5 +93,3 @@ class ArmorTemplateSet //------------------------------------------------------------------------------------------------- typedef std::vector ArmorTemplateSetVector; - -#endif // _ArmorSet_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h index d47c7f8262..63f52d479f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h @@ -29,9 +29,6 @@ #pragma once -#ifndef CAVE_SYSTEM_H -#define CAVE_SYSTEM_H - class Object; class TunnelTracker; // The player owns one such object for his Tunnels, so instead of duplicating // so much code, this SubSystem will manage all of the Cave systems. @@ -73,4 +70,3 @@ class CaveSystem : public SubsystemInterface, }; extern CaveSystem *TheCaveSystem; -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h index e94cba0062..ef6e956827 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h @@ -29,9 +29,6 @@ #pragma once -#ifndef CRATE_SYSTEM_H -#define CRATE_SYSTEM_H - #include "Common/INI.h" #include "Common/Overridable.h" #include "Common/Override.h" @@ -113,4 +110,3 @@ class CrateSystem : public SubsystemInterface }; extern CrateSystem *TheCrateSystem; -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h index 77b5b80068..df1b6e5f67 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DAMAGE_H_ -#define __DAMAGE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/BitFlags.h" #include "Common/GameType.h" @@ -372,6 +369,3 @@ class DamageInfo : public Snapshot virtual void loadPostProcess( void ){ } }; - -#endif // __DAMAGE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h index 559545a3c5..a275b24b11 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h @@ -29,9 +29,6 @@ #pragma once -#ifndef EXPERIENCE_TRACKER_H -#define EXPERIENCE_TRACKER_H - #include "Common/GameCommon.h" #include "Common/GameType.h" #include "Common/GameMemory.h" @@ -75,5 +72,3 @@ class ExperienceTracker : public MemoryPoolObject, public Snapshot ObjectID m_experienceSink; ///< ID of object I have pledged my experience point gains to Real m_experienceScalar; ///< Scales any experience gained by this multiplier. }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/FPUControl.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/FPUControl.h index 3ffd032d1a..45faa07657 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/FPUControl.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/FPUControl.h @@ -29,14 +29,9 @@ #pragma once -#ifndef __FPUCONTROL_H__ -#define __FPUCONTROL_H__ - /** * setFPMode sets the FPU internal precision and rounding mode. As DirectX is not guaranteed to * leave the FPU in a good state, we must call this at the start of GameLogic::update() and * anywhere that touches DirectX inside GameLogic loops (LoadScreen). */ void setFPMode( void ); - -#endif // __FPUCONTROL_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h index bdfa59d616..237b009bb3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h @@ -29,9 +29,6 @@ #pragma once -#ifndef FIRING_TRACKER_H -#define FIRING_TRACKER_H - #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/AudioEventRTS.h" @@ -91,6 +88,3 @@ class FiringTracker : public UpdateModule UnsignedInt m_frameToStopLoopingSound; ///< if sound is looping, frame to stop looping it (or zero if not looping) AudioHandle m_audioHandle; }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h index 5931e710fd..9f5fa504ae 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _GAME_LOGIC_H_ -#define _GAME_LOGIC_H_ - #include "Common/GameCommon.h" // ensure we get DUMP_PERF_STATS, or not #include "Common/GameType.h" #include "Common/Snapshot.h" @@ -453,6 +450,3 @@ inline Object* GameLogic::findObjectByID( ObjectID id ) // the singleton extern GameLogic *TheGameLogic; - -#endif // _GAME_LOGIC_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h index 097dca6385..06d6d73422 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _GHOSTOBJECT_H_ -#define _GHOSTOBJECT_H_ - #include "Lib/BaseType.h" #include "Common/Snapshot.h" @@ -113,5 +110,3 @@ inline Bool GhostObjectManager::trackAllPlayers() const // the singleton extern GhostObjectManager *TheGhostObjectManager; - -#endif // _GHOSTOBJECT_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h index 3d605bfd95..2a6ce943ff 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __Locomotor_H_ -#define __Locomotor_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" #include "Common/Override.h" @@ -513,6 +510,3 @@ class LocomotorStore : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern LocomotorStore *TheLocomotorStore; - -#endif // __Locomotor_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h index bbf84cc4ca..8072827d4a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __LocomotorSet_H_ -#define __LocomotorSet_H_ - // no, please do NOT include this. //#include "GameLogic/Locomotor.h" #include "Common/GameCommon.h" @@ -110,5 +107,3 @@ class LocomotorSet : public Snapshot inline Bool isDownhillOnly( void ) const { return m_downhillOnly; }; }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h index 1c04e27d68..491bd0e02e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _AI_UPDATE_H_ -#define _AI_UPDATE_H_ - #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/AI.h" #include "GameLogic/AIStateMachine.h" @@ -802,6 +799,3 @@ class AIUpdateInterface : public UpdateModule, public AICommandInterface //------------------------------------------------------------------------------------------------------------ // Inlines // - -#endif // _AI_UPDATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h index 74afe3fdb7..0fbd3a7efa 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __ACTIVEBODY_H_ -#define __ACTIVEBODY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DamageFX.h" #include "GameLogic/Module/BodyModule.h" @@ -174,6 +171,3 @@ class ActiveBody : public BodyModule mutable const DamageFX* m_curDamageFX; }; - -#endif // __ACTIVEBODY_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h index a0143d7e36..285dc25628 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __ACTIVE_SHROUD_UPGRADE_H_ -#define __ACTIVE_SHROUD_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -75,6 +72,3 @@ class ActiveShroudUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; - -#endif // __ACTIVE_SHROUD_UPGRADE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h index 9abb36237b..6ffc8b3060 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __ANIMATION_STEERING_UPDATE_H -#define __ANIMATION_STEERING_UPDATE_H - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -83,5 +80,3 @@ class AnimationSteeringUpdate : public UpdateModule ModelConditionFlagType m_currentTurnAnim; UnsignedInt m_nextTransitionFrame; }; - -#endif // end __ANIMATION_STEERING_UPDATE_H diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h index e113a872ee..38998a466e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __ARMOR_UPGRADE_H_ -#define __ARMOR_UPGRADE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -90,5 +87,3 @@ class ArmorUpgrade : public UpgradeModule //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __ARMOR_UPGRADE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h index 2c5b21f5dc..edcaf28bea 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __ASSAULT_TRANSPORT_AI_UPDATE_H -#define __ASSAULT_TRANSPORT_AI_UPDATE_H - #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" @@ -123,6 +120,3 @@ class AssaultTransportAIUpdate : public AIUpdateInterface, public AssaultTranspo Bool m_isAttackObject; Bool m_newOccupantsAreNewMembers; }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h index 0a09f791d9..23965134d7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _ASSISTED_TARGETING_UPDATE_H -#define _ASSISTED_TARGETING_UPDATE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -82,6 +79,3 @@ class AssistedTargetingUpdate : public UpdateModule }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h index 1d9218f08a..a70c06b973 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __AUTO_DEPOSIT_UPDATE_H_ -#define __AUTO_DEPOSIT_UPDATE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -140,5 +137,3 @@ class AutoDepositUpdate : public UpdateModule //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __AUTO_DEPOSIT_UPDATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h index ceffae8ad1..0ef89bcd78 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __AUTO_FIND_HEALING_UPDATE_H_ -#define __AUTO_FIND_HEALING_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" @@ -80,7 +77,3 @@ class AutoFindHealingUpdate : public UpdateModule protected: Int m_nextScanFrames; }; - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h index 8828e74eb6..edd036f9a3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h @@ -33,9 +33,6 @@ #pragma once -#ifndef __AutoHealBehavior_H_ -#define __AutoHealBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/BehaviorModule.h" @@ -189,6 +186,3 @@ class AutoHealBehavior : public UpdateModule, Bool m_stopped; }; - -#endif // __AutoHealBehavior_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h index 4b19c973c0..771bbb4d1c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __BAIKONUR_LAUNCH_POWER_H_ -#define __BAIKONUR_LAUNCH_POWER_H_ - #include "GameLogic/Module/SpecialPowerModule.h" class Object; @@ -85,5 +82,3 @@ class BaikonurLaunchPower : public SpecialPowerModule protected: }; - -#endif // __BAIKONUR_LAUNCH_POWER_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h index 3c0eeb76f6..95c8c58f7a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BASE_REGENERATE_UPDATE_H_ -#define __BASE_REGENERATE_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/Module/DamageModule.h" @@ -81,5 +78,3 @@ class BaseRegenerateUpdate : public UpdateModule, private: }; - -#endif // end __BASE_REGENERATE_UPDATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h index f553de09ac..55a301ded9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BUS_SLOW_DEATH_BEHAVIOR_H_ -#define __BUS_SLOW_DEATH_BEHAVIOR_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/SlowDeathBehavior.h" @@ -88,6 +85,3 @@ class BattleBusSlowDeathBehavior : public SlowDeathBehavior UnsignedInt m_penaltyDeathFrame; ///< If non zero, kill us with Penalty damage at this frame }; - - -#endif // end __BUS_SLOW_DEATH_BEHAVIOR_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h index 7edae5d51e..8eeed38c7d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BATTLE_PLAN_UPDATE_H_ -#define __BATTLE_PLAN_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/SpecialPowerUpdateModule.h" @@ -190,7 +187,3 @@ class BattlePlanUpdate : public SpecialPowerUpdateModule ObjectID m_visionObjectID; }; - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h index 0c013932f2..0290d52b50 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BehaviorModule_H_ -#define __BehaviorModule_H_ - #include "Common/GameType.h" #include "Common/Module.h" @@ -285,5 +282,3 @@ class LandMineInterface }; //------------------------------------------------------------------------------------------------- - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h index 3750d63889..2e9e792cff 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BODYMODULE_H_ -#define __BODYMODULE_H_ - #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/ArmorSet.h" @@ -310,5 +307,3 @@ class BodyModule : public BehaviorModule, public BodyModuleInterface }; inline BodyModule::BodyModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ), m_damageScalar(1.0f) { } inline BodyModule::~BodyModule() { } - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h index 8a93f2b525..aede96065c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BONEFXDAMAGE_H_ -#define __BONEFXDAMAGE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DamageModule.h" @@ -66,5 +63,3 @@ class BoneFXDamage : public DamageModule virtual void onObjectCreated(); }; - -#endif // end __BONEFXDAMAGE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h index f7c2d5b0d4..8aea676986 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BONEFXUPDATE_H_ -#define __BONEFXUPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/UpdateModule.h" @@ -277,5 +274,3 @@ class BoneFXUpdate : public UpdateModule Bool m_bonesResolved[BODYDAMAGETYPE_COUNT]; Bool m_active; }; - -#endif // end __BONEFXUPDATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h index dd5915b0ee..43b5d0bbe9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BRIDGE_BEHAVIOR_H_ -#define __BRIDGE_BEHAVIOR_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameClient/TerrainRoads.h" @@ -197,5 +194,3 @@ class BridgeBehavior : public UpdateModule, UnsignedInt m_deathFrame; ///< frame we died on }; - -#endif // end __BRIDGE_DAMAGE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h index 96bb885130..42274c7486 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BRIDGE_SCAFFOLD_BEHAVIOR_H_ -#define __BRIDGE_SCAFFOLD_BEHAVIOR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpdateModule.h" @@ -112,6 +109,3 @@ class BridgeScaffoldBehavior : public UpdateModule, Coord3D m_targetPos; ///< current target position for our motion type }; - - -#endif // end __BRIDGE_SCAFFOLD_BEHAVIOR_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h index e2f667acc5..a4b9d18f73 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BRIDGE_TOWER_BEHAVIOR_H_ -#define __BRIDGE_TOWER_BEHAVIOR_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DamageModule.h" @@ -95,5 +92,3 @@ class BridgeTowerBehavior : public BehaviorModule, BridgeTowerType m_type; ///< type of tower (positioning) we are }; - -#endif // end __BRIDGE_TOWER_DAMAGE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h index ffa08cbc9a..5439875ebd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __BUNKERBUSTER_BEHAVIOR_H_ -#define __BUNKERBUSTER_BEHAVIOR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpdateModule.h" @@ -102,6 +99,3 @@ class BunkerBusterBehavior : public UpdateModule, ObjectID m_victimID; }; - -#endif // end __BUNKERBUSTER_BEHAVIOR_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h index 345221b4e6..34b460715f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h @@ -44,9 +44,6 @@ #pragma once -#ifndef __CashBountyPower_H_ -#define __CashBountyPower_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -127,5 +124,3 @@ class CashBountyPower : public SpecialPowerModule Real findBounty() const; }; - -#endif // __CashBountyPower_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h index 1aa926fdca..0eeb354440 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __CASHHACKSPECIALPOWER_H_ -#define __CASHHACKSPECIALPOWER_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" @@ -85,6 +82,3 @@ class CashHackSpecialPower : public SpecialPowerModule Int findAmountToSteal() const; }; - -#endif // end __CASHHACKSPECIALPOWER_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h index 6b6e878d97..fca16c556a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h @@ -31,9 +31,6 @@ #pragma once -#ifndef __CAVE_CONTAIN_H_ -#define __CAVE_CONTAIN_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" #include "GameLogic/Module/OpenContain.h" @@ -127,5 +124,3 @@ class CaveContain : public OpenContain, public CreateModuleInterface, public Cav Team *m_originalTeam; ///< our original team before we were garrisoned }; - -#endif // end __CAVE_CONTAIN_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h index 1c20f58b44..4c3bb82e42 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef CHECKPOINT_UPDATE_H -#define CHECKPOINT_UPDATE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" @@ -88,6 +85,3 @@ class CheckpointUpdate : public UpdateModule void checkForAlliesAndEnemies( void ); }; - -#endif // end CHECKPOINT_UPDATE_H - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h index 996ca5039b..0b0279a046 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _ChinookAIUpdate_H_ -#define _ChinookAIUpdate_H_ - #include "GameLogic/AIStateMachine.h" #include "GameLogic/Module/SupplyTruckAIUpdate.h" @@ -140,6 +137,3 @@ class ChinookAIUpdate : public SupplyTruckAIUpdate Coord3D m_originalPos; Bool m_hasPendingCommand; }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h index 065fbbfb4b..a94e05adb8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h @@ -43,9 +43,6 @@ #pragma once -#ifndef __CLEANUP_AREA_POWER_H_ -#define __CLEANUP_AREA_POWER_H_ - //----------------------------------------------------------------------------- #include "GameLogic/Module/SpecialPowerModule.h" @@ -75,5 +72,3 @@ class CleanupAreaPower : public SpecialPowerModule virtual void doSpecialPowerAtLocation( const Coord3D *loc, Real angle, UnsignedInt commandOptions ); }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h index 9322145936..8268e7db55 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __CLEANUP_HAZARD_UPDATE_H_ -#define __CLEANUP_HAZARD_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" @@ -91,7 +88,3 @@ class CleanupHazardUpdate : public UpdateModule Coord3D m_pos; Real m_moveRange; }; - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h index ad5d768d97..3394bee886 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __CollideModule_H_ -#define __CollideModule_H_ - #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" @@ -102,5 +99,3 @@ class CollideModule : public BehaviorModule, inline CollideModule::CollideModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { } inline CollideModule::~CollideModule() { } //------------------------------------------------------------------------------------------------- - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h index c99ef70553..a9e66f197c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __COMMAND_BUTTON_HUNT_UPDATE_H_ -#define __COMMAND_BUTTON_HUNT_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" @@ -86,7 +83,3 @@ class CommandButtonHuntUpdate : public UpdateModule AsciiString m_commandButtonName; const CommandButton *m_commandButton; }; - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h index 56eef9bf18..e034b17685 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _COMMAND_SET_UPGRADE_H -#define _COMMAND_SET_UPGRADE_H - #include "GameLogic/Module/UpgradeModule.h" //----------------------------------------------------------------------------- @@ -69,6 +66,3 @@ class CommandSetUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; -#endif // _COMMAND_SET_UPGRADE_H - - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h index 3b17231475..f85817f831 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __ContainModule_H_ -#define __ContainModule_H_ - #include "Common/Module.h" #include "GameLogic/WeaponBonusConditionFlags.h" // Can't forward a typedef. This should me made a BitFlags class. #include "GameLogic/Damage.h" @@ -210,5 +207,3 @@ class ContainModuleInterface } }; //------------------------------------------------------------------------------------------------- - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h index 36704b2429..c748c8ec30 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h @@ -30,9 +30,6 @@ #pragma once -#ifndef CONVERT_TO_CAR_BOMB_CRATE_COLLIDE_H_ -#define CONVERT_TO_CAR_BOMB_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -89,5 +86,3 @@ class ConvertToCarBombCrateCollide : public CrateCollide virtual Bool isRailroad() const { return FALSE;}; virtual Bool isCarBombCrateCollide() const { return TRUE; } }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h index 98cdf2dbb4..7abd85627d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h @@ -33,9 +33,6 @@ #pragma once -#ifndef CONVERT_TO_HIJACKED_VEHICLE_CRATE_COLLIDE_H_ -#define CONVERT_TO_HIJACKED_VEHICLE_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -83,5 +80,3 @@ class ConvertToHijackedVehicleCrateCollide : public CrateCollide virtual Bool isHijackedVehicleCrateCollide() const { return TRUE; } }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h index 8dae4917dc..e9d82b2da3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __COST_MODIFIER_UPGRADE_H_ -#define __COST_MODIFIER_UPGRADE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -115,5 +112,3 @@ class CostModifierUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; - -#endif // __COST_MODIFIER_UPGRADE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h index 087407de46..9ca8248b63 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __COUNTERMEASURES_BEHAVIOR_H -#define __COUNTERMEASURES_BEHAVIOR_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/BehaviorModule.h" @@ -192,6 +189,3 @@ class CountermeasuresBehavior : public UpdateModule, public UpgradeMux, public C UnsignedInt m_nextVolleyFrame; //Frame the next volley is fired. UnsignedInt m_reloadFrame; //The frame countermeasures will be ready to use again. }; - -#endif // __COUNTERMEASURES_BEHAVIOR_H - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h index 449a4d4517..8cf17d8f14 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h @@ -29,9 +29,6 @@ #pragma once -#ifndef CRATE_COLLIDE_H_ -#define CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" @@ -109,5 +106,3 @@ enum SabotageVictimType CPP_11(: Int) virtual Bool isValidToExecute( const Object *other ) const; }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h index 12558979c5..2139b995cb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _CREATE_CRATE_DIE_H_ -#define _CREATE_CRATE_DIE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" @@ -96,5 +93,3 @@ class CreateCrateDie : public DieModule Object *createCrate( CrateTemplate const *currentCrateData ); }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h index 80c8fa4f6d..8b6de2d9fc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __CreateModule_H_ -#define __CreateModule_H_ - #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" @@ -85,5 +82,3 @@ class CreateModule : public BehaviorModule, public CreateModuleInterface Bool m_needToRunOnBuildComplete; ///< Prevent the multiple calling of onBuildComplete }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h index ae706e4043..12f0386c1f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _CREATE_OBJECT_DIE_H_ -#define _CREATE_OBJECT_DIE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" @@ -73,6 +70,3 @@ class CreateObjectDie : public DieModule virtual void onDie( const DamageInfo *damageInfo ); }; - -#endif // _CREATE_OBJECT_DIE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h index 058ef13c5b..c18289db5b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __CrushDie_H_ -#define __CrushDie_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" @@ -101,6 +98,3 @@ class CrushDie : public DieModule virtual void onDie( const DamageInfo *damageInfo ); }; - -#endif // __CrushDie_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h index 4c6fc0b4dc..896ead6813 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DAMDIE_H_ -#define __DAMDIE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" @@ -64,5 +61,3 @@ class DamDie : public DieModule virtual void onDie( const DamageInfo *damageInfo ); }; - -#endif // end __DAMDIE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h index 68063da3b0..6555522a81 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DamageModule_H_ -#define __DamageModule_H_ - #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/Module/BehaviorModule.h" @@ -113,5 +110,3 @@ class DamageModule : public BehaviorModule, public DamageModuleInterface inline DamageModule::DamageModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { } inline DamageModule::~DamageModule() { } //------------------------------------------------------------------------------------------------- - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h index 176f81ea2d..4d2aea2d39 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h @@ -30,9 +30,6 @@ #pragma once -#ifndef _DEFAULT_PRODUCTION_EXIT_UPDATE_H -#define _DEFAULT_PRODUCTION_EXIT_UPDATE_H - #include "GameLogic/Module/UpdateModule.h" #include "Common/INI.h" #include "Lib/BaseType.h" @@ -129,5 +126,3 @@ inline Bool DefaultProductionExitUpdate::useSpawnRallyPoint( void ) const else return FALSE; } - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h index 89d8a51a6a..b9d7310891 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h @@ -32,9 +32,6 @@ #pragma once -#ifndef __DEFECTORSPECIALPOWER_H_ -#define __DEFECTORSPECIALPOWER_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" @@ -81,5 +78,3 @@ class DefectorSpecialPower : public SpecialPowerModule protected: }; -#endif // end DefectorSpecialPower - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h index 0ed28d8d87..436feb28d7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DELETION_UPDATE_H_ -#define __DELETION_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -86,6 +83,3 @@ class DeletionUpdate : public UpdateModule UnsignedInt m_dieFrame; ///< frame we die on }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h index ad45b9da1c..e92b964b6e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _DELIVER_PAYLOAD_AI_UPDATE_H_ -#define _DELIVER_PAYLOAD_AI_UPDATE_H_ - #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" #include "GameClient/RadiusDecal.h" @@ -383,6 +380,3 @@ class DeliverPayloadAIUpdate : public AIUpdateInterface }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h index 0a219f4870..9085a9c982 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DEMO_TRAP_UPDATE_H_ -#define __DEMO_TRAP_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" @@ -86,7 +83,3 @@ class DemoTrapUpdate : public UpdateModule Int m_nextScanFrames; Bool m_detonated; }; - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h index e8e53da9cc..c4ed1c56f2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DEMORALIZE_SPECIAL_POWER_H_ -#define __DEMORALIZE_SPECIAL_POWER_H_ - #ifdef ALLOW_DEMORALIZE // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// @@ -82,6 +79,3 @@ class DemoralizeSpecialPower : public SpecialPowerModule }; #endif // ALLOW_DEMORALIZE - - -#endif // end __DEMORALIZE_SPECIAL_POWER_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h index aad2f9f65d..d79bccd2f7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DEPLOY_STYLE_AI_UPDATE_H -#define __DEPLOY_STYLE_AI_UPDATE_H - #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" @@ -116,6 +113,3 @@ class DeployStyleAIUpdate : public AIUpdateInterface DeployStateTypes m_state; UnsignedInt m_frameToWaitForDeploy; }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h index 22477b4111..f365c12956 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DestroyDie_H_ -#define __DestroyDie_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "Common/INI.h" @@ -53,6 +50,3 @@ class DestroyDie : public DieModule virtual void onDie( const DamageInfo *damageInfo ); }; - -#endif // __DestroyDie_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h index ab44b30399..c71fb13050 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DestroyModule_H_ -#define __DestroyModule_H_ - #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" @@ -66,5 +63,3 @@ class DestroyModule : public BehaviorModule, public DestroyModuleInterface protected: }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h index f59e44835c..803cdde7c5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DieModule_H_ -#define __DieModule_H_ - #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/Module/BehaviorModule.h" @@ -108,5 +105,3 @@ class DieModule : public BehaviorModule, public DieModuleInterface }; inline DieModule::DieModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { } inline DieModule::~DieModule() { } - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h index c0d979c383..92695de6c5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _DOCK_UPDATE_H_ -#define _DOCK_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" @@ -156,5 +153,3 @@ class DockUpdate : public UpdateModule , public DockUpdateInterface void loadDockPositions(); ///< load all the dock positions Coord3D computeApproachPosition( Int positionIndex, Object *forWhom ); ///< Do a smart lookup of this bone position }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h index 1ae1566a26..2d5d4bd399 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DOZERAIUPDATE_H_ -#define __DOZERAIUPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/AIUpdate.h" @@ -305,7 +302,3 @@ class DozerAIUpdate : public AIUpdateInterface, public DozerAIInterface void createMachines( void ); ///< create our behavior machines we need }; - - -#endif // __DOZERAIUPDATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h index 0772cc54d1..ac230ffc2e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _DumbProjectileBehavior_H_ -#define _DumbProjectileBehavior_H_ - #include "Common/GameType.h" #include "Common/GlobalData.h" #include "Common/STLTypedefs.h" @@ -125,6 +122,3 @@ class DumbProjectileBehavior : public UpdateModule, public ProjectileUpdateInter #endif }; - -#endif // _DumbProjectileBehavior_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h index 3f7c996ae7..96b0e953dd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DYNAMIC_GEOMETRY_INFO_UPDATE_H_ -#define __DYNAMIC_GEOMETRY_INFO_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Geometry.h" #include "GameLogic/Module/UpdateModule.h" @@ -102,7 +99,3 @@ class DynamicGeometryInfoUpdate : public UpdateModule Real m_finalMinorRadius; }; - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h index f27fae6e21..7b84745ca5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __DYNAMIC_SHROUD_RANGE_UPDATE_H_ -#define __DYNAMIC_SHROUD_RANGE_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameClient/RadiusDecal.h"///< For the pseudo-wireframe decal effect @@ -129,6 +126,3 @@ class DynamicShroudClearingRangeUpdate : public UpdateModule RadiusDecal m_gridDecal[GRID_FX_DECAL_COUNT];///< For the pseudo-wireframe decal effect }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h index 695bf26e5f..9e6712b508 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __EMPUPDATE_H_ -#define __EMPUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/Module/DieModule.h" @@ -221,22 +218,3 @@ class LeafletDropBehavior : public UpdateModule, UnsignedInt m_startFrame; ///< frame we die on Bool m_fxFired; ///< have we done our fx yet }; - - - - - - - - - - - - - - - - -#endif // __EMPUPDATE_H_ - - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h index b968662c7a..b2a0e2cc03 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _EjectPilotDie_H_ -#define _EjectPilotDie_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "Common/INI.h" @@ -72,6 +69,3 @@ class EjectPilotDie : public DieModule virtual DieModuleInterface* getEjectPilotDieInterface( void ) {return this; } }; - -#endif // _EjectPilotDie_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h index f173f259bf..3929983db0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __EnemyNearUpdate_H_ -#define __EnemyNearUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" @@ -84,6 +81,3 @@ class EnemyNearUpdate : public UpdateModule void checkForEnemies( void ); }; - -#endif // end __EnemyNearUpdate_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h index c661dc477f..eefcea7e94 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __EXPERIENCE_SCALAR_UPGRADE_H_ -#define __EXPERIENCE_SCALAR_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -72,7 +69,3 @@ class ExperienceScalarUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; - - -#endif // __DEFAULTDIE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h index b7de68588c..d299618064 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FXListDie_H_ -#define __FXListDie_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" @@ -130,7 +127,3 @@ class FXListDie : public DieModule, public UpgradeMux }; - - -#endif // __FXListDie_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h index fcf6fc5393..2c14a00b3c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __FIRE_OCL_AFTER_WEAPON_COOLDOWN_UPDATE_H -#define __FIRE_OCL_AFTER_WEAPON_COOLDOWN_UPDATE_H - class UpgradeMuxData; #include "GameLogic/Module/UpdateModule.h" @@ -107,6 +104,3 @@ class FireOCLAfterWeaponCooldownUpdate : public UpdateModule, public UpgradeMux UnsignedInt m_startFrame; }; - -#endif // __FIRE_OCL_AFTER_WEAPON_COOLDOWN_UPDATE_H - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h index 0c70a3ce61..7d73089bc4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FIRE_SPREAD_UPDATE_H_ -#define __FIRE_SPREAD_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -76,6 +73,3 @@ class FireSpreadUpdate : public UpdateModule UnsignedInt calcNextSpreadDelay(); }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h index cc7600c0f4..5d1f6fb04a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FireWeaponCollide_H_ -#define __FireWeaponCollide_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" #include "GameLogic/Weapon.h" @@ -80,7 +77,3 @@ class FireWeaponCollide : public CollideModule Bool m_everFired; }; - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h index 6c42c47e5d..7e47a54840 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h @@ -44,9 +44,6 @@ #pragma once -#ifndef __FIRE_WEAPON_POWER_H -#define __FIRE_WEAPON_POWER_H - #include "GameLogic/Module/SpecialPowerModule.h" class Object; @@ -85,5 +82,3 @@ class FireWeaponPower : public SpecialPowerModule protected: }; - -#endif // __FIRE_WEAPON_POWER_H diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h index da59d72da6..3532abe855 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FIRE_WEAPON_UPDATE_H_ -#define __FIRE_WEAPON_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/Weapon.h" @@ -75,6 +72,3 @@ class FireWeaponUpdate : public UpdateModule UnsignedInt m_initialDelayFrame; }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h index c55d95f307..801bfaaf24 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FireWeaponWhenDamagedBehavior_H_ -#define __FireWeaponWhenDamagedBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpgradeModule.h" @@ -173,6 +170,3 @@ class FireWeaponWhenDamagedBehavior : public UpdateModule, Weapon *m_continuousWeaponRubble; }; - -#endif // __FireWeaponWhenDamagedBehavior_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h index 4fab1dc235..7a1271eca6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FireWeaponWhenDeadBehavior_H_ -#define __FireWeaponWhenDeadBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" @@ -128,6 +125,3 @@ class FireWeaponWhenDeadBehavior : public BehaviorModule, virtual Bool isSubObjectsUpgrade() { return false; } }; - -#endif // __FireWeaponWhenDeadBehavior_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h index e3d3e5f095..6c0761be70 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FIRESTORM_DYNAMIC_GEOMETRY_INFO_UPDATE_H_ -#define __FIRESTORM_DYNAMIC_GEOMETRY_INFO_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Geometry.h" #include "GameLogic/Module/DynamicGeometryInfoUpdate.h" @@ -84,7 +81,3 @@ class FirestormDynamicGeometryInfoUpdate : public DynamicGeometryInfoUpdate Bool m_scorchPlaced; ///< TRUE once we have placed the scorch mark UnsignedInt m_lastDamageFrame; ///< frame we last did damage on }; - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h index be73de9656..67ab98c966 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FLAMMABLE_UPDATE_H_ -#define __FLAMMABLE_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameLogic/Module/DamageModule.h" @@ -114,6 +111,3 @@ class FlammableUpdate : public UpdateModule, public DamageModuleInterface ObjectID m_flameSource; UnsignedInt m_lastFlameDamageDealt; }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h index c74f4234e7..650166809a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FLIGHT_DECK_BEHAVIOR_H -#define __FLIGHT_DECK_BEHAVIOR_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" @@ -229,6 +226,3 @@ class FlightDeckBehavior : public AIUpdateInterface, Bool m_rampUp[ MAX_RUNWAYS ]; }; - -#endif // __FLIGHT_DECK_BEHAVIOR_H - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h index 65237c7973..7da2cbce24 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __FLOATUPDATE_H_ -#define __FLOATUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -74,5 +71,3 @@ class FloatUpdate : public UpdateModule Bool m_enabled; ///< enabled }; - -#endif // end __FLOATUPDATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h index 09f21a875a..b8c78b631a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GARRISONCONTAIN_H_ -#define __GARRISONCONTAIN_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" #include "Common/ModelState.h" @@ -244,6 +241,3 @@ class GarrisonContain : public OpenContain EvacDisposition m_evacDisposition; }; - -#endif // __GARRISONCONTAIN_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h index ab6b35f5d1..99a659b2e7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GenerateMinefieldBehavior_H_ -#define __GenerateMinefieldBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" @@ -134,6 +131,3 @@ class GenerateMinefieldBehavior : public UpdateModule, void placeMinesAroundRect(const Coord3D& pos, Real majorRadius, Real minorRadius, const ThingTemplate* mineTemplate); Object* placeMineAt(const Coord3D& pt, const ThingTemplate* mineTemplate, Team* team, const Object* producer); }; - -#endif // __GenerateMinefieldBehavior_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h index 92e521ab17..166afd3fb9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __GRANT_SCIENCE_UPGRADE_H -#define __GRANT_SCIENCE_UPGRADE_H - #include "GameLogic/Module/UpgradeModule.h" //----------------------------------------------------------------------------- @@ -82,6 +79,3 @@ class GrantScienceUpgrade : public UpgradeModule ScienceType m_scienceType; }; -#endif // _COMMAND_SET_UPGRADE_H - - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h index 0bc1c6521b..ed0491c3c7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GrantStealthBehavior_H_ -#define __GrantStealthBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/BehaviorModule.h" @@ -107,6 +104,3 @@ class GrantStealthBehavior : public UpdateModule ParticleSystemID m_radiusParticleSystemID; Real m_currentScanRadius; }; - -#endif // __GrantStealthBehavior_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h index 799627edde..bc23fcb8e1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GRANTUPGRADECREATE_H_ -#define __GRANTUPGRADECREATE_H_ - #define DEFINE_OBJECT_STATUS_NAMES // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// @@ -77,6 +74,3 @@ class GrantUpgradeCreate : public CreateModule protected: }; - -#endif // __GRANTUPGRADECREATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h index 2d77d7f147..6b049d7372 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __HACK_INTERNET_AI_UPDATE_H -#define __HACK_INTERNET_AI_UPDATE_H - #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" @@ -228,6 +225,3 @@ class HackInternetAIUpdate : public AIUpdateInterface, public HackInternetAIInte AICommandParmsStorage m_pendingCommand; Bool m_hasPendingCommand; }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h index 99acc4e412..996c06653a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __HEALCONTAIN_H_ -#define __HEALCONTAIN_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" @@ -73,5 +70,3 @@ class HealContain : public OpenContain Bool doHeal( Object *obj, UnsignedInt framesForFullHeal ); ///< do the heal on an object }; - -#endif // end __HEALCONTAIN_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h index 2c79a438d9..e2f8bdcd91 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h @@ -29,9 +29,6 @@ #pragma once -#ifndef HEAL_CRATE_COLLIDE_H_ -#define HEAL_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -56,5 +53,3 @@ class HealCrateCollide : public CrateCollide /// This is the game logic execution function that all real CrateCollides will implement virtual Bool executeCrateBehavior( Object *other ); }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h index 04f89fb16d..67ce4f20d1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __HEIGHTDIEUPDATE_H_ -#define __HEIGHTDIEUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -79,5 +76,3 @@ class HeightDieUpdate : public UpdateModule UnsignedInt m_earliestDeathFrame; ///< Earliest we are allowed to think about dying }; - -#endif // end __HEIGHTDIEUPDATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h index f28fd59eb3..1e3ae0e31a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __HelicopterSlowDeathBehavior_H_ -#define __HelicopterSlowDeathBehavior_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameLogic/Module/SlowDeathBehavior.h" @@ -113,5 +110,3 @@ class HelicopterSlowDeathBehavior : public SlowDeathBehavior AudioEventRTS m_deathSound; ///< Sound played during death sequence. }; - -#endif // end __HelicopterSlowDeathBehavior_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h index 7bf597d0d9..fc28147c1f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h @@ -33,9 +33,6 @@ #pragma once -#ifndef __HELIX_CONTAIN_H_ -#define __HELIX_CONTAIN_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/TransportContain.h" @@ -129,6 +126,3 @@ class HelixContain : public TransportContain ObjectID m_portableStructureID; }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h index d557a38aa9..1ab52a67c1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __HIGHLANDER_BODY_H -#define __HIGHLANDER_BODY_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" @@ -57,6 +54,3 @@ class HighlanderBody : public ActiveBody protected: }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h index ff03b0e5f5..bbabac53f1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h @@ -34,9 +34,6 @@ #pragma once -#ifndef __HIJACKER_UPDATE_H -#define __HIJACKER_UPDATE_H - #include "GameLogic/Module/UpdateModule.h" //------------------------------------------------------------------------------------------------- @@ -92,6 +89,3 @@ class HijackerUpdate : public UpdateModule // of target vehicle if it has one }; - -#endif // __HIJACKER_UPDATE_H - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h index 978bd59396..7ff7780860 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h @@ -31,9 +31,6 @@ #pragma once -#ifndef __HIVE_STRUCTURE_BODY_H -#define __HIVE_STRUCTURE_BODY_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/StructureBody.h" #include "GameLogic/Damage.h" @@ -81,6 +78,3 @@ class HiveStructureBody : public StructureBody virtual void attemptDamage( DamageInfo *damageInfo ); ///< try to damage this object }; - -#endif // __HIVE_STRUCTURE_BODY_H - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h index 5ac02b4752..e114dc31e1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __HordeUpdate_H_ -#define __HordeUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" @@ -125,6 +122,3 @@ class HordeUpdate : public UpdateModule, public HordeUpdateInterface Bool m_hasFlag; }; - -#endif // __HordeUpdate_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h index a7a290a381..b29376bb30 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __IMMORTAL_BODY_H -#define __IMMORTAL_BODY_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" @@ -57,6 +54,3 @@ class ImmortalBody : public ActiveBody protected: }; - -#endif // __STRUCTUREBODY_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h index 285396e821..79ca7cd61c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __INACTIVEBODY_H_ -#define __INACTIVEBODY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BodyModule.h" @@ -69,6 +66,3 @@ class InactiveBody : public BodyModule private: Bool m_dieCalled; }; - -#endif // __INACTIVEBODY_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h index 36ddc4e754..8000ecd3ce 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __InstantDeathBehavior_H_ -#define __InstantDeathBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" @@ -76,6 +73,3 @@ class InstantDeathBehavior : public DieModule virtual void onDie( const DamageInfo *damageInfo ); }; - -#endif // __InstantDeathBehavior_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h index a1aeca9a66..8f300b2399 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __INTERNET_HACK_CONTAIN_H -#define __INTERNET_HACK_CONTAIN_H - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/TransportContain.h" @@ -68,6 +65,3 @@ class InternetHackContain : public TransportContain private: }; - -#endif // __RIDER_CHANGE_CONTAIN_H - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h index 1aa86cabbc..1840d30a4b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h @@ -27,9 +27,6 @@ #pragma once -#ifndef _JET_AI_UPDATE_H_ -#define _JET_AI_UPDATE_H_ - #include "Common/STLTypedefs.h" #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" @@ -179,6 +176,3 @@ class JetAIUpdate : public AIUpdateInterface Bool getFlag(FlagType f) const; void setFlag(FlagType f, Bool v); }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h index 0776c1b536..f9d8f8b50f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __JET_SLOW_DEATH_BEHAVIOR_H_ -#define __JET_SLOW_DEATH_BEHAVIOR_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameLogic/Module/BehaviorModule.h" @@ -105,6 +102,3 @@ class JetSlowDeathBehavior : public SlowDeathBehavior AudioEventRTS m_deathLoopSound; ///< death loop sound }; - - -#endif // end __JET_SLOW_DEATH_BEHAVIOR_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h index b126629612..539ff20559 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h @@ -32,9 +32,6 @@ #pragma once -#ifndef __KEEP_OBJECT_DIE_H_ -#define __KEEP_OBJECT_DIE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "Common/INI.h" @@ -56,6 +53,3 @@ class KeepObjectDie : public DieModule virtual void onDie( const DamageInfo *damageInfo ); }; - -#endif // __KEEP_OBJECT_DIE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h index 6c2fdcd139..f921a04f53 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __LASER_UPDATE_H -#define __LASER_UPDATE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" @@ -133,7 +130,3 @@ class LaserUpdate : public ClientUpdateModule LaserRadiusUpdate m_laserRadius; }; - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h index 9416ac40f4..7802e2bf50 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __LIFETIMEUPDATE_H_ -#define __LIFETIMEUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -85,6 +82,3 @@ class LifetimeUpdate : public UpdateModule UnsignedInt m_dieFrame; }; - -#endif // __LIFETIMEUPDATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h index b6c7c25db7..8650a5a422 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __LOCKWEAPONCREATE_H_ -#define __LOCKWEAPONCREATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" @@ -71,6 +68,3 @@ class LockWeaponCreate : public CreateModule protected: }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h index eb52cf61a0..2df6b5e934 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __LocomotorSetUpgrade_H_ -#define __LocomotorSetUpgrade_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -57,7 +54,3 @@ class LocomotorSetUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; - - -#endif // __LocomotorSetUpgrade_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h index c3aebfc167..d269b87720 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __MAX_HEALTH_UPGRADE_H_ -#define __MAX_HEALTH_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -74,7 +71,3 @@ class MaxHealthUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; - - -#endif // __DEFAULTDIE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h index 2ef8870f6f..f145d238be 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __MinefieldBEHAVIOR_H_ -#define __MinefieldBEHAVIOR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/CollideModule.h" @@ -145,5 +142,3 @@ class MinefieldBehavior : public UpdateModule, UpdateSleepTime calcSleepTime(); }; - -#endif // end __MinefieldBEHAVIOR_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h index bd6ec6a34f..f66f917348 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _MISSILE_AI_UPDATE_H_ -#define _MISSILE_AI_UPDATE_H_ - #include "Common/GameType.h" #include "Common/GlobalData.h" #include "GameLogic/Module/AIUpdate.h" @@ -147,6 +144,3 @@ class MissileAIUpdate : public AIUpdateInterface, public ProjectileUpdateInterfa }; - -#endif // _MISSILE_AI_UPDATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h index 58027f5ff8..30bf8b44b4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _MissileLauncherBuildingUpdate_H_ -#define _MissileLauncherBuildingUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" @@ -135,5 +132,3 @@ class MissileLauncherBuildingUpdate : public SpecialPowerUpdateModule UnsignedInt m_timeoutFrame; AudioEventRTS m_openIdleAudio; }; - -#endif // _MissileLauncherBuildingUpdate_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h index 7b2f75f06d..ce18cf4873 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _MOBMEMBER_SLAVED_UPDATE_H_ -#define _MOBMEMBER_SLAVED_UPDATE_H_ - #define MM_SLAVED_UPDATE_RATE (LOGICFRAMES_PER_SECOND / 8) ///< This is a low priority module that only needs to be called every this many frames #define MIN_SQUIRRELLINESS (0.01f) #define MAX_SQUIRRELLINESS (1.0f) @@ -133,5 +130,3 @@ class MobMemberSlavedUpdate : public UpdateModule, public SlavedUpdateInterface // thus causing the mob to become invincible, since they will continue to bud around the nexus }; -#endif //_MOBMEMBER_AI_UPDATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h index 1004813a69..a6cb49aa53 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __MOBNEXUSCONTAIN_H_ -#define __MOBNEXUSCONTAIN_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" @@ -103,6 +100,3 @@ class MobNexusContain : public OpenContain, Int m_extraSlotsInUse; }; - -#endif // __MOBNEXUSCONTAIN_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h index d3e2099ab2..a1adfe69b7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _MODEL_CONDITION_UPGRADE_H -#define _MODEL_CONDITION_UPGRADE_H - #include "GameLogic/Module/UpgradeModule.h" enum ModelConditionFlagType CPP_11(: Int); @@ -63,6 +60,3 @@ class ModelConditionUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; -#endif // _MODEL_CONDITION_UPGRADE_H - - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h index 70b08118b2..ed767becd8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h @@ -29,9 +29,6 @@ #pragma once -#ifndef MONEY_CRATE_COLLIDE_H_ -#define MONEY_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -89,5 +86,3 @@ class MoneyCrateCollide : public CrateCollide Int getUpgradedSupplyBoost( Object *other ) const; }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h index 254cb360cf..9f972ea26a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __NeutronBlastBehavior_H_ -#define __NeutronBlastBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "GameLogic/Module/UpdateModule.h" @@ -94,6 +91,3 @@ class NeutronBlastBehavior : public UpdateModule, void neutronBlastToObject( Object *obj ); }; - -#endif // __NeutronBlastBehavior_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h index d4daabf77c..fdcd161a87 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __NEUTRONMISSILESlowDeathBehavior_H_ -#define __NEUTRONMISSILESlowDeathBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SlowDeathBehavior.h" @@ -112,5 +109,3 @@ class NeutronMissileSlowDeathBehavior : public SlowDeathBehavior Bool m_scorchPlaced; ///< TRUE once we've placed the scorch mark }; - -#endif // end __NEUTRONMISSILESlowDeathBehavior_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h index a7d440fd8a..41c6db5a18 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _MISSILE_UPDATE_H_ -#define _MISSILE_UPDATE_H_ - #include "GameClient/RadiusDecal.h" #include "Common/GameType.h" #include "Common/GlobalData.h" @@ -140,6 +137,3 @@ class NeutronMissileUpdate : public UpdateModule, }; - -#endif // _MISSILE_UPDATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h index 710d54d192..5fa059cff7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __OCLSPECIALPOWER_H_ -#define __OCLSPECIALPOWER_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" #include "Common/Science.h" @@ -106,5 +103,3 @@ class OCLSpecialPower : public SpecialPowerModule const ObjectCreationList* findOCL() const; }; - -#endif // end __OCLSPECIALPOWER_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h index 8eac6c74d0..3e7e0546a0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __OCL_UPDATE_H_ -#define __OCL_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -96,6 +93,3 @@ class OCLUpdate : public UpdateModule void setNextCreationFrame(); }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h index cc8f65703d..eb2786bf1b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __OBJECTCREATIONUPGRADE_H_ -#define __OBJECTCREATIONUPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -77,6 +74,3 @@ class ObjectCreationUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; - -#endif // __OBJECTCREATIONUPGRADE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h index 85b28a0ab4..baa2c45508 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __OBJECT_DEFECTION_HELPER_H_ -#define __OBJECT_DEFECTION_HELPER_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" @@ -83,6 +80,3 @@ class ObjectDefectionHelper : public ObjectHelper void startDefectionTimer(UnsignedInt numFrames, Bool withDefectorFX = TRUE); }; - - -#endif // end __OBJECT_DEFECTION_HELPER_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h index d38d42dd64..cdf4c59607 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __OBJECT_HELPER_H_ -#define __OBJECT_HELPER_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -64,5 +61,3 @@ class ObjectHelper : public UpdateModule void sleepUntil(UnsignedInt when); }; - -#endif // end __OBJECT_HELPER_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h index ce344ca452..445c05d3f9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __ObjectRepulsorHelper_H_ -#define __ObjectRepulsorHelper_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" @@ -58,6 +55,3 @@ class ObjectRepulsorHelper : public ObjectHelper virtual UpdateSleepTime update(); }; - - -#endif // end __ObjectRepulsorHelper_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h index b88ed76ae0..34fc3cd833 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __OBJECT_SMC_HELPER_H_ -#define __OBJECT_SMC_HELPER_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" @@ -58,6 +55,3 @@ class ObjectSMCHelper : public ObjectHelper virtual UpdateSleepTime update(); }; - - -#endif // end __OBJECT_SMC_HELPER_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h index 8f1cd8f0ad..0a36cfea97 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __OBJECT_WEAPON_STATUS_HELPER_H_ -#define __OBJECT_WEAPON_STATUS_HELPER_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ThingTemplate.h" #include "GameLogic/Object.h" @@ -81,5 +78,3 @@ class ObjectWeaponStatusHelper : public ObjectHelper return UPDATE_SLEEP_NONE; } }; - -#endif // end __OBJECT_DEFECTION_HELPER_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h index 23350910ba..180fc86aac 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h @@ -32,9 +32,6 @@ #pragma once -#ifndef __OPENCONTAIN_H_ -#define __OPENCONTAIN_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/CollideModule.h" @@ -284,5 +281,3 @@ class OpenContain : public UpdateModule, Bool m_loadSoundsEnabled; ///< Don't serialize -- used for disabling sounds during payload creation. Bool m_passengerAllowedToFire; ///< Newly promoted from the template data to the module for upgrade overriding access }; - -#endif // end __OPENCONTAIN_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h index 0459a37a65..23999c4b10 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h @@ -31,9 +31,6 @@ #pragma once -#ifndef __OVERCHARGE_BEHAVIOR_H_ -#define __OVERCHARGE_BEHAVIOR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DamageModule.h" @@ -114,5 +111,3 @@ class OverchargeBehavior : public UpdateModule, Bool m_overchargeActive; ///< Overcharge is currently on/off for this object }; - -#endif // end __OVERCHARGE_BEHAVIOR_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h index bc5d09417d..8cb487b76e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __OVERLORD_CONTAIN_H_ -#define __OVERLORD_CONTAIN_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/TransportContain.h" #include "GameLogic/GameLogic.h" @@ -127,6 +124,3 @@ class OverlordContain : public TransportContain Bool m_redirectionActivated; }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h index 0bfc2b856f..f937ba66b6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __POW_TRUCK_AI_UPDATE_H_ -#define __POW_TRUCK_AI_UPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/AIUpdate.h" @@ -146,5 +143,3 @@ class POWTruckAIUpdate : public AIUpdateInterface, }; #endif - -#endif // end __POW_TRUCK_AI_UPDATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h index ede1be194f..1ef92bb49c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __POW_TRUCK_BEHAVIOR_H_ -#define __POW_TRUCK_BEHAVIOR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" @@ -71,5 +68,3 @@ class POWTruckBehavior : public OpenContain }; #endif - -#endif // end __POW_TRUCK_BEHAVIOR_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h index d478ddd293..9aa2b664c7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __ParachuteContain_H_ -#define __ParachuteContain_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" @@ -113,6 +110,3 @@ class ParachuteContain : public OpenContain Bool m_needToUpdateParaBones; Bool m_opened; }; - -#endif // __ParachuteContain_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h index 43b95b5d19..053d3108e6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __ParkingPlaceBehavior_H_ -#define __ParkingPlaceBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" @@ -217,6 +214,3 @@ class ParkingPlaceBehavior : public UpdateModule, Coord3D m_heliRallyPoint; Bool m_heliRallyPointExists; ///< Only move to the rally point if this is true }; - -#endif // __ParkingPlaceBehavior_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h index 7170479c0f..015813b9a7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __PARTICLE_UPLINK_CANNON_UPDATE_H_ -#define __PARTICLE_UPLINK_CANNON_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "Common/Science.h" @@ -241,7 +238,3 @@ class ParticleUplinkCannonUpdate : public SpecialPowerUpdateModule Bool m_scriptedWaypointMode; Bool m_clientShroudedLastFrame; }; - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h index e98e588851..a9d27ac14f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __PASSENGERS_FIRE_UPGRADE_H_ -#define __PASSENGERS_FIRE_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -56,7 +53,3 @@ class PassengersFireUpgrade : public UpgradeModule }; - - -#endif // __PASSENGERS_FIRE_UPGRADE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h index 008944893f..4ba389c53d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _PHYSICSUPDATE_H_ -#define _PHYSICSUPDATE_H_ - #include "Common/AudioEventRTS.h" #include "Common/GameAudio.h" #include "GameLogic/Module/BehaviorModule.h" @@ -307,6 +304,3 @@ inline ObjectID PhysicsBehavior::getLastCollidee() const { return m_lastCollidee; } - -#endif // _PHYSICSUPDATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h index 92b710a840..78c39e8c2d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __PILOT_FIND_VEHICLE_UPDATE_H_ -#define __PILOT_FIND_VEHICLE_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" @@ -79,7 +76,3 @@ class PilotFindVehicleUpdate : public UpdateModule protected: Bool m_didMoveToBase; }; - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h index 0076b1cd2f..e66818f66f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __POINT_DEFENSE_LASER_UPDATE_H_ -#define __POINT_DEFENSE_LASER_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" @@ -87,7 +84,3 @@ class PointDefenseLaserUpdate : public UpdateModule Int m_nextScanFrames; Int m_nextShotAvailableInFrames; }; - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h index 48190a1704..11537deedc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __Poisoned_Behavior_H_ -#define __Poisoned_Behavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DamageModule.h" @@ -96,6 +93,3 @@ class PoisonedBehavior : public UpdateModule, DeathType m_deathType; }; - -#endif // __Poisoned_Behavior_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h index 2752b08ba1..97c21634e5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __POWERPLANTUPDATE_H_ -#define __POWERPLANTUPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -99,5 +96,3 @@ class PowerPlantUpdate : public UpdateModule, Bool m_extended; ///< TRUE when extend is all done }; - -#endif // end __POWERPLANTUPDATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h index ea1c4eaed5..c3b601bdd1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __POWERPLANTUPGRADE_H_ -#define __POWERPLANTUPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -62,6 +59,3 @@ class PowerPlantUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; - -#endif // __POWERPLANTUPGRADE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h index bfccea0f4f..dad86a0cbd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h @@ -30,9 +30,6 @@ #pragma once -#ifndef _PREORDER_CREATE_H_ -#define _PREORDER_CREATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" @@ -58,5 +55,3 @@ class PreorderCreate : public CreateModule protected: }; - -#endif // _PREORDER_CREATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h index ccf67cd48a..600af3bbb2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h @@ -27,8 +27,7 @@ // Desc: Prison Behaviors /////////////////////////////////////////////////////////////////////////////////////////////////// -#ifndef __PRISON_BEHAVIOR_H_ -#define __PRISON_BEHAVIOR_H_ +#pragma once // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" @@ -85,5 +84,3 @@ class PrisonBehavior : public OpenContain }; #endif - -#endif // end __PRISON_BEHAVIOR_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h index b5088e0d64..2baf25279c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __PRISON_DOCK_UPDATE_H_ -#define __PRISON_DOCK_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameLogic/Module/DockUpdate.h" @@ -59,5 +56,3 @@ class PrisonDockUpdate : public DockUpdate }; #endif - -#endif // end __PRISON_DOCK_UPDATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h index f58b0305e5..5c6cc19fe4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __PRODUCTIONUPDATE_H_ -#define __PRODUCTIONUPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/ModelState.h" #include "GameLogic/Module/DieModule.h" @@ -268,5 +265,3 @@ class ProductionUpdate : public UpdateModule, public ProductionUpdateInterface, Bool m_flagsDirty; ///< clearFlags/setFlags needs to be set into the model }; - -#endif // end __PRODUCTIONUPDATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h index 39d77de041..3f79ac99c5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __PROJECTILE_STREAM_UPDATE_H_ -#define __PROJECTILE_STREAM_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" // FORWARD REFERENCES ///////////////////////////////////////////////////////////////////////////// @@ -77,7 +74,3 @@ class ProjectileStreamUpdate : public UpdateModule ObjectID m_targetObject;///< Need to insert a hole if target changes, so track target ID and target position Coord3D m_targetPosition; }; - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h index a00338277d..2aa7447993 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __PRONE_UPDATE_H_ -#define __PRONE_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -78,7 +75,3 @@ class ProneUpdate : public UpdateModule Int m_proneFrames; }; - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h index 47cc77bf2f..abcfd6f6f5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h @@ -27,8 +27,7 @@ // Desc: Propaganda Center Behavior /////////////////////////////////////////////////////////////////////////////////////////////////// -#ifndef __PROPAGANDA_CENTER_BEHAVIOR_H_ -#define __PROPAGANDA_CENTER_BEHAVIOR_H_ +#pragma once // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/PrisonBehavior.h" @@ -84,5 +83,3 @@ class PropagandaCenterBehavior : public PrisonBehavior }; #endif - -#endif // end __PROPAGANDA_CENTER_BEHAVIOR_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h index 78a3409a5d..da388a53f0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __PROPAGANDA_TOWER_BEHAVIOR_H_ -#define __PROPAGANDA_TOWER_BEHAVIOR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/PropagandaTowerBehavior.h" @@ -112,6 +109,3 @@ class PropagandaTowerBehavior : public UpdateModule, const UpgradeTemplate *m_upgradeRequired; ///< Upgrade required to use the upgraded pulse FX }; - -#endif // end __PROPAGANDA_TOWER_BEHAVIOR_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h index 2f1f180b26..d6eb4714fd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h @@ -30,9 +30,6 @@ #pragma once -#ifndef _QUEUE_PRODUCTION_EXIT_UPDATE_H -#define _QUEUE_PRODUCTION_EXIT_UPDATE_H - #include "GameLogic/Module/UpdateModule.h" #include "Common/INI.h" #include "Lib/BaseType.h" @@ -126,5 +123,3 @@ inline const Coord3D *QueueProductionExitUpdate::getRallyPoint( void ) const return NULL; } - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h index a6b0590ed6..c36d57bf36 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __RADARUPDATE_H_ -#define __RADARUPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -88,5 +85,3 @@ class RadarUpdate : public UpdateModule Bool m_radarActive; ///< TRUE when radar is actually online and generating radar information. }; - -#endif // end __RADARUPDATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h index 2610df236f..eb5b0c8968 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __RADARUPGRADE_H_ -#define __RADARUPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -78,6 +75,3 @@ class RadarUpgrade : public UpgradeModule }; - -#endif // __RADARUPGRADE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h index 5f859f44cc..3d58a6ae6f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h @@ -27,9 +27,6 @@ #pragma once -#ifndef __RadiusDecalUpdate_H_ -#define __RadiusDecalUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameClient/RadiusDecal.h" @@ -84,6 +81,3 @@ class RadiusDecalUpdate : public UpdateModule RadiusDecal m_deliveryDecal; Bool m_killWhenNoLongerAttacking; }; - -#endif // __RadiusDecalUpdate_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h index 1db4067a5c..3f29b21677 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __RAILED_TRANSPORT_AI_UPDATE_H_ -#define __RAILED_TRANSPORT_AI_UPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/AIUpdate.h" @@ -96,7 +93,3 @@ class RailedTransportAIUpdate : public AIUpdateInterface Bool m_waypointDataLoaded; ///< TRUE once we've searched the map to load m_path }; - - -#endif // end __RAILED_TRANSPORT_AI_UPDATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h index 186b76de6d..4b5357b27f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __RAILED_TRANSPORT_CONTAIN_H_ -#define __RAILED_TRANSPORT_CONTAIN_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/TransportContain.h" @@ -57,5 +54,3 @@ class RailedTransportContain : public TransportContain virtual Bool isSpecificRiderFreeToExit( Object *obj ); }; - -#endif // end __RAILED_TRANSPORT_CONTAIN_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h index e289411305..537d0293ba 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h @@ -27,8 +27,7 @@ // Desc: Railed transport dock update /////////////////////////////////////////////////////////////////////////////////////////////////// -#ifndef __RAILED_TRANSPORT_DOCK_UPDATE_H_ -#define __RAILED_TRANSPORT_DOCK_UPDATE_H_ +#pragma once // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DockUpdate.h" @@ -110,5 +109,3 @@ class RailedTransportDockUpdate : public DockUpdate, Int m_unloadCount; ///< count used to govern unloading 1 or all objects }; - -#endif // end __RAILED_TRANSPORT_DOCK_UPDATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h index 112adb8dc4..f142d92cfb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __RAILROADGUIDE_AI_UPDATE_H_ -#define __RAILROADGUIDE_AI_UPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/AIUpdate.h" #include "GameLogic/Module/PhysicsUpdate.h" @@ -302,7 +299,3 @@ class RailroadBehavior : public PhysicsBehavior }; - - -#endif // end __RAILROAD_GUIDE_AI_UPDATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h index 4bfa30b91e..8a37bc1e41 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __REBUILD_HOLE_BEHAVIOR_H_ -#define __REBUILD_HOLE_BEHAVIOR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" @@ -120,5 +117,3 @@ class RebuildHoleBehavior : public UpdateModule, const ThingTemplate *m_rebuildTemplate; ///< what we are rebuilding }; - -#endif // end __REBUILD_HOLE_BEHAVIOR_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h index 77e8027e28..eaf5fff785 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __REBUILD_HOLE_EXPOSE_DIE_H_ -#define __REBUILD_HOLE_EXPOSE_DIE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" @@ -72,6 +69,3 @@ class RebuildHoleExposeDie : public DieModule virtual void onDie( const DamageInfo *damageInfo ); }; - - -#endif // end __REBUILD_HOLE_EXPOSE_DIE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h index bbe339b123..ff8c94e972 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __REPAIRDOCKUPDATE_H_ -#define __REPAIRDOCKUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameLogic/Module/SupplyCenterDockUpdate.h" @@ -76,5 +73,3 @@ class RepairDockUpdate : public DockUpdate Real m_healthToAddPerFrame; ///< health to add per frame to current docked object }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h index 15a001976f..0cdcb5234f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _REPLACE_OBJECT_UPGRADE_H -#define _REPLACE_OBJECT_UPGRADE_H - #include "GameLogic/Module/UpgradeModule.h" //----------------------------------------------------------------------------- @@ -64,6 +61,3 @@ class ReplaceObjectUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; -#endif // _COMMAND_SET_UPGRADE_H - - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h index 65f072b7e9..7de0142439 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __RIDER_CHANGE_CONTAIN_H -#define __RIDER_CHANGE_CONTAIN_H - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/TransportContain.h" @@ -116,6 +113,3 @@ class RiderChangeContain : public TransportContain Bool m_containing; //doesn't require xfer. }; - -#endif // __RIDER_CHANGE_CONTAIN_H - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h index 3e0c471688..ee0bd55023 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h @@ -32,9 +32,6 @@ #pragma once -#ifndef SABOTAGE_COMMAND_CENTER_CRATE_COLLIDE_H_ -#define SABOTAGE_COMMAND_CENTER_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -87,5 +84,3 @@ class SabotageCommandCenterCrateCollide : public CrateCollide virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; } }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h index 47692c8fdc..7788a47ccd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h @@ -32,9 +32,6 @@ #pragma once -#ifndef SABOTAGE_FAKE_BUILDING_CRATE_COLLIDE_H_ -#define SABOTAGE_FAKE_BUILDING_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -87,5 +84,3 @@ class SabotageFakeBuildingCrateCollide : public CrateCollide virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; } }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h index 125092128f..319dc68a3f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h @@ -32,9 +32,6 @@ #pragma once -#ifndef SABOTAGE_INTERNET_CENTER_CRATE_COLLIDE_H_ -#define SABOTAGE_INTERNET_CENTER_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -90,5 +87,3 @@ class SabotageInternetCenterCrateCollide : public CrateCollide virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; } }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h index 3f81922d3f..543e001657 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h @@ -32,9 +32,6 @@ #pragma once -#ifndef SABOTAGE_MILITARY_FACTORY_CRATE_COLLIDE_H_ -#define SABOTAGE_MILITARY_FACTORY_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -90,5 +87,3 @@ class SabotageMilitaryFactoryCrateCollide : public CrateCollide virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; } }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h index bab2bfbb91..daff695180 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h @@ -32,9 +32,6 @@ #pragma once -#ifndef SABOTAGE_POWER_PLANT_CRATE_COLLIDE_H_ -#define SABOTAGE_POWER_PLANT_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -90,5 +87,3 @@ class SabotagePowerPlantCrateCollide : public CrateCollide virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; } }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h index 737625b940..ed26201b13 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h @@ -32,9 +32,6 @@ #pragma once -#ifndef SABOTAGE_SUPERWEAPON_CRATE_COLLIDE_H_ -#define SABOTAGE_SUPERWEAPON_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -87,5 +84,3 @@ class SabotageSuperweaponCrateCollide : public CrateCollide virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; } }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h index 97e0024130..c3f75fc1e9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h @@ -32,9 +32,6 @@ #pragma once -#ifndef SABOTAGE_SUPPLY_CENTER_CRATE_COLLIDE_H_ -#define SABOTAGE_SUPPLY_CENTER_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -90,5 +87,3 @@ class SabotageSupplyCenterCrateCollide : public CrateCollide virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; } }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h index fad5f0ae9e..0bf5d1c2d7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h @@ -32,9 +32,6 @@ #pragma once -#ifndef SABOTAGE_SUPPLY_DROPZONE_CRATE_COLLIDE_H_ -#define SABOTAGE_SUPPLY_DROPZONE_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -90,5 +87,3 @@ class SabotageSupplyDropzoneCrateCollide : public CrateCollide virtual Bool isSabotageBuildingCrateCollide() const { return TRUE; } }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h index 2a635010fe..5540c678b5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h @@ -30,9 +30,6 @@ #pragma once -#ifndef SALVAGE_CRATE_COLLIDE_H_ -#define SALVAGE_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "Common/STLTypedefs.h" @@ -113,5 +110,3 @@ class SalvageCrateCollide : public CrateCollide void doMoney( Object *other ); }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h index 0aff385d1d..f77074e406 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h @@ -29,9 +29,6 @@ #pragma once -#ifndef SHROUD_CRATE_COLLIDE_H_ -#define SHROUD_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -56,5 +53,3 @@ class ShroudCrateCollide : public CrateCollide /// This is the game logic execution function that all real CrateCollides will implement virtual Bool executeCrateBehavior( Object *other ); }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h index 9bbc916415..2a77c29aeb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h @@ -29,10 +29,8 @@ // soldiers that are close to a stinger site. It's important to note that any slaved units // can use any or all features, some of which are specialized. /////////////////////////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef _SLAVED_UPDATE_H_ -#define _SLAVED_UPDATE_H_ +#pragma once const Int SLAVED_UPDATE_RATE = LOGICFRAMES_PER_SECOND/4; ///< This is a low priority module that only needs to be called every this many frames @@ -177,5 +175,3 @@ class SlavedUpdate : public UpdateModule, public SlavedUpdateInterface RepairStates m_repairState; Bool m_repairing; }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h index 12f7952dce..7fb3e462f5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SlowDeathBehavior_H_ -#define __SlowDeathBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" @@ -178,6 +175,3 @@ class SlowDeathBehavior : public UpdateModule, Real m_acceleratedTimeScale; ///::const_iterator m_templateNameIterator; }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h index 7b4acddf46..8622540f49 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h @@ -30,9 +30,6 @@ #pragma once -#ifndef _SPAWN_POINT_PRODUCTION_EXIT_UPDATE_H -#define _SPAWN_POINT_PRODUCTION_EXIT_UPDATE_H - #include "GameLogic/Module/UpdateModule.h" #include "Common/INI.h" #include "Lib/BaseType.h" @@ -100,5 +97,3 @@ class SpawnPointProductionExitUpdate : public UpdateModule, public ExitInterface void initializeBonePositions(); ///< Look up the bone positions and store them in world space coords void revalidateOccupiers(); ///< Do a lookup on all our ID's and clear the dead ones. }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h index 2e9cd9749c..cd5abc5cd8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __SPECIAL_ABILITY_H_ -#define __SPECIAL_ABILITY_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" @@ -65,5 +62,3 @@ class SpecialAbility : public SpecialPowerModule protected: }; - -#endif // end __SPECIAL_ABILITY_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h index 52f3ea7094..bee145e9aa 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SPECIAL_ABILITY_UPDATE_H -#define __SPECIAL_ABILITY_UPDATE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" @@ -285,5 +282,3 @@ class SpecialAbilityUpdate : public SpecialPowerUpdateModule Bool m_withinStartAbilityRange; Bool m_doDisableFXParticles; // smaller targets cause this flag to toggle, making the particle effect more sparse }; - -#endif // _SPECIAL_POWER_UPDATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h index 33e1cd334e..fef438647a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _SPECIAL_POWER_COMPLETION_DIE_H_ -#define _SPECIAL_POWER_COMPLETION_DIE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" @@ -89,6 +86,4 @@ class SpecialPowerCompletionDie : public DieModule }; -#endif // _SPECIAL_POWER_COMPLETION_DIE_H_ - // Creator is stored as ID, so a failed lookup just means that he died first and noone cares that we are going. diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h index 90c0a21392..c8d13c20e2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _SPECIAL_POWER_CREATE_H_ -#define _SPECIAL_POWER_CREATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" @@ -57,5 +54,3 @@ class SpecialPowerCreate : public CreateModule protected: }; - -#endif // _SPECIAL_POWER_CREATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h index 531f005e78..8669842463 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SPECIALPOWERMODULE_H_ -#define __SPECIALPOWERMODULE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/Module.h" @@ -179,6 +176,3 @@ class SpecialPowerModule : public BehaviorModule, Real m_pausedPercent; }; - -#endif // end __SPECIALPOWERMODULE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h index 45cfe9a71f..01d4aed564 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SPECIAL_POWER_UPDATE_MODULE_H -#define __SPECIAL_POWER_UPDATE_MODULE_H - #include "Common/Module.h" #include "Common/GameType.h" @@ -81,5 +78,3 @@ class SpecialPowerUpdateModule : public UpdateModule, public SpecialPowerUpdateI virtual Bool isPowerCurrentlyInUse( const CommandButton *command = NULL ) const = 0; }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h index c192cef5ef..ee44fd479d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SPECTRE_GUNSHIP_DEPLOYMENT_UPDATE_H_ -#define __SPECTRE_GUNSHIP_DEPLOYMENT_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/SpecialPowerUpdateModule.h" @@ -147,7 +144,3 @@ class SpectreGunshipDeploymentUpdate : public SpecialPowerUpdateModule }; - - -#endif // __SPECTRE_GUNSHIP_DEPLOYMENT_UPDATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h index 5937cfc08b..c494e4b1a5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SPECTRE_GUNSHIP_UPDATE_H_ -#define __SPECTRE_GUNSHIP_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/SpecialPowerUpdateModule.h" @@ -170,7 +167,3 @@ class SpectreGunshipUpdate : public SpecialPowerUpdateModule AudioEventRTS m_howitzerFireSound; }; - - -#endif // __SPECTRE_GUNSHIP_UPDATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h index 242e427725..0238e90e53 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SPY_VISION_SPECIAL_POWER_H_ -#define __SPY_VISION_SPECIAL_POWER_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" @@ -73,5 +70,3 @@ class SpyVisionSpecialPower : public SpecialPowerModule protected: }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h index 7237d65830..5ac32cbadd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h @@ -31,9 +31,6 @@ #pragma once -#ifndef _SPY_VISION_UPDATE_H -#define _SPY_VISION_UPDATE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/Module/UpgradeModule.h" @@ -146,6 +143,3 @@ class SpyVisionUpdate : public UpdateModule, public UpgradeMux Bool m_currentlyActive; Bool m_resetTimersNextUpdate; }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h index 93ff0a989a..598bd98db1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SquishCollide_H_ -#define __SquishCollide_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" @@ -58,6 +55,3 @@ class SquishCollide : public CollideModule protected: }; - -#endif // __SquishCollide_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h index 584a2eca25..c195a74f2e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __StatusBitsUpgrade_H_ -#define __StatusBitsUpgrade_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -106,7 +103,3 @@ class StatusBitsUpgrade : public UpgradeModule //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __StatusBitsUpgrade_H_ - - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h index c6a08ea9da..c5add81882 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __StatusDamageHelper_H_ -#define __StatusDamageHelper_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" @@ -65,6 +62,3 @@ class StatusDamageHelper : public ObjectHelper UnsignedInt m_frameToHeal; void clearStatusCondition(); }; - - -#endif // end __StatusDamageHelper_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h index cb63b75884..6eab70e630 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __STEALTHDETECTOR_UPDATE_H_ -#define __STEALTHDETECTOR_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -97,7 +94,3 @@ class StealthDetectorUpdate : public UpdateModule Bool m_enabled; }; - - -#endif // __STEALTHDETECTOR_UPDATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h index dff2b95de6..11b4471295 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __STEALTH_UPDATE_H_ -#define __STEALTH_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -180,7 +177,3 @@ class StealthUpdate : public UpdateModule WeaponSetType m_requiresWeaponSetType; }; - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h index 9142c9b2e1..511dfb38a9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __STEALTH_UPGRADE_H_ -#define __STEALTH_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -57,7 +54,3 @@ class StealthUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h index 898d42c610..5d1c16d07f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __STICK_BOMB_UPDATE_H -#define __STICK_BOMB_UPDATE_H - #include "GameLogic/Module/UpdateModule.h" class WeaponTemplate; @@ -98,6 +95,3 @@ class StickyBombUpdate : public UpdateModule UnsignedInt m_dieFrame; UnsignedInt m_nextPingFrame; }; - -#endif // __STICK_BOMB_UPDATE_H - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureBody.h index d5035ddb9f..ebe9235daa 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureBody.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __STRUCTUREBODY_H_ -#define __STRUCTUREBODY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" @@ -79,6 +76,3 @@ class StructureBody : public ActiveBody ObjectID m_constructorObjectID; ///< object that built this structure }; - -#endif // __STRUCTUREBODY_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h index c2a10328c4..ca645c3004 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __StructureCollapseUpdate_H_ -#define __StructureCollapseUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" @@ -149,6 +146,3 @@ class StructureCollapseUpdate : public UpdateModule, Real m_currentHeight; }; - -#endif // __StructureCollapseUpdate_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h index 000a93eec3..916b28ac4e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __StructureToppleUpdate_H_ -#define __StructureToppleUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpdateModule.h" @@ -197,6 +194,3 @@ class StructureToppleUpdate : public UpdateModule, Real m_buildingHeight; }; - -#endif // __StructureToppleUpdate_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h index 6bdaeed1c5..db1460646a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __SUB_OBJECTS_UPGRADE_H -#define __SUB_OBJECTS_UPGRADE_H - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -88,7 +85,3 @@ class SubObjectsUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return true; } }; - -#endif - - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h index e521a3a101..46e45c2499 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SubdualDamageHelper_H_ -#define __SubdualDamageHelper_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" @@ -63,6 +60,3 @@ class SubdualDamageHelper : public ObjectHelper protected: UnsignedInt m_healingStepCountdown; }; - - -#endif // end __SubdualDamageHelper_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h index c04601b2d8..e4c739bce4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _SUPPLY_CENTER_CREATE_H_ -#define _SUPPLY_CENTER_CREATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" @@ -57,5 +54,3 @@ class SupplyCenterCreate : public CreateModule protected: }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h index 4f39179b13..e6d0d2d282 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _SUPPLY_CENTER_DOCK_UPDATE_H_ -#define _SUPPLY_CENTER_DOCK_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" @@ -69,5 +66,3 @@ class SupplyCenterDockUpdate : public DockUpdate }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h index 4c0781103f..f528eca261 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h @@ -30,9 +30,6 @@ #pragma once -#ifndef _SUPPLY_CENTER_PRODUCTION_EXIT_UPDATE_H -#define _SUPPLY_CENTER_PRODUCTION_EXIT_UPDATE_H - #include "GameLogic/Module/UpdateModule.h" class Object; @@ -114,6 +111,3 @@ inline const Coord3D *SupplyCenterProductionExitUpdate::getRallyPoint( void ) co return NULL; } - - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h index fade290ac4..bc1af1eefc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _SUPPLY_TRUCK_AI_UPDATE_H_ -#define _SUPPLY_TRUCK_AI_UPDATE_H_ - #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" @@ -238,5 +235,3 @@ class SupplyTruckAIUpdate : public AIUpdateInterface, public SupplyTruckAIInterf AudioEventRTS m_suppliesDepletedVoice; ///< Sound played when I take the last box. }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h index b2af2b047c..eda60fef62 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _SUPPLY_WAREHOUSE_CREATE_H_ -#define _SUPPLY_WAREHOUSE_CREATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" @@ -56,6 +53,3 @@ class SupplyWarehouseCreate : public CreateModule protected: }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h index 90709aacec..8a5c9bfefc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _SUPPLY_WAREHOUSE_CRIPPLING_BEHAVIOR_H -#define _SUPPLY_WAREHOUSE_CRIPPLING_BEHAVIOR_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DamageModule.h" @@ -90,6 +87,3 @@ class SupplyWarehouseCripplingBehavior : public UpdateModule, UnsignedInt m_healingSupressedUntilFrame; UnsignedInt m_nextHealingFrame; }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h index ae3cf2dc78..b9b81d91cd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _SUPPLY_WAREHOUSE_DOCK_UPDATE_H_ -#define _SUPPLY_WAREHOUSE_DOCK_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" @@ -78,5 +75,3 @@ class SupplyWarehouseDockUpdate : public DockUpdate Int m_boxesStored; }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h index 54ad97d13c..19218186c9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __TECH_BUILDING_BEHAVIOR_H_ -#define __TECH_BUILDING_BEHAVIOR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "GameLogic/Module/UpdateModule.h" @@ -80,5 +77,3 @@ class TechBuildingBehavior : public UpdateModule, protected: }; - -#endif // end __TECH_BUILDING_BEHAVIOR_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h index 7ff9238a28..ca711ff8d5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __TempWeaponBonusHelper_H_ -#define __TempWeaponBonusHelper_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" @@ -67,6 +64,3 @@ class TempWeaponBonusHelper : public ObjectHelper UnsignedInt m_frameToRemove; void clearTempWeaponBonus(); }; - - -#endif // end __TempWeaponBonusHelper_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h index 11793b7917..f67c53565a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __TENSILEFORMATIONUPDATE_H_ -#define __TENSILEFORMATIONUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -90,5 +87,3 @@ class TensileFormationUpdate : public UpdateModule AudioEventRTS m_crackSound; }; - -#endif // end __TENSILEFORMATIONUPDATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h index d6420951af..5064096e48 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __TOPPLEUPDATE_H_ -#define __TOPPLEUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/CollideModule.h" @@ -128,6 +125,3 @@ class ToppleUpdate : public UpdateModule, ObjectID m_stumpID; ///< stump generated, if any }; - -#endif // end __TOPPLEUPDATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h index 9b420ba06a..b50f352b0c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __TRANSITIONDAMAGEFX_H_ -#define __TRANSITIONDAMAGEFX_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/DamageModule.h" @@ -263,5 +260,3 @@ class TransitionDamageFX : public DamageModule ParticleSystemID m_particleSystemID[ BODYDAMAGETYPE_COUNT ][ DAMAGE_MODULE_MAX_FX ]; }; - -#endif // end __TRANSITIONDAMAGEFX diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h index 15d6a08917..6b555e1700 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _TRANSPORT_AI_UPDATE_H_ -#define _TRANSPORT_AI_UPDATE_H_ - #include "GameLogic/Module/AIUpdate.h" //------------------------------------------------------------------------------------------------- @@ -65,6 +62,3 @@ class TransportAIUpdate : public AIUpdateInterface virtual void privateAttackPosition( const Coord3D *pos, Int maxShotsToFire, CommandSourceType cmdSource );///< Extension. Also tell occupants to attackPosition virtual void privateForceAttackObject( Object *victim, Int maxShotsToFire, CommandSourceType cmdSource );///< Extension. Also tell occupants to forceAttackObject }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportContain.h index 2cb73f73ea..24ca96adaf 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportContain.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __TransportContain_H_ -#define __TransportContain_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" @@ -116,6 +113,3 @@ class TransportContain : public OpenContain UnsignedInt m_frameExitNotBusy; }; - -#endif // __TransportContain_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h index 672a0dba0b..f19373a9ab 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __TUNNEL_CONTAIN_H_ -#define __TUNNEL_CONTAIN_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" #include "GameLogic/Module/HealContain.h" @@ -140,5 +137,3 @@ class TunnelContain : public OpenContain, public CreateModuleInterface Bool m_isCurrentlyRegistered; ///< Keeps track if this is registered with the player, so we don't double remove and mess up }; - -#endif // end __TUNNEL_CONTAIN_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UndeadBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UndeadBody.h index 9ceaeb9674..ebdd27facd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UndeadBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UndeadBody.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __UNDEAD_BODY_H -#define __UNDEAD_BODY_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" @@ -72,6 +69,3 @@ class UndeadBody : public ActiveBody void startSecondLife(DamageInfo *damageInfo); }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h index de89bbbcf2..e4595a174a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h @@ -29,9 +29,6 @@ #pragma once -#ifndef UNIT_CRATE_COLLIDE_H_ -#define UNIT_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -84,5 +81,3 @@ class UnitCrateCollide : public CrateCollide protected: }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h index 91fc8f9728..5c6b610ee0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h @@ -31,9 +31,6 @@ #pragma once -#ifndef __UNPAUSE_SPECIAL_POWER_UPGRADE_H_ -#define __UNPAUSE_SPECIAL_POWER_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -75,6 +72,3 @@ class UnpauseSpecialPowerUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h index e262bfb37e..00254e1247 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __UpdateModule_H_ -#define __UpdateModule_H_ - #include "Common/Module.h" #include "Common/GameType.h" #include "Common/DisabledTypes.h" @@ -365,5 +362,3 @@ class ExitInterface virtual Bool getNaturalRallyPoint( Coord3D& rallyPoint, Bool offset = TRUE ) const {rallyPoint.x=rallyPoint.y=rallyPoint.z=0; return false;} ///< get the natural "rally point" for units to move towards virtual Bool getExitPosition( Coord3D& exitPosition ) const {exitPosition.x=exitPosition.y=exitPosition.z=0; return false;}; ///< access to the "Door" position of the production object }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h index e39f26784c..01b9f8fb7c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __UPGRADEDIE_H -#define __UPGRADEDIE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" @@ -78,6 +75,3 @@ class UpgradeDie : public DieModule virtual void onDie( const DamageInfo *damageInfo ); }; - -#endif // __UPGRADEDIE_H - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h index ba6e4da540..2be91e217e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __UPGRADE_MODULE_H_ -#define __UPGRADE_MODULE_H_ - #include "Common/Module.h" #include "Common/STLTypedefs.h" #include "Common/Upgrade.h" @@ -213,6 +210,3 @@ class UpgradeModule : public BehaviorModule, public UpgradeMux }; inline UpgradeModule::UpgradeModule( Thing *thing, const ModuleData* moduleData ) : BehaviorModule( thing, moduleData ) { } inline UpgradeModule::~UpgradeModule() { } - - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h index cb03e3e3ad..a1cc5bdeec 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h @@ -29,9 +29,6 @@ #pragma once -#ifndef VETERANCY_CRATE_COLLIDE_H_ -#define VETERANCY_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" @@ -93,5 +90,3 @@ class VeterancyCrateCollide : public CrateCollide Int getLevelsToGain() const; }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h index d8532a34c8..4ab22c5926 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __VETERANCY_GAIN_CREATE_H_ -#define __VETERANCY_GAIN_CREATE_H_ - #define DEFINE_VETERANCY_NAMES // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameCommon.h" @@ -70,6 +67,3 @@ class VeterancyGainCreate : public CreateModule protected: }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h index 03d2f6aa48..dbfa033d1e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _WANDER_AI_UPDATE_H_ -#define _WANDER_AI_UPDATE_H_ - #include "GameLogic/Module/AIUpdate.h" //------------------------------------------------------------------------------------------------- @@ -63,6 +60,3 @@ class WanderAIUpdate : public AIUpdateInterface virtual AIStateMachine* makeStateMachine(); }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h index 49fd329345..ca6c583bc0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __WATERWAVE_H_ -#define __WATERWAVE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -111,5 +108,3 @@ class WaveGuideUpdate : public UpdateModule Coord3D m_finalDestination; ///< the final destination of the waveguide path }; - -#endif // end __WATERWAVE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h index 9d5a0c844c..fc25099d38 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __WEAPON_BONUS_UPDATE_H_ -#define __WEAPON_BONUS_UPDATE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -108,5 +105,3 @@ class WeaponBonusUpdate : public UpdateModule //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h index 44d03cffdf..c8bc99561e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __WEAPON_BONUS_UPGRADE_H_ -#define __WEAPON_BONUS_UPGRADE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -90,7 +87,3 @@ class WeaponBonusUpgrade : public UpgradeModule //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __WEAPON_BONUS_UPGRADE_H_ - - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h index d73612c996..3604ce239b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __WEAPON_SET_UPGRADE_H_ -#define __WEAPON_SET_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -57,7 +54,3 @@ class WeaponSetUpgrade : public UpgradeModule virtual Bool isSubObjectsUpgrade() { return false; } }; - - -#endif // __DEFAULTDIE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h index dcf994b463..afc308ccf6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __WORKER_AI_UPDATE_H_ -#define __WORKER_AI_UPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" @@ -268,7 +265,3 @@ class WorkerAIUpdate : public AIUpdateInterface, public DozerAIInterface, public AudioEventRTS m_suppliesDepletedVoice; ///< Sound played when I take the last box. }; - - -#endif // __WORKER_AI_UPDATE_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h index 2c551ded48..10f614c047 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h @@ -27,8 +27,6 @@ // Author: Michael S. Booth, October 2000 #pragma once -#ifndef _OBJECT_H_ -#define _OBJECT_H_ #include "Lib/BaseType.h" #include "ref_ptr.h" @@ -831,5 +829,3 @@ AsciiString DebugDescribeObject(const Object *obj); #ifdef DEBUG_OBJECT_ID_EXISTS extern ObjectID TheObjectIDToDebug; #endif - -#endif // _OBJECT_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h index a53b8e056c..d29b0f581b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h @@ -32,9 +32,6 @@ #pragma once -#ifndef _ObjectCreationList_H_ -#define _ObjectCreationList_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" @@ -219,6 +216,3 @@ class ObjectCreationListStore : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern ObjectCreationListStore *TheObjectCreationListStore; - -#endif // _ObjectCreationList_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h index 7a0d067e4a..6ef3f32d58 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _OBJECT_ITER_H_ -#define _OBJECT_ITER_H_ - #include "Common/GameType.h" #include "Common/GameMemory.h" @@ -155,7 +152,3 @@ class SimpleObjectIterator : public ObjectIterator */ Int getCount() { return m_clumpCount; } }; - - -#endif // _OBJECT_ITER_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h index a2c83d1670..975f48096f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h @@ -27,8 +27,6 @@ // JKMCD Aug 2002 #pragma once -#ifndef __OBJECTSCRIPTSTATUSBITS_H__ -#define __OBJECTSCRIPTSTATUSBITS_H__ //------------------------------------------------------------------------------------------------- /** Object status bits */ @@ -42,6 +40,3 @@ enum ObjectScriptStatusBit CPP_11(: Int) OBJECT_STATUS_SCRIPT_TARGETABLE = 0x10, ///< This unit can be targeted by the player, but not autoacquired. // NOTE: Object currently only uses a Byte for this, so if you add status bits, you may need to enlarge that field. }; - -#endif /* __OBJECTSCRIPTSTATUSBITS_H__ */ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h index f02a41c81c..f618852691 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __OBJECT_TYPES_H__ -#define __OBJECT_TYPES_H__ - #include "Common/AsciiString.h" #include "Common/Snapshot.h" @@ -87,5 +84,3 @@ class ObjectTypes : public MemoryPoolObject, Bool canBuildAny(Player *player); }; EMPTY_DTOR(ObjectTypes) - -#endif /* __OBJECT_TYPES_H__ */ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h index 6b5fad9837..978b04950f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __PARTITIONMANAGER_H_ -#define __PARTITIONMANAGER_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -1598,6 +1595,3 @@ class CellOutwardIterator // Externals //----------------------------------------------------------------------------- extern PartitionManager *ThePartitionManager; ///< object manager singleton - -#endif // __PARTITIONMANAGER_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/PolygonTrigger.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/PolygonTrigger.h index 2c8ee084dd..39ef5273f2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/PolygonTrigger.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/PolygonTrigger.h @@ -33,9 +33,6 @@ #pragma once -#ifndef PolygonTrigger_H -#define PolygonTrigger_H - #include "Common/GameMemory.h" #include "Common/Snapshot.h" #include "Common/STLTypedefs.h" @@ -153,5 +150,3 @@ class PolygonTrigger : public MemoryPoolObject, const WaterHandle* getWaterHandle(void) const; Bool isValid(void) const; }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Powers.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Powers.h index 9b0d00b64d..5473296795 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Powers.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Powers.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __POWERS_H_ -#define __POWERS_H_ - // // skeleton definition of unit powers // @@ -58,6 +55,3 @@ static const char *const PowerNames[] = }; static_assert(ARRAY_SIZE(PowerNames) == POWERS_NUM_POWERS + 1, "Incorrect array size"); #endif // end DEFINE_POWER_NAMES - -#endif // __POWERS_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/RankInfo.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/RankInfo.h index 8bdd039b44..3576c0c03e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/RankInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/RankInfo.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __RankInfo_H_ -#define __RankInfo_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Science.h" #include "Common/UnicodeString.h" @@ -76,7 +73,3 @@ class RankInfoStore : public SubsystemInterface }; extern RankInfoStore* TheRankInfoStore; - - -#endif // __RankInfo_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h index b3945e3e87..c849fb5fa8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SCRIPTACTIONS_H_ -#define __SCRIPTACTIONS_H_ - class ScriptAction; class GameWindow; class Team; @@ -391,8 +388,3 @@ class ScriptActions : public ScriptActionsInterface void doEnableObjectSound(const AsciiString& objectName, Bool enable); }; - - -#endif // end __SCRIPTACTIONS_H_ - - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h index e1a20f3288..28d7e5bcf7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SCRIPTCONDITIONS_H_ -#define __SCRIPTCONDITIONS_H_ - class Condition; class ObjectTypes; class Parameter; @@ -188,6 +185,3 @@ class ScriptConditions : public ScriptConditionsInterface }; - - -#endif // end __SCRIPTCONDITIONS_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h index f70c735448..fe237cbcee 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __SCRIPTENGINE_H_ -#define __SCRIPTENGINE_H_ - #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/STLTypedefs.h" @@ -498,6 +495,3 @@ class ScriptEngine : public SubsystemInterface, }; extern ScriptEngine *TheScriptEngine; ///< singleton definition - - -#endif // end __SCRIPTENGINE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h index 6800bbf5f3..3b928470bd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h @@ -29,9 +29,6 @@ #pragma once -#ifndef SCRIPTS_H -#define SCRIPTS_H - #include "Common/Snapshot.h" #include "GameNetwork/NetworkDefs.h" #include "Common/ObjectStatusTypes.h" @@ -1136,6 +1133,3 @@ class ScriptList : public MemoryPoolObject, public Snapshot /// are read, and the caller is responsible for deleting the scripts. static Int getReadScripts(ScriptList *scriptLists[MAX_PLAYER_COUNT]); }; - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/SidesList.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/SidesList.h index af57e58a61..82ed837e4a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/SidesList.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/SidesList.h @@ -29,9 +29,6 @@ #pragma once -#ifndef SIDESLIST_H -#define SIDESLIST_H - #include "Common/Dict.h" #include "Common/Errors.h" #include "Common/GameType.h" @@ -390,7 +387,3 @@ inline Bool BuildListInfo::isBuildable( void ) return false; } - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Squad.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Squad.h index a45ddd96b3..586f695b2b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Squad.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Squad.h @@ -38,8 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_SQAUD_ -#define _H_SQAUD_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" @@ -96,5 +94,3 @@ class Squad : public MemoryPoolObject, public Snapshot void aiGroupFromSquad(AIGroup* aiGroupToFill); }; EMPTY_DTOR(Squad) - -#endif /* _H_SQAUD_ */ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h index 61fab68a5c..e02d9192eb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __TERRAINLOGIC_H_ -#define __TERRAINLOGIC_H_ - #include "Common/GameMemory.h" #include "Common/Snapshot.h" #include "Common/STLTypedefs.h" @@ -380,4 +377,3 @@ extern TerrainLogic *TheTerrainLogic; ///< singleton definition extern void makeAlignToNormalMatrix( Real angle, const Coord3D& pos, const Coord3D& normal, Matrix3D& mtx); extern Bool LineInRegion( const Coord2D *p1, const Coord2D *p2, const Region2D *clipRegion ); -#endif // end __TERRAINLOGIC_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h index 6db1bd451a..30aa1d34cf 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _TURRETAI_H_ -#define _TURRETAI_H_ - #include "Common/StateMachine.h" #include "Common/GameMemory.h" @@ -373,6 +370,3 @@ class TurretAI : public MemoryPoolObject, public Snapshot, public NotifyWeaponFi mutable Bool m_targetWasSetByIdleMood : 1; }; - -#endif // end _TURRETAI_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h index d1a30a17fb..adf651bda6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __VICTORYCONDITIONS_H__ -#define __VICTORYCONDITIONS_H__ - #include "Common/SubsystemInterface.h" #include "Lib/BaseType.h" @@ -79,5 +76,3 @@ class VictoryConditionsInterface : public SubsystemInterface VictoryConditionsInterface * createVictoryConditions( void ); extern VictoryConditionsInterface *TheVictoryConditions; - -#endif // __VICTORYCONDITIONS_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h index 3435cb95e1..f6e45876c2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __WEAPON_H_ -#define __WEAPON_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameCommon.h" @@ -890,6 +887,3 @@ class WeaponStore : public SubsystemInterface // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern WeaponStore *TheWeaponStore; - -#endif // __WEAPON_H_ - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h index 960cce23b2..39d26fb0d1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h @@ -27,9 +27,5 @@ // JKMCD Aug 2002 #pragma once -#ifndef __WEAPONBONUSCONDITIONFLAGS_H__ -#define __WEAPONBONUSCONDITIONFLAGS_H__ typedef UnsignedInt WeaponBonusConditionFlags; - -#endif /* __WEAPONBONUSCONDITIONFLAGS_H__ */ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h index 352fd20544..75ad9b72df 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h @@ -26,9 +26,6 @@ #pragma once -#ifndef _WeaponSet_H_ -#define _WeaponSet_H_ - #include "Lib/BaseType.h" #include "Common/GameType.h" #include "Common/KindOf.h" @@ -268,5 +265,3 @@ class WeaponSet : public Snapshot static ModelConditionFlags getModelConditionForWeaponSlot(WeaponSlotType wslot, WeaponSetConditionType a); }; - -#endif // _WeaponSet_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h index df1c3a75bf..aede477042 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h @@ -27,11 +27,7 @@ // JKMCD Aug 2002 #pragma once -#ifndef __WEAPONSETFLAGS_H__ -#define __WEAPONSETFLAGS_H__ #include "GameLogic/WeaponSetType.h" typedef BitFlags WeaponSetFlags; - -#endif /* __WEAPONSETFLAGS_H__ */ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h index aff5c34954..50b999c0b2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h @@ -27,8 +27,6 @@ // JKMCD Aug 2002 #pragma once -#ifndef __WEAPONSETTYPE_H__ -#define __WEAPONSETTYPE_H__ //------------------------------------------------------------------------------------------------- // IMPORTANT NOTE: you should endeavor to set up states such that the most "normal" @@ -61,5 +59,3 @@ enum WeaponSetType CPP_11(: Int) WEAPONSET_COUNT }; - -#endif /* __WEAPONSETTYPE_H__ */ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h index 8bfe60cca8..be8e86c186 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h @@ -27,8 +27,6 @@ // JKMCD Aug 2002 #pragma once -#ifndef __WEAPONSTATUS_H__ -#define __WEAPONSTATUS_H__ enum WeaponStatus CPP_11(: Int) { @@ -40,5 +38,3 @@ enum WeaponStatus CPP_11(: Int) WEAPON_STATUS_COUNT }; - -#endif /* __WEAPONSTATUS_H__ */ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/Connection.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/Connection.h index 82d3a83250..660a3dcfbb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/Connection.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/Connection.h @@ -35,9 +35,6 @@ #pragma once -#ifndef __CONNECTION_H -#define __CONNECTION_H - #include "GameNetwork/NetCommandList.h" #include "GameNetwork/User.h" #include "GameNetwork/Transport.h" @@ -102,5 +99,3 @@ class Connection : public MemoryPoolObject Int m_numRetries; ///< The number of retries for the last second. time_t m_retryMetricsTime; ///< The start time of the current retry metrics thing. }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/ConnectionManager.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/ConnectionManager.h index da26083c99..98b98fe36e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/ConnectionManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/ConnectionManager.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __CONNECTIONMANAGER_H -#define __CONNECTIONMANAGER_H - #include "GameNetwork/Connection.h" #include "GameNetwork/NetCommandList.h" #include "GameNetwork/Transport.h" @@ -217,5 +214,3 @@ class ConnectionManager FileProgressMap s_fileProgressMap[MAX_SLOTS]; // ----------------------------------------------------------------------------- }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/DisconnectManager.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/DisconnectManager.h index 08c98da11e..cfc1fb952e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/DisconnectManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/DisconnectManager.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __DISCONNECTMANAGER_H -#define __DISCONNECTMANAGER_H - #include "GameNetwork/NetCommandRef.h" #include "Lib/BaseType.h" //#include "GameNetwork/ConnectionManager.h" @@ -127,6 +123,3 @@ class DisconnectManager Int m_pingsRecieved; UnsignedInt m_pingFrame; }; - - -#endif // #ifndef __DISCONNECTMANAGER_H diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/DownloadManager.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/DownloadManager.h index 8f88e247d4..c4a52edf47 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/DownloadManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/DownloadManager.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __DOWNLOADMANAGER_H__ -#define __DOWNLOADMANAGER_H__ - #include "WWDownload/downloaddefs.h" #include "WWDownload/Download.h" @@ -94,5 +91,3 @@ class DownloadManager : public IDownload }; extern DownloadManager *TheDownloadManager; - -#endif // __DOWNLOADMANAGER_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FileTransfer.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FileTransfer.h index edca97bae4..474599405f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FileTransfer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FileTransfer.h @@ -29,8 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once -#ifndef __FILE_TRANSFER_H__ -#define __FILE_TRANSFER_H__ class GameInfo; @@ -48,5 +46,3 @@ AsciiString GetReadmeFromMap( AsciiString path ); // The meat of file (map) transfers Bool DoAnyMapTransfers(GameInfo *game); - -#endif // __FILE_TRANSFER_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h index d249d20ab3..06e005789f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h @@ -48,9 +48,6 @@ #pragma once -#ifndef __FIREWALLHELPER_H -#define __FIREWALLHELPER_H - class UDP; #define NUM_TEST_PORTS 4 @@ -308,7 +305,3 @@ class FirewallHelperClass { extern FirewallHelperClass *TheFirewallHelper; FirewallHelperClass * createFirewallHelper(); - - -#endif // __FIREWALLHELPER_H - diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h index cfbb977659..aa0427967e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __FRAMEDATA_H -#define __FRAMEDATA_H - #include "Lib/BaseType.h" #include "GameNetwork/NetCommandList.h" @@ -65,5 +61,3 @@ class FrameData { UnsignedInt m_lastFailedCC; UnsignedInt m_lastFailedFrameCC; }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameDataManager.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameDataManager.h index 421e493d55..1ad6055da0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameDataManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameDataManager.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __FRAMEDATAMANAGER_H -#define __FRAMEDATAMANAGER_H - #include "GameNetwork/NetworkDefs.h" #include "GameNetwork/FrameData.h" @@ -63,5 +59,3 @@ class FrameDataManager : public MemoryPoolObject Bool m_isQuitting; UnsignedInt m_quitFrame; }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameMetrics.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameMetrics.h index c13ac38d0e..4a77c0f09d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameMetrics.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameMetrics.h @@ -26,9 +26,6 @@ #pragma once -#ifndef __FRAMEMETRICS_H -#define __FRAMEMETRICS_H - #include "Lib/BaseType.h" #include "GameNetwork/NetworkDefs.h" @@ -70,5 +67,3 @@ class FrameMetrics { UnsignedInt m_cushionIndex; ///< The next index to use for the cushion list. Int m_minimumCushion; ///< The average cushion for the history. }; - -#endif // __FRAMEMETRICS_H diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GUIUtil.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GUIUtil.h index 41a5a3829f..2d00645cb1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GUIUtil.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GUIUtil.h @@ -27,9 +27,6 @@ #pragma once -#ifndef __GUIUTIL_H__ -#define __GUIUTIL_H__ - class GameWindow; class GameInfo; @@ -53,5 +50,3 @@ void EnableAcceptControls(Bool Enabled, GameInfo *myGame, GameWindow *comboPlaye GameWindow *comboColor[], GameWindow *comboPlayerTemplate[], GameWindow *comboTeam[], GameWindow *buttonAccept[], GameWindow *buttonStart, GameWindow *buttonMapStartPosition[], Int slotNum = -1); - -#endif // __GUIUTIL_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h index 5fb3320de7..923641a3b1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __GAMEINFO_H__ -#define __GAMEINFO_H__ - #include "Common/Snapshot.h" #include "Common/Money.h" #include "GameNetwork/NetworkDefs.h" @@ -306,5 +303,3 @@ class SkirmishGameInfo : public GameInfo, public Snapshot extern SkirmishGameInfo *TheSkirmishGameInfo; extern SkirmishGameInfo *TheChallengeGameInfo; - -#endif // __GAMEINFO_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameMessageParser.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameMessageParser.h index 75dbfcf29f..e9b5af774e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameMessageParser.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameMessageParser.h @@ -22,7 +22,6 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once #include "Common/MessageStream.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h index 2d032020f8..b6522cba40 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h @@ -28,10 +28,5 @@ #pragma once -#ifndef __BUDDYDEFS_H__ -#define __BUDDYDEFS_H__ - void HandleBuddyResponses(void); void PopulateOldBuddyMessages(void); - -#endif // __BUDDYDEFS_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h index 86ce35ae1e..de175b0e84 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __BUDDYTHREAD_H__ -#define __BUDDYTHREAD_H__ - #include "gamespy/gp/gp.h" #define MAX_BUDDY_CHAT_LEN 128 @@ -172,6 +169,3 @@ class GameSpyBuddyMessageQueueInterface }; extern GameSpyBuddyMessageQueueInterface *TheGameSpyBuddyMessageQueue; - - -#endif // __BUDDYTHREAD_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h index fb03080e9e..81b4207167 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GSCONFIG_H__ -#define __GSCONFIG_H__ - #include "Common/AsciiString.h" #include "Common/STLTypedefs.h" @@ -69,5 +66,3 @@ class GameSpyConfigInterface }; extern GameSpyConfigInterface *TheGameSpyConfig; - -#endif // __GSCONFIG_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h index 76c9167585..d437f58ce5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __GAMERESULTSTHREAD_H__ -#define __GAMERESULTSTHREAD_H__ - #include "Common/SubsystemInterface.h" // this class encapsulates a request for the thread @@ -76,6 +73,3 @@ class GameResultsInterface : public SubsystemInterface }; extern GameResultsInterface *TheGameResultsQueue; - - -#endif // __GAMERESULTSTHREAD_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h index 25d8098c2e..e59aebbd5d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __LADDERDEFS_H__ -#define __LADDERDEFS_H__ - #include "Common/UnicodeString.h" #include "Common/AsciiString.h" #include "Common/STLTypedefs.h" @@ -84,5 +81,3 @@ class LadderList }; extern LadderList *TheLadderList; - -#endif // __LADDERDEFS_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h index 94aacf4c7d..d881d474e4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __LOBBYUTILS_H__ -#define __LOBBYUTILS_H__ - class GameWindow; GameWindow *GetGameListBox( void ); @@ -56,5 +53,3 @@ enum GameSortType CPP_11(: Int) Bool HandleSortButton( NameKeyType sortButton ); void PopulateLobbyPlayerListbox(void); - -#endif // __LOBBYUTILS_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h index a0a8aff3da..44ca5bda7b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __MAINMENUUTILS_H__ -#define __MAINMENUUTILS_H__ - void HTTPThinkWrapper( void ); void StopAsyncDNSCheck( void ); void StartPatchCheck( void ); @@ -44,5 +41,3 @@ void HandleOverallStats( const char* szHTTPStats, unsigned len ); void CheckNumPlayersOnline( void ); void HandleNumPlayersOnline( Int numPlayersOnline ); - -#endif // __MAINMENUUTILS_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h index 68ebfc6ec1..41332be23a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __PEERDEFS_H__ -#define __PEERDEFS_H__ - #include "gamespy/peer/peer.h" #include "gamespy/gp/gp.h" @@ -298,5 +295,3 @@ extern Int GetAdditionalDisconnectsFromUserFile(Int playerID); void SetUpGameSpy( const char *motdBuffer, const char *configBuffer ); void TearDownGameSpy( void ); - -#endif // __PEERDEFS_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h index e26f265f92..470879d939 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __PEERDEFSIMPLEMENTATION_H__ -#define __PEERDEFSIMPLEMENTATION_H__ - #include "GameNetwork/GameSpy/PeerDefs.h" #include "GameNetwork/GameSpy/PersistentStorageThread.h" @@ -178,5 +175,3 @@ class GameSpyInfo : public GameSpyInfoInterface std::set m_preorderPlayers; Int m_additionalDisconnects; }; - -#endif // __PEERDEFS_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h index 11a4188dcc..5178e7d36b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __PEERTHREAD_H__ -#define __PEERTHREAD_H__ - #include "gamespy/peer/peer.h" #include "GameNetwork/NetworkDefs.h" @@ -387,5 +384,3 @@ class GameSpyPeerMessageQueueInterface }; extern GameSpyPeerMessageQueueInterface *TheGameSpyPeerMessageQueue; - -#endif // __PEERTHREAD_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h index e63547b00b..f039a0b2ab 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __PERSISTENTSTORAGEDEFS_H__ -#define __PERSISTENTSTORAGEDEFS_H__ - enum LocaleType CPP_11(: Int) { LOC_UNKNOWN = 0, @@ -43,5 +40,3 @@ void UpdateLocalPlayerStats(void); void SetLookAtPlayer( Int id, AsciiString nick ); void PopulatePlayerInfoWindows( AsciiString parentWindowName ); - -#endif // __PERSISTENTSTORAGEDEFS_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h index 56bbdfe408..d2fa080cd4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __PERSISTENTSTORAGETHREAD_H__ -#define __PERSISTENTSTORAGETHREAD_H__ - #include "gamespy/gstats/gpersist.h" #define MAX_BUDDY_CHAT_LEN 128 @@ -182,6 +179,3 @@ class GameSpyPSMessageQueueInterface }; extern GameSpyPSMessageQueueInterface *TheGameSpyPSMessageQueue; - - -#endif // __PERSISTENTSTORAGETHREAD_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h index 4661de891b..df2f7f35c1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __PINGTHREAD_H__ -#define __PINGTHREAD_H__ - // this class encapsulates a request for the thread class PingRequest { @@ -78,6 +75,3 @@ class PingerInterface }; extern PingerInterface *ThePinger; - - -#endif // __PINGTHREAD_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h index 650cd03505..31ab279b7b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __STAGINGROOMGAMEINFO_H__ -#define __STAGINGROOMGAMEINFO_H__ - #include "GameNetwork/GameInfo.h" #include "GameNetwork/Transport.h" @@ -157,5 +154,3 @@ class GameSpyStagingRoom : public GameInfo }; extern GameSpyStagingRoom *TheGameSpyGame; - -#endif // __STAGINGROOMGAMEINFO_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h index 7dd7c6fa3f..0db2a8df67 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h @@ -28,10 +28,5 @@ #pragma once -#ifndef __GAMESPY_THREADUTILS_H__ -#define __GAMESPY_THREADUTILS_H__ - std::wstring MultiByteToWideCharSingleLine( const char *orig ); std::string WideCharStringToMultiByte( const WideChar *orig ); - -#endif // __GAMESPY_THREADUTILS_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyChat.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyChat.h index b2a6b408ef..cf149df174 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyChat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyChat.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __GAMESPYCHAT_H__ -#define __GAMESPYCHAT_H__ - #include "gamespy/peer/peer.h" class GameWindow; @@ -56,5 +53,3 @@ void RoomMessageCallback(PEER peer, RoomType roomType, void PlayerMessageCallback(PEER peer, const char * nick, const char * message, MessageType messageType, void * param); ///< Called when a private message is received from another player. - -#endif // __GAMESPYCHAT_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGP.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGP.h index d434220e49..6ce6092a55 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGP.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGP.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __GAMESPYGP_H__ -#define __GAMESPYGP_H__ - #include "gamespy/gp/gp.h" void GPRecvBuddyRequestCallback(GPConnection * connection, GPRecvBuddyRequestArg * arg, void * param); @@ -43,5 +40,3 @@ void GameSpyUpdateBuddyOverlay(void); extern GPConnection *TheGPConnection; Bool IsGameSpyBuddy(GPProfile id); - -#endif // __GAMESPYGP_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h index 8a5b553512..36dccb48e1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGameInfo.h @@ -29,10 +29,6 @@ #pragma once #error this file is obsolete - -#ifndef __GAMESPYGAMEINFO_H__ -#define __GAMESPYGAMEINFO_H__ - #include "gamespy/peer/peer.h" #include "GameNetwork/GameInfo.h" @@ -94,5 +90,3 @@ void WOLDisplaySlotList( void ); void GameSpyStartGame( void ); void GameSpyLaunchGame( void ); Bool GetLocalChatConnectionAddress(AsciiString serverName, UnsignedShort serverPort, UnsignedInt& localIP); - -#endif // __LANGAMEINFO_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h index 53526dbf73..b6dd903594 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __GAMESPYOVERLAY_H__ -#define __GAMESPYOVERLAY_H__ - #include "Common/NameKeyGenerator.h" #include "GameClient/WindowLayout.h" #include "GameClient/Gadget.h" @@ -66,4 +63,3 @@ void GameSpyToggleOverlay( GSOverlayType ); void GameSpyUpdateOverlays( void ); void ReOpenPlayerInfo( void ); void CheckReOpenPlayerInfo(void ); -#endif // __GAMESPYOVERLAY_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyThread.h index 11e8040027..82434da418 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyThread.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __GAMESPYTHREAD_H__ -#define __GAMESPYTHREAD_H__ - #include "mutex.h" #include "thread.h" @@ -63,5 +60,3 @@ class GameSpyThreadClass : public ThreadClass extern GameSpyThreadClass *TheGameSpyThread; extern MutexClass TheGameSpyMutex; - -#endif // __GAMESPYTHREAD_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/IPEnumeration.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/IPEnumeration.h index bb3a03d36d..df84a5d652 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/IPEnumeration.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/IPEnumeration.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _IPENUMERATION_H_ -#define _IPENUMERATION_H_ - #include "GameNetwork/Transport.h" /** @@ -78,6 +75,3 @@ class IPEnumeration EnumeratedIP *m_IPlist; Bool m_isWinsockInitialized; }; - - -#endif // _IPENUMERATION_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPI.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPI.h index d2ebaf6c7c..34a132c0ac 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPI.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPI.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _LANAPI_H_ -#define _LANAPI_H_ - #include "GameNetwork/Transport.h" #include "GameNetwork/NetworkInterface.h" #include "GameNetwork/NetworkDefs.h" @@ -413,6 +410,3 @@ struct LANMessage }; }; #pragma pack(pop) - - -#endif // _LANAPI_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h index 8f4a726ce3..394b75dedd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h @@ -27,10 +27,8 @@ // Author: Chris Huybregts, October 2001 // Description: LAN API Callbacks header /////////////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef _LANAPI_CALLBACKS_H_ -#define _LANAPI_CALLBACKS_H_ +#pragma once #include "Common/NameKeyGenerator.h" #include "GameClient/Shell.h" @@ -83,7 +81,3 @@ enum PostToLanGameType CPP_11(: Int){ SEND_GAME_OPTS = 0, POST_TO_LAN_GAME_TYPE_COUNT }; //the utility function mentioned above void PostToLanGameOptions(PostToLanGameType post); - - - -#endif //_LANAPI_CALLBACKS_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANGameInfo.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANGameInfo.h index 55075d36d3..0e4cb66323 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANGameInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANGameInfo.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __LANGAMEINFO_H__ -#define __LANGAMEINFO_H__ - #include "GameNetwork/GameInfo.h" #include "GameNetwork/LANPlayer.h" @@ -180,6 +177,3 @@ void LANDisplayGameOptions( void ); ///< Displays the game options according to AsciiString GenerateGameOptionsString( void ); Bool ParseGameOptionsString(LANGameInfo *game, AsciiString options); - - -#endif // __LANGAMEINFO_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANPlayer.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANPlayer.h index 032a5992ff..5c0f146d8a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANPlayer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANPlayer.h @@ -28,10 +28,6 @@ #pragma once -#ifndef _LANPLAYER_H_ -#define _LANPLAYER_H_ - - /** * LAN player class. This is for players sitting in the lobby. Players are * uniquely identified by their IP addresses. @@ -65,5 +61,3 @@ class LANPlayer LANPlayer *m_next; ///< Linked list pointer UnsignedInt m_IP; ///< Player's IP }; - -#endif //_LANPLAYER_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NAT.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NAT.h index 66b8ee7739..b5eb44c959 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NAT.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NAT.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __NAT_H -#define __NAT_H - #include "Lib/BaseType.h" #include "GameNetwork/NetworkInterface.h" #include "GameNetwork/FirewallHelper.h" @@ -158,5 +155,3 @@ class NAT { }; extern NAT *TheNAT; - -#endif // #ifndef __NAT_H diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandList.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandList.h index ac29cbe1cc..21aa6ff733 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandList.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandList.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __NETCOMMANDLIST_H -#define __NETCOMMANDLIST_H - #include "Common/GameMemory.h" #include "GameNetwork/NetCommandRef.h" @@ -70,5 +66,3 @@ class NetCommandList : public MemoryPoolObject NetCommandRef *m_last; ///< Tail of the list. NetCommandRef *m_lastMessageInserted; ///< The last message that was inserted to this list. }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h index fb988e2e65..6f47b794ca 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __NETCOMMANDMSG_H -#define __NETCOMMANDMSG_H - #include "Lib/BaseType.h" #include "GameNetwork/NetworkDefs.h" #include "Common/UnicodeString.h" @@ -517,4 +514,3 @@ class NetFrameResendRequestCommandMsg : public NetCommandMsg protected: UnsignedInt m_frameToResend; }; -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandRef.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandRef.h index 5338af0220..33e0d46b2d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandRef.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandRef.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __NETCOMMANDREF_H -#define __NETCOMMANDREF_H - #include "GameNetwork/NetCommandMsg.h" #include "Common/GameMemory.h" @@ -148,5 +144,3 @@ inline UnsignedByte NetCommandRef::getRelay() const { return m_relay; } - -#endif // #ifndef __NETCOMMANDREF_H diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h index 1997ff5d07..f4ea0bed06 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h @@ -27,9 +27,6 @@ #pragma once -#ifndef __NETCOMMANDWRAPPERLIST_H -#define __NETCOMMANDWRAPPERLIST_H - #include "GameNetwork/NetCommandList.h" class NetCommandWrapperListNode : public MemoryPoolObject @@ -79,5 +76,3 @@ class NetCommandWrapperList : public MemoryPoolObject NetCommandWrapperListNode *m_list; }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetPacket.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetPacket.h index 465b88cf6e..f117df083a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetPacket.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetPacket.h @@ -32,14 +32,10 @@ for the data, but at least that wouldn't be repeating code, that would be specialized code. */ - - #pragma once -#ifndef __NETPACKET_H -#define __NETPACKET_H - #include "NetworkDefs.h" + #include "GameNetwork/NetCommandList.h" #include "Common/MessageStream.h" #include "Common/GameMemory.h" @@ -236,5 +232,3 @@ class NetPacket : public MemoryPoolObject UnsignedByte m_lastCommandType; UnsignedByte m_lastRelay; }; - -#endif // __NETPACKET_H diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h index 9b0744e487..171f33df3d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __NETWORKDEFS_H -#define __NETWORKDEFS_H - #include "Lib/BaseType.h" #include "Common/MessageStream.h" @@ -212,5 +208,3 @@ class NetworkInterface; extern NetworkInterface *TheNetwork; #define PRINTF_IP_AS_4_INTS(ip) ((ip) >> 24) & 0xff, ((ip) >> 16) & 0xff, ((ip) >> 8 ) & 0xff, (ip) & 0xff - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkInterface.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkInterface.h index 8d454add86..c0bf655eb6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkInterface.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkInterface.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _NETWORK_INTERFACE_H_ -#define _NETWORK_INTERFACE_H_ - #include "Common/MessageStream.h" #include "GameNetwork/ConnectionManager.h" #include "GameNetwork/User.h" @@ -137,5 +134,3 @@ class NetworkInterface : public SubsystemInterface * a 32-bit unsigned integer. */ UnsignedInt ResolveIP(AsciiString host); - -#endif // _NETWORK_INTERFACE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/RankPointValue.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/RankPointValue.h index f24b6d8aa1..a2f616a2f5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/RankPointValue.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/RankPointValue.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __RANK_POINT_VALUE_H_ -#define __RANK_POINT_VALUE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -101,5 +98,3 @@ Int CalculateRank( const PSPlayerStats& stats ); Int GetFavoriteSide( const PSPlayerStats& stats ); const Image* LookupSmallRankImage(Int side, Int rankPoints); extern RankPoints *TheRankPointValues; - -#endif // __RANK_POINT_VALUE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/Transport.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/Transport.h index 27c111da10..747f9d475b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/Transport.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/Transport.h @@ -28,9 +28,6 @@ #pragma once -#ifndef _TRANSPORT_H_ -#define _TRANSPORT_H_ - #include "GameNetwork/udp.h" #include "GameNetwork/NetworkDefs.h" @@ -101,5 +98,3 @@ class Transport //: public MemoryPoolObject Bool isGeneralsPacket( TransportMessage *msg ); }; - -#endif // _TRANSPORT_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/User.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/User.h index fd0ee0cd0b..0f69b8fea9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/User.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/User.h @@ -28,9 +28,6 @@ #pragma once -#ifndef __USER_H -#define __USER_H - #include "GameNetwork/NetworkDefs.h" #include "Common/UnicodeString.h" @@ -58,5 +55,3 @@ class User : public MemoryPoolObject UnsignedInt m_ipaddr; }; EMPTY_DTOR(User) - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h index a3d6a0095f..e87de2eb6c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h @@ -27,8 +27,7 @@ // IDispatch for a COM object with a type library. // -#ifndef _FEBDISPATCH_H__ -#define _FEBDISPATCH_H__ +#pragma once #include extern CComModule _Module; @@ -102,5 +101,3 @@ public C private: ITypeInfo *m_ptinfo; }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h index 075df2e479..0338aad5aa 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h @@ -42,9 +42,6 @@ #pragma once -#ifndef __WEBBROWSER_H__ -#define __WEBBROWSER_H__ - #include "Common/SubsystemInterface.h" #include #include @@ -125,4 +122,3 @@ class WebBrowser : }; extern CComObject *TheWebBrowser; -#endif // __WEBBROWSER_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/networkutil.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/networkutil.h index b202323cf1..944e2ce0a6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/networkutil.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/networkutil.h @@ -22,10 +22,7 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __NETWORKUTIL_H -#define __NETWORKUTIL_H #include "GameNetwork/NetworkDefs.h" #include "GameNetwork/NetworkInterface.h" @@ -55,5 +52,3 @@ inline UnsignedInt AssembleIp(UnsignedByte a, UnsignedByte b, UnsignedByte c, Un ((UnsignedInt)(c) << 8) | ((UnsignedInt)(d)); } - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/udp.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/udp.h index 7b54512d79..fa97d0e130 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/udp.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/udp.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef UDP_HEADER -#define UDP_HEADER - #ifdef _UNIX #include #endif @@ -127,5 +123,3 @@ class UDP #ifdef DEBUG_LOGGING AsciiString GetWSAErrorString( Int error ); #endif - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h b/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h index ab7e03502c..2d9fd88a3a 100644 --- a/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h +++ b/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h @@ -26,8 +26,7 @@ // Be careful what you stick in here, because putting files that change often in here will // tend to cheese people's goats. -#ifndef __PRERTS_H__ -#define __PRERTS_H__ +#pragma once //----------------------------------------------------------------------------- // srj sez: this must come first, first, first. @@ -127,5 +126,3 @@ class STLSpecialAlloc; #include "Common/Thing.h" #include "Common/UnicodeString.h" - -#endif /* __PRERTS_H__ */ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h index 84923f3120..6ad2a55fbb 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h @@ -41,9 +41,6 @@ #pragma once -#ifndef __W3DCONVERT_H_ -#define __W3DCONVERT_H_ - //============================================================================= // Includes //============================================================================= @@ -62,7 +59,3 @@ extern void PixelScreenToW3DLogicalScreen( Int screenX, Int screenY, //============================================================================= // Type Defines //============================================================================= - - -#endif // _W3DCONVERT_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h index 675bcf0e41..71e3dd5c47 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3DFUNCTIONLEXICON_H_ -#define __W3DFUNCTIONLEXICON_H_ - #include "Common/FunctionLexicon.h" //------------------------------------------------------------------------------------------------- @@ -52,6 +49,3 @@ class W3DFunctionLexicon : public FunctionLexicon protected: }; - -#endif // __W3DFUNCTIONLEXICON_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h index 1714f7c30a..141457eafe 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h @@ -32,9 +32,6 @@ #pragma once -#ifndef __W3DMODULEFACTORY_H_ -#define __W3DMODULEFACTORY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ModuleFactory.h" @@ -49,5 +46,3 @@ class W3DModuleFactory : public ModuleFactory virtual void init( void ); }; - -#endif // __W3DMODULEFACTORY_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h index c52b5b7400..193d755f68 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h @@ -31,9 +31,6 @@ #pragma once -#ifndef __W3DRADAR_H_ -#define __W3DRADAR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Radar.h" #include "WW3D2/ww3dformat.h" @@ -127,6 +124,3 @@ class W3DRadar : public Radar std::vector m_cachedHeroObjectList; //< cache of hero objects for drawing icons in radar overlay }; - - -#endif // __W3DRADAR_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h index 86493bc654..b248a03fa9 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h @@ -31,9 +31,6 @@ #pragma once -#ifndef __W3DTHINGFACTORY_H_ -#define __W3DTHINGFACTORY_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/ThingFactory.h" @@ -47,6 +44,3 @@ class W3DThingFactory : public ThingFactory W3DThingFactory( void ); virtual ~W3DThingFactory( void ); }; - -#endif // __W3DTHINGFACTORY_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h index 60165711af..ade37299a4 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __BASE_HEIGHTMAP_H_ -#define __BASE_HEIGHTMAP_H_ - #include "always.h" #include "rendobj.h" #include "w3d_file.h" @@ -333,4 +329,3 @@ class BaseHeightMapRenderObjClass : public RenderObjClass, public DX8_CleanupHoo }; extern BaseHeightMapRenderObjClass *TheTerrainRenderObject; -#endif // end __FLAT_HEIGHTMAP_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h index 652a05221a..cebe16170a 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __FLAT_HEIGHTMAP_H_ -#define __FLAT_HEIGHTMAP_H_ - #include "always.h" #include "rendobj.h" #include "w3d_file.h" @@ -94,5 +90,3 @@ class FlatHeightMapRenderObjClass : public BaseHeightMapRenderObjClass void releaseTiles(void); }; - -#endif // end __FLAT_HEIGHTMAP_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h index f3af1530af..7491d7333b 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h @@ -22,13 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once - -#ifndef __HEIGHTMAP_H_ -#define __HEIGHTMAP_H_ - #include "always.h" #include "rendobj.h" #include "w3d_file.h" @@ -122,5 +117,3 @@ class HeightMapRenderObjClass : public BaseHeightMapRenderObjClass void freeIndexVertexBuffers(void); void renderExtraBlendTiles(void); ///< render 3-way blend tiles that have blend of 3 textures. }; - -#endif // end __HEIGHTMAP_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h index 2bdb54d173..4c79a24677 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3D_DEBRIS_DRAW_H_ -#define __W3D_DEBRIS_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/DrawModule.h" @@ -98,6 +95,3 @@ class W3DDebrisDraw : public DrawModule, public DebrisDrawInterface Shadow* m_shadow; ///< Updates/Renders shadows of this object }; - -#endif // __W3D_DEBRIS_DRAW_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h index fc6c4d8d3f..647d7379bf 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3DDEFAULTDRAW_H_ -#define __W3DDEFAULTDRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/DrawModule.h" @@ -75,6 +72,3 @@ class W3DDefaultDraw : public DrawModule Shadow* m_shadow; ///< Updates/Renders shadows of this object #endif }; - -#endif // __W3DDEFAULTDRAW_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h index f6e7f53dd7..c6048a8ca7 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h @@ -34,9 +34,6 @@ #pragma once -#ifndef _W3D_DEPENDENCY_MODEL_DRAW_H_ -#define _W3D_DEPENDENCY_MODEL_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" @@ -69,6 +66,3 @@ class W3DDependencyModelDraw : public W3DModelDraw protected: Bool m_dependencyCleared; // The thing we depend on will clear this, and we will relatch it after we draw. }; - -#endif // _W3D_DEPENDENCY_MODEL_DRAW_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h index 8ae80d0681..45d468e3cc 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3DLASERDRAW_H_ -#define __W3DLASERDRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" //#include "WW3D2/Line3D.h" @@ -99,6 +96,3 @@ class W3DLaserDraw : public DrawModule, public LaserDrawInterface Bool m_selfDirty; // not saved }; - -#endif // __W3DLASERDRAW_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h index 7dedf11d76..32bdbc4a53 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3DModelDraw_H_ -#define __W3DModelDraw_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ModelState.h" #include "Common/DrawModule.h" @@ -526,6 +523,3 @@ class W3DModelDraw : public DrawModule, public ObjectDrawInterface void hideGarrisonFlags(Bool hide); #endif }; - -#endif // __W3DModelDraw_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h index 662955c00f..b66926f960 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h @@ -36,9 +36,6 @@ #pragma once -#ifndef _W3D_OVERLORD_AIRCRAFT_DRAW_H_ -#define _W3D_OVERLORD_AIRCRAFT_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" @@ -70,6 +67,3 @@ class W3DOverlordAircraftDraw : public W3DModelDraw protected: }; - -#endif - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h index 296319a80c..72a3980959 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h @@ -30,9 +30,6 @@ #pragma once -#ifndef _W3D_OVERLORD_TANK_DRAW_H_ -#define _W3D_OVERLORD_TANK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DTankDraw.h" @@ -70,6 +67,3 @@ class W3DOverlordTankDraw : public W3DTankDraw protected: }; - -#endif - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h index af27426027..b20059f833 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h @@ -30,9 +30,6 @@ #pragma once -#ifndef _W3D_OVERLORD_TRUCK_DRAW_H_ -#define _W3D_OVERLORD_TRUCK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DTruckDraw.h" @@ -70,6 +67,3 @@ class W3DOverlordTruckDraw : public W3DTruckDraw protected: }; - -#endif - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h index f0a9606850..db3c632815 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3DPOLICECARDRAW_H_ -#define __W3DPOLICECARDRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "W3DDevice/GameClient/Module/W3DTruckDraw.h" @@ -63,6 +60,3 @@ class W3DPoliceCarDraw : public W3DTruckDraw Real m_curFrame; }; - -#endif // __W3DPOLICECARDRAW_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h index 3824851091..6d559dd578 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _W3D_PROJECTILE_STREAM_DRAW_H_ -#define _W3D_PROJECTILE_STREAM_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "GameLogic/Module/ProjectileStreamUpdate.h" // I am the draw module for this update. Very tight. @@ -83,6 +80,3 @@ class W3DProjectileStreamDraw : public DrawModule SegmentedLineClass *m_allLines[MAX_PROJECTILE_STREAM]; ///< Persist, so I can ensure they live a full cycle, and minimize re-creates by holding on Int m_linesValid; }; - -#endif - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h index d07b6c40b6..7222c39287 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3DPropDraw_H_ -#define __W3DPropDraw_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" @@ -75,6 +72,3 @@ class W3DPropDraw : public DrawModule Bool m_propAdded; }; - -#endif // __W3DPropDraw_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h index 8405d5b386..2756e82c28 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3DRopeDraw_H_ -#define __W3DRopeDraw_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" @@ -93,6 +90,3 @@ class W3DRopeDraw : public DrawModule, public RopeDrawInterface void buildSegments(); }; - -#endif // __W3DRopeDraw_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h index 8513d11bcd..fac32b29a6 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _W3D_SCIENCE_MODEL_DRAW_H_ -#define _W3D_SCIENCE_MODEL_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" @@ -63,6 +60,3 @@ class W3DScienceModelDraw : public W3DModelDraw protected: }; - -#endif - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h index 5b90d92bfe..46b41a8617 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _W3D_SUPPLY_DRAW_H_ -#define _W3D_SUPPLY_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" @@ -65,6 +62,3 @@ class W3DSupplyDraw : public W3DModelDraw Int m_totalBones; Int m_lastNumberShown; }; - -#endif // _W3D_TRUCK_DRAW_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h index 0f8558dbe6..2c659194a9 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _W3D_TANK_DRAW_H_ -#define _W3D_TANK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "GameClient/ParticleSys.h" @@ -105,6 +102,3 @@ class W3DTankDraw : public W3DModelDraw void updateTreadObjects(void); ///< update pointers to sub-objects like treads. void updateTreadPositions(Real uvDelta); ///< update uv coordinates on each tread }; - -#endif // _W3D_TANK_DRAW_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h index f37b8a6841..5bfc523f4a 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _W3D_TANKTRUCK_DRAW_H_ -#define _W3D_TANKTRUCK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "Common/AudioEventRTS.h" @@ -152,6 +149,3 @@ class W3DTankTruckDraw : public W3DModelDraw void updateTreadObjects(void); ///< update pointers to sub-objects like treads. void updateTreadPositions(Real uvDelta); ///< update uv coordinates on each tread }; - -#endif // _W3D_TANKTRUCK_DRAW_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h index f8c422ff04..cfbb2f81ba 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3DTRACERDRAW_H_ -#define __W3DTRACERDRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" @@ -73,6 +70,3 @@ class W3DTracerDraw : public DrawModule, public TracerDrawInterface Real m_opacity; ///< opacity of the tracer }; - -#endif // __W3DTRACERDRAW_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h index 6e9190d82f..9f0a0b3b7a 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __W3DTreeDraw_H_ -#define __W3DTreeDraw_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" @@ -97,6 +94,3 @@ class W3DTreeDraw : public DrawModule void addToTreeBuffer(); }; - -#endif // __W3DTreeDraw_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h index 8292f4c1e3..72e8d49bee 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _W3D_TRUCK_DRAW_H_ -#define _W3D_TRUCK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "Common/AudioEventRTS.h" @@ -141,6 +138,3 @@ class W3DTruckDraw : public W3DModelDraw void enableEmitters( Bool enable ); ///< stop creating debris from the tank treads void updateBones( void ); }; - -#endif // _W3D_TRUCK_DRAW_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h index 64e3f636e9..36af8873d0 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h @@ -28,9 +28,6 @@ #pragma once -#ifndef TERRAINTEX_H -#define TERRAINTEX_H - //#define DO_8STAGE_TERRAIN_PASS //optimized terrain rendering for Nvidia based cards #include "WW3D2/texture.h" @@ -144,7 +141,3 @@ class CloudMapTerrainTextureClass : public TextureClass void restore(void); }; - - - -#endif //TEXTURE_H diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h index ceac676467..b48b704b13 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h @@ -28,9 +28,6 @@ #pragma once -#ifndef TileData_H -#define TileData_H - #include #include "Lib/BaseType.h" @@ -104,5 +101,3 @@ class TileData : public RefCountClass Bool hasRGBDataForWidth(Int width); UnsignedByte *getRGBDataForWidth(Int width); }; - -#endif diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h index 7d9ef6a3ba..e987096c35 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h @@ -44,9 +44,6 @@ #pragma once -#ifndef W3DASSETMANAGER_H -#define W3DASSETMANAGER_H - #include "assetmgr.h" #include "Lib/BaseType.h" @@ -118,6 +115,3 @@ class W3DAssetManager: public WW3DAssetManager void Recolor_ParticleEmitter(RenderObjClass *robj, const Vector3 &hsv_shift); void Recolor_Asset(RenderObjClass *robj, const Vector3 &hsv_shift);*/ }; - -#endif - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h index 9ab559c17d..d135069d0e 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h @@ -38,8 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_W3DASSETMANAGEREXPOSED_ -#define _H_W3DASSETMANAGEREXPOSED_ // INCLUDES /////////////////////////////////////////////////////////////////// // DEFINES //////////////////////////////////////////////////////////////////// @@ -52,5 +50,3 @@ // so this function is here. It should only be called by the particle editor, // @todo Remove this function when we are no longer editing particles. void ReloadAllTextures(void); - -#endif /* _H_W3DASSETMANAGEREXPOSED_ */ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h index 1541d80dfd..0d900feee8 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h @@ -44,9 +44,6 @@ #pragma once -#ifndef __W3DBIB_BUFFER_H_ -#define __W3DBIB_BUFFER_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -131,5 +128,3 @@ friend class BaseHeightMapRenderObjClass; void allocateBibBuffers(void); ///< Allocates the buffers. void freeBibBuffers(void); ///< Frees the index and vertex buffers. }; - -#endif // end __W3DBIB_BUFFER_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h index 4c5f11ea44..12531a7d12 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h @@ -44,9 +44,6 @@ #pragma once -#ifndef __W3DBRIDGE_BUFFER_H_ -#define __W3DBRIDGE_BUFFER_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -187,5 +184,3 @@ friend class BaseHeightMapRenderObjClass; void cull(CameraClass * camera); ///< Culls the bridges. void freeBridgeBuffers(void); ///< Frees the index and vertex buffers. }; - -#endif // end __W3DBRIDGE_BUFFER_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h index 26f07e2b5f..dbe3f4c491 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _W3D_VERTEX_BUFFER_MANAGER -#define _W3D_VERTEX_BUFFER_MANAGER - #include "Lib/BaseType.h" #include "dx8vertexbuffer.h" #include "dx8indexbuffer.h" @@ -185,5 +182,3 @@ class W3DBufferManager }; extern W3DBufferManager *TheW3DBufferManager; //singleton - -#endif //_W3D_VERTEX_BUFFER_MANAGER diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h index db2fe00d98..0a1037a1c1 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h @@ -44,9 +44,6 @@ #pragma once -#ifndef __W3DCUSTOM_EDGING_H_ -#define __W3DCUSTOM_EDGING_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -107,5 +104,3 @@ friend class HeightMapRenderObjClass; void freeEdgingBuffers(void); ///< Frees the index and vertex buffers. void loadEdgingsInVertexAndIndexBuffers(WorldHeightMap *pMap, Int minX, Int maxX, Int minY, Int maxY); }; - -#endif // end __W3DCUSTOM_EDGING_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h index 3abd261af7..c92e08077a 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h @@ -24,13 +24,8 @@ #pragma once -#ifndef __W3DCUSTOMSCENE_H_ -#define __W3DCUSTOMSCENE_H_ - enum CustomScenePassModes CPP_11(: Int) { SCENE_PASS_DEFAULT, SCENE_PASS_ALPHA_MASK }; - -#endif //W3DCUSTOMSCENE diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h index 5362070586..2cc8e542a8 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugDisplay.h @@ -43,10 +43,6 @@ #pragma once -#ifndef __W3DDEVICE_GAMECLIENT_W3DDEBUGDISPLAY_H -#define __W3DDEVICE_GAMECLIENT_W3DDEBUGDISPLAY_H - - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -98,7 +94,3 @@ class W3DDebugDisplay : public DebugDisplay //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - - -#endif // __W3DDEVICE_GAMECLIENT_W3DDEBUGDISPLAY_H diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h index f872e76ec1..0bce9582b3 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __W3D_DEBUG_ICONS_H_ -#define __W3D_DEBUG_ICONS_H_ - #include "always.h" #include "rendobj.h" #include "vertmaterial.h" @@ -77,5 +73,3 @@ class W3DDebugIcons : public RenderObjClass static void addIcon(const Coord3D *pos, Real width, Int numFramesDuration, RGBColor color); }; #endif // RTS_DEBUG - -#endif // end __W3D_DEBUG_ICONS_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h index 2f55383e41..7f5ad9f174 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h @@ -33,9 +33,6 @@ #pragma once -#ifndef __W3DDISPLAY_H_ -#define __W3DDISPLAY_H_ - #include "GameClient/Display.h" #include "WW3D2/lightenvironment.h" @@ -203,5 +200,3 @@ class W3DDisplay : public Display W3DDebugDisplay *m_nativeDebugDisplay; ///< W3D specific debug display interface }; - -#endif // end __W3DDISPLAY_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h index ec9b6b4483..69b4c8acf8 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h @@ -47,9 +47,6 @@ #pragma once -#ifndef __W3DDISPLAYSTRING_H_ -#define __W3DDISPLAYSTRING_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -119,6 +116,3 @@ class W3DDisplayString : public DisplayString inline void W3DDisplayString::usingResources( UnsignedInt frame ) { m_lastResourceFrame = frame; } // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __W3DDISPLAYSTRING_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h index 348100df88..2c1e775d65 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h @@ -29,9 +29,6 @@ #pragma once -#ifndef _W3DDISPLAYSTRINGMANAGER_H_ -#define _W3DDISPLAYSTRINGMANAGER_H_ - #include "GameClient/DisplayStringManager.h" #include "W3DDevice/GameClient/W3DDisplayString.h" @@ -76,6 +73,3 @@ class W3DDisplayStringManager : public DisplayStringManager DisplayString *m_formationLetterDisplayString; }; - -#endif // _W3DDISPLAYSTRINGMANAGER_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h index 52a296451f..4039f98281 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h @@ -28,9 +28,6 @@ #pragma once -#ifndef W3D_DYNAMIC_LIGHT_H -#define W3D_DYNAMIC_LIGHT_H - #include "WW3D2/light.h" #include "Lib/BaseType.h" class HeightMapRenderObjClass; @@ -82,7 +79,3 @@ friend class HeightMapRenderObjClass; // Cull returns true if the terrain vertex at x,y is outside of the light's influence. Bool cull(Int x, Int y ) {return (xm_maxX||y>m_maxY);} }; - - - -#endif //TEXTURE_H diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h index f6a696e208..118b2307f6 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h @@ -31,12 +31,8 @@ // /////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __W3DFILESYSTEM_H_ -#define __W3DFILESYSTEM_H_ - #include "WWLib/ffactory.h" #include "Common/ArchiveFileSystem.h" #include "Common/file.h" @@ -100,4 +96,3 @@ class W3DFileSystem : public FileFactoryClass { }; extern W3DFileSystem *TheW3DFileSystem; -#endif diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h index 79f4e6c741..7a31839f3d 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h @@ -30,9 +30,6 @@ #pragma once -#ifndef __W3DGUICALLBACKS_H_ -#define __W3DGUICALLBACKS_H_ - class GameWindow; class WindowLayout; class WinInstanceData; @@ -67,6 +64,3 @@ extern void W3DNoDraw( GameWindow *window, WinInstanceData *instData ); extern void W3DDrawMapPreview( GameWindow *window, WinInstanceData *instData ); void W3DMainMenuInit( WindowLayout *layout, void *userData ); - -#endif // __W3DGUICALLBACKS_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h index bee27f1d70..f64935057f 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __W3DGADGET_H_ -#define __W3DGADGET_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -89,6 +86,3 @@ extern void W3DGadgetStaticTextDraw( GameWindow *window, WinInstanceData *instDa extern void W3DGadgetStaticTextImageDraw( GameWindow *window, WinInstanceData *instData ); extern void W3DGadgetTextEntryDraw( GameWindow *window, WinInstanceData *instData ); extern void W3DGadgetTextEntryImageDraw( GameWindow *window, WinInstanceData *instData ); - -#endif // __W3DGADGET_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h index 545ca43850..8e9060e82b 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h @@ -34,9 +34,6 @@ #pragma once -#ifndef __W3DGAMEINTERFACE_H_ -#define __W3DGAMEINTERFACE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -137,5 +134,3 @@ inline Mouse *W3DGameClient::createMouse( void ) TheWin32Mouse = mouse; ///< global cheat for the WndProc() return mouse; } - -#endif // end __W3DGAMEINTERFACE_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h index 7029b10e87..275d243bfd 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __W3DGAMEFONT_H_ -#define __W3DGAMEFONT_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -80,6 +77,3 @@ class W3DFontLibrary : public FontLibrary // INLINING /////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __W3DGAMEFONT_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h index fa36f98cec..8895e0ecc8 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __W3DGAMEWINDOW_H_ -#define __W3DGAMEWINDOW_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -100,6 +97,3 @@ class W3DGameWindow : public GameWindow // EXTERNALS ////////////////////////////////////////////////////////////////// extern void W3DGameWinDefaultDraw( GameWindow *window, WinInstanceData *instData ); - -#endif // __W3DGAMEWINDOW_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h index 76c29d778a..02e98a219f 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h @@ -31,9 +31,6 @@ #pragma once -#ifndef __W3DGAMEWINDOWMANAGER_H_ -#define __W3DGAMEWINDOWMANAGER_H_ - #include "GameClient/GameWindowManager.h" #include "W3DDevice/GameClient/W3DGameWindow.h" #include "W3DDevice/GameClient/W3DGadget.h" @@ -107,6 +104,3 @@ inline GameWinDrawFunc W3DGameWindowManager::getStaticTextImageDrawFunc( void ) inline GameWinDrawFunc W3DGameWindowManager::getStaticTextDrawFunc( void ) { return W3DGadgetStaticTextDraw; } inline GameWinDrawFunc W3DGameWindowManager::getTextEntryImageDrawFunc( void ) { return W3DGadgetTextEntryImageDraw; } inline GameWinDrawFunc W3DGameWindowManager::getTextEntryDrawFunc( void ) { return W3DGadgetTextEntryDraw; } - -#endif // __W3DGAMEWINDOWMANAGER_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h index b1980a7763..d717b02845 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h @@ -33,9 +33,6 @@ #pragma once -#ifndef __W3DINGAMEUI_H_ -#define __W3DINGAMEUI_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -85,5 +82,3 @@ class W3DInGameUI : public InGameUI RenderObjClass *m_buildingPlacementArrow; }; - -#endif // end __W3DINGAMEUI_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h index a9c793b260..1b3e8b0b01 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h @@ -22,12 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once -#ifndef __W3DMirror_H_ -#define __W3DMirror_H_ - #include "always.h" #include "rendobj.h" #include "w3d_file.h" @@ -115,5 +111,3 @@ class MirrorRenderObjClass : public RenderObjClass void renderWater(void); void renderWaterMesh(void); }; - -#endif // end __W3DMirror_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h index dd0dfcb264..e5e3a4c7f1 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __W3DMOUSE_H_ -#define __W3DMOUSE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -110,5 +107,3 @@ class W3DMouse : public Win32Mouse // INLINING /////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __W3DMOUSE_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h index ed130d32e9..ac77c87cc4 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h @@ -27,9 +27,6 @@ #pragma once -#ifndef __W3DParticleSys_H_ -#define __W3DParticleSys_H_ - #include "GameClient/ParticleSys.h" #include "WW3D2/pointgr.h" #include "WW3D2/streak.h" @@ -63,5 +60,3 @@ class W3DParticleSystemManager : public ParticleSystemManager ShareBufferClass *m_angleBuffer; ///< array of particle orientations Bool m_readyToRender; ///< if true, it is OK to render }; - -#endif // end __W3DParticleSys_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h index 63e8936dd7..06ed0a7b94 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __W3DPOLY_H_ -#define __W3DPOLY_H_ - #include "vector3.h" #include "plane.h" #include "simplevec.h" @@ -66,5 +63,3 @@ class ClipPolyClass SimpleDynVecClass Verts; }; - -#endif //__W3DPOLY_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h index 14f93b963a..e7b60c82a8 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h @@ -30,10 +30,8 @@ // // /////////////////////////////////////////////////////////////////////////////// -#pragma once -#ifndef __W3D_PROJECTED_SHADOW_H_ -#define __W3D_PROJECTED_SHADOW_H_ +#pragma once #include "GameClient/Shadow.h" @@ -136,5 +134,3 @@ class W3DProjectedShadow : public Shadow Int m_flags; /// custom rendering flags virtual void release(void) {TheW3DProjectedShadowManager->removeShadow(this);} ///; } inline AudioManager *Win32GameEngine::createAudioManager( void ) { return NEW MilesAudioManager; } - -#endif // end __WIN32GAMEENGINE_H_ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h index b786d0e91f..57894924d3 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __WIN32DIKEYBOARD_H_ -#define __WIN32DIKEYBOARD_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #ifndef DIRECTINPUT_VERSION # define DIRECTINPUT_VERSION 0x800 @@ -101,6 +98,3 @@ class DirectInputKeyboard : public Keyboard // INLINING /////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __WIN32DIKEYBOARD_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h index 8ca704babb..25d769ed58 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h @@ -39,9 +39,6 @@ #pragma once -#ifndef __WIN32DIMOUSE_H_ -#define __WIN32DIMOUSE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #ifndef DIRECTINPUT_VERSION # define DIRECTINPUT_VERSION 0x800 @@ -100,6 +97,3 @@ class DirectInputMouse : public Mouse // INLINING /////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __WIN32DIMOUSE_H_ - diff --git a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h index 1e606d4a94..acd55b8d34 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __WIN32MOUSE_H_ -#define __WIN32MOUSE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -115,6 +112,3 @@ class Win32Mouse : public Mouse // INLINING /////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __WIN32MOUSE_H_ - diff --git a/GeneralsMD/Code/Libraries/Include/Lib/BaseType.h b/GeneralsMD/Code/Libraries/Include/Lib/BaseType.h index 7d6ac66d7e..0a2c026728 100644 --- a/GeneralsMD/Code/Libraries/Include/Lib/BaseType.h +++ b/GeneralsMD/Code/Libraries/Include/Lib/BaseType.h @@ -26,11 +26,8 @@ /////////////////////////////////////////////////////////////////////////////// // tell the compiler to only load this file once -#pragma once - -#ifndef _BASE_TYPE_H_ -#define _BASE_TYPE_H_ +#pragma once #include "Lib/BaseTypeCore.h" #include "Lib/trig.h" @@ -405,5 +402,3 @@ struct RGBAColorInt UnsignedInt red, green, blue, alpha; // range between 0 and 255 }; - -#endif // _BASE_TYPE_H_ diff --git a/GeneralsMD/Code/Libraries/Include/Lib/trig.h b/GeneralsMD/Code/Libraries/Include/Lib/trig.h index cbd568906b..d6f3fa22cd 100644 --- a/GeneralsMD/Code/Libraries/Include/Lib/trig.h +++ b/GeneralsMD/Code/Libraries/Include/Lib/trig.h @@ -21,13 +21,10 @@ // Author: Sondra Iverson, March 1998 // Converted to Generals by Matthew D. Campbell, February 2002 -#ifndef _TRIG_H_ -#define _TRIG_H_ +#pragma once Real Sin(Real); Real Cos(Real); Real Tan(Real); Real ACos(Real); Real ASin(Real x); - -#endif // _TRIG_H_ diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h index a97d6a9f66..b3b2584263 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h @@ -36,12 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef AABTREEBUILDER_H -#define AABTREEBUILDER_H - #include "always.h" #include "vector3.h" #include "Vector3i.h" @@ -201,9 +197,3 @@ class AABTreeBuilderClass friend class AABTreeClass; }; - - - - -#endif //AABTREEBUILDER_H - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h index f04f76c233..1fd4717ce4 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h @@ -40,9 +40,6 @@ #pragma once -#ifndef ANIMOBJ_H -#define ANIMOBJ_H - #include "always.h" #include "composite.h" #include "htree.h" @@ -321,7 +318,3 @@ inline void Animatable3DObjClass::Combo_Update( const Matrix3D & root, HAnimComb } Set_Hierarchy_Valid(true); } - - - -#endif //ANIMOBJ_H diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h index 9b75aae032..0f5d19a85a 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef ASSETMGR_H -#define ASSETMGR_H - #include "always.h" #include "Vector.H" #include "htreemgr.h" @@ -434,5 +430,3 @@ class WW3DAssetManager // Font3DInstance need access to the Font3DData friend class Font3DInstanceClass; }; - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h index d8f9d66189..abf993dd32 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h @@ -36,9 +36,6 @@ #pragma once -#ifndef BMP2D_H -#define BMP2D_H - #include "dynamesh.h" class Bitmap2DObjClass : public DynamicScreenMeshClass @@ -53,5 +50,3 @@ class Bitmap2DObjClass : public DynamicScreenMeshClass virtual RenderObjClass * Clone(void) const; virtual int Class_ID(void) const { return CLASSID_BITMAP2D; } }; - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h index c2474e66f5..5a93e0e1c1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h @@ -36,9 +36,6 @@ #pragma once -#ifndef BOXROBJ_H -#define BOXROBJ_H - #include "always.h" #include "rendobj.h" #include "w3d_file.h" @@ -257,9 +254,3 @@ class BoxPrototypeClass : public W3DMPO, public PrototypeClass ** Instance of the loader which the asset manager installs */ extern BoxLoaderClass _BoxLoader; - - - - -#endif - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h index 6237d439dd..8766dea3a1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h @@ -45,9 +45,6 @@ #pragma once -#ifndef CAMERA_H -#define CAMERA_H - #include "always.h" #include "rendobj.h" #include "plane.h" @@ -449,6 +446,3 @@ inline const Vector3 * CameraClass::Get_View_Space_Frustum_Corners(void) const const FrustumClass & frustum = Get_View_Space_Frustum(); return frustum.Corners; } - - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h index a0a2483e30..24d3877940 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h @@ -18,9 +18,6 @@ #pragma once -#ifndef DAZZLE_H -#define DAZZLE_H - #include "always.h" #include "vector3.h" #include "matrix3d.h" @@ -392,5 +389,3 @@ class DazzleLoaderClass : public PrototypeLoaderClass }; extern DazzleLoaderClass _DazzleLoader; - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h index 77cc605c99..4ac4e73a2e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h @@ -18,9 +18,6 @@ // 08/06/02 KM Added cube map and volume texture support -#ifndef DDSFILE_H -#define DDSFILE_H - #pragma once #include "always.h" @@ -277,5 +274,3 @@ class DDSFileClass }; // ---------------------------------------------------------------------------- - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h index d77da0e6fd..734cccc323 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h @@ -38,9 +38,6 @@ #pragma once -#ifndef DECALMSH_H -#define DECALMSH_H - #include "always.h" #include "bittype.h" #include "simplevec.h" @@ -286,7 +283,3 @@ inline uint32 SkinDecalMeshClass::Get_Decal_ID(int decal_index) { return Decals[decal_index].DecalID; } - - -#endif //DECALMSH_H - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h index ea142dd6af..88a1dba262 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h @@ -39,9 +39,6 @@ #pragma once -#ifndef DX8CAPS_H -#define DX8CAPS_H - #include "always.h" #include "ww3dformat.h" #include @@ -317,6 +314,3 @@ class DX8Caps StringClass CapsLog; StringClass CompactLog; }; - - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h index f03f39e37e..30098c9805 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h @@ -39,12 +39,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef DX8_FVF_H -#define DX8_FVF_H - #include "always.h" #include #ifdef WWDEBUG @@ -283,6 +279,3 @@ class FVFInfoClass : public W3DMPO inline void Set_FVF(unsigned fvf) const { FVF=fvf; } inline void Set_FVF_Size(unsigned size) const { fvf_size=size; } }; - - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h index 0d507d291d..41c410388e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h @@ -38,9 +38,6 @@ #pragma once -#ifndef DX8INDEXBUFFER_H -#define DX8INDEXBUFFER_H - #include "always.h" #include "wwdebug.h" #include "refcount.h" @@ -201,6 +198,3 @@ class SortingIndexBufferClass : public IndexBufferClass protected: unsigned short* index_buffer; }; - -#endif //DX8INDEXBUFFER_H - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h index 930e8b50da..9b791652cc 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h @@ -37,12 +37,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef DX8_RENDERER_H -#define DX8_RENDERER_H - #include "always.h" #include "wwstring.h" #include "simplevec.h" @@ -354,5 +350,3 @@ class DX8MeshRendererClass }; extern DX8MeshRendererClass TheDX8MeshRenderer; - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h index e7967f2d0d..555e654d70 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h @@ -36,12 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef DX8_RENDERER_DEBUGGER_H -#define DX8_RENDERER_DEBUGGER_H - #include "always.h" class StringClass; @@ -69,5 +65,3 @@ class DX8RendererDebugger static void Disable_All(); static void Enable_All(); }; - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h index f2a86073f5..e9f07e55c8 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h @@ -39,9 +39,6 @@ #pragma once -#ifndef DX8TEXTUREMANAGER_H -#define DX8TEXTUREMANAGER_H - #include "always.h" #include "texture.h" #include "dx8wrapper.h" @@ -173,5 +170,3 @@ class DX8TextureManagerClass private: static TextureTrackerList Managed_Textures; }; - -#endif // ifdef TEXTUREMANAGER diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h index 38fc8fc9ce..b198ec9ec8 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h @@ -39,9 +39,6 @@ #pragma once -#ifndef DX8VERTEXBUFFER_H -#define DX8VERTEXBUFFER_H - #include "always.h" #include "wwdebug.h" #include "refcount.h" @@ -258,6 +255,3 @@ class SortingVertexBufferClass : public VertexBufferClass public: SortingVertexBufferClass(unsigned short VertexCount); }; - - -#endif //DX8VERTEXBUFFER_H diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h index c0464a4e6e..b763a47880 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h @@ -41,9 +41,6 @@ #pragma once -#ifndef DX8_WRAPPER_H -#define DX8_WRAPPER_H - #include "always.h" #include "dllist.h" #include "d3d8.h" @@ -1507,6 +1504,3 @@ WWINLINE RenderStateStruct& RenderStateStruct::operator= (const RenderStateStruc return *this; } - - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h index abc7d268e3..64d06c9045 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef HANIMMGR_H -#define HANIMMGR_H - #include "always.h" #include "hash.h" #include "wwstring.h" @@ -111,5 +107,3 @@ class HAnimManagerIterator : public HashTableIteratorClass { HAnimManagerIterator( HAnimManagerClass & manager ) : HashTableIteratorClass( *manager.AnimPtrTable ) {} HAnimClass * Get_Current_Anim( void ); }; - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h index bc9be68dbb..e899d592c1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef HLOD_H -#define HLOD_H - #ifndef ANIMOBJ_H #include "animobj.h" #endif @@ -388,6 +384,3 @@ class HLodPrototypeClass : public W3DMPO, public PrototypeClass ** Instance of the loaders which the asset manager install */ extern HLodLoaderClass _HLodLoader; - - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h index a553e9bb4e..6771abd756 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h @@ -38,9 +38,6 @@ #pragma once -#ifndef HMORPHANIM_H -#define HMORPHANIM_H - #include "always.h" #include "hanim.h" #include "simplevec.h" @@ -180,9 +177,3 @@ class TimeCodedMorphKeysClass friend class HMorphAnimClass; }; - - - -#endif - - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h index 865546f31a..9c549afe57 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h @@ -38,9 +38,6 @@ #pragma once -#ifndef HRAWANIM_H -#define HRAWANIM_H - #include "always.h" #include "hanim.h" @@ -131,9 +128,3 @@ class HRawAnimClass : public HAnimClass void add_bit_channel(BitChannelClass * newchan); }; - - - - -#endif - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h index 08c9fbf34d..e1b747a507 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef HTREEMGR_H -#define HTREEMGR_H - #include "always.h" #include "bittype.h" #include "hashtemplate.h" @@ -91,6 +87,3 @@ class HTreeManagerClass HashTemplateClass TreeHash; }; - - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h index bdf4b4bb21..cb8396e5a5 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef LIGHT_H -#define LIGHT_H - #include "always.h" #include "rendobj.h" #include "w3derr.h" @@ -178,5 +174,3 @@ class LightClass : public RenderObjClass Vector3 SpotDirection; //bool Donut; ///does this light only apply at edges }; - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h index 94a1c937b6..d804028726 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h @@ -39,9 +39,6 @@ #pragma once -#ifndef LIGHTENVIRONMENT_H -#define LIGHTENVIRONMENT_H - #include "always.h" #include "vector3.h" @@ -176,7 +173,3 @@ class LightEnvironmentClass InputLightStruct FillLight; // Used to store the calculated fill light float FillIntensity; // Used to determine how strong the fill light should be }; - - -#endif //LIGHTENVIRONMENT_H - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.h index fd90211771..1e37ea0cd4 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.h @@ -38,9 +38,6 @@ #pragma once -#ifndef LINEGRP_H -#define LINEGRP_H - #include "shader.h" #include "vector4.h" #include "vector3.h" @@ -128,5 +125,3 @@ class LineGroupClass Vector4 DefaultTailDiffuse; // Tail diffuse RGBA LineModeType LineMode; }; - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h index eee4524420..70eae24e3c 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h @@ -39,9 +39,6 @@ #pragma once -#ifndef VERTEXMAPPER_H -#define VERTEXMAPPER_H - #include "refcount.h" #include "w3d_file.h" #include "w3derr.h" @@ -570,5 +567,3 @@ class GridWSEnvironmentMapperClass : public GridWSEnvMapperClass ** Utility functions */ void Reset_All_Texture_Mappers(RenderObjClass *robj, bool make_unique); - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.h index 6452d08f30..5afda7388b 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.h @@ -39,9 +39,6 @@ #pragma once -#ifndef MATPASS_H -#define MATPASS_H - #ifndef REFCOUNT_H #include "refcount.h" #endif @@ -125,6 +122,3 @@ inline TextureClass * MaterialPassClass::Peek_Texture(int stage) const WWASSERT(stage < MAX_TEX_STAGES); return Texture[stage]; } - - -#endif // MATPASS_H diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h index 52b7483341..13d2f8c846 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h @@ -37,9 +37,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef MATRIXMAPPER_H -#define MATRIXMAPPER_H +#pragma once #include "always.h" #include "bittype.h" @@ -168,5 +166,3 @@ inline const Matrix4x4 & MatrixMapperClass::Get_Texture_Transform(void) const { return ViewToTexture; } - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h index 33c4848f9d..a2a9a16aba 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef MESH_H -#define MESH_H - #include "always.h" #include "rendobj.h" #include "bittype.h" @@ -201,6 +197,3 @@ inline MeshModelClass * MeshClass::Peek_Model(void) // model. This is useful for stuff like making a RenderObjects' polys sort. //void Set_MeshModel_Flag(RenderObjClass *robj, MeshModelClass::FlagsType flag, int onoff); void Set_MeshModel_Flag(RenderObjClass *robj, int flag, int onoff); - -#endif /*MESH_H*/ - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h index 82af63c2dd..8d64114a1f 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h @@ -40,9 +40,6 @@ #pragma once -#ifndef MESHBUILD_H -#define MESHBUILD_H - #include "always.h" #include "vector2.h" #include "vector3.h" @@ -380,5 +377,3 @@ inline const MeshBuilderClass::MeshStatsStruct & MeshBuilderClass::Get_Mesh_Stat assert(State == STATE_MESH_PROCESSED); return Stats; } - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h index 4440172400..1c571f94a1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h @@ -36,8 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef MESHGEOMETRY_H -#define MESHGEOMETRY_H +#pragma once #include "always.h" #include "refcount.h" @@ -293,6 +292,3 @@ inline uint8 MeshGeometryClass::Get_Poly_Surface_Type(int poly_index) const uint8 *type = PolySurfaceType->Get_Array(); return type[poly_index]; } - -#endif //MESHGEOMETRY_H - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h index 8521c3cb53..d0bbc93eec 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h @@ -36,8 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef MESHMATDESC_H -#define MESHMATDESC_H +#pragma once #include "always.h" #include "vector2.h" @@ -490,6 +489,3 @@ inline void MeshMatDescClass::Disable_Backface_Culling(void) } } } - -#endif //MESHMATDESC_H - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h index ab161719a6..c94234d9e1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef MESHMDL_H -#define MESHMDL_H - #include "vector2.h" #include "vector3.h" #include "vector4.h" @@ -344,12 +340,3 @@ class MeshModelClass : public MeshGeometryClass friend class DX8MeshRendererClass; friend class DX8PolygonRendererClass; }; - - - - - - - -#endif - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h index 2630eefad9..354ac9c7f8 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef MOTCHAN_H -#define MOTCHAN_H - #include "always.h" #include "bittype.h" #include "w3d_file.h" @@ -328,6 +324,3 @@ class TimeCodedBitChannelClass : public W3DMPO friend class HCompressedAnimClass; }; - - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h index 6a5225bc50..cddecf8910 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef NULL_H -#define NULL_H - #ifndef RENDOBJ_H #include "rendobj.h" #endif @@ -97,7 +93,3 @@ class NullLoaderClass : public PrototypeLoaderClass ** automatically install at creation time */ extern NullLoaderClass _NullLoader; - - -#endif - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h index 6a3bc397e9..95053db630 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h @@ -33,10 +33,8 @@ *-------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef PART_BUF_H -#define PART_BUF_H +#pragma once #include "rendobj.h" #include "pointgr.h" @@ -461,6 +459,3 @@ class ParticleBufferClass : public RenderObjClass unsigned char CurrentGroupID; }; - -#endif // PART_BUF_H - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h index c860400b61..42936478db 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h @@ -33,10 +33,8 @@ *-------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once -#ifndef PART_EMT_H -#define PART_EMT_H +#pragma once #include "rendobj.h" #include "RANDOM.H" @@ -348,7 +346,3 @@ class ParticleEmitterClass : public RenderObjClass // all particle emitters. static bool DebugDisable; }; - -#endif // PART_EMT_H - - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h index 51b44b8320..98b3b48726 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h @@ -32,13 +32,8 @@ * * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef __PART_EMT_LDR_H -#define __PART_EMT_LDR_H - - #include "proto.h" #include "rendobj.h" #include "w3d_file.h" @@ -373,6 +368,3 @@ class ParticleEmitterLoaderClass : public PrototypeLoaderClass // Global variables // extern ParticleEmitterLoaderClass _ParticleEmitterLoader; - - -#endif //__PART_EMT_LDR_H diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h index d34fef3730..c9e02b89a3 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef RENDER2D_H -#define RENDER2D_H - #include "always.h" //#include "simplevec.h" #include "Vector.H" @@ -241,5 +237,3 @@ class Render2DTextClass : public Render2DClass { void Draw_Char( WCHAR ch, unsigned long color ); }; - -#endif // RENDER2D_H diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h index b8c3193242..37e2be0337 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h @@ -37,13 +37,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef RINFO_H -#define RINFO_H - - #include "always.h" #include "bittype.h" #include "ww3d.h" @@ -161,7 +156,3 @@ class SpecialRenderInfoClass : public RenderInfoClass SpecialRenderInfoClass & operator = (const RenderInfoClass &); }; - - - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h index 45265632e0..50f8bbc128 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef SCENE_H -#define SCENE_H - #include "always.h" #include "refcount.h" #include "vector3.h" @@ -263,5 +259,3 @@ class SimpleSceneClass : public SceneClass virtual void Customized_Render(RenderInfoClass & rinfo); virtual void Post_Render_Processing(RenderInfoClass& rinfo); }; - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.h index 2800701f62..aabc03bd0e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef SHADER_H -#define SHADER_H - #include "always.h" class DX8Wrapper; @@ -465,5 +461,3 @@ inline void ShaderClass::Reset() Set_Post_Detail_Alpha_Func(DETAILALPHA_DISABLE); Set_NPatch_Enable(NPATCH_DISABLE); } - -#endif //SHADER_H diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shdlib.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shdlib.h index 3275741d40..0307babe95 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shdlib.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shdlib.h @@ -36,8 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef SHDLIB_H -#define SHDLIB_H +#pragma once // TheSuperHackers @build Removes the unused WWShade code. (#596) // If there is a desire to revive this, then the WWShade library needs to be re-added. @@ -68,6 +67,3 @@ extern void SHD_Register_Loader(); #define SHD_REG_LOADER #endif // USE_WWSHADE - - -#endif // SHDLIB_H diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h index ad67ec3871..06f0b5e826 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h @@ -18,9 +18,6 @@ #pragma once -#ifndef SORTING_RENDERER_H -#define SORTING_RENDERER_H - #include "always.h" class SortingNodeStruct; @@ -63,6 +60,3 @@ class SortingRendererClass static void _Enable_Triangle_Draw(bool enable) { _EnableTriangleDraw=enable; } static bool _Is_Triangle_Draw_Enabled() { return _EnableTriangleDraw; } }; - -#endif - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texproject.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texproject.h index edffbf3e79..0489220f64 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texproject.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texproject.h @@ -39,9 +39,6 @@ #pragma once -#ifndef TEXPROJECT_H -#define TEXPROJECT_H - #include "always.h" #include "matrix3d.h" #include "matrix4.h" @@ -240,7 +237,3 @@ class TexProjectClass : public ProjectorClass, public CullableClass, public Mult */ typedef RefMultiListClass TexProjListClass; typedef RefMultiListIterator TexProjListIterator; - - -#endif - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.h index fbb84febfc..f1130c9a15 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.h @@ -39,12 +39,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef TEXTURE_H -#define TEXTURE_H - #include "always.h" #include "refcount.h" #include "chunkio.h" @@ -478,5 +474,3 @@ class VolumeTextureClass : public TextureClass // Utility functions for loading and saving texture descriptions from/to W3D files TextureClass *Load_Texture(ChunkLoadClass & cload); void Save_Texture(TextureClass * texture, ChunkSaveClass & csave); - -#endif //TEXTURE_H diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h index 8db3f5c73d..3571471e4e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h @@ -37,8 +37,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef TEXTUREFILTER_H -#define TEXTUREFILTER_H +#pragma once #ifndef DX8_WRAPPER_H //#include "dx8wrapper.h" @@ -129,5 +128,3 @@ class TextureFilterClass TxtAddrMode UAddressMode; TxtAddrMode VAddressMode; }; - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h index 0c1a1feae1..38104d6495 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h @@ -37,10 +37,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef TEXTURELOADER_H -#define TEXTURELOADER_H - #pragma once #include "always.h" @@ -328,5 +324,3 @@ class VolumeTextureLoadTaskClass : public TextureLoadTaskClass unsigned int Depth; }; - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h index b4796452d4..465bcc367e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h @@ -17,8 +17,6 @@ */ // 08/07/02 KM Texture class redesign (revisited) -#ifndef TEXTURETHUMBNAIL_H -#define TEXTURETHUMBNAIL_H #pragma once @@ -124,5 +122,3 @@ class ThumbnailManagerClass : public DLNodeClass }; // ---------------------------------------------------------------------------- - -#endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h index e2a65a6654..229fa48630 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef VERTMATERIAL_H -#define VERTMATERIAL_H - #include "always.h" #include "refcount.h" @@ -317,6 +313,3 @@ inline bool VertexMaterialClass::Are_Mappers_Time_Variant(void) const } return false; } - -#endif //VERTMATERIAL_H - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h index 18841b7103..87a8623c58 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h @@ -35,12 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef W3D_FILE_H -#define W3D_FILE_H - #include "always.h" #include "bittype.h" #include "iostruct.h" @@ -2275,6 +2271,3 @@ struct W3dShdSubMeshHeaderStruct ** Include the obsolete structures and chunk ID's */ #include "w3d_obsolete.h" - - -#endif // W3D_FILE_H diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h index 8d82f64de2..b248548ebe 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h @@ -34,12 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once -#ifndef WW3D_H -#define WW3D_H - #include "always.h" #include "vector3.h" #include "layer.h" @@ -456,7 +452,3 @@ struct RenderStatistics long UserStat1; long UserStat2; }; - - - -#endif diff --git a/GeneralsMD/Code/Main/WinMain.h b/GeneralsMD/Code/Main/WinMain.h index 76a704f345..594964a79b 100644 --- a/GeneralsMD/Code/Main/WinMain.h +++ b/GeneralsMD/Code/Main/WinMain.h @@ -30,8 +30,7 @@ // /////////////////////////////////////////////////////////////////////////////// -#ifndef __WINMAIN_H_ -#define __WINMAIN_H_ +#pragma once // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -43,6 +42,3 @@ extern HINSTANCE ApplicationHInstance; ///< our application instance extern HWND ApplicationHWnd; ///< our application window handle extern Win32Mouse *TheWin32Mouse; ///< global for win32 mouse only! - -#endif // end __WINMAIN_H_ - diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/DialogProc.h b/GeneralsMD/Code/Tools/GUIEdit/Include/DialogProc.h index 76036ccfbe..60a5473621 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/DialogProc.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/DialogProc.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __DIALOGPROC_H_ -#define __DIALOGPROC_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -69,6 +66,3 @@ extern BOOL CALLBACK GridSettingsDialogProc( HWND hWndDialog, UINT message, WPARAM wParam, LPARAM lParam ); extern BOOL CALLBACK CallbackEditorDialogProc( HWND hWndDialog, UINT message, WPARAM wParam, LPARAM lParam ); - -#endif // __DIALOGPROC_H_ - diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h b/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h index 9d00b582fa..e021fdc3f0 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __EDITWINDOW_H_ -#define __EDITWINDOW_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #include @@ -203,6 +200,3 @@ inline ICoord2D EditWindow::getDragMoveOrigin( void ) { return m_dragMoveOrigin; // EXTERNALS ////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// extern EditWindow *TheEditWindow; ///< edit window singleton extern - -#endif // __EDITWINDOW_H_ - diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h index b39a10fde0..86122e9b6f 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h @@ -29,9 +29,6 @@ #pragma once -#ifndef __GUIEDIT_H_ -#define __GUIEDIT_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include #include @@ -374,6 +371,3 @@ inline AsciiString GUIEdit::getLayoutShutdown( void ) { return m_layoutShutdownS // EXTERNALS ////////////////////////////////////////////////////////////////////////////////////// extern GUIEdit *TheEditor; ///< editor application singleton - -#endif // __GUIEDIT_H_ - diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditColor.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditColor.h index 348b3d619e..71fccd5568 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditColor.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditColor.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __GUIEDITCOLOR_H_ -#define __GUIEDITCOLOR_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -96,6 +93,3 @@ struct HSVColorReal // EXTERNALS ////////////////////////////////////////////////////////////////// extern RGBColorInt *SelectColor( Int red, Int green, Int blue, Int alpha, Int mouseX = 0, Int mouseY = 0 ); - -#endif // __GUIEDITCOLOR_H_ - diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h index 430254937b..e7741c4016 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __GUIEDITDISPLAY_H_ -#define __GUIEDITDISPLAY_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -137,6 +134,3 @@ class GUIEditDisplay : public Display // INLINING /////////////////////////////////////////////////////////////////// // EXTERNALS ////////////////////////////////////////////////////////////////// - -#endif // __GUIEDITDISPLAY_H_ - diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h index face13f334..98e6f0f310 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h @@ -34,9 +34,6 @@ #pragma once -#ifndef __GUIEDITWINDOWMANAGER_H_ -#define __GUIEDITWINDOWMANAGER_H_ - #include #include "W3DDevice/GameClient/W3DGameWindowManager.h" @@ -114,6 +111,3 @@ inline GameWindow *GUIEditWindowManager::getClipboardDupeList( void ) { return m // EXTERN ///////////////////////////////////////////////////////////////////////////////////////// extern GUIEditWindowManager *TheGUIEditWindowManager; ///< editor use only - -#endif // __GUIEDITWINDOWMANAGER_H_ - diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h b/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h index bd3074e0a0..8b319ef474 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __HIERARCHYVIEW_H_ -#define __HIERARCHYVIEW_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #include @@ -174,6 +171,3 @@ inline GameWindow *HierarchyView::getPopupTarget( void ) { return m_popupTarget; // EXTERNALS ////////////////////////////////////////////////////////////////// extern HierarchyView *TheHierarchyView; ///< singleton for our view - -#endif // __CONTROLPALETTE_H_ - diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h b/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h index deef61ed6a..dbbe51d888 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __LAYOUTSCHEME_H_ -#define __LAYOUTSCHEME_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -147,6 +144,3 @@ inline GameFont *LayoutScheme::getFont( void ) { return m_font; } // EXTERNALS ////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// extern LayoutScheme *TheDefaultScheme; - -#endif // end __LAYOUTSCHEME_H_ - diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h b/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h index 9ec2fb637d..b584d35a44 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h @@ -46,9 +46,6 @@ #pragma once -#ifndef __PROPERTIES_H_ -#define __PROPERTIES_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -425,6 +422,3 @@ extern Color GetPropsDisabledTextColor( void ); extern Color GetPropsDisabledTextBorderColor( void ); extern Color GetPropsHiliteTextColor( void ); extern Color GetPropsHiliteTextBorderColor( void ); - -#endif // __PROPERTIES_H_ - diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/WinMain.h b/GeneralsMD/Code/Tools/GUIEdit/Include/WinMain.h index a8d2ce1e67..051704cdd5 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/WinMain.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/WinMain.h @@ -45,9 +45,6 @@ #pragma once -#ifndef __WINMAIN_H_ -#define __WINMAIN_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -65,6 +62,3 @@ extern HWND ApplicationHWnd; ///< application main window handle extern HINSTANCE ApplicationHInstance; ///< application main instance handle extern Win32Mouse *TheWin32Mouse; ///< the mouse for win processing - -#endif // __WINMAIN_H_ - diff --git a/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.h b/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.h index ab9854baae..8d99dc6c7f 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.h @@ -18,9 +18,6 @@ #pragma once -#ifndef _H_CBUTTONSHOWCOLOR_ -#define _H_CBUTTONSHOWCOLOR_ - #include "Lib/BaseType.h" class CButtonShowColor : public CButton @@ -44,5 +41,3 @@ class CButtonShowColor : public CButton DECLARE_MESSAGE_MAP(); }; - -#endif /* _H_CBUTTONSHOWCOLOR_ */ diff --git a/GeneralsMD/Code/Tools/ParticleEditor/CColorAlphaDialog.h b/GeneralsMD/Code/Tools/ParticleEditor/CColorAlphaDialog.h index 63ae380ef5..1c8801e14b 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/CColorAlphaDialog.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/CColorAlphaDialog.h @@ -16,7 +16,6 @@ ** along with this program. If not, see . */ - #pragma once #include "CButtonShowColor.h" diff --git a/GeneralsMD/Code/Tools/ParticleEditor/CParticleEditorPage.h b/GeneralsMD/Code/Tools/ParticleEditor/CParticleEditorPage.h index 2f64c2c4d5..bc93293579 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/CParticleEditorPage.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/CParticleEditorPage.h @@ -18,7 +18,6 @@ #pragma once - struct CParticleEditorPage : public CDialog { UINT m_templateID; diff --git a/GeneralsMD/Code/Tools/ParticleEditor/CSwitchesDialog.h b/GeneralsMD/Code/Tools/ParticleEditor/CSwitchesDialog.h index 7e8131ff73..5b467b0c2b 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/CSwitchesDialog.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/CSwitchesDialog.h @@ -16,7 +16,6 @@ ** along with this program. If not, see . */ - #pragma once #include "Lib/BaseType.h" diff --git a/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.h b/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.h index 885bde0f0e..347c65f152 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.h @@ -32,8 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_EMISSIONTYPEPANELS_ -#define _H_EMISSIONTYPEPANELS_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" @@ -134,5 +132,3 @@ class EmissionPanelCylinder : public ISwapablePanel afx_msg void OnParticleSystemEdit(); DECLARE_MESSAGE_MAP() }; - -#endif /* _H_EMISSIONTYPEPANELS_ */ diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ISwapablePanel.h b/GeneralsMD/Code/Tools/ParticleEditor/ISwapablePanel.h index aa1c3029e2..96b1255898 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/ISwapablePanel.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/ISwapablePanel.h @@ -33,8 +33,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_ISWAPABLEPANEL_ -#define _H_ISWAPABLEPANEL_ #include "Lib/BaseType.h" @@ -50,5 +48,3 @@ interface ISwapablePanel : public CDialog virtual void performUpdate( IN Bool toUI ) = 0; virtual void InitPanel( void ) = 0; }; - -#endif /* _H_ISWAPABLEPANEL_ */ diff --git a/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.h b/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.h index 0d2ba2f456..a8be3b1cd4 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.h @@ -32,8 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_MOREPARMSDIALOG_ -#define _H_MOREPARMSDIALOG_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" @@ -60,5 +58,3 @@ class MoreParmsDialog : public CDialog afx_msg void OnParticleSystemEdit(); DECLARE_MESSAGE_MAP() }; - -#endif /* _H_MOREPARMSDIALOG_ */ diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.h b/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.h index c570dbb5f3..cc285778c9 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.h @@ -19,9 +19,6 @@ // DebugWindow.h : main header file for the DEBUGWINDOW DLL // -#if !defined(AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_) -#define AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_ - #pragma once #ifndef __AFXWIN_H__ @@ -66,5 +63,3 @@ class CDebugWindowApp : public CWinApp //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_DEBUGWINDOW_H__018E1800_6E59_4527_BA0C_8731EBF22953__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditorDialog.h b/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditorDialog.h index 28e4004ffe..b38afd9d18 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditorDialog.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditorDialog.h @@ -16,7 +16,6 @@ ** along with this program. If not, see . */ - #pragma once #include // for std::pair diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ParticleTypePanels.h b/GeneralsMD/Code/Tools/ParticleEditor/ParticleTypePanels.h index 43b0c72741..3858e1256a 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/ParticleTypePanels.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/ParticleTypePanels.h @@ -32,8 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_PARTICLETYPEPANELS_ -#define _H_PARTICLETYPEPANELS_ #include "Resource.h" #include "ISwapablePanel.h" @@ -98,5 +96,3 @@ class ParticlePanelStreak : public ParticlePanelParticle afx_msg void OnParticleSystemEdit(); DECLARE_MESSAGE_MAP() }; - -#endif /* _H_PARTICLETYPEPANELS_ */ diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.h b/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.h index 1956202f63..4b4875a37d 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.h @@ -32,13 +32,8 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_SHADERTYPEPANELS_ -#define _H_SHADERTYPEPANELS_ // INCLUDES /////////////////////////////////////////////////////////////////// // DEFINES //////////////////////////////////////////////////////////////////// // TYPE DEFINES /////////////////////////////////////////////////////////////// // FORWARD DECLARATIONS /////////////////////////////////////////////////////// - - -#endif /* _H_SHADERTYPEPANELS_ */ diff --git a/GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h b/GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h index 8d8ee73c14..a5879cdae3 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h @@ -21,9 +21,6 @@ // are changed infrequently // -#if !defined(AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_) -#define AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_ - #pragma once #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers @@ -73,5 +70,3 @@ //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__FB15454D_21B4_4F33_A593_C13A58B86008__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.h b/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.h index be0f7aa423..ecc4ac0738 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.h @@ -32,8 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_VELOCITYTYPEPANELS_ -#define _H_VELOCITYTYPEPANELS_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" @@ -134,5 +132,3 @@ class VelocityPanelOutward : public ISwapablePanel afx_msg void OnParticleSystemEdit(); DECLARE_MESSAGE_MAP() }; - -#endif /* _H_VELOCITYTYPEPANELS_ */ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h index 32acf8d7de..c4a76c63e1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef AUTOEDGEOUTTOOL_H -#define AUTOEDGEOUTTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -43,6 +40,3 @@ class AutoEdgeOutTool : public Tool virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); virtual void activate(); ///< Become the current tool. }; - - -#endif //TOOL_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h index 7657dc2ce6..309efe287f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_BASEBUILDPROPS_H__71A01D97_E81A_45F8_982D_57D83E5342DF__INCLUDED_) -#define AFX_BASEBUILDPROPS_H__71A01D97_E81A_45F8_982D_57D83E5342DF__INCLUDED_ - #pragma once + // BaseBuildProps.h : header file // @@ -72,5 +70,3 @@ class BaseBuildProps : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_BASEBUILDPROPS_H__71A01D97_E81A_45F8_982D_57D83E5342DF__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h index f013c7bc26..d3a62b2121 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef BLEND_EDGE_TOOL_H -#define BLEND_EDGE_TOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -47,6 +44,3 @@ class BlendEdgeTool : public Tool virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); }; - - -#endif //TOOL_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h index 92245f484a..713b517da4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_BlendMaterial_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_) -#define AFX_BlendMaterial_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_ - #pragma once + // BlendMaterial.h : header file // @@ -86,5 +84,3 @@ class BlendMaterial : public COptionsPanel //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_BlendMaterial_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BorderTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BorderTool.h index c92a06098b..60721052bf 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BorderTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BorderTool.h @@ -17,6 +17,7 @@ */ #pragma once + #include "Tool.h" class BorderTool : public Tool diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h index 1ab148b7f4..7c767c82bb 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef BRUSHTOOL_H -#define BRUSHTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -64,6 +61,3 @@ class BrushTool : public Tool virtual Bool followsTerrain(void) {return false;}; }; - - -#endif //BRUSHTOOL_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildList.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildList.h index a70160e4c8..5136504304 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildList.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildList.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_BuildList_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_) -#define AFX_BuildList_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_ - #pragma once + // BuildList.h : header file // @@ -107,5 +105,3 @@ class BuildList : public COptionsPanel, public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_BuildList_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h index e6bea130b0..f764a82e14 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef BUILDLISTTOOL_H -#define BUILDLISTTOOL_H - #include "Tool.h" #include "Common/AsciiString.h" #include "PickUnitDialog.h" @@ -78,6 +75,3 @@ class BuildListTool : public Tool virtual void activate(); ///< Become the current tool. virtual void deactivate(); ///< Become not the current tool. }; - - -#endif //TOOL_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h index e45c66bfb1..3685c56952 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h @@ -18,9 +18,6 @@ #pragma once -#ifndef _H_CBUTTONSHOWCOLOR_ -#define _H_CBUTTONSHOWCOLOR_ - class CButtonShowColor : public CButton { protected: @@ -42,5 +39,3 @@ class CButtonShowColor : public CButton DECLARE_MESSAGE_MAP(); }; - -#endif /* _H_CBUTTONSHOWCOLOR_ */ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h index 11ac8f876c..683e45cded 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h @@ -22,9 +22,6 @@ #pragma once -#ifndef CUNDOABLE_H -#define CUNDOABLE_H - #include "Lib/BaseType.h" #include "../../GameEngine/Include/Common/MapObject.h" #include "../../GameEngine/Include/Common/GameCommon.h" @@ -412,7 +409,3 @@ class MultipleUndoable : public Undoable virtual void Undo(void); virtual void Redo(void); }; - - - -#endif //CUNDOABLE_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h index 9c0b696e88..3ba623f52d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_CAMERAOPTIONS_H__4EF4F775_1290_47AE_817F_9340BA3A898C__INCLUDED_) -#define AFX_CAMERAOPTIONS_H__4EF4F775_1290_47AE_817F_9340BA3A898C__INCLUDED_ - #pragma once + // CameraOptions.h : header file // @@ -88,5 +86,3 @@ class CameraOptions : public CDialog, public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_CAMERAOPTIONS_H__4EF4F775_1290_47AE_817F_9340BA3A898C__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h index 5837560c75..8dd420e5c1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_CELLWIDTH_H__E4023BA4_28DE_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_CELLWIDTH_H__E4023BA4_28DE_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once + // CellWidth.h : header file // @@ -63,5 +61,3 @@ class CellWidth : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_CELLWIDTH_H__E4023BA4_28DE_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h index e3794b42a4..974aeca6f8 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_ContourOptions_H__7B56E24C_582E_4530_A451_873397C8852D__INCLUDED_) -#define AFX_ContourOptions_H__7B56E24C_582E_4530_A451_873397C8852D__INCLUDED_ - #pragma once + // ContourOptions.h : header file // @@ -84,5 +82,3 @@ class ContourOptions : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_ContourOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h b/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h index 9a721cd8b5..77ea5426b1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h @@ -16,9 +16,7 @@ ** along with this program. If not, see . */ - -#ifndef __DRAW_OBJECT_H_ -#define __DRAW_OBJECT_H_ +#pragma once #include "always.h" #include "rendobj.h" @@ -190,5 +188,3 @@ class DrawObject : public RenderObjClass void BuildRectFromSegmentAndWidth(const Coord3D* b, const Coord3D* t, Real width, Coord3D* outBL, Coord3D* outTL, Coord3D* outBR, Coord3D* outTR); - -#endif // end __DRAW_OBJECT_H_ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h index 673e075d92..67c8affbb2 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EditAction_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_) -#define AFX_EditAction_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_ - #pragma once + // EditAction.h : header file // @@ -79,5 +77,3 @@ class EditAction : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EditAction_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h index c75d095549..56dd2efe3a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EDITCONDITION_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_) -#define AFX_EDITCONDITION_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_ - #pragma once + // EditCondition.h : header file // @@ -85,5 +83,3 @@ class EditCondition : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EDITCONDITION_H__64465BA2_AD81_4EFD_BAB4_93F66C90ECD1__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h index 313380acd2..1f007f9b47 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EDITCOORDPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_) -#define AFX_EDITCOORDPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_ - #pragma once + // EditCoordParameter.h : header file // #include "GameLogic/Scripts.h" @@ -70,5 +68,3 @@ friend class EditParameter; //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EDITCOORDPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h index 2cb3119d61..b75952dfef 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EDITGROUP_H__712F9978_4300_4625_9364_39E903FA3284__INCLUDED_) -#define AFX_EDITGROUP_H__712F9978_4300_4625_9364_39E903FA3284__INCLUDED_ - #pragma once + // EditGroup.h : header file // @@ -63,5 +61,3 @@ class EditGroup : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EDITGROUP_H__712F9978_4300_4625_9364_39E903FA3284__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h index 5cbe7b81d8..2f4c11394d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EDITOBJPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_) -#define AFX_EDITOBJPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_ - #pragma once + // EditObjectParameter.h : header file // #include "GameLogic/Scripts.h" @@ -74,5 +72,3 @@ friend class EditParameter; //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EDITOBJPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h index efeaab4049..8141ef0df3 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EDITPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_) -#define AFX_EDITPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_ - #pragma once + // EditParameter.h : header file // #include "GameLogic/Scripts.h" @@ -131,5 +129,3 @@ class EditParameter : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EDITPARAMETER_H__465E4002_6405_47E3_97BA_D46A8C108600__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h index a2eb6b1176..30a2a22e6c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EXPORTSCRIPTSOPTIONS_H__706D8D87_E01C_431A_ADB8_DFC4CA8A8422__INCLUDED_) -#define AFX_EXPORTSCRIPTSOPTIONS_H__706D8D87_E01C_431A_ADB8_DFC4CA8A8422__INCLUDED_ - #pragma once + // ExportScriptsOptions.h : header file // @@ -73,5 +71,3 @@ class ExportScriptsOptions : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EXPORTSCRIPTSOPTIONS_H__706D8D87_E01C_431A_ADB8_DFC4CA8A8422__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h index 6445b58438..90b25177a4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef EYEDROPPERTOOL_H -#define EYEDROPPERTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -43,6 +40,3 @@ class EyedropperTool : public Tool virtual void mouseDown(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); virtual void activate(); ///< Become the current tool. }; - - -#endif //TOOL_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h index 7a51d5be87..66ef13d917 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_FEATHEROPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) -#define AFX_FEATHEROPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_ - #pragma once + // brushoptions.h : header file // @@ -93,5 +91,3 @@ class FeatherOptions : public COptionsPanel , public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_FEATHEROPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h index 64ff12531f..c0617139f9 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef FEATHERTOOL_H -#define FEATHERTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /**************************************************************************/ @@ -56,6 +53,3 @@ class FeatherTool : public Tool virtual WorldHeightMapEdit *getHeightMap(void) {return m_htMapEditCopy;}; virtual void activate(); ///< Become the current tool. }; - - -#endif //FEATHERTOOL_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h index bb57b8abb7..dff1241e7a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_FenceOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_) -#define AFX_FenceOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_ - #pragma once + // FenceOptions.h : header file // @@ -94,5 +92,3 @@ class FenceOptions : public COptionsPanel //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_FenceOptions_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h index 0a7cc3e6dc..2ea16a9e35 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef FenceTool_H -#define FenceTool_H - #include "Tool.h" class WorldHeightMapEdit; class MapObject; @@ -57,6 +54,3 @@ class FenceTool : public Tool virtual void activate(); ///< Become the current tool. virtual void deactivate(); ///< Become not the current tool. }; - - -#endif //FenceTool_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h index 98a2bea469..e33be6a576 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef FloodFillTool_H -#define FloodFillTool_H - #include "Tool.h" class WorldHeightMapEdit; /************************************************************************** @@ -51,6 +48,3 @@ class FloodFillTool : public Tool void setAdjustCliffs(Bool val) {m_adjustCliffTextures = val;} }; - - -#endif //TOOL_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h index 0dd5205878..7ea4d1f37b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_GLOBALLIGHTOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) -#define AFX_GLOBALLIGHTOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_ - #pragma once + // GLOBALLIGHTOPTIONS.h : header file // @@ -137,5 +135,3 @@ class GlobalLightOptions : public CDialog , public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_GLOBALLIGHTOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h index c5e796b530..27101c9733 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h @@ -16,9 +16,6 @@ ** along with this program. If not, see . */ -#ifndef GROVEOPTIONS_H -#define GROVEOPTIONS_H - #pragma once #include @@ -78,5 +75,3 @@ class GroveOptions : public COptionsPanel }; extern GroveOptions *TheGroveOptions; - -#endif diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h index fab8dca47a..cd69ab6eca 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h @@ -21,9 +21,6 @@ #pragma once -#ifndef GroveTool_H -#define GroveTool_H - #include "Lib/BaseType.h" #include "Tool.h" #include "Common/MapObject.h" @@ -61,6 +58,3 @@ class GroveTool : public Tool virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); virtual void mouseMoved(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); }; - - -#endif //TOOL_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h index 19bbc4a4c8..fa47bbfa1c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef HandScrollTool_H -#define HandScrollTool_H - #include "Tool.h" /************************************************************************** HandScrollTool @@ -53,6 +50,3 @@ class HandScrollTool : public Tool virtual void activate(); ///< Become the current tool. virtual Bool followsTerrain(void) {return false;}; }; - - -#endif //TOOL_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h index a1118653ae..ad3cbad52a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h @@ -16,12 +16,8 @@ ** along with this program. If not, see . */ - #pragma once -#ifndef __IMPASSABLEOPTIONS_H__ -#define __IMPASSABLEOPTIONS_H__ - class ImpassableOptions : public CDialog { public: @@ -47,5 +43,3 @@ class ImpassableOptions : public CDialog afx_msg void OnPreview(); DECLARE_MESSAGE_MAP() }; - -#endif /* __IMPASSABLEOPTIONS_H__ */ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h b/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h index 94993cb0ff..00a8c5f5aa 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h @@ -32,8 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_LAYERSLIST_ -#define _H_LAYERSLIST_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" @@ -185,5 +183,3 @@ class LayersList : public CDialog }; extern LayersList *TheLayersList; - -#endif /* _H_LAYERSLIST_ */ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h index 68d86160d2..3e15583256 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_LightOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_) -#define AFX_LightOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_ - #pragma once + // LightOptions.h : header file // #include "OptionsPanel.h" @@ -76,5 +74,3 @@ class LightOptions : public COptionsPanel //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_LightOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h index 47df043248..e8081da8c4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h @@ -20,9 +20,6 @@ // ///////////////////////////////////////////////////////////////////////////// -#if !defined(AFX_MAINFRM_H__371EC7AB_29D3_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_MAINFRM_H__371EC7AB_29D3_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once #include "Lib/BaseType.h" @@ -156,5 +153,3 @@ class CMainFrame : public CFrameWnd //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_MAINFRM_H__371EC7AB_29D3_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MapPreview.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MapPreview.h index 4130e500b6..64c6676520 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MapPreview.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MapPreview.h @@ -39,9 +39,6 @@ #pragma once -#ifndef __MAP_PREVIEW_H_ -#define __MAP_PREVIEW_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -84,5 +81,3 @@ class MapPreview //----------------------------------------------------------------------------- // EXTERNALS ////////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- - -#endif // __MAP_PREVIEW_H_ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h index 42e9d48e45..d6e1517d69 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_MAPSETTINGS_H__21749744_4DF4_462C_8DD4_FEEC1003DCFE__INCLUDED_) -#define AFX_MAPSETTINGS_H__21749744_4DF4_462C_8DD4_FEEC1003DCFE__INCLUDED_ - #pragma once + // MapSettings.h : header file // @@ -63,5 +61,3 @@ class MapSettings : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_MAPSETTINGS_H__21749744_4DF4_462C_8DD4_FEEC1003DCFE__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h index a892b6ee84..973c9c285e 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_MESHMOLDOPTIONS_H__D5E62CB9_2830_4FA1_8306_DE18DD971087__INCLUDED_) -#define AFX_MESHMOLDOPTIONS_H__D5E62CB9_2830_4FA1_8306_DE18DD971087__INCLUDED_ - #pragma once + // MeshMoldOptions.h : header file // #include "WBPopupSlider.h" @@ -112,5 +110,3 @@ class MeshMoldOptions : public COptionsPanel , public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_MESHMOLDOPTIONS_H__D5E62CB9_2830_4FA1_8306_DE18DD971087__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h index 1589d32818..66ed3e1c98 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef MESHMOLDTOOL_H -#define MESHMOLDTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -65,6 +62,3 @@ class MeshMoldTool : public Tool static void updateMeshLocation(Bool changePreview); }; - - -#endif //MESHMOLDTOOL_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h index c1bc70931f..2d0ef585e2 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_MoundOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_) -#define AFX_MoundOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_ - #pragma once + // MoundOptions.h : header file // #include "WBPopupSlider.h" @@ -98,5 +96,3 @@ class MoundOptions : public COptionsPanel , public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_MoundOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h index 52c970335b..5d28cfbf99 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef MOUND_TOOL_H -#define MOUND_TOOL_H - #include "Tool.h" class WorldHeightMapEdit; /************************************************************************* @@ -72,4 +69,3 @@ class DigTool : public MoundTool DigTool(void); }; -#endif //MoundTool_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h index c83140ba19..ab80c80544 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h @@ -22,11 +22,6 @@ #pragma once -#ifndef MYTOOLBAR_H -#define MYTOOLBAR_H - - - /************************************************************************* ** CellSizeToolBar ***************************************************************************/ @@ -47,7 +42,3 @@ class CellSizeToolBar : public CDialogBar static void CellSizeChanged(Int cellSize); }; - - - -#endif //MYTOOLBAR_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h index 7e24d5ddc0..3a37645625 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_NEWHEIGHTMAP_H__239CD6A3_2919_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_NEWHEIGHTMAP_H__239CD6A3_2919_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once + // NewHeightMap.h : header file // @@ -83,5 +81,3 @@ class CNewHeightMap : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_NEWHEIGHTMAP_H__239CD6A3_2919_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h index d7575c12ea..94af9739d8 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_ObjectOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_) -#define AFX_ObjectOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_ - #pragma once + // ObjectOptions.h : header file // @@ -103,5 +101,3 @@ class ObjectOptions : public COptionsPanel //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_ObjectOptions_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h index ee857d0290..70b5262e5c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_OBJECTPREVIEW_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_) -#define AFX_OBJECTPREVIEW_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_ - #pragma once + // ObjectPreview.h : header file // @@ -70,5 +68,3 @@ class ObjectPreview : public CWnd //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_OBJECTPREVIEW_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h index c34c3f218e..8e58449bba 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef OBJECTTOOL_H -#define OBJECTTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -53,6 +50,3 @@ class ObjectTool : public Tool virtual void activate(); ///< Become the current tool. virtual void deactivate(); ///< Become not the current tool. }; - - -#endif //TOOL_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h index 1913078232..f43de286e7 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_OPENMAP_H__D3FD3B43_B0B7_42F6_BB77_2380A8B9945B__INCLUDED_) -#define AFX_OPENMAP_H__D3FD3B43_B0B7_42F6_BB77_2380A8B9945B__INCLUDED_ - #pragma once + // OpenMap.h : header file // @@ -74,5 +72,3 @@ class OpenMap : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_OPENMAP_H__D3FD3B43_B0B7_42F6_BB77_2380A8B9945B__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h b/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h index d4a2612eb1..b105a97c9f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_OPTIONSPANEL_H__CB473165_D123_42D9_AE80_32F16928E3AE__INCLUDED_) -#define AFX_OPTIONSPANEL_H__CB473165_D123_42D9_AE80_32F16928E3AE__INCLUDED_ - #pragma once + // OptionsPanel.h : header file // @@ -66,5 +64,3 @@ class COptionsPanel : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_OPTIONSPANEL_H__CB473165_D123_42D9_AE80_32F16928E3AE__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h index 497098aaec..18ee6f3dd2 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_PICKUNITDIALOG_H__B4C16E7D_FEED_472B_95FC_496D4C9006F5__INCLUDED_) -#define AFX_PICKUNITDIALOG_H__B4C16E7D_FEED_472B_95FC_496D4C9006F5__INCLUDED_ - #pragma once + // PickUnitDialog.h : header file // @@ -110,5 +108,3 @@ class ReplaceUnitDialog : public PickUnitDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_PICKUNITDIALOG_H__B4C16E7D_FEED_472B_95FC_496D4C9006F5__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h index 283605bebe..4dd8dd1876 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef POINTER_TOOL_H -#define POINTER_TOOL_H - #include "PolygonTool.h" class WorldHeightMapEdit; #include "../../GameEngine/Include/Common/MapObject.h" @@ -77,6 +74,3 @@ class PointerTool : public PolygonTool static void clearSelection(void); ///< Clears the selected objects selected flags. static Bool allowPick(MapObject* pMapObj, WbView* pView); }; - - -#endif //POINTER_TOOL_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h index 817f8f6dbf..674709b8ef 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef POLYGONTOOL_H -#define POLYGONTOOL_H - #include "Tool.h" class WorldHeightMapEdit; class MapObject; @@ -84,7 +81,3 @@ class PolygonTool : public Tool virtual void activate(); ///< Become the current tool. virtual void deactivate(); ///< Become not the current tool. }; - - -#endif //POLYGONTOOL_H - diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h index 5fd4e10257..8137f0a91c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h @@ -32,8 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_RAMPOPTIONS_ -#define _H_RAMPOPTIONS_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "OptionsPanel.h" @@ -62,5 +60,3 @@ class RampOptions : public COptionsPanel }; extern RampOptions* TheRampOptions; - -#endif /* _H_RAMPOPTIONS_ */ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h index 3cc5dc1888..41f979d645 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h @@ -32,8 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_RAMPTOOL_ -#define _H_RAMPTOOL_ // INCLUDES /////////////////////////////////////////////////////////////////// #include "Tool.h" @@ -64,6 +62,3 @@ class RampTool : public Tool void drawFeedback(Coord3D* endPoint); void applyRamp(CWorldBuilderDoc* pDoc); }; - - -#endif /* _H_RAMPTOOL_ */ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h index a6cbbc5203..939e00a619 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_RoadOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_) -#define AFX_RoadOptions_H__D3FF66C5_7107_4DAC_8A29_5EBAB5C3A24E__INCLUDED_ - #pragma once + // RoadOptions.h : header file // @@ -105,5 +103,3 @@ class RoadOptions : public COptionsPanel //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_RoadOptions_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h index a8b0b937f3..1bae16e13d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef RoadTool_H -#define RoadTool_H - #include "Tool.h" #include "W3DDevice/GameClient/WorldHeightMap.h" class WorldHeightMapEdit; @@ -58,6 +55,3 @@ class RoadTool : public Tool virtual void mouseUp(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); virtual void activate(); ///< Become the current tool. }; - - -#endif //TOOL_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h index 2941cef669..38cf6e0ba8 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h @@ -16,11 +16,8 @@ ** along with this program. If not, see . */ - -#ifndef __RULEROPTIONS_H_ -#define __RULEROPTIONS_H_ - #pragma once + // RulerOptions.h : header file // #include "OptionsPanel.h" @@ -74,5 +71,3 @@ class RulerOptions : public COptionsPanel //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // __RULEROPTIONS_H_ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h index f86dca2fd9..4d0ff121ec 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h @@ -21,9 +21,6 @@ #pragma once -#ifndef RULER_TOOL_H -#define RULER_TOOL_H - #include "Tool.h" class RulerTool : public Tool @@ -56,6 +53,3 @@ class RulerTool : public Tool static Real getLength(void); }; - -#endif //RULER_TOOL_H - diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h index 5c3f074814..553e42c649 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SAVEMAP_H__BCE93FF1_DA04_4F63_A483_D89BF1F49E32__INCLUDED_) -#define AFX_SAVEMAP_H__BCE93FF1_DA04_4F63_A483_D89BF1F49E32__INCLUDED_ - #pragma once + // SaveMap.h : header file // @@ -76,5 +74,3 @@ class SaveMap : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SAVEMAP_H__BCE93FF1_DA04_4F63_A483_D89BF1F49E32__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h index a1a8c7823c..8746d03995 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SCORCHOPTIONS_H__33FD4D9A_2C39_4494_A4EF_A20CEC76A95D__INCLUDED_) -#define AFX_SCORCHOPTIONS_H__33FD4D9A_2C39_4494_A4EF_A20CEC76A95D__INCLUDED_ - #pragma once + // ScorchOptions.h : header file // @@ -92,5 +90,3 @@ class ScorchOptions : public COptionsPanel, public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SCORCHOPTIONS_H__33FD4D9A_2C39_4494_A4EF_A20CEC76A95D__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h index a7d8750f46..a644cc2343 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h @@ -21,9 +21,6 @@ #pragma once -#ifndef SCORCHTOOL_H -#define SCORCHTOOL_H - #include "Tool.h" class WorldHeightMapEdit; class MapObject; @@ -51,6 +48,3 @@ class ScorchTool : public Tool virtual void activate(); ///< Become the current tool. virtual void deactivate(); ///< Become not the current tool. }; - - -#endif //SCORCHTOOL_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h index b76bb48d74..284c6412db 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SCRIPTACTIONSFALSE_H__227F217F_458B_4020_B6E9_6EB25E228FD5__INCLUDED_) -#define AFX_SCRIPTACTIONSFALSE_H__227F217F_458B_4020_B6E9_6EB25E228FD5__INCLUDED_ - #pragma once + // ScriptActionsFalse.h : header file // class Script; @@ -86,5 +84,3 @@ class ScriptActionsFalse : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SCRIPTACTIONSFALSE_H__227F217F_458B_4020_B6E9_6EB25E228FD5__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h index 111e2dc4cd..f10b085569 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SCRIPTACTIONSTRUE_H__D8CAEC29_8B71_461C_B1B8_DF55624330AA__INCLUDED_) -#define AFX_SCRIPTACTIONSTRUE_H__D8CAEC29_8B71_461C_B1B8_DF55624330AA__INCLUDED_ - #pragma once + // ScriptActionsTrue.h : header file // class Script; @@ -86,5 +84,3 @@ class ScriptActionsTrue : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SCRIPTACTIONSTRUE_H__D8CAEC29_8B71_461C_B1B8_DF55624330AA__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h index 74094d5ead..7d8d9397ee 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_ScriptConditionsDlg_H__EEFDFF65_2440_4AFE_B5D6_9E887C8C2DED__INCLUDED_) -#define AFX_ScriptConditionsDlg_H__EEFDFF65_2440_4AFE_B5D6_9E887C8C2DED__INCLUDED_ - #pragma once + // ScriptConditionsDlg.h : header file // class Script; @@ -91,5 +89,3 @@ class ScriptConditionsDlg : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_ScriptConditionsDlg_H__EEFDFF65_2440_4AFE_B5D6_9E887C8C2DED__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h index c2dce7b016..3bebff4376 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SCRIPTDIALOG_H__885FEF28_85F9_4556_9908_1BEC0B6E4C62__INCLUDED_) -#define AFX_SCRIPTDIALOG_H__885FEF28_85F9_4556_9908_1BEC0B6E4C62__INCLUDED_ - #pragma once + // ScriptDialog.h : header file // @@ -165,5 +163,3 @@ class ScriptDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SCRIPTDIALOG_H__885FEF28_85F9_4556_9908_1BEC0B6E4C62__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h index 23dd67684a..49d0b001de 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SCRIPTPROPERTIES_H__CE62125B_9FAB_4EF0_A8B5_36DD5393A2B0__INCLUDED_) -#define AFX_SCRIPTPROPERTIES_H__CE62125B_9FAB_4EF0_A8B5_36DD5393A2B0__INCLUDED_ - #pragma once + // ScriptProperties.h : header file // class Script; @@ -83,5 +81,3 @@ class ScriptProperties : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SCRIPTPROPERTIES_H__CE62125B_9FAB_4EF0_A8B5_36DD5393A2B0__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h b/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h index d2b980240c..1b6c2cba68 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SELECTMACROTEXTURE_H__0AB61BFA_3A67_40CB_A38F_7067F6BA352B__INCLUDED_) -#define AFX_SELECTMACROTEXTURE_H__0AB61BFA_3A67_40CB_A38F_7067F6BA352B__INCLUDED_ - #pragma once + // SelectMacrotexture.h : header file // @@ -63,5 +61,3 @@ class SelectMacrotexture : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SELECTMACROTEXTURE_H__0AB61BFA_3A67_40CB_A38F_7067F6BA352B__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h index 2c46965081..a4b742afa2 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_SHADOWOPTIONS_H__25CB23E2_9E42_44D4_BE83_4B89F87746DE__INCLUDED_) -#define AFX_SHADOWOPTIONS_H__25CB23E2_9E42_44D4_BE83_4B89F87746DE__INCLUDED_ - #pragma once + // ShadowOptions.h : header file // @@ -69,5 +67,3 @@ class ShadowOptions : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_SHADOWOPTIONS_H__25CB23E2_9E42_44D4_BE83_4B89F87746DE__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/SplashScreen.h b/GeneralsMD/Code/Tools/WorldBuilder/include/SplashScreen.h index fa01ff2ba7..f492f825f5 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/SplashScreen.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/SplashScreen.h @@ -16,12 +16,8 @@ ** along with this program. If not, see . */ - #pragma once -#ifndef __SPLASHSCREEN_H__ -#define __SPLASHSCREEN_H__ - class SplashScreen : public CDialog { protected: @@ -41,5 +37,3 @@ class SplashScreen : public CDialog DECLARE_MESSAGE_MAP() }; - -#endif /* __SPLASHSCREEN_H__ */ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/StdAfx.h b/GeneralsMD/Code/Tools/WorldBuilder/include/StdAfx.h index be0f37ede0..11f689c620 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/StdAfx.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/StdAfx.h @@ -21,9 +21,6 @@ // are changed infrequently // -#if !defined(AFX_STDAFX_H__FBA41347_2826_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_STDAFX_H__FBA41347_2826_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers @@ -47,5 +44,3 @@ //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__FBA41347_2826_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h index dad93de734..67134dedad 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_TEAMBEHAVIOR_H__40A707E0_08CB_4544_9FF1_AF0DACAB02A6__INCLUDED_) -#define AFX_TEAMBEHAVIOR_H__40A707E0_08CB_4544_9FF1_AF0DACAB02A6__INCLUDED_ - #pragma once + // TeamBehavior.h : header file // @@ -78,5 +76,3 @@ class TeamBehavior : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TEAMBEHAVIOR_H__40A707E0_08CB_4544_9FF1_AF0DACAB02A6__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h index 8664a669ca..a180fa298d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h @@ -16,12 +16,8 @@ ** along with this program. If not, see . */ - #pragma once -#ifndef __TEAMGENERIC_H__ -#define __TEAMGENERIC_H__ - class Dict; class TeamGeneric : public CPropertyPage @@ -49,5 +45,3 @@ class TeamGeneric : public CPropertyPage afx_msg void OnScriptAdjust(); DECLARE_MESSAGE_MAP() }; - -#endif diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h index 2b84246eaa..2fee1ad6b6 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_TEAMIDENTITY_H__B37DB2FD_297F_4D0E_AACD_193BE30C6C85__INCLUDED_) -#define AFX_TEAMIDENTITY_H__B37DB2FD_297F_4D0E_AACD_193BE30C6C85__INCLUDED_ - #pragma once + // TeamIdentity.h : header file // class Dict; @@ -96,5 +94,3 @@ class TeamIdentity : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TEAMIDENTITY_H__B37DB2FD_297F_4D0E_AACD_193BE30C6C85__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamObjectProperties.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamObjectProperties.h index 3137e8df80..95d4e713e7 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamObjectProperties.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamObjectProperties.h @@ -21,10 +21,6 @@ // January, 2003 // (c) Electronic Arts 2003 - -#ifndef TEAM_OBJECT_PROPERTIES_H -#define TEAM_OBJECT_PROPERTIES_H - #pragma once #include "resource.h" @@ -108,4 +104,3 @@ class TeamObjectProperties : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. -#endif //TEAM_OBJECT_PROPERTIES_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h index 01af583137..bdf0bc025a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_TEAMREINFORCEMENT_H__29B5C0C7_10E8_4869_8B43_815422C51C24__INCLUDED_) -#define AFX_TEAMREINFORCEMENT_H__29B5C0C7_10E8_4869_8B43_815422C51C24__INCLUDED_ - #pragma once + // TeamReinforcement.h : header file // @@ -68,5 +66,3 @@ class TeamReinforcement : public CPropertyPage //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TEAMREINFORCEMENT_H__29B5C0C7_10E8_4869_8B43_815422C51C24__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h index cf4ce58eab..98349d4ef4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_TERRAINMATERIAL_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_) -#define AFX_TERRAINMATERIAL_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_ - #pragma once + // terrainmaterial.h : header file // @@ -111,5 +109,3 @@ class TerrainMaterial : public COptionsPanel, public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TERRAINMATERIAL_H__D3FF66C5_711D_4DAC_8A29_5EAAB5C3A23E__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h index e838b84f33..e2f5f6cca1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_TERRAINMODAL_H__F013E9EF_2DE1_4084_97A8_5B87466535FC__INCLUDED_) -#define AFX_TERRAINMODAL_H__F013E9EF_2DE1_4084_97A8_5B87466535FC__INCLUDED_ - #pragma once + // TerrainModal.h : header file // @@ -80,5 +78,3 @@ class TerrainModal : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TERRAINMODAL_H__F013E9EF_2DE1_4084_97A8_5B87466535FC__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h index 9912fed4f7..d7174476e6 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_TERRAINSWATCHES_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_) -#define AFX_TERRAINSWATCHES_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_ - #pragma once + // TerrainSwatches.h : header file // @@ -64,5 +62,3 @@ class TerrainSwatches : public CWnd //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TERRAINSWATCHES_H__2EC47AA6_06CA_43D1_9003_15472AE76CE7__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h index 7761dc79a6..c42d23e415 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef TILETOOL_H -#define TILETOOL_H - #include "Tool.h" class WorldHeightMapEdit; /************************************************************************* @@ -69,4 +66,3 @@ class BigTileTool : public TileTool virtual Int getWidth(void) {return m_currentWidth;}; }; -#endif //TOOL_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h index 47e7dbb1b0..dcb2b9ead4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef TOOL_H -#define TOOL_H - #include "Lib/BaseType.h" #include "Common/STLTypedefs.h" @@ -88,6 +85,3 @@ class Tool Int widthOutside, CWorldBuilderDoc *pDoc, VecHeightMapIndexes* allIndices); }; - - -#endif //TOOL_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h index ead35fd9f4..f67256a84f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_WBFRAMEWND_H__83965AA4_8750_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_WBFRAMEWND_H__83965AA4_8750_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once + // WBFrameWnd.h : header file // @@ -100,5 +98,3 @@ class CWB3dFrameWnd : public CMainFrame //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WBFRAMEWND_H__83965AA4_8750_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h index a8d0300319..e521aff4b8 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h @@ -16,9 +16,7 @@ ** along with this program. If not, see . */ - -#ifndef __WBHEIGHTMAP_H_ -#define __WBHEIGHTMAP_H_ +#pragma once #include "W3DDevice/GameClient/FlatHeightMap.h" #include "W3DDevice/GameClient/HeightMap.h" @@ -52,5 +50,3 @@ class WBHeightMap : public HeightMapRenderObjClass Bool m_drawEntireMap; Bool m_flattenHeights; }; - -#endif // end __WBHEIGHTMAP_H_ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WBPopupSlider.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WBPopupSlider.h index dce9a5f2b8..a5e4dc265b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WBPopupSlider.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WBPopupSlider.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_WBPopupSliderButton_H__8B217F41_937B_11D1_8CA3_00A024CDC039__INCLUDED_) -#define AFX_WBPopupSliderButton_H__8B217F41_937B_11D1_8CA3_00A024CDC039__INCLUDED_ - #pragma once + // WBPopupSliderButton.h : header file // @@ -178,5 +176,3 @@ class PopupSlider : public CWnd //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WBPopupSliderButton_H__8B217F41_937B_11D1_8CA3_00A024CDC039__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h index 1c1cfc400d..c748ad6fe1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h @@ -22,9 +22,6 @@ #pragma once -#ifndef WHeightMapEdit_H -#define WHeightMapEdit_H - #include "W3DDevice/GameClient/WorldHeightMap.h" class DataChunkOutput; @@ -164,5 +161,3 @@ class WorldHeightMapEdit : public WorldHeightMap // outHandle: 0 means BL, 1 means TL, 2 means TR, 3 means BR void findBoundaryNear(Coord3D *pt, float okDistance, Int *outNdx, Int *outHandle); }; - -#endif diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h index 0a1f653fe7..7d55f6c785 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_WaterOptions_H__6B56E20C_582E_4132_A251_87902218852C__INCLUDED_) -#define AFX_WaterOptions_H__6B56E20C_582E_4132_A251_87902218852C__INCLUDED_ - #pragma once + // WaterOptions.h : header file // #include "WBPopupSlider.h" @@ -102,5 +100,3 @@ class WaterOptions : public COptionsPanel, public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WaterOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h index ddb7e97a05..65f1e142ae 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef WaterTool_H -#define WaterTool_H - #include "PolygonTool.h" class WorldHeightMapEdit; class MapObject; @@ -62,6 +59,3 @@ class WaterTool : public PolygonTool void fillTheArea(TTrackingMode m, CPoint viewPt, WbView* pView, CWorldBuilderDoc *pDoc); PolygonTrigger *adjustSpacing(PolygonTrigger *trigger, Real spacing); }; - - -#endif //WaterTool_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h index f13fa91c19..6934e7f6ba 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_WaypointOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_) -#define AFX_WaypointOptions_H__6B56E20C_582E_4132_A251_879097C8852C__INCLUDED_ - #pragma once + // WaypointOptions.h : header file // #include "OptionsPanel.h" @@ -92,5 +90,3 @@ class WaypointOptions : public COptionsPanel //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WaypointOptions_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h index 818ce29203..b6db067ffc 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h @@ -22,9 +22,6 @@ #pragma once -#ifndef WAYPOINTTOOL_H -#define WAYPOINTTOOL_H - #include "Tool.h" class WorldHeightMapEdit; class MapObject; @@ -58,6 +55,3 @@ class WaypointTool : public Tool virtual void activate(); ///< Become the current tool. virtual void deactivate(); ///< Become not the current tool. }; - - -#endif //WAYPOINTTOOL_H diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h index f87ff420df..90159d4c73 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h @@ -19,9 +19,6 @@ // WorldBuilder.h : main header file for the WORLDBUILDER application // -#if !defined(AFX_WORLDBUILDER_H__FBA41345_2826_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_WORLDBUILDER_H__FBA41345_2826_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once #ifndef __AFXWIN_H__ @@ -196,5 +193,3 @@ inline CWorldBuilderApp *WbApp() { return (CWorldBuilderApp*)::AfxGetApp(); } //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WORLDBUILDER_H__FBA41345_2826_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h index a485c84abc..5ee67174cc 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h @@ -20,9 +20,6 @@ // ///////////////////////////////////////////////////////////////////////////// -#if !defined(AFX_WORLDBUILDERDOC_H__FBA4134D_2826_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_WORLDBUILDERDOC_H__FBA4134D_2826_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once #include "Lib/BaseType.h" @@ -211,5 +208,3 @@ class CWorldBuilderDoc : public CDocument //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WORLDBUILDERDOC_H__FBA4134D_2826_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h index 8a67a27f2c..919d8522bd 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h @@ -20,9 +20,6 @@ // ///////////////////////////////////////////////////////////////////////////// -#if !defined(AFX_WORLDBUILDERVIEW_H__FBA4134F_2826_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_WORLDBUILDERVIEW_H__FBA4134F_2826_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once #include "Lib/BaseType.h" @@ -159,5 +156,3 @@ class CWorldBuilderView : public WbView //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WORLDBUILDERVIEW_H__FBA4134F_2826_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/addplayerdialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/addplayerdialog.h index 56049c295d..88d7b0ad09 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/addplayerdialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/addplayerdialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_ADDPLAYERDIALOG_H__96179004_35C9_436A_A302_A777E77F8F04__INCLUDED_) -#define AFX_ADDPLAYERDIALOG_H__96179004_35C9_436A_A302_A777E77F8F04__INCLUDED_ - #pragma once + // addplayerdialog.h : header file // @@ -69,5 +67,3 @@ class AddPlayerDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_ADDPLAYERDIALOG_H__96179004_35C9_436A_A302_A777E77F8F04__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h index f0090eddc5..251eceee38 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_BRUSHOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) -#define AFX_BRUSHOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_ - #pragma once + // brushoptions.h : header file // @@ -95,5 +93,3 @@ class BrushOptions : public COptionsPanel , public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_BRUSHOPTIONS_H__6B56E20C_582E_4030_A251_879097C8853C__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/euladialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/euladialog.h index e6c7e63c1a..1e9d912fad 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/euladialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/euladialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_EULADIALOG_H__9F6A134E_C2A3_425E_8485_F90B1A5F9B58__INCLUDED_) -#define AFX_EULADIALOG_H__9F6A134E_C2A3_425E_8485_F90B1A5F9B58__INCLUDED_ - #pragma once + // euladialog.h : header file // @@ -58,5 +56,3 @@ class EulaDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_EULADIALOG_H__9F6A134E_C2A3_425E_8485_F90B1A5F9B58__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h b/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h index 33673b549b..7494200872 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_MAPOBJECTPROPS_H__44517B9E_12AB_4E2C_B49B_D6BB65C59649__INCLUDED_) -#define AFX_MAPOBJECTPROPS_H__44517B9E_12AB_4E2C_B49B_D6BB65C59649__INCLUDED_ - #pragma once + // mapobjectprops.h : header file // @@ -209,5 +207,3 @@ class MapObjectProps : public COptionsPanel, public PopupSliderOwner //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_MAPOBJECTPROPS_H__44517B9E_12AB_4E2C_B49B_D6BB65C59649__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h b/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h index ad1eac2037..37f4a3c9f4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_PLAYERLISTDLG_H__103B4125_78ED_48A8_9DBB_289DDC6B0208__INCLUDED_) -#define AFX_PLAYERLISTDLG_H__103B4125_78ED_48A8_9DBB_289DDC6B0208__INCLUDED_ - #pragma once + // playerlistdlg.h : header file // @@ -86,5 +84,3 @@ class PlayerListDlg : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_PLAYERLISTDLG_H__103B4125_78ED_48A8_9DBB_289DDC6B0208__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/propedit.h b/GeneralsMD/Code/Tools/WorldBuilder/include/propedit.h index 8b3b76496f..a6a1781381 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/propedit.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/propedit.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_PROPEDIT_H__93C02F45_592B_4CFD_A092_7445559D26EB__INCLUDED_) -#define AFX_PROPEDIT_H__93C02F45_592B_4CFD_A092_7445559D26EB__INCLUDED_ - #pragma once + // propedit.h : header file // @@ -71,5 +69,3 @@ class PropEdit : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_PROPEDIT_H__93C02F45_592B_4CFD_A092_7445559D26EB__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h index 7414207691..ea4e3419f1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_TEAMSDIALOG_H__1410F415_1597_4EAF_AE0B_42DACDEB35B9__INCLUDED_) -#define AFX_TEAMSDIALOG_H__1410F415_1597_4EAF_AE0B_42DACDEB35B9__INCLUDED_ - #pragma once + // teamsdialog.h : header file // @@ -95,5 +93,3 @@ class CTeamsDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_TEAMSDIALOG_H__1410F415_1597_4EAF_AE0B_42DACDEB35B9__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h index d72c49d38e..60f9cdd642 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h @@ -16,9 +16,6 @@ ** along with this program. If not, see . */ -#if !defined(AFX_WBVIEW_H__875234A1_8815_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_WBVIEW_H__875234A1_8815_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once #include "Lib/BaseType.h" @@ -254,5 +251,3 @@ class WbView : public CView //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WBVIEW_H__875234A1_8815_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h index 4734e16790..95d71082e5 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h @@ -21,10 +21,8 @@ // Class to encapsulate height map. // Author: Steven Johnson, Aug 2001 -#if !defined(AFX_WBVIEW3D_H__832D8241_87F6_11D5_8CE0_00010297BBAC__INCLUDED_) -#define AFX_WBVIEW3D_H__832D8241_87F6_11D5_8CE0_00010297BBAC__INCLUDED_ - #pragma once + // wbview3d.h : header file // @@ -327,5 +325,3 @@ inline Bool WbView3d::getShowWireframe() { return m_showWireframe; } //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WBVIEW3D_H__832D8241_87F6_11D5_8CE0_00010297BBAC__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/wdump/FindDialog.h b/GeneralsMD/Code/Tools/wdump/FindDialog.h index 2efd619e8a..07e3f616b9 100644 --- a/GeneralsMD/Code/Tools/wdump/FindDialog.h +++ b/GeneralsMD/Code/Tools/wdump/FindDialog.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_FINDDIALOG_H__C38C0FF8_E89B_11D3_A398_009027447394__INCLUDED_) -#define AFX_FINDDIALOG_H__C38C0FF8_E89B_11D3_A398_009027447394__INCLUDED_ - #pragma once + // FindDialog.h : header file // @@ -88,5 +86,3 @@ class FindDialog : public CDialog //{{AFX_INSERT_LOCATION}} // Microsoft Visual C++ will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_FINDDIALOG_H__C38C0FF8_E89B_11D3_A398_009027447394__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/wdump/chunk_d.h b/GeneralsMD/Code/Tools/wdump/chunk_d.h index 84facf3a4d..8a06a4707c 100644 --- a/GeneralsMD/Code/Tools/wdump/chunk_d.h +++ b/GeneralsMD/Code/Tools/wdump/chunk_d.h @@ -20,10 +20,8 @@ // ////////////////////////////////////////////////////////////////////// -#if !defined(AFX_CHUNK_D_H__41C157F9_5631_11D1_8CDB_006097C6A583__INCLUDED_) -#define AFX_CHUNK_D_H__41C157F9_5631_11D1_8CDB_006097C6A583__INCLUDED_ - #pragma once + class ChunkItem; class ChunkType { @@ -254,5 +252,3 @@ class ChunkData protected: void Add_Chunk(ChunkLoadClass &cload, ChunkItem *Parent = 0); // add a chunk to the list of chunks maintained by ChunkData }; - -#endif // !defined(AFX_CHUNK_D_H__41C157F9_5631_11D1_8CDB_006097C6A583__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/wdump/mainfrm.h b/GeneralsMD/Code/Tools/wdump/mainfrm.h index c49fc2769b..9015bd9f31 100644 --- a/GeneralsMD/Code/Tools/wdump/mainfrm.h +++ b/GeneralsMD/Code/Tools/wdump/mainfrm.h @@ -20,9 +20,6 @@ // ///////////////////////////////////////////////////////////////////////////// -#if !defined(AFX_MAINFRM_H__41C157EB_5631_11D1_8CDB_006097C6A583__INCLUDED_) -#define AFX_MAINFRM_H__41C157EB_5631_11D1_8CDB_006097C6A583__INCLUDED_ - #pragma once class CMainFrame : public CFrameWnd @@ -73,5 +70,3 @@ class CMainFrame : public CFrameWnd //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_MAINFRM_H__41C157EB_5631_11D1_8CDB_006097C6A583__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/wdump/rawfilem.h b/GeneralsMD/Code/Tools/wdump/rawfilem.h index a8f74bdf4b..2dbb6ffd2f 100644 --- a/GeneralsMD/Code/Tools/wdump/rawfilem.h +++ b/GeneralsMD/Code/Tools/wdump/rawfilem.h @@ -38,8 +38,7 @@ * RawFileMClass::Is_Open -- Checks to see if the file is open or not. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef RAWFILEM_Hx -#define RAWFILEM_Hx +#pragma once #include #include @@ -320,5 +319,3 @@ inline bool RawFileMClass::Is_Open(void) const { return(Handle != INVALID_HANDLE_VALUE); } - -#endif diff --git a/GeneralsMD/Code/Tools/wdump/stdafx.h b/GeneralsMD/Code/Tools/wdump/stdafx.h index a18f0ac158..13957be316 100644 --- a/GeneralsMD/Code/Tools/wdump/stdafx.h +++ b/GeneralsMD/Code/Tools/wdump/stdafx.h @@ -21,9 +21,6 @@ // are changed infrequently // -#if !defined(AFX_STDAFX_H__41C157E9_5631_11D1_8CDB_006097C6A583__INCLUDED_) -#define AFX_STDAFX_H__41C157E9_5631_11D1_8CDB_006097C6A583__INCLUDED_ - #pragma once #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers @@ -44,5 +41,3 @@ //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_STDAFX_H__41C157E9_5631_11D1_8CDB_006097C6A583__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/wdump/wdeview.h b/GeneralsMD/Code/Tools/wdump/wdeview.h index e8cfbe299a..5b280f8670 100644 --- a/GeneralsMD/Code/Tools/wdump/wdeview.h +++ b/GeneralsMD/Code/Tools/wdump/wdeview.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_WDVIEW_H__41C157F8_5631_11D1_8CDB_006097C6A583__INCLUDED_) -#define AFX_WDVIEW_H__41C157F8_5631_11D1_8CDB_006097C6A583__INCLUDED_ - #pragma once + // WDView.h : header file // @@ -67,5 +65,3 @@ class CWDumpEditView : public CEditView //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WDVIEW_H__41C157F8_5631_11D1_8CDB_006097C6A583__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/wdump/wdlview.h b/GeneralsMD/Code/Tools/wdump/wdlview.h index e2d657953b..28fb9103dd 100644 --- a/GeneralsMD/Code/Tools/wdump/wdlview.h +++ b/GeneralsMD/Code/Tools/wdump/wdlview.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_WDLVIEW_H__6C0D7C07_56CD_11D1_8CDC_006097C6A583__INCLUDED_) -#define AFX_WDLVIEW_H__6C0D7C07_56CD_11D1_8CDC_006097C6A583__INCLUDED_ - #pragma once + // WDLView.h : header file // @@ -68,5 +66,3 @@ class CWDumpListView : public CListView //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WDLVIEW_H__6C0D7C07_56CD_11D1_8CDC_006097C6A583__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/wdump/wdtview.h b/GeneralsMD/Code/Tools/wdump/wdtview.h index 484769477a..37590e07f6 100644 --- a/GeneralsMD/Code/Tools/wdump/wdtview.h +++ b/GeneralsMD/Code/Tools/wdump/wdtview.h @@ -16,10 +16,8 @@ ** along with this program. If not, see . */ -#if !defined(AFX_WDTVIEW_H__41C157F7_5631_11D1_8CDB_006097C6A583__INCLUDED_) -#define AFX_WDTVIEW_H__41C157F7_5631_11D1_8CDB_006097C6A583__INCLUDED_ - #pragma once + // WDTView.h : header file // @@ -79,5 +77,3 @@ class CWDumpTreeView : public CTreeView //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WDTVIEW_H__41C157F7_5631_11D1_8CDB_006097C6A583__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/wdump/wdump.h b/GeneralsMD/Code/Tools/wdump/wdump.h index 924adf5859..0cfc802e3b 100644 --- a/GeneralsMD/Code/Tools/wdump/wdump.h +++ b/GeneralsMD/Code/Tools/wdump/wdump.h @@ -19,9 +19,6 @@ // wdump.h : main header file for the WDUMP application // -#if !defined(AFX_WDUMP_H__41C157E7_5631_11D1_8CDB_006097C6A583__INCLUDED_) -#define AFX_WDUMP_H__41C157E7_5631_11D1_8CDB_006097C6A583__INCLUDED_ - #pragma once #ifndef __AFXWIN_H__ @@ -67,5 +64,3 @@ extern CWdumpApp theApp; //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WDUMP_H__41C157E7_5631_11D1_8CDB_006097C6A583__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/wdump/wdumpdoc.h b/GeneralsMD/Code/Tools/wdump/wdumpdoc.h index 79da8b2a79..5a6c941574 100644 --- a/GeneralsMD/Code/Tools/wdump/wdumpdoc.h +++ b/GeneralsMD/Code/Tools/wdump/wdumpdoc.h @@ -20,9 +20,6 @@ // ///////////////////////////////////////////////////////////////////////////// -#if !defined(AFX_WDUMPDOC_H__41C157ED_5631_11D1_8CDB_006097C6A583__INCLUDED_) -#define AFX_WDUMPDOC_H__41C157ED_5631_11D1_8CDB_006097C6A583__INCLUDED_ - #pragma once #include "chunk_d.h" @@ -77,5 +74,3 @@ class CWdumpDoc : public CDocument //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WDUMPDOC_H__41C157ED_5631_11D1_8CDB_006097C6A583__INCLUDED_) diff --git a/GeneralsMD/Code/Tools/wdump/wdview.h b/GeneralsMD/Code/Tools/wdump/wdview.h index 5c22b4fd00..de270893e5 100644 --- a/GeneralsMD/Code/Tools/wdump/wdview.h +++ b/GeneralsMD/Code/Tools/wdump/wdview.h @@ -20,9 +20,6 @@ // ///////////////////////////////////////////////////////////////////////////// -#if !defined(AFX_WDUMPVIEW_H__41C157EF_5631_11D1_8CDB_006097C6A583__INCLUDED_) -#define AFX_WDUMPVIEW_H__41C157EF_5631_11D1_8CDB_006097C6A583__INCLUDED_ - #pragma once class CWdumpView : public CView @@ -75,5 +72,3 @@ inline CWdumpDoc* CWdumpView::GetDocument() //{{AFX_INSERT_LOCATION}} // Microsoft Developer Studio will insert additional declarations immediately before the previous line. - -#endif // !defined(AFX_WDUMPVIEW_H__41C157EF_5631_11D1_8CDB_006097C6A583__INCLUDED_) diff --git a/scripts/cpp/harmonize_linebreaks_pragmaonce.py b/scripts/cpp/harmonize_linebreaks_pragmaonce.py new file mode 100644 index 0000000000..cb53e0d0d3 --- /dev/null +++ b/scripts/cpp/harmonize_linebreaks_pragmaonce.py @@ -0,0 +1,157 @@ +#!/usr/bin/env python3 +""" +format_pragma_once_spacing.py + +Ensure consistent spacing around '#pragma once' in .h files: + +- Exactly one blank line AFTER '#pragma once'. +- Exactly one blank line BEFORE '#pragma once' IF there is any non-blank content above it. + (If '#pragma once' is already the first non-blank content in the file, we do NOT insert + a leading blank line.) + +We leave everything else untouched. + +Outputs: +- total .h files found +- files changed +- files without '#pragma once' +""" + +from __future__ import annotations +import argparse +import re +from pathlib import Path + +RE_PRAGMA_ONCE = re.compile(r'^\s*#\s*pragma\s+once\s*$', re.IGNORECASE) + +def is_blank(s: str) -> bool: + return s.strip() == "" + +def normalize_pragma_once_spacing(text: str) -> tuple[str, bool]: + """ + For each '#pragma once' line in the file, enforce spacing rules. + Returns (new_text, changed). + """ + # Preserve final newline behaviour + had_trailing_nl = text.endswith("\n") + lines = text.splitlines() + + # Find all pragma indices + pragma_idxs = [i for i, ln in enumerate(lines) if RE_PRAGMA_ONCE.match(ln)] + if not pragma_idxs: + return text, False + + changed = False + # We'll operate on a mutable list; keep track of index shifts when inserting/removing + i = 0 + while i < len(lines): + if i in pragma_idxs: + # ----- BEFORE: ensure exactly one blank line IF there is any non-blank above ----- + # Count run of blank lines immediately above + j = i - 1 + blanks_before = 0 + while j >= 0 and is_blank(lines[j]): + blanks_before += 1 + j -= 1 + + has_nonblank_above = j >= 0 # there's some non-blank content above + + # If there is content above, enforce exactly one blank line before + if has_nonblank_above: + # Remove all blank lines immediately above + if blanks_before > 1: + # delete the extra blanks, keep none for now + del lines[i - blanks_before: i - 1] # keep one slot for later insert + i -= (blanks_before - 1) + changed = True + elif blanks_before == 0: + # none present now; we'll insert one below + pass + # After removals, ensure exactly one blank line + if i - 1 < 0 or not is_blank(lines[i - 1]): + lines.insert(i, "") + i += 1 # pragma shifts down by one + # Update pragma index list too + pragma_idxs = [p + 1 if p >= i - 1 else p for p in pragma_idxs] + changed = True + else: + # No nonblank content above; ensure there are zero blank lines above + if blanks_before > 0: + del lines[i - blanks_before:i] + i -= blanks_before + # Adjust pragma indices after deletion + removed = blanks_before + pragma_idxs = [p - removed if p >= i else p for p in pragma_idxs] + changed = True + + # Recompute blanks_after starting from (possibly) updated i + # ----- AFTER: ensure exactly one blank line after ----- + k = i + 1 + blanks_after = 0 + while k < len(lines) and is_blank(lines[k]): + blanks_after += 1 + k += 1 + + # Remove all blank lines after, then insert exactly one + if blanks_after != 1: + # remove all current blanks after + if blanks_after > 0: + del lines[i + 1 : i + 1 + blanks_after] + # adjust pragma indices after deletion (those after k shift left) + # Not strictly needed for correctness here + changed = True + # insert exactly one blank line + lines.insert(i + 1, "") + changed = True + + # Advance past the pragma and the single enforced blank after it + i = i + 2 + continue + + i += 1 + + new_text = "\n".join(lines) + ("\n" if had_trailing_nl else "") + return new_text, changed + +def main(): + ap = argparse.ArgumentParser(description="Ensure exactly one empty line before/after '#pragma once' in .h files.") + ap.add_argument("directory", type=Path, help="Root directory to scan recursively") + args = ap.parse_args() + + root: Path = args.directory + if not root.exists() or not root.is_dir(): + print(f"Error: {root} is not a directory") + raise SystemExit(2) + + headers = [p for p in root.rglob("*.h") if p.is_file()] + changed = 0 + no_pragma: list[str] = [] + + for hdr in headers: + try: + text = hdr.read_text(encoding="utf-8", errors="replace") + except Exception as e: + print(f"Read error: {hdr} ({e})") + continue + + new_text, did_change = normalize_pragma_once_spacing(text) + if did_change: + try: + hdr.write_text(new_text, encoding="utf-8") + changed += 1 + except Exception as e: + print(f"Write error: {hdr} ({e})") + else: + # Determine if it lacked pragma + if not RE_PRAGMA_ONCE.search(text): + no_pragma.append(str(hdr)) + + print(f"Total .h files found: {len(headers)}") + print(f"Files changed: {changed}") + if no_pragma: + print("Files without '#pragma once':") + for p in no_pragma: + print(f" - {p}") + +if __name__ == "__main__": + main() diff --git a/scripts/cpp/remove_include_guards_pragma.py b/scripts/cpp/remove_include_guards_pragma.py new file mode 100644 index 0000000000..d2554d7733 --- /dev/null +++ b/scripts/cpp/remove_include_guards_pragma.py @@ -0,0 +1,208 @@ +#!/usr/bin/env python3 +""" +remove_include_guards.py + +Recursively scan a directory for .h files and remove classic include guards +ONLY if: + 1) the file contains `#pragma once`, AND + 2) there is substantive content between the guard's #define and its matching #endif + (i.e., not just blank/comment lines). + +Safely handles both: +- #ifndef MACRO ... #define MACRO ... #endif +- #if !defined(MACRO) ... #define MACRO ... #endif + +Leaves #pragma once intact. Prints totals and files skipped (with reasons). +""" + +from __future__ import annotations +import argparse +import re +from pathlib import Path + +RE_PRAGMA_ONCE = re.compile(r'^\s*#\s*pragma\s+once\b', re.IGNORECASE) + +RE_IFNDEF = re.compile(r'^\s*#\s*ifndef\s+([A-Za-z_][A-Za-z0-9_]*)\s*(?:\/\/.*|/\*.*\*/\s*)?$', re.ASCII) +RE_IF_NOT_DEFINED = re.compile( + r'^\s*#\s*if\s*!+\s*defined\s*\(\s*([A-Za-z_][A-Za-z0-9_]*)\s*\)\s*(?:\/\/.*|/\*.*\*/\s*)?$', + re.ASCII, +) +RE_DEFINE = re.compile(r'^\s*#\s*define\s+([A-Za-z_][A-Za-z0-9_]*)\b.*$', re.ASCII) +RE_IF = re.compile(r'^\s*#\s*if(n?def)?\b', re.ASCII) # #if/#ifdef/#ifndef +RE_ENDIF = re.compile(r'^\s*#\s*endif\b', re.ASCII) + +def _strip_bom(text: str) -> str: + return text.lstrip('\ufeff') + +def has_pragma_once(lines: list[str]) -> bool: + return any(RE_PRAGMA_ONCE.match(l) for l in lines) + +def is_comment_or_blank(s: str) -> bool: + t = s.strip() + if not t: + return True + # Treat single-line comments and block-comment-only lines as non-substantive. + return t.startswith('//') or t.startswith('/*') or t.endswith('*/') + +def has_substantive_content(lines: list[str], start_idx: int, end_idx: int) -> bool: + """ + Return True if there's at least one 'substantive' line between start_idx (inclusive) + and end_idx (exclusive). Substantive means not just blank/comment-only. + Any preprocessor directive like #include, #if, #define (for other macros), + code, etc. counts as content. (#endif is outside this range by design.) + """ + for k in range(start_idx, end_idx): + s = lines[k] + if not is_comment_or_blank(s): + return True + return False + +def find_guard(lines: list[str], search_window: int = 150): + """ + Locate a classic include guard near the file start. + + Returns (i_if, i_define, macro, i_endif) or None. + """ + n = len(lines) + lim = min(search_window, n) + + for i in range(lim): + line = lines[i] + m1 = RE_IFNDEF.match(line) + m2 = RE_IF_NOT_DEFINED.match(line) + macro = None + if m1: + macro = m1.group(1) + elif m2: + macro = m2.group(1) + else: + continue + + # Find #define with the same macro within a few lines, skipping blanks/comments + j = i + 1 + max_lookahead = min(i + 10, n - 1) + found_define_index = None + while j <= max_lookahead: + l2 = lines[j] + if is_comment_or_blank(l2): + j += 1 + continue + mdef = RE_DEFINE.match(l2) + if mdef and mdef.group(1) == macro: + found_define_index = j + break + if found_define_index is None: + continue + + # Find the matching #endif for the opening #if/#ifndef at i + i_endif = match_endif(lines, start_index=found_define_index + 1, initial_depth=1) + if i_endif is None: + continue + + return (i, found_define_index, macro, i_endif) + + return None + +def match_endif(lines: list[str], start_index: int, initial_depth: int = 1): + depth = initial_depth + for k in range(start_index, len(lines)): + s = lines[k] + if not s.lstrip().startswith('#'): + continue + if RE_IF.match(s): + depth += 1 + elif RE_ENDIF.match(s): + depth -= 1 + if depth == 0: + return k + return None + +def remove_guard_from_text(text: str) -> tuple[str, bool, str | None]: + """ + Remove include guard if detected AND: + - file has #pragma once + - there is substantive content between #define and #endif + Returns (new_text, changed_bool, reason_if_not_changed). + """ + text = _strip_bom(text) + lines = text.splitlines() + + if not has_pragma_once(lines): + return text, False, "no #pragma once" + + found = find_guard(lines) + if not found: + return text, False, "no classic guard detected" + + i_if, i_define, macro, i_endif = found + + # NEW RULE: ensure the guarded region contains more than just the macro define. + if not has_substantive_content(lines, i_define + 1, i_endif): + # Likely a utility macro wrapper like: + # #ifndef X + # #define X ... + # #endif + return text, False, "guard region has no content (macro wrapper)" + + # Proceed to remove the guard + to_remove = {i_if, i_define} + if i_define + 1 < len(lines) and lines[i_define + 1].strip() == '': + to_remove.add(i_define + 1) + if i_if - 1 >= 0 and lines[i_if - 1].strip() == '': + to_remove.add(i_if - 1) + + to_remove.add(i_endif) + if i_endif - 1 >= 0 and lines[i_endif - 1].strip() == '': + to_remove.add(i_endif - 1) + + new_lines = [ln for idx, ln in enumerate(lines) if idx not in to_remove] + + # Tidy leading/trailing blanks + while new_lines and new_lines[0].strip() == '': + new_lines.pop(0) + while new_lines and new_lines[-1].strip() == '': + new_lines.pop() + + new_text = "\n".join(new_lines) + ("\n" if text.endswith("\n") else "") + return new_text, True, None + +def main(): + ap = argparse.ArgumentParser(description="Remove classic include guards from .h files that already use #pragma once, skipping macro-only wrappers.") + ap.add_argument("directory", type=Path, help="Root directory to scan recursively") + args = ap.parse_args() + + root: Path = args.directory + if not root.exists() or not root.is_dir(): + print(f"Error: {root} is not a directory") + raise SystemExit(2) + + all_headers = [p for p in root.rglob("*.h") if p.is_file()] + changed = 0 + failed: list[str] = [] + + for hdr in all_headers: + try: + text = hdr.read_text(encoding="utf-8", errors="replace") + except Exception as e: + failed.append(f"{hdr} (read-error: {e})") + continue + + new_text, did_change, reason = remove_guard_from_text(text) + if did_change: + try: + hdr.write_text(new_text, encoding="utf-8") + changed += 1 + except Exception as e: + failed.append(f"{hdr} (write-error: {e})") + else: + failed.append(f"{hdr} ({reason or 'unknown reason'})") + + print(f"Total .h files found: {len(all_headers)}") + print(f"Files changed: {changed}") + if failed: + print("Guards not removed from:") + for path in failed: + print(f" - {path}") + +if __name__ == "__main__": + main() diff --git a/scripts/cpp/replace_include_guards_with_pragma.py b/scripts/cpp/replace_include_guards_with_pragma.py new file mode 100644 index 0000000000..fc187ac52c --- /dev/null +++ b/scripts/cpp/replace_include_guards_with_pragma.py @@ -0,0 +1,246 @@ +#!/usr/bin/env python3 +""" +replace_guards_with_pragma_once.py + +Recursively scan a directory for .h files that DO NOT contain `#pragma once`. +For those files, detect classic include guards and replace the guard with a +single `#pragma once`. + +We replace only when: + - A classic guard is found near the start: + #ifndef MACRO OR #if !defined(MACRO) + #define MACRO #define MACRO + ... (substantive content) ... + #endif + - There is substantive content between the #define and its matching #endif + (i.e., more than just blank lines or comment-only lines), to avoid replacing + macro wrapper patterns like: + #ifndef ARRAY_SIZE + #define ARRAY_SIZE(x) ... + #endif + +Output: +- total .h files found +- files changed +- list of files not changed (with reason) +""" + +from __future__ import annotations +import argparse +import re +from pathlib import Path + +RE_PRAGMA_ONCE = re.compile(r'^\s*#\s*pragma\s+once\b', re.IGNORECASE) + +RE_IFNDEF = re.compile(r'^\s*#\s*ifndef\s+([A-Za-z_][A-Za-z0-9_]*)\s*(?:\/\/.*|/\*.*\*/\s*)?$', re.ASCII) +RE_IF_NOT_DEFINED = re.compile( + r'^\s*#\s*if\s*!+\s*defined\s*\(\s*([A-Za-z_][A-Za-z0-9_]*)\s*\)\s*(?:\/\/.*|/\*.*\*/\s*)?$', + re.ASCII, +) +RE_DEFINE = re.compile(r'^\s*#\s*define\s+([A-Za-z_][A-Za-z0-9_]*)\b.*$', re.ASCII) +RE_IF = re.compile(r'^\s*#\s*if(n?def)?\b', re.ASCII) # #if/#ifdef/#ifndef +RE_ENDIF = re.compile(r'^\s*#\s*endif\b', re.ASCII) + +def _strip_bom(text: str) -> str: + return text.lstrip('\ufeff') + +def has_pragma_once(lines: list[str]) -> bool: + return any(RE_PRAGMA_ONCE.match(l) for l in lines) + +def is_comment_or_blank(s: str) -> bool: + t = s.strip() + if not t: + return True + # treat single-line/comment-only lines as non-substantive + return t.startswith('//') or t.startswith('/*') or t.endswith('*/') + +def has_substantive_content(lines: list[str], start_idx: int, end_idx: int) -> bool: + """ + Return True if there's at least one non-blank, non-comment-only line + between start_idx (inclusive) and end_idx (exclusive). + """ + for k in range(start_idx, end_idx): + if not is_comment_or_blank(lines[k]): + return True + return False + +def match_endif(lines: list[str], start_index: int, initial_depth: int = 1): + """ + Find the index of the #endif that closes the #if/#ifndef starting before start_index. + Handles nested preprocessor blocks. + """ + depth = initial_depth + for k in range(start_index, len(lines)): + s = lines[k] + if not s.lstrip().startswith('#'): + continue + if RE_IF.match(s): + depth += 1 + elif RE_ENDIF.match(s): + depth -= 1 + if depth == 0: + return k + return None + +def find_guard(lines: list[str], search_window: int = 200): + """ + Locate classic include guard near the beginning (after possible license header). + Returns (i_if, i_define, macro, i_endif) or None. + """ + n = len(lines) + lim = min(search_window, n) + + for i in range(lim): + line = lines[i] + m1 = RE_IFNDEF.match(line) + m2 = RE_IF_NOT_DEFINED.match(line) + macro = None + if m1: + macro = m1.group(1) + elif m2: + macro = m2.group(1) + else: + continue + + # Find #define with the same macro in the next few lines, skipping blanks/comments + j = i + 1 + max_lookahead = min(i + 12, n - 1) + found_define_index = None + while j <= max_lookahead: + l2 = lines[j] + if is_comment_or_blank(l2): + j += 1 + continue + mdef = RE_DEFINE.match(l2) + if mdef and mdef.group(1) == macro: + found_define_index = j + break + if found_define_index is None: + continue + + # Find the closing #endif for this guard block + i_endif = match_endif(lines, start_index=found_define_index + 1, initial_depth=1) + if i_endif is None: + continue + + return (i, found_define_index, macro, i_endif) + + return None + +def replace_guard_with_pragma_once(text: str): + """ + If file lacks #pragma once and has a classic include guard with substantive content, + replace the guard with a single '#pragma once'. + Returns (new_text, changed_bool, reason_if_not_changed). + """ + text = _strip_bom(text) + lines = text.splitlines() + + if has_pragma_once(lines): + return text, False, "already has #pragma once" + + found = find_guard(lines) + if not found: + return text, False, "no classic guard detected" + + i_if, i_define, macro, i_endif = found + + # Ensure the region contains more than just the macro define + if not has_substantive_content(lines, i_define + 1, i_endif): + return text, False, "guard region has no content (macro wrapper)" + + # Build new content: + # - Replace the opening guard pair with a single '#pragma once' + # - Remove the closing '#endif' + new_lines = list(lines) + + # Prepare a tidy insertion: remove surrounding blank lines near opening/closing + remove_idxs = set() + + # Remove opening lines + remove_idxs.add(i_if) + remove_idxs.add(i_define) + + # Optional tidy: blank line immediately after the #define + if i_define + 1 < len(new_lines) and new_lines[i_define + 1].strip() == '': + remove_idxs.add(i_define + 1) + + # Optional tidy: blank line immediately before the #if + if i_if - 1 >= 0 and new_lines[i_if - 1].strip() == '': + remove_idxs.add(i_if - 1) + + # Remove closing '#endif' and an optional blank before it + remove_idxs.add(i_endif) + if i_endif - 1 >= 0 and new_lines[i_endif - 1].strip() == '': + remove_idxs.add(i_endif - 1) + + # Apply removals + new_lines = [ln for idx, ln in enumerate(new_lines) if idx not in remove_idxs] + + # Insert '#pragma once' at the original guard start position (adjusted for removals) + # Compute the new insertion index as the smallest kept index >= i_if + insertion_index = 0 + count = 0 + for idx in range(len(lines)): + if idx in remove_idxs: + continue + if idx >= i_if: + insertion_index = count + break + count += 1 + else: + insertion_index = 0 # fallback (shouldn't happen) + + new_lines.insert(insertion_index, "#pragma once") + + # Tidy leading/trailing blank lines + while new_lines and new_lines[0].strip() == '': + new_lines.pop(0) + while new_lines and new_lines[-1].strip() == '': + new_lines.pop() + + new_text = "\n".join(new_lines) + ("\n" if text.endswith("\n") else "") + return new_text, True, None + +def main(): + ap = argparse.ArgumentParser( + description="Replace classic include guards with #pragma once in .h files that don't already have it." + ) + ap.add_argument("directory", type=Path, help="Root directory to scan recursively") + args = ap.parse_args() + + root: Path = args.directory + if not root.exists() or not root.is_dir(): + print(f"Error: {root} is not a directory") + raise SystemExit(2) + + all_headers = [p for p in root.rglob("*.h") if p.is_file()] + changed = 0 + skipped: list[str] = [] + + for hdr in all_headers: + try: + text = hdr.read_text(encoding="utf-8", errors="replace") + except Exception as e: + skipped.append(f"{hdr} (read-error: {e})") + continue + + new_text, did_change, reason = replace_guard_with_pragma_once(text) + if did_change: + try: + hdr.write_text(new_text, encoding="utf-8") + changed += 1 + except Exception as e: + skipped.append(f"{hdr} (write-error: {e})") + else: + skipped.append(f"{hdr} ({reason or 'unknown reason'})") + + print(f"Total .h files found: {len(all_headers)}") + print(f"Files changed: {changed}") + if skipped: + print("Not changed:") + for path in skipped: + print(f" - {path}") + +if __name__ == "__main__": + main()