From 4d57f7872644a19ee74e25e179df88365fb320ea Mon Sep 17 00:00:00 2001 From: Bart Roossien Date: Thu, 23 Oct 2025 16:01:52 +0200 Subject: [PATCH 1/5] refactor: Remove redundant include guards --- Core/GameEngine/Include/Common/ArchiveFile.h | 6 - .../Include/Common/ArchiveFileSystem.h | 6 - Core/GameEngine/Include/Common/AsciiString.h | 6 - Core/GameEngine/Include/Common/AudioAffect.h | 6 - .../Include/Common/AudioEventInfo.h | 5 - .../GameEngine/Include/Common/AudioEventRTS.h | 6 - .../Include/Common/AudioHandleSpecialValues.h | 6 - .../Include/Common/AudioRandomValue.h | 6 - Core/GameEngine/Include/Common/AudioRequest.h | 6 - .../GameEngine/Include/Common/AudioSettings.h | 6 - Core/GameEngine/Include/Common/Debug.h | 6 - .../Include/Common/DynamicAudioEventInfo.h | 9 - Core/GameEngine/Include/Common/FileSystem.h | 8 - Core/GameEngine/Include/Common/GameAudio.h | 6 - Core/GameEngine/Include/Common/GameMemory.h | 7 - Core/GameEngine/Include/Common/GameMusic.h | 6 - Core/GameEngine/Include/Common/GameSounds.h | 6 - Core/GameEngine/Include/Common/LocalFile.h | 7 - .../Include/Common/LocalFileSystem.h | 6 - Core/GameEngine/Include/Common/MiscAudio.h | 8 - Core/GameEngine/Include/Common/RAMFile.h | 7 - Core/GameEngine/Include/Common/RandomValue.h | 6 - .../Include/Common/StreamingArchiveFile.h | 7 - .../GameEngine/Include/Common/UnicodeString.h | 6 - Core/GameEngine/Include/Common/Xfer.h | 7 - Core/GameEngine/Include/Common/XferCRC.h | 7 - Core/GameEngine/Include/Common/XferDeepCRC.h | 7 - Core/GameEngine/Include/Common/XferLoad.h | 7 - Core/GameEngine/Include/Common/XferSave.h | 7 - Core/GameEngine/Include/Common/crc.h | 6 - Core/GameEngine/Include/Common/file.h | 10 - .../Include/GameClient/ClientRandomValue.h | 6 - .../Include/GameClient/VideoPlayer.h | 6 - .../Include/GameClient/WindowVideoManager.h | 6 - .../Include/GameLogic/LogicRandomValue.h | 6 - .../Include/StdDevice/Common/StdBIGFile.h | 6 - .../StdDevice/Common/StdBIGFileSystem.h | 6 - .../Include/StdDevice/Common/StdLocalFile.h | 6 - .../StdDevice/Common/StdLocalFileSystem.h | 5 - .../VideoDevice/Bink/BinkVideoPlayer.h | 7 - .../VideoDevice/FFmpeg/FFmpegVideoPlayer.h | 7 - .../W3DDevice/GameClient/W3DVideoBuffer.h | 6 - .../Include/Win32Device/Common/Win32BIGFile.h | 6 - .../Win32Device/Common/Win32BIGFileSystem.h | 6 - .../Win32Device/Common/Win32LocalFile.h | 6 - .../Win32Device/Common/Win32LocalFileSystem.h | 5 - Core/Libraries/Include/Lib/BaseTypeCore.h | 6 - Core/Libraries/Include/rts/debug.h | 5 - Core/Libraries/Include/rts/profile.h | 5 - .../Source/Compression/Compression.h | 6 - Core/Libraries/Source/Compression/EAC/gimex.h | 6 - Core/Libraries/Source/WWVegas/WW3D2/aabtree.h | 6 - Core/Libraries/Source/WWVegas/WW3D2/agg_def.h | 7 - .../Source/WWVegas/WW3D2/animatedsoundmgr.h | 7 - .../Source/WWVegas/WW3D2/assetstatus.h | 6 - .../Source/WWVegas/WW3D2/bitmaphandler.h | 7 - .../Libraries/Source/WWVegas/WW3D2/bwrender.h | 8 - Core/Libraries/Source/WWVegas/WW3D2/classid.h | 7 - Core/Libraries/Source/WWVegas/WW3D2/collect.h | 6 - .../Source/WWVegas/WW3D2/colorspace.h | 8 - Core/Libraries/Source/WWVegas/WW3D2/coltest.h | 7 - Core/Libraries/Source/WWVegas/WW3D2/coltype.h | 9 - .../Source/WWVegas/WW3D2/composite.h | 8 - .../Libraries/Source/WWVegas/WW3D2/decalsys.h | 10 - Core/Libraries/Source/WWVegas/WW3D2/distlod.h | 6 - Core/Libraries/Source/WWVegas/WW3D2/dllist.h | 6 - Core/Libraries/Source/WWVegas/WW3D2/dx8list.h | 8 - .../Source/WWVegas/WW3D2/dx8polygonrenderer.h | 6 - .../Libraries/Source/WWVegas/WW3D2/dynamesh.h | 6 - Core/Libraries/Source/WWVegas/WW3D2/font3d.h | 7 - .../Libraries/Source/WWVegas/WW3D2/formconv.h | 6 - .../Libraries/Source/WWVegas/WW3D2/framgrab.h | 6 - Core/Libraries/Source/WWVegas/WW3D2/hanim.h | 6 - Core/Libraries/Source/WWVegas/WW3D2/hcanim.h | 8 - Core/Libraries/Source/WWVegas/WW3D2/hmdldef.H | 6 - Core/Libraries/Source/WWVegas/WW3D2/htree.h | 8 - .../Libraries/Source/WWVegas/WW3D2/intersec.h | 7 - Core/Libraries/Source/WWVegas/WW3D2/inttest.h | 8 - Core/Libraries/Source/WWVegas/WW3D2/layer.h | 9 - Core/Libraries/Source/WWVegas/WW3D2/line3d.h | 6 - Core/Libraries/Source/WWVegas/WW3D2/matinfo.h | 6 - Core/Libraries/Source/WWVegas/WW3D2/meshdam.h | 6 - .../Libraries/Source/WWVegas/WW3D2/metalmap.h | 6 - .../Source/WWVegas/WW3D2/missingtexture.h | 7 - Core/Libraries/Source/WWVegas/WW3D2/pivot.h | 8 - Core/Libraries/Source/WWVegas/WW3D2/pointgr.h | 8 - .../Libraries/Source/WWVegas/WW3D2/polyinfo.h | 7 - Core/Libraries/Source/WWVegas/WW3D2/predlod.h | 6 - .../Source/WWVegas/WW3D2/prim_anim.h | 6 - Core/Libraries/Source/WWVegas/WW3D2/proto.h | 8 - Core/Libraries/Source/WWVegas/WW3D2/proxy.h | 8 - Core/Libraries/Source/WWVegas/WW3D2/rddesc.h | 8 - .../Source/WWVegas/WW3D2/render2dsentence.h | 6 - Core/Libraries/Source/WWVegas/WW3D2/rendobj.h | 7 - Core/Libraries/Source/WWVegas/WW3D2/ringobj.h | 8 - .../Libraries/Source/WWVegas/WW3D2/robjlist.h | 8 - Core/Libraries/Source/WWVegas/WW3D2/segline.h | 6 - .../Source/WWVegas/WW3D2/shattersystem.h | 9 - Core/Libraries/Source/WWVegas/WW3D2/snapPts.h | 6 - .../Source/WWVegas/WW3D2/soundrobj.h | 7 - .../Source/WWVegas/WW3D2/sphereobj.h | 8 - .../Source/WWVegas/WW3D2/static_sort_list.h | 10 - .../Source/WWVegas/WW3D2/statistics.h | 6 - Core/Libraries/Source/WWVegas/WW3D2/streak.h | 14 -- .../Source/WWVegas/WW3D2/stripoptimizer.h | 6 - .../Source/WWVegas/WW3D2/surfaceclass.h | 8 - .../Libraries/Source/WWVegas/WW3D2/textdraw.h | 6 - .../Source/WWVegas/WW3D2/visrasterizer.h | 7 - .../Source/WWVegas/WW3D2/w3d_obsolete.h | 7 - .../Libraries/Source/WWVegas/WW3D2/w3d_util.h | 8 - Core/Libraries/Source/WWVegas/WW3D2/w3derr.h | 6 - .../Source/WWVegas/WW3D2/w3dexclusionlist.h | 8 - .../Source/WWVegas/WW3D2/ww3dformat.h | 6 - Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h | 6 - .../Libraries/Source/WWVegas/WW3D2/ww3dtrig.h | 6 - .../WWVegas/WWAudio/AABTreeSoundCullClass.h | 7 - .../Source/WWVegas/WWAudio/AudibleSound.h | 7 - .../Source/WWVegas/WWAudio/AudioEvents.h | 8 - .../Source/WWVegas/WWAudio/AudioSaveLoad.h | 9 - .../Source/WWVegas/WWAudio/FilteredSound.h | 8 - .../Source/WWVegas/WWAudio/Listener.h | 7 - .../Source/WWVegas/WWAudio/LogicalListener.h | 8 - .../Source/WWVegas/WWAudio/LogicalSound.h | 8 - .../Source/WWVegas/WWAudio/PriorityVector.h | 7 - .../Source/WWVegas/WWAudio/Sound3D.h | 7 - .../Source/WWVegas/WWAudio/SoundBuffer.h | 7 - .../Source/WWVegas/WWAudio/SoundChunkIDs.h | 7 - .../Source/WWVegas/WWAudio/SoundCullObj.h | 6 - .../Source/WWVegas/WWAudio/SoundPseudo3D.h | 7 - .../Source/WWVegas/WWAudio/SoundScene.h | 7 - .../Source/WWVegas/WWAudio/SoundSceneObj.h | 9 - .../Source/WWVegas/WWAudio/Threads.h | 7 - .../Source/WWVegas/WWAudio/WWAudio.h | 7 - .../Source/WWVegas/WWAudio/listenerhandle.h | 7 - .../Source/WWVegas/WWAudio/sound2dhandle.h | 7 - .../Source/WWVegas/WWAudio/sound3dhandle.h | 7 - .../Source/WWVegas/WWAudio/soundhandle.h | 7 - .../WWVegas/WWAudio/soundstreamhandle.h | 7 - .../Source/WWVegas/WWDebug/wwdebug.h | 6 - .../Libraries/Source/WWVegas/WWDebug/wwhack.h | 6 - .../Source/WWVegas/WWDebug/wwmemlog.h | 11 - .../Source/WWVegas/WWDebug/wwprofile.h | 6 - .../Source/WWVegas/WWDownload/Registry.h | 6 - Core/Libraries/Source/WWVegas/WWLib/BSEARCH.H | 7 - Core/Libraries/Source/WWVegas/WWLib/BUFF.H | 7 - Core/Libraries/Source/WWVegas/WWLib/CRC.H | 7 - Core/Libraries/Source/WWVegas/WWLib/Except.h | 6 - .../Source/WWVegas/WWLib/FastAllocator.h | 17 -- .../Libraries/Source/WWVegas/WWLib/HASHLIST.H | 24 -- Core/Libraries/Source/WWVegas/WWLib/INDEX.H | 9 - Core/Libraries/Source/WWVegas/WWLib/INI.H | 6 - .../Libraries/Source/WWVegas/WWLib/LISTNODE.H | 7 - Core/Libraries/Source/WWVegas/WWLib/MPU.H | 6 - Core/Libraries/Source/WWVegas/WWLib/PIPE.H | 6 - Core/Libraries/Source/WWVegas/WWLib/Point.h | 7 - Core/Libraries/Source/WWVegas/WWLib/RANDOM.H | 6 - Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H | 6 - Core/Libraries/Source/WWVegas/WWLib/SLIST.H | 6 - Core/Libraries/Source/WWVegas/WWLib/SLNODE.H | 6 - Core/Libraries/Source/WWVegas/WWLib/STRAW.H | 7 - Core/Libraries/Source/WWVegas/WWLib/Vector.H | 6 - Core/Libraries/Source/WWVegas/WWLib/WWFILE.H | 6 - Core/Libraries/Source/WWVegas/WWLib/XPIPE.H | 6 - Core/Libraries/Source/WWVegas/WWLib/XSTRAW.H | 7 - Core/Libraries/Source/WWVegas/WWLib/always.h | 7 - Core/Libraries/Source/WWVegas/WWLib/argv.h | 7 - Core/Libraries/Source/WWVegas/WWLib/b64pipe.h | 6 - .../Libraries/Source/WWVegas/WWLib/b64straw.h | 7 - Core/Libraries/Source/WWVegas/WWLib/bittype.h | 6 - Core/Libraries/Source/WWVegas/WWLib/bound.h | 8 - .../Libraries/Source/WWVegas/WWLib/bufffile.h | 6 - Core/Libraries/Source/WWVegas/WWLib/chunkio.h | 8 - .../Source/WWVegas/WWLib/cpudetect.h | 7 - Core/Libraries/Source/WWVegas/WWLib/cstraw.h | 9 - .../Libraries/Source/WWVegas/WWLib/ffactory.h | 6 - Core/Libraries/Source/WWVegas/WWLib/gcd_lcm.h | 6 - Core/Libraries/Source/WWVegas/WWLib/hash.h | 7 - .../Libraries/Source/WWVegas/WWLib/hashcalc.h | 8 - .../Source/WWVegas/WWLib/hashtemplate.h | 8 - .../Libraries/Source/WWVegas/WWLib/iostruct.h | 9 - Core/Libraries/Source/WWVegas/WWLib/mempool.h | 8 - Core/Libraries/Source/WWVegas/WWLib/mmsys.h | 6 - .../Source/WWVegas/WWLib/multilist.h | 8 - Core/Libraries/Source/WWVegas/WWLib/mutex.h | 6 - Core/Libraries/Source/WWVegas/WWLib/nstrdup.h | 6 - Core/Libraries/Source/WWVegas/WWLib/ntree.h | 6 - Core/Libraries/Source/WWVegas/WWLib/rcfile.h | 7 - .../Libraries/Source/WWVegas/WWLib/readline.h | 6 - Core/Libraries/Source/WWVegas/WWLib/realcrc.h | 7 - Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h | 6 - .../Libraries/Source/WWVegas/WWLib/refcount.h | 7 - Core/Libraries/Source/WWVegas/WWLib/regexpr.h | 8 - .../Libraries/Source/WWVegas/WWLib/registry.h | 6 - .../Libraries/Source/WWVegas/WWLib/sharebuf.h | 6 - .../Source/WWVegas/WWLib/simplevec.h | 7 - .../Libraries/Source/WWVegas/WWLib/strtok_r.h | 6 - .../Libraries/Source/WWVegas/WWLib/textfile.h | 8 - Core/Libraries/Source/WWVegas/WWLib/thread.h | 6 - Core/Libraries/Source/WWVegas/WWLib/trect.h | 8 - Core/Libraries/Source/WWVegas/WWLib/trim.h | 6 - Core/Libraries/Source/WWVegas/WWLib/uarray.h | 8 - Core/Libraries/Source/WWVegas/WWLib/verchk.h | 8 - .../Source/WWVegas/WWLib/widestring.h | 7 - Core/Libraries/Source/WWVegas/WWLib/win.h | 6 - .../Libraries/Source/WWVegas/WWLib/wwstring.h | 7 - .../Source/WWVegas/WWMath/Vector3i.h | 6 - Core/Libraries/Source/WWVegas/WWMath/aabox.h | 7 - .../Source/WWVegas/WWMath/aabtreecull.h | 9 - .../Libraries/Source/WWVegas/WWMath/aaplane.h | 6 - .../Source/WWVegas/WWMath/cardinalspline.h | 8 - .../Libraries/Source/WWVegas/WWMath/castres.h | 7 - .../Source/WWVegas/WWMath/catmullromspline.h | 6 - .../Libraries/Source/WWVegas/WWMath/colmath.h | 6 - .../Source/WWVegas/WWMath/colmathaabox.h | 7 - .../Source/WWVegas/WWMath/colmathfrustum.h | 6 - .../Source/WWVegas/WWMath/colmathinlines.h | 8 - .../Libraries/Source/WWVegas/WWMath/cullsys.h | 7 - .../Source/WWVegas/WWMath/culltype.h | 7 - Core/Libraries/Source/WWVegas/WWMath/curve.h | 7 - Core/Libraries/Source/WWVegas/WWMath/euler.h | 7 - .../Libraries/Source/WWVegas/WWMath/frustum.h | 9 - .../Source/WWVegas/WWMath/hermitespline.h | 7 - .../Libraries/Source/WWVegas/WWMath/lineseg.h | 7 - .../Libraries/Source/WWVegas/WWMath/matrix3.h | 6 - .../Source/WWVegas/WWMath/matrix3d.h | 5 - .../Libraries/Source/WWVegas/WWMath/matrix4.h | 7 - Core/Libraries/Source/WWVegas/WWMath/obbox.h | 6 - Core/Libraries/Source/WWVegas/WWMath/ode.h | 7 - Core/Libraries/Source/WWVegas/WWMath/plane.h | 6 - Core/Libraries/Source/WWVegas/WWMath/pot.h | 4 - Core/Libraries/Source/WWVegas/WWMath/quat.h | 10 - Core/Libraries/Source/WWVegas/WWMath/rect.h | 7 - Core/Libraries/Source/WWVegas/WWMath/sphere.h | 9 - .../Source/WWVegas/WWMath/tcbspline.h | 8 - Core/Libraries/Source/WWVegas/WWMath/tri.h | 6 - Core/Libraries/Source/WWVegas/WWMath/v3_rnd.h | 9 - .../Libraries/Source/WWVegas/WWMath/vector2.h | 8 - .../Source/WWVegas/WWMath/vector2i.h | 7 - .../Libraries/Source/WWVegas/WWMath/vector3.h | 7 - .../Libraries/Source/WWVegas/WWMath/vector4.h | 8 - .../Source/WWVegas/WWMath/vehiclecurve.h | 8 - Core/Libraries/Source/WWVegas/WWMath/vp.h | 6 - Core/Libraries/Source/WWVegas/WWMath/wwmath.h | 6 - .../Source/WWVegas/WWSaveLoad/definition.h | 7 - .../WWVegas/WWSaveLoad/definitionclassids.h | 8 - .../WWVegas/WWSaveLoad/definitionfactory.h | 7 - .../WWVegas/WWSaveLoad/definitionfactorymgr.h | 7 - .../Source/WWVegas/WWSaveLoad/definitionmgr.h | 7 - .../Source/WWVegas/WWSaveLoad/editable.h | 10 - .../Source/WWVegas/WWSaveLoad/parameter.h | 8 - .../Source/WWVegas/WWSaveLoad/parameterlist.h | 8 - .../WWVegas/WWSaveLoad/parametertypes.h | 8 - .../Source/WWVegas/WWSaveLoad/persist.h | 8 - .../WWVegas/WWSaveLoad/persistfactory.h | 7 - .../Source/WWVegas/WWSaveLoad/pointerremap.h | 7 - .../Source/WWVegas/WWSaveLoad/saveload.h | 8 - .../Source/WWVegas/WWSaveLoad/saveloadids.h | 7 - .../WWVegas/WWSaveLoad/saveloadstatus.h | 6 - .../WWVegas/WWSaveLoad/saveloadsubsystem.h | 8 - .../WWVegas/WWSaveLoad/simpleparameter.h | 7 - .../Source/WWVegas/WWSaveLoad/twiddler.h | 8 - .../Source/WWVegas/WWSaveLoad/wwsaveload.h | 8 - Core/Libraries/Source/debug/_pch.h | 6 - Core/Libraries/Source/debug/debug.h | 6 - Core/Libraries/Source/debug/debug_cmd.h | 6 - Core/Libraries/Source/debug/debug_debug.h | 6 - Core/Libraries/Source/debug/debug_doc.h | 6 - Core/Libraries/Source/debug/debug_io.h | 6 - Core/Libraries/Source/debug/debug_macro.h | 6 - Core/Libraries/Source/debug/debug_stack.h | 6 - Core/Libraries/Source/debug/internal.h | 6 - Core/Libraries/Source/debug/internal_except.h | 6 - Core/Libraries/Source/debug/internal_io.h | 6 - Core/Libraries/Source/debug/test2/StdAfx.h | 6 - Core/Libraries/Source/profile/_pch.h | 6 - Core/Libraries/Source/profile/internal.h | 6 - Core/Libraries/Source/profile/internal_cmd.h | 6 - .../Source/profile/internal_funclevel.h | 6 - .../Source/profile/internal_highlevel.h | 6 - .../Source/profile/internal_result.h | 6 - Core/Libraries/Source/profile/profile.h | 6 - Core/Libraries/Source/profile/profile_doc.h | 6 - .../Source/profile/profile_funclevel.h | 6 - .../Source/profile/profile_highlevel.h | 6 - .../Libraries/Source/profile/profile_result.h | 6 - Core/Tools/Autorun/CDCNTRL.H | 9 - Core/Tools/Autorun/GameText.h | 7 - Core/Tools/Autorun/GetCD.h | 7 - Core/Tools/Autorun/Locale_API.h | 6 - Core/Tools/Autorun/POINT.h | 7 - Core/Tools/Autorun/RECT.h | 7 - Core/Tools/Autorun/TTFont.h | 7 - Core/Tools/Autorun/Utils.h | 7 - Core/Tools/Autorun/WSYS_FileSystem.h | 8 - Core/Tools/Autorun/WSYS_RAMFile.h | 7 - Core/Tools/Autorun/WSYS_StdFile.h | 7 - Core/Tools/Autorun/WSYS_StdFileSystem.h | 8 - Core/Tools/Autorun/WSYS_file.h | 7 - Core/Tools/Autorun/WinFix.H | 6 - Core/Tools/Autorun/Wnd_File.h | 6 - Core/Tools/Autorun/leanAndMeanAutorun.h | 6 - Core/Tools/Babylon/Babylon.h | 6 - Core/Tools/Babylon/BabylonDlg.h | 6 - Core/Tools/Babylon/DlgProxy.h | 6 - Core/Tools/Babylon/ExportDlg.h | 6 - Core/Tools/Babylon/GenerateDlg.h | 6 - Core/Tools/Babylon/MatchDlg.h | 6 - Core/Tools/Babylon/ProceedDlg.h | 6 - Core/Tools/Babylon/Report.h | 6 - Core/Tools/Babylon/RetranslateDlg.h | 6 - Core/Tools/Babylon/StdAfx.h | 5 - Core/Tools/Babylon/VIEWDBSII.h | 6 - Core/Tools/Babylon/VerifyDlg.h | 6 - Core/Tools/Babylon/VerifyTextDlg.h | 6 - Core/Tools/DebugWindow/DebugWindow.h | 6 - Core/Tools/DebugWindow/StdAfx.h | 6 - .../ImagePacker/Include/ImageDirectory.h | 7 - Core/Tools/ImagePacker/Include/ImageInfo.h | 7 - Core/Tools/ImagePacker/Include/ImagePacker.h | 7 - Core/Tools/ImagePacker/Include/TexturePage.h | 7 - Core/Tools/ImagePacker/Include/WinMain.h | 7 - Core/Tools/ImagePacker/Include/WindowProc.h | 7 - Core/Tools/Launcher/Toolkit/Support/Visualc.h | 5 - Core/Tools/MapCacheBuilder/Include/WinMain.h | 7 - Core/Tools/PATCHGET/DownloadManager.h | 6 - Core/Tools/PATCHGET/Registry.h | 6 - Core/Tools/W3DView/AddToLineupDialog.h | 6 - Core/Tools/W3DView/AdvancedAnimSheet.h | 6 - Core/Tools/W3DView/AggregateNameDialog.h | 6 - Core/Tools/W3DView/AmbientLightDialog.h | 6 - Core/Tools/W3DView/AnimMixingPage.h | 6 - Core/Tools/W3DView/AnimReportPage.h | 6 - .../W3DView/AnimatedSoundOptionsDialog.h | 6 - Core/Tools/W3DView/AnimationPropPage.h | 6 - Core/Tools/W3DView/AnimationSpeed.h | 6 - Core/Tools/W3DView/AssetInfo.h | 8 - Core/Tools/W3DView/AssetPropertySheet.h | 6 - Core/Tools/W3DView/AssetTypes.h | 7 - Core/Tools/W3DView/BackgroundBMPDialog.h | 6 - Core/Tools/W3DView/BackgroundColorDialog.h | 6 - Core/Tools/W3DView/BackgroundObjectDialog.h | 6 - Core/Tools/W3DView/BoneMgrDialog.h | 6 - Core/Tools/W3DView/CameraDistanceDialog.h | 6 - Core/Tools/W3DView/CameraSettingsDialog.h | 6 - Core/Tools/W3DView/ColorBar.h | 6 - Core/Tools/W3DView/ColorPicker.h | 6 - Core/Tools/W3DView/ColorPickerDialogClass.h | 6 - Core/Tools/W3DView/ColorSelectionDialog.h | 6 - Core/Tools/W3DView/DataTreeView.h | 7 - Core/Tools/W3DView/DeviceSelectionDialog.h | 6 - Core/Tools/W3DView/DialogToolbar.h | 8 - Core/Tools/W3DView/DirectoryDialog.h | 8 - Core/Tools/W3DView/EditLODDialog.h | 6 - Core/Tools/W3DView/EmitterColorPropPage.h | 6 - Core/Tools/W3DView/EmitterFramePropPage.h | 6 - Core/Tools/W3DView/EmitterGeneralPropPage.h | 6 - Core/Tools/W3DView/EmitterInstanceList.h | 6 - Core/Tools/W3DView/EmitterLineGroupPropPage.h | 6 - Core/Tools/W3DView/EmitterLinePropPage.h | 6 - Core/Tools/W3DView/EmitterParticlePropPage.h | 7 - Core/Tools/W3DView/EmitterPhysicsPropPage.h | 6 - Core/Tools/W3DView/EmitterPropertySheet.h | 6 - Core/Tools/W3DView/EmitterRotationPropPage.h | 6 - Core/Tools/W3DView/EmitterSizePropPage.h | 6 - Core/Tools/W3DView/EmitterUserPropPage.h | 6 - Core/Tools/W3DView/GammaDialog.h | 6 - Core/Tools/W3DView/GraphicView.h | 6 - Core/Tools/W3DView/HierarchyPropPage.h | 6 - Core/Tools/W3DView/MainFrm.h | 6 - Core/Tools/W3DView/MeshPropPage.h | 6 - Core/Tools/W3DView/OpacitySettingsDialog.h | 6 - Core/Tools/W3DView/OpacityVectorDialog.h | 6 - .../Tools/W3DView/ParticleBlurTimeKeyDialog.h | 6 - Core/Tools/W3DView/ParticleFrameKeyDialog.h | 6 - .../Tools/W3DView/ParticleRotationKeyDialog.h | 6 - Core/Tools/W3DView/ParticleSizeDialog.h | 6 - Core/Tools/W3DView/PlaySoundDialog.h | 6 - Core/Tools/W3DView/ResolutionDialog.h | 6 - Core/Tools/W3DView/RestrictedFileDialog.h | 6 - Core/Tools/W3DView/RingColorPropPage.h | 7 - Core/Tools/W3DView/RingGeneralPropPage.h | 6 - Core/Tools/W3DView/RingPropertySheet.h | 6 - Core/Tools/W3DView/RingSizePropPage.h | 6 - Core/Tools/W3DView/SaveSettingsDialog.h | 6 - Core/Tools/W3DView/ScaleDialog.h | 6 - Core/Tools/W3DView/SceneLightDialog.h | 6 - Core/Tools/W3DView/ScreenCursor.h | 7 - Core/Tools/W3DView/SoundEditDialog.h | 6 - Core/Tools/W3DView/SphereColorPropPage.h | 7 - Core/Tools/W3DView/SphereGeneralPropPage.h | 6 - Core/Tools/W3DView/SpherePropertySheet.h | 6 - Core/Tools/W3DView/SphereSizePropPage.h | 6 - Core/Tools/W3DView/SphereUtils.h | 8 - Core/Tools/W3DView/StdAfx.h | 6 - Core/Tools/W3DView/TextureMgrDialog.h | 6 - Core/Tools/W3DView/TexturePathDialog.h | 6 - Core/Tools/W3DView/TextureSettingsDialog.h | 6 - Core/Tools/W3DView/Vector3RndCombo.H | 6 - Core/Tools/W3DView/ViewerAssetMgr.h | 7 - Core/Tools/W3DView/ViewerScene.h | 7 - Core/Tools/W3DView/VolumeRandomDialog.h | 6 - Core/Tools/W3DView/W3DView.h | 6 - Core/Tools/W3DView/W3DViewDoc.h | 8 - Core/Tools/W3DView/W3DViewView.h | 6 - Core/Tools/WW3D/max2w3d/FormClass.h | 6 - Core/Tools/WW3D/max2w3d/LightGlareSave.h | 8 - Core/Tools/WW3D/max2w3d/SnapPoints.h | 6 - Core/Tools/WW3D/max2w3d/aabtreebuilder.h | 10 - Core/Tools/WW3D/max2w3d/colboxsave.h | 8 - Core/Tools/WW3D/max2w3d/dazzlesave.h | 13 -- Core/Tools/WW3D/max2w3d/meshbuild.h | 6 - Core/Tools/WW3D/max2w3d/meshsave.h | 10 - Core/Tools/WW3D/max2w3d/nullsave.h | 9 - Core/Tools/WW3D/max2w3d/w3d_file.h | 7 - Core/Tools/WW3D/max2w3d/w3d_obsolete.h | 7 - Core/Tools/WW3D/max2w3d/w3dmtl.h | 8 - Core/Tools/WW3D/pluglib/WWmatrix3.h | 6 - Core/Tools/WW3D/pluglib/aaplane.h | 6 - Core/Tools/WW3D/pluglib/always.h | 7 - Core/Tools/WW3D/pluglib/chunkio.h | 8 - Core/Tools/WW3D/pluglib/hashcalc.h | 8 - Core/Tools/WW3D/pluglib/iostruct.h | 9 - Core/Tools/WW3D/pluglib/matrix3d.h | 6 - Core/Tools/WW3D/pluglib/matrix4.h | 6 - Core/Tools/WW3D/pluglib/palette.h | 7 - Core/Tools/WW3D/pluglib/rawfile.h | 8 - Core/Tools/WW3D/pluglib/realcrc.h | 7 - Core/Tools/WW3D/pluglib/rgb.h | 6 - Core/Tools/WW3D/pluglib/uarray.h | 8 - Core/Tools/WW3D/pluglib/vector2.h | 8 - Core/Tools/WW3D/pluglib/vector3.h | 7 - Core/Tools/WW3D/pluglib/vector3i.h | 6 - Core/Tools/WW3D/pluglib/vector4.h | 8 - Core/Tools/WW3D/pluglib/w3dquat.h | 9 - Core/Tools/WW3D/pluglib/win.h | 6 - Core/Tools/WW3D/pluglib/wwfile.h | 6 - Core/Tools/WW3D/pluglib/wwmath.h | 6 - Core/Tools/timingTest/StdAfx.h | 6 - Core/Tools/wolSetup/StdAfx.h | 6 - .../GameEngine/Include/Common/ActionManager.h | 6 - .../GameEngine/Include/Common/BattleHonors.h | 6 - .../GameEngine/Include/Common/BezierSegment.h | 5 - .../Code/GameEngine/Include/Common/BitFlags.h | 7 - .../GameEngine/Include/Common/BitFlagsIO.h | 6 - .../Include/Common/BuildAssistant.h | 7 - .../GameEngine/Include/Common/CDManager.h | 6 - .../Include/Common/ClientUpdateModule.h | 8 - .../GameEngine/Include/Common/CommandLine.h | 6 - .../Include/Common/CriticalSection.h | 6 - .../Include/Common/CustomMatchPreferences.h | 6 - .../Code/GameEngine/Include/Common/DamageFX.h | 7 - .../GameEngine/Include/Common/DataChunk.h | 8 - .../Code/GameEngine/Include/Common/Dict.h | 8 - .../GameEngine/Include/Common/Directory.h | 6 - .../GameEngine/Include/Common/DisabledTypes.h | 7 - .../Include/Common/DiscreteCircle.h | 7 - .../GameEngine/Include/Common/DrawModule.h | 8 - .../Code/GameEngine/Include/Common/Energy.h | 7 - .../Code/GameEngine/Include/Common/Errors.h | 6 - .../Include/Common/FunctionLexicon.h | 7 - .../GameEngine/Include/Common/GameCommon.h | 7 - .../GameEngine/Include/Common/GameEngine.h | 6 - .../Code/GameEngine/Include/Common/GameLOD.h | 5 - .../Include/Common/GameSpyMiscPreferences.h | 6 - .../GameEngine/Include/Common/GameState.h | 7 - .../GameEngine/Include/Common/GameStateMap.h | 6 - .../Code/GameEngine/Include/Common/GameType.h | 7 - .../Code/GameEngine/Include/Common/Geometry.h | 7 - .../GameEngine/Include/Common/GlobalData.h | 6 - .../Code/GameEngine/Include/Common/Handicap.h | 6 - Generals/Code/GameEngine/Include/Common/INI.h | 7 - .../Include/Common/IgnorePreferences.h | 6 - .../Code/GameEngine/Include/Common/KindOf.h | 7 - .../Include/Common/LadderPreferences.h | 6 - .../Code/GameEngine/Include/Common/Language.h | 7 - .../GameEngine/Include/Common/LatchRestore.h | 8 - .../Code/GameEngine/Include/Common/List.h | 6 - .../GameEngine/Include/Common/MapObject.h | 7 - .../Include/Common/MapReaderWriterInfo.h | 6 - .../GameEngine/Include/Common/MessageStream.h | 6 - .../GameEngine/Include/Common/MissionStats.h | 7 - .../GameEngine/Include/Common/ModelState.h | 7 - .../Code/GameEngine/Include/Common/Module.h | 8 - .../GameEngine/Include/Common/ModuleFactory.h | 7 - .../Code/GameEngine/Include/Common/Money.h | 7 - .../Include/Common/MultiplayerSettings.h | 6 - .../Include/Common/NameKeyGenerator.h | 7 - .../GameEngine/Include/Common/OSDisplay.h | 6 - .../Include/Common/ObjectStatusTypes.h | 6 - .../GameEngine/Include/Common/Overridable.h | 7 - .../Code/GameEngine/Include/Common/Override.h | 7 - .../Include/Common/PartitionSolver.h | 5 - .../GameEngine/Include/Common/PerfMetrics.h | 8 - .../GameEngine/Include/Common/PerfTimer.h | 6 - .../Code/GameEngine/Include/Common/Player.h | 6 - .../GameEngine/Include/Common/PlayerList.h | 6 - .../Include/Common/PlayerTemplate.h | 6 - .../Include/Common/ProductionPrerequisite.h | 6 - .../Include/Common/QuickmatchPreferences.h | 6 - .../Include/Common/QuotedPrintable.h | 6 - .../Code/GameEngine/Include/Common/Radar.h | 9 - .../Code/GameEngine/Include/Common/Registry.h | 6 - .../Include/Common/ResourceGatheringManager.h | 6 - .../GameEngine/Include/Common/STLTypedefs.h | 6 - .../Code/GameEngine/Include/Common/Science.h | 8 - .../GameEngine/Include/Common/ScopedMutex.h | 6 - .../GameEngine/Include/Common/ScoreKeeper.h | 6 - .../Include/Common/SkirmishBattleHonors.h | 6 - .../Include/Common/SkirmishPreferences.h | 6 - .../Code/GameEngine/Include/Common/Snapshot.h | 7 - .../Include/Common/SparseMatchFinder.h | 7 - .../GameEngine/Include/Common/SpecialPower.h | 6 - .../Include/Common/SpecialPowerMaskType.h | 5 - .../Include/Common/SpecialPowerType.h | 5 - .../GameEngine/Include/Common/StackDump.h | 7 - .../GameEngine/Include/Common/StateMachine.h | 7 - .../Include/Common/StatsCollector.h | 6 - .../Include/Common/SubsystemInterface.h | 7 - .../GameEngine/Include/Common/SystemInfo.h | 8 - .../Code/GameEngine/Include/Common/Team.h | 6 - .../Code/GameEngine/Include/Common/Terrain.h | 6 - .../GameEngine/Include/Common/TerrainTypes.h | 7 - .../Code/GameEngine/Include/Common/Thing.h | 7 - .../GameEngine/Include/Common/ThingFactory.h | 8 - .../GameEngine/Include/Common/ThingSort.h | 7 - .../GameEngine/Include/Common/ThingTemplate.h | 7 - .../GameEngine/Include/Common/TunnelTracker.h | 6 - .../GameEngine/Include/Common/UnitTimings.h | 7 - .../Code/GameEngine/Include/Common/Upgrade.h | 6 - .../Include/Common/UserPreferences.h | 6 - .../GameEngine/Include/Common/WellKnownKeys.h | 6 - .../Code/GameEngine/Include/Common/encrypt.h | 8 - .../Code/GameEngine/Include/Common/version.h | 6 - .../GameEngine/Include/GameClient/Anim2D.h | 6 - .../Include/GameClient/AnimateWindowManager.h | 6 - .../GameEngine/Include/GameClient/CDCheck.h | 6 - .../Include/GameClient/CampaignManager.h | 6 - .../GameEngine/Include/GameClient/Color.h | 7 - .../Include/GameClient/CommandXlat.h | 6 - .../Include/GameClient/ControlBar.h | 7 - .../Include/GameClient/ControlBarResizer.h | 6 - .../Include/GameClient/ControlBarScheme.h | 6 - .../GameEngine/Include/GameClient/Credits.h | 5 - .../Include/GameClient/DebugDisplay.h | 8 - .../GameEngine/Include/GameClient/Diplomacy.h | 6 - .../Include/GameClient/DisconnectMenu.h | 6 - .../GameEngine/Include/GameClient/Display.h | 7 - .../Include/GameClient/DisplayString.h | 7 - .../Include/GameClient/DisplayStringManager.h | 7 - .../Include/GameClient/DrawGroupInfo.h | 5 - .../GameEngine/Include/GameClient/Drawable.h | 5 - .../Include/GameClient/DrawableInfo.h | 5 - .../Code/GameEngine/Include/GameClient/Eva.h | 5 - .../Include/GameClient/ExtendedMessageBox.h | 6 - .../GameEngine/Include/GameClient/FXList.h | 7 - .../GameEngine/Include/GameClient/FontDesc.h | 5 - .../Include/GameClient/GUICallbacks.h | 8 - .../Include/GameClient/GUICommandTranslator.h | 8 - .../GameEngine/Include/GameClient/Gadget.h | 6 - .../Include/GameClient/GadgetCheckBox.h | 7 - .../Include/GameClient/GadgetComboBox.h | 7 - .../Include/GameClient/GadgetListBox.h | 7 - .../Include/GameClient/GadgetProgressBar.h | 7 - .../Include/GameClient/GadgetPushButton.h | 7 - .../Include/GameClient/GadgetRadioButton.h | 7 - .../Include/GameClient/GadgetSlider.h | 7 - .../Include/GameClient/GadgetStaticText.h | 7 - .../Include/GameClient/GadgetTabControl.h | 7 - .../Include/GameClient/GadgetTextEntry.h | 7 - .../Include/GameClient/GameClient.h | 6 - .../GameEngine/Include/GameClient/GameFont.h | 7 - .../Include/GameClient/GameInfoWindow.h | 7 - .../GameEngine/Include/GameClient/GameText.h | 6 - .../Include/GameClient/GameWindow.h | 7 - .../Include/GameClient/GameWindowGlobal.h | 7 - .../Include/GameClient/GameWindowID.h | 7 - .../Include/GameClient/GameWindowManager.h | 7 - .../GameClient/GameWindowTransitions.h | 6 - .../Include/GameClient/GlobalLanguage.h | 5 - .../GameEngine/Include/GameClient/GraphDraw.h | 6 - .../Include/GameClient/HeaderTemplate.h | 5 - .../GameEngine/Include/GameClient/HintSpy.h | 6 - .../GameEngine/Include/GameClient/HotKey.h | 7 - .../Include/GameClient/IMEManager.h | 8 - .../GameEngine/Include/GameClient/Image.h | 7 - .../GameEngine/Include/GameClient/InGameUI.h | 6 - .../GameEngine/Include/GameClient/KeyDefs.h | 6 - .../GameEngine/Include/GameClient/Keyboard.h | 6 - .../Include/GameClient/LanguageFilter.h | 6 - .../GameEngine/Include/GameClient/Line2D.h | 8 - .../Include/GameClient/LoadScreen.h | 6 - .../Include/GameClient/LookAtXlat.h | 6 - .../GameEngine/Include/GameClient/MapUtil.h | 5 - .../Include/GameClient/MessageBox.h | 6 - .../GameEngine/Include/GameClient/MetaEvent.h | 6 - .../AnimatedParticleSysBoneClientUpdate.h | 7 - .../GameClient/Module/BeaconClientUpdate.h | 7 - .../GameClient/Module/SwayClientUpdate.h | 7 - .../GameEngine/Include/GameClient/Mouse.h | 6 - .../Include/GameClient/ParticleSys.h | 7 - .../Include/GameClient/PlaceEventTranslator.h | 6 - .../Include/GameClient/ProcessAnimateWindow.h | 6 - .../Include/GameClient/RadiusDecal.h | 6 - .../GameEngine/Include/GameClient/RayEffect.h | 7 - .../Include/GameClient/SelectionInfo.h | 7 - .../Include/GameClient/SelectionXlat.h | 6 - .../GameEngine/Include/GameClient/Shadow.h | 7 - .../GameEngine/Include/GameClient/Shell.h | 7 - .../Include/GameClient/ShellHooks.h | 7 - .../Include/GameClient/ShellMenuScheme.h | 6 - .../Include/GameClient/Statistics.h | 5 - .../Include/GameClient/TerrainRoads.h | 6 - .../Include/GameClient/TerrainVisual.h | 6 - .../Code/GameEngine/Include/GameClient/View.h | 6 - .../GameEngine/Include/GameClient/Water.h | 7 - .../Include/GameClient/WinInstanceData.h | 7 - .../Include/GameClient/WindowLayout.h | 7 - .../Include/GameClient/WindowXlat.h | 6 - .../Code/GameEngine/Include/GameLogic/AI.h | 7 - .../GameEngine/Include/GameLogic/AIDock.h | 7 - .../GameEngine/Include/GameLogic/AIGuard.h | 5 - .../GameEngine/Include/GameLogic/AIPathfind.h | 7 - .../GameEngine/Include/GameLogic/AIPlayer.h | 9 - .../Include/GameLogic/AISkirmishPlayer.h | 9 - .../Include/GameLogic/AIStateMachine.h | 6 - .../GameEngine/Include/GameLogic/AITNGuard.h | 5 - .../Code/GameEngine/Include/GameLogic/Armor.h | 7 - .../GameEngine/Include/GameLogic/ArmorSet.h | 6 - .../GameEngine/Include/GameLogic/CaveSystem.h | 5 - .../Include/GameLogic/CrateSystem.h | 5 - .../GameEngine/Include/GameLogic/Damage.h | 7 - .../Include/GameLogic/ExperienceTracker.h | 6 - .../GameEngine/Include/GameLogic/FPUControl.h | 6 - .../Include/GameLogic/FiringTracker.h | 7 - .../GameEngine/Include/GameLogic/GameLogic.h | 7 - .../Include/GameLogic/GhostObject.h | 6 - .../GameEngine/Include/GameLogic/Locomotor.h | 7 - .../Include/GameLogic/LocomotorSet.h | 6 - .../Include/GameLogic/Module/AIUpdate.h | 7 - .../Include/GameLogic/Module/ActiveBody.h | 7 - .../GameLogic/Module/ActiveShroudUpgrade.h | 7 - .../Include/GameLogic/Module/ArmorUpgrade.h | 6 - .../Module/AssaultTransportAIUpdate.h | 7 - .../Module/AssistedTargetingUpdate.h | 7 - .../GameLogic/Module/AutoDepositUpdate.h | 6 - .../GameLogic/Module/AutoFindHealingUpdate.h | 8 - .../GameLogic/Module/AutoHealBehavior.h | 7 - .../GameLogic/Module/BaikonurLaunchPower.h | 6 - .../GameLogic/Module/BaseRegenerateUpdate.h | 6 - .../GameLogic/Module/BattlePlanUpdate.h | 8 - .../Include/GameLogic/Module/BehaviorModule.h | 6 - .../Include/GameLogic/Module/BodyModule.h | 6 - .../Include/GameLogic/Module/BoneFXDamage.h | 6 - .../Include/GameLogic/Module/BoneFXUpdate.h | 6 - .../Include/GameLogic/Module/BridgeBehavior.h | 6 - .../GameLogic/Module/BridgeScaffoldBehavior.h | 7 - .../GameLogic/Module/BridgeTowerBehavior.h | 6 - .../GameLogic/Module/CashBountyPower.h | 6 - .../GameLogic/Module/CashHackSpecialPower.h | 7 - .../Include/GameLogic/Module/CaveContain.h | 6 - .../GameLogic/Module/CheckpointUpdate.h | 7 - .../GameLogic/Module/ChinookAIUpdate.h | 7 - .../GameLogic/Module/CleanupAreaPower.h | 6 - .../GameLogic/Module/CleanupHazardUpdate.h | 8 - .../Include/GameLogic/Module/CollideModule.h | 6 - .../Module/CommandButtonHuntUpdate.h | 8 - .../GameLogic/Module/CommandSetUpgrade.h | 7 - .../Include/GameLogic/Module/ContainModule.h | 6 - .../Module/ConvertToCarBombCrateCollide.h | 6 - .../ConvertToHijackedVehicleCrateCollide.h | 6 - .../GameLogic/Module/CostModifierUpgrade.h | 6 - .../Include/GameLogic/Module/CrateCollide.h | 6 - .../Include/GameLogic/Module/CreateCrateDie.h | 6 - .../Include/GameLogic/Module/CreateModule.h | 6 - .../GameLogic/Module/CreateObjectDie.h | 7 - .../Include/GameLogic/Module/CrushDie.h | 7 - .../Include/GameLogic/Module/DamDie.h | 6 - .../Include/GameLogic/Module/DamageModule.h | 6 - .../Module/DefaultProductionExitUpdate.h | 6 - .../GameLogic/Module/DefectorSpecialPower.h | 6 - .../Include/GameLogic/Module/DelayedUpgrade.h | 8 - .../Module/DelayedWeaponSetUpgradeUpdate.h | 6 - .../Include/GameLogic/Module/DeletionUpdate.h | 7 - .../GameLogic/Module/DeliverPayloadAIUpdate.h | 7 - .../Include/GameLogic/Module/DemoTrapUpdate.h | 8 - .../GameLogic/Module/DemoralizeSpecialPower.h | 7 - .../GameLogic/Module/DeployStyleAIUpdate.h | 7 - .../Include/GameLogic/Module/DestroyDie.h | 7 - .../Include/GameLogic/Module/DestroyModule.h | 6 - .../Include/GameLogic/Module/DieModule.h | 6 - .../Include/GameLogic/Module/DockUpdate.h | 6 - .../Include/GameLogic/Module/DozerAIUpdate.h | 8 - .../GameLogic/Module/DumbProjectileBehavior.h | 7 - .../Module/DynamicGeometryInfoUpdate.h | 8 - .../Module/DynamicShroudClearingRangeUpdate.h | 7 - .../Include/GameLogic/Module/EMPUpdate.h | 7 - .../Include/GameLogic/Module/EjectPilotDie.h | 7 - .../GameLogic/Module/EnemyNearUpdate.h | 7 - .../Module/ExperienceScalarUpgrade.h | 8 - .../Include/GameLogic/Module/FXListDie.h | 8 - .../Module/FireOCLAfterWeaponCooldownUpdate.h | 7 - .../GameLogic/Module/FireSpreadUpdate.h | 7 - .../GameLogic/Module/FireWeaponCollide.h | 8 - .../GameLogic/Module/FireWeaponUpdate.h | 7 - .../Module/FireWeaponWhenDamagedBehavior.h | 7 - .../Module/FireWeaponWhenDeadBehavior.h | 7 - .../FirestormDynamicGeometryInfoUpdate.h | 8 - .../GameLogic/Module/FlammableUpdate.h | 7 - .../Include/GameLogic/Module/FloatUpdate.h | 6 - .../GameLogic/Module/GarrisonContain.h | 7 - .../Module/GenerateMinefieldBehavior.h | 7 - .../GameLogic/Module/GrantUpgradeCreate.h | 7 - .../GameLogic/Module/HackInternetAIUpdate.h | 7 - .../Include/GameLogic/Module/HealContain.h | 6 - .../GameLogic/Module/HealCrateCollide.h | 6 - .../GameLogic/Module/HeightDieUpdate.h | 6 - .../Module/HelicopterSlowDeathUpdate.h | 6 - .../Include/GameLogic/Module/HighlanderBody.h | 7 - .../Include/GameLogic/Module/HijackerUpdate.h | 7 - .../GameLogic/Module/HiveStructureBody.h | 7 - .../Include/GameLogic/Module/HordeUpdate.h | 7 - .../Include/GameLogic/Module/ImmortalBody.h | 7 - .../Include/GameLogic/Module/InactiveBody.h | 7 - .../GameLogic/Module/InstantDeathBehavior.h | 7 - .../Include/GameLogic/Module/JetAIUpdate.h | 7 - .../GameLogic/Module/JetSlowDeathBehavior.h | 7 - .../Include/GameLogic/Module/KeepObjectDie.h | 7 - .../Include/GameLogic/Module/LaserUpdate.h | 8 - .../Include/GameLogic/Module/LifetimeUpdate.h | 7 - .../GameLogic/Module/LocomotorSetUpgrade.h | 8 - .../GameLogic/Module/MaxHealthUpgrade.h | 8 - .../GameLogic/Module/MinefieldBehavior.h | 6 - .../GameLogic/Module/MissileAIUpdate.h | 7 - .../Module/MissileLauncherBuildingUpdate.h | 6 - .../GameLogic/Module/MobMemberSlavedUpdate.h | 6 - .../GameLogic/Module/MobNexusContain.h | 7 - .../GameLogic/Module/MoneyCrateCollide.h | 6 - .../Module/NeutronMissileSlowDeathUpdate.h | 6 - .../GameLogic/Module/NeutronMissileUpdate.h | 7 - .../GameLogic/Module/OCLSpecialPower.h | 6 - .../Include/GameLogic/Module/OCLUpdate.h | 7 - .../GameLogic/Module/ObjectCreationUpgrade.h | 7 - .../GameLogic/Module/ObjectDefectionHelper.h | 7 - .../Include/GameLogic/Module/ObjectHelper.h | 6 - .../GameLogic/Module/ObjectRepulsorHelper.h | 7 - .../GameLogic/Module/ObjectSMCHelper.h | 7 - .../Module/ObjectWeaponStatusHelper.h | 6 - .../Include/GameLogic/Module/OpenContain.h | 6 - .../GameLogic/Module/OverchargeBehavior.h | 6 - .../GameLogic/Module/OverlordContain.h | 7 - .../GameLogic/Module/POWTruckAIUpdate.h | 6 - .../GameLogic/Module/POWTruckBehavior.h | 6 - .../GameLogic/Module/ParachuteContain.h | 7 - .../GameLogic/Module/ParkingPlaceBehavior.h | 7 - .../Module/ParticleUplinkCannonUpdate.h | 8 - .../Include/GameLogic/Module/PhysicsUpdate.h | 7 - .../GameLogic/Module/PilotFindVehicleUpdate.h | 8 - .../Module/PointDefenseLaserUpdate.h | 8 - .../GameLogic/Module/PoisonedBehavior.h | 7 - .../GameLogic/Module/PowerPlantUpdate.h | 6 - .../GameLogic/Module/PowerPlantUpgrade.h | 7 - .../Include/GameLogic/Module/PreorderCreate.h | 6 - .../GameLogic/Module/PrisonDockUpdate.h | 6 - .../GameLogic/Module/ProductionUpdate.h | 6 - .../GameLogic/Module/ProjectileStreamUpdate.h | 8 - .../Include/GameLogic/Module/ProneUpdate.h | 8 - .../Module/PropagandaTowerBehavior.h | 7 - .../Module/QueueProductionExitUpdate.h | 6 - .../Include/GameLogic/Module/RadarUpdate.h | 6 - .../Include/GameLogic/Module/RadarUpgrade.h | 7 - .../GameLogic/Module/RadiusDecalUpdate.h | 7 - .../Module/RailedTransportAIUpdate.h | 8 - .../GameLogic/Module/RailedTransportContain.h | 6 - .../GameLogic/Module/RailroadGuideAIUpdate.h | 8 - .../GameLogic/Module/RebuildHoleBehavior.h | 6 - .../GameLogic/Module/RebuildHoleExposeDie.h | 7 - .../GameLogic/Module/RepairDockUpdate.h | 6 - .../GameLogic/Module/SalvageCrateCollide.h | 6 - .../GameLogic/Module/ShroudCrateCollide.h | 6 - .../Include/GameLogic/Module/SlavedUpdate.h | 6 - .../GameLogic/Module/SlowDeathBehavior.h | 7 - .../Include/GameLogic/Module/SpawnBehavior.h | 6 - .../Module/SpawnPointProductionExitUpdate.h | 6 - .../Include/GameLogic/Module/SpecialAbility.h | 6 - .../GameLogic/Module/SpecialAbilityUpdate.h | 6 - .../Module/SpecialPowerCompletionDie.h | 6 - .../GameLogic/Module/SpecialPowerCreate.h | 6 - .../GameLogic/Module/SpecialPowerModule.h | 7 - .../Module/SpecialPowerUpdateModule.h | 6 - .../GameLogic/Module/SpyVisionSpecialPower.h | 6 - .../GameLogic/Module/SpyVisionUpdate.h | 7 - .../Include/GameLogic/Module/SquishCollide.h | 7 - .../GameLogic/Module/StatusBitsUpgrade.h | 8 - .../GameLogic/Module/StealthDetectorUpdate.h | 8 - .../Include/GameLogic/Module/StealthUpdate.h | 8 - .../Include/GameLogic/Module/StealthUpgrade.h | 8 - .../GameLogic/Module/StickyBombUpdate.h | 7 - .../Include/GameLogic/Module/StructureBody.h | 7 - .../Module/StructureCollapseUpdate.h | 7 - .../GameLogic/Module/StructureToppleUpdate.h | 7 - .../GameLogic/Module/SubObjectsUpgrade.h | 8 - .../GameLogic/Module/SupplyCenterCreate.h | 6 - .../GameLogic/Module/SupplyCenterDockUpdate.h | 6 - .../Module/SupplyCenterProductionExitUpdate.h | 7 - .../GameLogic/Module/SupplyTruckAIUpdate.h | 6 - .../GameLogic/Module/SupplyWarehouseCreate.h | 7 - .../Module/SupplyWarehouseCripplingBehavior.h | 7 - .../Module/SupplyWarehouseDockUpdate.h | 6 - .../GameLogic/Module/TechBuildingBehavior.h | 6 - .../GameLogic/Module/TensileFormationUpdate.h | 6 - .../Include/GameLogic/Module/ToppleUpdate.h | 7 - .../GameLogic/Module/TransitionDamageFX.h | 6 - .../GameLogic/Module/TransportAIUpdate.h | 7 - .../GameLogic/Module/TransportContain.h | 7 - .../Include/GameLogic/Module/TunnelContain.h | 6 - .../GameLogic/Module/UnitCrateCollide.h | 6 - .../Module/UnpauseSpecialPowerUpgrade.h | 7 - .../Include/GameLogic/Module/UpdateModule.h | 6 - .../Include/GameLogic/Module/UpgradeDie.h | 7 - .../Include/GameLogic/Module/UpgradeModule.h | 7 - .../GameLogic/Module/VeterancyCrateCollide.h | 6 - .../GameLogic/Module/VeterancyGainCreate.h | 7 - .../Include/GameLogic/Module/WanderAIUpdate.h | 7 - .../GameLogic/Module/WaveGuideUpdate.h | 6 - .../GameLogic/Module/WeaponBonusUpgrade.h | 8 - .../GameLogic/Module/WeaponSetUpgrade.h | 8 - .../Include/GameLogic/Module/WorkerAIUpdate.h | 8 - .../GameEngine/Include/GameLogic/Object.h | 5 - .../Include/GameLogic/ObjectCreationList.h | 7 - .../GameEngine/Include/GameLogic/ObjectIter.h | 8 - .../GameLogic/ObjectScriptStatusBits.h | 6 - .../Include/GameLogic/ObjectTypes.h | 6 - .../Include/GameLogic/PartitionManager.h | 7 - .../Include/GameLogic/PolygonTrigger.h | 6 - .../GameEngine/Include/GameLogic/Powers.h | 7 - .../GameEngine/Include/GameLogic/RankInfo.h | 8 - .../Include/GameLogic/ScriptActions.h | 9 - .../Include/GameLogic/ScriptConditions.h | 7 - .../Include/GameLogic/ScriptEngine.h | 7 - .../GameEngine/Include/GameLogic/Scripts.h | 7 - .../GameEngine/Include/GameLogic/SidesList.h | 8 - .../Code/GameEngine/Include/GameLogic/Squad.h | 5 - .../Include/GameLogic/TerrainLogic.h | 5 - .../GameEngine/Include/GameLogic/TurretAI.h | 7 - .../Include/GameLogic/VictoryConditions.h | 6 - .../GameEngine/Include/GameLogic/Weapon.h | 7 - .../GameLogic/WeaponBonusConditionFlags.h | 5 - .../GameEngine/Include/GameLogic/WeaponSet.h | 6 - .../Include/GameLogic/WeaponSetFlags.h | 5 - .../Include/GameLogic/WeaponSetType.h | 5 - .../Include/GameLogic/WeaponStatus.h | 5 - .../Include/GameNetwork/Connection.h | 6 - .../Include/GameNetwork/ConnectionManager.h | 6 - .../Include/GameNetwork/DisconnectManager.h | 7 - .../Include/GameNetwork/DownloadManager.h | 6 - .../Include/GameNetwork/FileTransfer.h | 5 - .../Include/GameNetwork/FirewallHelper.h | 8 - .../Include/GameNetwork/FrameData.h | 6 - .../Include/GameNetwork/FrameDataManager.h | 6 - .../Include/GameNetwork/FrameMetrics.h | 6 - .../GameEngine/Include/GameNetwork/GUIUtil.h | 6 - .../GameEngine/Include/GameNetwork/GameInfo.h | 6 - .../GameEngine/Include/GameNetwork/GameSpy.h | 7 - .../Include/GameNetwork/GameSpy/BuddyDefs.h | 6 - .../Include/GameNetwork/GameSpy/BuddyThread.h | 7 - .../Include/GameNetwork/GameSpy/GSConfig.h | 6 - .../GameNetwork/GameSpy/GameResultsThread.h | 7 - .../Include/GameNetwork/GameSpy/LadderDefs.h | 6 - .../Include/GameNetwork/GameSpy/LobbyUtils.h | 6 - .../GameNetwork/GameSpy/MainMenuUtils.h | 6 - .../Include/GameNetwork/GameSpy/PeerDefs.h | 6 - .../GameSpy/PeerDefsImplementation.h | 6 - .../Include/GameNetwork/GameSpy/PeerThread.h | 6 - .../GameSpy/PersistentStorageDefs.h | 6 - .../GameSpy/PersistentStorageThread.h | 7 - .../Include/GameNetwork/GameSpy/PingThread.h | 7 - .../GameNetwork/GameSpy/StagingRoomGameInfo.h | 6 - .../Include/GameNetwork/GameSpy/ThreadUtils.h | 6 - .../Include/GameNetwork/GameSpyChat.h | 6 - .../Include/GameNetwork/GameSpyGP.h | 6 - .../Include/GameNetwork/GameSpyGameInfo.h | 6 - .../Include/GameNetwork/GameSpyOverlay.h | 5 - .../GameNetwork/GameSpyPersistentStorage.h | 6 - .../Include/GameNetwork/GameSpyThread.h | 6 - .../Include/GameNetwork/IPEnumeration.h | 7 - .../GameEngine/Include/GameNetwork/LANAPI.h | 7 - .../Include/GameNetwork/LANAPICallbacks.h | 8 - .../Include/GameNetwork/LANGameInfo.h | 7 - .../Include/GameNetwork/LANPlayer.h | 6 - .../Code/GameEngine/Include/GameNetwork/NAT.h | 6 - .../Include/GameNetwork/NetCommandList.h | 6 - .../Include/GameNetwork/NetCommandMsg.h | 5 - .../Include/GameNetwork/NetCommandRef.h | 6 - .../GameNetwork/NetCommandWrapperList.h | 6 - .../Include/GameNetwork/NetPacket.h | 6 - .../Include/GameNetwork/NetworkDefs.h | 6 - .../Include/GameNetwork/NetworkInterface.h | 6 - .../Include/GameNetwork/RankPointValue.h | 6 - .../Include/GameNetwork/Transport.h | 6 - .../GameEngine/Include/GameNetwork/User.h | 6 - .../GameNetwork/WOLBrowser/WebBrowser.h | 5 - .../Include/GameNetwork/networkutil.h | 5 - .../Code/GameEngine/Include/GameNetwork/udp.h | 6 - .../Include/W3DDevice/Common/W3DConvert.h | 8 - .../W3DDevice/Common/W3DFunctionLexicon.h | 7 - .../W3DDevice/Common/W3DModuleFactory.h | 6 - .../Include/W3DDevice/Common/W3DRadar.h | 7 - .../W3DDevice/Common/W3DThingFactory.h | 7 - .../Include/W3DDevice/GameClient/HeightMap.h | 5 - .../GameClient/Module/W3DDebrisDraw.h | 7 - .../GameClient/Module/W3DDefaultDraw.h | 7 - .../Module/W3DDependencyModelDraw.h | 7 - .../GameClient/Module/W3DLaserDraw.h | 7 - .../GameClient/Module/W3DModelDraw.h | 7 - .../GameClient/Module/W3DOverlordTankDraw.h | 7 - .../GameClient/Module/W3DPoliceCarDraw.h | 7 - .../Module/W3DProjectileStreamDraw.h | 7 - .../W3DDevice/GameClient/Module/W3DRopeDraw.h | 7 - .../GameClient/Module/W3DScienceModelDraw.h | 7 - .../GameClient/Module/W3DSupplyDraw.h | 7 - .../W3DDevice/GameClient/Module/W3DTankDraw.h | 7 - .../GameClient/Module/W3DTankTruckDraw.h | 7 - .../GameClient/Module/W3DTracerDraw.h | 7 - .../GameClient/Module/W3DTruckDraw.h | 7 - .../Include/W3DDevice/GameClient/TerrainTex.h | 8 - .../Include/W3DDevice/GameClient/TileData.h | 6 - .../W3DDevice/GameClient/W3DAssetManager.h | 7 - .../GameClient/W3DAssetManagerExposed.h | 5 - .../W3DDevice/GameClient/W3DBibBuffer.h | 6 - .../W3DDevice/GameClient/W3DBridgeBuffer.h | 6 - .../W3DDevice/GameClient/W3DBufferManager.h | 6 - .../W3DDevice/GameClient/W3DCustomEdging.h | 6 - .../W3DDevice/GameClient/W3DCustomScene.h | 6 - .../W3DDevice/GameClient/W3DDebugDisplay.h | 8 - .../W3DDevice/GameClient/W3DDebugIcons.h | 6 - .../Include/W3DDevice/GameClient/W3DDisplay.h | 6 - .../W3DDevice/GameClient/W3DDisplayString.h | 7 - .../GameClient/W3DDisplayStringManager.h | 7 - .../W3DDevice/GameClient/W3DDynamicLight.h | 8 - .../W3DDevice/GameClient/W3DFileSystem.h | 5 - .../W3DDevice/GameClient/W3DGUICallbacks.h | 7 - .../Include/W3DDevice/GameClient/W3DGadget.h | 7 - .../W3DDevice/GameClient/W3DGameClient.h | 6 - .../W3DDevice/GameClient/W3DGameFont.h | 7 - .../W3DDevice/GameClient/W3DGameWindow.h | 7 - .../GameClient/W3DGameWindowManager.h | 7 - .../W3DDevice/GameClient/W3DInGameUI.h | 6 - .../Include/W3DDevice/GameClient/W3DMirror.h | 6 - .../Include/W3DDevice/GameClient/W3DMouse.h | 6 - .../W3DDevice/GameClient/W3DParticleSys.h | 6 - .../Include/W3DDevice/GameClient/W3DPoly.h | 6 - .../W3DDevice/GameClient/W3DProjectedShadow.h | 6 - .../W3DDevice/GameClient/W3DRoadBuffer.h | 6 - .../Include/W3DDevice/GameClient/W3DScene.h | 6 - .../W3DDevice/GameClient/W3DShaderManager.h | 6 - .../Include/W3DDevice/GameClient/W3DShadow.h | 6 - .../Include/W3DDevice/GameClient/W3DShroud.h | 6 - .../W3DDevice/GameClient/W3DStatusCircle.h | 6 - .../W3DDevice/GameClient/W3DTerrainTracks.h | 6 - .../W3DDevice/GameClient/W3DTerrainVisual.h | 6 - .../W3DDevice/GameClient/W3DTreeBuffer.h | 6 - .../Include/W3DDevice/GameClient/W3DView.h | 6 - .../GameClient/W3DVolumetricShadow.h | 6 - .../Include/W3DDevice/GameClient/W3DWater.h | 6 - .../W3DDevice/GameClient/W3DWaterTracks.h | 6 - .../W3DDevice/GameClient/W3DWaypointBuffer.h | 6 - .../W3DDevice/GameClient/W3DWebBrowser.h | 6 - .../W3DDevice/GameClient/WorldHeightMap.h | 6 - .../W3DDevice/GameLogic/W3DGameLogic.h | 6 - .../W3DDevice/GameLogic/W3DGhostObject.h | 6 - .../W3DDevice/GameLogic/W3DTerrainLogic.h | 6 - .../Win32Device/Common/Win32CDManager.h | 7 - .../Win32Device/Common/Win32GameEngine.h | 6 - .../Win32Device/GameClient/Win32DIKeyboard.h | 7 - .../Win32Device/GameClient/Win32DIMouse.h | 7 - .../Win32Device/GameClient/Win32Mouse.h | 7 - .../Code/Libraries/Include/Lib/BaseType.h | 6 - .../Source/WWVegas/WW3D2/aabtreebuilder.h | 10 - .../Libraries/Source/WWVegas/WW3D2/animobj.h | 8 - .../Libraries/Source/WWVegas/WW3D2/assetmgr.h | 6 - .../Libraries/Source/WWVegas/WW3D2/bmp2d.h | 6 - .../Libraries/Source/WWVegas/WW3D2/boxrobj.h | 10 - .../Libraries/Source/WWVegas/WW3D2/camera.h | 7 - .../Libraries/Source/WWVegas/WW3D2/dazzle.h | 6 - .../Libraries/Source/WWVegas/WW3D2/ddsfile.h | 6 - .../Libraries/Source/WWVegas/WW3D2/decalmsh.h | 8 - .../Libraries/Source/WWVegas/WW3D2/dx8caps.h | 7 - .../Libraries/Source/WWVegas/WW3D2/dx8fvf.h | 7 - .../Source/WWVegas/WW3D2/dx8indexbuffer.h | 7 - .../Source/WWVegas/WW3D2/dx8renderer.h | 6 - .../Source/WWVegas/WW3D2/dx8texman.h | 6 - .../Source/WWVegas/WW3D2/dx8vertexbuffer.h | 7 - .../Source/WWVegas/WW3D2/dx8wrapper.h | 7 - .../Libraries/Source/WWVegas/WW3D2/hanimmgr.h | 6 - .../Libraries/Source/WWVegas/WW3D2/hlod.h | 7 - .../Source/WWVegas/WW3D2/hmorphanim.h | 10 - .../Libraries/Source/WWVegas/WW3D2/hrawanim.h | 10 - .../Libraries/Source/WWVegas/WW3D2/htreemgr.h | 7 - .../Libraries/Source/WWVegas/WW3D2/light.h | 6 - .../Source/WWVegas/WW3D2/lightenvironment.h | 8 - .../Libraries/Source/WWVegas/WW3D2/mapper.h | 6 - .../Libraries/Source/WWVegas/WW3D2/matpass.h | 7 - .../Libraries/Source/WWVegas/WW3D2/mesh.h | 7 - .../Source/WWVegas/WW3D2/meshbuild.h | 6 - .../Libraries/Source/WWVegas/WW3D2/meshmdl.h | 9 - .../Libraries/Source/WWVegas/WW3D2/motchan.h | 7 - .../Libraries/Source/WWVegas/WW3D2/nullrobj.h | 8 - .../Libraries/Source/WWVegas/WW3D2/part_buf.h | 7 - .../Libraries/Source/WWVegas/WW3D2/part_emt.h | 8 - .../Libraries/Source/WWVegas/WW3D2/part_ldr.h | 7 - .../Libraries/Source/WWVegas/WW3D2/render2d.h | 6 - .../Libraries/Source/WWVegas/WW3D2/rinfo.h | 8 - .../Libraries/Source/WWVegas/WW3D2/scene.h | 6 - .../Libraries/Source/WWVegas/WW3D2/shader.h | 6 - .../Source/WWVegas/WW3D2/sortingrenderer.h | 7 - .../Source/WWVegas/WW3D2/texproject.h | 8 - .../Libraries/Source/WWVegas/WW3D2/texture.h | 6 - .../Source/WWVegas/WW3D2/textureloader.h | 8 - .../Source/WWVegas/WW3D2/texturethumbnail.h | 6 - .../Source/WWVegas/WW3D2/vertmaterial.h | 7 - .../Libraries/Source/WWVegas/WW3D2/w3d_file.h | 7 - .../Libraries/Source/WWVegas/WW3D2/ww3d.h | 8 - .../Code/Tools/GUIEdit/Include/DialogProc.h | 7 - .../Code/Tools/GUIEdit/Include/EditWindow.h | 7 - Generals/Code/Tools/GUIEdit/Include/GUIEdit.h | 7 - .../Code/Tools/GUIEdit/Include/GUIEditColor.h | 7 - .../Tools/GUIEdit/Include/GUIEditDisplay.h | 7 - .../GUIEdit/Include/GUIEditWindowManager.h | 7 - .../Tools/GUIEdit/Include/HierarchyView.h | 7 - .../Code/Tools/GUIEdit/Include/LayoutScheme.h | 7 - .../Code/Tools/GUIEdit/Include/Properties.h | 7 - Generals/Code/Tools/GUIEdit/Include/WinMain.h | 7 - .../Tools/ParticleEditor/CButtonShowColor.h | 6 - .../Tools/ParticleEditor/EmissionTypePanels.h | 5 - .../Tools/ParticleEditor/ISwapablePanel.h | 5 - .../Tools/ParticleEditor/MoreParmsDialog.h | 5 - .../Tools/ParticleEditor/ParticleEditor.h | 6 - .../Tools/ParticleEditor/ParticleTypePanels.h | 5 - .../Tools/ParticleEditor/ShaderTypePanels.h | 6 - Generals/Code/Tools/ParticleEditor/StdAfx.h | 6 - .../Tools/ParticleEditor/VelocityTypePanels.h | 5 - .../WorldBuilder/include/AutoEdgeOutTool.h | 7 - .../WorldBuilder/include/BaseBuildProps.h | 6 - .../WorldBuilder/include/BlendEdgeTool.h | 7 - .../WorldBuilder/include/BlendMaterial.h | 6 - .../Tools/WorldBuilder/include/BrushTool.h | 7 - .../Tools/WorldBuilder/include/BuildList.h | 6 - .../WorldBuilder/include/BuildListTool.h | 7 - .../WorldBuilder/include/CButtonShowColor.h | 6 - .../Tools/WorldBuilder/include/CUndoable.h | 7 - .../WorldBuilder/include/CameraOptions.h | 6 - .../Tools/WorldBuilder/include/CellWidth.h | 6 - .../WorldBuilder/include/ContourOptions.h | 6 - .../Tools/WorldBuilder/include/EditAction.h | 6 - .../WorldBuilder/include/EditCondition.h | 6 - .../WorldBuilder/include/EditCoordParameter.h | 6 - .../Tools/WorldBuilder/include/EditGroup.h | 6 - .../include/EditObjectParameter.h | 6 - .../WorldBuilder/include/EditParameter.h | 6 - .../include/ExportScriptsOptions.h | 6 - .../WorldBuilder/include/EyedropperTool.h | 7 - .../WorldBuilder/include/FeatherOptions.h | 6 - .../Tools/WorldBuilder/include/FeatherTool.h | 7 - .../Tools/WorldBuilder/include/FenceOptions.h | 6 - .../Tools/WorldBuilder/include/FenceTool.h | 7 - .../WorldBuilder/include/FloodFillTool.h | 7 - .../WorldBuilder/include/GlobalLightOptions.h | 6 - .../Tools/WorldBuilder/include/GroveOptions.h | 6 - .../Tools/WorldBuilder/include/GroveTool.h | 7 - .../WorldBuilder/include/HandScrollTool.h | 7 - .../WorldBuilder/include/ImpassableOptions.h | 6 - .../Tools/WorldBuilder/include/LayersList.h | 5 - .../Tools/WorldBuilder/include/LightOptions.h | 6 - .../Code/Tools/WorldBuilder/include/MainFrm.h | 6 - .../Tools/WorldBuilder/include/MapPreview.h | 6 - .../Tools/WorldBuilder/include/MapSettings.h | 6 - .../WorldBuilder/include/MeshMoldOptions.h | 6 - .../Tools/WorldBuilder/include/MeshMoldTool.h | 7 - .../Tools/WorldBuilder/include/MoundOptions.h | 6 - .../Tools/WorldBuilder/include/MoundTool.h | 5 - .../Tools/WorldBuilder/include/MyToolbar.h | 8 - .../Tools/WorldBuilder/include/NewHeightMap.h | 6 - .../WorldBuilder/include/ObjectOptions.h | 6 - .../WorldBuilder/include/ObjectPreview.h | 6 - .../Tools/WorldBuilder/include/ObjectTool.h | 7 - .../Code/Tools/WorldBuilder/include/OpenMap.h | 6 - .../Tools/WorldBuilder/include/OptionsPanel.h | 6 - .../WorldBuilder/include/PickUnitDialog.h | 6 - .../Tools/WorldBuilder/include/PointerTool.h | 7 - .../Tools/WorldBuilder/include/PolygonTool.h | 8 - .../Tools/WorldBuilder/include/RampOptions.h | 5 - .../Tools/WorldBuilder/include/RampTool.h | 6 - .../Tools/WorldBuilder/include/RoadOptions.h | 6 - .../Tools/WorldBuilder/include/RoadTool.h | 7 - .../Code/Tools/WorldBuilder/include/SaveMap.h | 6 - .../WorldBuilder/include/ScorchOptions.h | 6 - .../Tools/WorldBuilder/include/ScorchTool.h | 7 - .../WorldBuilder/include/ScriptActionsFalse.h | 6 - .../WorldBuilder/include/ScriptActionsTrue.h | 6 - .../WorldBuilder/include/ScriptConditions.h | 6 - .../Tools/WorldBuilder/include/ScriptDialog.h | 6 - .../WorldBuilder/include/ScriptProperties.h | 6 - .../WorldBuilder/include/SelectMacrotexture.h | 6 - .../WorldBuilder/include/ShadowOptions.h | 6 - .../Tools/WorldBuilder/include/SplashScreen.h | 6 - .../Code/Tools/WorldBuilder/include/StdAfx.h | 6 - .../Tools/WorldBuilder/include/TeamBehavior.h | 6 - .../Tools/WorldBuilder/include/TeamGeneric.h | 6 - .../Tools/WorldBuilder/include/TeamIdentity.h | 6 - .../WorldBuilder/include/TeamReinforcement.h | 6 - .../WorldBuilder/include/TerrainMaterial.h | 6 - .../Tools/WorldBuilder/include/TerrainModal.h | 6 - .../WorldBuilder/include/TerrainSwatches.h | 6 - .../Tools/WorldBuilder/include/TileTool.h | 5 - .../Code/Tools/WorldBuilder/include/Tool.h | 7 - .../Tools/WorldBuilder/include/WBFrameWnd.h | 6 - .../WorldBuilder/include/WBPopupSlider.h | 6 - .../WorldBuilder/include/WHeightMapEdit.h | 6 - .../Tools/WorldBuilder/include/WaterOptions.h | 6 - .../Tools/WorldBuilder/include/WaterTool.h | 7 - .../WorldBuilder/include/WaypointOptions.h | 6 - .../Tools/WorldBuilder/include/WaypointTool.h | 7 - .../Tools/WorldBuilder/include/WorldBuilder.h | 6 - .../WorldBuilder/include/WorldBuilderDoc.h | 6 - .../WorldBuilder/include/WorldBuilderView.h | 6 - .../WorldBuilder/include/addplayerdialog.h | 6 - .../Tools/WorldBuilder/include/brushoptions.h | 6 - .../Tools/WorldBuilder/include/euladialog.h | 6 - .../WorldBuilder/include/mapobjectprops.h | 6 - .../WorldBuilder/include/playerlistdlg.h | 6 - .../Tools/WorldBuilder/include/propedit.h | 6 - .../Tools/WorldBuilder/include/teamsdialog.h | 6 - .../Code/Tools/WorldBuilder/include/wbview.h | 6 - .../Tools/WorldBuilder/include/wbview3d.h | 6 - .../Source/WWVegas/WWLib/WWDefines.h | 3 - .../GameEngine/Include/Common/AcademyStats.h | 7 - .../GameEngine/Include/Common/ActionManager.h | 6 - .../GameEngine/Include/Common/BattleHonors.h | 6 - .../GameEngine/Include/Common/BezierSegment.h | 5 - .../Code/GameEngine/Include/Common/BitFlags.h | 7 - .../GameEngine/Include/Common/BitFlagsIO.h | 6 - .../Include/Common/BuildAssistant.h | 7 - .../GameEngine/Include/Common/CDManager.h | 6 - .../Include/Common/ClientUpdateModule.h | 8 - .../GameEngine/Include/Common/CommandLine.h | 6 - .../Include/Common/CriticalSection.h | 6 - .../Include/Common/CustomMatchPreferences.h | 6 - .../Code/GameEngine/Include/Common/DamageFX.h | 7 - .../GameEngine/Include/Common/DataChunk.h | 8 - .../Code/GameEngine/Include/Common/Dict.h | 8 - .../GameEngine/Include/Common/Directory.h | 6 - .../GameEngine/Include/Common/DisabledTypes.h | 7 - .../Include/Common/DiscreteCircle.h | 7 - .../GameEngine/Include/Common/DrawModule.h | 8 - .../Code/GameEngine/Include/Common/Energy.h | 7 - .../Code/GameEngine/Include/Common/Errors.h | 6 - .../Include/Common/FunctionLexicon.h | 7 - .../GameEngine/Include/Common/GameCommon.h | 7 - .../GameEngine/Include/Common/GameEngine.h | 6 - .../Code/GameEngine/Include/Common/GameLOD.h | 5 - .../Include/Common/GameSpyMiscPreferences.h | 6 - .../GameEngine/Include/Common/GameState.h | 7 - .../GameEngine/Include/Common/GameStateMap.h | 6 - .../Code/GameEngine/Include/Common/GameType.h | 7 - .../Code/GameEngine/Include/Common/Geometry.h | 7 - .../GameEngine/Include/Common/GlobalData.h | 6 - .../Code/GameEngine/Include/Common/Handicap.h | 6 - .../Code/GameEngine/Include/Common/INI.h | 7 - .../Include/Common/IgnorePreferences.h | 6 - .../Code/GameEngine/Include/Common/KindOf.h | 7 - .../Include/Common/LadderPreferences.h | 6 - .../Code/GameEngine/Include/Common/Language.h | 7 - .../GameEngine/Include/Common/LatchRestore.h | 8 - .../Code/GameEngine/Include/Common/List.h | 6 - .../GameEngine/Include/Common/MapObject.h | 7 - .../Include/Common/MapReaderWriterInfo.h | 6 - .../GameEngine/Include/Common/MessageStream.h | 6 - .../GameEngine/Include/Common/MissionStats.h | 7 - .../GameEngine/Include/Common/ModelState.h | 7 - .../Code/GameEngine/Include/Common/Module.h | 8 - .../GameEngine/Include/Common/ModuleFactory.h | 7 - .../Code/GameEngine/Include/Common/Money.h | 7 - .../Include/Common/MultiplayerSettings.h | 6 - .../Include/Common/NameKeyGenerator.h | 7 - .../GameEngine/Include/Common/OSDisplay.h | 6 - .../Include/Common/ObjectStatusTypes.h | 6 - .../GameEngine/Include/Common/Overridable.h | 7 - .../Code/GameEngine/Include/Common/Override.h | 7 - .../Include/Common/PartitionSolver.h | 5 - .../GameEngine/Include/Common/PerfMetrics.h | 8 - .../GameEngine/Include/Common/PerfTimer.h | 6 - .../Code/GameEngine/Include/Common/Player.h | 6 - .../GameEngine/Include/Common/PlayerList.h | 6 - .../Include/Common/PlayerTemplate.h | 6 - .../Include/Common/ProductionPrerequisite.h | 6 - .../Include/Common/QuickmatchPreferences.h | 6 - .../Include/Common/QuotedPrintable.h | 6 - .../Code/GameEngine/Include/Common/Radar.h | 9 - .../Code/GameEngine/Include/Common/Registry.h | 6 - .../Include/Common/ResourceGatheringManager.h | 6 - .../GameEngine/Include/Common/STLTypedefs.h | 6 - .../Code/GameEngine/Include/Common/Science.h | 8 - .../GameEngine/Include/Common/ScopedMutex.h | 6 - .../GameEngine/Include/Common/ScoreKeeper.h | 6 - .../Include/Common/SkirmishBattleHonors.h | 6 - .../Include/Common/SkirmishPreferences.h | 6 - .../Code/GameEngine/Include/Common/Snapshot.h | 7 - .../Include/Common/SparseMatchFinder.h | 7 - .../GameEngine/Include/Common/SpecialPower.h | 6 - .../Include/Common/SpecialPowerMaskType.h | 5 - .../Include/Common/SpecialPowerType.h | 5 - .../GameEngine/Include/Common/StackDump.h | 5 - .../GameEngine/Include/Common/StateMachine.h | 7 - .../Include/Common/StatsCollector.h | 6 - .../Include/Common/SubsystemInterface.h | 7 - .../GameEngine/Include/Common/SystemInfo.h | 8 - .../Code/GameEngine/Include/Common/Team.h | 6 - .../Code/GameEngine/Include/Common/Terrain.h | 6 - .../GameEngine/Include/Common/TerrainTypes.h | 7 - .../Code/GameEngine/Include/Common/Thing.h | 7 - .../GameEngine/Include/Common/ThingFactory.h | 8 - .../GameEngine/Include/Common/ThingSort.h | 7 - .../GameEngine/Include/Common/ThingTemplate.h | 7 - .../GameEngine/Include/Common/TunnelTracker.h | 6 - .../GameEngine/Include/Common/UnitTimings.h | 7 - .../Code/GameEngine/Include/Common/Upgrade.h | 6 - .../Include/Common/UserPreferences.h | 6 - .../GameEngine/Include/Common/WellKnownKeys.h | 6 - .../Code/GameEngine/Include/Common/encrypt.h | 8 - .../Code/GameEngine/Include/Common/version.h | 6 - .../GameEngine/Include/GameClient/Anim2D.h | 6 - .../Include/GameClient/AnimateWindowManager.h | 6 - .../GameEngine/Include/GameClient/CDCheck.h | 6 - .../Include/GameClient/CampaignManager.h | 6 - .../Include/GameClient/ChallengeGenerals.h | 6 - .../GameEngine/Include/GameClient/Color.h | 7 - .../Include/GameClient/CommandXlat.h | 6 - .../Include/GameClient/ControlBar.h | 7 - .../Include/GameClient/ControlBarResizer.h | 6 - .../Include/GameClient/ControlBarScheme.h | 6 - .../GameEngine/Include/GameClient/Credits.h | 5 - .../Include/GameClient/DebugDisplay.h | 8 - .../GameEngine/Include/GameClient/Diplomacy.h | 6 - .../Include/GameClient/DisconnectMenu.h | 6 - .../GameEngine/Include/GameClient/Display.h | 7 - .../Include/GameClient/DisplayString.h | 7 - .../Include/GameClient/DisplayStringManager.h | 7 - .../Include/GameClient/DrawGroupInfo.h | 5 - .../GameEngine/Include/GameClient/Drawable.h | 5 - .../Include/GameClient/DrawableInfo.h | 5 - .../Code/GameEngine/Include/GameClient/Eva.h | 5 - .../Include/GameClient/ExtendedMessageBox.h | 6 - .../GameEngine/Include/GameClient/FXList.h | 7 - .../GameEngine/Include/GameClient/FontDesc.h | 5 - .../Include/GameClient/GUICallbacks.h | 8 - .../Include/GameClient/GUICommandTranslator.h | 8 - .../GameEngine/Include/GameClient/Gadget.h | 6 - .../Include/GameClient/GadgetCheckBox.h | 7 - .../Include/GameClient/GadgetComboBox.h | 7 - .../Include/GameClient/GadgetListBox.h | 7 - .../Include/GameClient/GadgetProgressBar.h | 7 - .../Include/GameClient/GadgetPushButton.h | 7 - .../Include/GameClient/GadgetRadioButton.h | 7 - .../Include/GameClient/GadgetSlider.h | 7 - .../Include/GameClient/GadgetStaticText.h | 7 - .../Include/GameClient/GadgetTabControl.h | 7 - .../Include/GameClient/GadgetTextEntry.h | 7 - .../Include/GameClient/GameClient.h | 6 - .../GameEngine/Include/GameClient/GameFont.h | 7 - .../Include/GameClient/GameInfoWindow.h | 7 - .../GameEngine/Include/GameClient/GameText.h | 6 - .../Include/GameClient/GameWindow.h | 7 - .../Include/GameClient/GameWindowGlobal.h | 7 - .../Include/GameClient/GameWindowID.h | 7 - .../Include/GameClient/GameWindowManager.h | 7 - .../GameClient/GameWindowTransitions.h | 6 - .../Include/GameClient/GlobalLanguage.h | 5 - .../GameEngine/Include/GameClient/GraphDraw.h | 6 - .../Include/GameClient/HeaderTemplate.h | 5 - .../GameEngine/Include/GameClient/HintSpy.h | 6 - .../GameEngine/Include/GameClient/HotKey.h | 7 - .../Include/GameClient/IMEManager.h | 8 - .../GameEngine/Include/GameClient/Image.h | 7 - .../GameEngine/Include/GameClient/InGameUI.h | 6 - .../GameEngine/Include/GameClient/KeyDefs.h | 6 - .../GameEngine/Include/GameClient/Keyboard.h | 6 - .../Include/GameClient/LanguageFilter.h | 6 - .../GameEngine/Include/GameClient/Line2D.h | 8 - .../Include/GameClient/LoadScreen.h | 6 - .../Include/GameClient/LookAtXlat.h | 6 - .../GameEngine/Include/GameClient/MapUtil.h | 5 - .../Include/GameClient/MessageBox.h | 6 - .../GameEngine/Include/GameClient/MetaEvent.h | 6 - .../AnimatedParticleSysBoneClientUpdate.h | 7 - .../GameClient/Module/BeaconClientUpdate.h | 7 - .../GameClient/Module/SwayClientUpdate.h | 7 - .../GameEngine/Include/GameClient/Mouse.h | 6 - .../Include/GameClient/ParabolicEase.h | 3 - .../Include/GameClient/ParticleSys.h | 7 - .../Include/GameClient/PlaceEventTranslator.h | 6 - .../Include/GameClient/ProcessAnimateWindow.h | 6 - .../Include/GameClient/RadiusDecal.h | 6 - .../GameEngine/Include/GameClient/RayEffect.h | 7 - .../Include/GameClient/SelectionInfo.h | 7 - .../Include/GameClient/SelectionXlat.h | 6 - .../GameEngine/Include/GameClient/Shadow.h | 7 - .../GameEngine/Include/GameClient/Shell.h | 7 - .../Include/GameClient/ShellHooks.h | 7 - .../Include/GameClient/ShellMenuScheme.h | 6 - .../GameEngine/Include/GameClient/Smudge.h | 6 - .../Code/GameEngine/Include/GameClient/Snow.h | 6 - .../Include/GameClient/Statistics.h | 5 - .../Include/GameClient/TerrainRoads.h | 6 - .../Include/GameClient/TerrainVisual.h | 6 - .../Code/GameEngine/Include/GameClient/View.h | 6 - .../GameEngine/Include/GameClient/Water.h | 7 - .../Include/GameClient/WinInstanceData.h | 7 - .../Include/GameClient/WindowLayout.h | 7 - .../Include/GameClient/WindowXlat.h | 6 - .../Code/GameEngine/Include/GameLogic/AI.h | 7 - .../GameEngine/Include/GameLogic/AIDock.h | 7 - .../GameEngine/Include/GameLogic/AIGuard.h | 5 - .../Include/GameLogic/AIGuardRetaliate.h | 5 - .../GameEngine/Include/GameLogic/AIPathfind.h | 7 - .../GameEngine/Include/GameLogic/AIPlayer.h | 9 - .../Include/GameLogic/AISkirmishPlayer.h | 9 - .../Include/GameLogic/AIStateMachine.h | 6 - .../GameEngine/Include/GameLogic/AITNGuard.h | 5 - .../Code/GameEngine/Include/GameLogic/Armor.h | 7 - .../GameEngine/Include/GameLogic/ArmorSet.h | 6 - .../GameEngine/Include/GameLogic/CaveSystem.h | 5 - .../Include/GameLogic/CrateSystem.h | 5 - .../GameEngine/Include/GameLogic/Damage.h | 7 - .../Include/GameLogic/ExperienceTracker.h | 6 - .../GameEngine/Include/GameLogic/FPUControl.h | 6 - .../Include/GameLogic/FiringTracker.h | 7 - .../GameEngine/Include/GameLogic/GameLogic.h | 7 - .../Include/GameLogic/GhostObject.h | 6 - .../GameEngine/Include/GameLogic/Locomotor.h | 7 - .../Include/GameLogic/LocomotorSet.h | 6 - .../Include/GameLogic/Module/AIUpdate.h | 7 - .../Include/GameLogic/Module/ActiveBody.h | 7 - .../GameLogic/Module/ActiveShroudUpgrade.h | 7 - .../Module/AnimationSteeringUpdate.h | 6 - .../Include/GameLogic/Module/ArmorUpgrade.h | 6 - .../Module/AssaultTransportAIUpdate.h | 7 - .../Module/AssistedTargetingUpdate.h | 7 - .../GameLogic/Module/AutoDepositUpdate.h | 6 - .../GameLogic/Module/AutoFindHealingUpdate.h | 8 - .../GameLogic/Module/AutoHealBehavior.h | 7 - .../GameLogic/Module/BaikonurLaunchPower.h | 6 - .../GameLogic/Module/BaseRegenerateUpdate.h | 6 - .../Module/BattleBusSlowDeathBehavior.h | 7 - .../GameLogic/Module/BattlePlanUpdate.h | 8 - .../Include/GameLogic/Module/BehaviorModule.h | 6 - .../Include/GameLogic/Module/BodyModule.h | 6 - .../Include/GameLogic/Module/BoneFXDamage.h | 6 - .../Include/GameLogic/Module/BoneFXUpdate.h | 6 - .../Include/GameLogic/Module/BridgeBehavior.h | 6 - .../GameLogic/Module/BridgeScaffoldBehavior.h | 7 - .../GameLogic/Module/BridgeTowerBehavior.h | 6 - .../GameLogic/Module/BunkerBusterBehavior.h | 7 - .../GameLogic/Module/CashBountyPower.h | 6 - .../GameLogic/Module/CashHackSpecialPower.h | 7 - .../Include/GameLogic/Module/CaveContain.h | 6 - .../GameLogic/Module/CheckpointUpdate.h | 7 - .../GameLogic/Module/ChinookAIUpdate.h | 7 - .../GameLogic/Module/CleanupAreaPower.h | 6 - .../GameLogic/Module/CleanupHazardUpdate.h | 8 - .../Include/GameLogic/Module/CollideModule.h | 6 - .../Module/CommandButtonHuntUpdate.h | 8 - .../GameLogic/Module/CommandSetUpgrade.h | 7 - .../Include/GameLogic/Module/ContainModule.h | 6 - .../Module/ConvertToCarBombCrateCollide.h | 6 - .../ConvertToHijackedVehicleCrateCollide.h | 6 - .../GameLogic/Module/CostModifierUpgrade.h | 6 - .../Module/CountermeasuresBehavior.h | 7 - .../Include/GameLogic/Module/CrateCollide.h | 6 - .../Include/GameLogic/Module/CreateCrateDie.h | 6 - .../Include/GameLogic/Module/CreateModule.h | 6 - .../GameLogic/Module/CreateObjectDie.h | 7 - .../Include/GameLogic/Module/CrushDie.h | 7 - .../Include/GameLogic/Module/DamDie.h | 6 - .../Include/GameLogic/Module/DamageModule.h | 6 - .../Module/DefaultProductionExitUpdate.h | 6 - .../GameLogic/Module/DefectorSpecialPower.h | 6 - .../Include/GameLogic/Module/DeletionUpdate.h | 7 - .../GameLogic/Module/DeliverPayloadAIUpdate.h | 7 - .../Include/GameLogic/Module/DemoTrapUpdate.h | 8 - .../GameLogic/Module/DemoralizeSpecialPower.h | 7 - .../GameLogic/Module/DeployStyleAIUpdate.h | 7 - .../Include/GameLogic/Module/DestroyDie.h | 7 - .../Include/GameLogic/Module/DestroyModule.h | 6 - .../Include/GameLogic/Module/DieModule.h | 6 - .../Include/GameLogic/Module/DockUpdate.h | 6 - .../Include/GameLogic/Module/DozerAIUpdate.h | 8 - .../GameLogic/Module/DumbProjectileBehavior.h | 7 - .../Module/DynamicGeometryInfoUpdate.h | 8 - .../Module/DynamicShroudClearingRangeUpdate.h | 7 - .../Include/GameLogic/Module/EMPUpdate.h | 23 -- .../Include/GameLogic/Module/EjectPilotDie.h | 7 - .../GameLogic/Module/EnemyNearUpdate.h | 7 - .../Module/ExperienceScalarUpgrade.h | 8 - .../Include/GameLogic/Module/FXListDie.h | 8 - .../Module/FireOCLAfterWeaponCooldownUpdate.h | 7 - .../GameLogic/Module/FireSpreadUpdate.h | 7 - .../GameLogic/Module/FireWeaponCollide.h | 8 - .../GameLogic/Module/FireWeaponPower.h | 6 - .../GameLogic/Module/FireWeaponUpdate.h | 7 - .../Module/FireWeaponWhenDamagedBehavior.h | 7 - .../Module/FireWeaponWhenDeadBehavior.h | 7 - .../FirestormDynamicGeometryInfoUpdate.h | 8 - .../GameLogic/Module/FlammableUpdate.h | 7 - .../GameLogic/Module/FlightDeckBehavior.h | 7 - .../Include/GameLogic/Module/FloatUpdate.h | 6 - .../GameLogic/Module/GarrisonContain.h | 7 - .../Module/GenerateMinefieldBehavior.h | 7 - .../GameLogic/Module/GrantScienceUpgrade.h | 7 - .../GameLogic/Module/GrantStealthBehavior.h | 7 - .../GameLogic/Module/GrantUpgradeCreate.h | 7 - .../GameLogic/Module/HackInternetAIUpdate.h | 7 - .../Include/GameLogic/Module/HealContain.h | 6 - .../GameLogic/Module/HealCrateCollide.h | 6 - .../GameLogic/Module/HeightDieUpdate.h | 6 - .../Module/HelicopterSlowDeathUpdate.h | 6 - .../Include/GameLogic/Module/HelixContain.h | 7 - .../Include/GameLogic/Module/HighlanderBody.h | 7 - .../Include/GameLogic/Module/HijackerUpdate.h | 7 - .../GameLogic/Module/HiveStructureBody.h | 7 - .../Include/GameLogic/Module/HordeUpdate.h | 7 - .../Include/GameLogic/Module/ImmortalBody.h | 7 - .../Include/GameLogic/Module/InactiveBody.h | 7 - .../GameLogic/Module/InstantDeathBehavior.h | 7 - .../GameLogic/Module/InternetHackContain.h | 7 - .../Include/GameLogic/Module/JetAIUpdate.h | 7 - .../GameLogic/Module/JetSlowDeathBehavior.h | 7 - .../Include/GameLogic/Module/KeepObjectDie.h | 7 - .../Include/GameLogic/Module/LaserUpdate.h | 8 - .../Include/GameLogic/Module/LifetimeUpdate.h | 7 - .../GameLogic/Module/LockWeaponCreate.h | 7 - .../GameLogic/Module/LocomotorSetUpgrade.h | 8 - .../GameLogic/Module/MaxHealthUpgrade.h | 8 - .../GameLogic/Module/MinefieldBehavior.h | 6 - .../GameLogic/Module/MissileAIUpdate.h | 7 - .../Module/MissileLauncherBuildingUpdate.h | 6 - .../GameLogic/Module/MobMemberSlavedUpdate.h | 6 - .../GameLogic/Module/MobNexusContain.h | 7 - .../GameLogic/Module/ModelConditionUpgrade.h | 7 - .../GameLogic/Module/MoneyCrateCollide.h | 6 - .../GameLogic/Module/NeutronBlastBehavior.h | 7 - .../Module/NeutronMissileSlowDeathUpdate.h | 6 - .../GameLogic/Module/NeutronMissileUpdate.h | 7 - .../GameLogic/Module/OCLSpecialPower.h | 6 - .../Include/GameLogic/Module/OCLUpdate.h | 7 - .../GameLogic/Module/ObjectCreationUpgrade.h | 7 - .../GameLogic/Module/ObjectDefectionHelper.h | 7 - .../Include/GameLogic/Module/ObjectHelper.h | 6 - .../GameLogic/Module/ObjectRepulsorHelper.h | 7 - .../GameLogic/Module/ObjectSMCHelper.h | 7 - .../Module/ObjectWeaponStatusHelper.h | 6 - .../Include/GameLogic/Module/OpenContain.h | 6 - .../GameLogic/Module/OverchargeBehavior.h | 6 - .../GameLogic/Module/OverlordContain.h | 7 - .../GameLogic/Module/POWTruckAIUpdate.h | 6 - .../GameLogic/Module/POWTruckBehavior.h | 6 - .../GameLogic/Module/ParachuteContain.h | 7 - .../GameLogic/Module/ParkingPlaceBehavior.h | 7 - .../Module/ParticleUplinkCannonUpdate.h | 8 - .../GameLogic/Module/PassengersFireUpgrade.h | 8 - .../Include/GameLogic/Module/PhysicsUpdate.h | 7 - .../GameLogic/Module/PilotFindVehicleUpdate.h | 8 - .../Module/PointDefenseLaserUpdate.h | 8 - .../GameLogic/Module/PoisonedBehavior.h | 7 - .../GameLogic/Module/PowerPlantUpdate.h | 6 - .../GameLogic/Module/PowerPlantUpgrade.h | 7 - .../Include/GameLogic/Module/PreorderCreate.h | 6 - .../GameLogic/Module/PrisonDockUpdate.h | 6 - .../GameLogic/Module/ProductionUpdate.h | 6 - .../GameLogic/Module/ProjectileStreamUpdate.h | 8 - .../Include/GameLogic/Module/ProneUpdate.h | 8 - .../Module/PropagandaTowerBehavior.h | 7 - .../Module/QueueProductionExitUpdate.h | 6 - .../Include/GameLogic/Module/RadarUpdate.h | 6 - .../Include/GameLogic/Module/RadarUpgrade.h | 7 - .../GameLogic/Module/RadiusDecalUpdate.h | 7 - .../Module/RailedTransportAIUpdate.h | 8 - .../GameLogic/Module/RailedTransportContain.h | 6 - .../GameLogic/Module/RailroadGuideAIUpdate.h | 8 - .../GameLogic/Module/RebuildHoleBehavior.h | 6 - .../GameLogic/Module/RebuildHoleExposeDie.h | 7 - .../GameLogic/Module/RepairDockUpdate.h | 6 - .../GameLogic/Module/ReplaceObjectUpgrade.h | 7 - .../GameLogic/Module/RiderChangeContain.h | 7 - .../SabotageCommandCenterCrateCollide.h | 6 - .../Module/SabotageFakeBuildingCrateCollide.h | 6 - .../SabotageInternetCenterCrateCollide.h | 6 - .../SabotageMilitaryFactoryCrateCollide.h | 6 - .../Module/SabotagePowerPlantCrateCollide.h | 6 - .../Module/SabotageSuperweaponCrateCollide.h | 6 - .../Module/SabotageSupplyCenterCrateCollide.h | 6 - .../SabotageSupplyDropzoneCrateCollide.h | 6 - .../GameLogic/Module/SalvageCrateCollide.h | 6 - .../GameLogic/Module/ShroudCrateCollide.h | 6 - .../Include/GameLogic/Module/SlavedUpdate.h | 6 - .../GameLogic/Module/SlowDeathBehavior.h | 7 - .../Module/SmartBombTargetHomingUpdate.h | 7 - .../Include/GameLogic/Module/SpawnBehavior.h | 6 - .../Module/SpawnPointProductionExitUpdate.h | 6 - .../Include/GameLogic/Module/SpecialAbility.h | 6 - .../GameLogic/Module/SpecialAbilityUpdate.h | 6 - .../Module/SpecialPowerCompletionDie.h | 6 - .../GameLogic/Module/SpecialPowerCreate.h | 6 - .../GameLogic/Module/SpecialPowerModule.h | 7 - .../Module/SpecialPowerUpdateModule.h | 6 - .../Module/SpectreGunshipDeploymentUpdate.h | 8 - .../GameLogic/Module/SpectreGunshipUpdate.h | 8 - .../GameLogic/Module/SpyVisionSpecialPower.h | 6 - .../GameLogic/Module/SpyVisionUpdate.h | 7 - .../Include/GameLogic/Module/SquishCollide.h | 7 - .../GameLogic/Module/StatusBitsUpgrade.h | 8 - .../GameLogic/Module/StatusDamageHelper.h | 7 - .../GameLogic/Module/StealthDetectorUpdate.h | 8 - .../Include/GameLogic/Module/StealthUpdate.h | 8 - .../Include/GameLogic/Module/StealthUpgrade.h | 8 - .../GameLogic/Module/StickyBombUpdate.h | 7 - .../Include/GameLogic/Module/StructureBody.h | 7 - .../Module/StructureCollapseUpdate.h | 7 - .../GameLogic/Module/StructureToppleUpdate.h | 7 - .../GameLogic/Module/SubObjectsUpgrade.h | 8 - .../GameLogic/Module/SubdualDamageHelper.h | 7 - .../GameLogic/Module/SupplyCenterCreate.h | 6 - .../GameLogic/Module/SupplyCenterDockUpdate.h | 6 - .../Module/SupplyCenterProductionExitUpdate.h | 7 - .../GameLogic/Module/SupplyTruckAIUpdate.h | 6 - .../GameLogic/Module/SupplyWarehouseCreate.h | 7 - .../Module/SupplyWarehouseCripplingBehavior.h | 7 - .../Module/SupplyWarehouseDockUpdate.h | 6 - .../GameLogic/Module/TechBuildingBehavior.h | 6 - .../GameLogic/Module/TempWeaponBonusHelper.h | 7 - .../GameLogic/Module/TensileFormationUpdate.h | 6 - .../Include/GameLogic/Module/ToppleUpdate.h | 7 - .../GameLogic/Module/TransitionDamageFX.h | 6 - .../GameLogic/Module/TransportAIUpdate.h | 7 - .../GameLogic/Module/TransportContain.h | 7 - .../Include/GameLogic/Module/TunnelContain.h | 6 - .../Include/GameLogic/Module/UndeadBody.h | 7 - .../GameLogic/Module/UnitCrateCollide.h | 6 - .../Module/UnpauseSpecialPowerUpgrade.h | 7 - .../Include/GameLogic/Module/UpdateModule.h | 6 - .../Include/GameLogic/Module/UpgradeDie.h | 7 - .../Include/GameLogic/Module/UpgradeModule.h | 7 - .../GameLogic/Module/VeterancyCrateCollide.h | 6 - .../GameLogic/Module/VeterancyGainCreate.h | 7 - .../Include/GameLogic/Module/WanderAIUpdate.h | 7 - .../GameLogic/Module/WaveGuideUpdate.h | 6 - .../GameLogic/Module/WeaponBonusUpdate.h | 6 - .../GameLogic/Module/WeaponBonusUpgrade.h | 8 - .../GameLogic/Module/WeaponSetUpgrade.h | 8 - .../Include/GameLogic/Module/WorkerAIUpdate.h | 8 - .../GameEngine/Include/GameLogic/Object.h | 5 - .../Include/GameLogic/ObjectCreationList.h | 7 - .../GameEngine/Include/GameLogic/ObjectIter.h | 8 - .../GameLogic/ObjectScriptStatusBits.h | 6 - .../Include/GameLogic/ObjectTypes.h | 6 - .../Include/GameLogic/PartitionManager.h | 7 - .../Include/GameLogic/PolygonTrigger.h | 6 - .../GameEngine/Include/GameLogic/Powers.h | 7 - .../GameEngine/Include/GameLogic/RankInfo.h | 8 - .../Include/GameLogic/ScriptActions.h | 9 - .../Include/GameLogic/ScriptConditions.h | 7 - .../Include/GameLogic/ScriptEngine.h | 7 - .../GameEngine/Include/GameLogic/Scripts.h | 7 - .../GameEngine/Include/GameLogic/SidesList.h | 8 - .../Code/GameEngine/Include/GameLogic/Squad.h | 5 - .../Include/GameLogic/TerrainLogic.h | 5 - .../GameEngine/Include/GameLogic/TurretAI.h | 7 - .../Include/GameLogic/VictoryConditions.h | 6 - .../GameEngine/Include/GameLogic/Weapon.h | 7 - .../GameLogic/WeaponBonusConditionFlags.h | 5 - .../GameEngine/Include/GameLogic/WeaponSet.h | 6 - .../Include/GameLogic/WeaponSetFlags.h | 5 - .../Include/GameLogic/WeaponSetType.h | 5 - .../Include/GameLogic/WeaponStatus.h | 5 - .../Include/GameNetwork/Connection.h | 6 - .../Include/GameNetwork/ConnectionManager.h | 6 - .../Include/GameNetwork/DisconnectManager.h | 7 - .../Include/GameNetwork/DownloadManager.h | 6 - .../Include/GameNetwork/FileTransfer.h | 5 - .../Include/GameNetwork/FirewallHelper.h | 8 - .../Include/GameNetwork/FrameData.h | 6 - .../Include/GameNetwork/FrameDataManager.h | 6 - .../Include/GameNetwork/FrameMetrics.h | 6 - .../GameEngine/Include/GameNetwork/GUIUtil.h | 6 - .../GameEngine/Include/GameNetwork/GameInfo.h | 6 - .../Include/GameNetwork/GameSpy/BuddyDefs.h | 6 - .../Include/GameNetwork/GameSpy/BuddyThread.h | 7 - .../Include/GameNetwork/GameSpy/GSConfig.h | 6 - .../GameNetwork/GameSpy/GameResultsThread.h | 7 - .../Include/GameNetwork/GameSpy/LadderDefs.h | 6 - .../Include/GameNetwork/GameSpy/LobbyUtils.h | 6 - .../GameNetwork/GameSpy/MainMenuUtils.h | 6 - .../Include/GameNetwork/GameSpy/PeerDefs.h | 6 - .../GameSpy/PeerDefsImplementation.h | 6 - .../Include/GameNetwork/GameSpy/PeerThread.h | 6 - .../GameSpy/PersistentStorageDefs.h | 6 - .../GameSpy/PersistentStorageThread.h | 7 - .../Include/GameNetwork/GameSpy/PingThread.h | 7 - .../GameNetwork/GameSpy/StagingRoomGameInfo.h | 6 - .../Include/GameNetwork/GameSpy/ThreadUtils.h | 6 - .../Include/GameNetwork/GameSpyChat.h | 6 - .../Include/GameNetwork/GameSpyGP.h | 6 - .../Include/GameNetwork/GameSpyGameInfo.h | 6 - .../Include/GameNetwork/GameSpyOverlay.h | 5 - .../Include/GameNetwork/GameSpyThread.h | 6 - .../Include/GameNetwork/IPEnumeration.h | 7 - .../GameEngine/Include/GameNetwork/LANAPI.h | 7 - .../Include/GameNetwork/LANAPICallbacks.h | 8 - .../Include/GameNetwork/LANGameInfo.h | 7 - .../Include/GameNetwork/LANPlayer.h | 6 - .../Code/GameEngine/Include/GameNetwork/NAT.h | 6 - .../Include/GameNetwork/NetCommandList.h | 6 - .../Include/GameNetwork/NetCommandMsg.h | 5 - .../Include/GameNetwork/NetCommandRef.h | 6 - .../GameNetwork/NetCommandWrapperList.h | 6 - .../Include/GameNetwork/NetPacket.h | 6 - .../Include/GameNetwork/NetworkDefs.h | 6 - .../Include/GameNetwork/NetworkInterface.h | 6 - .../Include/GameNetwork/RankPointValue.h | 6 - .../Include/GameNetwork/Transport.h | 6 - .../GameEngine/Include/GameNetwork/User.h | 6 - .../GameNetwork/WOLBrowser/WebBrowser.h | 5 - .../Include/GameNetwork/networkutil.h | 5 - .../Code/GameEngine/Include/GameNetwork/udp.h | 6 - .../Include/W3DDevice/Common/W3DConvert.h | 8 - .../W3DDevice/Common/W3DFunctionLexicon.h | 7 - .../W3DDevice/Common/W3DModuleFactory.h | 6 - .../Include/W3DDevice/Common/W3DRadar.h | 7 - .../W3DDevice/Common/W3DThingFactory.h | 7 - .../W3DDevice/GameClient/BaseHeightMap.h | 5 - .../W3DDevice/GameClient/FlatHeightMap.h | 6 - .../Include/W3DDevice/GameClient/HeightMap.h | 6 - .../GameClient/Module/W3DDebrisDraw.h | 7 - .../GameClient/Module/W3DDefaultDraw.h | 7 - .../Module/W3DDependencyModelDraw.h | 7 - .../GameClient/Module/W3DLaserDraw.h | 7 - .../GameClient/Module/W3DModelDraw.h | 7 - .../Module/W3DOverlordAircraftDraw.h | 7 - .../GameClient/Module/W3DOverlordTankDraw.h | 7 - .../GameClient/Module/W3DOverlordTruckDraw.h | 7 - .../GameClient/Module/W3DPoliceCarDraw.h | 7 - .../Module/W3DProjectileStreamDraw.h | 7 - .../W3DDevice/GameClient/Module/W3DPropDraw.h | 7 - .../W3DDevice/GameClient/Module/W3DRopeDraw.h | 7 - .../GameClient/Module/W3DScienceModelDraw.h | 7 - .../GameClient/Module/W3DSupplyDraw.h | 7 - .../W3DDevice/GameClient/Module/W3DTankDraw.h | 7 - .../GameClient/Module/W3DTankTruckDraw.h | 7 - .../GameClient/Module/W3DTracerDraw.h | 7 - .../W3DDevice/GameClient/Module/W3DTreeDraw.h | 7 - .../GameClient/Module/W3DTruckDraw.h | 7 - .../Include/W3DDevice/GameClient/TerrainTex.h | 8 - .../Include/W3DDevice/GameClient/TileData.h | 6 - .../W3DDevice/GameClient/W3DAssetManager.h | 7 - .../GameClient/W3DAssetManagerExposed.h | 5 - .../W3DDevice/GameClient/W3DBibBuffer.h | 6 - .../W3DDevice/GameClient/W3DBridgeBuffer.h | 6 - .../W3DDevice/GameClient/W3DBufferManager.h | 6 - .../W3DDevice/GameClient/W3DCustomEdging.h | 6 - .../W3DDevice/GameClient/W3DCustomScene.h | 6 - .../W3DDevice/GameClient/W3DDebugDisplay.h | 8 - .../W3DDevice/GameClient/W3DDebugIcons.h | 6 - .../Include/W3DDevice/GameClient/W3DDisplay.h | 6 - .../W3DDevice/GameClient/W3DDisplayString.h | 7 - .../GameClient/W3DDisplayStringManager.h | 7 - .../W3DDevice/GameClient/W3DDynamicLight.h | 8 - .../W3DDevice/GameClient/W3DFileSystem.h | 5 - .../W3DDevice/GameClient/W3DGUICallbacks.h | 7 - .../Include/W3DDevice/GameClient/W3DGadget.h | 7 - .../W3DDevice/GameClient/W3DGameClient.h | 6 - .../W3DDevice/GameClient/W3DGameFont.h | 7 - .../W3DDevice/GameClient/W3DGameWindow.h | 7 - .../GameClient/W3DGameWindowManager.h | 7 - .../W3DDevice/GameClient/W3DInGameUI.h | 6 - .../Include/W3DDevice/GameClient/W3DMirror.h | 6 - .../Include/W3DDevice/GameClient/W3DMouse.h | 6 - .../W3DDevice/GameClient/W3DParticleSys.h | 6 - .../Include/W3DDevice/GameClient/W3DPoly.h | 6 - .../W3DDevice/GameClient/W3DProjectedShadow.h | 6 - .../W3DDevice/GameClient/W3DPropBuffer.h | 6 - .../W3DDevice/GameClient/W3DRoadBuffer.h | 6 - .../Include/W3DDevice/GameClient/W3DScene.h | 6 - .../W3DDevice/GameClient/W3DShaderManager.h | 6 - .../Include/W3DDevice/GameClient/W3DShadow.h | 6 - .../Include/W3DDevice/GameClient/W3DShroud.h | 6 - .../Include/W3DDevice/GameClient/W3DSmudge.h | 6 - .../W3DDevice/GameClient/W3DStatusCircle.h | 6 - .../GameClient/W3DTerrainBackground.h | 6 - .../W3DDevice/GameClient/W3DTerrainTracks.h | 6 - .../W3DDevice/GameClient/W3DTerrainVisual.h | 6 - .../W3DDevice/GameClient/W3DTreeBuffer.h | 6 - .../Include/W3DDevice/GameClient/W3DView.h | 6 - .../GameClient/W3DVolumetricShadow.h | 6 - .../Include/W3DDevice/GameClient/W3DWater.h | 6 - .../W3DDevice/GameClient/W3DWaterTracks.h | 6 - .../W3DDevice/GameClient/W3DWaypointBuffer.h | 6 - .../W3DDevice/GameClient/W3DWebBrowser.h | 6 - .../W3DDevice/GameClient/WorldHeightMap.h | 6 - .../W3DDevice/GameLogic/W3DGameLogic.h | 6 - .../W3DDevice/GameLogic/W3DGhostObject.h | 6 - .../W3DDevice/GameLogic/W3DTerrainLogic.h | 6 - .../Win32Device/Common/Win32CDManager.h | 7 - .../Win32Device/Common/Win32GameEngine.h | 6 - .../Win32Device/GameClient/Win32DIKeyboard.h | 7 - .../Win32Device/GameClient/Win32DIMouse.h | 7 - .../Win32Device/GameClient/Win32Mouse.h | 7 - .../Code/Libraries/Include/Lib/BaseType.h | 6 - .../Source/WWVegas/WW3D2/aabtreebuilder.h | 10 - .../Libraries/Source/WWVegas/WW3D2/animobj.h | 8 - .../Libraries/Source/WWVegas/WW3D2/assetmgr.h | 6 - .../Libraries/Source/WWVegas/WW3D2/bmp2d.h | 6 - .../Libraries/Source/WWVegas/WW3D2/boxrobj.h | 10 - .../Libraries/Source/WWVegas/WW3D2/camera.h | 7 - .../Libraries/Source/WWVegas/WW3D2/dazzle.h | 6 - .../Libraries/Source/WWVegas/WW3D2/ddsfile.h | 6 - .../Libraries/Source/WWVegas/WW3D2/decalmsh.h | 8 - .../Libraries/Source/WWVegas/WW3D2/dx8caps.h | 7 - .../Libraries/Source/WWVegas/WW3D2/dx8fvf.h | 7 - .../Source/WWVegas/WW3D2/dx8indexbuffer.h | 7 - .../Source/WWVegas/WW3D2/dx8renderer.h | 6 - .../WWVegas/WW3D2/dx8rendererdebugger.h | 6 - .../Source/WWVegas/WW3D2/dx8texman.h | 6 - .../Source/WWVegas/WW3D2/dx8vertexbuffer.h | 7 - .../Source/WWVegas/WW3D2/dx8wrapper.h | 7 - .../Libraries/Source/WWVegas/WW3D2/hanimmgr.h | 6 - .../Libraries/Source/WWVegas/WW3D2/hlod.h | 7 - .../Source/WWVegas/WW3D2/hmorphanim.h | 10 - .../Libraries/Source/WWVegas/WW3D2/hrawanim.h | 10 - .../Libraries/Source/WWVegas/WW3D2/htreemgr.h | 7 - .../Libraries/Source/WWVegas/WW3D2/light.h | 6 - .../Source/WWVegas/WW3D2/lightenvironment.h | 8 - .../Libraries/Source/WWVegas/WW3D2/linegrp.h | 6 - .../Libraries/Source/WWVegas/WW3D2/mapper.h | 6 - .../Libraries/Source/WWVegas/WW3D2/matpass.h | 7 - .../Libraries/Source/WWVegas/WW3D2/mesh.h | 7 - .../Source/WWVegas/WW3D2/meshbuild.h | 6 - .../Libraries/Source/WWVegas/WW3D2/meshmdl.h | 13 -- .../Libraries/Source/WWVegas/WW3D2/motchan.h | 7 - .../Libraries/Source/WWVegas/WW3D2/nullrobj.h | 8 - .../Libraries/Source/WWVegas/WW3D2/part_buf.h | 7 - .../Libraries/Source/WWVegas/WW3D2/part_emt.h | 8 - .../Libraries/Source/WWVegas/WW3D2/part_ldr.h | 7 - .../Libraries/Source/WWVegas/WW3D2/render2d.h | 6 - .../Libraries/Source/WWVegas/WW3D2/rinfo.h | 8 - .../Libraries/Source/WWVegas/WW3D2/scene.h | 6 - .../Libraries/Source/WWVegas/WW3D2/shader.h | 6 - .../Source/WWVegas/WW3D2/sortingrenderer.h | 7 - .../Source/WWVegas/WW3D2/texproject.h | 8 - .../Libraries/Source/WWVegas/WW3D2/texture.h | 6 - .../Source/WWVegas/WW3D2/textureloader.h | 6 - .../Source/WWVegas/WW3D2/texturethumbnail.h | 5 - .../Source/WWVegas/WW3D2/vertmaterial.h | 7 - .../Libraries/Source/WWVegas/WW3D2/w3d_file.h | 7 - .../Libraries/Source/WWVegas/WW3D2/ww3d.h | 8 - .../Code/Tools/GUIEdit/Include/DialogProc.h | 7 - .../Code/Tools/GUIEdit/Include/EditWindow.h | 7 - .../Code/Tools/GUIEdit/Include/GUIEdit.h | 7 - .../Code/Tools/GUIEdit/Include/GUIEditColor.h | 7 - .../Tools/GUIEdit/Include/GUIEditDisplay.h | 7 - .../GUIEdit/Include/GUIEditWindowManager.h | 7 - .../Tools/GUIEdit/Include/HierarchyView.h | 7 - .../Code/Tools/GUIEdit/Include/LayoutScheme.h | 7 - .../Code/Tools/GUIEdit/Include/Properties.h | 7 - .../Code/Tools/GUIEdit/Include/WinMain.h | 7 - .../Tools/ParticleEditor/CButtonShowColor.h | 6 - .../Tools/ParticleEditor/EmissionTypePanels.h | 5 - .../Tools/ParticleEditor/ISwapablePanel.h | 5 - .../Tools/ParticleEditor/MoreParmsDialog.h | 5 - .../Tools/ParticleEditor/ParticleEditor.h | 6 - .../Tools/ParticleEditor/ParticleTypePanels.h | 5 - .../Tools/ParticleEditor/ShaderTypePanels.h | 6 - GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h | 6 - .../Tools/ParticleEditor/VelocityTypePanels.h | 5 - .../WorldBuilder/include/AutoEdgeOutTool.h | 7 - .../WorldBuilder/include/BaseBuildProps.h | 6 - .../WorldBuilder/include/BlendEdgeTool.h | 7 - .../WorldBuilder/include/BlendMaterial.h | 6 - .../Tools/WorldBuilder/include/BrushTool.h | 7 - .../Tools/WorldBuilder/include/BuildList.h | 6 - .../WorldBuilder/include/BuildListTool.h | 7 - .../WorldBuilder/include/CButtonShowColor.h | 6 - .../Tools/WorldBuilder/include/CUndoable.h | 8 - .../WorldBuilder/include/CameraOptions.h | 6 - .../Tools/WorldBuilder/include/CellWidth.h | 6 - .../WorldBuilder/include/ContourOptions.h | 6 - .../Tools/WorldBuilder/include/EditAction.h | 6 - .../WorldBuilder/include/EditCondition.h | 6 - .../WorldBuilder/include/EditCoordParameter.h | 6 - .../Tools/WorldBuilder/include/EditGroup.h | 6 - .../include/EditObjectParameter.h | 6 - .../WorldBuilder/include/EditParameter.h | 6 - .../include/ExportScriptsOptions.h | 6 - .../WorldBuilder/include/EyedropperTool.h | 7 - .../WorldBuilder/include/FeatherOptions.h | 6 - .../Tools/WorldBuilder/include/FeatherTool.h | 7 - .../Tools/WorldBuilder/include/FenceOptions.h | 6 - .../Tools/WorldBuilder/include/FenceTool.h | 7 - .../WorldBuilder/include/FloodFillTool.h | 7 - .../WorldBuilder/include/GlobalLightOptions.h | 6 - .../Tools/WorldBuilder/include/GroveOptions.h | 6 - .../Tools/WorldBuilder/include/GroveTool.h | 7 - .../WorldBuilder/include/HandScrollTool.h | 7 - .../WorldBuilder/include/ImpassableOptions.h | 6 - .../Tools/WorldBuilder/include/LayersList.h | 5 - .../Tools/WorldBuilder/include/LightOptions.h | 6 - .../Code/Tools/WorldBuilder/include/MainFrm.h | 6 - .../Tools/WorldBuilder/include/MapPreview.h | 6 - .../Tools/WorldBuilder/include/MapSettings.h | 6 - .../WorldBuilder/include/MeshMoldOptions.h | 6 - .../Tools/WorldBuilder/include/MeshMoldTool.h | 7 - .../Tools/WorldBuilder/include/MoundOptions.h | 6 - .../Tools/WorldBuilder/include/MoundTool.h | 5 - .../Tools/WorldBuilder/include/MyToolbar.h | 8 - .../Tools/WorldBuilder/include/NewHeightMap.h | 6 - .../WorldBuilder/include/ObjectOptions.h | 6 - .../WorldBuilder/include/ObjectPreview.h | 6 - .../Tools/WorldBuilder/include/ObjectTool.h | 7 - .../Code/Tools/WorldBuilder/include/OpenMap.h | 6 - .../Tools/WorldBuilder/include/OptionsPanel.h | 6 - .../WorldBuilder/include/PickUnitDialog.h | 6 - .../Tools/WorldBuilder/include/PointerTool.h | 7 - .../Tools/WorldBuilder/include/PolygonTool.h | 8 - .../Tools/WorldBuilder/include/RampOptions.h | 5 - .../Tools/WorldBuilder/include/RampTool.h | 6 - .../Tools/WorldBuilder/include/RoadOptions.h | 6 - .../Tools/WorldBuilder/include/RoadTool.h | 7 - .../Tools/WorldBuilder/include/RulerOptions.h | 6 - .../Tools/WorldBuilder/include/RulerTool.h | 7 - .../Code/Tools/WorldBuilder/include/SaveMap.h | 6 - .../WorldBuilder/include/ScorchOptions.h | 6 - .../Tools/WorldBuilder/include/ScorchTool.h | 7 - .../WorldBuilder/include/ScriptActionsFalse.h | 6 - .../WorldBuilder/include/ScriptActionsTrue.h | 6 - .../WorldBuilder/include/ScriptConditions.h | 6 - .../Tools/WorldBuilder/include/ScriptDialog.h | 6 - .../WorldBuilder/include/ScriptProperties.h | 6 - .../WorldBuilder/include/SelectMacrotexture.h | 6 - .../WorldBuilder/include/ShadowOptions.h | 6 - .../Tools/WorldBuilder/include/SplashScreen.h | 6 - .../Code/Tools/WorldBuilder/include/StdAfx.h | 6 - .../Tools/WorldBuilder/include/TeamBehavior.h | 6 - .../Tools/WorldBuilder/include/TeamGeneric.h | 6 - .../Tools/WorldBuilder/include/TeamIdentity.h | 6 - .../include/TeamObjectProperties.h | 5 - .../WorldBuilder/include/TeamReinforcement.h | 6 - .../WorldBuilder/include/TerrainMaterial.h | 6 - .../Tools/WorldBuilder/include/TerrainModal.h | 6 - .../WorldBuilder/include/TerrainSwatches.h | 6 - .../Tools/WorldBuilder/include/TileTool.h | 5 - .../Code/Tools/WorldBuilder/include/Tool.h | 7 - .../Tools/WorldBuilder/include/WBFrameWnd.h | 6 - .../WorldBuilder/include/WBPopupSlider.h | 6 - .../WorldBuilder/include/WHeightMapEdit.h | 6 - .../Tools/WorldBuilder/include/WaterOptions.h | 6 - .../Tools/WorldBuilder/include/WaterTool.h | 7 - .../WorldBuilder/include/WaypointOptions.h | 6 - .../Tools/WorldBuilder/include/WaypointTool.h | 7 - .../Tools/WorldBuilder/include/WorldBuilder.h | 6 - .../WorldBuilder/include/WorldBuilderDoc.h | 6 - .../WorldBuilder/include/WorldBuilderView.h | 6 - .../WorldBuilder/include/addplayerdialog.h | 6 - .../Tools/WorldBuilder/include/brushoptions.h | 6 - .../Tools/WorldBuilder/include/euladialog.h | 6 - .../WorldBuilder/include/mapobjectprops.h | 6 - .../WorldBuilder/include/playerlistdlg.h | 6 - .../Tools/WorldBuilder/include/propedit.h | 6 - .../Tools/WorldBuilder/include/teamsdialog.h | 6 - .../Code/Tools/WorldBuilder/include/wbview.h | 6 - .../Tools/WorldBuilder/include/wbview3d.h | 6 - GeneralsMD/Code/Tools/wdump/FindDialog.h | 6 - GeneralsMD/Code/Tools/wdump/chunk_d.h | 6 - GeneralsMD/Code/Tools/wdump/mainfrm.h | 6 - GeneralsMD/Code/Tools/wdump/stdafx.h | 6 - GeneralsMD/Code/Tools/wdump/wdeview.h | 6 - GeneralsMD/Code/Tools/wdump/wdlview.h | 6 - GeneralsMD/Code/Tools/wdump/wdtview.h | 6 - GeneralsMD/Code/Tools/wdump/wdump.h | 6 - GeneralsMD/Code/Tools/wdump/wdumpdoc.h | 6 - GeneralsMD/Code/Tools/wdump/wdview.h | 6 - scripts/cpp/remove_include_guards_pragma.py | 208 ++++++++++++++++++ 1889 files changed, 208 insertions(+), 12461 deletions(-) create mode 100644 scripts/cpp/remove_include_guards_pragma.py diff --git a/Core/GameEngine/Include/Common/ArchiveFile.h b/Core/GameEngine/Include/Common/ArchiveFile.h index b62b61297d..b1d942f7e2 100644 --- a/Core/GameEngine/Include/Common/ArchiveFile.h +++ b/Core/GameEngine/Include/Common/ArchiveFile.h @@ -27,10 +27,6 @@ ////////////////////////////////////////// #pragma once - -#ifndef __ARCHIVEFILE_H -#define __ARCHIVEFILE_H - #include "Lib/BaseType.h" #include "Common/AsciiString.h" #include "Common/ArchiveFileSystem.h" @@ -73,5 +69,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..8dd76d158a 100644 --- a/Core/GameEngine/Include/Common/ArchiveFileSystem.h +++ b/Core/GameEngine/Include/Common/ArchiveFileSystem.h @@ -42,10 +42,6 @@ //---------------------------------------------------------------------------- #pragma once - -#ifndef __ARCHIVEFILESYSTEM_H_ -#define __ARCHIVEFILESYSTEM_H_ - #define MUSIC_BIG "Music.big" //---------------------------------------------------------------------------- @@ -180,5 +176,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..990766b9f0 100644 --- a/Core/GameEngine/Include/Common/AsciiString.h +++ b/Core/GameEngine/Include/Common/AsciiString.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef ASCIISTRING_H -#define ASCIISTRING_H - #include #include #include @@ -599,5 +595,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..4b16b09546 100644 --- a/Core/GameEngine/Include/Common/AudioAffect.h +++ b/Core/GameEngine/Include/Common/AudioAffect.h @@ -26,10 +26,6 @@ // John McDonald, Jr // Do not distribute #pragma once - -#ifndef _AUDIOAFFECT_H_ -#define _AUDIOAFFECT_H_ - #include // if it is set by the options panel, use the system setting parameter. Otherwise, this will be @@ -44,5 +40,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..ce05848865 100644 --- a/Core/GameEngine/Include/Common/AudioEventInfo.h +++ b/Core/GameEngine/Include/Common/AudioEventInfo.h @@ -27,9 +27,6 @@ // Author: John K. McDonald, March 2002 #pragma once -#ifndef _H_AUDIOEVENTINFO_ -#define _H_AUDIOEVENTINFO_ - #include "Common/AsciiString.h" #include "Common/GameMemory.h" #include "Common/STLTypedefs.h" @@ -135,5 +132,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..2125023f81 100644 --- a/Core/GameEngine/Include/Common/AudioEventRTS.h +++ b/Core/GameEngine/Include/Common/AudioEventRTS.h @@ -27,9 +27,6 @@ // Author: John K. McDonald, March 2002 #pragma once -#ifndef _H_AUDIOEVENTRTS_ -#define _H_AUDIOEVENTRTS_ - #include "Common/AsciiString.h" #include "Common/GameAudio.h" #include "Common/GameMemory.h" @@ -212,6 +209,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..d12c192b3f 100644 --- a/Core/GameEngine/Include/Common/AudioHandleSpecialValues.h +++ b/Core/GameEngine/Include/Common/AudioHandleSpecialValues.h @@ -27,10 +27,6 @@ // Do not distribute #pragma once - -#ifndef _AUDIOHANDLESPECIALVALUES_H_ -#define _AUDIOHANDLESPECIALVALUES_H_ - enum AudioHandleSpecialValues CPP_11(: Int) { AHSV_Error = 0x00, @@ -41,5 +37,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..894b2fddfe 100644 --- a/Core/GameEngine/Include/Common/AudioRandomValue.h +++ b/Core/GameEngine/Include/Common/AudioRandomValue.h @@ -28,10 +28,6 @@ // Split out into separate Logic/Client/Audio headers by MDC Sept 2002 #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 +39,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..36596d8697 100644 --- a/Core/GameEngine/Include/Common/AudioRequest.h +++ b/Core/GameEngine/Include/Common/AudioRequest.h @@ -27,10 +27,6 @@ // Do not distribute #pragma once - -#ifndef _AUDIOREQUEST_H_ -#define _AUDIOREQUEST_H_ - #include "Common/GameAudio.h" #include "Common/GameMemory.h" @@ -57,5 +53,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..f0335c94c8 100644 --- a/Core/GameEngine/Include/Common/AudioSettings.h +++ b/Core/GameEngine/Include/Common/AudioSettings.h @@ -27,10 +27,6 @@ // Do not distribute #pragma once - -#ifndef _AUDIOSETTINGS_H_ -#define _AUDIOSETTINGS_H_ - #include "Common/AsciiString.h" enum { MAX_HW_PROVIDERS = 4 }; @@ -103,5 +99,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/Debug.h b/Core/GameEngine/Include/Common/Debug.h index 67048157c5..8152db19fc 100644 --- a/Core/GameEngine/Include/Common/Debug.h +++ b/Core/GameEngine/Include/Common/Debug.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DEBUG_H_ -#define __DEBUG_H_ - class AsciiString; #define NO_RELEASE_DEBUG_LOGGING @@ -260,5 +256,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..1735b47a19 100644 --- a/Core/GameEngine/Include/Common/FileSystem.h +++ b/Core/GameEngine/Include/Common/FileSystem.h @@ -42,10 +42,6 @@ //---------------------------------------------------------------------------- #pragma once - -#ifndef __FILESYSTEM_H -#define __FILESYSTEM_H - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- @@ -182,7 +178,3 @@ extern FileSystem* TheFileSystem; //---------------------------------------------------------------------------- // Inlining //---------------------------------------------------------------------------- - - - -#endif // __WSYS_FILESYSTEM_H diff --git a/Core/GameEngine/Include/Common/GameAudio.h b/Core/GameEngine/Include/Common/GameAudio.h index 1aa90880b2..c1673cd654 100644 --- a/Core/GameEngine/Include/Common/GameAudio.h +++ b/Core/GameEngine/Include/Common/GameAudio.h @@ -40,10 +40,6 @@ //---------------------------------------------------------------------------- #pragma once - -#ifndef __COMMON_GAMEAUDIO_H_ -#define __COMMON_GAMEAUDIO_H_ - // Includes #include "Lib/BaseType.h" #include "Common/STLTypedefs.h" @@ -431,5 +427,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..1f0f70a851 100644 --- a/Core/GameEngine/Include/Common/GameMemory.h +++ b/Core/GameEngine/Include/Common/GameMemory.h @@ -44,10 +44,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 +909,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..30eb3047c6 100644 --- a/Core/GameEngine/Include/Common/GameSounds.h +++ b/Core/GameEngine/Include/Common/GameSounds.h @@ -40,9 +40,6 @@ //---------------------------------------------------------------------------- #pragma once -#ifndef __COMMON_GAMESOUNDS_H_ -#define __COMMON_GAMESOUNDS_H_ - #include "Common/SubsystemInterface.h" #include "Common/GameAudio.h" #include "Common/GameType.h" @@ -98,6 +95,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..906a76daea 100644 --- a/Core/GameEngine/Include/Common/LocalFile.h +++ b/Core/GameEngine/Include/Common/LocalFile.h @@ -43,10 +43,6 @@ #pragma once -#ifndef __LOCALFILE_H -#define __LOCALFILE_H - - //---------------------------------------------------------------------------- // Includes @@ -134,6 +130,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..e0d21329ef 100644 --- a/Core/GameEngine/Include/Common/LocalFileSystem.h +++ b/Core/GameEngine/Include/Common/LocalFileSystem.h @@ -27,10 +27,6 @@ ////////////////////////////////////////////////////////// #pragma once - -#ifndef __LOCALFILESYSTEM_H -#define __LOCALFILESYSTEM_H - #include "Common/SubsystemInterface.h" #include "FileSystem.h" // for typedefs, etc. @@ -54,5 +50,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..cb13fb70d3 100644 --- a/Core/GameEngine/Include/Common/MiscAudio.h +++ b/Core/GameEngine/Include/Common/MiscAudio.h @@ -26,10 +26,6 @@ // This file is for miscellaneous sound hooks that don't have another happy home. #pragma once - -#ifndef _MISCAUDIO_H_ -#define _MISCAUDIO_H_ - #include "Common/AudioEventRTS.h" struct MiscAudio @@ -73,7 +69,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..29866f779a 100644 --- a/Core/GameEngine/Include/Common/RAMFile.h +++ b/Core/GameEngine/Include/Common/RAMFile.h @@ -43,10 +43,6 @@ #pragma once -#ifndef __RAMFILE_H -#define __RAMFILE_H - - //---------------------------------------------------------------------------- // Includes @@ -130,6 +126,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..80ad62e234 100644 --- a/Core/GameEngine/Include/Common/RandomValue.h +++ b/Core/GameEngine/Include/Common/RandomValue.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, January 1998 #pragma once - -#ifndef _RANDOM_VALUE_H_ -#define _RANDOM_VALUE_H_ - #include "Lib/BaseType.h" extern void InitRandom( void ); @@ -40,5 +36,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..ae36bf234d 100644 --- a/Core/GameEngine/Include/Common/StreamingArchiveFile.h +++ b/Core/GameEngine/Include/Common/StreamingArchiveFile.h @@ -43,10 +43,6 @@ #pragma once -#ifndef __STREAMINGARCHIVEFILE_H -#define __STREAMINGARCHIVEFILE_H - - //---------------------------------------------------------------------------- // Includes @@ -114,6 +110,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..7cc9cf45d1 100644 --- a/Core/GameEngine/Include/Common/UnicodeString.h +++ b/Core/GameEngine/Include/Common/UnicodeString.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef UNICODESTRING_H -#define UNICODESTRING_H - #include #include #include @@ -501,5 +497,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..d9df57848a 100644 --- a/Core/GameEngine/Include/Common/Xfer.h +++ b/Core/GameEngine/Include/Common/Xfer.h @@ -38,10 +38,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __XFER_H_ -#define __XFER_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Science.h" #include "Common/Upgrade.h" @@ -191,6 +187,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..3581ff4245 100644 --- a/Core/GameEngine/Include/Common/XferCRC.h +++ b/Core/GameEngine/Include/Common/XferCRC.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __XFERCRC_H_ -#define __XFERCRC_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/Xfer.h" @@ -69,6 +65,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..36fe37fe33 100644 --- a/Core/GameEngine/Include/Common/XferDeepCRC.h +++ b/Core/GameEngine/Include/Common/XferDeepCRC.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __XFERDEEPCRC_H_ -#define __XFERDEEPCRC_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/Xfer.h" #include "Common/XferCRC.h" @@ -64,6 +60,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..4eeb7c96f8 100644 --- a/Core/GameEngine/Include/Common/XferLoad.h +++ b/Core/GameEngine/Include/Common/XferLoad.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __XFER_LOAD_H_ -#define __XFER_LOAD_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include #include "Common/Xfer.h" @@ -68,6 +64,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..7ef8b02b86 100644 --- a/Core/GameEngine/Include/Common/XferSave.h +++ b/Core/GameEngine/Include/Common/XferSave.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __XFER_SAVE_H_ -#define __XFER_SAVE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/Xfer.h" @@ -73,6 +69,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..5ffcbae2b7 100644 --- a/Core/GameEngine/Include/Common/crc.h +++ b/Core/GameEngine/Include/Common/crc.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, October 2001 #pragma once - -#ifndef _CRC_H_ -#define _CRC_H_ - #include "Lib/BaseType.h" #ifdef RTS_DEBUG @@ -139,5 +135,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..3243238b0d 100644 --- a/Core/GameEngine/Include/Common/file.h +++ b/Core/GameEngine/Include/Common/file.h @@ -43,10 +43,6 @@ #pragma once -#ifndef __FILE_H -#define __FILE_H - - //---------------------------------------------------------------------------- // Includes @@ -227,9 +223,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/GameClient/ClientRandomValue.h b/Core/GameEngine/Include/GameClient/ClientRandomValue.h index af62e59cad..16f2502328 100644 --- a/Core/GameEngine/Include/GameClient/ClientRandomValue.h +++ b/Core/GameEngine/Include/GameClient/ClientRandomValue.h @@ -28,10 +28,6 @@ // Split out into separate Logic/Client/Audio headers by MDC Sept 2002 #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 +88,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..a57d872912 100644 --- a/Core/GameEngine/Include/GameClient/WindowVideoManager.h +++ b/Core/GameEngine/Include/GameClient/WindowVideoManager.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WINDOWVIDEOMANAGER_H_ -#define __WINDOWVIDEOMANAGER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -183,5 +179,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..2a18dc8686 100644 --- a/Core/GameEngine/Include/GameLogic/LogicRandomValue.h +++ b/Core/GameEngine/Include/GameLogic/LogicRandomValue.h @@ -28,10 +28,6 @@ // Split out into separate Logic/Client/Audio headers by MDC Sept 2002 #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 +88,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..886b4d0929 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h @@ -27,10 +27,6 @@ /////////////////////////////////////////////////////////// #pragma once - -#ifndef __STDBIGFILE_H -#define __STDBIGFILE_H - #include "Common/ArchiveFile.h" #include "Common/AsciiString.h" #include "Common/List.h" @@ -54,5 +50,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..9e9a3179e9 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h @@ -27,10 +27,6 @@ ///////////////////////////////////////////////////////////// #pragma once - -#ifndef __STDBIGFILESYSTEM_H -#define __STDBIGFILESYSTEM_H - #include "Common/ArchiveFileSystem.h" class StdBIGFileSystem : public ArchiveFileSystem @@ -56,5 +52,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..0d250e0091 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFile.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFile.h @@ -27,10 +27,6 @@ ////////////////////////////////////////////////// #pragma once - -#ifndef __STDLOCALFILE_H -#define __STDLOCALFILE_H - #include "Common/LocalFile.h" class StdLocalFile : public LocalFile @@ -42,5 +38,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..e9a4d86b16 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h @@ -27,9 +27,6 @@ /////////////////////////////////////////////////////////////// #pragma once - -#ifndef __STDLOCALFILESYSTEM_H -#define __STDLOCALFILESYSTEM_H #include "Common/LocalFileSystem.h" class StdLocalFileSystem : public LocalFileSystem @@ -53,5 +50,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..35adfea67b 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h @@ -27,10 +27,6 @@ /////////////////////////////////////////////////////////// #pragma once - -#ifndef __WIN32BIGFILE_H -#define __WIN32BIGFILE_H - #include "Common/ArchiveFile.h" #include "Common/AsciiString.h" #include "Common/List.h" @@ -54,5 +50,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..675181afcc 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h @@ -27,10 +27,6 @@ ///////////////////////////////////////////////////////////// #pragma once - -#ifndef __WIN32BIGFILESYSTEM_H -#define __WIN32BIGFILESYSTEM_H - #include "Common/ArchiveFileSystem.h" class Win32BIGFileSystem : public ArchiveFileSystem @@ -56,5 +52,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..e0623022c9 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h @@ -27,10 +27,6 @@ ////////////////////////////////////////////////// #pragma once - -#ifndef __WIN32LOCALFILE_H -#define __WIN32LOCALFILE_H - #include "Common/LocalFile.h" class Win32LocalFile : public LocalFile @@ -42,5 +38,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..ce902c2452 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h @@ -27,9 +27,6 @@ /////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WIN32LOCALFILESYSTEM_H -#define __WIN32LOCALFILESYSTEM_H #include "Common/LocalFileSystem.h" class Win32LocalFileSystem : public LocalFileSystem @@ -53,5 +50,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..1de72f8291 100644 --- a/Core/Libraries/Include/Lib/BaseTypeCore.h +++ b/Core/Libraries/Include/Lib/BaseTypeCore.h @@ -28,10 +28,6 @@ // tell the compiler to only load this file once #pragma once - -#ifndef _BASE_TYPE_CORE_H_ -#define _BASE_TYPE_CORE_H_ - #include #include // TheSuperHackers @build feliwir 07/04/2025 Adds utility macros for cross-platform compatibility @@ -132,5 +128,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..e0e679111d 100644 --- a/Core/Libraries/Include/rts/debug.h +++ b/Core/Libraries/Include/rts/debug.h @@ -27,9 +27,4 @@ // 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..8fccf54a39 100644 --- a/Core/Libraries/Include/rts/profile.h +++ b/Core/Libraries/Include/rts/profile.h @@ -27,9 +27,4 @@ // 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..d218f29848 100644 --- a/Core/Libraries/Source/Compression/Compression.h +++ b/Core/Libraries/Source/Compression/Compression.h @@ -21,10 +21,6 @@ ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __COMPRESSION_H__ -#define __COMPRESSION_H__ - #include "Lib/BaseTypeCore.h" enum CompressionType @@ -67,5 +63,3 @@ class CompressionManager static CompressionType getPreferredCompression( void ); }; - -#endif // __COMPRESSION_H__ diff --git a/Core/Libraries/Source/Compression/EAC/gimex.h b/Core/Libraries/Source/Compression/EAC/gimex.h index 15800033c3..bc8b96636a 100644 --- a/Core/Libraries/Source/Compression/EAC/gimex.h +++ b/Core/Libraries/Source/Compression/EAC/gimex.h @@ -62,10 +62,6 @@ gimex.h - Primary header file for the GIMEX API. /* 3.46 021205 FB about firstextension */ /* */ /*------------------------------------------------------------------*/ - -#ifndef __GIMEX_H -#define __GIMEX_H 1 - #pragma once #if defined(_MSC_VER) @@ -493,6 +489,4 @@ static __inline void gputi(void *dst, unsigned int data, int bytes) } } -#endif /* __GIMEX_H */ - /* END ABSTRACT */ diff --git a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h index a7066e752d..9f3200106c 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h @@ -38,10 +38,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef AABTREE_H -#define AABTREE_H - #include "always.h" #include "refcount.h" #include "simplevec.h" @@ -348,5 +344,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..ec10b05f63 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h @@ -34,10 +34,6 @@ #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..8107ae1a3b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h @@ -38,10 +38,6 @@ // #pragma once - -#ifndef __ANIMATEDSOUNDMGR_H -#define __ANIMATEDSOUNDMGR_H - #include "simplevec.h" #include "Vector.H" #include "hashtemplate.h" @@ -129,6 +125,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..9ea1566bb4 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h @@ -17,10 +17,6 @@ */ #pragma once - -#ifndef WW3D_ASSET_STATUS_H -#define WW3D_ASSET_STATUS_H - #include "always.h" #include "hashtemplate.h" @@ -62,5 +58,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..c91f6cd3c6 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h @@ -17,10 +17,6 @@ */ #pragma once - -#ifndef BITMAPHANDLER_H -#define BITMAPHANDLER_H - #include "always.h" #include "ww3dformat.h" #include "vector3.h" @@ -477,6 +473,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..667027cc99 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/classid.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/classid.h @@ -34,10 +34,6 @@ #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..fe30fe4431 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/collect.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef COLLECT_H -#define COLLECT_H - #include "rendobj.h" #include "composite.h" #include "Vector.H" @@ -143,5 +139,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..19e0e26742 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef COLORSPACE_H -#define COLORSPACE_H - #include "dx8wrapper.h" #include @@ -153,7 +149,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..3855549261 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/coltest.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/coltest.h @@ -39,10 +39,6 @@ #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..30343bf5cc 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/coltype.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/coltype.h @@ -41,10 +41,6 @@ #pragma once -#ifndef COLTYPE_H -#define COLTYPE_H - - ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // // Collision 'Types' @@ -85,8 +81,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..9f7905d9d6 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/composite.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/composite.h @@ -36,10 +36,6 @@ #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..6431e26c17 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef DECALSYS_H -#define DECALSYS_H - #include "always.h" #include "matrix3d.h" #include "matrix4.h" @@ -298,9 +294,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..ed6606d750 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/distlod.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/distlod.h @@ -36,10 +36,6 @@ #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..1e871aea14 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h @@ -39,10 +39,6 @@ #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..cb34569b6d 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h @@ -39,10 +39,6 @@ #pragma once -#ifndef DX8_POLYGON_RENDERER_H -#define DX8_POLYGON_RENDERER_H - - #include "always.h" #include "meshmdl.h" #include "dx8list.h" @@ -155,5 +151,3 @@ inline void DX8PolygonRendererClass::Render_Sorted(/*const Matrix3D & tm,*/int b vertex_index_range); } - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h index 8db618340f..a45e04e2e1 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h @@ -34,10 +34,6 @@ #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..f2aa0f7b45 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/font3d.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/font3d.h @@ -34,10 +34,6 @@ #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..39e527babd 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/formconv.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/formconv.h @@ -38,10 +38,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef FORMCONV_H -#define FORMCONV_H - #include "ww3dformat.h" #include @@ -56,5 +52,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..179f0a7542 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h @@ -36,10 +36,6 @@ #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..af70da3895 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hanim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hanim.h @@ -37,10 +37,6 @@ #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..8f4613ac65 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h @@ -37,10 +37,6 @@ #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..f78fbcb11a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.H +++ b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.H @@ -36,10 +36,6 @@ #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..54fd7054be 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/htree.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/htree.h @@ -36,10 +36,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef HTREE_H -#define HTREE_H - #include "always.h" #include "pivot.h" #include "quat.h" @@ -204,7 +200,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..04552eba3e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/intersec.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/intersec.h @@ -48,10 +48,6 @@ */ #pragma once - -#ifndef INTERSEC_H -#define INTERSEC_H - #include "always.h" #include "matrix3d.h" #include "layer.h" @@ -397,6 +393,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..b2e94190d6 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/inttest.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/inttest.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef INTTEST_H -#define INTTEST_H - #include "always.h" #include "aabox.h" #include "obbox.h" @@ -248,7 +244,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..e03758cc54 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/layer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/layer.h @@ -36,10 +36,6 @@ #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..34d6e9367e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef LINE3D_H -#define LINE3D_H - #include "always.h" #include "rendobj.h" #include "vector3.h" @@ -118,5 +114,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..0e2f2cbcb6 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h @@ -36,10 +36,6 @@ #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..0b7dcfd839 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h @@ -37,10 +37,6 @@ #if 0 #pragma once - -#ifndef MESHDAM_H -#define MESHDAM_H - #include "always.h" #include "vector3.h" #include "bittype.h" @@ -100,7 +96,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..c9fac2cb09 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef METALMAP_H -#define METALMAP_H - #include class TextureClass; @@ -115,5 +111,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..3c4eb38303 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h @@ -17,10 +17,6 @@ */ #pragma once - -#ifndef DX8_MISSING_TEXTURE_H -#define DX8_MISSING_TEXTURE_H - #include "always.h" struct IDirect3DTexture8; @@ -35,6 +31,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..9aea998381 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/pivot.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/pivot.h @@ -36,10 +36,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef PIVOT_H -#define PIVOT_H - #include "always.h" #include "vector3.h" #include "matrix3d.h" @@ -105,7 +101,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..00ff3b45f2 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef POINTGR_H -#define POINTGR_H - #include "sharebuf.h" #include "shader.h" #include "vector4.h" @@ -234,7 +230,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..c1ad9856e8 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/predlod.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/predlod.h @@ -35,10 +35,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 +76,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/proto.h b/Core/Libraries/Source/WWVegas/WW3D2/proto.h index 796bbf43d4..6a15b3760d 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/proto.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.h @@ -36,10 +36,6 @@ #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..1c5efa0766 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/proxy.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/proxy.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __PROXY_H -#define __PROXY_H - #include "wwstring.h" #include "matrix3d.h" @@ -107,7 +103,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..2bac5f3897 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h @@ -36,10 +36,6 @@ #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..a505935403 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef RENDER2DSENTENCE_H -#define RENDER2DSENTENCE_H - #include "render2d.h" #include "refcount.h" #include "Vector.H" @@ -270,5 +266,3 @@ class Render2DSentenceClass { TextureClass * CurTexture; ShaderClass Shader; }; - -#endif // RENDER2DSENTENCE_H diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h index b6eb7dbfb6..de5de54af4 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h @@ -40,10 +40,6 @@ #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..2548b0d8cf 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef RINGOBJ_H -#define RINGOBJ_H - #include "always.h" #include "rendobj.h" #include "w3d_file.h" @@ -361,8 +357,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..3d6a6fd6ef 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h @@ -36,10 +36,6 @@ #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..d15c93125b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/segline.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/segline.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef SEGLINE_H -#define SEGLINE_H - #include "rendobj.h" #include "shader.h" #include "simplevec.h" @@ -176,5 +172,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/shattersystem.h b/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h index 16de2a7e82..77f6a8357d 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef SHATTERSYSTEM_H -#define SHATTERSYSTEM_H - #include "always.h" @@ -94,8 +90,3 @@ class ShatterSystem }; - - -#endif - - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h b/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h index 17ef69102a..0a8f43ef88 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef SNAPPTS_H -#define SNAPPTS_H - #include "refcount.h" #include "Vector.H" #include "vector3.h" @@ -58,5 +54,3 @@ class SnapPointsClass : public DynamicVectorClass, public RefCountClass ~SnapPointsClass(void) {} }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h index 19a643a0b5..ae5616d41e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h @@ -35,10 +35,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 +274,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..7b16f6db96 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef SPHEREOBJ_H -#define SPHEREOBJ_H - #include "always.h" #include "rendobj.h" #include "w3d_file.h" @@ -470,8 +466,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..0a44ec8851 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h @@ -36,10 +36,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef STATIC_SORT_LIST_H -#define STATIC_SORT_LIST_H - #include "robjlist.h" #include "w3d_file.h" @@ -89,9 +85,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..4956ca7046 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/statistics.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/statistics.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef WW3D_STATISTICS_H -#define WW3D_STATISTICS_H - #pragma once #include "always.h" @@ -74,5 +70,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..a17526d81c 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streak.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/streak.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef STREAK_H -#define STREAK_H - #include "rendobj.h" #include "shader.h" #include "simplevec.h" @@ -206,13 +202,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/stripoptimizer.h b/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h index 337b2f869b..7b331a0335 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h @@ -17,10 +17,6 @@ */ #pragma once - -#ifndef WW3D2_STRIP_OPTIMIZER_H__ -#define WW3D2_STRIP_OPTIMIZER_H__ - #include "always.h" @@ -42,5 +38,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..58affd53cd 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef SURFACECLASS_H -#define SURFACECLASS_H - #include "ww3dformat.h" #include "refcount.h" @@ -146,7 +142,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..c2c4cf2c83 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h @@ -34,10 +34,6 @@ #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..cab41442f4 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef VISRASTERIZER_H -#define VISRASTERIZER_H - #include "always.h" #include "matrix3d.h" #include "matrix4.h" @@ -206,6 +202,3 @@ class VisRasterizerClass SimpleVecClass TempVertexBuffer; }; - -#endif //VISRASTERIZER_H - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_obsolete.h b/Core/Libraries/Source/WWVegas/WW3D2/w3d_obsolete.h index b511f308da..16040ce96b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_obsolete.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_obsolete.h @@ -37,10 +37,6 @@ #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 +322,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..73b61761ed 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h @@ -36,10 +36,6 @@ #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..a3a98d25fc 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h @@ -36,10 +36,6 @@ #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..57936aecf6 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h @@ -36,10 +36,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef W3DEXCLUSIONLIST_H -#define W3DEXCLUSIONLIST_H - #include "always.h" #include "Vector.H" #include "wwstring.h" @@ -76,7 +72,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..27c144c5f3 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h @@ -40,10 +40,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef WW3DFORMAT_H -#define WW3DFORMAT_H - #include "always.h" #include "wwstring.h" @@ -203,5 +199,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..46248b49c6 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h @@ -37,10 +37,6 @@ #pragma once - -#ifndef WW3DIDS_H -#define WW3DIDS_H - #include "saveloadids.h" /* @@ -71,5 +67,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..e62e46fff7 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ww3dtrig.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ww3dtrig.h @@ -37,10 +37,6 @@ #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 +51,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..5973ee5d70 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h @@ -36,10 +36,6 @@ #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..4e37cbf421 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __SOUNDOBJ_H -#define __SOUNDOBJ_H - #pragma warning (push, 3) #include "mss.h" #pragma warning (pop) @@ -457,6 +453,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..52f5838902 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __AUDIO_EVENTS_H -#define __AUDIO_EVENTS_H - #include "simplevec.h" #include "bittype.h" @@ -207,7 +203,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..5a64cf2509 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h @@ -36,10 +36,6 @@ #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..222302e0b4 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/Listener.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/Listener.h @@ -37,10 +37,6 @@ #pragma once -#ifndef __LISTENER_H -#define __LISTENER_H - - #include "Sound3D.h" @@ -140,6 +136,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..d8ce9b71a0 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h @@ -31,10 +31,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __LOGICAL_LISTENER_H -#define __LOGICAL_LISTENER_H - #include "SoundSceneObj.h" #include "bittype.h" #include "vector3.h" @@ -145,7 +141,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..9eb1fec93b 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h @@ -31,10 +31,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __LOGICAL_SOUND_H -#define __LOGICAL_SOUND_H - #include "SoundSceneObj.h" #include "bittype.h" #include "vector3.h" @@ -145,7 +141,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..ab76ef31f4 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h @@ -31,10 +31,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __PRIORITY_VECTOR_H -#define __PRIORITY_VECTOR_H - #include "Vector.H" //////////////////////////////////////////////////////////////////// @@ -113,6 +109,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..88e8e873c0 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __SOUND3DOBJ_H -#define __SOUND3DOBJ_H - #include "AudibleSound.h" #include "mempool.h" @@ -194,6 +190,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..818301a3bf 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h @@ -36,10 +36,6 @@ #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..00122d4bc7 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h @@ -36,10 +36,6 @@ #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..2ecb94daeb 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h @@ -36,10 +36,6 @@ #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..fda4c9e793 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h @@ -36,10 +36,6 @@ #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..daa4f3d62c 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h @@ -33,10 +33,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __SOUND_SCENE_OBJ_H -#define __SOUND_SCENE_OBJ_H - #include "refcount.h" #include "WWAudio.h" #include "bittype.h" @@ -270,8 +266,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..6802fdd141 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/Threads.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/Threads.h @@ -31,10 +31,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __WWAUDIO_THREADS_H -#define __WWAUDIO_THREADS_H - #include "windows.h" #include "Vector.H" #include "mutex.h" @@ -105,6 +101,3 @@ class WWAudioThreadsClass static CriticalSectionClass m_ListMutex; static bool m_IsShuttingDown; }; - -#endif //__WWAUDIO_THREADS_H - diff --git a/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h b/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h index 6fe21d0b56..ae89c7554d 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __WWAUDIO_H -#define __WWAUDIO_H - #include "always.h" #pragma warning (push, 3) #include "mss.h" @@ -579,6 +575,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..1c03613a71 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/listenerhandle.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/listenerhandle.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __LISTENERHANDLE_H -#define __LISTENERHANDLE_H - #include "sound3dhandle.h" @@ -95,6 +91,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..743ded36b8 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __SOUND2DHANDLE_H -#define __SOUND2DHANDLE_H - #include "soundhandle.h" @@ -100,6 +96,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..2306debb53 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __SOUND3DHANDLE_H -#define __SOUND3DHANDLE_H - #include "soundhandle.h" @@ -105,6 +101,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..5d3cc860a0 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/soundhandle.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/soundhandle.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __SOUNDHANDLE_H -#define __SOUNDHANDLE_H - #include "WWAudio.h" ////////////////////////////////////////////////////////////////////// @@ -122,6 +118,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..ef14ee2d17 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef WWDEBUG_H -#define WWDEBUG_H - // TheSuperHackers @todo Recover WWDEBUG? #ifdef WWDEBUG #include @@ -175,5 +171,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..10937db9a8 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwhack.h +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwhack.h @@ -35,14 +35,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..aa6140934b 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.h +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.h @@ -38,10 +38,6 @@ #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/Registry.h b/Core/Libraries/Source/WWVegas/WWDownload/Registry.h index 846fad6912..7c32d09479 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/Registry.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/Registry.h @@ -21,10 +21,6 @@ // Author: Matthew D. Campbell, December 2001 #pragma once - -#ifndef __WWDOWNLOAD_REGISTRY_H__ -#define __WWDOWNLOAD_REGISTRY_H__ - #include /** @@ -46,5 +42,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/WWLib/BSEARCH.H b/Core/Libraries/Source/WWVegas/WWLib/BSEARCH.H index c1b9e8235c..c9e2e07a78 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/BSEARCH.H +++ b/Core/Libraries/Source/WWVegas/WWLib/BSEARCH.H @@ -19,10 +19,6 @@ #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 +67,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..70a1fc60f1 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/BUFF.H +++ b/Core/Libraries/Source/WWVegas/WWLib/BUFF.H @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once -#ifndef CCBUFF_H -#define CCBUFF_H - - /* ** The "bool" integral type was defined by the C++ committee in ** November of '94. Until the compiler supports this, use the following @@ -88,6 +84,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..69a561f0e9 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/CRC.H +++ b/Core/Libraries/Source/WWVegas/WWLib/CRC.H @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef CRC_H -#define CRC_H - #include // TheSuperHackers @build feliwir 17/04/2025 include _ltrotl macros @@ -127,6 +123,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/Except.h b/Core/Libraries/Source/WWVegas/WWLib/Except.h index a425735b93..b04bcd61ae 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/Except.h +++ b/Core/Libraries/Source/WWVegas/WWLib/Except.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef EXCEPT_H -#define EXCEPT_H - #ifdef _MSC_VER #include "win.h" @@ -84,5 +80,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..0d4a930cc8 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/HASHLIST.H +++ b/Core/Libraries/Source/WWVegas/WWLib/HASHLIST.H @@ -43,10 +43,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef HASHLIST_H -#define HASHLIST_H - #pragma warning (push) #pragma warning (disable: 4786) @@ -628,23 +624,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..297edf74bd 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/INDEX.H +++ b/Core/Libraries/Source/WWVegas/WWLib/INDEX.H @@ -49,10 +49,6 @@ * compfunc -- Support function for bsearch and bsort. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef INDEX_H -#define INDEX_H - #include "BSEARCH.H" #if !defined(__BORLANDC__) || !defined(_USERENTRY) @@ -721,8 +717,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..21eb0946b4 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/INI.H +++ b/Core/Libraries/Source/WWVegas/WWLib/INI.H @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef INI_H -#define INI_H - #include //#include "listnode.h" @@ -240,5 +236,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..2e8ea037e7 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.H @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once -#ifndef LISTNODE_H -#define LISTNODE_H - - /* ** Includes */ @@ -319,6 +315,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..261ed4f094 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/MPU.H +++ b/Core/Libraries/Source/WWVegas/WWLib/MPU.H @@ -34,13 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef MPU_H -#define MPU_H - 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..55f161412c 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/PIPE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/PIPE.H @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef PIPE_H -#define PIPE_H - /* ** A "push through" pipe interface abstract class used for such purposes as compression ** and translation of data. In STL terms, this is functionally similar to an output @@ -71,5 +67,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..f27890c77b 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/Point.h +++ b/Core/Libraries/Source/WWVegas/WWLib/Point.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef POINT_H -#define POINT_H - template class TRect; /* @@ -199,6 +195,3 @@ TPoint3D const operator * (T lvalue, TPoint3D const & rvalue) ** integer 3D points. */ typedef TPoint3D Point3D; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/RANDOM.H b/Core/Libraries/Source/WWVegas/WWLib/RANDOM.H index 93c6aef09d..3fab1fa283 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/RANDOM.H +++ b/Core/Libraries/Source/WWVegas/WWLib/RANDOM.H @@ -35,10 +35,6 @@ * Pick_Random_Number -- Picks a random number between two values (inclusive). * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef RANDOM_H -#define RANDOM_H - // "unreferenced inline function has been removed" Yea, so what? #pragma warning(disable : 4514) @@ -264,5 +260,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..dede7ea79a 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H @@ -38,10 +38,6 @@ * RawFileClass::Is_Open -- Checks to see if the file is open or not. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef RAWFILE_Hx -#define RAWFILE_Hx - //#include // #include "win.h" @@ -150,5 +146,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..ee7c7456da 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/SLIST.H +++ b/Core/Libraries/Source/WWVegas/WWLib/SLIST.H @@ -51,10 +51,6 @@ * *SList::Find_Node -- returns first node in list matching the input * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __SLIST_H__ -#define __SLIST_H__ - #include "SLNODE.H" #ifndef NULL @@ -539,5 +535,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..8750d63a8e 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/SLNODE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/SLNODE.H @@ -32,10 +32,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __SLNODE_H__ -#define __SLNODE_H__ - #ifndef ALWAYS_H #include "always.h" #endif @@ -115,5 +111,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..7273e98ddd 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/STRAW.H +++ b/Core/Libraries/Source/WWVegas/WWLib/STRAW.H @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef STRAW_H -#define STRAW_H - /* ** This is a demand driven data carrier. It will retrieve the byte request by passing ** the request down the chain (possibly processing on the way) in order to fulfill the @@ -69,6 +65,3 @@ class Straw Straw(Straw & rvalue); Straw & operator = (Straw const & pipe); }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/Vector.H b/Core/Libraries/Source/WWVegas/WWLib/Vector.H index 713937e5d7..83a30b7f07 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/Vector.H +++ b/Core/Libraries/Source/WWVegas/WWLib/Vector.H @@ -51,10 +51,6 @@ * DynamicVectorClass::Insert -- insert an object at the desired index * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef VECTOR_H -#define VECTOR_H - #include "always.h" #include #include @@ -1118,5 +1114,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/WWFILE.H b/Core/Libraries/Source/WWVegas/WWLib/WWFILE.H index 728e03ffdf..3cda2e63d2 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/WWFILE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/WWFILE.H @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef WWFILE_Hx -#define WWFILE_Hx - #define YEAR(dt) (((dt & 0xFE000000) >> (9 + 16)) + 1980) #define MONTH(dt) ((dt & 0x01E00000) >> (5 + 16)) #define DAY(dt) ((dt & 0x001F0000) >> (0 + 16)) @@ -103,5 +99,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..02a7b279c7 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/XPIPE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/XPIPE.H @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef XPIPE_H -#define XPIPE_H - #include "BUFF.H" #include "PIPE.H" #include "WWFILE.H" @@ -88,5 +84,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..a887ae2012 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.H +++ b/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.H @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef XSTRAW_H -#define XSTRAW_H - #include "BUFF.H" #include "STRAW.H" #include "WWFILE.H" @@ -85,6 +81,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..288f42aea7 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/always.h +++ b/Core/Libraries/Source/WWVegas/WWLib/always.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef ALWAYS_H -#define ALWAYS_H - #include "WWCommon.h" #include "WWDefines.h" @@ -255,6 +251,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..4787399611 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h +++ b/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef B64PIPE_H -#define B64PIPE_H - #include "PIPE.H" /* @@ -87,5 +83,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..24ea324d8f 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/b64straw.h +++ b/Core/Libraries/Source/WWVegas/WWLib/b64straw.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef B64STRAW_H -#define B64STRAW_H - #include "STRAW.H" /* @@ -85,6 +81,3 @@ class Base64Straw : public Straw Base64Straw(Base64Straw & rvalue); Base64Straw & operator = (Base64Straw const & pipe); }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/bittype.h b/Core/Libraries/Source/WWVegas/WWLib/bittype.h index d20c80ed24..6ebcc2ab84 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/bittype.h +++ b/Core/Libraries/Source/WWVegas/WWLib/bittype.h @@ -35,10 +35,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef BITTYPE_H -#define BITTYPE_H - typedef unsigned char uint8; typedef unsigned short uint16; typedef unsigned long uint32; @@ -67,5 +63,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..6847f12ae0 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/bound.h +++ b/Core/Libraries/Source/WWVegas/WWLib/bound.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef BOUND_H -#define BOUND_H - template inline T Bound(T original, T minval, T maxval) { @@ -53,7 +49,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..af9a60a422 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/bufffile.h +++ b/Core/Libraries/Source/WWVegas/WWLib/bufffile.h @@ -39,10 +39,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef BUFFFILE_H -#define BUFFFILE_H - #include "RAWFILE.H" @@ -79,5 +75,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..d8f5d08268 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/chunkio.h +++ b/Core/Libraries/Source/WWVegas/WWLib/chunkio.h @@ -35,10 +35,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef CHUNKIO_H -#define CHUNKIO_H - #ifndef ALWAYS_H #include "always.h" #endif @@ -372,7 +368,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..a92b00dab9 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/cpudetect.h +++ b/Core/Libraries/Source/WWVegas/WWLib/cpudetect.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef WWLIB_CPU_DETECT_H__ -#define WWLIB_CPU_DETECT_H__ - #include "always.h" #include "wwstring.h" @@ -320,6 +316,3 @@ struct CPUIDStruct CPUDetectClass::CPUID(Eax,Ebx,Ecx,Edx,cpuid_type); } }; - - -#endif // WWLIB_CPU_DETECT_H__ diff --git a/Core/Libraries/Source/WWVegas/WWLib/cstraw.h b/Core/Libraries/Source/WWVegas/WWLib/cstraw.h index 146bba873a..99edbe9c51 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/cstraw.h +++ b/Core/Libraries/Source/WWVegas/WWLib/cstraw.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef CSTRAW_H -#define CSTRAW_H - #include "BUFF.H" #include "STRAW.H" @@ -63,8 +59,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..97bb58cc97 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/ffactory.h +++ b/Core/Libraries/Source/WWVegas/WWLib/ffactory.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef FFACTORY_H -#define FFACTORY_H - #ifndef ALWAYS_H #include "always.h" #endif @@ -157,5 +153,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..1cf9970325 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/gcd_lcm.h +++ b/Core/Libraries/Source/WWVegas/WWLib/gcd_lcm.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef GCD_LCM_H -#define GCD_LCM_H - #include "always.h" // The greatest common divisor (GCD) is the greatest integer which is a @@ -47,5 +43,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..2861956c40 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/hash.h +++ b/Core/Libraries/Source/WWVegas/WWLib/hash.h @@ -37,10 +37,6 @@ #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..d38b90fd8c 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/hashcalc.h +++ b/Core/Libraries/Source/WWVegas/WWLib/hashcalc.h @@ -36,10 +36,6 @@ #pragma once -#ifndef HASHCALC_H -#define HASHCALC_H - - /* ** HashCalculatorClass ** The hash calculator is used to abstract the process of computing a hash @@ -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/hashtemplate.h b/Core/Libraries/Source/WWVegas/WWLib/hashtemplate.h index fdd230d36b..742541371f 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/hashtemplate.h +++ b/Core/Libraries/Source/WWVegas/WWLib/hashtemplate.h @@ -36,10 +36,6 @@ #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/iostruct.h b/Core/Libraries/Source/WWVegas/WWLib/iostruct.h index 666a192a9d..85f7a6433f 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/iostruct.h +++ b/Core/Libraries/Source/WWVegas/WWLib/iostruct.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef IOSTRUCT_H -#define IOSTRUCT_H - #ifndef BITTYPE_H #include "bittype.h" #endif @@ -72,8 +68,3 @@ struct IOQuaternionStruct { float32 Q[4]; }; - - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWLib/mempool.h b/Core/Libraries/Source/WWVegas/WWLib/mempool.h index 6909818dd9..fdc92f8427 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/mempool.h +++ b/Core/Libraries/Source/WWVegas/WWLib/mempool.h @@ -44,10 +44,6 @@ #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..c7b7c2c4b2 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/mmsys.h +++ b/Core/Libraries/Source/WWVegas/WWLib/mmsys.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef MMSYS_H -#define MMSYS_H - /* ** This header just includes mmsystem.h with warning 4201 disabled */ @@ -45,5 +41,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..bcc63d2bac 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/multilist.h +++ b/Core/Libraries/Source/WWVegas/WWLib/multilist.h @@ -38,10 +38,6 @@ #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..61d09b32c3 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/mutex.h +++ b/Core/Libraries/Source/WWVegas/WWLib/mutex.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef MUTEX_H -#define MUTEX_H - #pragma once #include "always.h" @@ -203,5 +199,3 @@ class FastCriticalSectionClass friend class LockClass; }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/nstrdup.h b/Core/Libraries/Source/WWVegas/WWLib/nstrdup.h index 5cf3e1dfe2..7958da4ce4 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/nstrdup.h +++ b/Core/Libraries/Source/WWVegas/WWLib/nstrdup.h @@ -35,10 +35,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..4769e0029a 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/ntree.h +++ b/Core/Libraries/Source/WWVegas/WWLib/ntree.h @@ -37,10 +37,6 @@ #pragma once -#ifndef __NTREE_H -#define __NTREE_H - - #include "refcount.h" #include "wwstring.h" @@ -562,5 +558,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..2eb96bc56e 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/rcfile.h +++ b/Core/Libraries/Source/WWVegas/WWLib/rcfile.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef RCFILE_H -#define RCFILE_H - #include "always.h" #include "WWFILE.H" #include "win.h" @@ -89,6 +85,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..dc8c904ca7 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/readline.h +++ b/Core/Libraries/Source/WWVegas/WWLib/readline.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef READLINE_H -#define READLINE_H - #include "STRAW.H" #include "WWFILE.H" #include @@ -45,5 +41,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..1aedd373a4 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/realcrc.h +++ b/Core/Libraries/Source/WWVegas/WWLib/realcrc.h @@ -35,13 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once -#ifndef REALCRC_H -#define REALCRC_H - - 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..f843f80b95 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h +++ b/Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h @@ -36,10 +36,6 @@ #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..e0f1251631 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/refcount.h +++ b/Core/Libraries/Source/WWVegas/WWLib/refcount.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef REFCOUNT_H -#define REFCOUNT_H - #ifndef ALWAYS_H #include "always.h" #endif @@ -327,6 +323,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..387aa35531 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/registry.h +++ b/Core/Libraries/Source/WWVegas/WWLib/registry.h @@ -34,10 +34,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef REGISTRY_H -#define REGISTRY_H - #ifndef ALWAYS_H #include "always.h" #endif @@ -121,5 +117,3 @@ class RegistryClass { // static bool IsLocked; }; - -#endif // REGISTRY_H diff --git a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h index d407c05d54..628780c873 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h +++ b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h @@ -34,9 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef SHAREBUF_H -#define SHAREBUF_H #include "refcount.h" @@ -142,6 +139,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..6bd0acdfbb 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/simplevec.h +++ b/Core/Libraries/Source/WWVegas/WWLib/simplevec.h @@ -48,10 +48,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef SIMPLEVEC_H -#define SIMPLEVEC_H - #include "always.h" #include #include // for memmove @@ -637,6 +633,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/strtok_r.h b/Core/Libraries/Source/WWVegas/WWLib/strtok_r.h index e2ba1a177a..dedcde4ac1 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/strtok_r.h +++ b/Core/Libraries/Source/WWVegas/WWLib/strtok_r.h @@ -35,12 +35,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/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/thread.h b/Core/Libraries/Source/WWVegas/WWLib/thread.h index 246bb9aa59..37efab9fb2 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/thread.h +++ b/Core/Libraries/Source/WWVegas/WWLib/thread.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef THREAD_H -#define THREAD_H - #pragma once #include "always.h" @@ -97,5 +93,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..5074a6f176 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/trect.h +++ b/Core/Libraries/Source/WWVegas/WWLib/trect.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef TRECT_H -#define TRECT_H - #include "Point.h" @@ -217,7 +213,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..90aa79323c 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/trim.h +++ b/Core/Libraries/Source/WWVegas/WWLib/trim.h @@ -34,13 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef TRIM_H -#define TRIM_H - #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..f38957d2b4 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/uarray.h +++ b/Core/Libraries/Source/WWVegas/WWLib/uarray.h @@ -37,10 +37,6 @@ * UniqueArrayClass::Add -- Add an item to the array * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef UARRAY_H -#define UARRAY_H - #ifndef HASHCALC_H #include "hashcalc.h" #endif @@ -218,7 +214,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..4901d7e269 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/verchk.h +++ b/Core/Libraries/Source/WWVegas/WWLib/verchk.h @@ -36,10 +36,6 @@ #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/widestring.h b/Core/Libraries/Source/WWVegas/WWLib/widestring.h index ebba61df5b..862c4f3101 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/widestring.h +++ b/Core/Libraries/Source/WWVegas/WWLib/widestring.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __WIDESTRING_H -#define __WIDESTRING_H - #include #include #include "always.h" @@ -776,6 +772,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..dbed74903f 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/win.h +++ b/Core/Libraries/Source/WWVegas/WWLib/win.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef WIN_H -#define WIN_H - /* ** This header file includes the Windows headers. If there are any special pragmas that need ** to occur around this process, they are performed here. Typically, certain warnings will need @@ -86,5 +82,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..67cbdec7c0 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/wwstring.h +++ b/Core/Libraries/Source/WWVegas/WWLib/wwstring.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __WWSTRING_H -#define __WWSTRING_H - #include "always.h" #include "mutex.h" #include "win.h" @@ -776,6 +772,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..2e67e7e0c4 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/Vector3i.h +++ b/Core/Libraries/Source/WWVegas/WWMath/Vector3i.h @@ -36,10 +36,6 @@ #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..5eeb4e3bad 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/aabox.h +++ b/Core/Libraries/Source/WWVegas/WWMath/aabox.h @@ -53,10 +53,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef AABOX_H -#define AABOX_H - #include "always.h" #include "matrix3d.h" #include "lineseg.h" @@ -672,6 +668,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..aee208904a 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h +++ b/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h @@ -36,10 +36,6 @@ #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..6080f508a9 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h @@ -36,10 +36,6 @@ #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..7a5ea81597 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/castres.h +++ b/Core/Libraries/Source/WWVegas/WWMath/castres.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef CASTRES_H -#define CASTRES_H - #include "always.h" #include "vector3.h" #include "bittype.h" @@ -68,6 +64,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..15292b7e44 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h @@ -36,10 +36,6 @@ #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..84b278417a 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmath.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmath.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef COLMATH_H -#define COLMATH_H - #ifndef ALWAYS_H #include "always.h" #endif @@ -306,5 +302,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..0607d4977b 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.h @@ -39,10 +39,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef COLMATHAABOX_H -#define COLMATHAABOX_H - #include "always.h" #include "aabox.h" #include "vector3.h" @@ -103,6 +99,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..7ebc58d538 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.h @@ -38,10 +38,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef COLMATHFRUSTUM_H -#define COLMATHFRUSTUM_H - #include "always.h" #include "aabox.h" #include "vector3.h" @@ -99,5 +95,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..b1b26b32b4 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathinlines.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathinlines.h @@ -37,15 +37,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/cullsys.h b/Core/Libraries/Source/WWVegas/WWMath/cullsys.h index a7215657fa..c36826b994 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/cullsys.h +++ b/Core/Libraries/Source/WWVegas/WWMath/cullsys.h @@ -36,10 +36,6 @@ #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..37bd178603 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/culltype.h +++ b/Core/Libraries/Source/WWVegas/WWMath/culltype.h @@ -36,10 +36,6 @@ #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..fa98d1d538 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/curve.h +++ b/Core/Libraries/Source/WWVegas/WWMath/curve.h @@ -36,10 +36,6 @@ #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..f6bb2aaa0a 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/euler.h +++ b/Core/Libraries/Source/WWVegas/WWMath/euler.h @@ -37,10 +37,6 @@ #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..55537b02f9 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/frustum.h +++ b/Core/Libraries/Source/WWVegas/WWMath/frustum.h @@ -36,10 +36,6 @@ #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..ceb87b9707 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/hermitespline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/hermitespline.h @@ -36,10 +36,6 @@ #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..3017ce6799 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/lineseg.h +++ b/Core/Libraries/Source/WWVegas/WWMath/lineseg.h @@ -36,10 +36,6 @@ #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/matrix3.h b/Core/Libraries/Source/WWVegas/WWMath/matrix3.h index 7c6f76058a..e247d37ea5 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/matrix3.h +++ b/Core/Libraries/Source/WWVegas/WWMath/matrix3.h @@ -58,10 +58,6 @@ #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..5600b2cf21 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h +++ b/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h @@ -79,10 +79,6 @@ #define NO_ALLOW_TEMPORARIES #pragma once - -#ifndef MATRIX3D_H -#define MATRIX3D_H - #ifdef _UNIX #include "osdep.h" #endif @@ -1813,4 +1809,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..678763ff47 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/matrix4.h +++ b/Core/Libraries/Source/WWVegas/WWMath/matrix4.h @@ -59,10 +59,6 @@ #pragma once - -#ifndef MATRIX4_H -#define MATRIX4_H - #include "always.h" #include "vector4.h" #include "matrix3d.h" @@ -841,6 +837,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/obbox.h b/Core/Libraries/Source/WWVegas/WWMath/obbox.h index 8b9c462829..f41f6d2ddb 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/obbox.h +++ b/Core/Libraries/Source/WWVegas/WWMath/obbox.h @@ -42,10 +42,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef OBBOX_H -#define OBBOX_H - #include "always.h" #include "vector3.h" #include "matrix3.h" @@ -265,5 +261,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..b496f10a98 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/ode.h +++ b/Core/Libraries/Source/WWVegas/WWMath/ode.h @@ -37,10 +37,6 @@ #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..8b2ef19cd6 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/plane.h +++ b/Core/Libraries/Source/WWVegas/WWMath/plane.h @@ -36,10 +36,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef PLANE_H -#define PLANE_H - #include "always.h" #include "vector3.h" #include "sphere.h" @@ -244,5 +240,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..89df84060b 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/pot.h +++ b/Core/Libraries/Source/WWVegas/WWMath/pot.h @@ -35,9 +35,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..af2a91fb5d 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/quat.h +++ b/Core/Libraries/Source/WWVegas/WWMath/quat.h @@ -36,10 +36,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef QUAT_H -#define QUAT_H - #include "always.h" #include "wwmath.h" #include "matrix3.h" @@ -307,9 +303,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..ef10049f86 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/rect.h +++ b/Core/Libraries/Source/WWVegas/WWMath/rect.h @@ -36,10 +36,6 @@ #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..86e623c8fa 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/sphere.h +++ b/Core/Libraries/Source/WWVegas/WWMath/sphere.h @@ -50,10 +50,6 @@ #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..a8a3200217 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/tcbspline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/tcbspline.h @@ -36,10 +36,6 @@ #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..46308c1710 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/tri.h +++ b/Core/Libraries/Source/WWVegas/WWMath/tri.h @@ -36,10 +36,6 @@ #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..5b5a727fc9 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/v3_rnd.h +++ b/Core/Libraries/Source/WWVegas/WWMath/v3_rnd.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef V3_RND_H -#define V3_RND_H - #include "always.h" #include "vector3.h" #include "RANDOM.H" @@ -226,8 +222,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..3b1c035d5f 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vector2.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vector2.h @@ -50,10 +50,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef VECTOR2_H -#define VECTOR2_H - #include "always.h" #include "wwmath.h" #include @@ -663,7 +659,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..e6b8bdc52b 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vector2i.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vector2i.h @@ -36,10 +36,6 @@ #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..c9d3f9e6a3 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vector3.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vector3.h @@ -64,10 +64,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef VECTOR3_H -#define VECTOR3_H - #include "always.h" #include "wwmath.h" #include @@ -932,6 +928,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..641e49f04c 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vector4.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vector4.h @@ -45,10 +45,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef VECTOR4_H -#define VECTOR4_H - #include "always.h" #include "wwmath.h" #include @@ -404,7 +400,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..ec1b980328 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.h @@ -36,10 +36,6 @@ #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..21ccbdf2e3 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vp.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vp.h @@ -46,10 +46,6 @@ */ #pragma once - -#ifndef VECTORPROCESSOR_H -#define VECTORPROCESSOR_H - class Vector2; class Vector3; class Vector4; @@ -87,5 +83,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..2a1b48fdc0 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/wwmath.h +++ b/Core/Libraries/Source/WWVegas/WWMath/wwmath.h @@ -36,10 +36,6 @@ #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/WWSaveLoad/definition.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.h index a361c55989..c45f520a4c 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.h @@ -35,10 +35,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 +183,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..ed1b641ddf 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionclassids.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionclassids.h @@ -36,10 +36,6 @@ #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..f556bfd7d5 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactory.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactory.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __DEFINITION_FACTORY_H -#define __DEFINITION_FACTORY_H - #include "always.h" #include "bittype.h" #include "definitionclassids.h" @@ -86,6 +82,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..24e22f9f70 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __DEFINITION_FACTORY_MGR_H -#define __DEFINITION_FACTORY_MGR_H - #include "always.h" #include "bittype.h" #include "definitionclassids.h" @@ -83,6 +79,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..ea7e1afb3f 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.h @@ -37,10 +37,6 @@ #pragma once - -#ifndef __DEFINITION_MGR_H -#define __DEFINITION_MGR_H - #include "always.h" #include "saveload.h" #include "saveloadsubsystem.h" @@ -180,6 +176,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..4fe64cde56 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/editable.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/editable.h @@ -45,10 +45,6 @@ #pragma once -#ifndef __EDITABLE_H -#define __EDITABLE_H - - #include "always.h" #include "persist.h" #include "parameter.h" @@ -329,9 +325,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..9a85b4d660 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.h @@ -38,10 +38,6 @@ #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..39a07ee0fa 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h @@ -39,10 +39,6 @@ - -#ifndef __PARAMETER_LIST_H -#define __PARAMETER_LIST_H - #include "always.h" #include "Vector.H" #include "parameter.h" @@ -153,7 +149,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..4bef4824e7 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/parametertypes.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/parametertypes.h @@ -38,10 +38,6 @@ #pragma once - -#ifndef __PARAMETER_TYPES_H -#define __PARAMETER_TYPES_H - #include "always.h" ////////////////////////////////////////////////////////////////////////////////// @@ -61,7 +57,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..9bd68e60ac 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/persist.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/persist.h @@ -36,10 +36,6 @@ #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..af06d92eca 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h @@ -39,10 +39,6 @@ - -#ifndef PERSISTFACTORY_H -#define PERSISTFACTORY_H - #include "always.h" #include "bittype.h" #include "chunkio.h" @@ -136,6 +132,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..6658b447f5 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.h @@ -37,10 +37,6 @@ #pragma once - -#ifndef POINTERREMAP_H -#define POINTERREMAP_H - #ifdef _UNIX #include "osdep/osdep.h" #endif @@ -108,6 +104,3 @@ class PointerRemapClass DynamicVectorClass PointerRequestTable; DynamicVectorClass RefCountRequestTable; }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.h index bf03a3eccd..376b64e657 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.h @@ -37,10 +37,6 @@ #pragma once - -#ifndef SAVELOAD_H -#define SAVELOAD_H - #include "always.h" #include "pointerremap.h" #include "bittype.h" @@ -215,7 +211,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..ccf12efe24 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadids.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadids.h @@ -36,10 +36,6 @@ #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..28de12f80c 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef WWSAVELOADSTATUS_H -#define WWSAVELOADSTATUS_H - #pragma once #include "always.h" @@ -36,5 +32,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..3f845c6d6b 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h @@ -38,10 +38,6 @@ #pragma once -#ifndef SAVELOADSUBSYSTEM_H -#define SAVELOADSUBSYSTEM_H - - #include "always.h" #include "bittype.h" #include "postloadable.h" @@ -87,7 +83,3 @@ class SaveLoadSubSystemClass : public PostLoadableClass friend class SaveLoadSystemClass; }; - - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h index 3782b56894..861270842a 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h @@ -39,10 +39,6 @@ - -#ifndef __SIMPLE_PARAMETER_H -#define __SIMPLE_PARAMETER_H - #include "always.h" #include "parameter.h" #include "vector2.h" @@ -240,6 +236,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..5c28397d4a 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __TWIDDLER_H -#define __TWIDDLER_H - #include "definition.h" #include "definitionclassids.h" @@ -122,7 +118,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..28975d441e 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/wwsaveload.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/wwsaveload.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef WWSAVELOAD_H -#define WWSAVELOAD_H - /** ** WWSaveLoad ** The Init and Shutdown functions should be called once by the App. @@ -52,7 +48,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..7d8ae72962 100644 --- a/Core/Libraries/Source/debug/_pch.h +++ b/Core/Libraries/Source/debug/_pch.h @@ -27,10 +27,6 @@ // Precompiled header (module internal) ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _PCH_H // Include guard -#define _PCH_H - #include "debug.h" // we need windows.h at too many places... @@ -41,5 +37,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..d228500724 100644 --- a/Core/Libraries/Source/debug/debug.h +++ b/Core/Libraries/Source/debug/debug.h @@ -27,10 +27,6 @@ // Debugging module ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef DEBUG_H // Include guard -#define DEBUG_H - /** \page lib_var Library variants @@ -103,5 +99,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..cf80c053e2 100644 --- a/Core/Libraries/Source/debug/debug_cmd.h +++ b/Core/Libraries/Source/debug/debug_cmd.h @@ -27,10 +27,6 @@ // Debug command interface ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef DEBUG_CMD_H // Include guard -#define DEBUG_CMD_H - /** \interface DebugCmdInterface debug.h @@ -126,5 +122,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..08e6f0d7cf 100644 --- a/Core/Libraries/Source/debug/debug_debug.h +++ b/Core/Libraries/Source/debug/debug_debug.h @@ -27,10 +27,6 @@ // main Debug object (singleton) ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef DEBUG_DEBUG_H // Include guard -#define DEBUG_DEBUG_H - /** \class Debug debug.h @@ -1227,5 +1223,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..f55b00c9ab 100644 --- a/Core/Libraries/Source/debug/debug_doc.h +++ b/Core/Libraries/Source/debug/debug_doc.h @@ -27,10 +27,6 @@ // additional Doxygen module documentation ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef DEBUG_DOC_H // Include guard -#define DEBUG_DOC_H - // This generates a small main page for Doxygen if a module only // documentation is built. #ifndef DOXYGEN_GLOBAL_DOC @@ -704,5 +700,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..066dcc70a5 100644 --- a/Core/Libraries/Source/debug/debug_io.h +++ b/Core/Libraries/Source/debug/debug_io.h @@ -27,10 +27,6 @@ // Debug I/O interface ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef DEBUG_IO_H // Include guard -#define DEBUG_IO_H - /** \interface DebugIOInterface debug.h @@ -197,5 +193,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..366f8a028b 100644 --- a/Core/Libraries/Source/debug/debug_macro.h +++ b/Core/Libraries/Source/debug/debug_macro.h @@ -27,10 +27,6 @@ // Debugging macros ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef DEBUG_MACRO_H // Include guard -#define DEBUG_MACRO_H - // I'm putting the documentation for the following macros // here because Doxygen otherwise includes the values of each macro // in the documentation. I don't want that (it would expose some @@ -389,5 +385,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..97a8807ccf 100644 --- a/Core/Libraries/Source/debug/debug_stack.h +++ b/Core/Libraries/Source/debug/debug_stack.h @@ -27,10 +27,6 @@ // Stack walker ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef DEBUG_STACK_H // Include guard -#define DEBUG_STACK_H - /// \brief stack walker class (singleton) class DebugStackwalk { @@ -167,5 +163,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..0080fbcef6 100644 --- a/Core/Libraries/Source/debug/internal.h +++ b/Core/Libraries/Source/debug/internal.h @@ -27,10 +27,6 @@ // Internal header ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef INTERNAL_H // Include guard -#define INTERNAL_H - // make sure we're not omitting the frame pointer #pragma optimize("y",off) @@ -96,5 +92,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..9b55a7e35c 100644 --- a/Core/Libraries/Source/debug/internal_except.h +++ b/Core/Libraries/Source/debug/internal_except.h @@ -27,10 +27,6 @@ // Unhandled exception handler ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef INTERNAL_EXCEPT_H // Include guard -#define INTERNAL_EXCEPT_H - /// \internal exception handler class DebugExceptionhandler { @@ -85,5 +81,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..d23a3add3f 100644 --- a/Core/Libraries/Source/debug/internal_io.h +++ b/Core/Libraries/Source/debug/internal_io.h @@ -27,10 +27,6 @@ // Internal header: I/O classes ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef INTERNAL_IO_H // Include guard -#define INTERNAL_IO_H - /// \internal \brief con debug I/O class class DebugIOCon: public DebugIOInterface { @@ -251,5 +247,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..1cbe23e482 100644 --- a/Core/Libraries/Source/debug/test2/StdAfx.h +++ b/Core/Libraries/Source/debug/test2/StdAfx.h @@ -20,10 +20,6 @@ // or project specific include files that are used frequently, but // 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 +40,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..e544dca02d 100644 --- a/Core/Libraries/Source/profile/_pch.h +++ b/Core/Libraries/Source/profile/_pch.h @@ -27,15 +27,9 @@ // Precompiled header (module internal) ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _PCH_H // Include guard -#define _PCH_H - #define WIN32_LEAN_AND_MEAN #define STRICT #include #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..e537afac76 100644 --- a/Core/Libraries/Source/profile/internal.h +++ b/Core/Libraries/Source/profile/internal.h @@ -27,10 +27,6 @@ // Internal header ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef INTERNAL_H // Include guard -#define INTERNAL_H - #include "../debug/debug.h" #include "internal_funclevel.h" #include "internal_highlevel.h" @@ -153,5 +149,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..1b0ce0e3b4 100644 --- a/Core/Libraries/Source/profile/internal_cmd.h +++ b/Core/Libraries/Source/profile/internal_cmd.h @@ -27,10 +27,6 @@ // Profile module command interface ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef INTERNAL_CMD_H // Include guard -#define INTERNAL_CMD_H - class ProfileCmdInterface: public DebugCmdInterface { struct Factory @@ -56,5 +52,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..293b5455e2 100644 --- a/Core/Libraries/Source/profile/internal_funclevel.h +++ b/Core/Libraries/Source/profile/internal_funclevel.h @@ -27,10 +27,6 @@ // Function level profiling (internal header) ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef INTERNAL_FUNCLEVEL_H // Include guard -#define INTERNAL_FUNCLEVEL_H - class ProfileFuncLevelTracer { friend class ProfileCmdInterface; @@ -357,5 +353,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..35c40739eb 100644 --- a/Core/Libraries/Source/profile/internal_highlevel.h +++ b/Core/Libraries/Source/profile/internal_highlevel.h @@ -27,10 +27,6 @@ // High level profiling (internal header) ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef INTERNAL_HIGHLEVEL_H // Include guard -#define INTERNAL_HIGHLEVEL_H - /// an internal high level profile ID class ProfileId { @@ -242,5 +238,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..e5cb5ca579 100644 --- a/Core/Libraries/Source/profile/internal_result.h +++ b/Core/Libraries/Source/profile/internal_result.h @@ -27,10 +27,6 @@ // Internal result functions ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef INTERNAL_RESULT_H // Include guard -#define INTERNAL_RESULT_H - /// \brief Simple CSV format flat file result function, for all threads. class ProfileResultFileCSV: public ProfileResultInterface { @@ -97,5 +93,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..906e5754d5 100644 --- a/Core/Libraries/Source/profile/profile.h +++ b/Core/Libraries/Source/profile/profile.h @@ -27,10 +27,6 @@ // Profiling module ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef PROFILE_H // Include guard -#define PROFILE_H - // include all our public header files (use double quotes here) #include "profile_doc.h" #include "profile_highlevel.h" @@ -205,5 +201,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..9454820d7d 100644 --- a/Core/Libraries/Source/profile/profile_doc.h +++ b/Core/Libraries/Source/profile/profile_doc.h @@ -27,10 +27,6 @@ // additional Doxygen module documentation ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef PROFILE_DOC_H // Include guard -#define PROFILE_DOC_H - // This generates a small main page for Doxygen if a module only // documentation is built. #ifndef DOXYGEN_GLOBAL_DOC @@ -191,5 +187,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..c7cddf0a1a 100644 --- a/Core/Libraries/Source/profile/profile_funclevel.h +++ b/Core/Libraries/Source/profile/profile_funclevel.h @@ -27,10 +27,6 @@ // Function level profiling ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef PROFILE_FUNCLEVEL_H // Include guard -#define PROFILE_FUNCLEVEL_H - /** \brief The function level profiler. @@ -218,5 +214,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..9eaac63fed 100644 --- a/Core/Libraries/Source/profile/profile_highlevel.h +++ b/Core/Libraries/Source/profile/profile_highlevel.h @@ -27,10 +27,6 @@ // High level profiling ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef PROFILE_HIGHLEVEL_H // Include guard -#define PROFILE_HIGHLEVEL_H - /// \internal internal Id representation class ProfileId; @@ -236,5 +232,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..61d58b9d61 100644 --- a/Core/Libraries/Source/profile/profile_result.h +++ b/Core/Libraries/Source/profile/profile_result.h @@ -27,10 +27,6 @@ // Result function interface and result functions ////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef PROFILE_RESULT_H // Include guard -#define PROFILE_RESULT_H - /** \brief Result function class. @@ -61,5 +57,3 @@ class ProfileResultInterface protected: ProfileResultInterface(void) {} }; - -#endif // PROFILE_RESULT_H diff --git a/Core/Tools/Autorun/CDCNTRL.H b/Core/Tools/Autorun/CDCNTRL.H index a63785e11b..a48c0275df 100644 --- a/Core/Tools/Autorun/CDCNTRL.H +++ b/Core/Tools/Autorun/CDCNTRL.H @@ -37,10 +37,6 @@ #pragma once -#ifndef _CDCNTRL -#define _CDCNTRL - - //#include "always.h" //#include #define STRICT @@ -149,8 +145,3 @@ typedef struct _PARAMBLOCK { } PARAMBLOCK, *PPARAMBLOCK; #pragma pack() - - - -#endif //_CDCNTRL - 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..e3534562c6 100644 --- a/Core/Tools/Autorun/Locale_API.h +++ b/Core/Tools/Autorun/Locale_API.h @@ -35,10 +35,6 @@ *************************************************************************************************/ #pragma once - -#ifndef LOCALE_API_H -#define LOCALE_API_H - #include /****************************************************************************/ @@ -63,5 +59,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..64eebc9875 100644 --- a/Core/Tools/Autorun/POINT.h +++ b/Core/Tools/Autorun/POINT.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef POINT_H -#define POINT_H - #include //#include "always.h" //#include "cctypes.h" @@ -237,6 +233,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..ee0c225f7a 100644 --- a/Core/Tools/Autorun/RECT.h +++ b/Core/Tools/Autorun/RECT.h @@ -37,10 +37,6 @@ * Intersect -- Simple intersect between two rectangles. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef RECT_H -#define RECT_H - #include #include "POINT.h" @@ -303,6 +299,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..e461c84ad9 100644 --- a/Core/Tools/Autorun/TTFont.h +++ b/Core/Tools/Autorun/TTFont.h @@ -36,10 +36,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/ #pragma once - -#ifndef TTFONT_H -#define TTFONT_H - #include #include "POINT.h" #include "RECT.h" @@ -299,6 +295,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..040d690444 100644 --- a/Core/Tools/Autorun/Utils.h +++ b/Core/Tools/Autorun/Utils.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef UTILS_H -#define UTILS_H - #include @@ -70,6 +66,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/WSYS_FileSystem.h b/Core/Tools/Autorun/WSYS_FileSystem.h index 6eb78c7b83..8b4ebf49fa 100644 --- a/Core/Tools/Autorun/WSYS_FileSystem.h +++ b/Core/Tools/Autorun/WSYS_FileSystem.h @@ -37,10 +37,6 @@ #pragma once -#ifndef __WSYS_FILESYSTEM_H -#define __WSYS_FILESYSTEM_H - - //---------------------------------------------------------------------------- // Includes @@ -90,7 +86,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..145cf6fc2e 100644 --- a/Core/Tools/Autorun/WSYS_RAMFile.h +++ b/Core/Tools/Autorun/WSYS_RAMFile.h @@ -37,10 +37,6 @@ #pragma once -#ifndef __WSYS_RAMFILE_H -#define __WSYS_RAMFILE_H - - //---------------------------------------------------------------------------- // Includes @@ -95,6 +91,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..8f6c79195f 100644 --- a/Core/Tools/Autorun/WSYS_StdFile.h +++ b/Core/Tools/Autorun/WSYS_StdFile.h @@ -37,10 +37,6 @@ #pragma once -#ifndef __WSYS_STDFILE_H -#define __WSYS_STDFILE_H - - //---------------------------------------------------------------------------- // Includes @@ -92,6 +88,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..795e314d03 100644 --- a/Core/Tools/Autorun/WSYS_StdFileSystem.h +++ b/Core/Tools/Autorun/WSYS_StdFileSystem.h @@ -37,10 +37,6 @@ #pragma once -#ifndef __WSYS_STDFILESYSTEM_H -#define __WSYS_STDFILESYSTEM_H - - //---------------------------------------------------------------------------- // Includes @@ -86,7 +82,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..fd43365507 100644 --- a/Core/Tools/Autorun/WSYS_file.h +++ b/Core/Tools/Autorun/WSYS_file.h @@ -37,10 +37,6 @@ #pragma once -#ifndef __WSYS_FILE_H -#define __WSYS_FILE_H - - //---------------------------------------------------------------------------- // Includes @@ -162,6 +158,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..0bc411c197 100644 --- a/Core/Tools/Autorun/Wnd_File.h +++ b/Core/Tools/Autorun/Wnd_File.h @@ -39,10 +39,6 @@ // //**************************************************************************** #pragma once - -#ifndef WND_FILE_H -#define WND_FILE_H - //------------------------------------------------------------------------------ // include files... //------------------------------------------------------------------------------ @@ -212,5 +208,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/leanAndMeanAutorun.h b/Core/Tools/Autorun/leanAndMeanAutorun.h index 37c5b0d93e..b85d44712a 100644 --- a/Core/Tools/Autorun/leanAndMeanAutorun.h +++ b/Core/Tools/Autorun/leanAndMeanAutorun.h @@ -22,10 +22,4 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once -#ifndef __LEANANDMEANAUTORUN_H_ -#define __LEANANDMEANAUTORUN_H_ - - #define LEAN_AND_MEAN - -#endif //__LEANANDMEANAUTORUN_H_ diff --git a/Core/Tools/Babylon/Babylon.h b/Core/Tools/Babylon/Babylon.h index 753468abc1..b1b18881cf 100644 --- a/Core/Tools/Babylon/Babylon.h +++ b/Core/Tools/Babylon/Babylon.h @@ -18,10 +18,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 +64,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..415a1ecb1a 100644 --- a/Core/Tools/Babylon/BabylonDlg.h +++ b/Core/Tools/Babylon/BabylonDlg.h @@ -18,10 +18,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 +146,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..01fc93b255 100644 --- a/Core/Tools/Babylon/DlgProxy.h +++ b/Core/Tools/Babylon/DlgProxy.h @@ -18,10 +18,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 +69,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..ae55d22d5d 100644 --- a/Core/Tools/Babylon/ExportDlg.h +++ b/Core/Tools/Babylon/ExportDlg.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +71,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..d1cbaa4a9e 100644 --- a/Core/Tools/Babylon/GenerateDlg.h +++ b/Core/Tools/Babylon/GenerateDlg.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +82,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..5bc3c8be33 100644 --- a/Core/Tools/Babylon/MatchDlg.h +++ b/Core/Tools/Babylon/MatchDlg.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +66,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..cefa221b58 100644 --- a/Core/Tools/Babylon/ProceedDlg.h +++ b/Core/Tools/Babylon/ProceedDlg.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -64,5 +60,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..614e6411bd 100644 --- a/Core/Tools/Babylon/Report.h +++ b/Core/Tools/Babylon/Report.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +79,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..3c29a44fc5 100644 --- a/Core/Tools/Babylon/RetranslateDlg.h +++ b/Core/Tools/Babylon/RetranslateDlg.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +65,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..6bbc4e1eba 100644 --- a/Core/Tools/Babylon/StdAfx.h +++ b/Core/Tools/Babylon/StdAfx.h @@ -20,10 +20,6 @@ // or project specific include files that are used frequently, but // 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 +54,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/VIEWDBSII.h b/Core/Tools/Babylon/VIEWDBSII.h index 21b77841b3..fe491a5eea 100644 --- a/Core/Tools/Babylon/VIEWDBSII.h +++ b/Core/Tools/Babylon/VIEWDBSII.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +60,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..de40c17830 100644 --- a/Core/Tools/Babylon/VerifyDlg.h +++ b/Core/Tools/Babylon/VerifyDlg.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +75,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..aca72de561 100644 --- a/Core/Tools/Babylon/VerifyTextDlg.h +++ b/Core/Tools/Babylon/VerifyTextDlg.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +58,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/DebugWindow/DebugWindow.h b/Core/Tools/DebugWindow/DebugWindow.h index 2176235ab8..7ec9f7d220 100644 --- a/Core/Tools/DebugWindow/DebugWindow.h +++ b/Core/Tools/DebugWindow/DebugWindow.h @@ -18,10 +18,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 +62,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..d8953dc416 100644 --- a/Core/Tools/DebugWindow/StdAfx.h +++ b/Core/Tools/DebugWindow/StdAfx.h @@ -20,10 +20,6 @@ // or project specific include files that are used frequently, but // 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 +55,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..af87fd7e9d 100644 --- a/Core/Tools/ImagePacker/Include/ImageDirectory.h +++ b/Core/Tools/ImagePacker/Include/ImageDirectory.h @@ -39,10 +39,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __IMAGEDIRECTORY_H_ -#define __IMAGEDIRECTORY_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -82,6 +78,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..f77bd26a77 100644 --- a/Core/Tools/ImagePacker/Include/ImageInfo.h +++ b/Core/Tools/ImagePacker/Include/ImageInfo.h @@ -38,10 +38,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __IMAGEINFO_H_ -#define __IMAGEINFO_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -111,6 +107,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..d1ac1b599a 100644 --- a/Core/Tools/ImagePacker/Include/ImagePacker.h +++ b/Core/Tools/ImagePacker/Include/ImagePacker.h @@ -38,10 +38,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __IMAGEPACKER_H_ -#define __IMAGEPACKER_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -212,6 +208,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..90520fc65d 100644 --- a/Core/Tools/ImagePacker/Include/TexturePage.h +++ b/Core/Tools/ImagePacker/Include/TexturePage.h @@ -39,10 +39,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TEXTUREPAGE_H_ -#define __TEXTUREPAGE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -167,6 +163,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..06803d375a 100644 --- a/Core/Tools/ImagePacker/Include/WinMain.h +++ b/Core/Tools/ImagePacker/Include/WinMain.h @@ -38,10 +38,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WINMAIN_H_ -#define __WINMAIN_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -57,6 +53,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..d745ec78bc 100644 --- a/Core/Tools/ImagePacker/Include/WindowProc.h +++ b/Core/Tools/ImagePacker/Include/WindowProc.h @@ -38,10 +38,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WINDOWPROC_H_ -#define __WINDOWPROC_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -69,6 +65,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/Toolkit/Support/Visualc.h b/Core/Tools/Launcher/Toolkit/Support/Visualc.h index f18fe1613e..1b73f41cdd 100644 --- a/Core/Tools/Launcher/Toolkit/Support/Visualc.h +++ b/Core/Tools/Launcher/Toolkit/Support/Visualc.h @@ -34,10 +34,6 @@ * ******************************************************************************/ #pragma once - -#ifndef _VISUALC_H_ -#define _VISUALC_H_ - #if defined(_MSC_VER) // "unreferenced inline function has been removed" @@ -87,4 +83,3 @@ #pragma warning(disable:4786) #endif // _MSC_VER -#endif // _VISUALC_H_ diff --git a/Core/Tools/MapCacheBuilder/Include/WinMain.h b/Core/Tools/MapCacheBuilder/Include/WinMain.h index dc2cffc033..06803d375a 100644 --- a/Core/Tools/MapCacheBuilder/Include/WinMain.h +++ b/Core/Tools/MapCacheBuilder/Include/WinMain.h @@ -38,10 +38,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WINMAIN_H_ -#define __WINMAIN_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -57,6 +53,3 @@ // EXTERNALS ////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// extern HINSTANCE ApplicationHInstance; - -#endif // __WINMAIN_H_ - diff --git a/Core/Tools/PATCHGET/DownloadManager.h b/Core/Tools/PATCHGET/DownloadManager.h index 8b4a207757..ce561febd5 100644 --- a/Core/Tools/PATCHGET/DownloadManager.h +++ b/Core/Tools/PATCHGET/DownloadManager.h @@ -21,10 +21,6 @@ // Author: Matthew D. Campbell, July 2002 #pragma once - -#ifndef __DOWNLOADMANAGER_H__ -#define __DOWNLOADMANAGER_H__ - #include "WWDownload/downloaddefs.h" #include "WWDownload/Download.h" #include @@ -96,5 +92,3 @@ class DownloadManager : public IDownload extern DownloadManager *TheDownloadManager; } // namespace patchget - -#endif // __DOWNLOADMANAGER_H__ diff --git a/Core/Tools/PATCHGET/Registry.h b/Core/Tools/PATCHGET/Registry.h index 3600d0fefb..da1980e6fe 100644 --- a/Core/Tools/PATCHGET/Registry.h +++ b/Core/Tools/PATCHGET/Registry.h @@ -21,10 +21,6 @@ // Author: Matthew D. Campbell, December 2001 #pragma once - -#ifndef __REGISTRY_H__ -#define __REGISTRY_H__ - #include namespace patchget @@ -51,5 +47,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/W3DView/AddToLineupDialog.h b/Core/Tools/W3DView/AddToLineupDialog.h index dbda01f2f2..936a215c06 100644 --- a/Core/Tools/W3DView/AddToLineupDialog.h +++ b/Core/Tools/W3DView/AddToLineupDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +59,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..64f8aaea84 100644 --- a/Core/Tools/W3DView/AdvancedAnimSheet.h +++ b/Core/Tools/W3DView/AdvancedAnimSheet.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +82,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..6c24116b4f 100644 --- a/Core/Tools/W3DView/AggregateNameDialog.h +++ b/Core/Tools/W3DView/AggregateNameDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +73,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..f0dba4a0f2 100644 --- a/Core/Tools/W3DView/AmbientLightDialog.h +++ b/Core/Tools/W3DView/AmbientLightDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +65,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..e3743a211a 100644 --- a/Core/Tools/W3DView/AnimMixingPage.h +++ b/Core/Tools/W3DView/AnimMixingPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +67,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..a3df1d2b2d 100644 --- a/Core/Tools/W3DView/AnimReportPage.h +++ b/Core/Tools/W3DView/AnimReportPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +68,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..aa35b77364 100644 --- a/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h +++ b/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +71,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..1a48e97634 100644 --- a/Core/Tools/W3DView/AnimationPropPage.h +++ b/Core/Tools/W3DView/AnimationPropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +58,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..d7912c753d 100644 --- a/Core/Tools/W3DView/AnimationSpeed.h +++ b/Core/Tools/W3DView/AnimationSpeed.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +63,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..0b8378a410 100644 --- a/Core/Tools/W3DView/AssetInfo.h +++ b/Core/Tools/W3DView/AssetInfo.h @@ -37,10 +37,6 @@ #pragma once - -#ifndef __ASSET_INFO_H -#define __ASSET_INFO_H - #include "rendobj.h" #include "Utils.h" #include "AssetTypes.h" @@ -125,7 +121,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..5fc975545a 100644 --- a/Core/Tools/W3DView/AssetPropertySheet.h +++ b/Core/Tools/W3DView/AssetPropertySheet.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +64,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..748f2df258 100644 --- a/Core/Tools/W3DView/AssetTypes.h +++ b/Core/Tools/W3DView/AssetTypes.h @@ -37,10 +37,6 @@ #pragma once -#ifndef __ASSET_TYPES_H -#define __ASSET_TYPES_H - - typedef enum { TypeUnknown = -1, @@ -57,6 +53,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..4687b3f4c3 100644 --- a/Core/Tools/W3DView/BackgroundBMPDialog.h +++ b/Core/Tools/W3DView/BackgroundBMPDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +56,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..4f2ed781b5 100644 --- a/Core/Tools/W3DView/BackgroundColorDialog.h +++ b/Core/Tools/W3DView/BackgroundColorDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +65,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..79e64d1264 100644 --- a/Core/Tools/W3DView/BackgroundObjectDialog.h +++ b/Core/Tools/W3DView/BackgroundObjectDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +57,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..2436fcd270 100644 --- a/Core/Tools/W3DView/BoneMgrDialog.h +++ b/Core/Tools/W3DView/BoneMgrDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +101,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..0fc3001f77 100644 --- a/Core/Tools/W3DView/CameraDistanceDialog.h +++ b/Core/Tools/W3DView/CameraDistanceDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +58,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..629e365b08 100644 --- a/Core/Tools/W3DView/CameraSettingsDialog.h +++ b/Core/Tools/W3DView/CameraSettingsDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +72,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..d594ad3e53 100644 --- a/Core/Tools/W3DView/ColorBar.h +++ b/Core/Tools/W3DView/ColorBar.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +242,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..3c61f1254a 100644 --- a/Core/Tools/W3DView/ColorPicker.h +++ b/Core/Tools/W3DView/ColorPicker.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +151,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..d73e043b73 100644 --- a/Core/Tools/W3DView/ColorPickerDialogClass.h +++ b/Core/Tools/W3DView/ColorPickerDialogClass.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +126,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..dbe7079ba3 100644 --- a/Core/Tools/W3DView/ColorSelectionDialog.h +++ b/Core/Tools/W3DView/ColorSelectionDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +99,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/DataTreeView.h b/Core/Tools/W3DView/DataTreeView.h index 7267f54329..8aaab2b3a2 100644 --- a/Core/Tools/W3DView/DataTreeView.h +++ b/Core/Tools/W3DView/DataTreeView.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +169,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..8c046ab7a6 100644 --- a/Core/Tools/W3DView/DeviceSelectionDialog.h +++ b/Core/Tools/W3DView/DeviceSelectionDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +80,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..446f1a1d60 100644 --- a/Core/Tools/W3DView/DialogToolbar.h +++ b/Core/Tools/W3DView/DialogToolbar.h @@ -37,10 +37,6 @@ #pragma once - -#ifndef __DIALOGTOOLBAR_H -#define __DIALOGTOOLBAR_H - #include "resource.h" ///////////////////////////////////////////////////////////////// @@ -97,7 +93,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..0b086c271b 100644 --- a/Core/Tools/W3DView/DirectoryDialog.h +++ b/Core/Tools/W3DView/DirectoryDialog.h @@ -37,17 +37,9 @@ #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..71f9eeda40 100644 --- a/Core/Tools/W3DView/EditLODDialog.h +++ b/Core/Tools/W3DView/EditLODDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +72,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..22b238e356 100644 --- a/Core/Tools/W3DView/EmitterColorPropPage.h +++ b/Core/Tools/W3DView/EmitterColorPropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +124,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..45aea4a033 100644 --- a/Core/Tools/W3DView/EmitterFramePropPage.h +++ b/Core/Tools/W3DView/EmitterFramePropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +124,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..7a639ec1b8 100644 --- a/Core/Tools/W3DView/EmitterGeneralPropPage.h +++ b/Core/Tools/W3DView/EmitterGeneralPropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +124,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..cd80fe0021 100644 --- a/Core/Tools/W3DView/EmitterInstanceList.h +++ b/Core/Tools/W3DView/EmitterInstanceList.h @@ -31,10 +31,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 +104,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..3be310fd62 100644 --- a/Core/Tools/W3DView/EmitterLineGroupPropPage.h +++ b/Core/Tools/W3DView/EmitterLineGroupPropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +106,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..c6d87aafad 100644 --- a/Core/Tools/W3DView/EmitterLinePropPage.h +++ b/Core/Tools/W3DView/EmitterLinePropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +125,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..77664e701f 100644 --- a/Core/Tools/W3DView/EmitterParticlePropPage.h +++ b/Core/Tools/W3DView/EmitterParticlePropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +113,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..fe1e319cb0 100644 --- a/Core/Tools/W3DView/EmitterPhysicsPropPage.h +++ b/Core/Tools/W3DView/EmitterPhysicsPropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +119,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..0be0a0a5df 100644 --- a/Core/Tools/W3DView/EmitterPropertySheet.h +++ b/Core/Tools/W3DView/EmitterPropertySheet.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +118,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..ce9e741c12 100644 --- a/Core/Tools/W3DView/EmitterRotationPropPage.h +++ b/Core/Tools/W3DView/EmitterRotationPropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +133,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..480f279bca 100644 --- a/Core/Tools/W3DView/EmitterSizePropPage.h +++ b/Core/Tools/W3DView/EmitterSizePropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +109,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..d6fdd6e1da 100644 --- a/Core/Tools/W3DView/EmitterUserPropPage.h +++ b/Core/Tools/W3DView/EmitterUserPropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +105,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..1e3ce19307 100644 --- a/Core/Tools/W3DView/GammaDialog.h +++ b/Core/Tools/W3DView/GammaDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +57,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/GraphicView.h b/Core/Tools/W3DView/GraphicView.h index 8ffa8b069c..daa2971cc0 100644 --- a/Core/Tools/W3DView/GraphicView.h +++ b/Core/Tools/W3DView/GraphicView.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +253,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..cebff6afcf 100644 --- a/Core/Tools/W3DView/HierarchyPropPage.h +++ b/Core/Tools/W3DView/HierarchyPropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +64,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/MainFrm.h b/Core/Tools/W3DView/MainFrm.h index b6f70dc99d..b3accc9e7b 100644 --- a/Core/Tools/W3DView/MainFrm.h +++ b/Core/Tools/W3DView/MainFrm.h @@ -19,10 +19,6 @@ // MainFrm.h : interface of the CMainFrame class // ///////////////////////////////////////////////////////////////////////////// - -#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 +290,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..812f4c22e8 100644 --- a/Core/Tools/W3DView/MeshPropPage.h +++ b/Core/Tools/W3DView/MeshPropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +64,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..6bc2a83e04 100644 --- a/Core/Tools/W3DView/OpacitySettingsDialog.h +++ b/Core/Tools/W3DView/OpacitySettingsDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +73,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..cec555ff80 100644 --- a/Core/Tools/W3DView/OpacityVectorDialog.h +++ b/Core/Tools/W3DView/OpacityVectorDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +95,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..c4bd91afbe 100644 --- a/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h +++ b/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +70,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..6b0f57ad2f 100644 --- a/Core/Tools/W3DView/ParticleFrameKeyDialog.h +++ b/Core/Tools/W3DView/ParticleFrameKeyDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +71,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..3c102d106d 100644 --- a/Core/Tools/W3DView/ParticleRotationKeyDialog.h +++ b/Core/Tools/W3DView/ParticleRotationKeyDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +71,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..f7167c7398 100644 --- a/Core/Tools/W3DView/ParticleSizeDialog.h +++ b/Core/Tools/W3DView/ParticleSizeDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +70,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..396ec3f913 100644 --- a/Core/Tools/W3DView/PlaySoundDialog.h +++ b/Core/Tools/W3DView/PlaySoundDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +65,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..d3d09c057e 100644 --- a/Core/Tools/W3DView/ResolutionDialog.h +++ b/Core/Tools/W3DView/ResolutionDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +77,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..414b693d76 100644 --- a/Core/Tools/W3DView/RestrictedFileDialog.h +++ b/Core/Tools/W3DView/RestrictedFileDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +50,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..8bdb0009eb 100644 --- a/Core/Tools/W3DView/RingColorPropPage.h +++ b/Core/Tools/W3DView/RingColorPropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +107,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..f0cb2f85cf 100644 --- a/Core/Tools/W3DView/RingGeneralPropPage.h +++ b/Core/Tools/W3DView/RingGeneralPropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +112,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..eddd915bda 100644 --- a/Core/Tools/W3DView/RingPropertySheet.h +++ b/Core/Tools/W3DView/RingPropertySheet.h @@ -36,10 +36,6 @@ #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..3ec5ff82ba 100644 --- a/Core/Tools/W3DView/RingSizePropPage.h +++ b/Core/Tools/W3DView/RingSizePropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +116,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..6673e6f710 100644 --- a/Core/Tools/W3DView/SaveSettingsDialog.h +++ b/Core/Tools/W3DView/SaveSettingsDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +61,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..5888453dd7 100644 --- a/Core/Tools/W3DView/ScaleDialog.h +++ b/Core/Tools/W3DView/ScaleDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 @@ -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..197028f2fe 100644 --- a/Core/Tools/W3DView/SceneLightDialog.h +++ b/Core/Tools/W3DView/SceneLightDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +116,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..273bbc65f9 100644 --- a/Core/Tools/W3DView/ScreenCursor.h +++ b/Core/Tools/W3DView/ScreenCursor.h @@ -33,10 +33,6 @@ #pragma once - -#ifndef __SCREENCURSOR_H -#define __SCREENCURSOR_H - #include "resource.h" #include "rendobj.h" #include "Vector3i.h" @@ -109,6 +105,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..aafa12de31 100644 --- a/Core/Tools/W3DView/SoundEditDialog.h +++ b/Core/Tools/W3DView/SoundEditDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 @@ -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..3f83deecaa 100644 --- a/Core/Tools/W3DView/SphereColorPropPage.h +++ b/Core/Tools/W3DView/SphereColorPropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +116,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..83de201e70 100644 --- a/Core/Tools/W3DView/SphereGeneralPropPage.h +++ b/Core/Tools/W3DView/SphereGeneralPropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +110,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..cbbd418b0e 100644 --- a/Core/Tools/W3DView/SpherePropertySheet.h +++ b/Core/Tools/W3DView/SpherePropertySheet.h @@ -36,10 +36,6 @@ #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..b65710dfbd 100644 --- a/Core/Tools/W3DView/SphereSizePropPage.h +++ b/Core/Tools/W3DView/SphereSizePropPage.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +108,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..3e039d5786 100644 --- a/Core/Tools/W3DView/SphereUtils.h +++ b/Core/Tools/W3DView/SphereUtils.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __SPHERE_UTILS -#define __SPHERE_UTILS - #include "sphereobj.h" ///////////////////////////////////////////////////////////// @@ -89,7 +85,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..5fe3b593a1 100644 --- a/Core/Tools/W3DView/StdAfx.h +++ b/Core/Tools/W3DView/StdAfx.h @@ -20,10 +20,6 @@ // or project specific include files that are used frequently, but // 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 +37,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..aa9de225ce 100644 --- a/Core/Tools/W3DView/TextureMgrDialog.h +++ b/Core/Tools/W3DView/TextureMgrDialog.h @@ -33,10 +33,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 +245,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..0debcb859b 100644 --- a/Core/Tools/W3DView/TexturePathDialog.h +++ b/Core/Tools/W3DView/TexturePathDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +57,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..fc63f4b2ac 100644 --- a/Core/Tools/W3DView/TextureSettingsDialog.h +++ b/Core/Tools/W3DView/TextureSettingsDialog.h @@ -29,10 +29,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 +119,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/Vector3RndCombo.H b/Core/Tools/W3DView/Vector3RndCombo.H index 8fe3c9500b..c7fa84ef82 100644 --- a/Core/Tools/W3DView/Vector3RndCombo.H +++ b/Core/Tools/W3DView/Vector3RndCombo.H @@ -32,10 +32,6 @@ #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..08431fe779 100644 --- a/Core/Tools/W3DView/ViewerAssetMgr.h +++ b/Core/Tools/W3DView/ViewerAssetMgr.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __VIEWER_ASSETMGR_H -#define __VIEWER_ASSETMGR_H - #include "assetmgr.h" @@ -87,6 +83,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..775d4b950f 100644 --- a/Core/Tools/W3DView/ViewerScene.h +++ b/Core/Tools/W3DView/ViewerScene.h @@ -37,10 +37,6 @@ #pragma once - -#ifndef __VIEWER_SCENE_H -#define __VIEWER_SCENE_H - #include "scene.h" #include "aabox.h" #include "sphere.h" @@ -111,6 +107,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..5519494d03 100644 --- a/Core/Tools/W3DView/VolumeRandomDialog.h +++ b/Core/Tools/W3DView/VolumeRandomDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +90,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..4680eaa493 100644 --- a/Core/Tools/W3DView/W3DView.h +++ b/Core/Tools/W3DView/W3DView.h @@ -18,10 +18,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 +62,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..e9e122696e 100644 --- a/Core/Tools/W3DView/W3DViewDoc.h +++ b/Core/Tools/W3DView/W3DViewDoc.h @@ -19,10 +19,6 @@ // W3DViewDoc.h : interface of the CW3DViewDoc class // ///////////////////////////////////////////////////////////////////////////// - -#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 +331,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..62a02999f0 100644 --- a/Core/Tools/W3DView/W3DViewView.h +++ b/Core/Tools/W3DView/W3DViewView.h @@ -19,10 +19,6 @@ // W3DViewView.h : interface of the CW3DViewView class // ///////////////////////////////////////////////////////////////////////////// - -#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 +69,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/FormClass.h b/Core/Tools/WW3D/max2w3d/FormClass.h index e70b1149af..86df4028dc 100644 --- a/Core/Tools/WW3D/max2w3d/FormClass.h +++ b/Core/Tools/WW3D/max2w3d/FormClass.h @@ -36,10 +36,6 @@ #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/LightGlareSave.h b/Core/Tools/WW3D/max2w3d/LightGlareSave.h index 6fd1b38006..d17641294c 100644 --- a/Core/Tools/WW3D/max2w3d/LightGlareSave.h +++ b/Core/Tools/WW3D/max2w3d/LightGlareSave.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef LIGHTGLARESAVE_H -#define LIGHTGLARESAVE_H - #include #include "w3d_file.h" #include "chunkio.h" @@ -76,7 +72,3 @@ class LightGlareSaveClass W3dLightGlareStruct GlareData; }; - - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/SnapPoints.h b/Core/Tools/WW3D/max2w3d/SnapPoints.h index 922f136110..ae9ddc0ba8 100644 --- a/Core/Tools/WW3D/max2w3d/SnapPoints.h +++ b/Core/Tools/WW3D/max2w3d/SnapPoints.h @@ -36,10 +36,6 @@ #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/aabtreebuilder.h b/Core/Tools/WW3D/max2w3d/aabtreebuilder.h index bcdeaf9e07..7ef5e125f0 100644 --- a/Core/Tools/WW3D/max2w3d/aabtreebuilder.h +++ b/Core/Tools/WW3D/max2w3d/aabtreebuilder.h @@ -38,10 +38,6 @@ #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/colboxsave.h b/Core/Tools/WW3D/max2w3d/colboxsave.h index a9dc74f768..90cbc77b93 100644 --- a/Core/Tools/WW3D/max2w3d/colboxsave.h +++ b/Core/Tools/WW3D/max2w3d/colboxsave.h @@ -36,10 +36,6 @@ #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..9220872932 100644 --- a/Core/Tools/WW3D/max2w3d/dazzlesave.h +++ b/Core/Tools/WW3D/max2w3d/dazzlesave.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef DAZZLESAVE_H -#define DAZZLESAVE_H - #include #include "w3d_file.h" #include "chunkio.h" @@ -77,12 +73,3 @@ class DazzleSaveClass char DazzleType[128]; }; - - - - - - - -#endif //DAZZLESAVE_H - diff --git a/Core/Tools/WW3D/max2w3d/meshbuild.h b/Core/Tools/WW3D/max2w3d/meshbuild.h index dd71c7eb54..4d06d82a4d 100644 --- a/Core/Tools/WW3D/max2w3d/meshbuild.h +++ b/Core/Tools/WW3D/max2w3d/meshbuild.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef MESHBUILD_H -#define MESHBUILD_H - #include "always.h" #include "vector2.h" #include "vector3.h" @@ -373,5 +369,3 @@ inline const MeshBuilderClass::MeshStatsStruct & MeshBuilderClass::Get_Mesh_Stat assert(State == STATE_MESH_PROCESSED); return Stats; } - -#endif diff --git a/Core/Tools/WW3D/max2w3d/meshsave.h b/Core/Tools/WW3D/max2w3d/meshsave.h index 66609518b9..930686bbbe 100644 --- a/Core/Tools/WW3D/max2w3d/meshsave.h +++ b/Core/Tools/WW3D/max2w3d/meshsave.h @@ -36,10 +36,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 +212,3 @@ class MeshSaveClass friend class DamageClass; }; - - - - - -#endif /*MESHSAVE_H*/ diff --git a/Core/Tools/WW3D/max2w3d/nullsave.h b/Core/Tools/WW3D/max2w3d/nullsave.h index b4c890272a..afc84b23f7 100644 --- a/Core/Tools/WW3D/max2w3d/nullsave.h +++ b/Core/Tools/WW3D/max2w3d/nullsave.h @@ -37,10 +37,6 @@ #pragma once -#ifndef NULLSAVE_H -#define NULLSAVE_H - - #include #include "w3d_file.h" #include "chunkio.h" @@ -72,8 +68,3 @@ class NullSaveClass W3dNullObjectStruct NullData; }; - - - - -#endif //NULLSAVE_H diff --git a/Core/Tools/WW3D/max2w3d/w3d_file.h b/Core/Tools/WW3D/max2w3d/w3d_file.h index fce09375a3..13993d152a 100644 --- a/Core/Tools/WW3D/max2w3d/w3d_file.h +++ b/Core/Tools/WW3D/max2w3d/w3d_file.h @@ -37,10 +37,6 @@ #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..7c3a0f27b4 100644 --- a/Core/Tools/WW3D/max2w3d/w3d_obsolete.h +++ b/Core/Tools/WW3D/max2w3d/w3d_obsolete.h @@ -37,10 +37,6 @@ #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 +322,3 @@ struct W3dHModelAuxDataStruct float32 LODMax; uint32 FutureUse[32]; }; - - -#endif // W3D_OBSOLETE_H diff --git a/Core/Tools/WW3D/max2w3d/w3dmtl.h b/Core/Tools/WW3D/max2w3d/w3dmtl.h index 592520554d..d70b63f804 100644 --- a/Core/Tools/WW3D/max2w3d/w3dmtl.h +++ b/Core/Tools/WW3D/max2w3d/w3dmtl.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef W3DMTL_H -#define W3DMTL_H - #include "always.h" #include "w3d_file.h" #include "Vector.H" @@ -305,7 +301,3 @@ class W3dMaterialDescClass DynamicVectorClass < TexClass > Textures; }; - - - -#endif diff --git a/Core/Tools/WW3D/pluglib/WWmatrix3.h b/Core/Tools/WW3D/pluglib/WWmatrix3.h index f22c4e5246..b12a1118d6 100644 --- a/Core/Tools/WW3D/pluglib/WWmatrix3.h +++ b/Core/Tools/WW3D/pluglib/WWmatrix3.h @@ -55,10 +55,6 @@ #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..79e57a5ffc 100644 --- a/Core/Tools/WW3D/pluglib/aaplane.h +++ b/Core/Tools/WW3D/pluglib/aaplane.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef AAPLANE_H -#define AAPLANE_H - #include "always.h" #include "vector3.h" @@ -77,5 +73,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..3eb00ddeee 100644 --- a/Core/Tools/WW3D/pluglib/always.h +++ b/Core/Tools/WW3D/pluglib/always.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef ALWAYS_H -#define ALWAYS_H - // 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 +159,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/chunkio.h b/Core/Tools/WW3D/pluglib/chunkio.h index 3f5f44f00d..5b36be25b7 100644 --- a/Core/Tools/WW3D/pluglib/chunkio.h +++ b/Core/Tools/WW3D/pluglib/chunkio.h @@ -35,10 +35,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef CHUNKIO_H -#define CHUNKIO_H - #ifndef ALWAYS_H #include "always.h" #endif @@ -372,7 +368,3 @@ class ChunkLoadClass */ #define OBSOLETE_MICRO_CHUNK(id) \ case (id): break; - - - -#endif // CHUNKIO_H diff --git a/Core/Tools/WW3D/pluglib/hashcalc.h b/Core/Tools/WW3D/pluglib/hashcalc.h index 97f303027e..d38b90fd8c 100644 --- a/Core/Tools/WW3D/pluglib/hashcalc.h +++ b/Core/Tools/WW3D/pluglib/hashcalc.h @@ -36,10 +36,6 @@ #pragma once -#ifndef HASHCALC_H -#define HASHCALC_H - - /* ** HashCalculatorClass ** The hash calculator is used to abstract the process of computing a hash @@ -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/iostruct.h b/Core/Tools/WW3D/pluglib/iostruct.h index 4444b4f830..d6b4cb9a16 100644 --- a/Core/Tools/WW3D/pluglib/iostruct.h +++ b/Core/Tools/WW3D/pluglib/iostruct.h @@ -37,10 +37,6 @@ #pragma once - -#ifndef IOSTRUCT_H -#define IOSTRUCT_H - #ifndef BITTYPE_H #include "BITTYPE.H" #endif @@ -74,8 +70,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..1d68521003 100644 --- a/Core/Tools/WW3D/pluglib/matrix3d.h +++ b/Core/Tools/WW3D/pluglib/matrix3d.h @@ -71,10 +71,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef MATRIX3D_H -#define MATRIX3D_H - #ifdef _UNIX #include "osdep.h" #endif @@ -1510,5 +1506,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..6964d80c96 100644 --- a/Core/Tools/WW3D/pluglib/matrix4.h +++ b/Core/Tools/WW3D/pluglib/matrix4.h @@ -54,10 +54,6 @@ #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/palette.h b/Core/Tools/WW3D/pluglib/palette.h index 29f833bcb4..b67bc5c42e 100644 --- a/Core/Tools/WW3D/pluglib/palette.h +++ b/Core/Tools/WW3D/pluglib/palette.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef PALETTE_H -#define PALETTE_H - #include "rgb.h" /* @@ -74,6 +70,3 @@ class PaletteClass protected: RGBClass Palette[COLOR_COUNT]; }; - - -#endif diff --git a/Core/Tools/WW3D/pluglib/rawfile.h b/Core/Tools/WW3D/pluglib/rawfile.h index 53a012c052..939ef16eff 100644 --- a/Core/Tools/WW3D/pluglib/rawfile.h +++ b/Core/Tools/WW3D/pluglib/rawfile.h @@ -38,10 +38,6 @@ * RawFileClass::Is_Open -- Checks to see if the file is open or not. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef RAWFILE_Hx -#define RAWFILE_Hx - //#include // #include "win.h" @@ -197,7 +193,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..1aedd373a4 100644 --- a/Core/Tools/WW3D/pluglib/realcrc.h +++ b/Core/Tools/WW3D/pluglib/realcrc.h @@ -35,13 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once -#ifndef REALCRC_H -#define REALCRC_H - - 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..411d432ed1 100644 --- a/Core/Tools/WW3D/pluglib/rgb.h +++ b/Core/Tools/WW3D/pluglib/rgb.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef RGB_H -#define RGB_H - class PaletteClass; class HSVClass; @@ -89,5 +85,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..a441ac796e 100644 --- a/Core/Tools/WW3D/pluglib/uarray.h +++ b/Core/Tools/WW3D/pluglib/uarray.h @@ -37,10 +37,6 @@ * UniqueArrayClass::Add -- Add an item to the array * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef UARRAY_H -#define UARRAY_H - #ifndef HASHCALC_H #include "hashcalc.h" #endif @@ -220,7 +216,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..04d4cd524f 100644 --- a/Core/Tools/WW3D/pluglib/vector2.h +++ b/Core/Tools/WW3D/pluglib/vector2.h @@ -50,10 +50,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef VECTOR2_H -#define VECTOR2_H - #include "always.h" #include "wwmath.h" #include @@ -632,7 +628,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..f848510650 100644 --- a/Core/Tools/WW3D/pluglib/vector3.h +++ b/Core/Tools/WW3D/pluglib/vector3.h @@ -64,10 +64,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef VECTOR3_H -#define VECTOR3_H - #include "always.h" #include "wwmath.h" #include @@ -923,6 +919,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..4382838e2e 100644 --- a/Core/Tools/WW3D/pluglib/vector3i.h +++ b/Core/Tools/WW3D/pluglib/vector3i.h @@ -36,10 +36,6 @@ #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..6fe9ab205e 100644 --- a/Core/Tools/WW3D/pluglib/vector4.h +++ b/Core/Tools/WW3D/pluglib/vector4.h @@ -45,10 +45,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef VECTOR4_H -#define VECTOR4_H - #include "always.h" #include "wwmath.h" #include @@ -382,7 +378,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/w3dquat.h b/Core/Tools/WW3D/pluglib/w3dquat.h index 86d034c080..c8222c92f2 100644 --- a/Core/Tools/WW3D/pluglib/w3dquat.h +++ b/Core/Tools/WW3D/pluglib/w3dquat.h @@ -36,10 +36,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef QUAT_H -#define QUAT_H - #include "always.h" #include "wwmath.h" #include "WWmatrix3.h" @@ -253,8 +249,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/win.h b/Core/Tools/WW3D/pluglib/win.h index faaae191dc..ed44dbce41 100644 --- a/Core/Tools/WW3D/pluglib/win.h +++ b/Core/Tools/WW3D/pluglib/win.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef WIN_H -#define WIN_H - /* ** This header file includes the Windows headers. If there are any special pragmas that need ** to occur around this process, they are performed here. Typically, certain warnings will need @@ -85,5 +81,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..10fda74e63 100644 --- a/Core/Tools/WW3D/pluglib/wwfile.h +++ b/Core/Tools/WW3D/pluglib/wwfile.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef WWFILE_Hx -#define WWFILE_Hx - #ifdef _UNIX #include "osdep.h" #endif @@ -106,5 +102,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..1bf77eb095 100644 --- a/Core/Tools/WW3D/pluglib/wwmath.h +++ b/Core/Tools/WW3D/pluglib/wwmath.h @@ -36,10 +36,6 @@ #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/timingTest/StdAfx.h b/Core/Tools/timingTest/StdAfx.h index ee6dc64133..e86eb5ae25 100644 --- a/Core/Tools/timingTest/StdAfx.h +++ b/Core/Tools/timingTest/StdAfx.h @@ -20,10 +20,6 @@ // or project specific include files that are used frequently, but // 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 +30,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..2e28ae3d77 100644 --- a/Core/Tools/wolSetup/StdAfx.h +++ b/Core/Tools/wolSetup/StdAfx.h @@ -20,10 +20,6 @@ // or project specific include files that are used frequently, but // 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 +31,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/Generals/Code/GameEngine/Include/Common/ActionManager.h b/Generals/Code/GameEngine/Include/Common/ActionManager.h index 2a66e6dfec..6ae2be6d29 100644 --- a/Generals/Code/GameEngine/Include/Common/ActionManager.h +++ b/Generals/Code/GameEngine/Include/Common/ActionManager.h @@ -33,10 +33,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ACTIONMANAGER_H_ -#define __ACTIONMANAGER_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/SubsystemInterface.h" @@ -110,5 +106,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..0815f9e46d 100644 --- a/Generals/Code/GameEngine/Include/Common/BattleHonors.h +++ b/Generals/Code/GameEngine/Include/Common/BattleHonors.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BATTLE_HONORS_H_ -#define __BATTLE_HONORS_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -123,5 +119,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..a1a68496bd 100644 --- a/Generals/Code/GameEngine/Include/Common/BezierSegment.h +++ b/Generals/Code/GameEngine/Include/Common/BezierSegment.h @@ -28,9 +28,6 @@ // DO NOT DISTRIBUTE #pragma once -#ifndef __BEZIERSEGMENT_H__ -#define __BEZIERSEGMENT_H__ - #include #include "Common/STLTypedefs.h" @@ -69,5 +66,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..21dc6d98a4 100644 --- a/Generals/Code/GameEngine/Include/Common/BitFlags.h +++ b/Generals/Code/GameEngine/Include/Common/BitFlags.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BitFlags_H_ -#define __BitFlags_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" @@ -329,6 +325,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..1c0c2be83a 100644 --- a/Generals/Code/GameEngine/Include/Common/BitFlagsIO.h +++ b/Generals/Code/GameEngine/Include/Common/BitFlagsIO.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BitFlagsIO_H_ -#define __BitFlagsIO_H_ - #include "Common/BitFlags.h" #include "Common/INI.h" #include "Common/Xfer.h" @@ -229,5 +225,3 @@ void BitFlags::xfer(Xfer* xfer) } } - -#endif diff --git a/Generals/Code/GameEngine/Include/Common/BuildAssistant.h b/Generals/Code/GameEngine/Include/Common/BuildAssistant.h index 6df0c153b1..6562197f8f 100644 --- a/Generals/Code/GameEngine/Include/Common/BuildAssistant.h +++ b/Generals/Code/GameEngine/Include/Common/BuildAssistant.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BUILDASSISTANT_H_ -#define __BUILDASSISTANT_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" #include "Lib/BaseType.h" @@ -212,6 +208,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..063f3a1798 100644 --- a/Generals/Code/GameEngine/Include/Common/ClientUpdateModule.h +++ b/Generals/Code/GameEngine/Include/Common/ClientUpdateModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ClientUpdateModule_H_ -#define __ClientUpdateModule_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include @@ -63,7 +59,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..149ff809a0 100644 --- a/Generals/Code/GameEngine/Include/Common/CommandLine.h +++ b/Generals/Code/GameEngine/Include/Common/CommandLine.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, September 2001 #pragma once - -#ifndef _COMMAND_LINE_H_ -#define _COMMAND_LINE_H_ - class CommandLine { public: @@ -38,5 +34,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..fbd21670b6 100644 --- a/Generals/Code/GameEngine/Include/Common/CriticalSection.h +++ b/Generals/Code/GameEngine/Include/Common/CriticalSection.h @@ -27,10 +27,6 @@ // Author: JohnM And MattC, August 13, 2002 #pragma once - -#ifndef __CRITICALSECTION_H__ -#define __CRITICALSECTION_H__ - #include "Common/PerfTimer.h" #ifdef PERF_TIMERS @@ -102,5 +98,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..cfde742fba 100644 --- a/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CUSTOMMATCHPREFERENCES_H__ -#define __CUSTOMMATCHPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -79,5 +75,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..80a47d4a9a 100644 --- a/Generals/Code/GameEngine/Include/Common/DamageFX.h +++ b/Generals/Code/GameEngine/Include/Common/DamageFX.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _DamageFX_H_ -#define _DamageFX_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameCommon.h" #include "Common/NameKeyGenerator.h" @@ -164,6 +160,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..56bfb66989 100644 --- a/Generals/Code/GameEngine/Include/Common/DataChunk.h +++ b/Generals/Code/GameEngine/Include/Common/DataChunk.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, October 2000 #pragma once - -#ifndef _DATA_CHUNK_H_ -#define _DATA_CHUNK_H_ - #include "Common/GameMemory.h" #include "Common/Dict.h" #include "Common/MapReaderWriterInfo.h" @@ -232,7 +228,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..d868b86941 100644 --- a/Generals/Code/GameEngine/Include/Common/Dict.h +++ b/Generals/Code/GameEngine/Include/Common/Dict.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef Dict_H -#define Dict_H - #include "Common/Errors.h" #include "Common/NameKeyGenerator.h" @@ -362,7 +358,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..713e0bdf54 100644 --- a/Generals/Code/GameEngine/Include/Common/Directory.h +++ b/Generals/Code/GameEngine/Include/Common/Directory.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #if (0) #pragma once - -#ifndef __DIRECTORY_H__ -#define __DIRECTORY_H__ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" #include "Common/STLTypedefs.h" @@ -90,6 +86,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..d540184619 100644 --- a/Generals/Code/GameEngine/Include/Common/DisabledTypes.h +++ b/Generals/Code/GameEngine/Include/Common/DisabledTypes.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DISABLED_TYPES_H_ -#define __DISABLED_TYPES_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" @@ -109,6 +105,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..b5b2e4211f 100644 --- a/Generals/Code/GameEngine/Include/Common/DiscreteCircle.h +++ b/Generals/Code/GameEngine/Include/Common/DiscreteCircle.h @@ -28,10 +28,6 @@ // DO NOT DISTRIBUTE #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 +70,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..3c22211120 100644 --- a/Generals/Code/GameEngine/Include/Common/DrawModule.h +++ b/Generals/Code/GameEngine/Include/Common/DrawModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DRAWMODULE_H_ -#define __DRAWMODULE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Module.h" @@ -248,7 +244,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..53d3d000db 100644 --- a/Generals/Code/GameEngine/Include/Common/Energy.h +++ b/Generals/Code/GameEngine/Include/Common/Energy.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef _ENERGY_H_ -#define _ENERGY_H_ - // INLCUDES ///////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" @@ -118,6 +114,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..6bcf0a7903 100644 --- a/Generals/Code/GameEngine/Include/Common/Errors.h +++ b/Generals/Code/GameEngine/Include/Common/Errors.h @@ -44,10 +44,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 +64,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..1ea88f5335 100644 --- a/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h +++ b/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __FUNCTIONLEXICON_H_ -#define __FUNCTIONLEXICON_H_ - #include "Common/SubsystemInterface.h" #include "Common/NameKeyGenerator.h" #include "Common/GameMemory.h" @@ -149,6 +145,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..2b3ff8fbc2 100644 --- a/Generals/Code/GameEngine/Include/Common/GameCommon.h +++ b/Generals/Code/GameEngine/Include/Common/GameCommon.h @@ -46,10 +46,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef _GAMECOMMON_H_ -#define _GAMECOMMON_H_ - // ---------------------------------------------------------------------------------------------- #include "Lib/BaseType.h" #include "WWCommon.h" @@ -489,6 +485,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..b28340b224 100644 --- a/Generals/Code/GameEngine/Include/Common/GameEngine.h +++ b/Generals/Code/GameEngine/Include/Common/GameEngine.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, April 2001 #pragma once - -#ifndef _GAME_ENGINE_H_ -#define _GAME_ENGINE_H_ - #include "Common/SubsystemInterface.h" #include "Common/GameType.h" @@ -118,5 +114,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..3ad9d288f7 100644 --- a/Generals/Code/GameEngine/Include/Common/GameLOD.h +++ b/Generals/Code/GameEngine/Include/Common/GameLOD.h @@ -32,10 +32,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 +252,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..9810d7cdfc 100644 --- a/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAMESPYMISCPREFERENCES_H__ -#define __GAMESPYMISCPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -57,5 +53,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..fc34872645 100644 --- a/Generals/Code/GameEngine/Include/Common/GameState.h +++ b/Generals/Code/GameEngine/Include/Common/GameState.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAME_STATE_H_ -#define __GAME_STATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" #include "Common/Snapshot.h" @@ -238,6 +234,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..b8d5717e11 100644 --- a/Generals/Code/GameEngine/Include/Common/GameStateMap.h +++ b/Generals/Code/GameEngine/Include/Common/GameStateMap.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAME_STATE_MAP_H_ -#define __GAME_STATE_MAP_H_ - // INLCUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" #include "Common/SubsystemInterface.h" @@ -69,5 +65,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..ab4d21fa6b 100644 --- a/Generals/Code/GameEngine/Include/Common/GameType.h +++ b/Generals/Code/GameEngine/Include/Common/GameType.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, April 2001 #pragma once - -#ifndef _GAME_TYPE_H_ -#define _GAME_TYPE_H_ - #include "Lib/BaseType.h" // the default size of the world map @@ -192,6 +188,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..506b59eaf8 100644 --- a/Generals/Code/GameEngine/Include/Common/Geometry.h +++ b/Generals/Code/GameEngine/Include/Common/Geometry.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GEOMETRY_H_ -#define __GEOMETRY_H_ - #include "Lib/BaseType.h" #include "Common/AsciiString.h" #include "Common/Snapshot.h" @@ -195,6 +191,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..1368244842 100644 --- a/Generals/Code/GameEngine/Include/Common/GlobalData.h +++ b/Generals/Code/GameEngine/Include/Common/GlobalData.h @@ -28,10 +28,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 +582,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..41701fbb6c 100644 --- a/Generals/Code/GameEngine/Include/Common/Handicap.h +++ b/Generals/Code/GameEngine/Include/Common/Handicap.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef _HANDICAP_H_ -#define _HANDICAP_H_ - #include "Lib/BaseType.h" // ---------------------------------------------------------------------------------------------- @@ -117,5 +113,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..b662284c99 100644 --- a/Generals/Code/GameEngine/Include/Common/INI.h +++ b/Generals/Code/GameEngine/Include/Common/INI.h @@ -28,10 +28,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 +410,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..f4b8d4f269 100644 --- a/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h +++ b/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __IGNORE_PREFERENCES_H_ -#define __IGNORE_PREFERENCES_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -82,5 +78,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..35feb75e57 100644 --- a/Generals/Code/GameEngine/Include/Common/KindOf.h +++ b/Generals/Code/GameEngine/Include/Common/KindOf.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __KINDOF_H_ -#define __KINDOF_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" @@ -189,6 +185,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..a7b979fcf3 100644 --- a/Generals/Code/GameEngine/Include/Common/LadderPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/LadderPreferences.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __LADDERPREFERENCES_H__ -#define __LADDERPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -76,5 +72,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..d09f1f26f8 100644 --- a/Generals/Code/GameEngine/Include/Common/Language.h +++ b/Generals/Code/GameEngine/Include/Common/Language.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __LANGUAGE_H_ -#define __LANGUAGE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -102,6 +98,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..a0e970fc9b 100644 --- a/Generals/Code/GameEngine/Include/Common/LatchRestore.h +++ b/Generals/Code/GameEngine/Include/Common/LatchRestore.h @@ -29,10 +29,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 +107,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..a7bb54ceef 100644 --- a/Generals/Code/GameEngine/Include/Common/MapObject.h +++ b/Generals/Code/GameEngine/Include/Common/MapObject.h @@ -28,10 +28,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef MapObject_H -#define MapObject_H - #include "Common/Dict.h" #include "Common/GameMemory.h" #include "GameClient/TerrainRoads.h" @@ -170,6 +166,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..94bf82ac0a 100644 --- a/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h +++ b/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h @@ -27,10 +27,6 @@ // Author: John Ahlquist, October 2001 #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 +113,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..49c6c11060 100644 --- a/Generals/Code/GameEngine/Include/Common/MessageStream.h +++ b/Generals/Code/GameEngine/Include/Common/MessageStream.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, February 2001 #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 +802,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..c528135d86 100644 --- a/Generals/Code/GameEngine/Include/Common/MissionStats.h +++ b/Generals/Code/GameEngine/Include/Common/MissionStats.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef _MISSIONSTATS_H_ -#define _MISSIONSTATS_H_ - #include "Lib/BaseType.h" #include "Common/GameCommon.h" #include "Common/Snapshot.h" @@ -85,6 +81,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..90869ce714 100644 --- a/Generals/Code/GameEngine/Include/Common/ModelState.h +++ b/Generals/Code/GameEngine/Include/Common/ModelState.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, April 2001 #pragma once - -#ifndef _ModelState_H_ -#define _ModelState_H_ - #include "Lib/BaseType.h" #include "Common/INI.h" #include "Common/BitFlags.h" @@ -232,6 +228,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..173783e980 100644 --- a/Generals/Code/GameEngine/Include/Common/Module.h +++ b/Generals/Code/GameEngine/Include/Common/Module.h @@ -30,10 +30,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __MODULE_H_ -#define __MODULE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" @@ -314,7 +310,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..e10d8e2f2b 100644 --- a/Generals/Code/GameEngine/Include/Common/ModuleFactory.h +++ b/Generals/Code/GameEngine/Include/Common/ModuleFactory.h @@ -35,10 +35,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __MODULEFACTORY_H_ -#define __MODULEFACTORY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include @@ -126,6 +122,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..42fc6e313d 100644 --- a/Generals/Code/GameEngine/Include/Common/Money.h +++ b/Generals/Code/GameEngine/Include/Common/Money.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef _MONEY_H_ -#define _MONEY_H_ - #include "Lib/BaseType.h" #include "Common/Debug.h" #include "Common/Snapshot.h" @@ -106,6 +102,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..14d54c5db5 100644 --- a/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h +++ b/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _MULTIPLAYERSETTINGS_H_ -#define _MULTIPLAYERSETTINGS_H_ - #include "GameClient/Color.h" // FORWARD DECLARATIONS /////////////////////////////////////////////////////////////////////////// @@ -127,5 +123,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..f1babf0b37 100644 --- a/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h +++ b/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __NAMEKEYGENERATOR_H_ -#define __NAMEKEYGENERATOR_H_ - #include "Lib/BaseType.h" #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" @@ -160,6 +156,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..9c8750af0d 100644 --- a/Generals/Code/GameEngine/Include/Common/OSDisplay.h +++ b/Generals/Code/GameEngine/Include/Common/OSDisplay.h @@ -27,10 +27,6 @@ // Do Not Distribute #pragma once - -#ifndef __OSDISPLAY_H__ -#define __OSDISPLAY_H__ - #include "Lib/BaseType.h" class AsciiString; @@ -66,5 +62,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..3fe9aa4ae9 100644 --- a/Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h +++ b/Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __OBJECT_STATUS_TYPES_H -#define __OBJECT_STATUS_TYPES_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" @@ -125,5 +121,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..e3f84cbeb9 100644 --- a/Generals/Code/GameEngine/Include/Common/Overridable.h +++ b/Generals/Code/GameEngine/Include/Common/Overridable.h @@ -27,10 +27,6 @@ // Do Not Distribute #pragma once - -#ifndef _OVERRIDABLE_H_ -#define _OVERRIDABLE_H_ - #include "Common/GameMemory.h" /* @@ -124,6 +120,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..9330fbdb43 100644 --- a/Generals/Code/GameEngine/Include/Common/Override.h +++ b/Generals/Code/GameEngine/Include/Common/Override.h @@ -27,10 +27,6 @@ // Do Not Distribute #pragma once - -#ifndef _OVERRIDE_H_ -#define _OVERRIDE_H_ - #include "Common/Overridable.h" /* @@ -136,6 +132,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..86ee954589 100644 --- a/Generals/Code/GameEngine/Include/Common/PartitionSolver.h +++ b/Generals/Code/GameEngine/Include/Common/PartitionSolver.h @@ -38,9 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_PARTITIONSOLVER_ -#define _H_PARTITIONSOLVER_ - // INCLUDES /////////////////////////////////////////////////////////////////// // DEFINES //////////////////////////////////////////////////////////////////// @@ -83,5 +80,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..9503f458d8 100644 --- a/Generals/Code/GameEngine/Include/Common/PerfMetrics.h +++ b/Generals/Code/GameEngine/Include/Common/PerfMetrics.h @@ -27,10 +27,6 @@ // Do Not Distribute #pragma once - -#ifndef __PERFMETRICS_H__ -#define __PERFMETRICS_H__ - // For load timings enum { PERFMETRICS_LOAD_STARTFRAME = 0 }; enum { PERFMETRICS_LOAD_STOPFRAME = 1 }; @@ -42,7 +38,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..1faae0a4ed 100644 --- a/Generals/Code/GameEngine/Include/Common/PerfTimer.h +++ b/Generals/Code/GameEngine/Include/Common/PerfTimer.h @@ -27,10 +27,6 @@ // July 2002 #pragma once - -#ifndef __PERFTIMER_H__ -#define __PERFTIMER_H__ - #include "Utility/intrin_compat.h" #if defined(RTS_DEBUG) @@ -315,5 +311,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..d5534f08bf 100644 --- a/Generals/Code/GameEngine/Include/Common/Player.h +++ b/Generals/Code/GameEngine/Include/Common/Player.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef _PLAYER_H_ -#define _PLAYER_H_ - #include "Common/Debug.h" #include "Common/Energy.h" #include "Common/GameType.h" @@ -793,5 +789,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..4d05e59831 100644 --- a/Generals/Code/GameEngine/Include/Common/PlayerList.h +++ b/Generals/Code/GameEngine/Include/Common/PlayerList.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef _PLAYERLIST_H_ -#define _PLAYERLIST_H_ - #include "Common/SubsystemInterface.h" #include "Common/GameCommon.h" #include "Common/NameKeyGenerator.h" @@ -171,5 +167,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..25bdff4f6d 100644 --- a/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h +++ b/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef _PLAYERTEMPLATE_H_ -#define _PLAYERTEMPLATE_H_ - #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" #include "Common/Debug.h" @@ -214,5 +210,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..a432a03a34 100644 --- a/Generals/Code/GameEngine/Include/Common/ProductionPrerequisite.h +++ b/Generals/Code/GameEngine/Include/Common/ProductionPrerequisite.h @@ -41,10 +41,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef __ProductionPrerequisite_H_ -#define __ProductionPrerequisite_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -121,5 +117,3 @@ class ProductionPrerequisite }; //----------------------------------------------------------------------------- - -#endif diff --git a/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h b/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h index 38301af8b6..79004a0f75 100644 --- a/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __QUICKMATCHPREFERENCES_H__ -#define __QUICKMATCHPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -78,5 +74,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..b5e2400652 100644 --- a/Generals/Code/GameEngine/Include/Common/QuotedPrintable.h +++ b/Generals/Code/GameEngine/Include/Common/QuotedPrintable.h @@ -28,14 +28,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..7e5532b98d 100644 --- a/Generals/Code/GameEngine/Include/Common/Radar.h +++ b/Generals/Code/GameEngine/Include/Common/Radar.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __RADAR_H_ -#define __RADAR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/SubsystemInterface.h" @@ -311,8 +307,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/Registry.h b/Generals/Code/GameEngine/Include/Common/Registry.h index fff1c836aa..731ce4cc0e 100644 --- a/Generals/Code/GameEngine/Include/Common/Registry.h +++ b/Generals/Code/GameEngine/Include/Common/Registry.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, December 2001 #pragma once - -#ifndef __REGISTRY_H__ -#define __REGISTRY_H__ - #include /** @@ -47,5 +43,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..b56b1b3f1a 100644 --- a/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h +++ b/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef RESOURCE_GATHER_MANAGER_H -#define RESOURCE_GATHER_MANAGER_H - #include "Common/GameType.h" #include "Common/Snapshot.h" @@ -72,5 +68,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..634d646704 100644 --- a/Generals/Code/GameEngine/Include/Common/STLTypedefs.h +++ b/Generals/Code/GameEngine/Include/Common/STLTypedefs.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef __STLTYPEDEFS_H__ -#define __STLTYPEDEFS_H__ - //----------------------------------------------------------------------------- // srj sez: this must come first, first, first. #define _STLP_USE_NEWALLOC 1 @@ -297,5 +293,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..dff3f35472 100644 --- a/Generals/Code/GameEngine/Include/Common/Science.h +++ b/Generals/Code/GameEngine/Include/Common/Science.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SCIENCE_H_ -#define __SCIENCE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Overridable.h" #include "Common/NameKeyGenerator.h" @@ -134,7 +130,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..24a6c67d1d 100644 --- a/Generals/Code/GameEngine/Include/Common/ScopedMutex.h +++ b/Generals/Code/GameEngine/Include/Common/ScopedMutex.h @@ -22,10 +22,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SCOPEDMUTEX_H__ -#define __SCOPEDMUTEX_H__ - class ScopedMutex { private: @@ -42,5 +38,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..a400156ec3 100644 --- a/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h +++ b/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SCOREKEEPER_H_ -#define __SCOREKEEPER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -141,5 +137,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..79dad0ebbf 100644 --- a/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h +++ b/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SKIRMISHBATTLEHONORS_H__ -#define __SKIRMISHBATTLEHONORS_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -96,5 +92,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..ef4fb200c7 100644 --- a/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SKIRMISHPREFERENCES_H__ -#define __SKIRMISHPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -58,5 +54,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..4ba10885d9 100644 --- a/Generals/Code/GameEngine/Include/Common/Snapshot.h +++ b/Generals/Code/GameEngine/Include/Common/Snapshot.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SNAPSHOT_H_ -#define __SNAPSHOT_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" @@ -68,6 +64,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..4743dc2cad 100644 --- a/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h +++ b/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SparseMatchFinder_H_ -#define __SparseMatchFinder_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/BitFlags.h" #include "Common/STLTypedefs.h" @@ -243,6 +239,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..0cc873484c 100644 --- a/Generals/Code/GameEngine/Include/Common/SpecialPower.h +++ b/Generals/Code/GameEngine/Include/Common/SpecialPower.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SPECIALPOWER_H_ -#define __SPECIALPOWER_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameMemory.h" @@ -188,5 +184,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..997f9cf590 100644 --- a/Generals/Code/GameEngine/Include/Common/SpecialPowerMaskType.h +++ b/Generals/Code/GameEngine/Include/Common/SpecialPowerMaskType.h @@ -27,13 +27,8 @@ // 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..899cd3b4c4 100644 --- a/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h +++ b/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h @@ -27,9 +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 +94,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..dc1f4779af 100644 --- a/Generals/Code/GameEngine/Include/Common/StackDump.h +++ b/Generals/Code/GameEngine/Include/Common/StackDump.h @@ -23,10 +23,6 @@ //////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __STACKDUMP_H_ -#define __STACKDUMP_H_ - #ifndef IG_DEGBUG_STACKTRACE #define IG_DEBUG_STACKTRACE 1 #endif @@ -70,6 +66,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..b04c43c672 100644 --- a/Generals/Code/GameEngine/Include/Common/StateMachine.h +++ b/Generals/Code/GameEngine/Include/Common/StateMachine.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, January 2002 #pragma once - -#ifndef _STATE_MACHINE_H_ -#define _STATE_MACHINE_H_ - #include "Common/GameMemory.h" #include "Common/GameType.h" #include "Common/ModelState.h" @@ -486,6 +482,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..72689cd45c 100644 --- a/Generals/Code/GameEngine/Include/Common/StatsCollector.h +++ b/Generals/Code/GameEngine/Include/Common/StatsCollector.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __STATSCOLLECTOR_H_ -#define __STATSCOLLECTOR_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -119,5 +115,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..441f9baea3 100644 --- a/Generals/Code/GameEngine/Include/Common/SubsystemInterface.h +++ b/Generals/Code/GameEngine/Include/Common/SubsystemInterface.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SUBSYSTEMINTERFACE_H_ -#define __SUBSYSTEMINTERFACE_H_ - #include "Common/INI.h" #include "Common/STLTypedefs.h" @@ -165,6 +161,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..e121acc905 100644 --- a/Generals/Code/GameEngine/Include/Common/SystemInfo.h +++ b/Generals/Code/GameEngine/Include/Common/SystemInfo.h @@ -27,12 +27,4 @@ // Author: John K. McDonald, December 2002 #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..198ef93826 100644 --- a/Generals/Code/GameEngine/Include/Common/Team.h +++ b/Generals/Code/GameEngine/Include/Common/Team.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, Steven Johnson, March 2001 #pragma once - -#ifndef _TEAM_H_ -#define _TEAM_H_ - #include "Common/GameType.h" #include "Common/Snapshot.h" #include "Common/Thing.h" @@ -756,5 +752,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..9ba238e4cd 100644 --- a/Generals/Code/GameEngine/Include/Common/Terrain.h +++ b/Generals/Code/GameEngine/Include/Common/Terrain.h @@ -31,15 +31,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..0e054b78f7 100644 --- a/Generals/Code/GameEngine/Include/Common/TerrainTypes.h +++ b/Generals/Code/GameEngine/Include/Common/TerrainTypes.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TERRAINTYPE_H_ -#define __TERRAINTYPE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "Common/SubsystemInterface.h" @@ -205,6 +201,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..faa8caf8ec 100644 --- a/Generals/Code/GameEngine/Include/Common/Thing.h +++ b/Generals/Code/GameEngine/Include/Common/Thing.h @@ -47,10 +47,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef __THING_H_ -#define __THING_H_ - //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -197,6 +193,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..30c5e7396d 100644 --- a/Generals/Code/GameEngine/Include/Common/ThingFactory.h +++ b/Generals/Code/GameEngine/Include/Common/ThingFactory.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __THINGFACTORY_H_ -#define __THINGFACTORY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" @@ -134,7 +130,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..debdd1d15c 100644 --- a/Generals/Code/GameEngine/Include/Common/ThingSort.h +++ b/Generals/Code/GameEngine/Include/Common/ThingSort.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __THINGSORT_H_ -#define __THINGSORT_H_ - #include "GameCommon.h" //------------------------------------------------------------------------------------------------- @@ -78,6 +74,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..8db9e1a70d 100644 --- a/Generals/Code/GameEngine/Include/Common/ThingTemplate.h +++ b/Generals/Code/GameEngine/Include/Common/ThingTemplate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __THINGTEMPLATE_H_ -#define __THINGTEMPLATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" @@ -765,6 +761,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..0156a532d3 100644 --- a/Generals/Code/GameEngine/Include/Common/TunnelTracker.h +++ b/Generals/Code/GameEngine/Include/Common/TunnelTracker.h @@ -28,10 +28,6 @@ // Author: Graham Smallwood, March, 2002 #pragma once - -#ifndef TUNNEL_TRACKER_H -#define TUNNEL_TRACKER_H - #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/Snapshot.h" @@ -95,5 +91,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..f13928b5ac 100644 --- a/Generals/Code/GameEngine/Include/Common/Upgrade.h +++ b/Generals/Code/GameEngine/Include/Common/Upgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __UPGRADE_H_ -#define __UPGRADE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" @@ -263,5 +259,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..d34af4f388 100644 --- a/Generals/Code/GameEngine/Include/Common/UserPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/UserPreferences.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __USERPREFERENCES_H__ -#define __USERPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -167,5 +163,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..e8d9331189 100644 --- a/Generals/Code/GameEngine/Include/Common/WellKnownKeys.h +++ b/Generals/Code/GameEngine/Include/Common/WellKnownKeys.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _H_WELLKNOWNKEYS -#define _H_WELLKNOWNKEYS - #include "Common/NameKeyGenerator.h" #ifdef INSTANTIATE_WELL_KNOWN_KEYS @@ -846,5 +842,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..9904004b62 100644 --- a/Generals/Code/GameEngine/Include/Common/encrypt.h +++ b/Generals/Code/GameEngine/Include/Common/encrypt.h @@ -27,17 +27,9 @@ // Author: Anonymous #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..889b4fc001 100644 --- a/Generals/Code/GameEngine/Include/Common/version.h +++ b/Generals/Code/GameEngine/Include/Common/version.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, November 2001 #pragma once - -#ifndef __VERSION_H__ -#define __VERSION_H__ - #include /** @@ -120,5 +116,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..bced1ca822 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Anim2D.h +++ b/Generals/Code/GameEngine/Include/GameClient/Anim2D.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ANIM_2D_H_ -#define __ANIM_2D_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" @@ -222,5 +218,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..1edce24500 100644 --- a/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h +++ b/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h @@ -46,10 +46,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ANIMATEWINDOWMANAGER_H_ -#define __ANIMATEWINDOWMANAGER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -236,5 +232,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..e3da06d63b 100644 --- a/Generals/Code/GameEngine/Include/GameClient/CDCheck.h +++ b/Generals/Code/GameEngine/Include/GameClient/CDCheck.h @@ -28,13 +28,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..4551509f40 100644 --- a/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h +++ b/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CAMPAIGN_MANAGER_H_ -#define __CAMPAIGN_MANAGER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -164,5 +160,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..02c9ff08cc 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Color.h +++ b/Generals/Code/GameEngine/Include/GameClient/Color.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __COLOR_H_ -#define __COLOR_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -88,6 +84,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..009ff19315 100644 --- a/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, Dec 2001 #pragma once - -#ifndef _H_CommandXlat -#define _H_CommandXlat - #include "GameClient/InGameUI.h" enum GUICommandType CPP_11(: Int); @@ -124,5 +120,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..1379ac1de4 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CONTROLBAR_H_ -#define __CONTROLBAR_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameType.h" @@ -1029,6 +1025,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..0fa6b9ca44 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ControlBarResizer.h +++ b/Generals/Code/GameEngine/Include/GameClient/ControlBarResizer.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CONTROL_BAR_RESIZER_H_ -#define __CONTROL_BAR_RESIZER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -103,5 +99,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..ff322e3c3c 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h +++ b/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CONTROL_BAR_SCHEME_H_ -#define __CONTROL_BAR_SCHEME_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -287,5 +283,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..d40a94fdef 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Credits.h +++ b/Generals/Code/GameEngine/Include/GameClient/Credits.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CREDITS_H_ -#define __CREDITS_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -165,4 +161,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..6d221bb058 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Diplomacy.h +++ b/Generals/Code/GameEngine/Include/GameClient/Diplomacy.h @@ -27,14 +27,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..437990fd41 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h +++ b/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h @@ -24,10 +24,6 @@ #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..52a18c4947 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Display.h +++ b/Generals/Code/GameEngine/Include/GameClient/Display.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, March 2001 #pragma once - -#ifndef _GAME_DISPLAY_H_ -#define _GAME_DISPLAY_H_ - #include #include "Common/SubsystemInterface.h" #include "View.h" @@ -234,6 +230,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..c873308015 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DisplayString.h +++ b/Generals/Code/GameEngine/Include/GameClient/DisplayString.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DISPLAYSTRING_H_ -#define __DISPLAYSTRING_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -129,6 +125,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..3373a18537 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DisplayStringManager.h +++ b/Generals/Code/GameEngine/Include/GameClient/DisplayStringManager.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DISPLAYSTRINGMANAGER_H_ -#define __DISPLAYSTRINGMANAGER_H_ - #include "Common/SubsystemInterface.h" #include "GameClient/DisplayString.h" @@ -66,6 +62,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..f5f48b58e6 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DrawGroupInfo.h +++ b/Generals/Code/GameEngine/Include/GameClient/DrawGroupInfo.h @@ -27,9 +27,6 @@ // Author: John K. McDonald, March 2002 #pragma once -#ifndef _H_DRAWGROUPINFO_ -#define _H_DRAWGROUPINFO_ - struct DrawGroupInfo { AsciiString m_fontName; @@ -64,5 +61,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..8f35480ec7 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Drawable.h +++ b/Generals/Code/GameEngine/Include/GameClient/Drawable.h @@ -27,9 +27,6 @@ // Author: Michael S. Booth, March 2001 #pragma once -#ifndef _DRAWABLE_H_ -#define _DRAWABLE_H_ - #include "Common/AudioEventRTS.h" #include "Common/GameType.h" #include "Common/ModelState.h" @@ -760,5 +757,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..151bd86e99 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DrawableInfo.h +++ b/Generals/Code/GameEngine/Include/GameClient/DrawableInfo.h @@ -27,9 +27,6 @@ // Author: Mark Wilczynski, August 2002 #pragma once -#ifndef _DRAWABLEINFO_H_ -#define _DRAWABLEINFO_H_ - #include "Common/GameType.h" class Drawable; @@ -55,5 +52,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..5d00949f54 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETCOMBOBOX_H_ -#define __GADGETCOMBOBOX_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -193,6 +189,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..5d0c3f290a 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETLISTBOX_H_ -#define __GADGETLISTBOX_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -208,6 +204,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..7e98adb5cc 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetProgressBar.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetProgressBar.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETPROGRESSBAR_H_ -#define __GADGETPROGRESSBAR_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -141,6 +137,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..d93bb32bb4 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetPushButton.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetPushButton.h @@ -57,10 +57,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETPUSHBUTTON_H_ -#define __GADGETPUSHBUTTON_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -172,6 +168,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..0033e3d9bf 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetRadioButton.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetRadioButton.h @@ -63,10 +63,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETRADIOBUTTON_H_ -#define __GADGETRADIOBUTTON_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -147,6 +143,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..537dc408e2 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetSlider.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetSlider.h @@ -52,10 +52,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETSLIDER_H_ -#define __GADGETSLIDER_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -440,6 +436,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..f9e919fe78 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetStaticText.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetStaticText.h @@ -54,10 +54,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETSTATICTEXT_H_ -#define __GADGETSTATICTEXT_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -101,6 +97,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..018b57739d 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetTabControl.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetTabControl.h @@ -43,10 +43,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETTABCONTROL_H_ -#define __GADGETTABCONTROL_H_ - enum { GTC_BACKGROUND = 0, @@ -274,6 +270,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..2b55591f57 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetTextEntry.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetTextEntry.h @@ -49,10 +49,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETTEXTENTRY_H_ -#define __GADGETTEXTENTRY_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -124,6 +120,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..e2d95d79fb 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameClient.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameClient.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, March 2001 #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 +271,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..ef4e45720b 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameFont.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameFont.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAMEFONT_H_ -#define __GAMEFONT_H_ - #include "Common/SubsystemInterface.h" #include "Lib/BaseType.h" #include "Common/AsciiString.h" @@ -106,6 +102,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..b6d6fe2f60 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameInfoWindow.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameInfoWindow.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAMEINFOWINDOW_H_ -#define __GAMEINFOWINDOW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/GameWindow.h" #include "GameNetwork/LANGameInfo.h" @@ -41,6 +37,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..fd109d480b 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameWindow.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameWindow.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAMEWINDOW_H_ -#define __GAMEWINDOW_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -502,6 +498,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..dfffde2351 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameWindowGlobal.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameWindowGlobal.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAMEWINDOWGLOBAL_H_ -#define __GAMEWINDOWGLOBAL_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -64,6 +60,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..94f0048839 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameWindowID.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameWindowID.h @@ -46,10 +46,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAMEWINDOWID_H_ -#define __GAMEWINDOWID_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -84,6 +80,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..2837e69afd 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAME_WINDOW_TRANSITIONS_H_ -#define __GAME_WINDOW_TRANSITIONS_H_ - #include "Common/GameCommon.h" //----------------------------------------------------------------------------- @@ -696,5 +692,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..9d4a8eb27e 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GlobalLanguage.h +++ b/Generals/Code/GameEngine/Include/GameClient/GlobalLanguage.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GLOBAL_LANGUAGE_H_ -#define __GLOBAL_LANGUAGE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -122,4 +118,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..fcbce3d5cb 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GraphDraw.h +++ b/Generals/Code/GameEngine/Include/GameClient/GraphDraw.h @@ -47,9 +47,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once -#ifndef __GRAPHDRAW_H__ -#define __GRAPHDRAW_H__ - #include "Common/PerfTimer.h" #include "Common/STLTypedefs.h" @@ -85,6 +82,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..ff80a5ede3 100644 --- a/Generals/Code/GameEngine/Include/GameClient/HeaderTemplate.h +++ b/Generals/Code/GameEngine/Include/GameClient/HeaderTemplate.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HEADER_TEMPLATE_H_ -#define __HEADER_TEMPLATE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -116,4 +112,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..a3b7645c92 100644 --- a/Generals/Code/GameEngine/Include/GameClient/HintSpy.h +++ b/Generals/Code/GameEngine/Include/GameClient/HintSpy.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, Dec 2001 #pragma once - -#ifndef _H_HintSpy -#define _H_HintSpy - #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- @@ -39,5 +35,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..31b083551c 100644 --- a/Generals/Code/GameEngine/Include/GameClient/HotKey.h +++ b/Generals/Code/GameEngine/Include/GameClient/HotKey.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HOT_KEY_H_ -#define __HOT_KEY_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -113,6 +109,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..97e5220729 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Image.h +++ b/Generals/Code/GameEngine/Include/GameClient/Image.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __IMAGE_H_ -#define __IMAGE_H_ - #include "Common/AsciiString.h" #include "Common/GameMemory.h" #include "Common/SubsystemInterface.h" @@ -167,6 +163,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..0e41a22a34 100644 --- a/Generals/Code/GameEngine/Include/GameClient/InGameUI.h +++ b/Generals/Code/GameEngine/Include/GameClient/InGameUI.h @@ -29,10 +29,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 +905,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..880aca6a73 100644 --- a/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h +++ b/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h @@ -52,10 +52,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __KEYDEFS_H_ -#define __KEYDEFS_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #ifndef DIRECTINPUT_VERSION @@ -257,5 +253,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..ec7d63148b 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Keyboard.h +++ b/Generals/Code/GameEngine/Include/GameClient/Keyboard.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __KEYBOARD_H_ -#define __KEYBOARD_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -168,5 +164,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..75bed70586 100644 --- a/Generals/Code/GameEngine/Include/GameClient/LanguageFilter.h +++ b/Generals/Code/GameEngine/Include/GameClient/LanguageFilter.h @@ -24,10 +24,6 @@ #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..f03a23cb18 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Line2D.h +++ b/Generals/Code/GameEngine/Include/GameClient/Line2D.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __LINE2D_H_ -#define __LINE2D_H_ - typedef std::vector Coord2DVector; typedef std::vector Coord3DVector; @@ -85,7 +81,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..f9fff7dbd3 100644 --- a/Generals/Code/GameEngine/Include/GameClient/LoadScreen.h +++ b/Generals/Code/GameEngine/Include/GameClient/LoadScreen.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _LOADSCREEN_H_ -#define _LOADSCREEN_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -244,5 +240,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..1e6e1b1df5 100644 --- a/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, Dec 2001 #pragma once - -#ifndef _H_LookAtXlat -#define _H_LookAtXlat - #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- @@ -91,5 +87,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..8510415f3a 100644 --- a/Generals/Code/GameEngine/Include/GameClient/MapUtil.h +++ b/Generals/Code/GameEngine/Include/GameClient/MapUtil.h @@ -28,10 +28,6 @@ //////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __MAPUTIL_H__ -#define __MAPUTIL_H__ - #include "Common/AsciiString.h" #include "Common/UnicodeString.h" @@ -132,4 +128,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..5685b0f462 100644 --- a/Generals/Code/GameEngine/Include/GameClient/MessageBox.h +++ b/Generals/Code/GameEngine/Include/GameClient/MessageBox.h @@ -28,10 +28,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 +43,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..ebce69bb7e 100644 --- a/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h +++ b/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, Dec 2001 #pragma once - -#ifndef _H_MetaEvent -#define _H_MetaEvent - #include "Common/SubsystemInterface.h" #include "GameClient/InGameUI.h" @@ -402,5 +398,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..97e92cdaff 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h +++ b/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ANIMPARTICLESYSBONEUPDATE_H_ -#define __ANIMPARTICLESYSBONEUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" @@ -59,6 +55,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..e60dafc942 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h +++ b/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BEACONCLIENTUPDATE_H_ -#define __BEACONCLIENTUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" @@ -75,6 +71,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..cb491d73c7 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h +++ b/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SWAYCLIENTUPDATE_H_ -#define __SWAYCLIENTUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" @@ -70,6 +66,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..e0f99ad67c 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Mouse.h +++ b/Generals/Code/GameEngine/Include/GameClient/Mouse.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __MOUSE_H_ -#define __MOUSE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -440,5 +436,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..3a8c65e5bf 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h +++ b/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _PARTICLE_SYS_H_ -#define _PARTICLE_SYS_H_ - #include #include "Common/AsciiString.h" #include "Common/GameMemory.h" @@ -829,6 +825,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..30d723e7e1 100644 --- a/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h +++ b/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, Dec 2001 #pragma once - -#ifndef _H_PlaceEventTranslator -#define _H_PlaceEventTranslator - #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- @@ -43,5 +39,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..2ffc8b35f1 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h +++ b/Generals/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h @@ -49,10 +49,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __PROCESSANIMATEWINDOW_H_ -#define __PROCESSANIMATEWINDOW_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -265,5 +261,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..b99d6d0634 100644 --- a/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h +++ b/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h @@ -26,10 +26,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _RadiusDecal_H_ -#define _RadiusDecal_H_ - #include "Common/GameCommon.h" #include "Common/GameType.h" #include "GameClient/Color.h" @@ -91,5 +87,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..f01fc68100 100644 --- a/Generals/Code/GameEngine/Include/GameClient/RayEffect.h +++ b/Generals/Code/GameEngine/Include/GameClient/RayEffect.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __RAYEFFECT_H_ -#define __RAYEFFECT_H_ - // INCLUDE //////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/SubsystemInterface.h" @@ -91,6 +87,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..22e9dee20f 100644 --- a/Generals/Code/GameEngine/Include/GameClient/SelectionInfo.h +++ b/Generals/Code/GameEngine/Include/GameClient/SelectionInfo.h @@ -27,10 +27,6 @@ // Author: John McDonald, Jr, October 2002 #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 +96,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..6bae7f4708 100644 --- a/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, Dec 2001 #pragma once - -#ifndef _H_SelectionXlat -#define _H_SelectionXlat - #include "GameClient/InGameUI.h" class ThingTemplate; @@ -75,5 +71,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..96e28766e7 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Shadow.h +++ b/Generals/Code/GameEngine/Include/GameClient/Shadow.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SHADOW_H_ -#define __SHADOW_H_ - // // skeleton definition of shadow types // @@ -213,6 +209,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..762a3199be 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Shell.h +++ b/Generals/Code/GameEngine/Include/GameClient/Shell.h @@ -93,10 +93,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SHELL_H_ -#define __SHELL_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// // FORWARD REFERENCES ///////////////////////////////////////////////////////////////////////////// @@ -206,6 +202,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..c543127a74 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ShellHooks.h +++ b/Generals/Code/GameEngine/Include/GameClient/ShellHooks.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, October 2002 #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 +78,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..47ec5f4ca2 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ShellMenuScheme.h +++ b/Generals/Code/GameEngine/Include/GameClient/ShellMenuScheme.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SHELL_MENU_SCHEME_H_ -#define __SHELL_MENU_SCHEME_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -153,5 +149,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..bd8cb8f77d 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Statistics.h +++ b/Generals/Code/GameEngine/Include/GameClient/Statistics.h @@ -38,9 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_STATISTICS_ -#define _H_STATISTICS_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" @@ -62,5 +59,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..109bcb65cb 100644 --- a/Generals/Code/GameEngine/Include/GameClient/TerrainRoads.h +++ b/Generals/Code/GameEngine/Include/GameClient/TerrainRoads.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TERRAINROADS_H_ -#define __TERRAINROADS_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "Common/SubsystemInterface.h" @@ -230,5 +226,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..32854ca6a7 100644 --- a/Generals/Code/GameEngine/Include/GameClient/TerrainVisual.h +++ b/Generals/Code/GameEngine/Include/GameClient/TerrainVisual.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TERRAINVISUAL_H_ -#define __TERRAINVISUAL_H_ - #include "Common/Terrain.h" #include "Common/Snapshot.h" @@ -174,5 +170,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..4f6c3072f6 100644 --- a/Generals/Code/GameEngine/Include/GameClient/View.h +++ b/Generals/Code/GameEngine/Include/GameClient/View.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _VIEW_H_ -#define _VIEW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Snapshot.h" @@ -337,5 +333,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..49d2859ffd 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Water.h +++ b/Generals/Code/GameEngine/Include/GameClient/Water.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WATER_H_ -#define __WATER_H_ - // INLCLUDES ////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Overridable.h" @@ -125,6 +121,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..f4453c50f6 100644 --- a/Generals/Code/GameEngine/Include/GameClient/WinInstanceData.h +++ b/Generals/Code/GameEngine/Include/GameClient/WinInstanceData.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WININSTANCEDATA_H_ -#define __WININSTANCEDATA_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -216,6 +212,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..ec4aba021a 100644 --- a/Generals/Code/GameEngine/Include/GameClient/WindowLayout.h +++ b/Generals/Code/GameEngine/Include/GameClient/WindowLayout.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WINDOWLAYOUT_H_ -#define __WINDOWLAYOUT_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameClient/GameWindow.h" @@ -121,6 +117,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..2b4e5d7e67 100644 --- a/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, Dec 2001 #pragma once - -#ifndef _H_WindowXlat -#define _H_WindowXlat - #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- @@ -42,5 +38,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..3970de22be 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AI.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AI.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, November 2000 #pragma once - -#ifndef _AI_H_ -#define _AI_H_ - #include "Common/Snapshot.h" #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" @@ -1014,6 +1010,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..e2e008e8e6 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIDock.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIDock.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, February 2002 #pragma once - -#ifndef _AI_DOCK_H_ -#define _AI_DOCK_H_ - #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" @@ -203,6 +199,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..2e726760a6 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h @@ -38,9 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_AIGUARD_ -#define _H_AIGUARD_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" @@ -263,5 +260,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..e38a2e15e8 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, October 2001 #pragma once - -#ifndef _PATHFIND_H_ -#define _PATHFIND_H_ - #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/Snapshot.h" @@ -980,6 +976,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..e5b72507ce 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, January 2002 #pragma once - -#ifndef _AI_PLAYER_H_ -#define _AI_PLAYER_H_ - #include "Common/GameMemory.h" #include "Common/Snapshot.h" @@ -293,8 +289,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..80a8188632 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, January 2002 #pragma once - -#ifndef _AI_SKIRMISH_PLAYER_H_ -#define _AI_SKIRMISH_PLAYER_H_ - #include "Common/GameMemory.h" #include "GameLogic/AIPlayer.h" @@ -118,8 +114,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..ca71b9b216 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, January 2002 #pragma once - -#ifndef _AI_STATE_MACHINE_H_ -#define _AI_STATE_MACHINE_H_ - #include "Lib/BaseType.h" #include "Common/AudioEventRTS.h" @@ -1263,5 +1259,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..6f8100ae79 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h @@ -38,9 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_AITNGUARD_ -#define _H_AITNGUARD_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" @@ -246,5 +243,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..1ac0804d9c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Armor.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Armor.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _Armor_H_ -#define _Armor_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" #include "Common/STLTypedefs.h" @@ -129,6 +125,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..2f3870136f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h @@ -25,10 +25,6 @@ // ArmorSet.h #pragma once - -#ifndef _ArmorSet_H_ -#define _ArmorSet_H_ - #include "Lib/BaseType.h" #include "Common/GameType.h" #include "Common/SparseMatchFinder.h" @@ -93,5 +89,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..c451dc62ec 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h +++ b/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h @@ -28,10 +28,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 +69,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..6c2ae77d41 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h +++ b/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h @@ -28,10 +28,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 +109,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..bd043b9cbd 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Damage.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Damage.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DAMAGE_H_ -#define __DAMAGE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Snapshot.h" @@ -354,6 +350,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..c9282ae551 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h @@ -28,10 +28,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 +71,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..6b78edbf91 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/FPUControl.h +++ b/Generals/Code/GameEngine/Include/GameLogic/FPUControl.h @@ -28,15 +28,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..74dbc0a86f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h +++ b/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h @@ -28,10 +28,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 +87,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..99226923ef 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h +++ b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h @@ -28,10 +28,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 +421,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..671e37ec47 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h +++ b/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h @@ -28,10 +28,6 @@ // Author: Mark Wilczynski, August 2002 #pragma once - -#ifndef _GHOSTOBJECT_H_ -#define _GHOSTOBJECT_H_ - #include "Lib/BaseType.h" #include "Common/Snapshot.h" @@ -113,5 +109,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..1290793b61 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __Locomotor_H_ -#define __Locomotor_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" #include "Common/Override.h" @@ -495,6 +491,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..4384c4527a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h +++ b/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h @@ -28,10 +28,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 +106,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..549520b235 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, 2001-2002 #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 +783,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..3ab87c62d3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ACTIVEBODY_H_ -#define __ACTIVEBODY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DamageFX.h" #include "GameLogic/Module/BodyModule.h" @@ -152,6 +148,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..e6379b8254 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ACTIVE_SHROUD_UPGRADE_H_ -#define __ACTIVE_SHROUD_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -75,6 +71,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..6619ebbf91 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ARMOR_UPGRADE_H_ -#define __ARMOR_UPGRADE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -90,5 +86,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..e501d0f0bc 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h @@ -29,10 +29,6 @@ // injured troops to return to the transport for healing purposes. #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 +119,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..22787c6446 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _ASSISTED_TARGETING_UPDATE_H -#define _ASSISTED_TARGETING_UPDATE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -76,6 +72,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..87e7600d51 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __AUTO_DEPOSIT_UPDATE_H_ -#define __AUTO_DEPOSIT_UPDATE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -131,5 +127,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..8d63165ae8 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h @@ -28,10 +28,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 +76,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..a7db00bcc6 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h @@ -32,10 +32,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __AutoHealBehavior_H_ -#define __AutoHealBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/BehaviorModule.h" @@ -177,6 +173,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..fb16d40ab5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BAIKONUR_LAUNCH_POWER_H_ -#define __BAIKONUR_LAUNCH_POWER_H_ - #include "GameLogic/Module/SpecialPowerModule.h" class Object; @@ -85,5 +81,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..b820adc3c7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h @@ -28,10 +28,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 +77,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..8b5c0990ab 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h @@ -28,10 +28,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 +186,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..04f10304c1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BehaviorModule_H_ -#define __BehaviorModule_H_ - #include "Common/GameType.h" #include "Common/Module.h" @@ -263,5 +259,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..5320b6972a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BODYMODULE_H_ -#define __BODYMODULE_H_ - #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/ArmorSet.h" @@ -293,5 +289,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..d4285a12dd 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BONEFXDAMAGE_H_ -#define __BONEFXDAMAGE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DamageModule.h" @@ -66,5 +62,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..d0910dcaf0 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BONEFXUPDATE_H_ -#define __BONEFXUPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/UpdateModule.h" @@ -277,5 +273,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..94da620653 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BRIDGE_BEHAVIOR_H_ -#define __BRIDGE_BEHAVIOR_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameClient/TerrainRoads.h" @@ -197,5 +193,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..fa49b47223 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h @@ -28,10 +28,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 +108,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..cb1726bdca 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h @@ -28,10 +28,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 +91,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..0fe147ed16 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h @@ -43,10 +43,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CashBountyPower_H_ -#define __CashBountyPower_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -127,5 +123,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..26a358f604 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CASHHACKSPECIALPOWER_H_ -#define __CASHHACKSPECIALPOWER_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" @@ -85,6 +81,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..63ac29ca77 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h @@ -30,10 +30,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CAVE_CONTAIN_H_ -#define __CAVE_CONTAIN_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" #include "GameLogic/Module/OpenContain.h" @@ -126,5 +122,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..48fa5fd8c7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef CHECKPOINT_UPDATE_H -#define CHECKPOINT_UPDATE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" @@ -88,6 +84,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..dfbc1f61ba 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, June 2002 #pragma once - -#ifndef _ChinookAIUpdate_H_ -#define _ChinookAIUpdate_H_ - #include "GameLogic/AIStateMachine.h" #include "GameLogic/Module/SupplyTruckAIUpdate.h" @@ -122,6 +118,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..4958f84b99 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h @@ -42,10 +42,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CLEANUP_AREA_POWER_H_ -#define __CLEANUP_AREA_POWER_H_ - //----------------------------------------------------------------------------- #include "GameLogic/Module/SpecialPowerModule.h" @@ -75,5 +71,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..4e5a1f7748 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h @@ -28,10 +28,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 +87,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..9511d3e42e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CollideModule_H_ -#define __CollideModule_H_ - #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" @@ -100,5 +96,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..b2e447867e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h @@ -28,10 +28,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 +81,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..c4ec21959f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _COMMAND_SET_UPGRADE_H -#define _COMMAND_SET_UPGRADE_H - #include "GameLogic/Module/UpgradeModule.h" //----------------------------------------------------------------------------- @@ -65,6 +61,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..d418ec1410 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ContainModule_H_ -#define __ContainModule_H_ - #include "Common/Module.h" //------------------------------------------------------------------------------------------------- @@ -183,5 +179,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..f8dbe26eb4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h @@ -29,10 +29,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 +85,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..541e1b6f22 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h @@ -32,10 +32,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 +79,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..11955e93e2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __COST_MODIFIER_UPGRADE_H_ -#define __COST_MODIFIER_UPGRADE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -115,5 +111,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..e6acb9a9b7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef CRATE_COLLIDE_H_ -#define CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" @@ -93,5 +89,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..3eb6e770ed 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h @@ -28,10 +28,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 +92,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..9a7f1ac2f3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CreateModule_H_ -#define __CreateModule_H_ - #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" @@ -85,5 +81,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..945935304a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h @@ -28,10 +28,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 +67,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..a9ba1d0cc6 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CrushDie_H_ -#define __CrushDie_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" @@ -101,6 +97,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..23d83e5ce5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DAMDIE_H_ -#define __DAMDIE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" @@ -64,5 +60,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..c23f4246f9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DamageModule_H_ -#define __DamageModule_H_ - #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/Module/BehaviorModule.h" @@ -113,5 +109,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..79a14c0b84 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h @@ -29,10 +29,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 +110,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..40a548afd7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h @@ -31,10 +31,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DEFECTORSPECIALPOWER_H_ -#define __DEFECTORSPECIALPOWER_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" @@ -81,5 +77,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..582dfd6e96 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DELAYED_UPGRADE_H_ -#define __DELAYED_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -82,7 +78,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..ee4785d3bf 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h @@ -28,10 +28,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 +65,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..85777df086 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DELETION_UPDATE_H_ -#define __DELETION_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -86,6 +82,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..c99fb42d6c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h @@ -27,10 +27,6 @@ // Desc: State machine that controls the approach and deployment of airborne cargo #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 +377,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..7f74d72958 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h @@ -28,10 +28,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 +82,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..eff6b76fde 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DEMORALIZE_SPECIAL_POWER_H_ -#define __DEMORALIZE_SPECIAL_POWER_H_ - #ifdef ALLOW_DEMORALIZE // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// @@ -82,6 +78,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..4d9514e55d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h @@ -28,10 +28,6 @@ // When deployed, you can't move, when undeployed, you can't attack. #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 +121,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..8b09b469cc 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DestroyDie_H_ -#define __DestroyDie_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "Common/INI.h" @@ -53,6 +49,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..ac6b1298b4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DestroyModule_H_ -#define __DestroyModule_H_ - #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" @@ -66,5 +62,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..d7d7e02500 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DieModule_H_ -#define __DieModule_H_ - #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/Module/BehaviorModule.h" @@ -108,5 +104,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..547447f7d8 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _DOCK_UPDATE_H_ -#define _DOCK_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" @@ -156,5 +152,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..1b72394c13 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DOZERAIUPDATE_H_ -#define __DOZERAIUPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/AIUpdate.h" @@ -305,7 +301,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..a88539da7f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h @@ -27,10 +27,6 @@ // Desc: #pragma once - -#ifndef _DumbProjectileBehavior_H_ -#define _DumbProjectileBehavior_H_ - #include "Common/GameType.h" #include "Common/GlobalData.h" #include "Common/STLTypedefs.h" @@ -121,6 +117,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..3706ffee46 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h @@ -28,10 +28,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 +98,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..43ac038894 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h @@ -28,10 +28,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 +125,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..06bca8f73d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __EMPUPDATE_H_ -#define __EMPUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -123,6 +119,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..188b1dc164 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _EjectPilotDie_H_ -#define _EjectPilotDie_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "Common/INI.h" @@ -72,6 +68,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..72098f2c27 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __EnemyNearUpdate_H_ -#define __EnemyNearUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" @@ -84,6 +80,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..bd997d1ddf 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __EXPERIENCE_SCALAR_UPGRADE_H_ -#define __EXPERIENCE_SCALAR_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -72,7 +68,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..7176d412b5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __FXListDie_H_ -#define __FXListDie_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" @@ -84,7 +80,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..526f835d27 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h @@ -29,10 +29,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 +97,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..5700b4b95c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __FIRE_SPREAD_UPDATE_H_ -#define __FIRE_SPREAD_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -76,6 +72,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..4a32d238a8 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __FireWeaponCollide_H_ -#define __FireWeaponCollide_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" #include "GameLogic/Weapon.h" @@ -80,7 +76,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..cf7e73b3bf 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h @@ -28,10 +28,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 +67,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..316712606f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __FireWeaponWhenDamagedBehavior_H_ -#define __FireWeaponWhenDamagedBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpgradeModule.h" @@ -167,6 +163,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..00509c79e7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __FireWeaponWhenDeadBehavior_H_ -#define __FireWeaponWhenDeadBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" @@ -121,6 +117,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..c0b54d17ec 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h @@ -28,10 +28,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 +80,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..42bd4e16ce 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __FLAMMABLE_UPDATE_H_ -#define __FLAMMABLE_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameLogic/Module/DamageModule.h" @@ -114,6 +110,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..acd936f873 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __FLOATUPDATE_H_ -#define __FLOATUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -74,5 +70,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..cb3f11605c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GARRISONCONTAIN_H_ -#define __GARRISONCONTAIN_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" #include "Common/ModelState.h" @@ -211,6 +207,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..f1b9fb2f47 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GenerateMinefieldBehavior_H_ -#define __GenerateMinefieldBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" @@ -122,6 +118,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..3715fe043e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GRANTUPGRADECREATE_H_ -#define __GRANTUPGRADECREATE_H_ - #define DEFINE_OBJECT_STATUS_NAMES // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// @@ -77,6 +73,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..8aaf98bc8b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h @@ -27,10 +27,6 @@ // Desc: State machine that allows hacking cash from the internet (free money). #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 +221,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..7f65b44809 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HEALCONTAIN_H_ -#define __HEALCONTAIN_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" @@ -73,5 +69,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..438f988393 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h @@ -28,10 +28,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 +52,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..e8ab079b33 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HEIGHTDIEUPDATE_H_ -#define __HEIGHTDIEUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -79,5 +75,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..19ebfdfad7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HelicopterSlowDeathBehavior_H_ -#define __HelicopterSlowDeathBehavior_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameLogic/Module/SlowDeathBehavior.h" @@ -113,5 +109,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..a780a0f98d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HIGHLANDER_BODY_H -#define __HIGHLANDER_BODY_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" @@ -57,6 +53,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..c339e19c3d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h @@ -33,10 +33,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HIJACKER_UPDATE_H -#define __HIJACKER_UPDATE_H - #include "GameLogic/Module/UpdateModule.h" //------------------------------------------------------------------------------------------------- @@ -92,6 +88,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..eeff9fa8ab 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h @@ -30,10 +30,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 +77,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..0d157ff948 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HordeUpdate_H_ -#define __HordeUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" @@ -122,6 +118,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..334b912689 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __IMMORTAL_BODY_H -#define __IMMORTAL_BODY_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" @@ -57,6 +53,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..e2084f460e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __INACTIVEBODY_H_ -#define __INACTIVEBODY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BodyModule.h" @@ -68,6 +64,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..21e8de41a7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h @@ -27,10 +27,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __InstantDeathBehavior_H_ -#define __InstantDeathBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" @@ -76,6 +72,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..f6921d1622 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, June 2002 #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 +166,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..37b410d179 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h @@ -29,10 +29,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 +96,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..876d16f431 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SPECIAL_ABILITY_H_ -#define __SPECIAL_ABILITY_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" @@ -65,5 +61,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..413442c7f6 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SPECIAL_ABILITY_UPDATE_H -#define __SPECIAL_ABILITY_UPDATE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" @@ -274,5 +270,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..29c0a440ba 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h @@ -28,10 +28,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 +85,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..5caa294753 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _SPECIAL_POWER_CREATE_H_ -#define _SPECIAL_POWER_CREATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" @@ -57,5 +53,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..e467d4c11a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SPECIALPOWERMODULE_H_ -#define __SPECIALPOWERMODULE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/Module.h" @@ -169,6 +165,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..403873eed9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h @@ -28,10 +28,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 +45,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..6887062d47 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SPY_VISION_SPECIAL_POWER_H_ -#define __SPY_VISION_SPECIAL_POWER_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" @@ -73,5 +69,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..7aaeb97629 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h @@ -30,10 +30,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _SPY_VISION_UPDATE_H -#define _SPY_VISION_UPDATE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -73,6 +69,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..ab74fb002a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SquishCollide_H_ -#define __SquishCollide_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" @@ -58,6 +54,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..67eb71fdcc 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __StatusBitsUpgrade_H_ -#define __StatusBitsUpgrade_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -106,7 +102,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..c4d6f03c19 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __STEALTHDETECTOR_UPDATE_H_ -#define __STEALTHDETECTOR_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -97,7 +93,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..12f20545f3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __STEALTH_UPDATE_H_ -#define __STEALTH_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -171,7 +167,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..1f3706c7f3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __STEALTH_UPGRADE_H_ -#define __STEALTH_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -57,7 +53,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..65a05ff85e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __STICK_BOMB_UPDATE_H -#define __STICK_BOMB_UPDATE_H - #include "GameLogic/Module/UpdateModule.h" //------------------------------------------------------------------------------------------------- @@ -89,6 +85,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..7d46237fa4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureBody.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __STRUCTUREBODY_H_ -#define __STRUCTUREBODY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" @@ -79,6 +75,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..dcdf416ba6 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __StructureCollapseUpdate_H_ -#define __StructureCollapseUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" @@ -149,6 +145,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..6058c2aef9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __StructureToppleUpdate_H_ -#define __StructureToppleUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpdateModule.h" @@ -196,6 +192,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..274a16f53c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SUB_OBJECTS_UPGRADE_H -#define __SUB_OBJECTS_UPGRADE_H - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -88,7 +84,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..062171b747 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _SUPPLY_CENTER_CREATE_H_ -#define _SUPPLY_CENTER_CREATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" @@ -57,5 +53,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..27e054a92f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h @@ -28,10 +28,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 +66,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..ebb96b1df2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h @@ -29,10 +29,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 +108,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..e1fa522ee5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h @@ -27,10 +27,6 @@ // Desc: State machine that controls when and with who a Truck docks #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 +231,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..3003142135 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _SUPPLY_WAREHOUSE_CREATE_H_ -#define _SUPPLY_WAREHOUSE_CREATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" @@ -56,6 +52,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..06f887dcf2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h @@ -28,10 +28,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 +86,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..b9c21172ff 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h @@ -28,10 +28,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 +74,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..c68553dbe9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h @@ -28,10 +28,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 +76,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..55a6c23f38 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TENSILEFORMATIONUPDATE_H_ -#define __TENSILEFORMATIONUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -90,5 +86,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..ce9891848f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TOPPLEUPDATE_H_ -#define __TOPPLEUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/CollideModule.h" @@ -127,6 +123,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..7f2d08b2f4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TRANSITIONDAMAGEFX_H_ -#define __TRANSITIONDAMAGEFX_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/DamageModule.h" @@ -263,5 +259,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..ad46bd669b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h @@ -27,10 +27,6 @@ // Author: Graham Smallwood, July 2002 #pragma once - -#ifndef _TRANSPORT_AI_UPDATE_H_ -#define _TRANSPORT_AI_UPDATE_H_ - #include "GameLogic/Module/AIUpdate.h" //------------------------------------------------------------------------------------------------- @@ -65,6 +61,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..cb3594f342 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TransportContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TransportContain.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TransportContain_H_ -#define __TransportContain_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" @@ -108,6 +104,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..240a7410ef 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TUNNEL_CONTAIN_H_ -#define __TUNNEL_CONTAIN_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" #include "GameLogic/Module/HealContain.h" @@ -132,5 +128,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..a4e1e50e5d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h @@ -28,10 +28,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 +80,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..86f7c1798d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h @@ -30,10 +30,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __UNPAUSE_SPECIAL_POWER_UPGRADE_H_ -#define __UNPAUSE_SPECIAL_POWER_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -75,6 +71,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..68f9f3e261 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __UpdateModule_H_ -#define __UpdateModule_H_ - #include "Common/Module.h" #include "Common/GameType.h" #include "Common/DisabledTypes.h" @@ -372,5 +368,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..a37746b4c6 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __UPGRADEDIE_H -#define __UPGRADEDIE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" @@ -78,6 +74,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..0901701f92 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h @@ -28,10 +28,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 +195,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..90f92c7bfe 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h @@ -28,10 +28,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 +89,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..484391b32e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __VETERANCY_GAIN_CREATE_H_ -#define __VETERANCY_GAIN_CREATE_H_ - #define DEFINE_VETERANCY_NAMES // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameCommon.h" @@ -70,6 +66,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..b6c87976d2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h @@ -27,10 +27,6 @@ // Author: Graham Smallwood, April 2002 #pragma once - -#ifndef _WANDER_AI_UPDATE_H_ -#define _WANDER_AI_UPDATE_H_ - #include "GameLogic/Module/AIUpdate.h" //------------------------------------------------------------------------------------------------- @@ -63,6 +59,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..992ee42931 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WATERWAVE_H_ -#define __WATERWAVE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -111,5 +107,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..73b3911d7b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WEAPON_BONUS_UPGRADE_H_ -#define __WEAPON_BONUS_UPGRADE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -90,7 +86,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..997d9796b7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WEAPON_SET_UPGRADE_H_ -#define __WEAPON_SET_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -57,7 +53,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..39411841dc 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h @@ -28,10 +28,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 +259,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..aa3c9e68dc 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Object.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Object.h @@ -27,9 +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 +782,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..b1a64df63f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h @@ -31,10 +31,6 @@ // All OCLs return the first object that is created (or NULL if not applicable). #pragma once - -#ifndef _ObjectCreationList_H_ -#define _ObjectCreationList_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" @@ -219,6 +215,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..116334d451 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h @@ -27,10 +27,6 @@ // Author: Steven Johnson, September 2001 #pragma once - -#ifndef _OBJECT_ITER_H_ -#define _OBJECT_ITER_H_ - #include "Common/GameType.h" #include "Common/GameMemory.h" @@ -155,7 +151,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..6b02731135 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h @@ -27,9 +27,6 @@ // JKMCD Aug 2002 #pragma once -#ifndef __OBJECTSCRIPTSTATUSBITS_H__ -#define __OBJECTSCRIPTSTATUSBITS_H__ - //------------------------------------------------------------------------------------------------- /** Object status bits */ //------------------------------------------------------------------------------------------------- @@ -42,6 +39,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..d6be69fca3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h @@ -28,10 +28,6 @@ // DO NOT DISTRIBUTE #pragma once - -#ifndef __OBJECT_TYPES_H__ -#define __OBJECT_TYPES_H__ - #include "Common/AsciiString.h" #include "Common/Snapshot.h" @@ -87,5 +83,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..8ae5d24845 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h +++ b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h @@ -45,10 +45,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef __PARTITIONMANAGER_H_ -#define __PARTITIONMANAGER_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -1559,6 +1555,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..0e2ba3f109 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/PolygonTrigger.h +++ b/Generals/Code/GameEngine/Include/GameLogic/PolygonTrigger.h @@ -32,10 +32,6 @@ // Author: John Ahlquist, November 2001 #pragma once - -#ifndef PolygonTrigger_H -#define PolygonTrigger_H - #include "Common/GameMemory.h" #include "Common/Snapshot.h" #include "Common/STLTypedefs.h" @@ -141,5 +137,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..9150a33416 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Powers.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Powers.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __POWERS_H_ -#define __POWERS_H_ - // // skeleton definition of unit powers // @@ -58,6 +54,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..51fe1e93b4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/RankInfo.h +++ b/Generals/Code/GameEngine/Include/GameLogic/RankInfo.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __RankInfo_H_ -#define __RankInfo_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Science.h" #include "Common/UnicodeString.h" @@ -76,7 +72,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..99ac56d299 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SCRIPTACTIONS_H_ -#define __SCRIPTACTIONS_H_ - class ScriptAction; class GameWindow; class Team; @@ -378,8 +374,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..0b51beb849 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ScriptConditions.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ScriptConditions.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SCRIPTCONDITIONS_H_ -#define __SCRIPTCONDITIONS_H_ - class Condition; class ObjectTypes; class Parameter; @@ -187,6 +183,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..2309741130 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SCRIPTENGINE_H_ -#define __SCRIPTENGINE_H_ - #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/STLTypedefs.h" @@ -489,6 +485,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..74e1d1b038 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Scripts.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Scripts.h @@ -28,10 +28,6 @@ // Author: John Ahlquist, November 2001 #pragma once - -#ifndef SCRIPTS_H -#define SCRIPTS_H - #include "Common/Snapshot.h" #include "GameNetwork/NetworkDefs.h" #include "Common/ObjectStatusTypes.h" @@ -1108,6 +1104,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..92a9df1700 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/SidesList.h +++ b/Generals/Code/GameEngine/Include/GameLogic/SidesList.h @@ -28,10 +28,6 @@ // Author: John Ahlquist, November 2001 #pragma once - -#ifndef SIDESLIST_H -#define SIDESLIST_H - #include "Common/Dict.h" #include "Common/Errors.h" #include "Common/GameType.h" @@ -390,7 +386,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..ab5154fbf5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Squad.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Squad.h @@ -38,9 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_SQAUD_ -#define _H_SQAUD_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" #include "Common/GameMemory.h" @@ -96,5 +93,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..e35f3701c6 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h +++ b/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TERRAINLOGIC_H_ -#define __TERRAINLOGIC_H_ - #include "Common/GameMemory.h" #include "Common/Snapshot.h" #include "Common/STLTypedefs.h" @@ -379,4 +375,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..2bd2e7671d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h +++ b/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h @@ -27,10 +27,6 @@ // Simple turret behavior #pragma once - -#ifndef _TURRETAI_H_ -#define _TURRETAI_H_ - #include "Common/StateMachine.h" #include "Common/GameMemory.h" @@ -373,6 +369,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..d87510755d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h +++ b/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, February 2002 #pragma once - -#ifndef __VICTORYCONDITIONS_H__ -#define __VICTORYCONDITIONS_H__ - #include "Common/SubsystemInterface.h" #include "Lib/BaseType.h" @@ -79,5 +75,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..c54500fc17 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Weapon.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Weapon.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WEAPON_H_ -#define __WEAPON_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameCommon.h" @@ -854,6 +850,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..bfaa401488 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h +++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h @@ -27,9 +27,4 @@ // 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..f7b53860c9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h +++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h @@ -25,10 +25,6 @@ // WeaponSet.h #pragma once - -#ifndef _WeaponSet_H_ -#define _WeaponSet_H_ - #include "Lib/BaseType.h" #include "Common/GameType.h" #include "Common/KindOf.h" @@ -245,5 +241,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..8fe4cf42d7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h +++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h @@ -27,11 +27,6 @@ // 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..79b58305ae 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h +++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h @@ -27,9 +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" // state is defined by the bit being off. That is, the typical "normal" condition @@ -53,5 +50,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..49ffab48e4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h +++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h @@ -27,9 +27,6 @@ // JKMCD Aug 2002 #pragma once -#ifndef __WEAPONSTATUS_H__ -#define __WEAPONSTATUS_H__ - enum WeaponStatus CPP_11(: Int) { READY_TO_FIRE, @@ -40,5 +37,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..7b0c9e9e04 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/Connection.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/Connection.h @@ -34,10 +34,6 @@ */ #pragma once - -#ifndef __CONNECTION_H -#define __CONNECTION_H - #include "GameNetwork/NetCommandList.h" #include "GameNetwork/User.h" #include "GameNetwork/Transport.h" @@ -102,5 +98,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..f90a5930af 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/ConnectionManager.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/ConnectionManager.h @@ -28,10 +28,6 @@ */ #pragma once - -#ifndef __CONNECTIONMANAGER_H -#define __CONNECTIONMANAGER_H - #include "GameNetwork/Connection.h" #include "GameNetwork/NetCommandList.h" #include "GameNetwork/Transport.h" @@ -217,5 +213,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..f14b82f353 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h @@ -24,10 +24,6 @@ #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..6c3baf2c14 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/DownloadManager.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/DownloadManager.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, July 2002 #pragma once - -#ifndef __DOWNLOADMANAGER_H__ -#define __DOWNLOADMANAGER_H__ - #include "WWDownload/downloaddefs.h" #include "WWDownload/Download.h" @@ -94,5 +90,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..c3ea51e79c 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/FileTransfer.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/FileTransfer.h @@ -29,9 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once -#ifndef __FILE_TRANSFER_H__ -#define __FILE_TRANSFER_H__ - class GameInfo; // Convenience functions @@ -48,5 +45,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..c1c17e412e 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/FirewallHelper.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/FirewallHelper.h @@ -47,10 +47,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __FIREWALLHELPER_H -#define __FIREWALLHELPER_H - class UDP; #define NUM_TEST_PORTS 4 @@ -308,7 +304,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..c882256691 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/FrameData.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/FrameData.h @@ -24,10 +24,6 @@ #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..62b28ef8ce 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/FrameDataManager.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/FrameDataManager.h @@ -24,10 +24,6 @@ #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..62ed372a6a 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/FrameMetrics.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/FrameMetrics.h @@ -25,10 +25,6 @@ /** FrameMetrics.h */ #pragma once - -#ifndef __FRAMEMETRICS_H -#define __FRAMEMETRICS_H - #include "Lib/BaseType.h" #include "GameNetwork/NetworkDefs.h" @@ -70,5 +66,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..8968cc29b4 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GUIUtil.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GUIUtil.h @@ -26,10 +26,6 @@ // Author: Matthew D. Campbell, Sept 2002 #pragma once - -#ifndef __GUIUTIL_H__ -#define __GUIUTIL_H__ - class GameWindow; class GameInfo; @@ -52,5 +48,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..dc9b3b0e0d 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, December 2001 #pragma once - -#ifndef __GAMEINFO_H__ -#define __GAMEINFO_H__ - #include "Common/Snapshot.h" #include "GameNetwork/NetworkDefs.h" #include "GameNetwork/FirewallHelper.h" @@ -284,5 +280,3 @@ class SkirmishGameInfo : public GameInfo, public Snapshot }; extern SkirmishGameInfo *TheSkirmishGameInfo; - -#endif // __GAMEINFO_H__ diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h index 3379625ec5..8f097253c9 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, February 2002 #pragma once - -#ifndef __GameSpy_H__ -#define __GameSpy_H__ - #include "gamespy/peer/peer.h" #include "GameClient/Color.h" @@ -143,6 +139,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..ca230ae724 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h @@ -27,11 +27,5 @@ // Author: Matthew D. Campbell, July 2002 #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..09e1aeafa8 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, June 2002 #pragma once - -#ifndef __BUDDYTHREAD_H__ -#define __BUDDYTHREAD_H__ - #include "gamespy/gp/gp.h" #define MAX_BUDDY_CHAT_LEN 128 @@ -172,6 +168,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..afa4379c16 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GSCONFIG_H__ -#define __GSCONFIG_H__ - #include "Common/AsciiString.h" #include "Common/STLTypedefs.h" @@ -78,5 +74,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..2c97da5f63 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, August 2002 #pragma once - -#ifndef __GAMERESULTSTHREAD_H__ -#define __GAMERESULTSTHREAD_H__ - #include "Common/SubsystemInterface.h" // this class encapsulates a request for the thread @@ -76,6 +72,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..f9ac1d224a 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, August 2002 #pragma once - -#ifndef __LADDERDEFS_H__ -#define __LADDERDEFS_H__ - #include "Common/UnicodeString.h" #include "Common/AsciiString.h" #include "Common/STLTypedefs.h" @@ -84,5 +80,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..1b1c1a4b15 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, Sept 2002 #pragma once - -#ifndef __LOBBYUTILS_H__ -#define __LOBBYUTILS_H__ - class GameWindow; GameWindow *GetGameListBox( void ); @@ -53,5 +49,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..1cc9a6f75e 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __MAINMENUUTILS_H__ -#define __MAINMENUUTILS_H__ - void HTTPThinkWrapper( void ); void StopAsyncDNSCheck( void ); void StartPatchCheck( void ); @@ -60,5 +56,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..7bca73fa00 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, June 2002 #pragma once - -#ifndef __PEERDEFS_H__ -#define __PEERDEFS_H__ - #include "gamespy/peer/peer.h" #include "gamespy/gp/gp.h" @@ -298,5 +294,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..b777052ff7 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, Sept 2002 #pragma once - -#ifndef __PEERDEFSIMPLEMENTATION_H__ -#define __PEERDEFSIMPLEMENTATION_H__ - #include "GameNetwork/GameSpy/PeerDefs.h" #include "GameNetwork/GameSpy/PersistentStorageThread.h" @@ -180,5 +176,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..3206a4387c 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, June 2002 #pragma once - -#ifndef __PEERTHREAD_H__ -#define __PEERTHREAD_H__ - #include "gamespy/peer/peer.h" #include "GameNetwork/NetworkDefs.h" @@ -385,5 +381,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..54b53219d8 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, July 2002 #pragma once - -#ifndef __PERSISTENTSTORAGEDEFS_H__ -#define __PERSISTENTSTORAGEDEFS_H__ - enum LocaleType CPP_11(: Int) { LOC_UNKNOWN = 0, @@ -43,5 +39,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..2fd5ae5918 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, July 2002 #pragma once - -#ifndef __PERSISTENTSTORAGETHREAD_H__ -#define __PERSISTENTSTORAGETHREAD_H__ - #include "gamespy/gstats/gpersist.h" #define MAX_BUDDY_CHAT_LEN 128 @@ -182,6 +178,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..0aea049ae2 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h @@ -28,10 +28,6 @@ // Note: adapted from WOLAPI #pragma once - -#ifndef __PINGTHREAD_H__ -#define __PINGTHREAD_H__ - // this class encapsulates a request for the thread class PingRequest { @@ -78,6 +74,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..dd6494329a 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, Sept 2002 #pragma once - -#ifndef __STAGINGROOMGAMEINFO_H__ -#define __STAGINGROOMGAMEINFO_H__ - #include "GameNetwork/GameInfo.h" #include "GameNetwork/Transport.h" @@ -157,5 +153,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..8df2fa6be9 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h @@ -27,11 +27,5 @@ // Author: Matthew D. Campbell, July 2002 #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..d4b62a6663 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyChat.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyChat.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, February 2002 #pragma once - -#ifndef __GAMESPYCHAT_H__ -#define __GAMESPYCHAT_H__ - #include "gamespy/peer/peer.h" class GameWindow; @@ -56,5 +52,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..85e1e25efa 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGP.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGP.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, March 2002 #pragma once - -#ifndef __GAMESPYGP_H__ -#define __GAMESPYGP_H__ - #include "gamespy/gp/gp.h" void GPRecvBuddyRequestCallback(GPConnection * connection, GPRecvBuddyRequestArg * arg, void * param); @@ -43,5 +39,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..98c4a703ac 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, March 2002 #pragma once - -#ifndef __GAMESPYOVERLAY_H__ -#define __GAMESPYOVERLAY_H__ - #include "Common/NameKeyGenerator.h" #include "GameClient/WindowLayout.h" #include "GameClient/Gadget.h" @@ -66,4 +62,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..06a846fe2e 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyPersistentStorage.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyPersistentStorage.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, March 2002 #pragma once - -#ifndef __GAMESPYPersistentStorage_H__ -#define __GAMESPYPersistentStorage_H__ - class GameSpyPlayerInfoInterface : public SubsystemInterface { public: @@ -58,5 +54,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..d7646527c3 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyThread.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, March 2002 #pragma once - -#ifndef __GAMESPYTHREAD_H__ -#define __GAMESPYTHREAD_H__ - #include "mutex.h" #include "thread.h" @@ -63,5 +59,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..1c7e90f454 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/IPEnumeration.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/IPEnumeration.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, October 2001 #pragma once - -#ifndef _IPENUMERATION_H_ -#define _IPENUMERATION_H_ - #include "GameNetwork/Transport.h" /** @@ -78,6 +74,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..fc96a8a0af 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/LANAPI.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/LANAPI.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, October 2001 #pragma once - -#ifndef _LANAPI_H_ -#define _LANAPI_H_ - #include "GameNetwork/Transport.h" #include "GameNetwork/NetworkInterface.h" #include "GameNetwork/NetworkDefs.h" @@ -413,6 +409,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..e12d8d56b5 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h @@ -28,10 +28,6 @@ // Description: LAN API Callbacks header /////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _LANAPI_CALLBACKS_H_ -#define _LANAPI_CALLBACKS_H_ - #include "Common/NameKeyGenerator.h" #include "GameClient/Shell.h" #include "GameClient/GadgetListBox.h" @@ -83,7 +79,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..d9ead1789f 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/LANGameInfo.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/LANGameInfo.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, December 2001 #pragma once - -#ifndef __LANGAMEINFO_H__ -#define __LANGAMEINFO_H__ - #include "GameNetwork/GameInfo.h" #include "GameNetwork/LANPlayer.h" @@ -180,6 +176,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..add3c6202b 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NAT.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NAT.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __NAT_H -#define __NAT_H - #include "Lib/BaseType.h" #include "GameNetwork/NetworkInterface.h" #include "GameNetwork/FirewallHelper.h" @@ -158,5 +154,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..2b1e4c6a12 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandList.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandList.h @@ -24,10 +24,6 @@ #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..24c1f76c16 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h @@ -27,10 +27,6 @@ // are queued up to execute at a later time #pragma once - -#ifndef __NETCOMMANDMSG_H -#define __NETCOMMANDMSG_H - #include "Lib/BaseType.h" #include "GameNetwork/NetworkDefs.h" #include "Common/UnicodeString.h" @@ -517,4 +513,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..af9fde4c7c 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandRef.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandRef.h @@ -24,10 +24,6 @@ #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..10917f9eaf 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h @@ -26,10 +26,6 @@ // Bryan Cleveland #pragma once - -#ifndef __NETCOMMANDWRAPPERLIST_H -#define __NETCOMMANDWRAPPERLIST_H - #include "GameNetwork/NetCommandList.h" class NetCommandWrapperListNode : public MemoryPoolObject @@ -79,5 +75,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..ed37f4f4ca 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetPacket.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetPacket.h @@ -35,10 +35,6 @@ be specialized code. #pragma once - -#ifndef __NETPACKET_H -#define __NETPACKET_H - #include "NetworkDefs.h" #include "GameNetwork/NetCommandList.h" #include "Common/MessageStream.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..4481214522 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h @@ -24,10 +24,6 @@ #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..b9cd575298 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetworkInterface.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetworkInterface.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, July 2001 #pragma once - -#ifndef _NETWORK_INTERFACE_H_ -#define _NETWORK_INTERFACE_H_ - #include "Common/MessageStream.h" #include "GameNetwork/ConnectionManager.h" #include "GameNetwork/User.h" @@ -137,5 +133,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..1e72352b17 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/RankPointValue.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/RankPointValue.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __RANK_POINT_VALUE_H_ -#define __RANK_POINT_VALUE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -101,5 +97,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..1a1768fb13 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/Transport.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/Transport.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, July 2001 #pragma once - -#ifndef _TRANSPORT_H_ -#define _TRANSPORT_H_ - #include "GameNetwork/udp.h" #include "GameNetwork/NetworkDefs.h" @@ -101,5 +97,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..4c32f9270e 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/User.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/User.h @@ -27,10 +27,6 @@ */ #pragma once - -#ifndef __USER_H -#define __USER_H - #include "GameNetwork/NetworkDefs.h" #include "Common/UnicodeString.h" @@ -58,5 +54,3 @@ class User : public MemoryPoolObject UnsignedInt m_ipaddr; }; EMPTY_DTOR(User) - -#endif diff --git a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h b/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h index 7c98c1fc95..5f1f17be37 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h @@ -41,10 +41,6 @@ ******************************************************************************/ #pragma once - -#ifndef __WEBBROWSER_H__ -#define __WEBBROWSER_H__ - #include "Common/SubsystemInterface.h" #include #include @@ -125,4 +121,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..aa366e6617 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/networkutil.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/networkutil.h @@ -24,9 +24,6 @@ #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..d3518ea0b6 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/udp.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/udp.h @@ -24,10 +24,6 @@ #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/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h index a1e5c81764..471426c008 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h @@ -40,10 +40,6 @@ //============================================================================= #pragma once - -#ifndef __W3DCONVERT_H_ -#define __W3DCONVERT_H_ - //============================================================================= // Includes //============================================================================= @@ -62,7 +58,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..fcdd5b0674 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DFUNCTIONLEXICON_H_ -#define __W3DFUNCTIONLEXICON_H_ - #include "Common/FunctionLexicon.h" //------------------------------------------------------------------------------------------------- @@ -52,6 +48,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..bf92c0fe96 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h @@ -31,10 +31,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DMODULEFACTORY_H_ -#define __W3DMODULEFACTORY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ModuleFactory.h" @@ -49,5 +45,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..6f1c70d47d 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h @@ -30,10 +30,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DRADAR_H_ -#define __W3DRADAR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Radar.h" #include "WW3D2/ww3dformat.h" @@ -127,6 +123,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..8391a0e356 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h @@ -30,10 +30,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DTHINGFACTORY_H_ -#define __W3DTHINGFACTORY_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/ThingFactory.h" @@ -47,6 +43,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..62d7369601 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h @@ -24,10 +24,6 @@ #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..44d97ffe2f 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3D_DEBRIS_DRAW_H_ -#define __W3D_DEBRIS_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/DrawModule.h" @@ -98,6 +94,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..4162401f94 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DDEFAULTDRAW_H_ -#define __W3DDEFAULTDRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/DrawModule.h" @@ -75,6 +71,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..e2ad243a8d 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h @@ -33,10 +33,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3D_DEPENDENCY_MODEL_DRAW_H_ -#define _W3D_DEPENDENCY_MODEL_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" @@ -69,6 +65,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..ffb1b6def7 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DLASERDRAW_H_ -#define __W3DLASERDRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" //#include "WW3D2/Line3D.h" @@ -99,6 +95,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..0a9d17f59b 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DModelDraw_H_ -#define __W3DModelDraw_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ModelState.h" #include "Common/DrawModule.h" @@ -514,6 +510,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..48745d1b3d 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3D_OVERLORD_TANK_DRAW_H_ -#define _W3D_OVERLORD_TANK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DTankDraw.h" @@ -70,6 +66,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..9feea291a0 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DPOLICECARDRAW_H_ -#define __W3DPOLICECARDRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "W3DDevice/GameClient/Module/W3DTruckDraw.h" @@ -63,6 +59,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..1be960dfe0 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h @@ -28,10 +28,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 +79,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..367dc0d5e0 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DRopeDraw_H_ -#define __W3DRopeDraw_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" @@ -93,6 +89,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..6fd62fd1d9 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3D_SCIENCE_MODEL_DRAW_H_ -#define _W3D_SCIENCE_MODEL_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" @@ -63,6 +59,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..cff0c3b630 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3D_SUPPLY_DRAW_H_ -#define _W3D_SUPPLY_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" @@ -65,6 +61,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..4dea8bdfa5 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3D_TANK_DRAW_H_ -#define _W3D_TANK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "GameClient/ParticleSys.h" @@ -105,6 +101,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..d851bb8aae 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3D_TANKTRUCK_DRAW_H_ -#define _W3D_TANKTRUCK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "Common/AudioEventRTS.h" @@ -152,6 +148,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..1be5804a19 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DTRACERDRAW_H_ -#define __W3DTRACERDRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" @@ -73,6 +69,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..b513b39aa4 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3D_TRUCK_DRAW_H_ -#define _W3D_TRUCK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "Common/AudioEventRTS.h" @@ -141,6 +137,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..570aa465a1 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h @@ -27,10 +27,6 @@ // Author: John Ahlquist, April 2001 #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 +137,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..48447a0025 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h @@ -27,10 +27,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef TileData_H -#define TileData_H - #include #include "Lib/BaseType.h" @@ -104,5 +100,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..d8045a3a5f 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h @@ -43,10 +43,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef W3DASSETMANAGER_H -#define W3DASSETMANAGER_H - #include "assetmgr.h" #include "Lib/BaseType.h" @@ -113,6 +109,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..b924320971 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h @@ -38,9 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_W3DASSETMANAGEREXPOSED_ -#define _H_W3DASSETMANAGEREXPOSED_ - // INCLUDES /////////////////////////////////////////////////////////////////// // DEFINES //////////////////////////////////////////////////////////////////// // TYPE DEFINES /////////////////////////////////////////////////////////////// @@ -52,5 +49,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..16500ab274 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef __W3DBIB_BUFFER_H_ -#define __W3DBIB_BUFFER_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -131,5 +127,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..6827c3a762 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef __W3DBRIDGE_BUFFER_H_ -#define __W3DBRIDGE_BUFFER_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -187,5 +183,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..c2d1e64bea 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h @@ -28,10 +28,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 +181,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..335be01b0e 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef __W3DCUSTOM_EDGING_H_ -#define __W3DCUSTOM_EDGING_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -107,5 +103,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..e261e0ccb2 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h @@ -23,14 +23,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..7356fbd0c7 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h @@ -24,10 +24,6 @@ #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..bf07fc4835 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h @@ -32,10 +32,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DDISPLAY_H_ -#define __W3DDISPLAY_H_ - #include "GameClient/Display.h" #include "WW3D2/lightenvironment.h" @@ -202,5 +198,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..03282c8ac1 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h @@ -46,10 +46,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DDISPLAYSTRING_H_ -#define __W3DDISPLAYSTRING_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -119,6 +115,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..5ec38b1378 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3DDISPLAYSTRINGMANAGER_H_ -#define _W3DDISPLAYSTRINGMANAGER_H_ - #include "GameClient/DisplayStringManager.h" #include "W3DDevice/GameClient/W3DDisplayString.h" @@ -76,6 +72,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..e43be79ffd 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h @@ -27,10 +27,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef W3D_DYNAMIC_LIGHT_H -#define W3D_DYNAMIC_LIGHT_H - #include "WW3D2/light.h" #include "Lib/BaseType.h" class HeightMapRenderObjClass; @@ -81,7 +77,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..b78f39faa7 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h @@ -33,10 +33,6 @@ #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..d93a44e155 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DGUICALLBACKS_H_ -#define __W3DGUICALLBACKS_H_ - class GameWindow; class WindowLayout; class WinInstanceData; @@ -67,6 +63,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..c4e994a1c3 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DGADGET_H_ -#define __W3DGADGET_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -89,6 +85,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..3a2550074f 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h @@ -33,10 +33,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DGAMEINTERFACE_H_ -#define __W3DGAMEINTERFACE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -126,5 +122,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..933f382117 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DGAMEFONT_H_ -#define __W3DGAMEFONT_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -80,6 +76,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..4b211d8e1f 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DGAMEWINDOW_H_ -#define __W3DGAMEWINDOW_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -100,6 +96,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..06f54e87d4 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h @@ -30,10 +30,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 +103,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..642f599e2b 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h @@ -32,10 +32,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DINGAMEUI_H_ -#define __W3DINGAMEUI_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -85,5 +81,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..ccb6194db1 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h @@ -24,10 +24,6 @@ #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..c9cef2dbd4 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DMOUSE_H_ -#define __W3DMOUSE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -110,5 +106,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..8f8c7e01ae 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h @@ -26,10 +26,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DParticleSys_H_ -#define __W3DParticleSys_H_ - #include "GameClient/ParticleSys.h" #include "WW3D2/pointgr.h" #include "WW3D2/streak.h" @@ -63,5 +59,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..575d80793e 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DPOLY_H_ -#define __W3DPOLY_H_ - #include "vector3.h" #include "plane.h" #include "simplevec.h" @@ -66,5 +62,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..7f680ab098 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h @@ -31,10 +31,6 @@ // /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3D_PROJECTED_SHADOW_H_ -#define __W3D_PROJECTED_SHADOW_H_ - #include "GameClient/Shadow.h" class W3DShadowTexture; //forward reference @@ -136,5 +132,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..ee69cab0d2 100644 --- a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h +++ b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WIN32DIKEYBOARD_H_ -#define __WIN32DIKEYBOARD_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #ifndef DIRECTINPUT_VERSION # define DIRECTINPUT_VERSION 0x800 @@ -101,6 +97,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..13473c693a 100644 --- a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h +++ b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h @@ -38,10 +38,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WIN32DIMOUSE_H_ -#define __WIN32DIMOUSE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #ifndef DIRECTINPUT_VERSION # define DIRECTINPUT_VERSION 0x800 @@ -100,6 +96,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..65876cb43f 100644 --- a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h +++ b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WIN32MOUSE_H_ -#define __WIN32MOUSE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -115,6 +111,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..377698cb2f 100644 --- a/Generals/Code/Libraries/Include/Lib/BaseType.h +++ b/Generals/Code/Libraries/Include/Lib/BaseType.h @@ -28,10 +28,6 @@ // tell the compiler to only load this file once #pragma once - -#ifndef _BASE_TYPE_H_ -#define _BASE_TYPE_H_ - #include "Lib/BaseTypeCore.h" #include "Lib/trig.h" @@ -385,5 +381,3 @@ struct RGBAColorInt UnsignedInt red, green, blue, alpha; // range between 0 and 255 }; - -#endif // _BASE_TYPE_H_ diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h index 1b88047d1e..71d502d44a 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h @@ -38,10 +38,6 @@ #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..1444d7ab62 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h @@ -39,10 +39,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef ANIMOBJ_H -#define ANIMOBJ_H - #include "always.h" #include "composite.h" #include "htree.h" @@ -321,7 +317,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..bd7de137e1 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h @@ -37,10 +37,6 @@ #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..134340c97c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef BMP2D_H -#define BMP2D_H - #include "dynamesh.h" class Bitmap2DObjClass : public DynamicScreenMeshClass @@ -53,5 +49,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..61bce87233 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef BOXROBJ_H -#define BOXROBJ_H - #include "always.h" #include "rendobj.h" #include "w3d_file.h" @@ -257,9 +253,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..f0b2c9789e 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h @@ -44,10 +44,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef CAMERA_H -#define CAMERA_H - #include "always.h" #include "rendobj.h" #include "plane.h" @@ -449,6 +445,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..63643a8dde 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h @@ -17,10 +17,6 @@ */ #pragma once - -#ifndef DAZZLE_H -#define DAZZLE_H - #include "always.h" #include "vector3.h" #include "matrix3d.h" @@ -392,5 +388,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..e20afc580d 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h @@ -17,10 +17,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 +273,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..8513aacad1 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef DECALMSH_H -#define DECALMSH_H - #include "always.h" #include "bittype.h" #include "simplevec.h" @@ -286,7 +282,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..abf16f531a 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h @@ -38,10 +38,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef DX8CAPS_H -#define DX8CAPS_H - #include "always.h" #include "ww3dformat.h" #include @@ -284,6 +280,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..4171b84b54 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h @@ -41,10 +41,6 @@ #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..714faa854a 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef DX8INDEXBUFFER_H -#define DX8INDEXBUFFER_H - #include "always.h" #include "wwdebug.h" #include "refcount.h" @@ -201,6 +197,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..7515580ed6 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h @@ -38,10 +38,6 @@ #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..353ce467f5 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef DX8TEXTUREMANAGER_H -#define DX8TEXTUREMANAGER_H - #include "always.h" #include "texture.h" #include "dx8wrapper.h" @@ -135,5 +131,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..9c5bd00868 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef DX8VERTEXBUFFER_H -#define DX8VERTEXBUFFER_H - #include "always.h" #include "wwdebug.h" #include "refcount.h" @@ -257,6 +253,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..623f796c3f 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef DX8_WRAPPER_H -#define DX8_WRAPPER_H - #include "always.h" #include "dllist.h" #include "d3d8.h" @@ -1340,6 +1336,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..440995cad0 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h @@ -37,10 +37,6 @@ #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..9dab6ae2ca 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h @@ -36,10 +36,6 @@ #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..ebd18d841e 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef HMORPHANIM_H -#define HMORPHANIM_H - #include "always.h" #include "hanim.h" #include "simplevec.h" @@ -180,9 +176,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..c334919956 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef HRAWANIM_H -#define HRAWANIM_H - #include "always.h" #include "hanim.h" @@ -131,9 +127,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..6fc1f57bb8 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h @@ -37,10 +37,6 @@ #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..e3e96af8e5 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h @@ -36,10 +36,6 @@ #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..ae70cb8e40 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef LIGHTENVIRONMENT_H -#define LIGHTENVIRONMENT_H - #include "always.h" #include "vector3.h" @@ -157,7 +153,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..177371b8dc 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h @@ -38,10 +38,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef VERTEXMAPPER_H -#define VERTEXMAPPER_H - #include "refcount.h" #include "w3d_file.h" #include "w3derr.h" @@ -495,5 +491,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..e137a3abf0 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef MATPASS_H -#define MATPASS_H - #ifndef REFCOUNT_H #include "refcount.h" #endif @@ -124,6 +120,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/mesh.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h index 6c8c695e9d..eff0bc5067 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h @@ -37,10 +37,6 @@ #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..1577241a62 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h @@ -39,10 +39,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef MESHBUILD_H -#define MESHBUILD_H - #include "always.h" #include "vector2.h" #include "vector3.h" @@ -380,5 +376,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/meshmdl.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h index 6aa03693fa..92a94d36f5 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h @@ -36,10 +36,6 @@ #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..82a43a2588 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h @@ -37,10 +37,6 @@ #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..5790579cf9 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h @@ -36,10 +36,6 @@ #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..78acdffa05 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef PART_BUF_H -#define PART_BUF_H - #include "rendobj.h" #include "pointgr.h" #include "seglinerenderer.h" @@ -427,6 +423,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..7f294f69da 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef PART_EMT_H -#define PART_EMT_H - #include "rendobj.h" #include "RANDOM.H" #include "part_buf.h" @@ -337,7 +333,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..57a357710d 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h @@ -35,10 +35,6 @@ #pragma once -#ifndef __PART_EMT_LDR_H -#define __PART_EMT_LDR_H - - #include "proto.h" #include "rendobj.h" #include "w3d_file.h" @@ -368,6 +364,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..1ee1dee282 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h @@ -36,10 +36,6 @@ #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..cfe1c6bf6c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h @@ -40,10 +40,6 @@ #pragma once -#ifndef RINFO_H -#define RINFO_H - - #include "always.h" #include "bittype.h" #include "ww3d.h" @@ -161,7 +157,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..e65bff731a 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h @@ -36,10 +36,6 @@ #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..21040ac083 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.h @@ -36,10 +36,6 @@ #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..b8707f2491 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h @@ -17,10 +17,6 @@ */ #pragma once - -#ifndef SORTING_RENDERER_H -#define SORTING_RENDERER_H - #include "always.h" class SortingNodeStruct; @@ -63,6 +59,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..272ac64e08 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texproject.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texproject.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef TEXPROJECT_H -#define TEXPROJECT_H - #include "always.h" #include "matrix3d.h" #include "matrix4.h" @@ -231,7 +227,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..d1bb85f19c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.h @@ -36,10 +36,6 @@ #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/textureloader.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h index 5c3866b097..22ad2e0dd1 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef TEXTURELOADER_H -#define TEXTURELOADER_H - #pragma once #include "always.h" @@ -134,7 +130,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..7907e38253 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef TEXTURETHUMBNAIL_H -#define TEXTURETHUMBNAIL_H - #pragma once #include "always.h" @@ -49,5 +45,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..8c4c116204 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h @@ -36,10 +36,6 @@ #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..177e2c5dc4 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h @@ -37,10 +37,6 @@ #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..ebc9bec54d 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h @@ -36,10 +36,6 @@ #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/Tools/GUIEdit/Include/DialogProc.h b/Generals/Code/Tools/GUIEdit/Include/DialogProc.h index a388326a19..7177a677b8 100644 --- a/Generals/Code/Tools/GUIEdit/Include/DialogProc.h +++ b/Generals/Code/Tools/GUIEdit/Include/DialogProc.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DIALOGPROC_H_ -#define __DIALOGPROC_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -69,6 +65,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..13ec4d116a 100644 --- a/Generals/Code/Tools/GUIEdit/Include/EditWindow.h +++ b/Generals/Code/Tools/GUIEdit/Include/EditWindow.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __EDITWINDOW_H_ -#define __EDITWINDOW_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #include @@ -203,6 +199,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..266a18d1eb 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GUIEDIT_H_ -#define __GUIEDIT_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include #include @@ -374,6 +370,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..bf68ee8a7b 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEditColor.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEditColor.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GUIEDITCOLOR_H_ -#define __GUIEDITCOLOR_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -96,6 +92,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..27608e4354 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GUIEDITDISPLAY_H_ -#define __GUIEDITDISPLAY_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -137,6 +133,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..46b00f825c 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h @@ -33,10 +33,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GUIEDITWINDOWMANAGER_H_ -#define __GUIEDITWINDOWMANAGER_H_ - #include #include "W3DDevice/GameClient/W3DGameWindowManager.h" @@ -114,6 +110,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..b9e3335f46 100644 --- a/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h +++ b/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HIERARCHYVIEW_H_ -#define __HIERARCHYVIEW_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #include @@ -152,6 +148,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..9f73bca67c 100644 --- a/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h +++ b/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __LAYOUTSCHEME_H_ -#define __LAYOUTSCHEME_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -147,6 +143,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..ec75efc245 100644 --- a/Generals/Code/Tools/GUIEdit/Include/Properties.h +++ b/Generals/Code/Tools/GUIEdit/Include/Properties.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __PROPERTIES_H_ -#define __PROPERTIES_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -425,6 +421,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..3bb4051f1e 100644 --- a/Generals/Code/Tools/GUIEdit/Include/WinMain.h +++ b/Generals/Code/Tools/GUIEdit/Include/WinMain.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WINMAIN_H_ -#define __WINMAIN_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -65,6 +61,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..4821c0a2f4 100644 --- a/Generals/Code/Tools/ParticleEditor/CButtonShowColor.h +++ b/Generals/Code/Tools/ParticleEditor/CButtonShowColor.h @@ -17,10 +17,6 @@ */ #pragma once - -#ifndef _H_CBUTTONSHOWCOLOR_ -#define _H_CBUTTONSHOWCOLOR_ - #include "Lib/BaseType.h" class CButtonShowColor : public CButton @@ -44,5 +40,3 @@ class CButtonShowColor : public CButton DECLARE_MESSAGE_MAP(); }; - -#endif /* _H_CBUTTONSHOWCOLOR_ */ diff --git a/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.h b/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.h index 4d0b2df8b7..034e3012a6 100644 --- a/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.h +++ b/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.h @@ -32,9 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_EMISSIONTYPEPANELS_ -#define _H_EMISSIONTYPEPANELS_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" #include "ISwapablePanel.h" @@ -134,5 +131,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..231067641d 100644 --- a/Generals/Code/Tools/ParticleEditor/ISwapablePanel.h +++ b/Generals/Code/Tools/ParticleEditor/ISwapablePanel.h @@ -33,9 +33,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_ISWAPABLEPANEL_ -#define _H_ISWAPABLEPANEL_ - #include "Lib/BaseType.h" // INCLUDES /////////////////////////////////////////////////////////////////// @@ -50,5 +47,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..a6d4140ccf 100644 --- a/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.h +++ b/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.h @@ -32,9 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_MOREPARMSDIALOG_ -#define _H_MOREPARMSDIALOG_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" #include "Lib/BaseType.h" @@ -60,5 +57,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..1612b1432e 100644 --- a/Generals/Code/Tools/ParticleEditor/ParticleEditor.h +++ b/Generals/Code/Tools/ParticleEditor/ParticleEditor.h @@ -18,10 +18,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 +62,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..88feba52e4 100644 --- a/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.h +++ b/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.h @@ -32,9 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_PARTICLETYPEPANELS_ -#define _H_PARTICLETYPEPANELS_ - #include "Resource.h" #include "ISwapablePanel.h" @@ -98,5 +95,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..22a64dda50 100644 --- a/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.h +++ b/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.h @@ -32,13 +32,7 @@ /*---------------------------------------------------------------------------*/ #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..35c7c20335 100644 --- a/Generals/Code/Tools/ParticleEditor/StdAfx.h +++ b/Generals/Code/Tools/ParticleEditor/StdAfx.h @@ -20,10 +20,6 @@ // or project specific include files that are used frequently, but // 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 +69,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..ea529be30e 100644 --- a/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.h +++ b/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.h @@ -32,9 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_VELOCITYTYPEPANELS_ -#define _H_VELOCITYTYPEPANELS_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" #include "ISwapablePanel.h" @@ -134,5 +131,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..84de8a53e5 100644 --- a/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef AUTOEDGEOUTTOOL_H -#define AUTOEDGEOUTTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -43,6 +39,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..8df773f7f4 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h +++ b/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +68,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..fa6654da90 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef BLEND_EDGE_TOOL_H -#define BLEND_EDGE_TOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -47,6 +43,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..33b1ca4a4c 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h +++ b/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +82,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/BrushTool.h b/Generals/Code/Tools/WorldBuilder/include/BrushTool.h index a631a9475c..a6699b5c65 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BrushTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BrushTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef BRUSHTOOL_H -#define BRUSHTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -64,6 +60,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..0c6c37bc01 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BuildList.h +++ b/Generals/Code/Tools/WorldBuilder/include/BuildList.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +103,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..e158d8648c 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, Nov 2001 #pragma once - -#ifndef BUILDLISTTOOL_H -#define BUILDLISTTOOL_H - #include "Tool.h" #include "Common/AsciiString.h" #include "PickUnitDialog.h" @@ -78,6 +74,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..a56697e777 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h +++ b/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h @@ -17,10 +17,6 @@ */ #pragma once - -#ifndef _H_CBUTTONSHOWCOLOR_ -#define _H_CBUTTONSHOWCOLOR_ - class CButtonShowColor : public CButton { protected: @@ -42,5 +38,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..fea15b39ad 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CUndoable.h +++ b/Generals/Code/Tools/WorldBuilder/include/CUndoable.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #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 +384,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..5e8d7130ab 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +82,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..bc081422cc 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CellWidth.h +++ b/Generals/Code/Tools/WorldBuilder/include/CellWidth.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +59,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..cba432dfbd 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +80,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/EditAction.h b/Generals/Code/Tools/WorldBuilder/include/EditAction.h index 4712026c32..da9fb7d552 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditAction.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditAction.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +74,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..32451b07f5 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditCondition.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditCondition.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +73,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..f9e1a5a452 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -70,5 +66,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..0bbf1a8f81 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditGroup.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditGroup.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +59,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..870a70b42a 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -73,5 +69,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..5891d37299 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditParameter.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditParameter.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -127,5 +123,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..6b409b132b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +67,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..7fcdcfcc68 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef EYEDROPPERTOOL_H -#define EYEDROPPERTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -43,6 +39,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..f982c8cd1f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +89,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..8f35d378a8 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef FEATHERTOOL_H -#define FEATHERTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /**************************************************************************/ @@ -56,6 +52,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..13beba41f9 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +90,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..8c36acb90e 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FenceTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/FenceTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef FenceTool_H -#define FenceTool_H - #include "Tool.h" class WorldHeightMapEdit; class MapObject; @@ -57,6 +53,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..0015c783da 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef FloodFillTool_H -#define FloodFillTool_H - #include "Tool.h" class WorldHeightMapEdit; /************************************************************************** @@ -51,6 +47,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..e60bcdc226 100644 --- a/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +133,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..9528f56f64 100644 --- a/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef GROVEOPTIONS_H -#define GROVEOPTIONS_H - #pragma once #include @@ -78,5 +74,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..23138a2630 100644 --- a/Generals/Code/Tools/WorldBuilder/include/GroveTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/GroveTool.h @@ -20,10 +20,6 @@ // Author: John Ahlquist, May 2001 #pragma once - -#ifndef GroveTool_H -#define GroveTool_H - #include "Lib/BaseType.h" #include "Tool.h" #include "Common/MapObject.h" @@ -61,6 +57,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..d01c9adcfe 100644 --- a/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, May 2001 #pragma once - -#ifndef HandScrollTool_H -#define HandScrollTool_H - #include "Tool.h" /************************************************************************** HandScrollTool @@ -53,6 +49,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..1da43ce50d 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h @@ -17,10 +17,6 @@ */ #pragma once - -#ifndef __IMPASSABLEOPTIONS_H__ -#define __IMPASSABLEOPTIONS_H__ - class ImpassableOptions : public CDialog { public: @@ -46,5 +42,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..d919ae1eb8 100644 --- a/Generals/Code/Tools/WorldBuilder/include/LayersList.h +++ b/Generals/Code/Tools/WorldBuilder/include/LayersList.h @@ -32,9 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_LAYERSLIST_ -#define _H_LAYERSLIST_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" #include @@ -160,5 +157,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..8b4fa8d2f4 100644 --- a/Generals/Code/Tools/WorldBuilder/include/LightOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/LightOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -76,5 +72,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..fd69049a06 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MainFrm.h +++ b/Generals/Code/Tools/WorldBuilder/include/MainFrm.h @@ -19,10 +19,6 @@ // MainFrm.h : interface of the CMainFrame class // ///////////////////////////////////////////////////////////////////////////// - -#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 +149,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..5479d63308 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MapPreview.h +++ b/Generals/Code/Tools/WorldBuilder/include/MapPreview.h @@ -38,10 +38,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __MAP_PREVIEW_H_ -#define __MAP_PREVIEW_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -84,5 +80,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..a8b5c5fe37 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MapSettings.h +++ b/Generals/Code/Tools/WorldBuilder/include/MapSettings.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +59,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..5837668319 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -112,5 +108,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..548a5eadd1 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, Oct. 2001 #pragma once - -#ifndef MESHMOLDTOOL_H -#define MESHMOLDTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -65,6 +61,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..e03730f7a4 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -98,5 +94,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..00fd4c08c9 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MoundTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/MoundTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef MOUND_TOOL_H -#define MOUND_TOOL_H - #include "Tool.h" class WorldHeightMapEdit; /************************************************************************* @@ -72,4 +68,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..b4a39de893 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h +++ b/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h @@ -22,10 +22,6 @@ #pragma once -#ifndef MYTOOLBAR_H -#define MYTOOLBAR_H - - /************************************************************************* ** CellSizeToolBar @@ -47,7 +43,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..2828309ebe 100644 --- a/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h +++ b/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +79,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..527e8ec394 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +99,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..3ad9aa407e 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h +++ b/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +66,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..eb98b7027d 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef OBJECTTOOL_H -#define OBJECTTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -53,6 +49,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..f4d5196034 100644 --- a/Generals/Code/Tools/WorldBuilder/include/OpenMap.h +++ b/Generals/Code/Tools/WorldBuilder/include/OpenMap.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +70,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..35df8149f7 100644 --- a/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h +++ b/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +62,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..82db1cd44a 100644 --- a/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +106,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..71d66dd89d 100644 --- a/Generals/Code/Tools/WorldBuilder/include/PointerTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/PointerTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef POINTER_TOOL_H -#define POINTER_TOOL_H - #include "PolygonTool.h" class WorldHeightMapEdit; #include "../../GameEngine/Include/Common/MapObject.h" @@ -77,6 +73,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..c43f840caa 100644 --- a/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, Nov. 2001 #pragma once - -#ifndef POLYGONTOOL_H -#define POLYGONTOOL_H - #include "Tool.h" class WorldHeightMapEdit; class MapObject; @@ -84,7 +80,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..ea84cab8af 100644 --- a/Generals/Code/Tools/WorldBuilder/include/RampOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/RampOptions.h @@ -32,9 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_RAMPOPTIONS_ -#define _H_RAMPOPTIONS_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "OptionsPanel.h" #include "resource.h" @@ -62,5 +59,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..4f0dbffefe 100644 --- a/Generals/Code/Tools/WorldBuilder/include/RampTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/RampTool.h @@ -32,9 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_RAMPTOOL_ -#define _H_RAMPTOOL_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Tool.h" // DEFINES //////////////////////////////////////////////////////////////////// @@ -64,6 +61,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..c19a42aab6 100644 --- a/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +101,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..d1e92e32d1 100644 --- a/Generals/Code/Tools/WorldBuilder/include/RoadTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/RoadTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, June 2001 #pragma once - -#ifndef RoadTool_H -#define RoadTool_H - #include "Tool.h" #include "W3DDevice/GameClient/WorldHeightMap.h" class WorldHeightMapEdit; @@ -58,6 +54,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..cdde39948e 100644 --- a/Generals/Code/Tools/WorldBuilder/include/SaveMap.h +++ b/Generals/Code/Tools/WorldBuilder/include/SaveMap.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +72,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..7566efd955 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +88,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..7eddd2d681 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h @@ -20,10 +20,6 @@ // Author: Dennis Griffin, April 2002 #pragma once - -#ifndef SCORCHTOOL_H -#define SCORCHTOOL_H - #include "Tool.h" class WorldHeightMapEdit; class MapObject; @@ -51,6 +47,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..5b839269d1 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -86,5 +82,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..7213a0294c 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -86,5 +82,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..c672b5eb2b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -91,5 +87,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..c3d63109c2 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +152,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..801ce27463 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -83,5 +79,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..daa83ea95c 100644 --- a/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h +++ b/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +59,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..0b4abd8164 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +65,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..a369f3c426 100644 --- a/Generals/Code/Tools/WorldBuilder/include/SplashScreen.h +++ b/Generals/Code/Tools/WorldBuilder/include/SplashScreen.h @@ -17,10 +17,6 @@ */ #pragma once - -#ifndef __SPLASHSCREEN_H__ -#define __SPLASHSCREEN_H__ - class SplashScreen : public CDialog { protected: @@ -40,5 +36,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..2818b2c28a 100644 --- a/Generals/Code/Tools/WorldBuilder/include/StdAfx.h +++ b/Generals/Code/Tools/WorldBuilder/include/StdAfx.h @@ -20,10 +20,6 @@ // or project specific include files that are used frequently, but // 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 +43,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..b450b88c74 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h +++ b/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +74,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..8bca0e4dd4 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h +++ b/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h @@ -17,10 +17,6 @@ */ #pragma once - -#ifndef __TEAMGENERIC_H__ -#define __TEAMGENERIC_H__ - class Dict; class TeamGeneric : public CPropertyPage @@ -48,5 +44,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..7576b9ed51 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h +++ b/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -96,5 +92,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..ff2437071c 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h +++ b/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +64,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..b3783c73cf 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h +++ b/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +107,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..40c35332ce 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h +++ b/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +76,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..62f64da9d3 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h +++ b/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +60,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..74a7f4c140 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TileTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/TileTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef TILETOOL_H -#define TILETOOL_H - #include "Tool.h" class WorldHeightMapEdit; /************************************************************************* @@ -69,4 +65,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..684fdc29e8 100644 --- a/Generals/Code/Tools/WorldBuilder/include/Tool.h +++ b/Generals/Code/Tools/WorldBuilder/include/Tool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef TOOL_H -#define TOOL_H - #include "Lib/BaseType.h" #include "Common/STLTypedefs.h" @@ -88,6 +84,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..b36ae226c5 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h +++ b/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +96,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/WBPopupSlider.h b/Generals/Code/Tools/WorldBuilder/include/WBPopupSlider.h index 3b9d38952a..7e0ccb0c11 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WBPopupSlider.h +++ b/Generals/Code/Tools/WorldBuilder/include/WBPopupSlider.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +174,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..237e8f24d3 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h +++ b/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef WHeightMapEdit_H -#define WHeightMapEdit_H - #include "W3DDevice/GameClient/WorldHeightMap.h" class DataChunkOutput; @@ -168,5 +164,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..ffc8c1feb6 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -102,5 +98,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..6460f2473d 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WaterTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/WaterTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, Nov. 2001 #pragma once - -#ifndef WaterTool_H -#define WaterTool_H - #include "PolygonTool.h" class WorldHeightMapEdit; class MapObject; @@ -62,6 +58,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..e68a536554 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -92,5 +88,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..5a8d35372a 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef WAYPOINTTOOL_H -#define WAYPOINTTOOL_H - #include "Tool.h" class WorldHeightMapEdit; class MapObject; @@ -58,6 +54,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..80300ace3a 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h +++ b/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h @@ -18,10 +18,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 +190,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..c4b475cbaf 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h +++ b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h @@ -19,10 +19,6 @@ // WorldBuilderDoc.h : interface of the CWorldBuilderDoc class // ///////////////////////////////////////////////////////////////////////////// - -#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 +207,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..47b274a47b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h +++ b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h @@ -19,10 +19,6 @@ // WorldBuilderView.h : interface of the CWorldBuilderView class // ///////////////////////////////////////////////////////////////////////////// - -#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 +155,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..19d8cc58f6 100644 --- a/Generals/Code/Tools/WorldBuilder/include/addplayerdialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/addplayerdialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +65,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..4527eedb5a 100644 --- a/Generals/Code/Tools/WorldBuilder/include/brushoptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/brushoptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +91,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..10616f7ea3 100644 --- a/Generals/Code/Tools/WorldBuilder/include/euladialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/euladialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +54,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..794c5e6bbc 100644 --- a/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h +++ b/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +149,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..452ab83f2a 100644 --- a/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h +++ b/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +82,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..d3ec4f0d00 100644 --- a/Generals/Code/Tools/WorldBuilder/include/propedit.h +++ b/Generals/Code/Tools/WorldBuilder/include/propedit.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +67,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..f0babef02e 100644 --- a/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +91,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..5ab404bbba 100644 --- a/Generals/Code/Tools/WorldBuilder/include/wbview.h +++ b/Generals/Code/Tools/WorldBuilder/include/wbview.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +239,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..28e1c243eb 100644 --- a/Generals/Code/Tools/WorldBuilder/include/wbview3d.h +++ b/Generals/Code/Tools/WorldBuilder/include/wbview3d.h @@ -19,10 +19,6 @@ // WbView3d.h // 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 +298,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..480cec67d9 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h @@ -44,10 +44,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 +273,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..136dadf1d0 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h @@ -33,10 +33,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ACTIONMANAGER_H_ -#define __ACTIONMANAGER_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/SubsystemInterface.h" @@ -111,5 +107,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..2ae5f881dd 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BattleHonors.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BattleHonors.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BATTLE_HONORS_H_ -#define __BATTLE_HONORS_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -120,5 +116,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..c7adc6c76b 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BezierSegment.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BezierSegment.h @@ -28,9 +28,6 @@ // DO NOT DISTRIBUTE #pragma once -#ifndef __BEZIERSEGMENT_H__ -#define __BEZIERSEGMENT_H__ - #include #include "Common/STLTypedefs.h" @@ -69,5 +66,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..3997a41f48 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BitFlags_H_ -#define __BitFlags_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" @@ -329,6 +325,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..82c0f404e3 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BitFlagsIO.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BitFlagsIO.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BitFlagsIO_H_ -#define __BitFlagsIO_H_ - #include "Common/BitFlags.h" #include "Common/INI.h" #include "Common/Xfer.h" @@ -229,5 +225,3 @@ void BitFlags::xfer(Xfer* xfer) } } - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h b/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h index 94445b7d95..70586f4776 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BUILDASSISTANT_H_ -#define __BUILDASSISTANT_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" #include "Lib/BaseType.h" @@ -215,6 +211,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..d803498d74 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ClientUpdateModule.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ClientUpdateModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ClientUpdateModule_H_ -#define __ClientUpdateModule_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include @@ -63,7 +59,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..149ff809a0 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/CommandLine.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/CommandLine.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, September 2001 #pragma once - -#ifndef _COMMAND_LINE_H_ -#define _COMMAND_LINE_H_ - class CommandLine { public: @@ -38,5 +34,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..7f31954a30 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/CriticalSection.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/CriticalSection.h @@ -27,10 +27,6 @@ // Author: JohnM And MattC, August 13, 2002 #pragma once - -#ifndef __CRITICALSECTION_H__ -#define __CRITICALSECTION_H__ - #include "Common/PerfTimer.h" #ifdef PERF_TIMERS @@ -104,5 +100,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..29377d2e46 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/CustomMatchPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/CustomMatchPreferences.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CUSTOMMATCHPREFERENCES_H__ -#define __CUSTOMMATCHPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -90,5 +86,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..2d43528fdb 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _DamageFX_H_ -#define _DamageFX_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameCommon.h" #include "Common/NameKeyGenerator.h" @@ -164,6 +160,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..79240aabc3 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DataChunk.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DataChunk.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, October 2000 #pragma once - -#ifndef _DATA_CHUNK_H_ -#define _DATA_CHUNK_H_ - #include "Common/GameMemory.h" #include "Common/Dict.h" #include "Common/MapReaderWriterInfo.h" @@ -232,7 +228,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..508ba3388d 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Dict.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Dict.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef Dict_H -#define Dict_H - #include "Common/Errors.h" #include "Common/NameKeyGenerator.h" @@ -362,7 +358,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..1ff185b46f 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Directory.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Directory.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #if (0) #pragma once - -#ifndef __DIRECTORY_H__ -#define __DIRECTORY_H__ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" #include "Common/STLTypedefs.h" @@ -90,6 +86,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..e0ed81dffc 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DISABLED_TYPES_H_ -#define __DISABLED_TYPES_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" @@ -114,6 +110,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..60cb96315a 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DiscreteCircle.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DiscreteCircle.h @@ -28,10 +28,6 @@ // DO NOT DISTRIBUTE #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 +70,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..7ee53477ac 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DRAWMODULE_H_ -#define __DRAWMODULE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Module.h" @@ -256,7 +252,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..fe09acaed5 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Energy.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Energy.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef _ENERGY_H_ -#define _ENERGY_H_ - // INLCUDES ///////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" @@ -123,6 +119,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..77a80d0172 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Errors.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Errors.h @@ -44,10 +44,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 +64,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..b88922c93b 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/FunctionLexicon.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/FunctionLexicon.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __FUNCTIONLEXICON_H_ -#define __FUNCTIONLEXICON_H_ - #include "Common/SubsystemInterface.h" #include "Common/NameKeyGenerator.h" #include "Common/GameMemory.h" @@ -149,6 +145,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..79d8a9d1fc 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h @@ -47,10 +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 @@ -508,6 +504,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..c32562bfd4 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, April 2001 #pragma once - -#ifndef _GAME_ENGINE_H_ -#define _GAME_ENGINE_H_ - #include "Common/SubsystemInterface.h" #include "Common/GameType.h" @@ -117,5 +113,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..71abfb9369 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h @@ -32,10 +32,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 +253,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..a149416368 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAMESPYMISCPREFERENCES_H__ -#define __GAMESPYMISCPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -57,5 +53,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..749ba1fb66 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameState.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameState.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAME_STATE_H_ -#define __GAME_STATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" #include "Common/Snapshot.h" @@ -238,6 +234,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..2259b0b1e8 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameStateMap.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameStateMap.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAME_STATE_MAP_H_ -#define __GAME_STATE_MAP_H_ - // INLCUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" #include "Common/SubsystemInterface.h" @@ -69,5 +65,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..8a0250f286 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameType.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameType.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, April 2001 #pragma once - -#ifndef _GAME_TYPE_H_ -#define _GAME_TYPE_H_ - #include "Lib/BaseType.h" // the default size of the world map @@ -192,6 +188,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..673ba7c849 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GEOMETRY_H_ -#define __GEOMETRY_H_ - #include "Lib/BaseType.h" #include "Common/AsciiString.h" #include "Common/Snapshot.h" @@ -195,6 +191,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..edaa5d6ebd 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h @@ -28,10 +28,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 +594,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..fd4173c5b2 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Handicap.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Handicap.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef _HANDICAP_H_ -#define _HANDICAP_H_ - #include "Lib/BaseType.h" // ---------------------------------------------------------------------------------------------- @@ -117,5 +113,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..3678f88e33 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/INI.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/INI.h @@ -28,10 +28,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 +422,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..1f163ab5d1 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/IgnorePreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/IgnorePreferences.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __IGNORE_PREFERENCES_H_ -#define __IGNORE_PREFERENCES_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -82,5 +78,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..b7d2b9c6bc 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __KINDOF_H_ -#define __KINDOF_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" @@ -219,6 +215,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..3bc8feba95 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/LadderPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/LadderPreferences.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __LADDERPREFERENCES_H__ -#define __LADDERPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -76,5 +72,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..9b75a3c70f 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Language.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Language.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __LANGUAGE_H_ -#define __LANGUAGE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -102,6 +98,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..faaeae6573 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/LatchRestore.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/LatchRestore.h @@ -29,10 +29,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 +107,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..109e1a3166 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MapObject.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MapObject.h @@ -28,10 +28,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef MapObject_H -#define MapObject_H - #include "Common/Dict.h" #include "Common/GameMemory.h" #include "GameClient/TerrainRoads.h" @@ -183,6 +179,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..6e47d179b3 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h @@ -27,10 +27,6 @@ // Author: John Ahlquist, October 2001 #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 +115,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..6f4304d4cc 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, February 2001 #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 +836,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..b60656692d 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MissionStats.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MissionStats.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef _MISSIONSTATS_H_ -#define _MISSIONSTATS_H_ - #include "Lib/BaseType.h" #include "Common/GameCommon.h" #include "Common/Snapshot.h" @@ -85,6 +81,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..5951756ed5 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, April 2001 #pragma once - -#ifndef _ModelState_H_ -#define _ModelState_H_ - #include "Lib/BaseType.h" #include "Common/INI.h" #include "Common/BitFlags.h" @@ -260,6 +256,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..360ecdf007 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Module.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Module.h @@ -30,10 +30,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __MODULE_H_ -#define __MODULE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" @@ -318,7 +314,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..a1009a3597 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h @@ -35,10 +35,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __MODULEFACTORY_H_ -#define __MODULEFACTORY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include @@ -126,6 +122,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..1266be3e07 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Money.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Money.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef _MONEY_H_ -#define _MONEY_H_ - #include "Lib/BaseType.h" #include "Common/Debug.h" #include "Common/Snapshot.h" @@ -106,6 +102,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..9157c3ab88 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MultiplayerSettings.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MultiplayerSettings.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _MULTIPLAYERSETTINGS_H_ -#define _MULTIPLAYERSETTINGS_H_ - #include "GameClient/Color.h" #include "Common/Money.h" @@ -143,5 +139,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..b642d24120 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __NAMEKEYGENERATOR_H_ -#define __NAMEKEYGENERATOR_H_ - #include "Lib/BaseType.h" #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" @@ -158,6 +154,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..bdafe6189c 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h @@ -27,10 +27,6 @@ // Do Not Distribute #pragma once - -#ifndef __OSDISPLAY_H__ -#define __OSDISPLAY_H__ - #include "Lib/BaseType.h" class AsciiString; @@ -66,5 +62,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..c358799dc0 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __OBJECT_STATUS_TYPES_H -#define __OBJECT_STATUS_TYPES_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" @@ -141,5 +137,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..96c8612f5d 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h @@ -27,10 +27,6 @@ // Do Not Distribute #pragma once - -#ifndef _OVERRIDABLE_H_ -#define _OVERRIDABLE_H_ - #include "Common/GameMemory.h" /* @@ -124,6 +120,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..f511ecd5ce 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Override.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Override.h @@ -27,10 +27,6 @@ // Do Not Distribute #pragma once - -#ifndef _OVERRIDE_H_ -#define _OVERRIDE_H_ - #include "Common/Overridable.h" /* @@ -136,6 +132,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..ead1e8013b 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h @@ -38,9 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_PARTITIONSOLVER_ -#define _H_PARTITIONSOLVER_ - // INCLUDES /////////////////////////////////////////////////////////////////// // DEFINES //////////////////////////////////////////////////////////////////// @@ -83,5 +80,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..d075af3471 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/PerfMetrics.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/PerfMetrics.h @@ -27,10 +27,6 @@ // Do Not Distribute #pragma once - -#ifndef __PERFMETRICS_H__ -#define __PERFMETRICS_H__ - // For load timings enum { PERFMETRICS_LOAD_STARTFRAME = 0 }; enum { PERFMETRICS_LOAD_STOPFRAME = 1 }; @@ -42,7 +38,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..46a58879d4 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h @@ -27,10 +27,6 @@ // July 2002 #pragma once - -#ifndef __PERFTIMER_H__ -#define __PERFTIMER_H__ - #include "Utility/intrin_compat.h" #if defined(RTS_DEBUG) @@ -321,5 +317,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..96f42e10e7 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Player.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Player.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef _PLAYER_H_ -#define _PLAYER_H_ - #include "Common/AcademyStats.h" #include "Common/Debug.h" #include "Common/Energy.h" @@ -832,5 +828,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..4a55d136ad 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef _PLAYERLIST_H_ -#define _PLAYERLIST_H_ - #include "Common/SubsystemInterface.h" #include "Common/GameCommon.h" #include "Common/NameKeyGenerator.h" @@ -171,5 +167,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..4da97ac433 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/PlayerTemplate.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/PlayerTemplate.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef _PLAYERTEMPLATE_H_ -#define _PLAYERTEMPLATE_H_ - #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" #include "Common/Debug.h" @@ -233,5 +229,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..0abc05fcee 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ProductionPrerequisite.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ProductionPrerequisite.h @@ -41,10 +41,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef __ProductionPrerequisite_H_ -#define __ProductionPrerequisite_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -121,5 +117,3 @@ class ProductionPrerequisite }; //----------------------------------------------------------------------------- - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/Common/QuickmatchPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/QuickmatchPreferences.h index 72b14c9c3e..647fcf027a 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/QuickmatchPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/QuickmatchPreferences.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __QUICKMATCHPREFERENCES_H__ -#define __QUICKMATCHPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -78,5 +74,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..3e15273170 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/QuotedPrintable.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/QuotedPrintable.h @@ -28,14 +28,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..aeac1cac73 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Radar.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Radar.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __RADAR_H_ -#define __RADAR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/SubsystemInterface.h" @@ -313,8 +309,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/Registry.h b/GeneralsMD/Code/GameEngine/Include/Common/Registry.h index 1949270243..7cd090509b 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Registry.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Registry.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, December 2001 #pragma once - -#ifndef __REGISTRY_H__ -#define __REGISTRY_H__ - #include /** @@ -51,5 +47,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..806e0e8c69 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ResourceGatheringManager.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ResourceGatheringManager.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef RESOURCE_GATHER_MANAGER_H -#define RESOURCE_GATHER_MANAGER_H - #include "Common/GameType.h" #include "Common/Snapshot.h" @@ -72,5 +68,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..d59ecd568b 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef __STLTYPEDEFS_H__ -#define __STLTYPEDEFS_H__ - //----------------------------------------------------------------------------- // srj sez: this must come first, first, first. #define _STLP_USE_NEWALLOC 1 @@ -297,5 +293,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..4c1df1b4fc 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Science.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Science.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SCIENCE_H_ -#define __SCIENCE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Overridable.h" #include "Common/NameKeyGenerator.h" @@ -134,7 +130,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..bf84e4e3ae 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ScopedMutex.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ScopedMutex.h @@ -22,10 +22,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SCOPEDMUTEX_H__ -#define __SCOPEDMUTEX_H__ - class ScopedMutex { private: @@ -45,5 +41,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..1422ec6092 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SCOREKEEPER_H_ -#define __SCOREKEEPER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -141,5 +137,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..cdda6e34c1 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SKIRMISHBATTLEHONORS_H__ -#define __SKIRMISHBATTLEHONORS_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -108,5 +104,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..d4126ee463 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SKIRMISHPREFERENCES_H__ -#define __SKIRMISHPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -64,5 +60,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..59ec10bd8f 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Snapshot.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Snapshot.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SNAPSHOT_H_ -#define __SNAPSHOT_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" @@ -68,6 +64,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..913efb1d90 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SparseMatchFinder_H_ -#define __SparseMatchFinder_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/BitFlags.h" #include "Common/STLTypedefs.h" @@ -245,6 +241,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..f12b5c423b 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SPECIALPOWER_H_ -#define __SPECIALPOWER_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameMemory.h" @@ -191,5 +187,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..690b8f6740 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerMaskType.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerMaskType.h @@ -27,13 +27,8 @@ // 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..7f9811cb83 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h @@ -27,9 +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 +131,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..b45e3b225f 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h @@ -23,10 +23,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 +65,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..2797b75d5f 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, January 2002 #pragma once - -#ifndef _STATE_MACHINE_H_ -#define _STATE_MACHINE_H_ - #include "Common/GameMemory.h" #include "Common/GameType.h" #include "Common/ModelState.h" @@ -488,6 +484,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..f6dc5085e7 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/StatsCollector.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/StatsCollector.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __STATSCOLLECTOR_H_ -#define __STATSCOLLECTOR_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -119,5 +115,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..acf82b7027 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SubsystemInterface.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SubsystemInterface.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SUBSYSTEMINTERFACE_H_ -#define __SUBSYSTEMINTERFACE_H_ - #include "Common/INI.h" #include "Common/STLTypedefs.h" @@ -169,6 +165,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..ed01134e92 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SystemInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SystemInfo.h @@ -27,12 +27,4 @@ // Author: John K. McDonald, December 2002 #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..eb7ace0a2d 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Team.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Team.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, Steven Johnson, March 2001 #pragma once - -#ifndef _TEAM_H_ -#define _TEAM_H_ - #include "Common/GameType.h" #include "Common/Snapshot.h" #include "Common/Thing.h" @@ -756,5 +752,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..83fb7e319e 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Terrain.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Terrain.h @@ -31,15 +31,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..7afbc2a5e1 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TERRAINTYPE_H_ -#define __TERRAINTYPE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "Common/SubsystemInterface.h" @@ -243,6 +239,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..626f19f46c 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Thing.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Thing.h @@ -47,10 +47,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef __THING_H_ -#define __THING_H_ - //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- @@ -197,6 +193,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..1d7387923d 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __THINGFACTORY_H_ -#define __THINGFACTORY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" @@ -134,7 +130,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..08ebe6e756 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __THINGSORT_H_ -#define __THINGSORT_H_ - #include "GameCommon.h" //------------------------------------------------------------------------------------------------- @@ -78,6 +74,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..efe3e6cb0f 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __THINGTEMPLATE_H_ -#define __THINGTEMPLATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" @@ -787,6 +783,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..ab091d10c1 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h @@ -28,10 +28,6 @@ // Author: Graham Smallwood, March, 2002 #pragma once - -#ifndef TUNNEL_TRACKER_H -#define TUNNEL_TRACKER_H - #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/Snapshot.h" @@ -95,5 +91,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..74d48bb876 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __UPGRADE_H_ -#define __UPGRADE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" @@ -266,5 +262,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..fb65c9801e 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __USERPREFERENCES_H__ -#define __USERPREFERENCES_H__ - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -176,5 +172,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..28bc5ac4db 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/WellKnownKeys.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/WellKnownKeys.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _H_WELLKNOWNKEYS -#define _H_WELLKNOWNKEYS - #include "Common/NameKeyGenerator.h" #ifdef INSTANTIATE_WELL_KNOWN_KEYS @@ -920,5 +916,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..b25a63b48b 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/encrypt.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/encrypt.h @@ -27,17 +27,9 @@ // Author: Anonymous #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..8ddee64335 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/version.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/version.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, November 2001 #pragma once - -#ifndef __VERSION_H__ -#define __VERSION_H__ - #include /** @@ -120,5 +116,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..4f5da351a6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ANIM_2D_H_ -#define __ANIM_2D_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" @@ -222,5 +218,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..4449bccefe 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h @@ -46,10 +46,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ANIMATEWINDOWMANAGER_H_ -#define __ANIMATEWINDOWMANAGER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -236,5 +232,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..3078e3e8f4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/CDCheck.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/CDCheck.h @@ -28,13 +28,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..e8748e856e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CAMPAIGN_MANAGER_H_ -#define __CAMPAIGN_MANAGER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -176,5 +172,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..5b60824d1d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Color.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Color.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __COLOR_H_ -#define __COLOR_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -88,6 +84,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..a3101e483a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, Dec 2001 #pragma once - -#ifndef _H_CommandXlat -#define _H_CommandXlat - #include "GameClient/InGameUI.h" enum GUICommandType CPP_11(: Int); @@ -125,5 +121,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..3b361e9294 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CONTROLBAR_H_ -#define __CONTROLBAR_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameType.h" @@ -1049,6 +1045,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..c4c8b40766 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarResizer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarResizer.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CONTROL_BAR_RESIZER_H_ -#define __CONTROL_BAR_RESIZER_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -103,5 +99,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..b411d2ba50 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CONTROL_BAR_SCHEME_H_ -#define __CONTROL_BAR_SCHEME_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -289,5 +285,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..6a256da077 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Credits.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Credits.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CREDITS_H_ -#define __CREDITS_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -165,4 +161,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..830fffbac0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Diplomacy.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Diplomacy.h @@ -27,14 +27,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..f9deb9870b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h @@ -24,10 +24,6 @@ #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..ce32defa1f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, March 2001 #pragma once - -#ifndef _GAME_DISPLAY_H_ -#define _GAME_DISPLAY_H_ - #include #include "Common/SubsystemInterface.h" #include "View.h" @@ -235,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/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayString.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayString.h index a500097618..5543170731 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayString.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayString.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DISPLAYSTRING_H_ -#define __DISPLAYSTRING_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -129,6 +125,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..b7fb2e99b9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayStringManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayStringManager.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DISPLAYSTRINGMANAGER_H_ -#define __DISPLAYSTRINGMANAGER_H_ - #include "Common/SubsystemInterface.h" #include "GameClient/DisplayString.h" @@ -66,6 +62,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..ec01643086 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DrawGroupInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DrawGroupInfo.h @@ -27,9 +27,6 @@ // Author: John K. McDonald, March 2002 #pragma once -#ifndef _H_DRAWGROUPINFO_ -#define _H_DRAWGROUPINFO_ - struct DrawGroupInfo { AsciiString m_fontName; @@ -64,5 +61,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..4103ac180b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h @@ -27,9 +27,6 @@ // Author: Michael S. Booth, March 2001 #pragma once -#ifndef _DRAWABLE_H_ -#define _DRAWABLE_H_ - #include "Common/AudioEventRTS.h" #include "Common/GameType.h" #include "Common/ModelState.h" @@ -804,5 +801,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..38d077863c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DrawableInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DrawableInfo.h @@ -27,9 +27,6 @@ // Author: Mark Wilczynski, August 2002 #pragma once -#ifndef _DRAWABLEINFO_H_ -#define _DRAWABLEINFO_H_ - #include "Common/GameType.h" class Drawable; @@ -55,5 +52,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..f490731ea7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetComboBox.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetComboBox.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETCOMBOBOX_H_ -#define __GADGETCOMBOBOX_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -193,6 +189,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..0adad45eb5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetListBox.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetListBox.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETLISTBOX_H_ -#define __GADGETLISTBOX_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -208,6 +204,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..6e32fb72f5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetProgressBar.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetProgressBar.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETPROGRESSBAR_H_ -#define __GADGETPROGRESSBAR_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -141,6 +137,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..e214552529 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetPushButton.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetPushButton.h @@ -57,10 +57,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETPUSHBUTTON_H_ -#define __GADGETPUSHBUTTON_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -172,6 +168,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..286d599da5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetRadioButton.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetRadioButton.h @@ -63,10 +63,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETRADIOBUTTON_H_ -#define __GADGETRADIOBUTTON_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -147,6 +143,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..08d93aca90 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetSlider.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetSlider.h @@ -52,10 +52,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETSLIDER_H_ -#define __GADGETSLIDER_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -440,6 +436,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..87c0643541 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetStaticText.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetStaticText.h @@ -54,10 +54,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETSTATICTEXT_H_ -#define __GADGETSTATICTEXT_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -101,6 +97,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..e40885424b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTabControl.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTabControl.h @@ -43,10 +43,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETTABCONTROL_H_ -#define __GADGETTABCONTROL_H_ - enum { GTC_BACKGROUND = 0, @@ -274,6 +270,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..2e53376e9a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTextEntry.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTextEntry.h @@ -49,10 +49,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GADGETTEXTENTRY_H_ -#define __GADGETTEXTENTRY_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -124,6 +120,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..5c965a29ca 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, March 2001 #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 +302,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..17151a94a7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameFont.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameFont.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAMEFONT_H_ -#define __GAMEFONT_H_ - #include "Common/SubsystemInterface.h" #include "Lib/BaseType.h" #include "Common/AsciiString.h" @@ -106,6 +102,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..a36251a769 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameInfoWindow.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameInfoWindow.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAMEINFOWINDOW_H_ -#define __GAMEINFOWINDOW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/GameWindow.h" #include "GameNetwork/LANGameInfo.h" @@ -41,6 +37,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..78b8fea190 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAMEWINDOW_H_ -#define __GAMEWINDOW_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -504,6 +500,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..04165870ed 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowGlobal.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowGlobal.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAMEWINDOWGLOBAL_H_ -#define __GAMEWINDOWGLOBAL_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -64,6 +60,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..acf4cda766 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowID.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowID.h @@ -46,10 +46,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAMEWINDOWID_H_ -#define __GAMEWINDOWID_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -84,6 +80,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..807adc2ce6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GAME_WINDOW_TRANSITIONS_H_ -#define __GAME_WINDOW_TRANSITIONS_H_ - #include "Common/GameCommon.h" //----------------------------------------------------------------------------- @@ -696,5 +692,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..17247a5f0c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GlobalLanguage.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GlobalLanguage.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GLOBAL_LANGUAGE_H_ -#define __GLOBAL_LANGUAGE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -123,4 +119,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..684c07697d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GraphDraw.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GraphDraw.h @@ -47,9 +47,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once -#ifndef __GRAPHDRAW_H__ -#define __GRAPHDRAW_H__ - #include "Common/PerfTimer.h" #include "Common/STLTypedefs.h" @@ -85,6 +82,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..3a4d5535ee 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/HeaderTemplate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/HeaderTemplate.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HEADER_TEMPLATE_H_ -#define __HEADER_TEMPLATE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -116,4 +112,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..c69d1b7263 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, Dec 2001 #pragma once - -#ifndef _H_HintSpy -#define _H_HintSpy - #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- @@ -39,5 +35,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..1a0137abf6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HOT_KEY_H_ -#define __HOT_KEY_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -113,6 +109,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..44dda0b7e4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __IMAGE_H_ -#define __IMAGE_H_ - #include "Common/AsciiString.h" #include "Common/GameMemory.h" #include "Common/SubsystemInterface.h" @@ -169,6 +165,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..3fc1c94f77 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h @@ -29,10 +29,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 +927,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..e631167230 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h @@ -52,10 +52,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __KEYDEFS_H_ -#define __KEYDEFS_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #ifndef DIRECTINPUT_VERSION @@ -257,5 +253,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..d322d697ae 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Keyboard.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Keyboard.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __KEYBOARD_H_ -#define __KEYBOARD_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -168,5 +164,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..82c16293fa 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/LanguageFilter.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/LanguageFilter.h @@ -24,10 +24,6 @@ #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..2e14a745fe 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Line2D.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Line2D.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __LINE2D_H_ -#define __LINE2D_H_ - typedef std::vector Coord2DVector; typedef std::vector Coord3DVector; @@ -85,7 +81,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..8b4b0d6594 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/LoadScreen.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/LoadScreen.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _LOADSCREEN_H_ -#define _LOADSCREEN_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -327,5 +323,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..9b7a1d7221 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, Dec 2001 #pragma once - -#ifndef _H_LookAtXlat -#define _H_LookAtXlat - #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- @@ -91,5 +87,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..877aa7609f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/MapUtil.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/MapUtil.h @@ -28,10 +28,6 @@ //////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __MAPUTIL_H__ -#define __MAPUTIL_H__ - #include "Common/AsciiString.h" #include "Common/UnicodeString.h" @@ -135,4 +131,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..f320e8d026 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/MessageBox.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/MessageBox.h @@ -28,10 +28,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 +43,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..585c99392a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, Dec 2001 #pragma once - -#ifndef _H_MetaEvent -#define _H_MetaEvent - #include "Common/SubsystemInterface.h" #include "GameClient/InGameUI.h" @@ -402,5 +398,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..57bba3f2f5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ANIMPARTICLESYSBONEUPDATE_H_ -#define __ANIMPARTICLESYSBONEUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" @@ -59,6 +55,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..300cfb554c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BEACONCLIENTUPDATE_H_ -#define __BEACONCLIENTUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" @@ -75,6 +71,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..a52f6501b8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SWAYCLIENTUPDATE_H_ -#define __SWAYCLIENTUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" @@ -70,6 +66,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..aed40853fc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __MOUSE_H_ -#define __MOUSE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -441,5 +437,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..1fe13b8cad 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ParabolicEase.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ParabolicEase.h @@ -24,8 +24,6 @@ // Author: Robert Minsk May 12, 2003 // ============================================================================ #pragma once -#ifndef _PARABOLICEASE_H -#define _PARABOLICEASE_H // ============================================================================ #include "Lib/BaseType.h" // ============================================================================ @@ -89,4 +87,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..f2f3b80841 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _PARTICLE_SYS_H_ -#define _PARTICLE_SYS_H_ - #include #include "Common/AsciiString.h" #include "Common/GameMemory.h" @@ -822,6 +818,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..e7576b2b84 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, Dec 2001 #pragma once - -#ifndef _H_PlaceEventTranslator -#define _H_PlaceEventTranslator - #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- @@ -43,5 +39,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..96383191f4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h @@ -49,10 +49,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __PROCESSANIMATEWINDOW_H_ -#define __PROCESSANIMATEWINDOW_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -265,5 +261,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..e3a5c048f8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h @@ -26,10 +26,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _RadiusDecal_H_ -#define _RadiusDecal_H_ - #include "Common/GameCommon.h" #include "Common/GameType.h" #include "GameClient/Color.h" @@ -91,5 +87,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..ea8c1103e2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __RAYEFFECT_H_ -#define __RAYEFFECT_H_ - // INCLUDE //////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/SubsystemInterface.h" @@ -91,6 +87,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..e7808bbbaf 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionInfo.h @@ -27,10 +27,6 @@ // Author: John McDonald, Jr, October 2002 #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 +98,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..c649519544 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, Dec 2001 #pragma once - -#ifndef _H_SelectionXlat -#define _H_SelectionXlat - #include "GameClient/InGameUI.h" class ThingTemplate; @@ -83,5 +79,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..7eac0d6462 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SHADOW_H_ -#define __SHADOW_H_ - // // skeleton definition of shadow types // @@ -213,6 +209,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..f50016c730 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h @@ -93,10 +93,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SHELL_H_ -#define __SHELL_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// // FORWARD REFERENCES ///////////////////////////////////////////////////////////////////////////// @@ -206,6 +202,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..f5f357b27c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ShellHooks.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ShellHooks.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, October 2002 #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 +78,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..0ed3ae15ab 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ShellMenuScheme.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ShellMenuScheme.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SHELL_MENU_SCHEME_H_ -#define __SHELL_MENU_SCHEME_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -153,5 +149,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..ca4f106b69 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Smudge.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Smudge.h @@ -19,10 +19,6 @@ // FILE: Smudge.h ///////////////////////////////////////////////////////// #pragma once - -#ifndef _SMUDGE_H_ -#define _SMUDGE_H_ - #include "WW3D2/dllist.h" #include "WWMath/vector2.h" #include "WWMath/vector3.h" @@ -97,5 +93,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..306bff3fef 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/WinInstanceData.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/WinInstanceData.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WININSTANCEDATA_H_ -#define __WININSTANCEDATA_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -216,6 +212,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..3706421bce 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowLayout.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowLayout.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WINDOWLAYOUT_H_ -#define __WINDOWLAYOUT_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameClient/GameWindow.h" @@ -121,6 +117,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..fde735c5ed 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, Dec 2001 #pragma once - -#ifndef _H_WindowXlat -#define _H_WindowXlat - #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- @@ -42,5 +38,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..05c846a75c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, November 2000 #pragma once - -#ifndef _AI_H_ -#define _AI_H_ - #include "Common/Snapshot.h" #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" @@ -1055,6 +1051,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..845728d988 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, February 2002 #pragma once - -#ifndef _AI_DOCK_H_ -#define _AI_DOCK_H_ - #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" @@ -203,6 +199,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..1f7a0b64da 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h @@ -38,9 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_AIGUARD_ -#define _H_AIGUARD_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" @@ -272,5 +269,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..cbc104e47a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h @@ -36,9 +36,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef __AI_GUARD_RETALIATION_H -#define __AI_GUARD_RETALIATION_H - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" @@ -257,5 +254,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..ebdde46ed7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, October 2001 #pragma once - -#ifndef _PATHFIND_H_ -#define _PATHFIND_H_ - #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/Snapshot.h" @@ -988,6 +984,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..8d6fd29e59 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, January 2002 #pragma once - -#ifndef _AI_PLAYER_H_ -#define _AI_PLAYER_H_ - #include "Common/GameMemory.h" #include "Common/Snapshot.h" @@ -297,8 +293,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..74cb95d3dc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, January 2002 #pragma once - -#ifndef _AI_SKIRMISH_PLAYER_H_ -#define _AI_SKIRMISH_PLAYER_H_ - #include "Common/GameMemory.h" #include "GameLogic/AIPlayer.h" @@ -118,8 +114,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..0880dada29 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, January 2002 #pragma once - -#ifndef _AI_STATE_MACHINE_H_ -#define _AI_STATE_MACHINE_H_ - #include "Lib/BaseType.h" #include "Common/AudioEventRTS.h" @@ -1327,5 +1323,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..2221daef2e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h @@ -38,9 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_AITNGUARD_ -#define _H_AITNGUARD_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" @@ -246,5 +243,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..3fe9582c72 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _Armor_H_ -#define _Armor_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" #include "Common/STLTypedefs.h" @@ -129,6 +125,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..86d720fac5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h @@ -25,10 +25,6 @@ // ArmorSet.h #pragma once - -#ifndef _ArmorSet_H_ -#define _ArmorSet_H_ - #include "Lib/BaseType.h" #include "Common/GameType.h" #include "Common/SparseMatchFinder.h" @@ -96,5 +92,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..54b73a09ae 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h @@ -28,10 +28,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 +69,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..14f333e0ea 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h @@ -28,10 +28,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 +109,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..0365da6d0b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DAMAGE_H_ -#define __DAMAGE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/BitFlags.h" #include "Common/GameType.h" @@ -372,6 +368,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..e35349ca85 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h @@ -28,10 +28,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 +71,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..204242cf5b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/FPUControl.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/FPUControl.h @@ -28,15 +28,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..c07870d05d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h @@ -28,10 +28,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 +87,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..577794f019 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h @@ -28,10 +28,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 +449,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..9336cf5542 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h @@ -28,10 +28,6 @@ // Author: Mark Wilczynski, August 2002 #pragma once - -#ifndef _GHOSTOBJECT_H_ -#define _GHOSTOBJECT_H_ - #include "Lib/BaseType.h" #include "Common/Snapshot.h" @@ -113,5 +109,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..0bc8c9bb40 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __Locomotor_H_ -#define __Locomotor_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" #include "Common/Override.h" @@ -513,6 +509,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..ced72e7e30 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h @@ -28,10 +28,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 +106,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..df1abb3ff4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, 2001-2002 #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 +798,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..49892bab4e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ACTIVEBODY_H_ -#define __ACTIVEBODY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DamageFX.h" #include "GameLogic/Module/BodyModule.h" @@ -174,6 +170,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..90651625f6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ACTIVE_SHROUD_UPGRADE_H_ -#define __ACTIVE_SHROUD_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -75,6 +71,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..3ae9da0649 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ANIMATION_STEERING_UPDATE_H -#define __ANIMATION_STEERING_UPDATE_H - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -83,5 +79,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..cae5375337 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ARMOR_UPGRADE_H_ -#define __ARMOR_UPGRADE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -90,5 +86,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..72b487e171 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h @@ -29,10 +29,6 @@ // injured troops to return to the transport for healing purposes. #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 +119,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..43b3d5b9cc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _ASSISTED_TARGETING_UPDATE_H -#define _ASSISTED_TARGETING_UPDATE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -82,6 +78,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..e823d5b797 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __AUTO_DEPOSIT_UPDATE_H_ -#define __AUTO_DEPOSIT_UPDATE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -140,5 +136,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..0c7cbf7551 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h @@ -28,10 +28,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 +76,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..4b4f4109c3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h @@ -32,10 +32,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __AutoHealBehavior_H_ -#define __AutoHealBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/BehaviorModule.h" @@ -189,6 +185,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..cd7017978c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BAIKONUR_LAUNCH_POWER_H_ -#define __BAIKONUR_LAUNCH_POWER_H_ - #include "GameLogic/Module/SpecialPowerModule.h" class Object; @@ -85,5 +81,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..5289e71a06 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h @@ -28,10 +28,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 +77,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..e1361b0347 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h @@ -28,10 +28,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 +84,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..aa4391c6b3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h @@ -28,10 +28,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 +186,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..6a2153adfc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BehaviorModule_H_ -#define __BehaviorModule_H_ - #include "Common/GameType.h" #include "Common/Module.h" @@ -285,5 +281,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..36f612ddf4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BODYMODULE_H_ -#define __BODYMODULE_H_ - #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/ArmorSet.h" @@ -310,5 +306,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..cfbd7c1cbd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BONEFXDAMAGE_H_ -#define __BONEFXDAMAGE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DamageModule.h" @@ -66,5 +62,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..ed84e2edd7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BONEFXUPDATE_H_ -#define __BONEFXUPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/UpdateModule.h" @@ -277,5 +273,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..34df12bf85 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BRIDGE_BEHAVIOR_H_ -#define __BRIDGE_BEHAVIOR_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameClient/TerrainRoads.h" @@ -197,5 +193,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..f6189fec8c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h @@ -28,10 +28,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 +108,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..3ad1e49c28 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h @@ -28,10 +28,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 +91,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..1638f2f684 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __BUNKERBUSTER_BEHAVIOR_H_ -#define __BUNKERBUSTER_BEHAVIOR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpdateModule.h" @@ -102,6 +98,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..79113685d1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h @@ -43,10 +43,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CashBountyPower_H_ -#define __CashBountyPower_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -127,5 +123,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..374e9f0bf3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CASHHACKSPECIALPOWER_H_ -#define __CASHHACKSPECIALPOWER_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" @@ -85,6 +81,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..5976a33cf6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h @@ -30,10 +30,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CAVE_CONTAIN_H_ -#define __CAVE_CONTAIN_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" #include "GameLogic/Module/OpenContain.h" @@ -127,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/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h index 1c20f58b44..67cd463dea 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef CHECKPOINT_UPDATE_H -#define CHECKPOINT_UPDATE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" @@ -88,6 +84,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..9c5b6d3fc6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, June 2002 #pragma once - -#ifndef _ChinookAIUpdate_H_ -#define _ChinookAIUpdate_H_ - #include "GameLogic/AIStateMachine.h" #include "GameLogic/Module/SupplyTruckAIUpdate.h" @@ -140,6 +136,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..5cf3203bd3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h @@ -42,10 +42,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CLEANUP_AREA_POWER_H_ -#define __CLEANUP_AREA_POWER_H_ - //----------------------------------------------------------------------------- #include "GameLogic/Module/SpecialPowerModule.h" @@ -75,5 +71,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..ada1b33a73 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h @@ -28,10 +28,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 +87,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..9edd74887e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CollideModule_H_ -#define __CollideModule_H_ - #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" @@ -102,5 +98,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..f75e7861c1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h @@ -28,10 +28,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 +82,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..9399c13d08 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _COMMAND_SET_UPGRADE_H -#define _COMMAND_SET_UPGRADE_H - #include "GameLogic/Module/UpgradeModule.h" //----------------------------------------------------------------------------- @@ -69,6 +65,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..0e941cf1fb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h @@ -28,10 +28,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 +206,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..8ce91fc432 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h @@ -29,10 +29,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 +85,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..54da943142 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h @@ -32,10 +32,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 +79,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..7efe71859d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __COST_MODIFIER_UPGRADE_H_ -#define __COST_MODIFIER_UPGRADE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -115,5 +111,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..eb7c7e35c5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h @@ -29,10 +29,6 @@ //------------------------------------------ #pragma once - -#ifndef __COUNTERMEASURES_BEHAVIOR_H -#define __COUNTERMEASURES_BEHAVIOR_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/BehaviorModule.h" @@ -192,6 +188,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..e18c315e42 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef CRATE_COLLIDE_H_ -#define CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" @@ -109,5 +105,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..f37aa72109 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h @@ -28,10 +28,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 +92,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..2b7049e5b2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CreateModule_H_ -#define __CreateModule_H_ - #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" @@ -85,5 +81,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..184c4a60eb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h @@ -28,10 +28,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 +69,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..2f40c941e3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __CrushDie_H_ -#define __CrushDie_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" @@ -101,6 +97,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..dcced1e8de 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DAMDIE_H_ -#define __DAMDIE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" @@ -64,5 +60,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..ba82a5c059 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DamageModule_H_ -#define __DamageModule_H_ - #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/Module/BehaviorModule.h" @@ -113,5 +109,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..02d72a69d1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h @@ -29,10 +29,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 +125,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..4984074b0c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h @@ -31,10 +31,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DEFECTORSPECIALPOWER_H_ -#define __DEFECTORSPECIALPOWER_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" @@ -81,5 +77,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..d36577dd2e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DELETION_UPDATE_H_ -#define __DELETION_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -86,6 +82,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..abc92ebac9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h @@ -27,10 +27,6 @@ // Desc: State machine that controls the approach and deployment of airborne cargo #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 +379,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..336c320a6b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h @@ -28,10 +28,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 +82,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..05c0174726 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DEMORALIZE_SPECIAL_POWER_H_ -#define __DEMORALIZE_SPECIAL_POWER_H_ - #ifdef ALLOW_DEMORALIZE // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// @@ -82,6 +78,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..42106054c7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h @@ -28,10 +28,6 @@ // When deployed, you can't move, when undeployed, you can't attack. #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 +112,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..a04f89fdc7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DestroyDie_H_ -#define __DestroyDie_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "Common/INI.h" @@ -53,6 +49,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..6b877506df 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DestroyModule_H_ -#define __DestroyModule_H_ - #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" @@ -66,5 +62,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..87f295821b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DieModule_H_ -#define __DieModule_H_ - #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/Module/BehaviorModule.h" @@ -108,5 +104,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..a3133d3c3a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _DOCK_UPDATE_H_ -#define _DOCK_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" @@ -156,5 +152,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..d2772a2c72 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DOZERAIUPDATE_H_ -#define __DOZERAIUPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/AIUpdate.h" @@ -305,7 +301,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..f81bf66020 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h @@ -27,10 +27,6 @@ // Desc: #pragma once - -#ifndef _DumbProjectileBehavior_H_ -#define _DumbProjectileBehavior_H_ - #include "Common/GameType.h" #include "Common/GlobalData.h" #include "Common/STLTypedefs.h" @@ -125,6 +121,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..1c012582f9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h @@ -28,10 +28,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 +98,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..b0c43e1a84 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h @@ -28,10 +28,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 +125,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..8bb6055e49 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __EMPUPDATE_H_ -#define __EMPUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/Module/DieModule.h" @@ -221,22 +217,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..a98dd7a932 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _EjectPilotDie_H_ -#define _EjectPilotDie_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "Common/INI.h" @@ -72,6 +68,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..62f2397b58 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __EnemyNearUpdate_H_ -#define __EnemyNearUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" @@ -84,6 +80,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..7f1605b1f5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __EXPERIENCE_SCALAR_UPGRADE_H_ -#define __EXPERIENCE_SCALAR_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -72,7 +68,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..724aed2a21 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __FXListDie_H_ -#define __FXListDie_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" @@ -130,7 +126,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..1e70199954 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h @@ -29,10 +29,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 +103,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..1e814da38d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __FIRE_SPREAD_UPDATE_H_ -#define __FIRE_SPREAD_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -76,6 +72,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..c703d0dcfc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __FireWeaponCollide_H_ -#define __FireWeaponCollide_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" #include "GameLogic/Weapon.h" @@ -80,7 +76,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..e833277df0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h @@ -43,10 +43,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __FIRE_WEAPON_POWER_H -#define __FIRE_WEAPON_POWER_H - #include "GameLogic/Module/SpecialPowerModule.h" class Object; @@ -85,5 +81,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..0fcfc79c12 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h @@ -28,10 +28,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 +71,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..f5d1b29cb9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __FireWeaponWhenDamagedBehavior_H_ -#define __FireWeaponWhenDamagedBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpgradeModule.h" @@ -173,6 +169,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..8150861c9c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __FireWeaponWhenDeadBehavior_H_ -#define __FireWeaponWhenDeadBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" @@ -128,6 +124,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..780ba13261 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h @@ -28,10 +28,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 +80,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..47f9b18be5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __FLAMMABLE_UPDATE_H_ -#define __FLAMMABLE_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameLogic/Module/DamageModule.h" @@ -114,6 +110,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..449f45d4b6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h @@ -28,10 +28,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 +225,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..171f29735e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __FLOATUPDATE_H_ -#define __FLOATUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -74,5 +70,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..96aeba4d2e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GARRISONCONTAIN_H_ -#define __GARRISONCONTAIN_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" #include "Common/ModelState.h" @@ -244,6 +240,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..7f75458ab8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GenerateMinefieldBehavior_H_ -#define __GenerateMinefieldBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" @@ -134,6 +130,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..8e73f1803d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GRANT_SCIENCE_UPGRADE_H -#define __GRANT_SCIENCE_UPGRADE_H - #include "GameLogic/Module/UpgradeModule.h" //----------------------------------------------------------------------------- @@ -82,6 +78,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..da94386c10 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h @@ -28,10 +28,6 @@ //------------------------------------------ #pragma once - -#ifndef __GrantStealthBehavior_H_ -#define __GrantStealthBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/BehaviorModule.h" @@ -107,6 +103,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..528735930f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GRANTUPGRADECREATE_H_ -#define __GRANTUPGRADECREATE_H_ - #define DEFINE_OBJECT_STATUS_NAMES // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// @@ -77,6 +73,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..c7b0a5c24f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h @@ -27,10 +27,6 @@ // Desc: State machine that allows hacking cash from the internet (free money). #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 +224,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..c840f16219 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HEALCONTAIN_H_ -#define __HEALCONTAIN_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" @@ -73,5 +69,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..c884f7f02d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h @@ -28,10 +28,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 +52,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..05c4f63ccb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HEIGHTDIEUPDATE_H_ -#define __HEIGHTDIEUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -79,5 +75,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..04930b1c90 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HelicopterSlowDeathBehavior_H_ -#define __HelicopterSlowDeathBehavior_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameLogic/Module/SlowDeathBehavior.h" @@ -113,5 +109,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..9d4920a1a0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h @@ -32,10 +32,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HELIX_CONTAIN_H_ -#define __HELIX_CONTAIN_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/TransportContain.h" @@ -129,6 +125,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..2ad5a12ddf 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HIGHLANDER_BODY_H -#define __HIGHLANDER_BODY_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" @@ -57,6 +53,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..f1f9c10136 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h @@ -33,10 +33,6 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HIJACKER_UPDATE_H -#define __HIJACKER_UPDATE_H - #include "GameLogic/Module/UpdateModule.h" //------------------------------------------------------------------------------------------------- @@ -92,6 +88,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..b6d5afbae9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h @@ -30,10 +30,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 +77,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..3c89a606df 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HordeUpdate_H_ -#define __HordeUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" @@ -125,6 +121,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..099fdc0c86 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __IMMORTAL_BODY_H -#define __IMMORTAL_BODY_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" @@ -57,6 +53,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..910ad54c84 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __INACTIVEBODY_H_ -#define __INACTIVEBODY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BodyModule.h" @@ -69,6 +65,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..1ea5e001f1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h @@ -27,10 +27,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __InstantDeathBehavior_H_ -#define __InstantDeathBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" @@ -76,6 +72,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..d0a0db57bc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __INTERNET_HACK_CONTAIN_H -#define __INTERNET_HACK_CONTAIN_H - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/TransportContain.h" @@ -68,6 +64,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..abfdba541d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h @@ -26,10 +26,6 @@ // Author: Steven Johnson, June 2002 #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 +175,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..bd5a73081a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h @@ -28,10 +28,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 +101,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..29101bb4a7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h @@ -31,10 +31,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 +52,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..c06d61c89a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __LASER_UPDATE_H -#define __LASER_UPDATE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" @@ -133,7 +129,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..65057b2b67 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __LIFETIMEUPDATE_H_ -#define __LIFETIMEUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -85,6 +81,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..6a568478c7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __LOCKWEAPONCREATE_H_ -#define __LOCKWEAPONCREATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" @@ -71,6 +67,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..e4ad14bb69 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __LocomotorSetUpgrade_H_ -#define __LocomotorSetUpgrade_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -57,7 +53,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..90f72eb041 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __MAX_HEALTH_UPGRADE_H_ -#define __MAX_HEALTH_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -74,7 +70,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..a97dde8195 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __MinefieldBEHAVIOR_H_ -#define __MinefieldBEHAVIOR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/CollideModule.h" @@ -145,5 +141,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..4f1a567aa5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h @@ -27,10 +27,6 @@ // Desc: Missile behavior #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 +143,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..e8feceecc0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _MissileLauncherBuildingUpdate_H_ -#define _MissileLauncherBuildingUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" @@ -135,5 +131,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..0c669395a3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h @@ -27,10 +27,6 @@ // Author: Mark Lorenzen, August 2002 #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 +129,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..59ed97998c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __MOBNEXUSCONTAIN_H_ -#define __MOBNEXUSCONTAIN_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" @@ -103,6 +99,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..4ea9c65443 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h @@ -28,10 +28,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 +59,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..dff99997c4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h @@ -28,10 +28,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 +85,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..380bb8d056 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h @@ -28,10 +28,6 @@ //------------------------------------------ #pragma once - -#ifndef __NeutronBlastBehavior_H_ -#define __NeutronBlastBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "GameLogic/Module/UpdateModule.h" @@ -94,6 +90,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..72288c7493 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __NEUTRONMISSILESlowDeathBehavior_H_ -#define __NEUTRONMISSILESlowDeathBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SlowDeathBehavior.h" @@ -112,5 +108,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..080984bbdf 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h @@ -27,10 +27,6 @@ // Desc: Missile behavior #pragma once - -#ifndef _MISSILE_UPDATE_H_ -#define _MISSILE_UPDATE_H_ - #include "GameClient/RadiusDecal.h" #include "Common/GameType.h" #include "Common/GlobalData.h" @@ -140,6 +136,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..4faaae702d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __OCLSPECIALPOWER_H_ -#define __OCLSPECIALPOWER_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" #include "Common/Science.h" @@ -106,5 +102,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..287b94f677 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __OCL_UPDATE_H_ -#define __OCL_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -96,6 +92,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..6db9abe3c5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __OBJECTCREATIONUPGRADE_H_ -#define __OBJECTCREATIONUPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -77,6 +73,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..4014ec5a9e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __OBJECT_DEFECTION_HELPER_H_ -#define __OBJECT_DEFECTION_HELPER_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" @@ -83,6 +79,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..f11b24ae18 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __OBJECT_HELPER_H_ -#define __OBJECT_HELPER_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -64,5 +60,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..b5c7df9f62 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ObjectRepulsorHelper_H_ -#define __ObjectRepulsorHelper_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" @@ -58,6 +54,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..7550122c88 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __OBJECT_SMC_HELPER_H_ -#define __OBJECT_SMC_HELPER_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" @@ -58,6 +54,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..b72d7c66be 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h @@ -28,10 +28,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 +77,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..42fafbf9a4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h @@ -31,10 +31,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __OPENCONTAIN_H_ -#define __OPENCONTAIN_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/CollideModule.h" @@ -284,5 +280,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..31970b02fd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h @@ -30,10 +30,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __OVERCHARGE_BEHAVIOR_H_ -#define __OVERCHARGE_BEHAVIOR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DamageModule.h" @@ -114,5 +110,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..a1b38ea7bc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __OVERLORD_CONTAIN_H_ -#define __OVERLORD_CONTAIN_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/TransportContain.h" #include "GameLogic/GameLogic.h" @@ -127,6 +123,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..222dc2360c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __POW_TRUCK_AI_UPDATE_H_ -#define __POW_TRUCK_AI_UPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/AIUpdate.h" @@ -146,5 +142,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..cb182ec572 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __POW_TRUCK_BEHAVIOR_H_ -#define __POW_TRUCK_BEHAVIOR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" @@ -71,5 +67,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..16515cc74c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ParachuteContain_H_ -#define __ParachuteContain_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" @@ -113,6 +109,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..bd036e90ca 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __ParkingPlaceBehavior_H_ -#define __ParkingPlaceBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" @@ -217,6 +213,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..0de0afc356 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h @@ -28,10 +28,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 +237,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..8159985619 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __PASSENGERS_FIRE_UPGRADE_H_ -#define __PASSENGERS_FIRE_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -56,7 +52,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..c821aaf4bc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h @@ -27,10 +27,6 @@ // Author: Michael S. Booth, November 2001 #pragma once - -#ifndef _PHYSICSUPDATE_H_ -#define _PHYSICSUPDATE_H_ - #include "Common/AudioEventRTS.h" #include "Common/GameAudio.h" #include "GameLogic/Module/BehaviorModule.h" @@ -307,6 +303,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..d0988afebc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h @@ -28,10 +28,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 +75,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..710f3de1b4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h @@ -28,10 +28,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 +83,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..f14988437d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __Poisoned_Behavior_H_ -#define __Poisoned_Behavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DamageModule.h" @@ -96,6 +92,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..53d112b6da 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __POWERPLANTUPDATE_H_ -#define __POWERPLANTUPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -99,5 +95,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..dd23c01a02 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __POWERPLANTUPGRADE_H_ -#define __POWERPLANTUPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -62,6 +58,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..d7da71e63d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _PREORDER_CREATE_H_ -#define _PREORDER_CREATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" @@ -58,5 +54,3 @@ class PreorderCreate : public CreateModule protected: }; - -#endif // _PREORDER_CREATE_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h index b5088e0d64..eba299082d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h @@ -28,10 +28,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 +55,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..db3e090659 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __PRODUCTIONUPDATE_H_ -#define __PRODUCTIONUPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/ModelState.h" #include "GameLogic/Module/DieModule.h" @@ -268,5 +264,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..051ef18d97 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __PROJECTILE_STREAM_UPDATE_H_ -#define __PROJECTILE_STREAM_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" // FORWARD REFERENCES ///////////////////////////////////////////////////////////////////////////// @@ -77,7 +73,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..3b2aaba88a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __PRONE_UPDATE_H_ -#define __PRONE_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -78,7 +74,3 @@ class ProneUpdate : public UpdateModule Int m_proneFrames; }; - - -#endif - diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h index 78a3409a5d..cb1457939c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h @@ -28,10 +28,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 +108,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..7db64d46f3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h @@ -29,10 +29,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 +122,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..34b9cb27b0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __RADARUPDATE_H_ -#define __RADARUPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -88,5 +84,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..a59338188b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __RADARUPGRADE_H_ -#define __RADARUPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -78,6 +74,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..b5ba15b183 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h @@ -26,10 +26,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __RadiusDecalUpdate_H_ -#define __RadiusDecalUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameClient/RadiusDecal.h" @@ -84,6 +80,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..74a4442131 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __RAILED_TRANSPORT_AI_UPDATE_H_ -#define __RAILED_TRANSPORT_AI_UPDATE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/AIUpdate.h" @@ -96,7 +92,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..23a3fecfc9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __RAILED_TRANSPORT_CONTAIN_H_ -#define __RAILED_TRANSPORT_CONTAIN_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/TransportContain.h" @@ -57,5 +53,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/RailroadGuideAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h index 112adb8dc4..ef5acf7063 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h @@ -28,10 +28,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 +298,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..75b5f7c665 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h @@ -28,10 +28,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 +116,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..b14f1bbeea 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h @@ -29,10 +29,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 +68,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..ea46394e98 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __REPAIRDOCKUPDATE_H_ -#define __REPAIRDOCKUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameLogic/Module/SupplyCenterDockUpdate.h" @@ -76,5 +72,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..9dd26ab415 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _REPLACE_OBJECT_UPGRADE_H -#define _REPLACE_OBJECT_UPGRADE_H - #include "GameLogic/Module/UpgradeModule.h" //----------------------------------------------------------------------------- @@ -64,6 +60,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..7684d25e22 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __RIDER_CHANGE_CONTAIN_H -#define __RIDER_CHANGE_CONTAIN_H - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/TransportContain.h" @@ -116,6 +112,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..795ad102a9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h @@ -31,10 +31,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 +83,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..25e7f1453b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h @@ -31,10 +31,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 +83,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..3299b3e4c6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h @@ -31,10 +31,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 +86,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..54df6d6beb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h @@ -31,10 +31,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 +86,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..e9a2a12ef4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h @@ -31,10 +31,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 +86,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..30d0f34cf9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h @@ -31,10 +31,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 +83,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..d946564666 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h @@ -31,10 +31,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 +86,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..bc27241f28 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h @@ -31,10 +31,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 +86,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..3d2e6cf946 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef SALVAGE_CRATE_COLLIDE_H_ -#define SALVAGE_CRATE_COLLIDE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "Common/STLTypedefs.h" @@ -113,5 +109,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..c1de5e162f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h @@ -28,10 +28,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 +52,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..7b808decf7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h @@ -30,10 +30,6 @@ // can use any or all features, some of which are specialized. /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _SLAVED_UPDATE_H_ -#define _SLAVED_UPDATE_H_ - 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 // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// @@ -177,5 +173,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..4f95e1c1ca 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SlowDeathBehavior_H_ -#define __SlowDeathBehavior_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" @@ -178,6 +174,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..ad42c7e7e1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h @@ -29,10 +29,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 +96,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..5a0e2ca826 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SPECIAL_ABILITY_H_ -#define __SPECIAL_ABILITY_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" @@ -65,5 +61,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..c611f9e7cb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SPECIAL_ABILITY_UPDATE_H -#define __SPECIAL_ABILITY_UPDATE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" @@ -285,5 +281,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..3fe6c266d8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h @@ -28,10 +28,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 +85,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..0a31cbf403 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _SPECIAL_POWER_CREATE_H_ -#define _SPECIAL_POWER_CREATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" @@ -57,5 +53,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..0907142d8a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SPECIALPOWERMODULE_H_ -#define __SPECIALPOWERMODULE_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/Module.h" @@ -179,6 +175,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..96cd431243 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h @@ -28,10 +28,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 +77,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..f7fae1e53c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h @@ -28,10 +28,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 +143,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..fb5c97a395 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h @@ -28,10 +28,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 +166,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..ac195b0cfa 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SPY_VISION_SPECIAL_POWER_H_ -#define __SPY_VISION_SPECIAL_POWER_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" @@ -73,5 +69,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..0698435cdc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h @@ -30,10 +30,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 +142,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..8c8f8f019b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SquishCollide_H_ -#define __SquishCollide_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" @@ -58,6 +54,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..35afed9356 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __StatusBitsUpgrade_H_ -#define __StatusBitsUpgrade_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -106,7 +102,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..4177eacd80 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __StatusDamageHelper_H_ -#define __StatusDamageHelper_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" @@ -65,6 +61,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..99d87dbdd5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __STEALTHDETECTOR_UPDATE_H_ -#define __STEALTHDETECTOR_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -97,7 +93,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..f80868a798 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __STEALTH_UPDATE_H_ -#define __STEALTH_UPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -180,7 +176,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..2ddeda86df 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __STEALTH_UPGRADE_H_ -#define __STEALTH_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -57,7 +53,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..2fc45991fc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __STICK_BOMB_UPDATE_H -#define __STICK_BOMB_UPDATE_H - #include "GameLogic/Module/UpdateModule.h" class WeaponTemplate; @@ -98,6 +94,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..a4b8ed8cc7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureBody.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __STRUCTUREBODY_H_ -#define __STRUCTUREBODY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" @@ -79,6 +75,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..10d5330ad4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __StructureCollapseUpdate_H_ -#define __StructureCollapseUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" @@ -149,6 +145,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..12d0f8880c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __StructureToppleUpdate_H_ -#define __StructureToppleUpdate_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpdateModule.h" @@ -197,6 +193,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..a4d9923032 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SUB_OBJECTS_UPGRADE_H -#define __SUB_OBJECTS_UPGRADE_H - //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -88,7 +84,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..2ece02cf98 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SubdualDamageHelper_H_ -#define __SubdualDamageHelper_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" @@ -63,6 +59,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..df806c20ed 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _SUPPLY_CENTER_CREATE_H_ -#define _SUPPLY_CENTER_CREATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" @@ -57,5 +53,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..9620bed670 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h @@ -28,10 +28,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 +65,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..85d03869c5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h @@ -29,10 +29,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 +110,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..1b9b458a29 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h @@ -27,10 +27,6 @@ // Desc: State machine that controls when and with who a Truck docks #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 +234,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..1e33e7077f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _SUPPLY_WAREHOUSE_CREATE_H_ -#define _SUPPLY_WAREHOUSE_CREATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" @@ -56,6 +52,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..65c75720b3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h @@ -28,10 +28,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 +86,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..6ba26c743a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h @@ -28,10 +28,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 +74,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..57a5072a20 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h @@ -28,10 +28,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 +76,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..6caf78516b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TempWeaponBonusHelper_H_ -#define __TempWeaponBonusHelper_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" @@ -67,6 +63,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..a0aa3aa3e3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TENSILEFORMATIONUPDATE_H_ -#define __TENSILEFORMATIONUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -90,5 +86,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..d1103c6a68 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TOPPLEUPDATE_H_ -#define __TOPPLEUPDATE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/CollideModule.h" @@ -128,6 +124,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..5785a06c09 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TRANSITIONDAMAGEFX_H_ -#define __TRANSITIONDAMAGEFX_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/DamageModule.h" @@ -263,5 +259,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..a23bdacf6e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h @@ -27,10 +27,6 @@ // Author: Graham Smallwood, July 2002 #pragma once - -#ifndef _TRANSPORT_AI_UPDATE_H_ -#define _TRANSPORT_AI_UPDATE_H_ - #include "GameLogic/Module/AIUpdate.h" //------------------------------------------------------------------------------------------------- @@ -65,6 +61,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..9aaf3431a3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportContain.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TransportContain_H_ -#define __TransportContain_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" @@ -116,6 +112,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..81e9b3b099 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TUNNEL_CONTAIN_H_ -#define __TUNNEL_CONTAIN_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" #include "GameLogic/Module/HealContain.h" @@ -140,5 +136,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..42c84c54c4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UndeadBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UndeadBody.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __UNDEAD_BODY_H -#define __UNDEAD_BODY_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" @@ -72,6 +68,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..704fcba775 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h @@ -28,10 +28,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 +80,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..656122d2f4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h @@ -30,10 +30,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __UNPAUSE_SPECIAL_POWER_UPGRADE_H_ -#define __UNPAUSE_SPECIAL_POWER_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -75,6 +71,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..02f206dc63 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __UpdateModule_H_ -#define __UpdateModule_H_ - #include "Common/Module.h" #include "Common/GameType.h" #include "Common/DisabledTypes.h" @@ -365,5 +361,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..043765eeaf 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __UPGRADEDIE_H -#define __UPGRADEDIE_H - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" @@ -78,6 +74,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..d32fce3eb3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h @@ -28,10 +28,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 +209,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..92c329724b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h @@ -28,10 +28,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 +89,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..da5be7fe58 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __VETERANCY_GAIN_CREATE_H_ -#define __VETERANCY_GAIN_CREATE_H_ - #define DEFINE_VETERANCY_NAMES // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameCommon.h" @@ -70,6 +66,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..7718e35a9d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h @@ -27,10 +27,6 @@ // Author: Graham Smallwood, April 2002 #pragma once - -#ifndef _WANDER_AI_UPDATE_H_ -#define _WANDER_AI_UPDATE_H_ - #include "GameLogic/Module/AIUpdate.h" //------------------------------------------------------------------------------------------------- @@ -63,6 +59,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..99c2d131c8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WATERWAVE_H_ -#define __WATERWAVE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" @@ -111,5 +107,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..445b03e184 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WEAPON_BONUS_UPDATE_H_ -#define __WEAPON_BONUS_UPDATE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -108,5 +104,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..2df6100321 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WEAPON_BONUS_UPGRADE_H_ -#define __WEAPON_BONUS_UPGRADE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -90,7 +86,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..47c859a1ca 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WEAPON_SET_UPGRADE_H_ -#define __WEAPON_SET_UPGRADE_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" @@ -57,7 +53,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..286247c666 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h @@ -28,10 +28,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 +264,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..c91ddf23ed 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h @@ -27,9 +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 +828,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..05e6410ea6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h @@ -31,10 +31,6 @@ // All OCLs return the first object that is created (or NULL if not applicable). #pragma once - -#ifndef _ObjectCreationList_H_ -#define _ObjectCreationList_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" @@ -219,6 +215,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..a678259176 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h @@ -27,10 +27,6 @@ // Author: Steven Johnson, September 2001 #pragma once - -#ifndef _OBJECT_ITER_H_ -#define _OBJECT_ITER_H_ - #include "Common/GameType.h" #include "Common/GameMemory.h" @@ -155,7 +151,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..b216c3904a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h @@ -27,9 +27,6 @@ // JKMCD Aug 2002 #pragma once -#ifndef __OBJECTSCRIPTSTATUSBITS_H__ -#define __OBJECTSCRIPTSTATUSBITS_H__ - //------------------------------------------------------------------------------------------------- /** Object status bits */ //------------------------------------------------------------------------------------------------- @@ -42,6 +39,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..31d122cede 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h @@ -28,10 +28,6 @@ // DO NOT DISTRIBUTE #pragma once - -#ifndef __OBJECT_TYPES_H__ -#define __OBJECT_TYPES_H__ - #include "Common/AsciiString.h" #include "Common/Snapshot.h" @@ -87,5 +83,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..352a25cd8d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h @@ -45,10 +45,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef __PARTITIONMANAGER_H_ -#define __PARTITIONMANAGER_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -1598,6 +1594,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..39b9f4ee8e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/PolygonTrigger.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/PolygonTrigger.h @@ -32,10 +32,6 @@ // Author: John Ahlquist, November 2001 #pragma once - -#ifndef PolygonTrigger_H -#define PolygonTrigger_H - #include "Common/GameMemory.h" #include "Common/Snapshot.h" #include "Common/STLTypedefs.h" @@ -153,5 +149,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..f94dadb72f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Powers.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Powers.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __POWERS_H_ -#define __POWERS_H_ - // // skeleton definition of unit powers // @@ -58,6 +54,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..d286880628 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/RankInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/RankInfo.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __RankInfo_H_ -#define __RankInfo_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Science.h" #include "Common/UnicodeString.h" @@ -76,7 +72,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..dc7ff350b2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SCRIPTACTIONS_H_ -#define __SCRIPTACTIONS_H_ - class ScriptAction; class GameWindow; class Team; @@ -391,8 +387,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..29eb898da1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SCRIPTCONDITIONS_H_ -#define __SCRIPTCONDITIONS_H_ - class Condition; class ObjectTypes; class Parameter; @@ -188,6 +184,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..f093cbf052 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __SCRIPTENGINE_H_ -#define __SCRIPTENGINE_H_ - #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/STLTypedefs.h" @@ -498,6 +494,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..2151d52430 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h @@ -28,10 +28,6 @@ // Author: John Ahlquist, November 2001 #pragma once - -#ifndef SCRIPTS_H -#define SCRIPTS_H - #include "Common/Snapshot.h" #include "GameNetwork/NetworkDefs.h" #include "Common/ObjectStatusTypes.h" @@ -1136,6 +1132,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..8a5dbb85b4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/SidesList.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/SidesList.h @@ -28,10 +28,6 @@ // Author: John Ahlquist, November 2001 #pragma once - -#ifndef SIDESLIST_H -#define SIDESLIST_H - #include "Common/Dict.h" #include "Common/Errors.h" #include "Common/GameType.h" @@ -390,7 +386,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..c91c09f528 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Squad.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Squad.h @@ -38,9 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_SQAUD_ -#define _H_SQAUD_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" #include "Common/GameMemory.h" @@ -96,5 +93,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..de0da81554 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __TERRAINLOGIC_H_ -#define __TERRAINLOGIC_H_ - #include "Common/GameMemory.h" #include "Common/Snapshot.h" #include "Common/STLTypedefs.h" @@ -380,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/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h index 6db1bd451a..5aa9dfeaa9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h @@ -27,10 +27,6 @@ // Simple turret behavior #pragma once - -#ifndef _TURRETAI_H_ -#define _TURRETAI_H_ - #include "Common/StateMachine.h" #include "Common/GameMemory.h" @@ -373,6 +369,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..92965f3862 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, February 2002 #pragma once - -#ifndef __VICTORYCONDITIONS_H__ -#define __VICTORYCONDITIONS_H__ - #include "Common/SubsystemInterface.h" #include "Lib/BaseType.h" @@ -79,5 +75,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..1d957032d6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WEAPON_H_ -#define __WEAPON_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameCommon.h" @@ -890,6 +886,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..97a0be1a72 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h @@ -27,9 +27,4 @@ // 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..58aa1e6299 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h @@ -25,10 +25,6 @@ // WeaponSet.h #pragma once - -#ifndef _WeaponSet_H_ -#define _WeaponSet_H_ - #include "Lib/BaseType.h" #include "Common/GameType.h" #include "Common/KindOf.h" @@ -268,5 +264,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..2a5e596de8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h @@ -27,11 +27,6 @@ // 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..1653ea0c2f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h @@ -27,9 +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" // state is defined by the bit being off. That is, the typical "normal" condition @@ -61,5 +58,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..e8fb22e7a8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h @@ -27,9 +27,6 @@ // JKMCD Aug 2002 #pragma once -#ifndef __WEAPONSTATUS_H__ -#define __WEAPONSTATUS_H__ - enum WeaponStatus CPP_11(: Int) { READY_TO_FIRE, @@ -40,5 +37,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..f23b9ae20f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/Connection.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/Connection.h @@ -34,10 +34,6 @@ */ #pragma once - -#ifndef __CONNECTION_H -#define __CONNECTION_H - #include "GameNetwork/NetCommandList.h" #include "GameNetwork/User.h" #include "GameNetwork/Transport.h" @@ -102,5 +98,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..8b189ca140 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/ConnectionManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/ConnectionManager.h @@ -28,10 +28,6 @@ */ #pragma once - -#ifndef __CONNECTIONMANAGER_H -#define __CONNECTIONMANAGER_H - #include "GameNetwork/Connection.h" #include "GameNetwork/NetCommandList.h" #include "GameNetwork/Transport.h" @@ -217,5 +213,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..5216ebf63e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/DisconnectManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/DisconnectManager.h @@ -24,10 +24,6 @@ #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..e72ae50976 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/DownloadManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/DownloadManager.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, July 2002 #pragma once - -#ifndef __DOWNLOADMANAGER_H__ -#define __DOWNLOADMANAGER_H__ - #include "WWDownload/downloaddefs.h" #include "WWDownload/Download.h" @@ -94,5 +90,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..cb0edd47c3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FileTransfer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FileTransfer.h @@ -29,9 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once -#ifndef __FILE_TRANSFER_H__ -#define __FILE_TRANSFER_H__ - class GameInfo; // Convenience functions @@ -48,5 +45,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..5700db7197 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h @@ -47,10 +47,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef __FIREWALLHELPER_H -#define __FIREWALLHELPER_H - class UDP; #define NUM_TEST_PORTS 4 @@ -308,7 +304,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..34849917ec 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h @@ -24,10 +24,6 @@ #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..bf6af83710 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameDataManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameDataManager.h @@ -24,10 +24,6 @@ #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..1b687b9812 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameMetrics.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameMetrics.h @@ -25,10 +25,6 @@ /** FrameMetrics.h */ #pragma once - -#ifndef __FRAMEMETRICS_H -#define __FRAMEMETRICS_H - #include "Lib/BaseType.h" #include "GameNetwork/NetworkDefs.h" @@ -70,5 +66,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..340c1a67a9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GUIUtil.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GUIUtil.h @@ -26,10 +26,6 @@ // Author: Matthew D. Campbell, Sept 2002 #pragma once - -#ifndef __GUIUTIL_H__ -#define __GUIUTIL_H__ - class GameWindow; class GameInfo; @@ -53,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/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h index 5fb3320de7..c8b02f997c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, December 2001 #pragma once - -#ifndef __GAMEINFO_H__ -#define __GAMEINFO_H__ - #include "Common/Snapshot.h" #include "Common/Money.h" #include "GameNetwork/NetworkDefs.h" @@ -306,5 +302,3 @@ class SkirmishGameInfo : public GameInfo, public Snapshot extern SkirmishGameInfo *TheSkirmishGameInfo; extern SkirmishGameInfo *TheChallengeGameInfo; - -#endif // __GAMEINFO_H__ diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h index 2d032020f8..403e065178 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h @@ -27,11 +27,5 @@ // Author: Matthew D. Campbell, July 2002 #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..c79bbc73e7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, June 2002 #pragma once - -#ifndef __BUDDYTHREAD_H__ -#define __BUDDYTHREAD_H__ - #include "gamespy/gp/gp.h" #define MAX_BUDDY_CHAT_LEN 128 @@ -172,6 +168,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..79b1c1224a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GSCONFIG_H__ -#define __GSCONFIG_H__ - #include "Common/AsciiString.h" #include "Common/STLTypedefs.h" @@ -69,5 +65,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..2d88a24541 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, August 2002 #pragma once - -#ifndef __GAMERESULTSTHREAD_H__ -#define __GAMERESULTSTHREAD_H__ - #include "Common/SubsystemInterface.h" // this class encapsulates a request for the thread @@ -76,6 +72,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..8fecd364ba 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, August 2002 #pragma once - -#ifndef __LADDERDEFS_H__ -#define __LADDERDEFS_H__ - #include "Common/UnicodeString.h" #include "Common/AsciiString.h" #include "Common/STLTypedefs.h" @@ -84,5 +80,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..2cbde6f59a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, Sept 2002 #pragma once - -#ifndef __LOBBYUTILS_H__ -#define __LOBBYUTILS_H__ - class GameWindow; GameWindow *GetGameListBox( void ); @@ -56,5 +52,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..44b675d4d6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __MAINMENUUTILS_H__ -#define __MAINMENUUTILS_H__ - void HTTPThinkWrapper( void ); void StopAsyncDNSCheck( void ); void StartPatchCheck( void ); @@ -44,5 +40,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..5a48ac858d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, June 2002 #pragma once - -#ifndef __PEERDEFS_H__ -#define __PEERDEFS_H__ - #include "gamespy/peer/peer.h" #include "gamespy/gp/gp.h" @@ -298,5 +294,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..9abbef670a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, Sept 2002 #pragma once - -#ifndef __PEERDEFSIMPLEMENTATION_H__ -#define __PEERDEFSIMPLEMENTATION_H__ - #include "GameNetwork/GameSpy/PeerDefs.h" #include "GameNetwork/GameSpy/PersistentStorageThread.h" @@ -178,5 +174,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..b1f7985506 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, June 2002 #pragma once - -#ifndef __PEERTHREAD_H__ -#define __PEERTHREAD_H__ - #include "gamespy/peer/peer.h" #include "GameNetwork/NetworkDefs.h" @@ -387,5 +383,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..a5920126ef 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, July 2002 #pragma once - -#ifndef __PERSISTENTSTORAGEDEFS_H__ -#define __PERSISTENTSTORAGEDEFS_H__ - enum LocaleType CPP_11(: Int) { LOC_UNKNOWN = 0, @@ -43,5 +39,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..1496edca10 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, July 2002 #pragma once - -#ifndef __PERSISTENTSTORAGETHREAD_H__ -#define __PERSISTENTSTORAGETHREAD_H__ - #include "gamespy/gstats/gpersist.h" #define MAX_BUDDY_CHAT_LEN 128 @@ -182,6 +178,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..f62ea3c355 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h @@ -28,10 +28,6 @@ // Note: adapted from WOLAPI #pragma once - -#ifndef __PINGTHREAD_H__ -#define __PINGTHREAD_H__ - // this class encapsulates a request for the thread class PingRequest { @@ -78,6 +74,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..3e38c07c51 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, Sept 2002 #pragma once - -#ifndef __STAGINGROOMGAMEINFO_H__ -#define __STAGINGROOMGAMEINFO_H__ - #include "GameNetwork/GameInfo.h" #include "GameNetwork/Transport.h" @@ -157,5 +153,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..569eeee005 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h @@ -27,11 +27,5 @@ // Author: Matthew D. Campbell, July 2002 #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..6a50c2756a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyChat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyChat.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, February 2002 #pragma once - -#ifndef __GAMESPYCHAT_H__ -#define __GAMESPYCHAT_H__ - #include "gamespy/peer/peer.h" class GameWindow; @@ -56,5 +52,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..49045b0890 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGP.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGP.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, March 2002 #pragma once - -#ifndef __GAMESPYGP_H__ -#define __GAMESPYGP_H__ - #include "gamespy/gp/gp.h" void GPRecvBuddyRequestCallback(GPConnection * connection, GPRecvBuddyRequestArg * arg, void * param); @@ -43,5 +39,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..a37990b2e7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, March 2002 #pragma once - -#ifndef __GAMESPYOVERLAY_H__ -#define __GAMESPYOVERLAY_H__ - #include "Common/NameKeyGenerator.h" #include "GameClient/WindowLayout.h" #include "GameClient/Gadget.h" @@ -66,4 +62,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..63801de3ed 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyThread.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, March 2002 #pragma once - -#ifndef __GAMESPYTHREAD_H__ -#define __GAMESPYTHREAD_H__ - #include "mutex.h" #include "thread.h" @@ -63,5 +59,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..67188ac578 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/IPEnumeration.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/IPEnumeration.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, October 2001 #pragma once - -#ifndef _IPENUMERATION_H_ -#define _IPENUMERATION_H_ - #include "GameNetwork/Transport.h" /** @@ -78,6 +74,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..126078167c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPI.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPI.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, October 2001 #pragma once - -#ifndef _LANAPI_H_ -#define _LANAPI_H_ - #include "GameNetwork/Transport.h" #include "GameNetwork/NetworkInterface.h" #include "GameNetwork/NetworkDefs.h" @@ -413,6 +409,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..9252ee3477 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h @@ -28,10 +28,6 @@ // Description: LAN API Callbacks header /////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _LANAPI_CALLBACKS_H_ -#define _LANAPI_CALLBACKS_H_ - #include "Common/NameKeyGenerator.h" #include "GameClient/Shell.h" #include "GameClient/GadgetListBox.h" @@ -83,7 +79,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..b0cf8a2b0a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANGameInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANGameInfo.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, December 2001 #pragma once - -#ifndef __LANGAMEINFO_H__ -#define __LANGAMEINFO_H__ - #include "GameNetwork/GameInfo.h" #include "GameNetwork/LANPlayer.h" @@ -180,6 +176,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..9110d12c34 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NAT.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NAT.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __NAT_H -#define __NAT_H - #include "Lib/BaseType.h" #include "GameNetwork/NetworkInterface.h" #include "GameNetwork/FirewallHelper.h" @@ -158,5 +154,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..4a5df036eb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandList.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandList.h @@ -24,10 +24,6 @@ #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..10fbe10d62 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h @@ -27,10 +27,6 @@ // are queued up to execute at a later time #pragma once - -#ifndef __NETCOMMANDMSG_H -#define __NETCOMMANDMSG_H - #include "Lib/BaseType.h" #include "GameNetwork/NetworkDefs.h" #include "Common/UnicodeString.h" @@ -517,4 +513,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..5183ecd98a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandRef.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandRef.h @@ -24,10 +24,6 @@ #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..b549624c45 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h @@ -26,10 +26,6 @@ // Bryan Cleveland #pragma once - -#ifndef __NETCOMMANDWRAPPERLIST_H -#define __NETCOMMANDWRAPPERLIST_H - #include "GameNetwork/NetCommandList.h" class NetCommandWrapperListNode : public MemoryPoolObject @@ -79,5 +75,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..77d44c2d05 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetPacket.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetPacket.h @@ -35,10 +35,6 @@ be specialized code. #pragma once - -#ifndef __NETPACKET_H -#define __NETPACKET_H - #include "NetworkDefs.h" #include "GameNetwork/NetCommandList.h" #include "Common/MessageStream.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..5b5afa8baa 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h @@ -24,10 +24,6 @@ #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..5c8be7d4fb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkInterface.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkInterface.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, July 2001 #pragma once - -#ifndef _NETWORK_INTERFACE_H_ -#define _NETWORK_INTERFACE_H_ - #include "Common/MessageStream.h" #include "GameNetwork/ConnectionManager.h" #include "GameNetwork/User.h" @@ -137,5 +133,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..58ec00895b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/RankPointValue.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/RankPointValue.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __RANK_POINT_VALUE_H_ -#define __RANK_POINT_VALUE_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -101,5 +97,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..60f32e6607 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/Transport.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/Transport.h @@ -27,10 +27,6 @@ // Author: Matthew D. Campbell, July 2001 #pragma once - -#ifndef _TRANSPORT_H_ -#define _TRANSPORT_H_ - #include "GameNetwork/udp.h" #include "GameNetwork/NetworkDefs.h" @@ -101,5 +97,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..415c7e5113 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/User.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/User.h @@ -27,10 +27,6 @@ */ #pragma once - -#ifndef __USER_H -#define __USER_H - #include "GameNetwork/NetworkDefs.h" #include "Common/UnicodeString.h" @@ -58,5 +54,3 @@ class User : public MemoryPoolObject UnsignedInt m_ipaddr; }; EMPTY_DTOR(User) - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h index 075df2e479..2a499cfb62 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h @@ -41,10 +41,6 @@ ******************************************************************************/ #pragma once - -#ifndef __WEBBROWSER_H__ -#define __WEBBROWSER_H__ - #include "Common/SubsystemInterface.h" #include #include @@ -125,4 +121,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..3bc9145384 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/networkutil.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/networkutil.h @@ -24,9 +24,6 @@ #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..8742f8021e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/udp.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/udp.h @@ -24,10 +24,6 @@ #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/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h index 84923f3120..deea913eb0 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h @@ -40,10 +40,6 @@ //============================================================================= #pragma once - -#ifndef __W3DCONVERT_H_ -#define __W3DCONVERT_H_ - //============================================================================= // Includes //============================================================================= @@ -62,7 +58,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..32d6a2a445 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DFUNCTIONLEXICON_H_ -#define __W3DFUNCTIONLEXICON_H_ - #include "Common/FunctionLexicon.h" //------------------------------------------------------------------------------------------------- @@ -52,6 +48,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..ebc4abde4b 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h @@ -31,10 +31,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DMODULEFACTORY_H_ -#define __W3DMODULEFACTORY_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ModuleFactory.h" @@ -49,5 +45,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..6e6625588d 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h @@ -30,10 +30,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DRADAR_H_ -#define __W3DRADAR_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Radar.h" #include "WW3D2/ww3dformat.h" @@ -127,6 +123,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..9bbf68c366 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h @@ -30,10 +30,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DTHINGFACTORY_H_ -#define __W3DTHINGFACTORY_H_ - // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/ThingFactory.h" @@ -47,6 +43,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..220bb74506 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h @@ -24,10 +24,6 @@ #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..b3134d2048 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h @@ -24,10 +24,6 @@ #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..726b70d17a 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h @@ -25,10 +25,6 @@ #pragma once - -#ifndef __HEIGHTMAP_H_ -#define __HEIGHTMAP_H_ - #include "always.h" #include "rendobj.h" #include "w3d_file.h" @@ -122,5 +118,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..d4b8b28ae9 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3D_DEBRIS_DRAW_H_ -#define __W3D_DEBRIS_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/DrawModule.h" @@ -98,6 +94,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..c57d5a7264 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DDEFAULTDRAW_H_ -#define __W3DDEFAULTDRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/DrawModule.h" @@ -75,6 +71,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..0445a4a451 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h @@ -33,10 +33,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3D_DEPENDENCY_MODEL_DRAW_H_ -#define _W3D_DEPENDENCY_MODEL_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" @@ -69,6 +65,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..ec325cd983 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DLASERDRAW_H_ -#define __W3DLASERDRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" //#include "WW3D2/Line3D.h" @@ -99,6 +95,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..ec1d0a40e2 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DModelDraw_H_ -#define __W3DModelDraw_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ModelState.h" #include "Common/DrawModule.h" @@ -526,6 +522,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..aeda4372f1 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h @@ -35,10 +35,6 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3D_OVERLORD_AIRCRAFT_DRAW_H_ -#define _W3D_OVERLORD_AIRCRAFT_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" @@ -70,6 +66,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..c3d45ced3a 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3D_OVERLORD_TANK_DRAW_H_ -#define _W3D_OVERLORD_TANK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DTankDraw.h" @@ -70,6 +66,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..982486c86e 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3D_OVERLORD_TRUCK_DRAW_H_ -#define _W3D_OVERLORD_TRUCK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DTruckDraw.h" @@ -70,6 +66,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..93dba22395 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DPOLICECARDRAW_H_ -#define __W3DPOLICECARDRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "W3DDevice/GameClient/Module/W3DTruckDraw.h" @@ -63,6 +59,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..7c40517d0c 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h @@ -28,10 +28,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 +79,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..eb680c3902 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DPropDraw_H_ -#define __W3DPropDraw_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" @@ -75,6 +71,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..ccfc211053 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DRopeDraw_H_ -#define __W3DRopeDraw_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" @@ -93,6 +89,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..c991631056 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3D_SCIENCE_MODEL_DRAW_H_ -#define _W3D_SCIENCE_MODEL_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" @@ -63,6 +59,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..95189e4c4f 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3D_SUPPLY_DRAW_H_ -#define _W3D_SUPPLY_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" @@ -65,6 +61,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..a6d5d392ae 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3D_TANK_DRAW_H_ -#define _W3D_TANK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "GameClient/ParticleSys.h" @@ -105,6 +101,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..6a626f8ef8 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3D_TANKTRUCK_DRAW_H_ -#define _W3D_TANKTRUCK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "Common/AudioEventRTS.h" @@ -152,6 +148,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..5e093a02d2 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DTRACERDRAW_H_ -#define __W3DTRACERDRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" @@ -73,6 +69,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..4a467a14d8 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DTreeDraw_H_ -#define __W3DTreeDraw_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" @@ -97,6 +93,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..e01b698718 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3D_TRUCK_DRAW_H_ -#define _W3D_TRUCK_DRAW_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "Common/AudioEventRTS.h" @@ -141,6 +137,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..d8806f55c4 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h @@ -27,10 +27,6 @@ // Author: John Ahlquist, April 2001 #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 +140,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..2f45d0e0ad 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h @@ -27,10 +27,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef TileData_H -#define TileData_H - #include #include "Lib/BaseType.h" @@ -104,5 +100,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..7bc63dca84 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h @@ -43,10 +43,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef W3DASSETMANAGER_H -#define W3DASSETMANAGER_H - #include "assetmgr.h" #include "Lib/BaseType.h" @@ -118,6 +114,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..770b2ced96 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h @@ -38,9 +38,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_W3DASSETMANAGEREXPOSED_ -#define _H_W3DASSETMANAGEREXPOSED_ - // INCLUDES /////////////////////////////////////////////////////////////////// // DEFINES //////////////////////////////////////////////////////////////////// // TYPE DEFINES /////////////////////////////////////////////////////////////// @@ -52,5 +49,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..911ab74686 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef __W3DBIB_BUFFER_H_ -#define __W3DBIB_BUFFER_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -131,5 +127,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..54c55dd179 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef __W3DBRIDGE_BUFFER_H_ -#define __W3DBRIDGE_BUFFER_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -187,5 +183,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..9fa6b11ee9 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h @@ -28,10 +28,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 +181,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..e8f08648c7 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h @@ -43,10 +43,6 @@ //----------------------------------------------------------------------------- #pragma once - -#ifndef __W3DCUSTOM_EDGING_H_ -#define __W3DCUSTOM_EDGING_H_ - //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- @@ -107,5 +103,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..f5ca82e372 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h @@ -23,14 +23,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..36e2199188 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h @@ -24,10 +24,6 @@ #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..d462698ab0 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h @@ -32,10 +32,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DDISPLAY_H_ -#define __W3DDISPLAY_H_ - #include "GameClient/Display.h" #include "WW3D2/lightenvironment.h" @@ -203,5 +199,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..0fad6c6e6d 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h @@ -46,10 +46,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DDISPLAYSTRING_H_ -#define __W3DDISPLAYSTRING_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -119,6 +115,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..1ea7f3f044 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef _W3DDISPLAYSTRINGMANAGER_H_ -#define _W3DDISPLAYSTRINGMANAGER_H_ - #include "GameClient/DisplayStringManager.h" #include "W3DDevice/GameClient/W3DDisplayString.h" @@ -76,6 +72,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..b839754da3 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h @@ -27,10 +27,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef W3D_DYNAMIC_LIGHT_H -#define W3D_DYNAMIC_LIGHT_H - #include "WW3D2/light.h" #include "Lib/BaseType.h" class HeightMapRenderObjClass; @@ -82,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/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h index f6a696e208..fa5b5441fb 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h @@ -33,10 +33,6 @@ #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..bd9a52b39a 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h @@ -29,10 +29,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DGUICALLBACKS_H_ -#define __W3DGUICALLBACKS_H_ - class GameWindow; class WindowLayout; class WinInstanceData; @@ -67,6 +63,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..638efee2a8 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DGADGET_H_ -#define __W3DGADGET_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -89,6 +85,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..3ac31b03be 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h @@ -33,10 +33,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DGAMEINTERFACE_H_ -#define __W3DGAMEINTERFACE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -137,5 +133,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..363bb580e5 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DGAMEFONT_H_ -#define __W3DGAMEFONT_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -80,6 +76,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..fcf6e9f232 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DGAMEWINDOW_H_ -#define __W3DGAMEWINDOW_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -100,6 +96,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..41f2dc9f10 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h @@ -30,10 +30,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 +103,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..7c316b00d2 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h @@ -32,10 +32,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DINGAMEUI_H_ -#define __W3DINGAMEUI_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -85,5 +81,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..28af98d024 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h @@ -24,10 +24,6 @@ #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..d4be8942af 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DMOUSE_H_ -#define __W3DMOUSE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -110,5 +106,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..7fe8547adc 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h @@ -26,10 +26,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DParticleSys_H_ -#define __W3DParticleSys_H_ - #include "GameClient/ParticleSys.h" #include "WW3D2/pointgr.h" #include "WW3D2/streak.h" @@ -63,5 +59,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..a1701db9f5 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3DPOLY_H_ -#define __W3DPOLY_H_ - #include "vector3.h" #include "plane.h" #include "simplevec.h" @@ -66,5 +62,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..48a3eb5fed 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h @@ -31,10 +31,6 @@ // /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __W3D_PROJECTED_SHADOW_H_ -#define __W3D_PROJECTED_SHADOW_H_ - #include "GameClient/Shadow.h" class W3DShadowTexture; //forward reference @@ -136,5 +132,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..f7171a46d2 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WIN32DIKEYBOARD_H_ -#define __WIN32DIKEYBOARD_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #ifndef DIRECTINPUT_VERSION # define DIRECTINPUT_VERSION 0x800 @@ -101,6 +97,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..11798a025b 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h @@ -38,10 +38,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WIN32DIMOUSE_H_ -#define __WIN32DIMOUSE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #ifndef DIRECTINPUT_VERSION # define DIRECTINPUT_VERSION 0x800 @@ -100,6 +96,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..79a498db2f 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WIN32MOUSE_H_ -#define __WIN32MOUSE_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -115,6 +111,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..aeb492274b 100644 --- a/GeneralsMD/Code/Libraries/Include/Lib/BaseType.h +++ b/GeneralsMD/Code/Libraries/Include/Lib/BaseType.h @@ -28,10 +28,6 @@ // tell the compiler to only load this file once #pragma once - -#ifndef _BASE_TYPE_H_ -#define _BASE_TYPE_H_ - #include "Lib/BaseTypeCore.h" #include "Lib/trig.h" @@ -405,5 +401,3 @@ struct RGBAColorInt UnsignedInt red, green, blue, alpha; // range between 0 and 255 }; - -#endif // _BASE_TYPE_H_ diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h index a97d6a9f66..5c577cf1c9 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h @@ -38,10 +38,6 @@ #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..0136702e2e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h @@ -39,10 +39,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef ANIMOBJ_H -#define ANIMOBJ_H - #include "always.h" #include "composite.h" #include "htree.h" @@ -321,7 +317,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..2054efde76 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h @@ -37,10 +37,6 @@ #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..1de3f0e120 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef BMP2D_H -#define BMP2D_H - #include "dynamesh.h" class Bitmap2DObjClass : public DynamicScreenMeshClass @@ -53,5 +49,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..95ced09770 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h @@ -35,10 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef BOXROBJ_H -#define BOXROBJ_H - #include "always.h" #include "rendobj.h" #include "w3d_file.h" @@ -257,9 +253,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..1fc0fc5fd8 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h @@ -44,10 +44,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef CAMERA_H -#define CAMERA_H - #include "always.h" #include "rendobj.h" #include "plane.h" @@ -449,6 +445,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..571816e40c 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h @@ -17,10 +17,6 @@ */ #pragma once - -#ifndef DAZZLE_H -#define DAZZLE_H - #include "always.h" #include "vector3.h" #include "matrix3d.h" @@ -392,5 +388,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..fa162d9567 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h @@ -17,10 +17,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 +273,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..c9b418739a 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef DECALMSH_H -#define DECALMSH_H - #include "always.h" #include "bittype.h" #include "simplevec.h" @@ -286,7 +282,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..b95053cfcf 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h @@ -38,10 +38,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef DX8CAPS_H -#define DX8CAPS_H - #include "always.h" #include "ww3dformat.h" #include @@ -317,6 +313,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..61a20ea50f 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h @@ -41,10 +41,6 @@ #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..cff76f93e4 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef DX8INDEXBUFFER_H -#define DX8INDEXBUFFER_H - #include "always.h" #include "wwdebug.h" #include "refcount.h" @@ -201,6 +197,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..7f426f8e98 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h @@ -39,10 +39,6 @@ #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..4836334c1d 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h @@ -38,10 +38,6 @@ #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..4eea8504e3 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h @@ -38,10 +38,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef DX8TEXTUREMANAGER_H -#define DX8TEXTUREMANAGER_H - #include "always.h" #include "texture.h" #include "dx8wrapper.h" @@ -173,5 +169,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..713cbde439 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h @@ -38,10 +38,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef DX8VERTEXBUFFER_H -#define DX8VERTEXBUFFER_H - #include "always.h" #include "wwdebug.h" #include "refcount.h" @@ -258,6 +254,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..b816683990 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h @@ -40,10 +40,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef DX8_WRAPPER_H -#define DX8_WRAPPER_H - #include "always.h" #include "dllist.h" #include "d3d8.h" @@ -1507,6 +1503,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..f6e58b1a33 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h @@ -37,10 +37,6 @@ #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..aa2840b6fc 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h @@ -36,10 +36,6 @@ #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..67d2d96a01 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef HMORPHANIM_H -#define HMORPHANIM_H - #include "always.h" #include "hanim.h" #include "simplevec.h" @@ -180,9 +176,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..2851dea881 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef HRAWANIM_H -#define HRAWANIM_H - #include "always.h" #include "hanim.h" @@ -131,9 +127,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..b43a53812a 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h @@ -37,10 +37,6 @@ #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..6e4e284334 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h @@ -36,10 +36,6 @@ #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..6c1dac5f8f 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h @@ -38,10 +38,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef LIGHTENVIRONMENT_H -#define LIGHTENVIRONMENT_H - #include "always.h" #include "vector3.h" @@ -176,7 +172,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..cb06bd847a 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.h @@ -37,10 +37,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef LINEGRP_H -#define LINEGRP_H - #include "shader.h" #include "vector4.h" #include "vector3.h" @@ -128,5 +124,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..0236033cb6 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h @@ -38,10 +38,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef VERTEXMAPPER_H -#define VERTEXMAPPER_H - #include "refcount.h" #include "w3d_file.h" #include "w3derr.h" @@ -570,5 +566,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..c7782a2904 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.h @@ -38,10 +38,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef MATPASS_H -#define MATPASS_H - #ifndef REFCOUNT_H #include "refcount.h" #endif @@ -125,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/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h index 33c4848f9d..0c8b497cb1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h @@ -37,10 +37,6 @@ #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..5ad1b9ca27 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h @@ -39,10 +39,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef MESHBUILD_H -#define MESHBUILD_H - #include "always.h" #include "vector2.h" #include "vector3.h" @@ -380,5 +376,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/meshmdl.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h index ab161719a6..e3dbd862d6 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h @@ -36,10 +36,6 @@ #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..cf98568c79 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h @@ -37,10 +37,6 @@ #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..cfcd2ea653 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h @@ -36,10 +36,6 @@ #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..f9e7b481f0 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef PART_BUF_H -#define PART_BUF_H - #include "rendobj.h" #include "pointgr.h" #include "seglinerenderer.h" @@ -461,6 +457,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..fda1f66711 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h @@ -34,10 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef PART_EMT_H -#define PART_EMT_H - #include "rendobj.h" #include "RANDOM.H" #include "part_buf.h" @@ -348,7 +344,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..deae8fb4b7 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h @@ -35,10 +35,6 @@ #pragma once -#ifndef __PART_EMT_LDR_H -#define __PART_EMT_LDR_H - - #include "proto.h" #include "rendobj.h" #include "w3d_file.h" @@ -373,6 +369,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..7590197ab3 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h @@ -36,10 +36,6 @@ #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..9e8aac4e62 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h @@ -40,10 +40,6 @@ #pragma once -#ifndef RINFO_H -#define RINFO_H - - #include "always.h" #include "bittype.h" #include "ww3d.h" @@ -161,7 +157,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..995244b50b 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h @@ -36,10 +36,6 @@ #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..7adf449ae8 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.h @@ -36,10 +36,6 @@ #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/sortingrenderer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h index ad67ec3871..6d4ef2430e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h @@ -17,10 +17,6 @@ */ #pragma once - -#ifndef SORTING_RENDERER_H -#define SORTING_RENDERER_H - #include "always.h" class SortingNodeStruct; @@ -63,6 +59,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..d2082affb1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texproject.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texproject.h @@ -38,10 +38,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once - -#ifndef TEXPROJECT_H -#define TEXPROJECT_H - #include "always.h" #include "matrix3d.h" #include "matrix4.h" @@ -240,7 +236,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..77bddb8b41 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.h @@ -41,10 +41,6 @@ #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/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..d5a2f30b08 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h @@ -17,9 +17,6 @@ */ // 08/07/02 KM Texture class redesign (revisited) -#ifndef TEXTURETHUMBNAIL_H -#define TEXTURETHUMBNAIL_H - #pragma once #include "always.h" @@ -124,5 +121,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..ebe6d0841a 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h @@ -36,10 +36,6 @@ #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..efdaa8dd33 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h @@ -37,10 +37,6 @@ #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..1d6c8fce16 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h @@ -36,10 +36,6 @@ #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/Tools/GUIEdit/Include/DialogProc.h b/GeneralsMD/Code/Tools/GUIEdit/Include/DialogProc.h index 76036ccfbe..f884a55e53 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/DialogProc.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/DialogProc.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __DIALOGPROC_H_ -#define __DIALOGPROC_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -69,6 +65,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..e72b6c87b9 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __EDITWINDOW_H_ -#define __EDITWINDOW_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #include @@ -203,6 +199,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..ddbe54cdbf 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h @@ -28,10 +28,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GUIEDIT_H_ -#define __GUIEDIT_H_ - // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include #include @@ -374,6 +370,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..5282666247 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditColor.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditColor.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GUIEDITCOLOR_H_ -#define __GUIEDITCOLOR_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -96,6 +92,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..0fbaa5d919 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GUIEDITDISPLAY_H_ -#define __GUIEDITDISPLAY_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -137,6 +133,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..2b91458737 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h @@ -33,10 +33,6 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __GUIEDITWINDOWMANAGER_H_ -#define __GUIEDITWINDOWMANAGER_H_ - #include #include "W3DDevice/GameClient/W3DGameWindowManager.h" @@ -114,6 +110,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..95c2b4f98e 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __HIERARCHYVIEW_H_ -#define __HIERARCHYVIEW_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #include @@ -174,6 +170,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..b65b0c4cd1 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __LAYOUTSCHEME_H_ -#define __LAYOUTSCHEME_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -147,6 +143,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..eb79e5d8b1 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h @@ -45,10 +45,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __PROPERTIES_H_ -#define __PROPERTIES_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// @@ -425,6 +421,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..b1349ea682 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/WinMain.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/WinMain.h @@ -44,10 +44,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __WINMAIN_H_ -#define __WINMAIN_H_ - // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -65,6 +61,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..2e52a26dc3 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.h @@ -17,10 +17,6 @@ */ #pragma once - -#ifndef _H_CBUTTONSHOWCOLOR_ -#define _H_CBUTTONSHOWCOLOR_ - #include "Lib/BaseType.h" class CButtonShowColor : public CButton @@ -44,5 +40,3 @@ class CButtonShowColor : public CButton DECLARE_MESSAGE_MAP(); }; - -#endif /* _H_CBUTTONSHOWCOLOR_ */ diff --git a/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.h b/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.h index 885bde0f0e..7783d1d8e1 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.h @@ -32,9 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_EMISSIONTYPEPANELS_ -#define _H_EMISSIONTYPEPANELS_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" #include "ISwapablePanel.h" @@ -134,5 +131,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..2bc1b01060 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/ISwapablePanel.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/ISwapablePanel.h @@ -33,9 +33,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_ISWAPABLEPANEL_ -#define _H_ISWAPABLEPANEL_ - #include "Lib/BaseType.h" // INCLUDES /////////////////////////////////////////////////////////////////// @@ -50,5 +47,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..9dcb1a034b 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.h @@ -32,9 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_MOREPARMSDIALOG_ -#define _H_MOREPARMSDIALOG_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" #include "Lib/BaseType.h" @@ -60,5 +57,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..e3404af71e 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.h @@ -18,10 +18,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 +62,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/ParticleTypePanels.h b/GeneralsMD/Code/Tools/ParticleEditor/ParticleTypePanels.h index 43b0c72741..cb70fcf8c6 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/ParticleTypePanels.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/ParticleTypePanels.h @@ -32,9 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_PARTICLETYPEPANELS_ -#define _H_PARTICLETYPEPANELS_ - #include "Resource.h" #include "ISwapablePanel.h" @@ -98,5 +95,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..f2c79a276c 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.h @@ -32,13 +32,7 @@ /*---------------------------------------------------------------------------*/ #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..d185a970f0 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h @@ -20,10 +20,6 @@ // or project specific include files that are used frequently, but // 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 +69,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..801c0b8e20 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.h @@ -32,9 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_VELOCITYTYPEPANELS_ -#define _H_VELOCITYTYPEPANELS_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" #include "ISwapablePanel.h" @@ -134,5 +131,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..2f10b8e909 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef AUTOEDGEOUTTOOL_H -#define AUTOEDGEOUTTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -43,6 +39,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..988388d230 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +68,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..ede9ce2fd6 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef BLEND_EDGE_TOOL_H -#define BLEND_EDGE_TOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -47,6 +43,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..57ab610710 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +82,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/BrushTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h index 1ab148b7f4..a69e28c9ee 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef BRUSHTOOL_H -#define BRUSHTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -64,6 +60,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..858c2282d5 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildList.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildList.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +103,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..2586e1797e 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, Nov 2001 #pragma once - -#ifndef BUILDLISTTOOL_H -#define BUILDLISTTOOL_H - #include "Tool.h" #include "Common/AsciiString.h" #include "PickUnitDialog.h" @@ -78,6 +74,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..4c3e479ca1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h @@ -17,10 +17,6 @@ */ #pragma once - -#ifndef _H_CBUTTONSHOWCOLOR_ -#define _H_CBUTTONSHOWCOLOR_ - class CButtonShowColor : public CButton { protected: @@ -42,5 +38,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..30b3632d8b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #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 +408,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..50020b93d1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +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/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h index 5837560c75..37db06cf25 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +59,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..1d208d07ab 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +80,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/EditAction.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h index 673e075d92..52ad4e481d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +75,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..7a4c5ccd44 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +81,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..344a4a20b0 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -70,5 +66,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..2e46ecc096 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +59,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..6ea030292d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -74,5 +70,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..7d463774e2 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -131,5 +127,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..fd1e91ea2d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +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/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h index 6445b58438..0d579c953a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef EYEDROPPERTOOL_H -#define EYEDROPPERTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -43,6 +39,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..65acc1316c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +89,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..ef8632159e 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef FEATHERTOOL_H -#define FEATHERTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /**************************************************************************/ @@ -56,6 +52,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..fb02db8012 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +90,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..26a9bd56cb 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef FenceTool_H -#define FenceTool_H - #include "Tool.h" class WorldHeightMapEdit; class MapObject; @@ -57,6 +53,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..fa7d877328 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef FloodFillTool_H -#define FloodFillTool_H - #include "Tool.h" class WorldHeightMapEdit; /************************************************************************** @@ -51,6 +47,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..c99edf725b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +133,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..f2e61f3ff3 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef GROVEOPTIONS_H -#define GROVEOPTIONS_H - #pragma once #include @@ -78,5 +74,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..45d1e87ef8 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h @@ -20,10 +20,6 @@ // Author: John Ahlquist, May 2001 #pragma once - -#ifndef GroveTool_H -#define GroveTool_H - #include "Lib/BaseType.h" #include "Tool.h" #include "Common/MapObject.h" @@ -61,6 +57,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..23a50bb430 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, May 2001 #pragma once - -#ifndef HandScrollTool_H -#define HandScrollTool_H - #include "Tool.h" /************************************************************************** HandScrollTool @@ -53,6 +49,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..0334a26432 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h @@ -18,10 +18,6 @@ #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..9fad59c3eb 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h @@ -32,9 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_LAYERSLIST_ -#define _H_LAYERSLIST_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" #include @@ -185,5 +182,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..5fa20ff475 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -76,5 +72,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..c8e7bd0835 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h @@ -19,10 +19,6 @@ // MainFrm.h : interface of the CMainFrame class // ///////////////////////////////////////////////////////////////////////////// - -#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 +152,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..3c149d9ab4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MapPreview.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MapPreview.h @@ -38,10 +38,6 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once - -#ifndef __MAP_PREVIEW_H_ -#define __MAP_PREVIEW_H_ - //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- @@ -84,5 +80,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..3367b67195 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +59,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..f81377350f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -112,5 +108,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..a81dea3a8e 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, Oct. 2001 #pragma once - -#ifndef MESHMOLDTOOL_H -#define MESHMOLDTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -65,6 +61,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..f307cf0baa 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -98,5 +94,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..2cf60229e2 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef MOUND_TOOL_H -#define MOUND_TOOL_H - #include "Tool.h" class WorldHeightMapEdit; /************************************************************************* @@ -72,4 +68,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..511cf9a03e 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h @@ -22,10 +22,6 @@ #pragma once -#ifndef MYTOOLBAR_H -#define MYTOOLBAR_H - - /************************************************************************* ** CellSizeToolBar @@ -47,7 +43,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..3d2f11f828 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +79,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..981bb68721 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +99,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..34ebd9448b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +66,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..b8ccaac383 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef OBJECTTOOL_H -#define OBJECTTOOL_H - #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ @@ -53,6 +49,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..edde9bd2e0 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +70,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..fc55b44b17 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +62,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..8fe4a306ac 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +106,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..30f652ff0f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef POINTER_TOOL_H -#define POINTER_TOOL_H - #include "PolygonTool.h" class WorldHeightMapEdit; #include "../../GameEngine/Include/Common/MapObject.h" @@ -77,6 +73,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..92a37bcd91 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, Nov. 2001 #pragma once - -#ifndef POLYGONTOOL_H -#define POLYGONTOOL_H - #include "Tool.h" class WorldHeightMapEdit; class MapObject; @@ -84,7 +80,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..bb2d42870f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h @@ -32,9 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_RAMPOPTIONS_ -#define _H_RAMPOPTIONS_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "OptionsPanel.h" #include "resource.h" @@ -62,5 +59,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..fb36ac590c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h @@ -32,9 +32,6 @@ /*---------------------------------------------------------------------------*/ #pragma once -#ifndef _H_RAMPTOOL_ -#define _H_RAMPTOOL_ - // INCLUDES /////////////////////////////////////////////////////////////////// #include "Tool.h" // DEFINES //////////////////////////////////////////////////////////////////// @@ -64,6 +61,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..8857a61880 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +101,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..cf546fd395 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, June 2001 #pragma once - -#ifndef RoadTool_H -#define RoadTool_H - #include "Tool.h" #include "W3DDevice/GameClient/WorldHeightMap.h" class WorldHeightMapEdit; @@ -58,6 +54,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..84c25dd9d2 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h @@ -16,10 +16,6 @@ ** along with this program. If not, see . */ - -#ifndef __RULEROPTIONS_H_ -#define __RULEROPTIONS_H_ - #pragma once // RulerOptions.h : header file // @@ -74,5 +70,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..9b318d03f8 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h @@ -20,10 +20,6 @@ // Author: Mike Lytle, January 2003 #pragma once - -#ifndef RULER_TOOL_H -#define RULER_TOOL_H - #include "Tool.h" class RulerTool : public Tool @@ -56,6 +52,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..2e9a0ea138 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +72,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..56f411108e 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +88,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..5bd81fb974 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h @@ -20,10 +20,6 @@ // Author: Dennis Griffin, April 2002 #pragma once - -#ifndef SCORCHTOOL_H -#define SCORCHTOOL_H - #include "Tool.h" class WorldHeightMapEdit; class MapObject; @@ -51,6 +47,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..715142dad4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -86,5 +82,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..ee20b0e73a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -86,5 +82,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..e37037d137 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -91,5 +87,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..d9989f3bfd 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +161,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..e7f0d24ddd 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -83,5 +79,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..518e879a2e 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +59,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..0c06c8087c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +65,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..725908b7b0 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/SplashScreen.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/SplashScreen.h @@ -18,10 +18,6 @@ #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..d66d9a836c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/StdAfx.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/StdAfx.h @@ -20,10 +20,6 @@ // or project specific include files that are used frequently, but // 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 +43,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..d09982a31f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +74,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..c51f7f88cb 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h @@ -18,10 +18,6 @@ #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..1e239fd12e 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -96,5 +92,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..9c7221c68d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +64,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..ee9963e970 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +107,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..1ba89d78f9 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +76,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..2f853f72e5 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +60,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..4022fa3d83 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef TILETOOL_H -#define TILETOOL_H - #include "Tool.h" class WorldHeightMapEdit; /************************************************************************* @@ -69,4 +65,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..23691c5702 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef TOOL_H -#define TOOL_H - #include "Lib/BaseType.h" #include "Common/STLTypedefs.h" @@ -88,6 +84,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..44a0957b7c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +96,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/WBPopupSlider.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WBPopupSlider.h index dce9a5f2b8..81fdb677ed 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WBPopupSlider.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WBPopupSlider.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +174,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..9cc7124d90 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef WHeightMapEdit_H -#define WHeightMapEdit_H - #include "W3DDevice/GameClient/WorldHeightMap.h" class DataChunkOutput; @@ -164,5 +160,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..2ecc6c26cf 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -102,5 +98,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..542f3b4857 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, Nov. 2001 #pragma once - -#ifndef WaterTool_H -#define WaterTool_H - #include "PolygonTool.h" class WorldHeightMapEdit; class MapObject; @@ -62,6 +58,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..41cbf351c6 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 // @@ -92,5 +88,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..a5c1284edb 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h @@ -21,10 +21,6 @@ // Author: John Ahlquist, April 2001 #pragma once - -#ifndef WAYPOINTTOOL_H -#define WAYPOINTTOOL_H - #include "Tool.h" class WorldHeightMapEdit; class MapObject; @@ -58,6 +54,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..2fffbf1986 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h @@ -18,10 +18,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 +192,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..21f54a7848 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h @@ -19,10 +19,6 @@ // WorldBuilderDoc.h : interface of the CWorldBuilderDoc class // ///////////////////////////////////////////////////////////////////////////// - -#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 +207,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..ec520cac7f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h @@ -19,10 +19,6 @@ // WorldBuilderView.h : interface of the CWorldBuilderView class // ///////////////////////////////////////////////////////////////////////////// - -#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 +155,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..ed2b4350ce 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/addplayerdialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/addplayerdialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +65,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..1dd06c4786 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +91,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..5ec0085945 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/euladialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/euladialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +54,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..f6de4030db 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +205,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..c0117ff43b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +82,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..ab615655bf 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/propedit.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/propedit.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +67,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..0e409e3d3f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +91,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..bbdade43ff 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +250,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..bdec268c29 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h @@ -20,10 +20,6 @@ // WbView3d.h // 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 +323,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..788381ced9 100644 --- a/GeneralsMD/Code/Tools/wdump/FindDialog.h +++ b/GeneralsMD/Code/Tools/wdump/FindDialog.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +84,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..1f580ff532 100644 --- a/GeneralsMD/Code/Tools/wdump/chunk_d.h +++ b/GeneralsMD/Code/Tools/wdump/chunk_d.h @@ -19,10 +19,6 @@ // Chunk_D.h: interface for the ChunkData class. // ////////////////////////////////////////////////////////////////////// - -#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; @@ -254,5 +250,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..3ff7b487ad 100644 --- a/GeneralsMD/Code/Tools/wdump/mainfrm.h +++ b/GeneralsMD/Code/Tools/wdump/mainfrm.h @@ -19,10 +19,6 @@ // MainFrm.h : interface of the CMainFrame class // ///////////////////////////////////////////////////////////////////////////// - -#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 +69,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/stdafx.h b/GeneralsMD/Code/Tools/wdump/stdafx.h index a18f0ac158..6c55227d5b 100644 --- a/GeneralsMD/Code/Tools/wdump/stdafx.h +++ b/GeneralsMD/Code/Tools/wdump/stdafx.h @@ -20,10 +20,6 @@ // or project specific include files that are used frequently, but // 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 +40,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..f603a99228 100644 --- a/GeneralsMD/Code/Tools/wdump/wdeview.h +++ b/GeneralsMD/Code/Tools/wdump/wdeview.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +63,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..7a7d76e902 100644 --- a/GeneralsMD/Code/Tools/wdump/wdlview.h +++ b/GeneralsMD/Code/Tools/wdump/wdlview.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +64,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..476e80c3eb 100644 --- a/GeneralsMD/Code/Tools/wdump/wdtview.h +++ b/GeneralsMD/Code/Tools/wdump/wdtview.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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 +75,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..bf633077ea 100644 --- a/GeneralsMD/Code/Tools/wdump/wdump.h +++ b/GeneralsMD/Code/Tools/wdump/wdump.h @@ -18,10 +18,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 +63,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..eb4fa263a7 100644 --- a/GeneralsMD/Code/Tools/wdump/wdumpdoc.h +++ b/GeneralsMD/Code/Tools/wdump/wdumpdoc.h @@ -19,10 +19,6 @@ // wdumpDoc.h : interface of the CWdumpDoc class // ///////////////////////////////////////////////////////////////////////////// - -#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 +73,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..f470d76e7a 100644 --- a/GeneralsMD/Code/Tools/wdump/wdview.h +++ b/GeneralsMD/Code/Tools/wdump/wdview.h @@ -19,10 +19,6 @@ // wdumpView.h : interface of the CWdumpView class // ///////////////////////////////////////////////////////////////////////////// - -#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 +71,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/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() From 310a893ba653af2bc1386b786db27929f1077a35 Mon Sep 17 00:00:00 2001 From: Bart Roossien Date: Thu, 23 Oct 2025 16:19:43 +0200 Subject: [PATCH 2/5] refactor: Remove guards and add include for codex.h --- Core/Libraries/Source/Compression/EAC/btreecodex.h | 7 +------ Core/Libraries/Source/Compression/EAC/codex.h | 3 --- Core/Libraries/Source/Compression/EAC/huffcodex.h | 7 +------ Core/Libraries/Source/Compression/EAC/refcodex.h | 7 +------ 4 files changed, 3 insertions(+), 21 deletions(-) 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..7999e36a55 100644 --- a/Core/Libraries/Source/Compression/EAC/codex.h +++ b/Core/Libraries/Source/Compression/EAC/codex.h @@ -37,8 +37,6 @@ /* */ /*------------------------------------------------------------------*/ -#ifndef __CODEX_H -#define __CODEX_H 1 #pragma once @@ -117,5 +115,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/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 From 86fb1c11a5f3200057b11c2fa511d4f07c8205c2 Mon Sep 17 00:00:00 2001 From: Bart Roossien Date: Thu, 23 Oct 2025 20:06:30 +0200 Subject: [PATCH 3/5] refactor: replace include guards with pragma once --- Core/GameEngine/Include/Common/CRCDebug.h | 7 +- Core/GameEngine/Include/Common/simpleplayer.h | 7 +- Core/GameEngine/Include/Common/urllaunch.h | 7 +- .../Compression/LZHCompress/NoxCompress.h | 7 +- .../Source/WWVegas/WW3D2/dx8webbrowser.h | 7 +- .../Source/WWVegas/WW3D2/projector.h | 10 +- .../WWVegas/WW3D2/renderobjectrecycler.h | 10 +- .../Source/WWVegas/WW3D2/seglinerenderer.h | 9 +- .../Source/WWVegas/WW3D2/soundlibrarybridge.h | 6 +- .../Source/WWVegas/WW3D2/streakRender.h | 8 +- Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h | 7 +- Core/Libraries/Source/WWVegas/WWAudio/Utils.h | 8 +- .../Source/WWVegas/WWDownload/Download.h | 7 +- .../Source/WWVegas/WWDownload/DownloadDebug.h | 7 +- .../Source/WWVegas/WWDownload/downloaddefs.h | 7 +- .../Libraries/Source/WWVegas/WWDownload/ftp.h | 7 +- .../Source/WWVegas/WWDownload/ftpdefs.h | 8 +- .../Source/WWVegas/WWDownload/urlBuilder.h | 6 +- .../Source/WWVegas/WWLib/CallbackHook.h | 7 +- Core/Libraries/Source/WWVegas/WWLib/RAMFILE.H | 10 +- .../Libraries/Source/WWVegas/WWLib/Signaler.h | 9 +- Core/Libraries/Source/WWVegas/WWLib/TARGA.H | 7 +- .../Source/WWVegas/WWLib/WWCOMUtil.h | 7 +- .../Libraries/Source/WWVegas/WWLib/bfiofile.h | 7 +- Core/Libraries/Source/WWVegas/WWLib/binheap.h | 8 +- Core/Libraries/Source/WWVegas/WWLib/crandom.h | 7 +- Core/Libraries/Source/WWVegas/WWLib/crcpipe.h | 7 +- .../Libraries/Source/WWVegas/WWLib/crcstraw.h | 8 +- Core/Libraries/Source/WWVegas/WWLib/hashtab.h | 9 +- Core/Libraries/Source/WWVegas/WWLib/incdec.h | 7 +- Core/Libraries/Source/WWVegas/WWLib/lzo.h | 9 +- Core/Libraries/Source/WWVegas/WWLib/lzo1x.h | 7 +- .../Libraries/Source/WWVegas/WWLib/lzo_conf.h | 8 +- Core/Libraries/Source/WWVegas/WWLib/lzoconf.h | 7 +- Core/Libraries/Source/WWVegas/WWLib/lzopipe.h | 8 +- .../Libraries/Source/WWVegas/WWLib/lzostraw.h | 8 +- Core/Libraries/Source/WWVegas/WWLib/noinit.h | 8 +- .../Libraries/Source/WWVegas/WWLib/notifier.h | 7 +- Core/Libraries/Source/WWVegas/WWLib/search.h | 10 +- Core/Libraries/Source/WWVegas/WWLib/stimer.h | 7 +- Core/Libraries/Source/WWVegas/WWLib/swap.h | 7 +- .../Libraries/Source/WWVegas/WWLib/tgatodxt.h | 7 +- .../Source/WWVegas/WWMath/colmathline.h | 12 +- .../Source/WWVegas/WWMath/colmathplane.h | 9 +- .../Source/WWVegas/WWMath/lookuptable.h | 8 +- .../Source/WWVegas/WWMath/normalcone.h | 7 +- .../Source/WWVegas/WWMath/wwmathids.h | 10 +- .../Source/WWVegas/WWSaveLoad/postloadable.h | 10 +- .../WWSaveLoad/simpledefinitionfactory.h | 8 +- Core/Tools/Autorun/ARGS.H | 7 +- Core/Tools/Autorun/CallbackHook.h | 7 +- Core/Tools/Autorun/DrawButton.h | 12 +- Core/Tools/Autorun/ViewHTML.h | 7 +- Core/Tools/Autorun/autorun.h | 9 +- Core/Tools/Autorun/gimex.h | 10 +- Core/Tools/Autorun/locale.h | 8 +- Core/Tools/Babylon/TransDB.h | 9 +- Core/Tools/Babylon/XLStuff.h | 9 +- Core/Tools/Babylon/bin.h | 8 +- Core/Tools/Babylon/expimp.h | 6 +- Core/Tools/Babylon/fileops.h | 8 +- Core/Tools/Babylon/iff.h | 8 +- Core/Tools/Babylon/list.h | 8 +- Core/Tools/Babylon/loadsave.h | 8 +- Core/Tools/Babylon/olestring.h | 9 +- Core/Tools/Babylon/transcs.h | 7 +- Core/Tools/CRCDiff/KVPair.h | 8 +- Core/Tools/CRCDiff/debug.h | 8 +- Core/Tools/CRCDiff/expander.h | 8 +- Core/Tools/CRCDiff/misc.h | 8 +- Core/Tools/Launcher/BFISH.H | 8 +- .../Tools/Launcher/Toolkit/Debug/DebugPrint.h | 7 +- Core/Tools/Launcher/Toolkit/Storage/File.h | 7 +- Core/Tools/Launcher/Toolkit/Storage/Rights.h | 7 +- Core/Tools/Launcher/Toolkit/Storage/Stream.h | 7 +- .../Launcher/Toolkit/Support/RefCounted.h | 7 +- Core/Tools/Launcher/Toolkit/Support/RefPtr.h | 7 +- .../Launcher/Toolkit/Support/StringConvert.h | 7 +- Core/Tools/Launcher/Toolkit/Support/UString.h | 7 +- Core/Tools/Launcher/Toolkit/Support/UTypes.h | 7 +- Core/Tools/Launcher/configfile.h | 7 +- Core/Tools/Launcher/dialog.h | 7 +- Core/Tools/Launcher/dictionary.h | 7 +- Core/Tools/Launcher/filed.h | 7 +- Core/Tools/Launcher/findpatch.h | 7 +- Core/Tools/Launcher/loadbmp.h | 8 +- Core/Tools/Launcher/monod.h | 7 +- Core/Tools/Launcher/odevice.h | 7 +- Core/Tools/Launcher/patch.h | 7 +- Core/Tools/Launcher/process.h | 8 +- Core/Tools/Launcher/streamer.h | 7 +- Core/Tools/Launcher/wdebug.h | 7 +- Core/Tools/Launcher/winblows.h | 7 +- Core/Tools/Launcher/wstring.h | 7 +- Core/Tools/Launcher/wstypes.h | 7 +- Core/Tools/PATCHGET/CHATAPI.H | 7 +- Core/Tools/PATCHGET/COMINIT.H | 7 +- Core/Tools/PATCHGET/PROCESS.H | 7 +- Core/Tools/PATCHGET/WINBLOWS.H | 7 +- Core/Tools/PATCHGET/WSTYPES.H | 7 +- Core/Tools/PATCHGET/debug.h | 8 +- Core/Tools/W3DView/ColorUtils.h | 8 +- Core/Tools/W3DView/Globals.h | 8 +- Core/Tools/W3DView/LODDefs.h | 9 +- Core/Tools/W3DView/Toolbar.h | 7 +- Core/Tools/W3DView/Utils.h | 7 +- Core/Tools/WW3D/max2w3d/AlphaModifier.h | 11 +- Core/Tools/WW3D/max2w3d/ExportAllDlg.h | 8 +- Core/Tools/WW3D/max2w3d/GameMtlDlg.h | 8 +- Core/Tools/WW3D/max2w3d/GameMtlForm.h | 7 +- Core/Tools/WW3D/max2w3d/GameMtlPassDlg.h | 7 +- Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.h | 7 +- Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.h | 12 +- .../WW3D/max2w3d/GameMtlVertexMaterialDlg.h | 8 +- Core/Tools/WW3D/max2w3d/InputDlg.h | 8 +- Core/Tools/WW3D/max2w3d/MeshDeform.h | 8 +- Core/Tools/WW3D/max2w3d/MeshDeformData.h | 9 +- Core/Tools/WW3D/max2w3d/MeshDeformDefs.h | 9 +- Core/Tools/WW3D/max2w3d/MeshDeformPanel.h | 8 +- Core/Tools/WW3D/max2w3d/MeshDeformSave.h | 7 +- Core/Tools/WW3D/max2w3d/MeshDeformSaveDefs.h | 8 +- Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.h | 7 +- Core/Tools/WW3D/max2w3d/MeshDeformSet.h | 9 +- Core/Tools/WW3D/max2w3d/MeshDeformUndo.h | 8 +- Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.h | 7 +- Core/Tools/WW3D/max2w3d/SceneSetupDlg.h | 7 +- Core/Tools/WW3D/max2w3d/TARGA.H | 7 +- .../max2w3d/animationcompressionsettings.h | 9 +- Core/Tools/WW3D/max2w3d/bchannel.h | 8 +- Core/Tools/WW3D/max2w3d/boneicon.h | 7 +- Core/Tools/WW3D/max2w3d/bpick.h | 8 +- Core/Tools/WW3D/max2w3d/dllmain.h | 7 +- Core/Tools/WW3D/max2w3d/exportlog.h | 9 +- Core/Tools/WW3D/max2w3d/floaterdialog.h | 10 +- Core/Tools/WW3D/max2w3d/gamemaps.h | 8 +- Core/Tools/WW3D/max2w3d/gamemtl.h | 10 +- .../WW3D/max2w3d/genlodextensiondialog.h | 10 +- Core/Tools/WW3D/max2w3d/genmtlnamesdialog.h | 10 +- .../WW3D/max2w3d/geometryexportcontext.h | 10 +- Core/Tools/WW3D/max2w3d/geometryexporttask.h | 10 +- Core/Tools/WW3D/max2w3d/gridsnapmodifier.h | 8 +- Core/Tools/WW3D/max2w3d/hiersave.h | 7 +- Core/Tools/WW3D/max2w3d/hlodsave.h | 9 +- Core/Tools/WW3D/max2w3d/logdlg.h | 7 +- Core/Tools/WW3D/max2w3d/maxworldinfo.h | 9 +- Core/Tools/WW3D/max2w3d/meshcon.h | 8 +- Core/Tools/WW3D/max2w3d/motion.h | 8 +- Core/Tools/WW3D/max2w3d/namedsel.h | 8 +- .../WW3D/max2w3d/presetexportoptionsdialog.h | 9 +- Core/Tools/WW3D/max2w3d/rcmenu.h | 7 +- Core/Tools/WW3D/max2w3d/simpdib.h | 8 +- Core/Tools/WW3D/max2w3d/skin.h | 11 +- Core/Tools/WW3D/max2w3d/skindata.h | 8 +- Core/Tools/WW3D/max2w3d/util.h | 8 +- Core/Tools/WW3D/max2w3d/vchannel.h | 7 +- Core/Tools/WW3D/max2w3d/vxl.h | 8 +- Core/Tools/WW3D/max2w3d/vxldbg.h | 9 +- Core/Tools/WW3D/max2w3d/vxllayer.h | 8 +- Core/Tools/WW3D/max2w3d/w3dappdata.h | 9 +- Core/Tools/WW3D/max2w3d/w3ddesc.h | 8 +- Core/Tools/WW3D/max2w3d/w3ddlg.h | 8 +- Core/Tools/WW3D/max2w3d/w3dexp.h | 8 +- Core/Tools/WW3D/max2w3d/w3dutil.h | 7 +- Core/Tools/WW3D/pluglib/BITTYPE.H | 8 +- Core/Tools/WW3D/pluglib/EULER.H | 8 +- Core/Tools/WW3D/pluglib/PROGRESS.H | 7 +- Core/Tools/WW3D/pluglib/Vector.H | 9 +- Core/Tools/WW3D/pluglib/errclass.h | 8 +- Core/Tools/WW3D/pluglib/hsv.h | 7 +- Core/Tools/WW3D/pluglib/nodefilt.h | 9 +- Core/Tools/WW3D/pluglib/nodelist.h | 8 +- Core/Tools/WW3D/pluglib/noinit.h | 8 +- Core/Tools/WW3D/pluglib/plane.h | 9 +- Core/Tools/WW3D/pluglib/w3d_file.h | 9 +- Core/Tools/mangler/crc.h | 7 +- Core/Tools/mangler/endian.h | 9 +- Core/Tools/mangler/mangler.h | 7 +- Core/Tools/mangler/wlib/arraylist.h | 8 +- Core/Tools/mangler/wlib/configfile.h | 7 +- Core/Tools/mangler/wlib/critsec.h | 7 +- Core/Tools/mangler/wlib/dictionary.h | 9 +- Core/Tools/mangler/wlib/filed.h | 7 +- Core/Tools/mangler/wlib/linkedlist.h | 7 +- Core/Tools/mangler/wlib/mboxd.h | 7 +- Core/Tools/mangler/wlib/monod.h | 7 +- Core/Tools/mangler/wlib/odevice.h | 7 +- Core/Tools/mangler/wlib/sem4.h | 7 +- Core/Tools/mangler/wlib/stderrd.h | 7 +- Core/Tools/mangler/wlib/stdoutd.h | 7 +- Core/Tools/mangler/wlib/streamer.h | 7 +- Core/Tools/mangler/wlib/syslogd.h | 7 +- Core/Tools/mangler/wlib/threadfac.h | 7 +- Core/Tools/mangler/wlib/threadsafe.h | 7 +- Core/Tools/mangler/wlib/timezone.h | 8 +- Core/Tools/mangler/wlib/ustring.h | 7 +- Core/Tools/mangler/wlib/wdebug.h | 7 +- Core/Tools/mangler/wlib/wstring.h | 7 +- Core/Tools/mangler/wlib/wstypes.h | 7 +- Core/Tools/mangler/wlib/wtime.h | 6 +- Core/Tools/mangler/wlib/xtime.h | 7 +- Core/Tools/mangler/wnet/tcp.h | 7 +- Core/Tools/mangler/wnet/udp.h | 7 +- Core/Tools/matchbot/debug.h | 8 +- Core/Tools/matchbot/encrypt.h | 9 +- Core/Tools/matchbot/generals.h | 8 +- Core/Tools/matchbot/global.h | 8 +- Core/Tools/matchbot/matcher.h | 8 +- Core/Tools/matchbot/mydebug.h | 7 +- Core/Tools/matchbot/rand.h | 8 +- Core/Tools/matchbot/wlib/arraylist.h | 8 +- Core/Tools/matchbot/wlib/configfile.h | 7 +- Core/Tools/matchbot/wlib/critsec.h | 7 +- Core/Tools/matchbot/wlib/dictionary.h | 9 +- Core/Tools/matchbot/wlib/filed.h | 7 +- Core/Tools/matchbot/wlib/linkedlist.h | 7 +- Core/Tools/matchbot/wlib/mboxd.h | 7 +- Core/Tools/matchbot/wlib/monod.h | 7 +- Core/Tools/matchbot/wlib/odevice.h | 7 +- Core/Tools/matchbot/wlib/sem4.h | 7 +- Core/Tools/matchbot/wlib/stderrd.h | 7 +- Core/Tools/matchbot/wlib/stdoutd.h | 7 +- Core/Tools/matchbot/wlib/streamer.h | 7 +- Core/Tools/matchbot/wlib/syslogd.h | 7 +- Core/Tools/matchbot/wlib/threadfac.h | 7 +- Core/Tools/matchbot/wlib/threadsafe.h | 7 +- Core/Tools/matchbot/wlib/timezone.h | 8 +- Core/Tools/matchbot/wlib/ustring.h | 7 +- Core/Tools/matchbot/wlib/wdebug.h | 7 +- Core/Tools/matchbot/wlib/wstring.h | 7 +- Core/Tools/matchbot/wlib/wstypes.h | 7 +- Core/Tools/matchbot/wlib/wtime.h | 6 +- Core/Tools/matchbot/wlib/xtime.h | 7 +- Core/Tools/matchbot/wnet/tcp.h | 7 +- Core/Tools/matchbot/wnet/udp.h | 7 +- Core/Tools/wolSetup/WOLAPI/chatdefs.h | 8 +- Core/Tools/wolSetup/WOLAPI/downloaddefs.h | 7 +- Core/Tools/wolSetup/WOLAPI/ftpdefs.h | 8 +- Core/Tools/wolSetup/WOLAPI/netutildefs.h | 7 +- Core/Tools/wolSetup/verchk.h | 8 +- Core/Tools/wolSetup/wolSetup.h | 7 +- .../Include/GameLogic/Module/PrisonBehavior.h | 7 +- .../Module/PropagandaCenterBehavior.h | 7 +- .../Module/RailedTransportDockUpdate.h | 7 +- .../GameNetwork/WOLBrowser/FEBDispatch.h | 7 +- .../GameEngine/Include/Precompiled/PreRTS.h | 7 +- Generals/Code/Libraries/Include/Lib/trig.h | 7 +- .../Source/WWVegas/WW3D2/matrixmapper.h | 7 +- .../Source/WWVegas/WW3D2/meshgeometry.h | 8 +- .../Source/WWVegas/WW3D2/meshmatdesc.h | 8 +- .../Source/WWVegas/WW3D2/texturefilter.h | 7 +- Generals/Code/Main/WinMain.h | 8 +- .../Tools/WorldBuilder/include/DrawObject.h | 7 +- .../Tools/WorldBuilder/include/WBHeightMap.h | 7 +- .../Include/GameLogic/Module/PrisonBehavior.h | 7 +- .../Module/PropagandaCenterBehavior.h | 7 +- .../Module/RailedTransportDockUpdate.h | 7 +- .../GameNetwork/WOLBrowser/FEBDispatch.h | 7 +- .../GameEngine/Include/Precompiled/PreRTS.h | 7 +- .../Include/W3DDevice/GameClient/W3DSnow.h | 8 +- .../W3DDevice/GameClient/camerashakesystem.h | 9 +- GeneralsMD/Code/Libraries/Include/Lib/trig.h | 7 +- .../Source/WWVegas/WW3D2/matrixmapper.h | 7 +- .../Source/WWVegas/WW3D2/meshgeometry.h | 8 +- .../Source/WWVegas/WW3D2/meshmatdesc.h | 8 +- .../Libraries/Source/WWVegas/WW3D2/shdlib.h | 8 +- .../Source/WWVegas/WW3D2/texturefilter.h | 7 +- GeneralsMD/Code/Main/WinMain.h | 8 +- .../Tools/WorldBuilder/include/DrawObject.h | 7 +- .../Tools/WorldBuilder/include/WBHeightMap.h | 7 +- GeneralsMD/Code/Tools/wdump/rawfilem.h | 7 +- .../cpp/replace_include_guards_with_pragma.py | 246 ++++++++++++++++++ 271 files changed, 516 insertions(+), 1810 deletions(-) create mode 100644 scripts/cpp/replace_include_guards_with_pragma.py diff --git a/Core/GameEngine/Include/Common/CRCDebug.h b/Core/GameEngine/Include/Common/CRCDebug.h index 77d806042e..8045def003 100644 --- a/Core/GameEngine/Include/Common/CRCDebug.h +++ b/Core/GameEngine/Include/Common/CRCDebug.h @@ -27,10 +27,7 @@ // 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" #ifndef NO_DEBUG_CRC @@ -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/simpleplayer.h b/Core/GameEngine/Include/Common/simpleplayer.h index b7dec2d1d6..98043b2ff1 100644 --- a/Core/GameEngine/Include/Common/simpleplayer.h +++ b/Core/GameEngine/Include/Common/simpleplayer.h @@ -16,10 +16,7 @@ ** along with this program. If not, see . */ - -#ifndef SIMPLEPLAYER_H -#define SIMPLEPLAYER_H - +#pragma once #include "wmsdk.h" // @@ -119,5 +116,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..da3062f81c 100644 --- a/Core/GameEngine/Include/Common/urllaunch.h +++ b/Core/GameEngine/Include/Common/urllaunch.h @@ -16,12 +16,7 @@ ** 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/Libraries/Source/Compression/LZHCompress/NoxCompress.h b/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.h index 48afbcb4ec..6c69b74b0d 100644 --- a/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.h +++ b/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.h @@ -20,10 +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" #define RUL_EXTENSION ".rul" @@ -36,5 +33,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/dx8webbrowser.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h index eeb5881d9a..f77c153468 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h @@ -29,10 +29,7 @@ //****************************************************************************************** // $Header: $ //****************************************************************************************** - -#ifndef DX8_WEBBROWSER_H -#define DX8_WEBBROWSER_H - +#pragma once #include #include "d3d8.h" @@ -89,5 +86,3 @@ class DX8WebBrowser }; #endif - -#endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/projector.h b/Core/Libraries/Source/WWVegas/WW3D2/projector.h index 9e13bd86e9..051d3c5611 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/projector.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/projector.h @@ -36,10 +36,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef PROJECTOR_H -#define PROJECTOR_H - +#pragma once #include "always.h" #include "matrix3d.h" #include "matrix4.h" @@ -85,8 +82,3 @@ class ProjectorClass MatrixMapperClass * Mapper; }; - - -#endif - - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h index 4519c13530..7785ee0c80 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h @@ -36,10 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef RENDEROBJECTRECYCLER_H -#define RENDEROBJECTRECYCLER_H - +#pragma once #include "always.h" #include "robjlist.h" @@ -77,8 +74,3 @@ class RenderObjectRecyclerClass RefRenderObjListClass InactiveModels; }; - - - - -#endif //RENDEROBJECTRECYCLER_H diff --git a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h index 61a6475421..50abb82530 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h @@ -35,10 +35,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef SEGLINERENDERER_H -#define SEGLINERENDERER_H - +#pragma once #include "always.h" #include "shader.h" #include "texture.h" @@ -206,7 +203,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/soundlibrarybridge.h b/Core/Libraries/Source/WWVegas/WW3D2/soundlibrarybridge.h index e74644ca07..a0a8d2f5f8 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/soundlibrarybridge.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/soundlibrarybridge.h @@ -33,9 +33,7 @@ *--------------------------------------------------------------------------------------------- * Functions: * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#ifndef SOUNDLIBRARYBRIDGE_H -#define SOUNDLIBRARYBRIDGE_H - +#pragma once // Forward declarations. class Matrix3D; @@ -45,5 +43,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/streakRender.h b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h index fc4e0ac5f0..05e49e4bf7 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h @@ -35,10 +35,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef STREAKRENDER_H -#define STREAKRENDER_H - +#pragma once #include "always.h" #include "shader.h" #include "texture.h" @@ -222,6 +219,3 @@ inline void StreakRendererClass::Reset_Line(void) { // Empty } - -#endif //STREAKRENDER_H - diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h b/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h index 3e02cae30d..a6ccb161ac 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef W3D_DEP_H -#define W3D_DEP_H - +#pragma once #pragma warning (push, 3) #pragma warning (disable: 4018 4284 4786 4788) #include @@ -50,5 +47,3 @@ typedef std::list StringList; bool Get_W3D_Dependencies (const char *w3d_filename, StringList &files); - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Utils.h b/Core/Libraries/Source/WWVegas/WWAudio/Utils.h index be17acb83b..5c3e5e36bd 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/Utils.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/Utils.h @@ -34,10 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __UTILS_H -#define __UTILS_H - +#pragma once #pragma warning (push, 3) #include "mss.h" #pragma warning (pop) @@ -88,6 +85,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/WWDownload/Download.h b/Core/Libraries/Source/WWVegas/WWDownload/Download.h index 389a4abe33..73b1a03e36 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/Download.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/Download.h @@ -17,10 +17,7 @@ */ // Download.h : Declaration of the CDownload - -#ifndef __DOWNLOAD_H_ -#define __DOWNLOAD_H_ - +#pragma once //#include "../resource.h" // main symbols #include "WWDownload/ftp.h" #include "WWDownload/downloaddefs.h" @@ -95,5 +92,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..f4fdfc20b0 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/DownloadDebug.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/DownloadDebug.h @@ -17,10 +17,5 @@ */ // 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/downloaddefs.h b/Core/Libraries/Source/WWVegas/WWDownload/downloaddefs.h index b7fbb15daf..a5012d53f5 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/downloaddefs.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/downloaddefs.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef _DOWNLOADDEFS_H -#define _DOWNLOADDEFS_H - +#pragma once // CDownload statuses #define DOWNLOADSTATUS_NONE 0 @@ -57,5 +54,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..d6a311e4b9 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/ftp.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/ftp.h @@ -17,10 +17,7 @@ */ // ftp.h : Declaration of the Cftp - -#ifndef __FTP_H_ -#define __FTP_H_ - +#pragma once //#include "../resource.h" // main symbols @@ -113,5 +110,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..6ea78a8f5a 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/ftpdefs.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/ftpdefs.h @@ -15,16 +15,10 @@ ** You should have received a copy of the GNU General Public License ** 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..077c0dc35e 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/urlBuilder.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/urlBuilder.h @@ -15,10 +15,6 @@ ** You should have received a copy of the GNU General Public License ** 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/CallbackHook.h b/Core/Libraries/Source/WWVegas/WWLib/CallbackHook.h index 45edb97b2e..eafadf65e4 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/CallbackHook.h +++ b/Core/Libraries/Source/WWVegas/WWLib/CallbackHook.h @@ -32,10 +32,7 @@ * $Revision: 1 $ * ******************************************************************************/ - -#ifndef __CALLBACKHOOK_H__ -#define __CALLBACKHOOK_H__ - +#pragma once class CallbackHook { public: @@ -80,5 +77,3 @@ template class Callback : bool (*mCallback)(T); T mUserData; }; - -#endif // __CALLBACKHOOK_H__ diff --git a/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.H b/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.H index 54cfbc3e17..01cd3944a9 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.H @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef RAMFILE_H -#define RAMFILE_H - +#pragma once #include "WWFILE.H" @@ -104,8 +101,3 @@ class RAMFileClass : public FileClass */ bool IsAllocated; }; - - - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/Signaler.h b/Core/Libraries/Source/WWVegas/WWLib/Signaler.h index 6f05802614..e5f2bf97c7 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/Signaler.h +++ b/Core/Libraries/Source/WWVegas/WWLib/Signaler.h @@ -36,10 +36,7 @@ * $Revision: 4 $ * ******************************************************************************/ - -#ifndef __SIGNALER_H__ -#define __SIGNALER_H__ - +#pragma once template class Signaler { public: @@ -79,7 +76,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..90e18c7261 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/TARGA.H +++ b/Core/Libraries/Source/WWVegas/WWLib/TARGA.H @@ -15,9 +15,7 @@ ** You should have received a copy of the GNU General Public License ** 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 +313,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/WWCOMUtil.h b/Core/Libraries/Source/WWVegas/WWLib/WWCOMUtil.h index af4019e05c..66b4f7ba4f 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/WWCOMUtil.h +++ b/Core/Libraries/Source/WWVegas/WWLib/WWCOMUtil.h @@ -33,10 +33,7 @@ * $Modtime: 8/02/01 3:00p $ * ******************************************************************************/ - -#ifndef __WWCOMUTIL_H__ -#define __WWCOMUTIL_H__ - +#pragma once #include //! Invoke PropertyGet on IDispatch interface. @@ -56,5 +53,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/bfiofile.h b/Core/Libraries/Source/WWVegas/WWLib/bfiofile.h index 2955e054b7..0e5cffcae8 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/bfiofile.h +++ b/Core/Libraries/Source/WWVegas/WWLib/bfiofile.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef BFIOFILE_H -#define BFIOFILE_H - +#pragma once #include "RAWFILE.H" /* @@ -92,5 +89,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..384c813901 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/binheap.h +++ b/Core/Libraries/Source/WWVegas/WWLib/binheap.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef BINARY_HEAP_CLASS_H -#define BINARY_HEAP_CLASS_H - +#pragma once /*=============================================================================================*/ // Includes. /*=============================================================================================*/ @@ -314,6 +311,3 @@ class BinaryHeapClass // binary tree. bool Own_Array; }; - - -#endif //BINARY_HEAP_CLASS_H diff --git a/Core/Libraries/Source/WWVegas/WWLib/crandom.h b/Core/Libraries/Source/WWVegas/WWLib/crandom.h index 02667d8121..9cb21efb08 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/crandom.h +++ b/Core/Libraries/Source/WWVegas/WWLib/crandom.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef CRANDOM_H -#define CRANDOM_H - +#pragma once #ifndef ALWAYS_H #include "always.h" #endif @@ -119,5 +116,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..a1a78042b8 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/crcpipe.h +++ b/Core/Libraries/Source/WWVegas/WWLib/crcpipe.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef CRCPIPE_H -#define CRCPIPE_H - +#pragma once #include "CRC.H" #include "PIPE.H" @@ -60,5 +57,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..18658fd606 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/crcstraw.h +++ b/Core/Libraries/Source/WWVegas/WWLib/crcstraw.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef CRCSTRAW_H -#define CRCSTRAW_H - +#pragma once #include "CRC.H" #include "STRAW.H" @@ -60,6 +57,3 @@ class CRCStraw : public Straw CRCStraw(CRCStraw & rvalue); CRCStraw & operator = (CRCStraw const & pipe); }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/hashtab.h b/Core/Libraries/Source/WWVegas/WWLib/hashtab.h index ced524f0bb..9d527510f1 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/hashtab.h +++ b/Core/Libraries/Source/WWVegas/WWLib/hashtab.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef HASHTAB_H -#define HASHTAB_H - +#pragma once #if 0 template class NamedObjectHashTableClass @@ -121,7 +118,3 @@ Object * HashTableClass::Find(Key * key) const } #endif - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWLib/incdec.h b/Core/Libraries/Source/WWVegas/WWLib/incdec.h index 8ce539067b..0a0fd5d516 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/incdec.h +++ b/Core/Libraries/Source/WWVegas/WWLib/incdec.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef INCDEC_H -#define INCDEC_H - +#pragma once /* ** These templates allow enumeration types to have simple bitwise ** arithmatic performed. The operators must be instatiated for the @@ -64,5 +61,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/lzo.h b/Core/Libraries/Source/WWVegas/WWLib/lzo.h index 8c47381a58..d33a6d7801 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzo.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzo.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef _LZO_H -#define _LZO_H - +#pragma once #include "lzoconf.h" #include "lzo1x.h" @@ -100,7 +97,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..a4d8868ede 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzo1x.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzo1x.h @@ -59,10 +59,7 @@ markus.oberhumer@jk.uni-linz.ac.at */ - -#ifndef __LZO1X_H -#define __LZO1X_H - +#pragma once #include "lzoconf.h" //#ifdef __cplusplus @@ -121,8 +118,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..c4acd8596c 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzo_conf.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzo_conf.h @@ -65,10 +65,7 @@ to change. */ - -#ifndef __LZO_CONF_H -#define __LZO_CONF_H - +#pragma once #ifndef __LZOCONF_H # include "lzoconf.h" #endif @@ -296,9 +293,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..38d77a6875 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzoconf.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzoconf.h @@ -59,10 +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" #define LZO_VERSION_DATE "11 Aug 1996" @@ -228,8 +225,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..bf11aa74ac 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzopipe.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzopipe.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef LZOPIPE_H -#define LZOPIPE_H - +#pragma once #include "PIPE.H" @@ -97,6 +94,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..db7b23a057 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzostraw.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzostraw.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef LZOSTRAW_H -#define LZOSTRAW_H - +#pragma once #include "STRAW.H" @@ -98,6 +95,3 @@ class LZOStraw : public Straw LZOStraw(LZOStraw & rvalue); LZOStraw & operator = (LZOStraw const & pipe); }; - - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/noinit.h b/Core/Libraries/Source/WWVegas/WWLib/noinit.h index efa714de2c..c5075260f7 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/noinit.h +++ b/Core/Libraries/Source/WWVegas/WWLib/noinit.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef NOINIT_H -#define NOINIT_H - +#pragma once /********************************************************************** ** This class is solely used as a parameter to a constructor that does ** absolutely no initialization to the object being constructed. By using @@ -52,6 +49,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..c1847f1f38 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/notifier.h +++ b/Core/Libraries/Source/WWVegas/WWLib/notifier.h @@ -34,10 +34,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) #pragma warning(push, 3) @@ -272,5 +269,3 @@ class TypedEventPair A mItemA; B mItemB; }; - -#endif // __NOTIFY_H__ diff --git a/Core/Libraries/Source/WWVegas/WWLib/search.h b/Core/Libraries/Source/WWVegas/WWLib/search.h index c2c4beb189..548a4bc881 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/search.h +++ b/Core/Libraries/Source/WWVegas/WWLib/search.h @@ -48,10 +48,7 @@ * IndexClass::~IndexClass -- Destructor for index handler object. * * 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 ** November of '94. Until the compiler supports this, use the following @@ -692,8 +689,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/stimer.h b/Core/Libraries/Source/WWVegas/WWLib/stimer.h index 00d79ae882..aa9259960f 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/stimer.h +++ b/Core/Libraries/Source/WWVegas/WWLib/stimer.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef STIMER_H -#define STIMER_H - +#pragma once /**************************************************************************** ** Timer constants. These are used when setting the countdown timer. ** Note that this is based upon a timer that ticks every 60th of a second. @@ -61,5 +58,3 @@ class SystemTimerClass long operator () (void) const; operator long (void) const; }; - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/swap.h b/Core/Libraries/Source/WWVegas/WWLib/swap.h index 23587a32cf..d8a83f8440 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/swap.h +++ b/Core/Libraries/Source/WWVegas/WWLib/swap.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef SWAP_H -#define SWAP_H - +#pragma once /********************************************************************** ** Swaps two objects. */ @@ -48,5 +45,3 @@ void swap(T & left, T & right) left = right; right = temp; } - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.h b/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.h index 140db5f9ab..d7b6392350 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.h +++ b/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.h @@ -33,10 +33,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 +78,3 @@ class TGAToDXTClass extern TGAToDXTClass _TGAToDXTConverter; #endif //0 - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathline.h b/Core/Libraries/Source/WWVegas/WWMath/colmathline.h index d2a890de2b..76f5172484 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathline.h @@ -35,10 +35,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef COLMATHLINE_H -#define COLMATHLINE_H - +#pragma once /* ** Inline collision functions dealing with line segments */ @@ -55,10 +52,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..b252ce4fe2 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathplane.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathplane.h @@ -39,10 +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" #include "aabox.h" @@ -148,7 +145,3 @@ CollisionMath::Overlap_Test(const PlaneClass & plane,const AABoxClass & box) } return BOTH; } - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h b/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h index 7658f87ec1..7a57f0c347 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h +++ b/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h @@ -36,10 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef LOOKUPTABLE_H -#define LOOKUPTABLE_H - +#pragma once #include "always.h" #include "simplevec.h" #include "wwstring.h" @@ -156,6 +153,3 @@ class LookupTableMgrClass static RefMultiListClass Tables; }; - - -#endif // LOOKUPTABLE_H diff --git a/Core/Libraries/Source/WWVegas/WWMath/normalcone.h b/Core/Libraries/Source/WWVegas/WWMath/normalcone.h index e6ad9608aa..04c764d4ee 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/normalcone.h +++ b/Core/Libraries/Source/WWVegas/WWMath/normalcone.h @@ -42,10 +42,7 @@ ** The term 'NormalCone' is a bit of a misnomer; it is really a circular portion of a sphere. ** -ehc */ - -#ifndef NORMALCONE_H -#define NORMALCONE_H - +#pragma once #include "vector3.h" #include "matrix3.h" @@ -239,5 +236,3 @@ inline float NormalCone::Smallest_Dot_Product(const Vector3 & Input) return dot1; return dot2; } - -#endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/wwmathids.h b/Core/Libraries/Source/WWVegas/WWMath/wwmathids.h index d6f8d76695..f9af6fe4b5 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/wwmathids.h +++ b/Core/Libraries/Source/WWVegas/WWMath/wwmathids.h @@ -35,10 +35,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef WWMATHIDS_H -#define WWMATHIDS_H - +#pragma once #include "saveloadids.h" /* @@ -59,8 +56,3 @@ enum WWMATH_CHUNKID_TCBSPLINE3D, WWMATH_CHUNKID_VEHICLECURVE }; - - - -#endif //WWMATHIDS_H - diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/postloadable.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/postloadable.h index f574daef44..9396c9b4a3 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/postloadable.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/postloadable.h @@ -35,10 +35,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef POSTLOADABLE_H -#define POSTLOADABLE_H - +#pragma once ////////////////////////////////////////////////////////////////////////////////// // @@ -64,8 +61,3 @@ class PostLoadableClass bool IsPostLoadRegistered; }; - - - -#endif - diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h index c18d86e051..202b261ac3 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h @@ -17,10 +17,7 @@ */ - -#ifndef __SIMPLE_DEFINITION_FACTORY_H -#define __SIMPLE_DEFINITION_FACTORY_H - +#pragma once #include "definitionfactory.h" ////////////////////////////////////////////////////////////////////////////////// @@ -81,6 +78,3 @@ 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 - diff --git a/Core/Tools/Autorun/ARGS.H b/Core/Tools/Autorun/ARGS.H index b4374361e1..6638d0f610 100644 --- a/Core/Tools/Autorun/ARGS.H +++ b/Core/Tools/Autorun/ARGS.H @@ -29,10 +29,7 @@ // ArgC_ArgV.h // //================================================================================================ - -#ifndef ARGS_H -#define ARGS_H - +#pragma once //---------------------------------------------------------------------------- // INCLUDES //---------------------------------------------------------------------------- @@ -66,5 +63,3 @@ class Command_Line_Arguments }; extern Command_Line_Arguments *Args; - -#endif // ARGC_ARGV_H diff --git a/Core/Tools/Autorun/CallbackHook.h b/Core/Tools/Autorun/CallbackHook.h index 6864412d26..943204d708 100644 --- a/Core/Tools/Autorun/CallbackHook.h +++ b/Core/Tools/Autorun/CallbackHook.h @@ -32,10 +32,7 @@ * $Revision: 2 $ * ******************************************************************************/ - -#ifndef CALLBACKHOOK_H -#define CALLBACKHOOK_H - +#pragma once class CallbackHook { public: @@ -81,5 +78,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..917c36368c 100644 --- a/Core/Tools/Autorun/DrawButton.h +++ b/Core/Tools/Autorun/DrawButton.h @@ -30,10 +30,7 @@ * * * Last Update : October 5, 2000 [MML] * *----------------------------------------------------------------------*/ - -#ifndef DRAWBUTTONS_H -#define DRAWBUTTONS_H - +#pragma once #include #include #include "TTFont.h" @@ -99,10 +96,3 @@ class DrawButton char PressedBitmap[ _MAX_FNAME ]; char FocusBitmap [ _MAX_FNAME ]; }; - - - - - - -#endif diff --git a/Core/Tools/Autorun/ViewHTML.h b/Core/Tools/Autorun/ViewHTML.h index 4a81337f53..fccb9ae7a2 100644 --- a/Core/Tools/Autorun/ViewHTML.h +++ b/Core/Tools/Autorun/ViewHTML.h @@ -31,12 +31,7 @@ * $Revision: 3 $ * ******************************************************************************/ - -#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/autorun.h b/Core/Tools/Autorun/autorun.h index 5a068c055c..3219e57e14 100644 --- a/Core/Tools/Autorun/autorun.h +++ b/Core/Tools/Autorun/autorun.h @@ -34,10 +34,7 @@ * *************************************************************************************************/ - -#ifndef AUTORUN_H -#define AUTORUN_H - +#pragma once #include #include #include @@ -250,7 +247,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..0fa68937af 100644 --- a/Core/Tools/Autorun/gimex.h +++ b/Core/Tools/Autorun/gimex.h @@ -21,10 +21,7 @@ /* ABSTRACT gimex.h - Graphics IMport EXport (GIMEX) v2.26 @ */ - -#ifndef __GIMEX_H -#define __GIMEX_H 1 - +#pragma once #ifdef __cplusplus extern "C" { #endif @@ -299,9 +296,4 @@ unsigned long bswap(unsigned long val); #ifdef __cplusplus } #endif - -#endif /* __GIMEX_H */ /* END ABSTRACT */ - - - diff --git a/Core/Tools/Autorun/locale.h b/Core/Tools/Autorun/locale.h index d9c0f3aa96..d1060b652f 100644 --- a/Core/Tools/Autorun/locale.h +++ b/Core/Tools/Autorun/locale.h @@ -21,10 +21,7 @@ /* ABSTRACT locale.h - REAL fonts @ */ - -#ifndef __LOCALE_H -#define __LOCALE_H 1 - +#pragma once //#ifdef __cplusplus //extern "C" { //#endif @@ -66,7 +63,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/TransDB.h b/Core/Tools/Babylon/TransDB.h index f10bcf61be..d2d0ba1a65 100644 --- a/Core/Tools/Babylon/TransDB.h +++ b/Core/Tools/Babylon/TransDB.h @@ -20,10 +20,7 @@ // ParseStr.h // // - -#ifndef __TRANSDB_H -#define __TRANSDB_H - +#pragma once #include "olestring.h" #include "list.h" #include "bin.h" @@ -424,7 +421,3 @@ class DupNode : public ListNode extern TransDB* FirstTransDB ( void ); - - - -#endif // __TRANSDB_H diff --git a/Core/Tools/Babylon/XLStuff.h b/Core/Tools/Babylon/XLStuff.h index e1849185da..93126916ee 100644 --- a/Core/Tools/Babylon/XLStuff.h +++ b/Core/Tools/Babylon/XLStuff.h @@ -20,10 +20,7 @@ // XLStuff.h // // - -#ifndef XLSTUFF_H -#define XLSTUFF_H - +#pragma once #include "BabylonDlg.h" typedef enum { xlAll = -4104, @@ -256,7 +253,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..f664812408 100644 --- a/Core/Tools/Babylon/bin.h +++ b/Core/Tools/Babylon/bin.h @@ -20,10 +20,7 @@ // Bin.h // - -#ifndef __BIN_H -#define __BIN_H - +#pragma once #include "list.h" #include "olestring.h" @@ -103,6 +100,3 @@ class BinID }; - - -#endif // __BIN_H diff --git a/Core/Tools/Babylon/expimp.h b/Core/Tools/Babylon/expimp.h index adf558bd01..a998c39b23 100644 --- a/Core/Tools/Babylon/expimp.h +++ b/Core/Tools/Babylon/expimp.h @@ -19,10 +19,7 @@ // // expimp.h // - -#ifndef __EXPIMP_H -#define __EXPIMP_H - +#pragma once #include "TransDB.h" #include "BabylonDlg.h" @@ -107,4 +104,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..864af4beac 100644 --- a/Core/Tools/Babylon/fileops.h +++ b/Core/Tools/Babylon/fileops.h @@ -19,10 +19,7 @@ // // File IO support // - -#ifndef __FILEOPS_H -#define __FILEOPS_H - +#pragma once static const int FA_NOFILE = 0; static const int FA_READONLY = 0x00000001; static const int FA_DIRECTORY = 0x00000002; @@ -33,6 +30,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..6f3a84fc0c 100644 --- a/Core/Tools/Babylon/iff.h +++ b/Core/Tools/Babylon/iff.h @@ -16,10 +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 +119,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..7d3525ea18 100644 --- a/Core/Tools/Babylon/loadsave.h +++ b/Core/Tools/Babylon/loadsave.h @@ -19,13 +19,7 @@ // // 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..7b542afc32 100644 --- a/Core/Tools/Babylon/olestring.h +++ b/Core/Tools/Babylon/olestring.h @@ -19,10 +19,7 @@ // // OLEString // - -#ifndef __OLESTRING_H -#define __OLESTRING_H - +#pragma once const unsigned int OLESTRING_DEFAULT_SIZE = 256; class OLEString @@ -55,7 +52,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..047e73bc7a 100644 --- a/Core/Tools/Babylon/transcs.h +++ b/Core/Tools/Babylon/transcs.h @@ -19,11 +19,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..980ed953d2 100644 --- a/Core/Tools/CRCDiff/KVPair.h +++ b/Core/Tools/CRCDiff/KVPair.h @@ -22,10 +22,7 @@ // Creation Date: 9/4/2002 // Description: Key/Value Pair class // --------------------------------------------------------------------------- - -#ifndef __KVPAIR_H__ -#define __KVPAIR_H__ - +#pragma once #include #include @@ -48,6 +45,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..3283c9df9b 100644 --- a/Core/Tools/CRCDiff/debug.h +++ b/Core/Tools/CRCDiff/debug.h @@ -19,10 +19,7 @@ // FILE: debug.h ////////////////////////////////////////////////////////////// // Minimal debug info // Author: Matthew D. Campbell, Sept 2002 - -#ifndef __DEBUG_H__ -#define __DEBUG_H__ - +#pragma once #ifdef DEBUG #include @@ -35,6 +32,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..6f411f7a90 100644 --- a/Core/Tools/CRCDiff/expander.h +++ b/Core/Tools/CRCDiff/expander.h @@ -22,10 +22,7 @@ // Creation Date: 9/13/2002 // Description: Key/value pair template expansion class // --------------------------------------------------------------------------- - -#ifndef __EXPANDER_H__ -#define __EXPANDER_H__ - +#pragma once #include #include #include @@ -49,6 +46,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..e21c73bf4e 100644 --- a/Core/Tools/CRCDiff/misc.h +++ b/Core/Tools/CRCDiff/misc.h @@ -22,13 +22,7 @@ // Creation Date: 9/12/2002 // 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/Launcher/BFISH.H b/Core/Tools/Launcher/BFISH.H index 5d206620d0..70b44d3b57 100644 --- a/Core/Tools/Launcher/BFISH.H +++ b/Core/Tools/Launcher/BFISH.H @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef BFISH_H -#define BFISH_H - +#pragma once #include @@ -100,6 +97,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..5042cf10d8 100644 --- a/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.h +++ b/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.h @@ -33,10 +33,7 @@ * $Revision: $ * ******************************************************************************/ - -#ifndef _DEBUGPRINT_H_ -#define _DEBUGPRINT_H_ - +#pragma once #ifdef RTS_DEBUG #ifdef __cplusplus @@ -61,5 +58,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..169f1d2d0f 100644 --- a/Core/Tools/Launcher/Toolkit/Storage/File.h +++ b/Core/Tools/Launcher/Toolkit/Storage/File.h @@ -33,10 +33,7 @@ * $Revision: $ * ****************************************************************************/ - -#ifndef FILE_H -#define FILE_H - +#pragma once #include #include "Stream.h" #include "Rights.h" @@ -149,5 +146,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..3b5adea180 100644 --- a/Core/Tools/Launcher/Toolkit/Storage/Rights.h +++ b/Core/Tools/Launcher/Toolkit/Storage/Rights.h @@ -33,10 +33,7 @@ * $Revision: $ * ****************************************************************************/ - -#ifndef RIGHTS_H -#define RIGHTS_H - +#pragma once // Access rights typedef enum { @@ -44,5 +41,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..5cf9f33c5a 100644 --- a/Core/Tools/Launcher/Toolkit/Storage/Stream.h +++ b/Core/Tools/Launcher/Toolkit/Storage/Stream.h @@ -33,10 +33,7 @@ * $Revision: $ * ****************************************************************************/ - -#ifndef STREAM_H -#define STREAM_H - +#pragma once #include class Stream @@ -77,5 +74,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..652efab0db 100644 --- a/Core/Tools/Launcher/Toolkit/Support/RefCounted.h +++ b/Core/Tools/Launcher/Toolkit/Support/RefCounted.h @@ -36,10 +36,7 @@ * $Revision: $ * ******************************************************************************/ - -#ifndef REFCOUNTED_H -#define REFCOUNTED_H - +#pragma once #include class RefCounted @@ -82,5 +79,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..18e078965a 100644 --- a/Core/Tools/Launcher/Toolkit/Support/RefPtr.h +++ b/Core/Tools/Launcher/Toolkit/Support/RefPtr.h @@ -64,10 +64,7 @@ * $Revision: $ * ******************************************************************************/ - -#ifndef REFPTR_H -#define REFPTR_H - +#pragma once #include "Visualc.h" #include "RefCounted.h" #include @@ -357,5 +354,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..5b10849a02 100644 --- a/Core/Tools/Launcher/Toolkit/Support/StringConvert.h +++ b/Core/Tools/Launcher/Toolkit/Support/StringConvert.h @@ -33,15 +33,10 @@ * $Revision: $ * ******************************************************************************/ - -#ifndef STRINGCONVERT_H -#define STRINGCONVERT_H - +#pragma once #include "UTypes.h" 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..8cba13cacb 100644 --- a/Core/Tools/Launcher/Toolkit/Support/UString.h +++ b/Core/Tools/Launcher/Toolkit/Support/UString.h @@ -33,10 +33,7 @@ * $Revision: $ * ******************************************************************************/ - -#ifndef USTRING_H -#define USTRING_H - +#pragma once #include "UTypes.h" #include "RefCounted.h" @@ -235,5 +232,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..d2d97ea1dc 100644 --- a/Core/Tools/Launcher/Toolkit/Support/UTypes.h +++ b/Core/Tools/Launcher/Toolkit/Support/UTypes.h @@ -33,10 +33,7 @@ * $Revision: $ * ******************************************************************************/ - -#ifndef UTYPES_H -#define UTYPES_H - +#pragma once //! Signed integer value typedef int Int; @@ -90,5 +87,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/configfile.h b/Core/Tools/Launcher/configfile.h index c99d4897fb..f76106b9c8 100644 --- a/Core/Tools/Launcher/configfile.h +++ b/Core/Tools/Launcher/configfile.h @@ -25,10 +25,7 @@ Author : Neal Kettler 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 +48,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..518d0a75fb 100644 --- a/Core/Tools/Launcher/dialog.h +++ b/Core/Tools/Launcher/dialog.h @@ -15,14 +15,9 @@ ** You should have received a copy of the GNU General Public License ** 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..c716b54859 100644 --- a/Core/Tools/Launcher/dictionary.h +++ b/Core/Tools/Launcher/dictionary.h @@ -34,10 +34,7 @@ linked list at the slot the hashing function specifies. If everything 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 #include @@ -582,5 +579,3 @@ void Dictionary::expand(void) } delete[](oldtable); } - -#endif diff --git a/Core/Tools/Launcher/filed.h b/Core/Tools/Launcher/filed.h index cbbacf79a9..0936a99805 100644 --- a/Core/Tools/Launcher/filed.h +++ b/Core/Tools/Launcher/filed.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef FILED_HEADER -#define FILED_HEADER - +#pragma once #include "odevice.h" class FileD : public OutputDevice @@ -52,5 +49,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..480bb768d2 100644 --- a/Core/Tools/Launcher/findpatch.h +++ b/Core/Tools/Launcher/findpatch.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef FINDPATCH_HEADER -#define FINDPATCH_HEADER - +#pragma once #include #include #include @@ -29,5 +26,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..fb511f69ca 100644 --- a/Core/Tools/Launcher/loadbmp.h +++ b/Core/Tools/Launcher/loadbmp.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef LOADBMP_HEADER -#define LOADBMP_HEADER - +#pragma once #include #include #include "wstypes.h" @@ -41,6 +38,3 @@ class LoadBmp HPALETTE PalHandle_; HWND WindowHandle_; }; - - -#endif diff --git a/Core/Tools/Launcher/monod.h b/Core/Tools/Launcher/monod.h index 494674c974..d4dfee99e9 100644 --- a/Core/Tools/Launcher/monod.h +++ b/Core/Tools/Launcher/monod.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef MONOD_HEADER -#define MONOD_HEADER - +#pragma once #include #include @@ -70,5 +67,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..f27719c771 100644 --- a/Core/Tools/Launcher/odevice.h +++ b/Core/Tools/Launcher/odevice.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** 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. class OutputDevice @@ -28,5 +25,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..86290ae9fd 100644 --- a/Core/Tools/Launcher/patch.h +++ b/Core/Tools/Launcher/patch.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef PATCH_HEADER -#define PATCH_HEADER - +#pragma once #include "winblows.h" #include "dialog.h" #include "resource.h" @@ -26,5 +23,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..b0e5d5e15a 100644 --- a/Core/Tools/Launcher/process.h +++ b/Core/Tools/Launcher/process.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef PROCESS_HEADER -#define PROCESS_HEADER - +#pragma once #include #include "wstypes.h" #include "wdebug.h" @@ -41,6 +38,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..fc802c15af 100644 --- a/Core/Tools/Launcher/streamer.h +++ b/Core/Tools/Launcher/streamer.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef STREAMER_HEADER -#define STREAMER_HEADER - +#pragma once #include #include #include @@ -57,5 +54,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..2057b778b6 100644 --- a/Core/Tools/Launcher/wdebug.h +++ b/Core/Tools/Launcher/wdebug.h @@ -49,10 +49,7 @@ This won't compile, read the code until you figure it out. Only then will you be ready to leave grasshopper. \*****************************************************************************/ - -#ifndef WDEBUG_HEADER -#define WDEBUG_HEADER - +#pragma once #include #include "odevice.h" #include "streamer.h" @@ -189,5 +186,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..997a9a80d3 100644 --- a/Core/Tools/Launcher/winblows.h +++ b/Core/Tools/Launcher/winblows.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef WINBLOWS_HEADER -#define WINBLOWS_HEADER - +#pragma once #define WIN32_LEAN_AND_MEAN #include #include @@ -33,5 +30,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..28c1e081e5 100644 --- a/Core/Tools/Launcher/wstring.h +++ b/Core/Tools/Launcher/wstring.h @@ -25,10 +25,7 @@ Author : Neal Kettler Start Date : June 1, 1997 Last Update : June 17, 1997 \****************************************************************************/ - -#ifndef WSTRING_HEADER -#define WSTRING_HEADER - +#pragma once #include #include #include "wstypes.h" @@ -83,5 +80,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..695c8e903d 100644 --- a/Core/Tools/Launcher/wstypes.h +++ b/Core/Tools/Launcher/wstypes.h @@ -27,10 +27,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 #endif @@ -78,5 +75,3 @@ typedef unsigned int uint32; #define strncasecmp _strnicmp #define strcasecmp _stricmp #endif - -#endif diff --git a/Core/Tools/PATCHGET/CHATAPI.H b/Core/Tools/PATCHGET/CHATAPI.H index bcb549fe6c..c798538d2f 100644 --- a/Core/Tools/PATCHGET/CHATAPI.H +++ b/Core/Tools/PATCHGET/CHATAPI.H @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef CHATAPI_HEADER -#define CHATAPI_HEADER - +#pragma once #include "COMINIT.H" #include #include @@ -46,5 +43,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..b0a0e4786b 100644 --- a/Core/Tools/PATCHGET/COMINIT.H +++ b/Core/Tools/PATCHGET/COMINIT.H @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef COMINIT_HEADER -#define COMINIT_HEADER - +#pragma once namespace patchget { @@ -35,5 +32,3 @@ class ComInit }; } // namespace patchget - -#endif diff --git a/Core/Tools/PATCHGET/PROCESS.H b/Core/Tools/PATCHGET/PROCESS.H index a1c9b61d87..723dfa26d3 100644 --- a/Core/Tools/PATCHGET/PROCESS.H +++ b/Core/Tools/PATCHGET/PROCESS.H @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef PROCESS_HEADER -#define PROCESS_HEADER - +#pragma once #include #include "WSTYPES.H" @@ -42,5 +39,3 @@ bit8 Create_Process(Process &process); bit8 Wait_Process(Process &process, DWORD *exit_code=NULL); } // namespace patchget - -#endif diff --git a/Core/Tools/PATCHGET/WINBLOWS.H b/Core/Tools/PATCHGET/WINBLOWS.H index be4f13f034..30f4f2779a 100644 --- a/Core/Tools/PATCHGET/WINBLOWS.H +++ b/Core/Tools/PATCHGET/WINBLOWS.H @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef WINBLOWS_HEADER -#define WINBLOWS_HEADER - +#pragma once #define WIN32_LEAN_AND_MEAN #include #include @@ -33,5 +30,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..dab994d6ba 100644 --- a/Core/Tools/PATCHGET/WSTYPES.H +++ b/Core/Tools/PATCHGET/WSTYPES.H @@ -27,10 +27,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 #endif @@ -70,5 +67,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..b8650f6367 100644 --- a/Core/Tools/PATCHGET/debug.h +++ b/Core/Tools/PATCHGET/debug.h @@ -19,10 +19,7 @@ // FILE: debug.h ////////////////////////////////////////////////////////////// // Minimal debug info // Author: Matthew D. Campbell, Sept 2002 - -#ifndef __DEBUG_H__ -#define __DEBUG_H__ - +#pragma once namespace patchget { @@ -71,6 +68,3 @@ void DebugLog( const char *fmt, ... ); #endif } // namespace patchget - -#endif // __DEBUG_H__ - diff --git a/Core/Tools/W3DView/ColorUtils.h b/Core/Tools/W3DView/ColorUtils.h index 3b103b32f1..c425f399b5 100644 --- a/Core/Tools/W3DView/ColorUtils.h +++ b/Core/Tools/W3DView/ColorUtils.h @@ -21,10 +21,7 @@ // ColorUtils.H // // - -#ifndef __COLORUTILS_H -#define __COLORUTILS_H - +#pragma once ///////////////////////////////////////////////////////////////////////////// // Callbacks ///////////////////////////////////////////////////////////////////////////// @@ -46,6 +43,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/Globals.h b/Core/Tools/W3DView/Globals.h index 15205954b1..434e898fdb 100644 --- a/Core/Tools/W3DView/Globals.h +++ b/Core/Tools/W3DView/Globals.h @@ -24,10 +24,7 @@ // // ///////////////////////////////////////////////////////////////////// - -#ifndef __GLOBALS_H -#define __GLOBALS_H - +#pragma once ////////////////////////////////////////////////////// // Externs @@ -45,6 +42,3 @@ extern int g_iHeight; ////////////////////////////////////////////////////// const int DEFAULT_DEVICEINDEX = 1; const int DEFAULT_BITSPERPIX = 16; - - -#endif //__GLOBALS_H 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/Toolbar.h b/Core/Tools/W3DView/Toolbar.h index c574836c88..cf1e1e4a6a 100644 --- a/Core/Tools/W3DView/Toolbar.h +++ b/Core/Tools/W3DView/Toolbar.h @@ -22,10 +22,7 @@ // // Declaration of a 'fancy' toolbar using hi-color buttons // - -#ifndef __FANCYTOOLBAR_H -#define __FANCYTOOLBAR_H - +#pragma once ////////////////////////////////////////////////////////////// // @@ -164,5 +161,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..e9a05738f1 100644 --- a/Core/Tools/W3DView/Utils.h +++ b/Core/Tools/W3DView/Utils.h @@ -22,10 +22,7 @@ // // Module containing usefull misc. utility functions // - -#ifndef __UTILS_H -#define __UTILS_H - +#pragma once #include "Vector.H" // Forward declarations @@ -158,5 +155,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/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..c715b3184f 100644 --- a/Core/Tools/WW3D/max2w3d/ExportAllDlg.h +++ b/Core/Tools/WW3D/max2w3d/ExportAllDlg.h @@ -34,10 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef EXPORTALLDLG_H -#define EXPORTALLDLG_H - +#pragma once #include "dllmain.h" #include "resource.h" @@ -76,6 +73,3 @@ class ExportAllDlg void OnBrowse (void); BOOL OnOK (void); // TRUE if ok to close dialog }; - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/GameMtlDlg.h b/Core/Tools/WW3D/max2w3d/GameMtlDlg.h index e28a822969..bfcd12096d 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlDlg.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlDlg.h @@ -36,10 +36,7 @@ - -#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..06e7537bd3 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlForm.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlForm.h @@ -35,10 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef GAMEMTLFORM_H -#define GAMEMTLFORM_H - +#pragma once #include "FormClass.h" class GameMtl; @@ -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..046c785772 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.h @@ -36,10 +36,7 @@ - -#ifndef GAMEMTLPASSDLG_H -#define GAMEMTLPASSDLG_H - +#pragma once #include class GameMtl; @@ -93,5 +90,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..9b0274f897 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.h @@ -35,10 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#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..25dfa89024 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.h @@ -36,10 +36,7 @@ - -#ifndef GAMEMTLTEXTUREDLG_H -#define GAMEMTLTEXTUREDLG_H - +#pragma once #include #include "GameMtlForm.h" @@ -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..d1db41105c 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.h @@ -35,10 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#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..b3c47ebdd5 100644 --- a/Core/Tools/WW3D/max2w3d/InputDlg.h +++ b/Core/Tools/WW3D/max2w3d/InputDlg.h @@ -35,10 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#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/MeshDeform.h b/Core/Tools/WW3D/max2w3d/MeshDeform.h index 7d80686f86..61879137af 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeform.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeform.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __MESH_DEFORM_H -#define __MESH_DEFORM_H - +#pragma once #include #include "Vector.H" @@ -196,6 +193,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..3eb6a37ee7 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformData.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformData.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __MESH_DEFORM_DATA_H -#define __MESH_DEFORM_DATA_H - +#pragma once #include #include "Vector.H" #include "MeshDeformSet.h" @@ -122,7 +119,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..15c88bd677 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformDefs.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformDefs.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __MESH_DEFORM_DEFS_H -#define __MESH_DEFORM_DEFS_H - +#pragma once #include #include "Vector.H" @@ -94,7 +91,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..f08d2dab5a 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformPanel.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformPanel.h @@ -34,10 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __MESH_DEFORM_PANEL_H -#define __MESH_DEFORM_PANEL_H - +#pragma once #include #include "resource.h" @@ -112,6 +109,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..46a1c7b183 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformSave.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformSave.h @@ -34,10 +34,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __MESH_DEFORM_SAVE_H -#define __MESH_DEFORM_SAVE_H - +#pragma once #include #include "Vector.H" @@ -106,5 +103,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..719e7e842c 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformSaveDefs.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformSaveDefs.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __MESH_DEFORM_SAVE_DEFS_H -#define __MESH_DEFORM_SAVE_DEFS_H - +#pragma once #include /////////////////////////////////////////////////////////////////////////// @@ -109,6 +106,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..cd51f73263 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.h @@ -34,10 +34,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __MESH_DEFORM_SAVE_SET_H -#define __MESH_DEFORM_SAVE_SET_H - +#pragma once #include #include "Vector.H" @@ -134,5 +131,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..6d3aecca5c 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformSet.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformSet.h @@ -34,10 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __MESH_DEFORM_SET_H -#define __MESH_DEFORM_SET_H - +#pragma once #include #include "Vector.H" #include "MeshDeformDefs.h" @@ -179,7 +176,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..ddb1f1fe6c 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformUndo.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformUndo.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __MESH_DEFORM_UNDO_H -#define __MESH_DEFORM_UNDO_H - +#pragma once #include #include "Vector.H" #include "MeshDeformDefs.h" @@ -150,6 +147,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..03125f2dfa 100644 --- a/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.h +++ b/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.h @@ -34,10 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef PS2GAMEMTLSHADERDLG_H -#define PS2GAMEMTLSHADERDLG_H - +#pragma once #include #include "GameMtlForm.h" @@ -67,5 +64,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..2f51a5a3ad 100644 --- a/Core/Tools/WW3D/max2w3d/SceneSetupDlg.h +++ b/Core/Tools/WW3D/max2w3d/SceneSetupDlg.h @@ -34,10 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef SCENESETUPDLG_H -#define SCENESETUPDLG_H - +#pragma once // SceneSetupDlg.h : header file // @@ -91,5 +88,3 @@ class SceneSetupDlg // Protected Data Interface *m_MaxInterface; }; - -#endif diff --git a/Core/Tools/WW3D/max2w3d/TARGA.H b/Core/Tools/WW3D/max2w3d/TARGA.H index 05d9aa5c2b..cc10915ca7 100644 --- a/Core/Tools/WW3D/max2w3d/TARGA.H +++ b/Core/Tools/WW3D/max2w3d/TARGA.H @@ -15,9 +15,7 @@ ** You should have received a copy of the GNU General Public License ** 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 +313,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/animationcompressionsettings.h b/Core/Tools/WW3D/max2w3d/animationcompressionsettings.h index 112c94b518..19fbea0154 100644 --- a/Core/Tools/WW3D/max2w3d/animationcompressionsettings.h +++ b/Core/Tools/WW3D/max2w3d/animationcompressionsettings.h @@ -36,10 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __ANIMATION_COMPRESSION_SETTINGS_H -#define __ANIMATION_COMPRESSION_SETTINGS_H - +#pragma once #include #include #include "w3dutil.h" @@ -90,7 +87,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..dbf9be7712 100644 --- a/Core/Tools/WW3D/max2w3d/bchannel.h +++ b/Core/Tools/WW3D/max2w3d/bchannel.h @@ -34,10 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef BCHANNEL_H -#define BCHANNEL_H - +#pragma once #ifndef ALWAYS_H #include "always.h" #endif @@ -98,6 +95,3 @@ class BitChannelClass }; - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/boneicon.h b/Core/Tools/WW3D/max2w3d/boneicon.h index f111bd30ae..670f386e06 100644 --- a/Core/Tools/WW3D/max2w3d/boneicon.h +++ b/Core/Tools/WW3D/max2w3d/boneicon.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef BONEICON_H -#define BONEICON_H - +#pragma once struct VertexStruct { float X,Y,Z; @@ -53,5 +50,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..17b019ab4e 100644 --- a/Core/Tools/WW3D/max2w3d/bpick.h +++ b/Core/Tools/WW3D/max2w3d/bpick.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef BPICK_H -#define BPICK_H - +#pragma once #include "max.h" //#include "dllmain.h" //#include "resource.h" @@ -124,6 +121,3 @@ class BonePickerClass : public PickNodeCallback, public PickModeCallback, public }; extern BonePickerClass TheBonePicker; - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/dllmain.h b/Core/Tools/WW3D/max2w3d/dllmain.h index 93c6fb9486..68326cd384 100644 --- a/Core/Tools/WW3D/max2w3d/dllmain.h +++ b/Core/Tools/WW3D/max2w3d/dllmain.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef DLLMAIN_H -#define DLLMAIN_H - +#pragma once #include extern HINSTANCE AppInstance; @@ -47,5 +44,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..5a82f49a66 100644 --- a/Core/Tools/WW3D/max2w3d/exportlog.h +++ b/Core/Tools/WW3D/max2w3d/exportlog.h @@ -36,10 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef EXPORTLOG_H -#define EXPORTLOG_H - +#pragma once #include /** @@ -56,7 +53,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..5e590be396 100644 --- a/Core/Tools/WW3D/max2w3d/floaterdialog.h +++ b/Core/Tools/WW3D/max2w3d/floaterdialog.h @@ -36,10 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef FLOATERDIALOG_H -#define FLOATERDIALOG_H - +#pragma once #include class Interface; @@ -68,8 +65,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..dee08f6e67 100644 --- a/Core/Tools/WW3D/max2w3d/gamemaps.h +++ b/Core/Tools/WW3D/max2w3d/gamemaps.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef GAMEMAPS_H -#define GAMEMAPS_H - +#pragma once #include #include "stdmat.h" @@ -110,6 +107,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..8cf22525c9 100644 --- a/Core/Tools/WW3D/max2w3d/gamemtl.h +++ b/Core/Tools/WW3D/max2w3d/gamemtl.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef GAMEMTL_H -#define GAMEMTL_H - +#pragma once #include #include "w3dmtl.h" #include "w3d_file.h" @@ -366,8 +363,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..066820045a 100644 --- a/Core/Tools/WW3D/max2w3d/genlodextensiondialog.h +++ b/Core/Tools/WW3D/max2w3d/genlodextensiondialog.h @@ -35,10 +35,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef GENLODEXTENSIONDIALOG_H -#define GENLODEXTENSIONDIALOG_H - +#pragma once #include class Interface; @@ -87,8 +84,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..190e0d23c9 100644 --- a/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.h +++ b/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.h @@ -35,10 +35,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef GENMTLNAMESDIALOG_H -#define GENMTLNAMESDIALOG_H - +#pragma once #include class Interface; @@ -95,8 +92,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..819b32629e 100644 --- a/Core/Tools/WW3D/max2w3d/geometryexportcontext.h +++ b/Core/Tools/WW3D/max2w3d/geometryexportcontext.h @@ -36,10 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef GEOMETRYEXPORTCONTEXT_H -#define GEOMETRYEXPORTCONTEXT_H - +#pragma once #include class ChunkSaveClass; @@ -108,8 +105,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..950f94c66c 100644 --- a/Core/Tools/WW3D/max2w3d/geometryexporttask.h +++ b/Core/Tools/WW3D/max2w3d/geometryexporttask.h @@ -35,10 +35,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef GEOMETRYEXPORTTASK_H -#define GEOMETRYEXPORTTASK_H - +#pragma once #include #include #include "w3d_file.h" @@ -148,8 +145,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..6b6c19d51b 100644 --- a/Core/Tools/WW3D/max2w3d/gridsnapmodifier.h +++ b/Core/Tools/WW3D/max2w3d/gridsnapmodifier.h @@ -35,13 +35,7 @@ *---------------------------------------------------------------------------------------------* * 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..e8f7d1888e 100644 --- a/Core/Tools/WW3D/max2w3d/hiersave.h +++ b/Core/Tools/WW3D/max2w3d/hiersave.h @@ -34,10 +34,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef HIERSAVE_H -#define HIERSAVE_H - +#pragma once #include "always.h" #include @@ -166,5 +163,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..9574d5f359 100644 --- a/Core/Tools/WW3D/max2w3d/hlodsave.h +++ b/Core/Tools/WW3D/max2w3d/hlodsave.h @@ -34,10 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef HLODSAVE_H -#define HLODSAVE_H - +#pragma once #include "always.h" #include @@ -123,7 +120,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..8b124f965e 100644 --- a/Core/Tools/WW3D/max2w3d/logdlg.h +++ b/Core/Tools/WW3D/max2w3d/logdlg.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef LOGDLG_H -#define LOGDLG_H - +#pragma once #include @@ -82,6 +79,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..254664ff1d 100644 --- a/Core/Tools/WW3D/max2w3d/maxworldinfo.h +++ b/Core/Tools/WW3D/max2w3d/maxworldinfo.h @@ -35,10 +35,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef MAXWORLDINFO_H -#define MAXWORLDINFO_H - +#pragma once #include #include "meshbuild.h" @@ -87,7 +84,3 @@ class MaxWorldInfoClass : public WorldInfoClass Matrix3 ExportTrans; bool SmoothBetweenMeshes; }; - - - -#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/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..5b94ea67f6 100644 --- a/Core/Tools/WW3D/max2w3d/namedsel.h +++ b/Core/Tools/WW3D/max2w3d/namedsel.h @@ -34,10 +34,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef NAMEDSEL_H -#define NAMEDSEL_H - +#pragma once #include "max.h" @@ -78,6 +75,3 @@ class NamedSelSetList NAMED_SEL_NAME_CHUNK = 0x0023 }; }; - - -#endif /*NAMEDSEL_H*/ diff --git a/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.h b/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.h index 0565e29e74..89d2d7d361 100644 --- a/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.h +++ b/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.h @@ -36,10 +36,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef __PRESET_EXPORT_OPTIONS_DIALOG_H -#define __PRESET_EXPORT_OPTIONS_DIALOG_H - +#pragma once #include #include #include "w3dutil.h" @@ -118,7 +115,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..68da2de96f 100644 --- a/Core/Tools/WW3D/max2w3d/rcmenu.h +++ b/Core/Tools/WW3D/max2w3d/rcmenu.h @@ -34,10 +34,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef RCMENU_H -#define RCMENU_H - +#pragma once #include "max.h" #include "dllmain.h" #include "resource.h" @@ -85,5 +82,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..6a17174579 100644 --- a/Core/Tools/WW3D/max2w3d/simpdib.h +++ b/Core/Tools/WW3D/max2w3d/simpdib.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef SIMPDIB_H -#define SIMPDIB_H - +#pragma once #ifndef ALWAYS_H #include "always.h" #endif @@ -77,6 +74,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..160a694e9a 100644 --- a/Core/Tools/WW3D/max2w3d/skin.h +++ b/Core/Tools/WW3D/max2w3d/skin.h @@ -34,10 +34,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef SKIN_H -#define SKIN_H - +#pragma once #include #include "simpmod.h" #include "simpobj.h" @@ -397,9 +394,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..877bfb8ea0 100644 --- a/Core/Tools/WW3D/max2w3d/skindata.h +++ b/Core/Tools/WW3D/max2w3d/skindata.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef SKINDATA_H -#define SKINDATA_H - +#pragma once #include "max.h" #include "namedsel.h" @@ -157,6 +154,3 @@ class SkinDataClass : public LocalModData }; }; - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/util.h b/Core/Tools/WW3D/max2w3d/util.h index 44af73865e..1ca9ca0a28 100644 --- a/Core/Tools/WW3D/max2w3d/util.h +++ b/Core/Tools/WW3D/max2w3d/util.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef UTIL_H -#define UTIL_H - +#pragma once #ifndef ALWAYS_H #include "always.h" #endif @@ -112,6 +109,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..c22b942c7d 100644 --- a/Core/Tools/WW3D/max2w3d/vchannel.h +++ b/Core/Tools/WW3D/max2w3d/vchannel.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef VCHANNEL_H -#define VCHANNEL_H - +#pragma once #ifndef ALWAYS_H #include "always.h" #endif @@ -136,5 +133,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..7b1ef45edd 100644 --- a/Core/Tools/WW3D/max2w3d/vxl.h +++ b/Core/Tools/WW3D/max2w3d/vxl.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef VXL_H -#define VXL_H - +#pragma once #ifndef ALWAYS_H #include "always.h" #endif @@ -139,6 +136,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..0b0ffc4d13 100644 --- a/Core/Tools/WW3D/max2w3d/vxldbg.h +++ b/Core/Tools/WW3D/max2w3d/vxldbg.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef VXLDBG_H -#define VXLDBG_H - +#pragma once #ifndef ALWAYS_H #include "always.h" #endif @@ -76,7 +73,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..18996b7084 100644 --- a/Core/Tools/WW3D/max2w3d/vxllayer.h +++ b/Core/Tools/WW3D/max2w3d/vxllayer.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef VXLLAYER_H -#define VXLLAYER_H - +#pragma once #include @@ -144,6 +141,3 @@ class VoxelLayerClass int bitmap_width; int bitmap_height; }; - - -#endif /*VXLLAYER_H*/ diff --git a/Core/Tools/WW3D/max2w3d/w3dappdata.h b/Core/Tools/WW3D/max2w3d/w3dappdata.h index 833a9dc418..1e1a6e2c64 100644 --- a/Core/Tools/WW3D/max2w3d/w3dappdata.h +++ b/Core/Tools/WW3D/max2w3d/w3dappdata.h @@ -35,10 +35,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef W3DAPPDATA_H -#define W3DAPPDATA_H - +#pragma once #include /* @@ -409,7 +406,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..145d5b4ae0 100644 --- a/Core/Tools/WW3D/max2w3d/w3ddesc.h +++ b/Core/Tools/WW3D/max2w3d/w3ddesc.h @@ -34,10 +34,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef W3DDESC_H -#define W3DDESC_H - +#pragma once #include "always.h" #include @@ -59,6 +56,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..d3cc90cd6e 100644 --- a/Core/Tools/WW3D/max2w3d/w3ddlg.h +++ b/Core/Tools/WW3D/max2w3d/w3ddlg.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef W3DDLG_H -#define W3DDLG_H - +#pragma once #include "always.h" #include #include "w3dutil.h" @@ -102,6 +99,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..18f8c4dae6 100644 --- a/Core/Tools/WW3D/max2w3d/w3dexp.h +++ b/Core/Tools/WW3D/max2w3d/w3dexp.h @@ -34,10 +34,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef W3DEXP_H -#define W3DEXP_H - +#pragma once #include "always.h" #include #include "dllmain.h" @@ -117,6 +114,3 @@ class W3dExportClass : public SceneExport void End_Progress_Bar(void); }; - - -#endif diff --git a/Core/Tools/WW3D/max2w3d/w3dutil.h b/Core/Tools/WW3D/max2w3d/w3dutil.h index 3bb2f62277..96f6e7b036 100644 --- a/Core/Tools/WW3D/max2w3d/w3dutil.h +++ b/Core/Tools/WW3D/max2w3d/w3dutil.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef W3DUTIL_H -#define W3DUTIL_H - +#pragma once #include #include "utilapi.h" #include "dllmain.h" @@ -126,5 +123,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..feb17a2bf0 100644 --- a/Core/Tools/WW3D/pluglib/BITTYPE.H +++ b/Core/Tools/WW3D/pluglib/BITTYPE.H @@ -27,10 +27,7 @@ * Programmer: Greg Hjelstrom * *****************************************************************/ - -#ifndef BITTYPE_H -#define BITTYPE_H - +#pragma once typedef unsigned char uint8; typedef unsigned short uint16; typedef unsigned long uint32; @@ -41,6 +38,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..7a2b42d5ee 100644 --- a/Core/Tools/WW3D/pluglib/EULER.H +++ b/Core/Tools/WW3D/pluglib/EULER.H @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef EULER_H -#define EULER_H - +#pragma once #include @@ -114,6 +111,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..c72e9ed908 100644 --- a/Core/Tools/WW3D/pluglib/PROGRESS.H +++ b/Core/Tools/WW3D/pluglib/PROGRESS.H @@ -34,10 +34,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef PROGRESS_H -#define PROGRESS_H - +#pragma once #include "always.h" class Progress_Meter_Class @@ -121,5 +118,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..126c77998c 100644 --- a/Core/Tools/WW3D/pluglib/Vector.H +++ b/Core/Tools/WW3D/pluglib/Vector.H @@ -49,10 +49,7 @@ * DynamicVectorClass::ID -- Find matching value in the dynamic vector. * * DynamicVectorClass::Uninitialized_Add -- Add an empty place to the vector. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef VECTOR_H -#define VECTOR_H - +#pragma once #include "noinit.h" #include #include @@ -1001,7 +998,3 @@ bool Pointer_Vector_Remove(T const * ptr, VectorClass & vec) } return(false); } - - -#endif - diff --git a/Core/Tools/WW3D/pluglib/errclass.h b/Core/Tools/WW3D/pluglib/errclass.h index 67d699bcdd..2f0fb59bfb 100644 --- a/Core/Tools/WW3D/pluglib/errclass.h +++ b/Core/Tools/WW3D/pluglib/errclass.h @@ -34,10 +34,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef ERRCLASS_H -#define ERRCLASS_H - +#pragma once #include @@ -83,6 +80,3 @@ inline ErrorClass & ErrorClass::operator = (const ErrorClass & that) return *this; } - - -#endif //ERRCLASS_H diff --git a/Core/Tools/WW3D/pluglib/hsv.h b/Core/Tools/WW3D/pluglib/hsv.h index 277cc9f35e..32d122b4b2 100644 --- a/Core/Tools/WW3D/pluglib/hsv.h +++ b/Core/Tools/WW3D/pluglib/hsv.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef HSV_H -#define HSV_H - +#pragma once class RGBClass; class HSVClass; @@ -77,5 +74,3 @@ class HSVClass unsigned char Saturation; unsigned char Value; }; - -#endif diff --git a/Core/Tools/WW3D/pluglib/nodefilt.h b/Core/Tools/WW3D/pluglib/nodefilt.h index 92e07d26a3..1e02e90db5 100644 --- a/Core/Tools/WW3D/pluglib/nodefilt.h +++ b/Core/Tools/WW3D/pluglib/nodefilt.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef NODEFILT_H -#define NODEFILT_H - +#pragma once #include "always.h" #include @@ -172,7 +169,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..c98363e908 100644 --- a/Core/Tools/WW3D/pluglib/nodelist.h +++ b/Core/Tools/WW3D/pluglib/nodelist.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef NODELIST_H -#define NODELIST_H - +#pragma once #include "always.h" #include @@ -97,6 +94,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..c5075260f7 100644 --- a/Core/Tools/WW3D/pluglib/noinit.h +++ b/Core/Tools/WW3D/pluglib/noinit.h @@ -33,10 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef NOINIT_H -#define NOINIT_H - +#pragma once /********************************************************************** ** This class is solely used as a parameter to a constructor that does ** absolutely no initialization to the object being constructed. By using @@ -52,6 +49,3 @@ class NoInitClass { void operator () (void) const {}; }; #endif - - -#endif diff --git a/Core/Tools/WW3D/pluglib/plane.h b/Core/Tools/WW3D/pluglib/plane.h index 62f2740485..a0d36654d2 100644 --- a/Core/Tools/WW3D/pluglib/plane.h +++ b/Core/Tools/WW3D/pluglib/plane.h @@ -34,10 +34,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef PLANE_H -#define PLANE_H - +#pragma once #ifndef VECTOR3_H #include "vector3.h" #endif @@ -93,7 +90,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/w3d_file.h b/Core/Tools/WW3D/pluglib/w3d_file.h index b29a6780c2..0469015121 100644 --- a/Core/Tools/WW3D/pluglib/w3d_file.h +++ b/Core/Tools/WW3D/pluglib/w3d_file.h @@ -35,10 +35,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef W3D_FILE_H -#define W3D_FILE_H - +#pragma once #include "always.h" #ifndef BITTYPE_H @@ -883,7 +880,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/mangler/crc.h b/Core/Tools/mangler/crc.h index fbd057f424..6a7c22beaa 100644 --- a/Core/Tools/mangler/crc.h +++ b/Core/Tools/mangler/crc.h @@ -15,12 +15,7 @@ ** You should have received a copy of the GNU General Public License ** 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..cdd2d69ef6 100644 --- a/Core/Tools/mangler/endian.h +++ b/Core/Tools/mangler/endian.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef __ENDIAN_H__ -#define __ENDIAN_H__ - +#pragma once /* @@ -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..9a37ae61e2 100644 --- a/Core/Tools/mangler/mangler.h +++ b/Core/Tools/mangler/mangler.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** 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 +72,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..d4f1b7e18f 100644 --- a/Core/Tools/mangler/wlib/arraylist.h +++ b/Core/Tools/mangler/wlib/arraylist.h @@ -43,10 +43,7 @@ for! A good copy constructor is one that won't blindly duplicate pointers that don't belong to them, etc... \****************************************************************************/ - -#ifndef ARRAYLIST_HEADER -#define ARRAYLIST_HEADER - +#pragma once #include #include #include @@ -704,6 +701,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..0aa719873c 100644 --- a/Core/Tools/mangler/wlib/configfile.h +++ b/Core/Tools/mangler/wlib/configfile.h @@ -25,10 +25,7 @@ Author : Neal Kettler Start Date : June 9, 1997 Last Update : May 13, 1999 \***************************************************************************/ - -#ifndef CONFIGFILE_HEADER -#define CONFIGFILE_HEADER - +#pragma once #include "wstypes.h" #include "dictionary.h" #include "wstring.h" @@ -72,5 +69,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..2ce22dc040 100644 --- a/Core/Tools/mangler/wlib/critsec.h +++ b/Core/Tools/mangler/wlib/critsec.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef CRITSEC_HEADER -#define CRITSEC_HEADER - +#pragma once #include "wstypes.h" #ifdef _WIN32 #include @@ -58,5 +55,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..7036e7b3a1 100644 --- a/Core/Tools/mangler/wlib/filed.h +++ b/Core/Tools/mangler/wlib/filed.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef FILED_HEADER -#define FILED_HEADER - +#pragma once #include "odevice.h" class FileD : public OutputDevice @@ -47,5 +44,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..c4298bf5a7 100644 --- a/Core/Tools/mangler/wlib/linkedlist.h +++ b/Core/Tools/mangler/wlib/linkedlist.h @@ -32,10 +32,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 #include @@ -491,5 +488,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..221524ddf6 100644 --- a/Core/Tools/mangler/wlib/mboxd.h +++ b/Core/Tools/mangler/wlib/mboxd.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef MBOXD_HEADER -#define MBOXD_HEADER - +#pragma once #include "odevice.h" class MboxD : public OutputDevice @@ -36,5 +33,3 @@ class MboxD : public OutputDevice } }; - -#endif diff --git a/Core/Tools/mangler/wlib/monod.h b/Core/Tools/mangler/wlib/monod.h index 494674c974..d4dfee99e9 100644 --- a/Core/Tools/mangler/wlib/monod.h +++ b/Core/Tools/mangler/wlib/monod.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef MONOD_HEADER -#define MONOD_HEADER - +#pragma once #include #include @@ -70,5 +67,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..f27719c771 100644 --- a/Core/Tools/mangler/wlib/odevice.h +++ b/Core/Tools/mangler/wlib/odevice.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** 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. class OutputDevice @@ -28,5 +25,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..4f208e0f14 100644 --- a/Core/Tools/mangler/wlib/sem4.h +++ b/Core/Tools/mangler/wlib/sem4.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef SEM4_HEADER -#define SEM4_HEADER - +#pragma once #include #ifndef _WINDOWS #include @@ -60,5 +57,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..4dbfd3790d 100644 --- a/Core/Tools/mangler/wlib/stderrd.h +++ b/Core/Tools/mangler/wlib/stderrd.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef STDERRD_HEADER -#define STDERRD_HEADER - +#pragma once #include "odevice.h" class StderrD : public OutputDevice @@ -35,5 +32,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..ffd3d2813b 100644 --- a/Core/Tools/mangler/wlib/stdoutd.h +++ b/Core/Tools/mangler/wlib/stdoutd.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef STDOUTD_HEADER -#define STDOUTD_HEADER - +#pragma once #include "odevice.h" class StdoutD : public OutputDevice @@ -36,5 +33,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..52c5a568ce 100644 --- a/Core/Tools/mangler/wlib/streamer.h +++ b/Core/Tools/mangler/wlib/streamer.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef STREAMER_HEADER -#define STREAMER_HEADER - +#pragma once #include #include #include @@ -63,5 +60,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..0b52c2f833 100644 --- a/Core/Tools/mangler/wlib/syslogd.h +++ b/Core/Tools/mangler/wlib/syslogd.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef SYSLOGD_HEADER -#define SYSLOGD_HEADER - +#pragma once #include #include #ifndef _WINDOWS @@ -44,5 +41,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..ef9504f350 100644 --- a/Core/Tools/mangler/wlib/threadfac.h +++ b/Core/Tools/mangler/wlib/threadfac.h @@ -19,10 +19,7 @@ // // Platform independent thread creation (Win32 & POSIX) // - -#ifndef THREADFAC_HEADER -#define THREADFAC_HEADER - +#pragma once #ifdef _WIN32 #include #endif @@ -120,5 +117,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..0d69d10fc7 100644 --- a/Core/Tools/mangler/wlib/threadsafe.h +++ b/Core/Tools/mangler/wlib/threadsafe.h @@ -30,10 +30,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!") // Can't just do ctime, as Windows' objidl.h uses it as a FILETIME thingie @@ -57,6 +54,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..0cc318185b 100644 --- a/Core/Tools/mangler/wlib/timezone.h +++ b/Core/Tools/mangler/wlib/timezone.h @@ -24,10 +24,7 @@ we are now in. It even accounts for daylight savings! One caveat is that it 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 +33,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..fca4820197 100644 --- a/Core/Tools/mangler/wlib/ustring.h +++ b/Core/Tools/mangler/wlib/ustring.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef USTRING_HEADER -#define USTRING_HEADER - +#pragma once #include #include #include @@ -57,5 +54,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..310f355afd 100644 --- a/Core/Tools/mangler/wlib/wdebug.h +++ b/Core/Tools/mangler/wlib/wdebug.h @@ -49,10 +49,7 @@ This won't compile, read the code until you figure it out. Only then will you be ready to leave grasshopper. \*****************************************************************************/ - -#ifndef WDEBUG_HEADER -#define WDEBUG_HEADER - +#pragma once #define USE_DEBUG_SEM #include "wstypes.h" @@ -310,5 +307,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..37a5701f6e 100644 --- a/Core/Tools/mangler/wlib/wstring.h +++ b/Core/Tools/mangler/wlib/wstring.h @@ -25,10 +25,7 @@ Author : Neal Kettler Start Date : June 1, 1997 Last Update : June 17, 1997 \****************************************************************************/ - -#ifndef WSTRING_HEADER -#define WSTRING_HEADER - +#pragma once #include #include #include "wstypes.h" @@ -89,5 +86,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..6929ad89a1 100644 --- a/Core/Tools/mangler/wlib/wstypes.h +++ b/Core/Tools/mangler/wlib/wstypes.h @@ -27,10 +27,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 // threadsafe.h otherwise they won't compile @@ -114,5 +111,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..fc0f8479a0 100644 --- a/Core/Tools/mangler/wlib/wtime.h +++ b/Core/Tools/mangler/wlib/wtime.h @@ -20,9 +20,7 @@ wtime Neal Kettler \****************************************************************************/ -#ifndef WTIME_HEADER -#define WTIME_HEADER - +#pragma once #include #include @@ -124,5 +122,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..0284b63768 100644 --- a/Core/Tools/mangler/wlib/xtime.h +++ b/Core/Tools/mangler/wlib/xtime.h @@ -28,10 +28,7 @@ The call to update the current time will break in 2038. Hopefully by then somebody will replace the lame time() function :-) \****************************************************************************/ - -#ifndef XTIME_HEADER -#define XTIME_HEADER - +#pragma once #include #include @@ -142,5 +139,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..71231bb83d 100644 --- a/Core/Tools/mangler/wnet/tcp.h +++ b/Core/Tools/mangler/wnet/tcp.h @@ -20,10 +20,7 @@ TCP Neal Kettler neal@westwood.com \****************************************************************************/ - -#ifndef TCP_HEADER -#define TCP_HEADER - +#pragma once #include #include #include @@ -195,5 +192,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..23a2508e1f 100644 --- a/Core/Tools/mangler/wnet/udp.h +++ b/Core/Tools/mangler/wnet/udp.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef UDP_HEADER -#define UDP_HEADER - +#pragma once #include #include #include @@ -110,5 +107,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..8ae3f56caa 100644 --- a/Core/Tools/matchbot/debug.h +++ b/Core/Tools/matchbot/debug.h @@ -19,10 +19,7 @@ // FILE: debug.h ////////////////////////////////////////////////////////////// // Minimal debug info // Author: Matthew D. Campbell, Sept 2002 - -#ifndef __DEBUG_H__ -#define __DEBUG_H__ - +#pragma once #ifdef DEBUG #include @@ -41,6 +38,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..2430c1c956 100644 --- a/Core/Tools/matchbot/encrypt.h +++ b/Core/Tools/matchbot/encrypt.h @@ -15,14 +15,7 @@ ** You should have received a copy of the GNU General Public License ** 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..ca928c2b55 100644 --- a/Core/Tools/matchbot/generals.h +++ b/Core/Tools/matchbot/generals.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef __GENERALS_H__ -#define __GENERALS_H__ - +#pragma once #ifdef _WIN32 #include #endif @@ -189,6 +186,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..f5f8f00d13 100644 --- a/Core/Tools/matchbot/global.h +++ b/Core/Tools/matchbot/global.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef __GLOBAL_H__ -#define __GLOBAL_H__ - +#pragma once #ifdef _WIN32 #include #ifdef IN @@ -52,6 +49,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..c3aa102ccd 100644 --- a/Core/Tools/matchbot/matcher.h +++ b/Core/Tools/matchbot/matcher.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef __MATCHER_H__ -#define __MATCHER_H__ - +#pragma once #ifdef _WIN32 #include #endif @@ -88,6 +85,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..517f950999 100644 --- a/Core/Tools/matchbot/mydebug.h +++ b/Core/Tools/matchbot/mydebug.h @@ -49,10 +49,7 @@ This won't compile, read the code until you figure it out. Only then will you be ready to leave grasshopper. \*****************************************************************************/ - -#ifndef MYDEBUG_HEADER -#define MYDEBUG_HEADER - +#pragma once #define USE_SEM #include "wstypes.h" @@ -130,5 +127,3 @@ class MyMsgManager static ostream *paranoidStream(void); }; - -#endif diff --git a/Core/Tools/matchbot/rand.h b/Core/Tools/matchbot/rand.h index 59eadee1e8..0ca793ac84 100644 --- a/Core/Tools/matchbot/rand.h +++ b/Core/Tools/matchbot/rand.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef __RAND_H__ -#define __RAND_H__ - +#pragma once #include class RandClass @@ -40,6 +37,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..d4f1b7e18f 100644 --- a/Core/Tools/matchbot/wlib/arraylist.h +++ b/Core/Tools/matchbot/wlib/arraylist.h @@ -43,10 +43,7 @@ for! A good copy constructor is one that won't blindly duplicate pointers that don't belong to them, etc... \****************************************************************************/ - -#ifndef ARRAYLIST_HEADER -#define ARRAYLIST_HEADER - +#pragma once #include #include #include @@ -704,6 +701,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..0aa719873c 100644 --- a/Core/Tools/matchbot/wlib/configfile.h +++ b/Core/Tools/matchbot/wlib/configfile.h @@ -25,10 +25,7 @@ Author : Neal Kettler Start Date : June 9, 1997 Last Update : May 13, 1999 \***************************************************************************/ - -#ifndef CONFIGFILE_HEADER -#define CONFIGFILE_HEADER - +#pragma once #include "wstypes.h" #include "dictionary.h" #include "wstring.h" @@ -72,5 +69,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..2ce22dc040 100644 --- a/Core/Tools/matchbot/wlib/critsec.h +++ b/Core/Tools/matchbot/wlib/critsec.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef CRITSEC_HEADER -#define CRITSEC_HEADER - +#pragma once #include "wstypes.h" #ifdef _WIN32 #include @@ -58,5 +55,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..7036e7b3a1 100644 --- a/Core/Tools/matchbot/wlib/filed.h +++ b/Core/Tools/matchbot/wlib/filed.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef FILED_HEADER -#define FILED_HEADER - +#pragma once #include "odevice.h" class FileD : public OutputDevice @@ -47,5 +44,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..c4298bf5a7 100644 --- a/Core/Tools/matchbot/wlib/linkedlist.h +++ b/Core/Tools/matchbot/wlib/linkedlist.h @@ -32,10 +32,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 #include @@ -491,5 +488,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..221524ddf6 100644 --- a/Core/Tools/matchbot/wlib/mboxd.h +++ b/Core/Tools/matchbot/wlib/mboxd.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef MBOXD_HEADER -#define MBOXD_HEADER - +#pragma once #include "odevice.h" class MboxD : public OutputDevice @@ -36,5 +33,3 @@ class MboxD : public OutputDevice } }; - -#endif diff --git a/Core/Tools/matchbot/wlib/monod.h b/Core/Tools/matchbot/wlib/monod.h index 494674c974..d4dfee99e9 100644 --- a/Core/Tools/matchbot/wlib/monod.h +++ b/Core/Tools/matchbot/wlib/monod.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef MONOD_HEADER -#define MONOD_HEADER - +#pragma once #include #include @@ -70,5 +67,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..f27719c771 100644 --- a/Core/Tools/matchbot/wlib/odevice.h +++ b/Core/Tools/matchbot/wlib/odevice.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** 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. class OutputDevice @@ -28,5 +25,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..4f208e0f14 100644 --- a/Core/Tools/matchbot/wlib/sem4.h +++ b/Core/Tools/matchbot/wlib/sem4.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef SEM4_HEADER -#define SEM4_HEADER - +#pragma once #include #ifndef _WINDOWS #include @@ -60,5 +57,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..4dbfd3790d 100644 --- a/Core/Tools/matchbot/wlib/stderrd.h +++ b/Core/Tools/matchbot/wlib/stderrd.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef STDERRD_HEADER -#define STDERRD_HEADER - +#pragma once #include "odevice.h" class StderrD : public OutputDevice @@ -35,5 +32,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..ffd3d2813b 100644 --- a/Core/Tools/matchbot/wlib/stdoutd.h +++ b/Core/Tools/matchbot/wlib/stdoutd.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef STDOUTD_HEADER -#define STDOUTD_HEADER - +#pragma once #include "odevice.h" class StdoutD : public OutputDevice @@ -36,5 +33,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..52c5a568ce 100644 --- a/Core/Tools/matchbot/wlib/streamer.h +++ b/Core/Tools/matchbot/wlib/streamer.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef STREAMER_HEADER -#define STREAMER_HEADER - +#pragma once #include #include #include @@ -63,5 +60,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..0b52c2f833 100644 --- a/Core/Tools/matchbot/wlib/syslogd.h +++ b/Core/Tools/matchbot/wlib/syslogd.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef SYSLOGD_HEADER -#define SYSLOGD_HEADER - +#pragma once #include #include #ifndef _WINDOWS @@ -44,5 +41,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..ef9504f350 100644 --- a/Core/Tools/matchbot/wlib/threadfac.h +++ b/Core/Tools/matchbot/wlib/threadfac.h @@ -19,10 +19,7 @@ // // Platform independent thread creation (Win32 & POSIX) // - -#ifndef THREADFAC_HEADER -#define THREADFAC_HEADER - +#pragma once #ifdef _WIN32 #include #endif @@ -120,5 +117,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..0d69d10fc7 100644 --- a/Core/Tools/matchbot/wlib/threadsafe.h +++ b/Core/Tools/matchbot/wlib/threadsafe.h @@ -30,10 +30,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!") // Can't just do ctime, as Windows' objidl.h uses it as a FILETIME thingie @@ -57,6 +54,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..0cc318185b 100644 --- a/Core/Tools/matchbot/wlib/timezone.h +++ b/Core/Tools/matchbot/wlib/timezone.h @@ -24,10 +24,7 @@ we are now in. It even accounts for daylight savings! One caveat is that it 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 +33,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..fca4820197 100644 --- a/Core/Tools/matchbot/wlib/ustring.h +++ b/Core/Tools/matchbot/wlib/ustring.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef USTRING_HEADER -#define USTRING_HEADER - +#pragma once #include #include #include @@ -57,5 +54,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..5b27b80019 100644 --- a/Core/Tools/matchbot/wlib/wdebug.h +++ b/Core/Tools/matchbot/wlib/wdebug.h @@ -49,10 +49,7 @@ This won't compile, read the code until you figure it out. Only then will you be ready to leave grasshopper. \*****************************************************************************/ - -#ifndef WDEBUG_HEADER -#define WDEBUG_HEADER - +#pragma once #define USE_DEBUG_SEM #include "wstypes.h" @@ -314,5 +311,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..37a5701f6e 100644 --- a/Core/Tools/matchbot/wlib/wstring.h +++ b/Core/Tools/matchbot/wlib/wstring.h @@ -25,10 +25,7 @@ Author : Neal Kettler Start Date : June 1, 1997 Last Update : June 17, 1997 \****************************************************************************/ - -#ifndef WSTRING_HEADER -#define WSTRING_HEADER - +#pragma once #include #include #include "wstypes.h" @@ -89,5 +86,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..6929ad89a1 100644 --- a/Core/Tools/matchbot/wlib/wstypes.h +++ b/Core/Tools/matchbot/wlib/wstypes.h @@ -27,10 +27,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 // threadsafe.h otherwise they won't compile @@ -114,5 +111,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..fc0f8479a0 100644 --- a/Core/Tools/matchbot/wlib/wtime.h +++ b/Core/Tools/matchbot/wlib/wtime.h @@ -20,9 +20,7 @@ wtime Neal Kettler \****************************************************************************/ -#ifndef WTIME_HEADER -#define WTIME_HEADER - +#pragma once #include #include @@ -124,5 +122,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..0284b63768 100644 --- a/Core/Tools/matchbot/wlib/xtime.h +++ b/Core/Tools/matchbot/wlib/xtime.h @@ -28,10 +28,7 @@ The call to update the current time will break in 2038. Hopefully by then somebody will replace the lame time() function :-) \****************************************************************************/ - -#ifndef XTIME_HEADER -#define XTIME_HEADER - +#pragma once #include #include @@ -142,5 +139,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..71231bb83d 100644 --- a/Core/Tools/matchbot/wnet/tcp.h +++ b/Core/Tools/matchbot/wnet/tcp.h @@ -20,10 +20,7 @@ TCP Neal Kettler neal@westwood.com \****************************************************************************/ - -#ifndef TCP_HEADER -#define TCP_HEADER - +#pragma once #include #include #include @@ -195,5 +192,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..23a2508e1f 100644 --- a/Core/Tools/matchbot/wnet/udp.h +++ b/Core/Tools/matchbot/wnet/udp.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef UDP_HEADER -#define UDP_HEADER - +#pragma once #include #include #include @@ -110,5 +107,3 @@ class UDP int GetInputBuffer(void); int GetOutputBuffer(void); }; - -#endif diff --git a/Core/Tools/wolSetup/WOLAPI/chatdefs.h b/Core/Tools/wolSetup/WOLAPI/chatdefs.h index bcd83f50b0..0bc6f2b6bd 100644 --- a/Core/Tools/wolSetup/WOLAPI/chatdefs.h +++ b/Core/Tools/wolSetup/WOLAPI/chatdefs.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** 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 // BGC 6/7/01: now version 16 @@ -168,6 +165,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..b1c601ff87 100644 --- a/Core/Tools/wolSetup/WOLAPI/downloaddefs.h +++ b/Core/Tools/wolSetup/WOLAPI/downloaddefs.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef _DOWNLOADDEFS_H -#define _DOWNLOADDEFS_H - +#pragma once // CDownload statuses #define DOWNLOADSTATUS_NONE 0 @@ -56,5 +53,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..6ea78a8f5a 100644 --- a/Core/Tools/wolSetup/WOLAPI/ftpdefs.h +++ b/Core/Tools/wolSetup/WOLAPI/ftpdefs.h @@ -15,16 +15,10 @@ ** You should have received a copy of the GNU General Public License ** 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..e7f58c7bd6 100644 --- a/Core/Tools/wolSetup/WOLAPI/netutildefs.h +++ b/Core/Tools/wolSetup/WOLAPI/netutildefs.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** 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 +25,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..7d014bd564 100644 --- a/Core/Tools/wolSetup/verchk.h +++ b/Core/Tools/wolSetup/verchk.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** 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 #endif @@ -27,6 +24,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..64ce849dfb 100644 --- a/Core/Tools/wolSetup/wolSetup.h +++ b/Core/Tools/wolSetup/wolSetup.h @@ -18,10 +18,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 #endif @@ -42,5 +39,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/GameLogic/Module/PrisonBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h index b7b1863326..67b939919a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h @@ -26,10 +26,7 @@ // Author: Colin Day, August 2002 // Desc: Prison Behaviors /////////////////////////////////////////////////////////////////////////////////////////////////// - -#ifndef __PRISON_BEHAVIOR_H_ -#define __PRISON_BEHAVIOR_H_ - +#pragma once // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" @@ -85,5 +82,3 @@ class PrisonBehavior : public OpenContain }; #endif - -#endif // end __PRISON_BEHAVIOR_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h index 77fe985069..3a93f8af1d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h @@ -26,10 +26,7 @@ // Author: Colin Day, August 2002 // Desc: Propaganda Center Behavior /////////////////////////////////////////////////////////////////////////////////////////////////// - -#ifndef __PROPAGANDA_CENTER_BEHAVIOR_H_ -#define __PROPAGANDA_CENTER_BEHAVIOR_H_ - +#pragma once // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/PrisonBehavior.h" @@ -84,5 +81,3 @@ class PropagandaCenterBehavior : public PrisonBehavior }; #endif - -#endif // end __PROPAGANDA_CENTER_BEHAVIOR_H_ diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h index d45b2cd6e6..ab352c5149 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h @@ -26,10 +26,7 @@ // Author: Colin Day, August 2002 // 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" @@ -109,5 +106,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/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h b/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h index d2b39e1a94..e654fff0a3 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h @@ -26,10 +26,7 @@ // FEBDispatch class is a template class which, when inherited from, can implement the // IDispatch for a COM object with a type library. // - -#ifndef _FEBDISPATCH_H__ -#define _FEBDISPATCH_H__ - +#pragma once #include extern CComModule _Module; #include @@ -102,5 +99,3 @@ public C private: ITypeInfo *m_ptinfo; }; - -#endif diff --git a/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h b/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h index f8fb6c72ce..df7bb9dcc3 100644 --- a/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h +++ b/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h @@ -25,10 +25,7 @@ // This file contains all the header files that shouldn't change frequently. // 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. #define _STLP_USE_NEWALLOC 1 @@ -126,5 +123,3 @@ class STLSpecialAlloc; #include "Common/Thing.h" #include "Common/UnicodeString.h" - -#endif /* __PRERTS_H__ */ diff --git a/Generals/Code/Libraries/Include/Lib/trig.h b/Generals/Code/Libraries/Include/Lib/trig.h index a84f327005..dbfeb50c41 100644 --- a/Generals/Code/Libraries/Include/Lib/trig.h +++ b/Generals/Code/Libraries/Include/Lib/trig.h @@ -20,14 +20,9 @@ // fast trig functions // 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/matrixmapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h index 84d9e502a6..955f6c23e3 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h @@ -37,10 +37,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef MATRIXMAPPER_H -#define MATRIXMAPPER_H - +#pragma once #include "always.h" #include "bittype.h" #include "matrix4.h" @@ -140,5 +137,3 @@ inline const Matrix4x4 & MatrixMapperClass::Get_Texture_Transform(void) const { return ViewToTexture; } - -#endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h index fcfe8534ac..40efb9b5f3 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h @@ -35,10 +35,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef MESHGEOMETRY_H -#define MESHGEOMETRY_H - +#pragma once #include "always.h" #include "refcount.h" #include "bittype.h" @@ -286,6 +283,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..4011a08292 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h @@ -35,10 +35,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef MESHMATDESC_H -#define MESHMATDESC_H - +#pragma once #include "always.h" #include "vector2.h" #include "vector3.h" @@ -490,6 +487,3 @@ inline void MeshMatDescClass::Disable_Backface_Culling(void) } } } - -#endif //MESHMATDESC_H - diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h index e3566cc23b..bea867f921 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h @@ -36,10 +36,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef TEXTUREFILTER_H -#define TEXTUREFILTER_H - +#pragma once #ifndef DX8_WRAPPER_H //#include "dx8wrapper.h" #endif @@ -129,5 +126,3 @@ class TextureFilterClass TxtAddrMode UAddressMode; TxtAddrMode VAddressMode; }; - -#endif diff --git a/Generals/Code/Main/WinMain.h b/Generals/Code/Main/WinMain.h index b580e4da60..3df35efee4 100644 --- a/Generals/Code/Main/WinMain.h +++ b/Generals/Code/Main/WinMain.h @@ -29,10 +29,7 @@ // Author: Colin Day, April 2001 // /////////////////////////////////////////////////////////////////////////////// - -#ifndef __WINMAIN_H_ -#define __WINMAIN_H_ - +#pragma once // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -43,6 +40,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/WorldBuilder/include/DrawObject.h b/Generals/Code/Tools/WorldBuilder/include/DrawObject.h index 677ead6d0b..ed9c6dcb84 100644 --- a/Generals/Code/Tools/WorldBuilder/include/DrawObject.h +++ b/Generals/Code/Tools/WorldBuilder/include/DrawObject.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef __DRAW_OBJECT_H_ -#define __DRAW_OBJECT_H_ - +#pragma once #include "always.h" #include "rendobj.h" #include "w3d_file.h" @@ -171,5 +168,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/WBHeightMap.h b/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h index 449a936410..c1394b79da 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h +++ b/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h @@ -15,10 +15,7 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ - -#ifndef __WBHEIGHTMAP_H_ -#define __WBHEIGHTMAP_H_ - +#pragma once #include "W3DDevice/GameClient/HeightMap.h" class WBHeightMap : public HeightMapRenderObjClass @@ -46,5 +43,3 @@ class WBHeightMap : public HeightMapRenderObjClass Bool m_drawEntireMap; Bool m_flattenHeights; }; - -#endif // end __WBHEIGHTMAP_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h index ccf67cd48a..ebd4d792f1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h @@ -26,10 +26,7 @@ // Author: Colin Day, August 2002 // Desc: Prison Behaviors /////////////////////////////////////////////////////////////////////////////////////////////////// - -#ifndef __PRISON_BEHAVIOR_H_ -#define __PRISON_BEHAVIOR_H_ - +#pragma once // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" @@ -85,5 +82,3 @@ class PrisonBehavior : public OpenContain }; #endif - -#endif // end __PRISON_BEHAVIOR_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h index 47cc77bf2f..8be91d3806 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h @@ -26,10 +26,7 @@ // Author: Colin Day, August 2002 // Desc: Propaganda Center Behavior /////////////////////////////////////////////////////////////////////////////////////////////////// - -#ifndef __PROPAGANDA_CENTER_BEHAVIOR_H_ -#define __PROPAGANDA_CENTER_BEHAVIOR_H_ - +#pragma once // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/PrisonBehavior.h" @@ -84,5 +81,3 @@ class PropagandaCenterBehavior : public PrisonBehavior }; #endif - -#endif // end __PROPAGANDA_CENTER_BEHAVIOR_H_ diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h index e289411305..65c4e97158 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h @@ -26,10 +26,7 @@ // Author: Colin Day, August 2002 // 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 +107,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/GameNetwork/WOLBrowser/FEBDispatch.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h index a3d6a0095f..eac6e0beb8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h @@ -26,10 +26,7 @@ // FEBDispatch class is a template class which, when inherited from, can implement the // IDispatch for a COM object with a type library. // - -#ifndef _FEBDISPATCH_H__ -#define _FEBDISPATCH_H__ - +#pragma once #include extern CComModule _Module; #include @@ -102,5 +99,3 @@ public C private: ITypeInfo *m_ptinfo; }; - -#endif diff --git a/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h b/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h index ab7e03502c..3539149c13 100644 --- a/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h +++ b/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h @@ -25,10 +25,7 @@ // This file contains all the header files that shouldn't change frequently. // 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. #define _STLP_USE_NEWALLOC 1 @@ -127,5 +124,3 @@ class STLSpecialAlloc; #include "Common/Thing.h" #include "Common/UnicodeString.h" - -#endif /* __PRERTS_H__ */ diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h index 106c9f8151..88a57289ca 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h @@ -17,10 +17,7 @@ */ // FILE: W3DSnow.h ///////////////////////////////////////////////////////// - -#ifndef _W3DSNOW_H_ -#define _W3DSNOW_H_ - +#pragma once #include "GameClient/Snow.h" class DX8IndexBufferClass; @@ -59,6 +56,3 @@ class W3DSnowManager : public SnowManager Int m_totalRendered; ///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..334ec6ffe4 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h @@ -35,10 +35,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef MESHMATDESC_H -#define MESHMATDESC_H - +#pragma once #include "always.h" #include "vector2.h" #include "vector3.h" @@ -490,6 +487,3 @@ inline void MeshMatDescClass::Disable_Backface_Culling(void) } } } - -#endif //MESHMATDESC_H - diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shdlib.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shdlib.h index 3275741d40..1109e03b9d 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shdlib.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shdlib.h @@ -35,10 +35,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 +65,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/texturefilter.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h index 8db3f5c73d..24ca128d3c 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h @@ -36,10 +36,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef TEXTUREFILTER_H -#define TEXTUREFILTER_H - +#pragma once #ifndef DX8_WRAPPER_H //#include "dx8wrapper.h" #endif @@ -129,5 +126,3 @@ class TextureFilterClass TxtAddrMode UAddressMode; TxtAddrMode VAddressMode; }; - -#endif diff --git a/GeneralsMD/Code/Main/WinMain.h b/GeneralsMD/Code/Main/WinMain.h index 76a704f345..a849536513 100644 --- a/GeneralsMD/Code/Main/WinMain.h +++ b/GeneralsMD/Code/Main/WinMain.h @@ -29,10 +29,7 @@ // Author: Colin Day, April 2001 // /////////////////////////////////////////////////////////////////////////////// - -#ifndef __WINMAIN_H_ -#define __WINMAIN_H_ - +#pragma once // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include @@ -43,6 +40,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/WorldBuilder/include/DrawObject.h b/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h index 9a721cd8b5..baa4cf5d89 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h @@ -16,10 +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" #include "w3d_file.h" @@ -190,5 +187,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/WBHeightMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h index a8d0300319..0c7bf809f0 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h @@ -16,10 +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" #define dont_USE_FLAT_HEIGHT_MAP // Use the origina height map for mission disk. jba. [4/15/2003] @@ -52,5 +49,3 @@ class WBHeightMap : public HeightMapRenderObjClass Bool m_drawEntireMap; Bool m_flattenHeights; }; - -#endif // end __WBHEIGHTMAP_H_ diff --git a/GeneralsMD/Code/Tools/wdump/rawfilem.h b/GeneralsMD/Code/Tools/wdump/rawfilem.h index a8f74bdf4b..39f03069c4 100644 --- a/GeneralsMD/Code/Tools/wdump/rawfilem.h +++ b/GeneralsMD/Code/Tools/wdump/rawfilem.h @@ -37,10 +37,7 @@ * RawFileMClass::~RawFileMClass -- Default deconstructor for a file object. * * RawFileMClass::Is_Open -- Checks to see if the file is open or not. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - -#ifndef RAWFILEM_Hx -#define RAWFILEM_Hx - +#pragma once #include #include #include @@ -320,5 +317,3 @@ inline bool RawFileMClass::Is_Open(void) const { return(Handle != INVALID_HANDLE_VALUE); } - -#endif 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() From d6303250a90c8e562089a7d296d5baf2ead511ec Mon Sep 17 00:00:00 2001 From: Bart Roossien Date: Thu, 23 Oct 2025 21:29:32 +0200 Subject: [PATCH 4/5] refactor: Harmonize linebreaks around pragma once --- Core/GameEngine/Include/Common/ArchiveFile.h | 1 + .../Include/Common/ArchiveFileSystem.h | 1 + Core/GameEngine/Include/Common/AsciiString.h | 1 + Core/GameEngine/Include/Common/AudioAffect.h | 2 + .../Include/Common/AudioEventInfo.h | 1 + .../GameEngine/Include/Common/AudioEventRTS.h | 1 + .../Include/Common/AudioHandleSpecialValues.h | 1 + .../Include/Common/AudioRandomValue.h | 1 + Core/GameEngine/Include/Common/AudioRequest.h | 1 + .../GameEngine/Include/Common/AudioSettings.h | 1 + Core/GameEngine/Include/Common/CRCDebug.h | 2 +- Core/GameEngine/Include/Common/Debug.h | 1 + Core/GameEngine/Include/Common/FileSystem.h | 1 + Core/GameEngine/Include/Common/FramePacer.h | 1 + Core/GameEngine/Include/Common/GameAudio.h | 1 + Core/GameEngine/Include/Common/GameMemory.h | 1 + Core/GameEngine/Include/Common/GameSounds.h | 1 + Core/GameEngine/Include/Common/LocalFile.h | 1 - .../Include/Common/LocalFileSystem.h | 1 + Core/GameEngine/Include/Common/MiscAudio.h | 1 + Core/GameEngine/Include/Common/RAMFile.h | 1 - Core/GameEngine/Include/Common/RandomValue.h | 1 + .../Include/Common/StreamingArchiveFile.h | 1 - .../GameEngine/Include/Common/UnicodeString.h | 1 + Core/GameEngine/Include/Common/Xfer.h | 1 + Core/GameEngine/Include/Common/XferCRC.h | 1 + Core/GameEngine/Include/Common/XferDeepCRC.h | 1 + Core/GameEngine/Include/Common/XferLoad.h | 1 + Core/GameEngine/Include/Common/XferSave.h | 1 + Core/GameEngine/Include/Common/crc.h | 1 + Core/GameEngine/Include/Common/file.h | 1 - Core/GameEngine/Include/Common/simpleplayer.h | 1 + Core/GameEngine/Include/Common/urllaunch.h | 1 + .../Include/GameClient/ClientRandomValue.h | 1 + .../Include/GameClient/WindowVideoManager.h | 1 + .../Include/GameLogic/LogicRandomValue.h | 1 + .../Include/StdDevice/Common/StdBIGFile.h | 1 + .../StdDevice/Common/StdBIGFileSystem.h | 1 + .../Include/StdDevice/Common/StdLocalFile.h | 1 + .../StdDevice/Common/StdLocalFileSystem.h | 1 + .../Include/Win32Device/Common/Win32BIGFile.h | 1 + .../Win32Device/Common/Win32BIGFileSystem.h | 1 + .../Win32Device/Common/Win32LocalFile.h | 1 + .../Win32Device/Common/Win32LocalFileSystem.h | 1 + Core/Libraries/Include/Lib/BaseTypeCore.h | 1 + Core/Libraries/Include/rts/debug.h | 2 + Core/Libraries/Include/rts/profile.h | 2 + .../Source/Compression/Compression.h | 1 + Core/Libraries/Source/Compression/EAC/codex.h | 1 - Core/Libraries/Source/Compression/EAC/gimex.h | 1 + .../Compression/LZHCompress/NoxCompress.h | 1 + Core/Libraries/Source/WWVegas/WW3D2/aabtree.h | 1 + Core/Libraries/Source/WWVegas/WW3D2/agg_def.h | 2 +- .../Source/WWVegas/WW3D2/animatedsoundmgr.h | 1 + .../Source/WWVegas/WW3D2/assetstatus.h | 1 + .../Source/WWVegas/WW3D2/bitmaphandler.h | 1 + Core/Libraries/Source/WWVegas/WW3D2/classid.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/collect.h | 1 + .../Source/WWVegas/WW3D2/colorspace.h | 1 + Core/Libraries/Source/WWVegas/WW3D2/coltest.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/coltype.h | 2 - .../Source/WWVegas/WW3D2/composite.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/decalsys.h | 1 + Core/Libraries/Source/WWVegas/WW3D2/distlod.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/dx8list.h | 2 +- .../Source/WWVegas/WW3D2/dx8polygonrenderer.h | 1 - .../Source/WWVegas/WW3D2/dx8webbrowser.h | 2 + .../Libraries/Source/WWVegas/WW3D2/dynamesh.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/font3d.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/formconv.h | 1 + .../Libraries/Source/WWVegas/WW3D2/framgrab.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/hanim.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/hcanim.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/hmdldef.H | 2 +- Core/Libraries/Source/WWVegas/WW3D2/htree.h | 1 + .../Libraries/Source/WWVegas/WW3D2/intersec.h | 1 + Core/Libraries/Source/WWVegas/WW3D2/inttest.h | 1 + Core/Libraries/Source/WWVegas/WW3D2/layer.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/line3d.h | 1 + Core/Libraries/Source/WWVegas/WW3D2/matinfo.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/meshdam.h | 1 + .../Libraries/Source/WWVegas/WW3D2/metalmap.h | 1 + .../Source/WWVegas/WW3D2/missingtexture.h | 1 + Core/Libraries/Source/WWVegas/WW3D2/pivot.h | 1 + Core/Libraries/Source/WWVegas/WW3D2/pointgr.h | 1 + Core/Libraries/Source/WWVegas/WW3D2/predlod.h | 1 + .../Source/WWVegas/WW3D2/projector.h | 2 + Core/Libraries/Source/WWVegas/WW3D2/proto.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/proxy.h | 1 + Core/Libraries/Source/WWVegas/WW3D2/rddesc.h | 2 +- .../Source/WWVegas/WW3D2/render2dsentence.h | 1 + .../WWVegas/WW3D2/renderobjectrecycler.h | 1 + Core/Libraries/Source/WWVegas/WW3D2/rendobj.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/ringobj.h | 1 + .../Libraries/Source/WWVegas/WW3D2/robjlist.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/segline.h | 1 + .../Source/WWVegas/WW3D2/seglinerenderer.h | 2 + .../Source/WWVegas/WW3D2/shattersystem.h | 1 + Core/Libraries/Source/WWVegas/WW3D2/snapPts.h | 1 + .../Source/WWVegas/WW3D2/soundlibrarybridge.h | 2 + .../Source/WWVegas/WW3D2/soundrobj.h | 1 + .../Source/WWVegas/WW3D2/sphereobj.h | 1 + .../Source/WWVegas/WW3D2/static_sort_list.h | 2 + .../Source/WWVegas/WW3D2/statistics.h | 1 + Core/Libraries/Source/WWVegas/WW3D2/streak.h | 1 + .../Source/WWVegas/WW3D2/streakRender.h | 2 + .../Source/WWVegas/WW3D2/stripoptimizer.h | 1 + .../Source/WWVegas/WW3D2/surfaceclass.h | 1 + .../Libraries/Source/WWVegas/WW3D2/textdraw.h | 2 +- .../Source/WWVegas/WW3D2/visrasterizer.h | 1 + Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h | 2 + .../Source/WWVegas/WW3D2/w3d_obsolete.h | 1 - .../Libraries/Source/WWVegas/WW3D2/w3d_util.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/w3derr.h | 2 +- .../Source/WWVegas/WW3D2/w3dexclusionlist.h | 1 + .../Source/WWVegas/WW3D2/ww3dformat.h | 1 + Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h | 1 - .../Libraries/Source/WWVegas/WW3D2/ww3dtrig.h | 1 - .../WWVegas/WWAudio/AABTreeSoundCullClass.h | 2 +- .../Source/WWVegas/WWAudio/AudibleSound.h | 1 + .../Source/WWVegas/WWAudio/AudioEvents.h | 1 + .../Source/WWVegas/WWAudio/AudioSaveLoad.h | 2 +- .../Source/WWVegas/WWAudio/Listener.h | 1 - .../Source/WWVegas/WWAudio/LogicalListener.h | 1 + .../Source/WWVegas/WWAudio/LogicalSound.h | 1 + .../Source/WWVegas/WWAudio/PriorityVector.h | 1 + .../Source/WWVegas/WWAudio/Sound3D.h | 1 + .../Source/WWVegas/WWAudio/SoundBuffer.h | 2 +- .../Source/WWVegas/WWAudio/SoundChunkIDs.h | 2 +- .../Source/WWVegas/WWAudio/SoundCullObj.h | 2 +- .../Source/WWVegas/WWAudio/SoundScene.h | 2 +- .../Source/WWVegas/WWAudio/SoundSceneObj.h | 1 + .../Source/WWVegas/WWAudio/Threads.h | 1 + Core/Libraries/Source/WWVegas/WWAudio/Utils.h | 1 + .../Source/WWVegas/WWAudio/WWAudio.h | 1 + .../Source/WWVegas/WWAudio/listenerhandle.h | 1 + .../Source/WWVegas/WWAudio/sound2dhandle.h | 1 + .../Source/WWVegas/WWAudio/sound3dhandle.h | 1 + .../Source/WWVegas/WWAudio/soundhandle.h | 1 + .../Source/WWVegas/WWDebug/wwdebug.h | 1 + .../Libraries/Source/WWVegas/WWDebug/wwhack.h | 1 + .../Source/WWVegas/WWDebug/wwmemlog.h | 2 +- .../Source/WWVegas/WWDownload/Download.h | 2 + .../Source/WWVegas/WWDownload/DownloadDebug.h | 2 + .../Source/WWVegas/WWDownload/Registry.h | 1 + .../Source/WWVegas/WWDownload/downloaddefs.h | 2 + .../Libraries/Source/WWVegas/WWDownload/ftp.h | 1 + .../Source/WWVegas/WWDownload/ftpdefs.h | 1 + .../Source/WWVegas/WWDownload/urlBuilder.h | 2 + Core/Libraries/Source/WWVegas/WWLib/BSEARCH.H | 1 - Core/Libraries/Source/WWVegas/WWLib/BUFF.H | 1 + Core/Libraries/Source/WWVegas/WWLib/CRC.H | 2 + .../Source/WWVegas/WWLib/CallbackHook.h | 2 + Core/Libraries/Source/WWVegas/WWLib/Except.h | 1 + .../Libraries/Source/WWVegas/WWLib/HASHLIST.H | 1 + Core/Libraries/Source/WWVegas/WWLib/INDEX.H | 2 + Core/Libraries/Source/WWVegas/WWLib/INI.H | 1 + .../Libraries/Source/WWVegas/WWLib/LISTNODE.H | 1 + Core/Libraries/Source/WWVegas/WWLib/MPU.H | 2 + Core/Libraries/Source/WWVegas/WWLib/PIPE.H | 2 + Core/Libraries/Source/WWVegas/WWLib/Point.h | 2 + Core/Libraries/Source/WWVegas/WWLib/RAMFILE.H | 2 + Core/Libraries/Source/WWVegas/WWLib/RANDOM.H | 2 + Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H | 2 + Core/Libraries/Source/WWVegas/WWLib/SLIST.H | 2 + Core/Libraries/Source/WWVegas/WWLib/SLNODE.H | 2 + Core/Libraries/Source/WWVegas/WWLib/STRAW.H | 2 + .../Libraries/Source/WWVegas/WWLib/Signaler.h | 2 + Core/Libraries/Source/WWVegas/WWLib/TARGA.H | 2 + Core/Libraries/Source/WWVegas/WWLib/Vector.H | 2 + .../Source/WWVegas/WWLib/WWCOMUtil.h | 2 + Core/Libraries/Source/WWVegas/WWLib/WWFILE.H | 2 + Core/Libraries/Source/WWVegas/WWLib/XPIPE.H | 2 + Core/Libraries/Source/WWVegas/WWLib/XSTRAW.H | 2 + Core/Libraries/Source/WWVegas/WWLib/always.h | 2 + Core/Libraries/Source/WWVegas/WWLib/b64pipe.h | 2 + .../Libraries/Source/WWVegas/WWLib/b64straw.h | 2 + Core/Libraries/Source/WWVegas/WWLib/base64.h | 1 + .../Libraries/Source/WWVegas/WWLib/bfiofile.h | 2 + Core/Libraries/Source/WWVegas/WWLib/binheap.h | 2 + Core/Libraries/Source/WWVegas/WWLib/bittype.h | 2 + Core/Libraries/Source/WWVegas/WWLib/bound.h | 2 + .../Libraries/Source/WWVegas/WWLib/bufffile.h | 1 + Core/Libraries/Source/WWVegas/WWLib/chunkio.h | 2 + .../Source/WWVegas/WWLib/cpudetect.h | 1 + Core/Libraries/Source/WWVegas/WWLib/crandom.h | 2 + Core/Libraries/Source/WWVegas/WWLib/crcpipe.h | 2 + .../Libraries/Source/WWVegas/WWLib/crcstraw.h | 2 + Core/Libraries/Source/WWVegas/WWLib/cstraw.h | 2 + .../Libraries/Source/WWVegas/WWLib/ffactory.h | 1 + Core/Libraries/Source/WWVegas/WWLib/gcd_lcm.h | 2 + Core/Libraries/Source/WWVegas/WWLib/hash.h | 2 +- .../Libraries/Source/WWVegas/WWLib/hashcalc.h | 2 +- Core/Libraries/Source/WWVegas/WWLib/hashtab.h | 2 + .../Source/WWVegas/WWLib/hashtemplate.h | 2 +- Core/Libraries/Source/WWVegas/WWLib/incdec.h | 2 + Core/Libraries/Source/WWVegas/WWLib/inisup.h | 2 +- .../Libraries/Source/WWVegas/WWLib/iostruct.h | 1 + Core/Libraries/Source/WWVegas/WWLib/lzo.h | 2 + Core/Libraries/Source/WWVegas/WWLib/lzo1x.h | 1 + .../Libraries/Source/WWVegas/WWLib/lzo_conf.h | 1 + Core/Libraries/Source/WWVegas/WWLib/lzoconf.h | 1 + Core/Libraries/Source/WWVegas/WWLib/lzopipe.h | 2 + .../Libraries/Source/WWVegas/WWLib/lzostraw.h | 1 + Core/Libraries/Source/WWVegas/WWLib/mempool.h | 2 +- Core/Libraries/Source/WWVegas/WWLib/mmsys.h | 2 + .../Source/WWVegas/WWLib/multilist.h | 2 +- Core/Libraries/Source/WWVegas/WWLib/mutex.h | 1 + Core/Libraries/Source/WWVegas/WWLib/noinit.h | 2 + .../Libraries/Source/WWVegas/WWLib/notifier.h | 2 + Core/Libraries/Source/WWVegas/WWLib/nstrdup.h | 1 + Core/Libraries/Source/WWVegas/WWLib/ntree.h | 1 - Core/Libraries/Source/WWVegas/WWLib/rcfile.h | 1 + .../Libraries/Source/WWVegas/WWLib/readline.h | 2 + Core/Libraries/Source/WWVegas/WWLib/realcrc.h | 1 + Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h | 2 +- .../Libraries/Source/WWVegas/WWLib/refcount.h | 2 + .../Libraries/Source/WWVegas/WWLib/registry.h | 1 + Core/Libraries/Source/WWVegas/WWLib/search.h | 2 + .../Libraries/Source/WWVegas/WWLib/sharebuf.h | 2 + .../Source/WWVegas/WWLib/simplevec.h | 1 + Core/Libraries/Source/WWVegas/WWLib/stimer.h | 2 + .../Libraries/Source/WWVegas/WWLib/strtok_r.h | 1 + Core/Libraries/Source/WWVegas/WWLib/swap.h | 2 + .../Libraries/Source/WWVegas/WWLib/systimer.h | 1 + .../Libraries/Source/WWVegas/WWLib/tgatodxt.h | 2 + Core/Libraries/Source/WWVegas/WWLib/thread.h | 1 + Core/Libraries/Source/WWVegas/WWLib/trect.h | 2 + Core/Libraries/Source/WWVegas/WWLib/trim.h | 2 + Core/Libraries/Source/WWVegas/WWLib/uarray.h | 2 + Core/Libraries/Source/WWVegas/WWLib/verchk.h | 2 +- Core/Libraries/Source/WWVegas/WWLib/visualc.h | 1 + .../Source/WWVegas/WWLib/widestring.h | 1 + Core/Libraries/Source/WWVegas/WWLib/win.h | 2 + .../Libraries/Source/WWVegas/WWLib/wwstring.h | 1 + .../Source/WWVegas/WWMath/Vector3i.h | 2 +- Core/Libraries/Source/WWVegas/WWMath/aabox.h | 1 + .../Source/WWVegas/WWMath/aabtreecull.h | 2 +- .../Libraries/Source/WWVegas/WWMath/aaplane.h | 1 + .../Source/WWVegas/WWMath/cardinalspline.h | 2 +- .../Libraries/Source/WWVegas/WWMath/castres.h | 1 + .../Source/WWVegas/WWMath/catmullromspline.h | 2 +- .../Libraries/Source/WWVegas/WWMath/colmath.h | 1 + .../Source/WWVegas/WWMath/colmathaabox.h | 1 + .../Source/WWVegas/WWMath/colmathfrustum.h | 1 + .../Source/WWVegas/WWMath/colmathinlines.h | 1 + .../Source/WWVegas/WWMath/colmathline.h | 2 + .../Source/WWVegas/WWMath/colmathplane.h | 1 + .../Libraries/Source/WWVegas/WWMath/cullsys.h | 2 +- .../Source/WWVegas/WWMath/culltype.h | 2 +- Core/Libraries/Source/WWVegas/WWMath/curve.h | 2 +- Core/Libraries/Source/WWVegas/WWMath/euler.h | 2 +- .../Libraries/Source/WWVegas/WWMath/frustum.h | 2 +- .../Source/WWVegas/WWMath/hermitespline.h | 2 +- .../Libraries/Source/WWVegas/WWMath/lineseg.h | 2 +- .../Source/WWVegas/WWMath/lookuptable.h | 1 + .../Libraries/Source/WWVegas/WWMath/matrix3.h | 2 +- .../Source/WWVegas/WWMath/matrix3d.h | 1 + .../Libraries/Source/WWVegas/WWMath/matrix4.h | 1 - .../Source/WWVegas/WWMath/normalcone.h | 2 + Core/Libraries/Source/WWVegas/WWMath/obbox.h | 1 + Core/Libraries/Source/WWVegas/WWMath/ode.h | 2 +- Core/Libraries/Source/WWVegas/WWMath/plane.h | 1 + Core/Libraries/Source/WWVegas/WWMath/pot.h | 1 + Core/Libraries/Source/WWVegas/WWMath/quat.h | 1 + Core/Libraries/Source/WWVegas/WWMath/rect.h | 2 +- Core/Libraries/Source/WWVegas/WWMath/sphere.h | 2 +- .../Source/WWVegas/WWMath/tcbspline.h | 2 +- Core/Libraries/Source/WWVegas/WWMath/tri.h | 2 +- Core/Libraries/Source/WWVegas/WWMath/v3_rnd.h | 2 + .../Libraries/Source/WWVegas/WWMath/vector2.h | 1 + .../Source/WWVegas/WWMath/vector2i.h | 2 +- .../Libraries/Source/WWVegas/WWMath/vector3.h | 1 + .../Libraries/Source/WWVegas/WWMath/vector4.h | 1 + .../Source/WWVegas/WWMath/vehiclecurve.h | 2 +- Core/Libraries/Source/WWVegas/WWMath/vp.h | 1 + Core/Libraries/Source/WWVegas/WWMath/wwmath.h | 2 +- .../Source/WWVegas/WWMath/wwmathids.h | 2 + .../Source/WWVegas/WWSaveLoad/definition.h | 1 + .../WWVegas/WWSaveLoad/definitionclassids.h | 2 +- .../WWVegas/WWSaveLoad/definitionfactory.h | 1 + .../WWVegas/WWSaveLoad/definitionfactorymgr.h | 1 + .../Source/WWVegas/WWSaveLoad/definitionmgr.h | 1 - .../Source/WWVegas/WWSaveLoad/editable.h | 2 - .../Source/WWVegas/WWSaveLoad/parameter.h | 2 +- .../Source/WWVegas/WWSaveLoad/parameterlist.h | 3 - .../WWVegas/WWSaveLoad/parametertypes.h | 2 - .../Source/WWVegas/WWSaveLoad/persist.h | 2 +- .../WWVegas/WWSaveLoad/persistfactory.h | 3 - .../Source/WWVegas/WWSaveLoad/pointerremap.h | 1 - .../Source/WWVegas/WWSaveLoad/postloadable.h | 1 + .../Source/WWVegas/WWSaveLoad/saveload.h | 1 - .../Source/WWVegas/WWSaveLoad/saveloadids.h | 2 +- .../WWVegas/WWSaveLoad/saveloadstatus.h | 1 + .../WWVegas/WWSaveLoad/saveloadsubsystem.h | 2 - .../WWSaveLoad/simpledefinitionfactory.h | 2 +- .../WWVegas/WWSaveLoad/simpleparameter.h | 3 - .../Source/WWVegas/WWSaveLoad/twiddler.h | 1 + .../Source/WWVegas/WWSaveLoad/wwsaveload.h | 1 + Core/Libraries/Source/debug/_pch.h | 2 + Core/Libraries/Source/debug/debug.h | 2 + Core/Libraries/Source/debug/debug_cmd.h | 2 + Core/Libraries/Source/debug/debug_debug.h | 2 + Core/Libraries/Source/debug/debug_doc.h | 2 + Core/Libraries/Source/debug/debug_io.h | 2 + Core/Libraries/Source/debug/debug_macro.h | 2 + Core/Libraries/Source/debug/debug_stack.h | 2 + Core/Libraries/Source/debug/internal.h | 2 + Core/Libraries/Source/debug/internal_except.h | 2 + Core/Libraries/Source/debug/internal_io.h | 2 + Core/Libraries/Source/debug/test2/StdAfx.h | 1 + Core/Libraries/Source/profile/_pch.h | 2 + Core/Libraries/Source/profile/internal.h | 2 + Core/Libraries/Source/profile/internal_cmd.h | 2 + .../Source/profile/internal_funclevel.h | 2 + .../Source/profile/internal_highlevel.h | 2 + .../Source/profile/internal_result.h | 2 + Core/Libraries/Source/profile/profile.h | 2 + Core/Libraries/Source/profile/profile_doc.h | 2 + .../Source/profile/profile_funclevel.h | 2 + .../Source/profile/profile_highlevel.h | 2 + .../Libraries/Source/profile/profile_result.h | 2 + Core/Tools/Autorun/ARGS.H | 2 + Core/Tools/Autorun/CDCNTRL.H | 1 - Core/Tools/Autorun/CallbackHook.h | 2 + Core/Tools/Autorun/DrawButton.h | 2 + Core/Tools/Autorun/Locale_API.h | 1 + Core/Tools/Autorun/POINT.h | 2 + Core/Tools/Autorun/RECT.h | 2 + Core/Tools/Autorun/TTFont.h | 2 + Core/Tools/Autorun/Utils.h | 2 + Core/Tools/Autorun/ViewHTML.h | 2 + Core/Tools/Autorun/WSYS_FileSystem.h | 1 - Core/Tools/Autorun/WSYS_RAMFile.h | 1 - Core/Tools/Autorun/WSYS_StdFile.h | 1 - Core/Tools/Autorun/WSYS_StdFileSystem.h | 1 - Core/Tools/Autorun/WSYS_file.h | 1 - Core/Tools/Autorun/Wnd_File.h | 2 + Core/Tools/Autorun/autorun.h | 1 + Core/Tools/Autorun/gimex.h | 2 + Core/Tools/Autorun/leanAndMeanAutorun.h | 1 + Core/Tools/Autorun/locale.h | 2 + Core/Tools/Babylon/Babylon.h | 1 + Core/Tools/Babylon/BabylonDlg.h | 1 + Core/Tools/Babylon/DlgProxy.h | 1 + Core/Tools/Babylon/ExportDlg.h | 2 + Core/Tools/Babylon/GenerateDlg.h | 2 + Core/Tools/Babylon/MatchDlg.h | 2 + Core/Tools/Babylon/ProceedDlg.h | 2 + Core/Tools/Babylon/Report.h | 2 + Core/Tools/Babylon/RetranslateDlg.h | 2 + Core/Tools/Babylon/StdAfx.h | 1 + Core/Tools/Babylon/TransDB.h | 2 + Core/Tools/Babylon/VIEWDBSII.h | 2 + Core/Tools/Babylon/VerifyDlg.h | 2 + Core/Tools/Babylon/VerifyTextDlg.h | 2 + Core/Tools/Babylon/XLStuff.h | 2 + Core/Tools/Babylon/bin.h | 1 + Core/Tools/Babylon/expimp.h | 2 + Core/Tools/Babylon/fileops.h | 2 + Core/Tools/Babylon/iff.h | 1 + Core/Tools/Babylon/loadsave.h | 2 + Core/Tools/Babylon/olestring.h | 2 + Core/Tools/Babylon/transcs.h | 1 + Core/Tools/CRCDiff/KVPair.h | 2 + Core/Tools/CRCDiff/debug.h | 2 + Core/Tools/CRCDiff/expander.h | 2 + Core/Tools/CRCDiff/misc.h | 2 + Core/Tools/DebugWindow/DebugWindow.h | 1 + Core/Tools/DebugWindow/StdAfx.h | 1 + .../ImagePacker/Include/ImageDirectory.h | 1 + Core/Tools/ImagePacker/Include/ImageInfo.h | 1 + Core/Tools/ImagePacker/Include/ImagePacker.h | 1 + Core/Tools/ImagePacker/Include/TexturePage.h | 1 + Core/Tools/ImagePacker/Include/WinMain.h | 1 + Core/Tools/ImagePacker/Include/WindowProc.h | 1 + Core/Tools/Launcher/BFISH.H | 2 + .../Tools/Launcher/Toolkit/Debug/DebugPrint.h | 2 + Core/Tools/Launcher/Toolkit/Storage/File.h | 2 + Core/Tools/Launcher/Toolkit/Storage/Rights.h | 2 + Core/Tools/Launcher/Toolkit/Storage/Stream.h | 2 + .../Launcher/Toolkit/Support/RefCounted.h | 2 + Core/Tools/Launcher/Toolkit/Support/RefPtr.h | 2 + .../Launcher/Toolkit/Support/StringConvert.h | 2 + Core/Tools/Launcher/Toolkit/Support/UString.h | 2 + Core/Tools/Launcher/Toolkit/Support/UTypes.h | 2 + Core/Tools/Launcher/Toolkit/Support/Visualc.h | 2 + Core/Tools/Launcher/configfile.h | 2 + Core/Tools/Launcher/dialog.h | 2 + Core/Tools/Launcher/dictionary.h | 2 + Core/Tools/Launcher/filed.h | 2 + Core/Tools/Launcher/findpatch.h | 2 + Core/Tools/Launcher/loadbmp.h | 2 + Core/Tools/Launcher/monod.h | 1 + Core/Tools/Launcher/odevice.h | 2 + Core/Tools/Launcher/patch.h | 2 + Core/Tools/Launcher/process.h | 2 + Core/Tools/Launcher/streamer.h | 2 + Core/Tools/Launcher/wdebug.h | 2 + Core/Tools/Launcher/winblows.h | 2 + Core/Tools/Launcher/wstring.h | 2 + Core/Tools/Launcher/wstypes.h | 2 + Core/Tools/MapCacheBuilder/Include/WinMain.h | 1 + Core/Tools/PATCHGET/CHATAPI.H | 2 + Core/Tools/PATCHGET/COMINIT.H | 2 + Core/Tools/PATCHGET/DownloadManager.h | 1 + Core/Tools/PATCHGET/PROCESS.H | 2 + Core/Tools/PATCHGET/Registry.h | 1 + Core/Tools/PATCHGET/WINBLOWS.H | 2 + Core/Tools/PATCHGET/WSTYPES.H | 2 + Core/Tools/PATCHGET/debug.h | 2 + Core/Tools/W3DView/AddToLineupDialog.h | 2 + Core/Tools/W3DView/AdvancedAnimSheet.h | 2 + Core/Tools/W3DView/AggregateNameDialog.h | 2 + Core/Tools/W3DView/AmbientLightDialog.h | 2 + Core/Tools/W3DView/AnimMixingPage.h | 2 + Core/Tools/W3DView/AnimReportPage.h | 2 + .../W3DView/AnimatedSoundOptionsDialog.h | 2 + Core/Tools/W3DView/AnimationPropPage.h | 2 + Core/Tools/W3DView/AnimationSpeed.h | 2 + Core/Tools/W3DView/AssetInfo.h | 1 - Core/Tools/W3DView/AssetPropertySheet.h | 2 + Core/Tools/W3DView/AssetTypes.h | 1 - Core/Tools/W3DView/BackgroundBMPDialog.h | 2 + Core/Tools/W3DView/BackgroundColorDialog.h | 2 + Core/Tools/W3DView/BackgroundObjectDialog.h | 2 + Core/Tools/W3DView/BoneMgrDialog.h | 2 + Core/Tools/W3DView/CameraDistanceDialog.h | 1 + Core/Tools/W3DView/CameraSettingsDialog.h | 2 + Core/Tools/W3DView/ColorBar.h | 2 + Core/Tools/W3DView/ColorPicker.h | 2 + Core/Tools/W3DView/ColorPickerDialogClass.h | 2 + Core/Tools/W3DView/ColorSelectionDialog.h | 2 + Core/Tools/W3DView/ColorUtils.h | 2 + Core/Tools/W3DView/DataTreeView.h | 2 + Core/Tools/W3DView/DeviceSelectionDialog.h | 2 + Core/Tools/W3DView/DialogToolbar.h | 1 - Core/Tools/W3DView/DirectoryDialog.h | 1 - Core/Tools/W3DView/EditLODDialog.h | 2 + Core/Tools/W3DView/EmitterColorPropPage.h | 2 + Core/Tools/W3DView/EmitterFramePropPage.h | 2 + Core/Tools/W3DView/EmitterGeneralPropPage.h | 2 + Core/Tools/W3DView/EmitterInstanceList.h | 1 + Core/Tools/W3DView/EmitterLineGroupPropPage.h | 2 + Core/Tools/W3DView/EmitterLinePropPage.h | 2 + Core/Tools/W3DView/EmitterParticlePropPage.h | 2 + Core/Tools/W3DView/EmitterPhysicsPropPage.h | 2 + Core/Tools/W3DView/EmitterPropertySheet.h | 2 + Core/Tools/W3DView/EmitterRotationPropPage.h | 2 + Core/Tools/W3DView/EmitterSizePropPage.h | 2 + Core/Tools/W3DView/EmitterUserPropPage.h | 2 + Core/Tools/W3DView/GammaDialog.h | 2 + Core/Tools/W3DView/Globals.h | 1 + Core/Tools/W3DView/GraphicView.h | 2 + Core/Tools/W3DView/HierarchyPropPage.h | 2 + Core/Tools/W3DView/MainFrm.h | 1 + Core/Tools/W3DView/MeshPropPage.h | 2 + Core/Tools/W3DView/OpacitySettingsDialog.h | 2 + Core/Tools/W3DView/OpacityVectorDialog.h | 1 + .../Tools/W3DView/ParticleBlurTimeKeyDialog.h | 2 + Core/Tools/W3DView/ParticleFrameKeyDialog.h | 2 + .../Tools/W3DView/ParticleRotationKeyDialog.h | 2 + Core/Tools/W3DView/ParticleSizeDialog.h | 2 + Core/Tools/W3DView/PlaySoundDialog.h | 1 + Core/Tools/W3DView/ResolutionDialog.h | 1 + Core/Tools/W3DView/RestrictedFileDialog.h | 2 + Core/Tools/W3DView/RingColorPropPage.h | 2 + Core/Tools/W3DView/RingGeneralPropPage.h | 2 + Core/Tools/W3DView/RingPropertySheet.h | 2 +- Core/Tools/W3DView/RingSizePropPage.h | 2 + Core/Tools/W3DView/SaveSettingsDialog.h | 2 + Core/Tools/W3DView/ScaleDialog.h | 2 +- Core/Tools/W3DView/SceneLightDialog.h | 2 + Core/Tools/W3DView/ScreenCursor.h | 1 - Core/Tools/W3DView/SoundEditDialog.h | 2 +- Core/Tools/W3DView/SphereColorPropPage.h | 2 + Core/Tools/W3DView/SphereGeneralPropPage.h | 2 + Core/Tools/W3DView/SpherePropertySheet.h | 2 +- Core/Tools/W3DView/SphereSizePropPage.h | 2 + Core/Tools/W3DView/SphereUtils.h | 1 + Core/Tools/W3DView/StdAfx.h | 1 + Core/Tools/W3DView/TextureMgrDialog.h | 1 + Core/Tools/W3DView/TexturePathDialog.h | 2 + Core/Tools/W3DView/TextureSettingsDialog.h | 1 + Core/Tools/W3DView/Toolbar.h | 1 + Core/Tools/W3DView/Utils.h | 2 + Core/Tools/W3DView/Vector3RndCombo.H | 2 +- Core/Tools/W3DView/ViewerAssetMgr.h | 1 + Core/Tools/W3DView/ViewerScene.h | 1 - Core/Tools/W3DView/VolumeRandomDialog.h | 2 + Core/Tools/W3DView/W3DView.h | 1 + Core/Tools/W3DView/W3DViewDoc.h | 1 + Core/Tools/W3DView/W3DViewView.h | 1 + Core/Tools/WW3D/max2w3d/ExportAllDlg.h | 1 + Core/Tools/WW3D/max2w3d/FormClass.h | 2 +- Core/Tools/WW3D/max2w3d/GameMtlDlg.h | 4 +- Core/Tools/WW3D/max2w3d/GameMtlForm.h | 2 +- Core/Tools/WW3D/max2w3d/GameMtlPassDlg.h | 3 +- Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.h | 2 +- Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.h | 4 +- .../WW3D/max2w3d/GameMtlVertexMaterialDlg.h | 2 +- Core/Tools/WW3D/max2w3d/InputDlg.h | 2 +- Core/Tools/WW3D/max2w3d/LightGlareSave.h | 1 + Core/Tools/WW3D/max2w3d/MeshDeform.h | 1 + Core/Tools/WW3D/max2w3d/MeshDeformData.h | 2 + Core/Tools/WW3D/max2w3d/MeshDeformDefs.h | 2 + Core/Tools/WW3D/max2w3d/MeshDeformPanel.h | 1 + Core/Tools/WW3D/max2w3d/MeshDeformSave.h | 2 + Core/Tools/WW3D/max2w3d/MeshDeformSaveDefs.h | 2 + Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.h | 2 + Core/Tools/WW3D/max2w3d/MeshDeformSet.h | 1 + Core/Tools/WW3D/max2w3d/MeshDeformUndo.h | 2 + Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.h | 1 + Core/Tools/WW3D/max2w3d/SceneSetupDlg.h | 1 + Core/Tools/WW3D/max2w3d/SnapPoints.h | 2 +- Core/Tools/WW3D/max2w3d/TARGA.H | 2 + Core/Tools/WW3D/max2w3d/aabtreebuilder.h | 2 +- .../max2w3d/animationcompressionsettings.h | 1 + Core/Tools/WW3D/max2w3d/bchannel.h | 1 + Core/Tools/WW3D/max2w3d/boneicon.h | 1 + Core/Tools/WW3D/max2w3d/bpick.h | 1 + Core/Tools/WW3D/max2w3d/colboxsave.h | 2 +- Core/Tools/WW3D/max2w3d/dazzlesave.h | 1 + Core/Tools/WW3D/max2w3d/dllmain.h | 1 + Core/Tools/WW3D/max2w3d/exportlog.h | 1 + Core/Tools/WW3D/max2w3d/floaterdialog.h | 1 + Core/Tools/WW3D/max2w3d/gamemaps.h | 1 + Core/Tools/WW3D/max2w3d/gamemtl.h | 1 + .../WW3D/max2w3d/genlodextensiondialog.h | 2 + Core/Tools/WW3D/max2w3d/genmtlnamesdialog.h | 2 + .../WW3D/max2w3d/geometryexportcontext.h | 1 + Core/Tools/WW3D/max2w3d/geometryexporttask.h | 2 + Core/Tools/WW3D/max2w3d/gridsnapmodifier.h | 2 + Core/Tools/WW3D/max2w3d/hiersave.h | 2 + Core/Tools/WW3D/max2w3d/hlodsave.h | 1 + Core/Tools/WW3D/max2w3d/logdlg.h | 1 + Core/Tools/WW3D/max2w3d/maxworldinfo.h | 1 + Core/Tools/WW3D/max2w3d/meshbuild.h | 1 + Core/Tools/WW3D/max2w3d/meshsave.h | 1 + Core/Tools/WW3D/max2w3d/namedsel.h | 1 + Core/Tools/WW3D/max2w3d/nullsave.h | 1 - .../WW3D/max2w3d/presetexportoptionsdialog.h | 1 + Core/Tools/WW3D/max2w3d/rcmenu.h | 2 + Core/Tools/WW3D/max2w3d/simpdib.h | 2 + Core/Tools/WW3D/max2w3d/skin.h | 1 + Core/Tools/WW3D/max2w3d/skindata.h | 1 + Core/Tools/WW3D/max2w3d/util.h | 1 + Core/Tools/WW3D/max2w3d/vchannel.h | 1 + Core/Tools/WW3D/max2w3d/vxl.h | 1 + Core/Tools/WW3D/max2w3d/vxldbg.h | 1 + Core/Tools/WW3D/max2w3d/vxllayer.h | 1 + Core/Tools/WW3D/max2w3d/w3d_file.h | 2 +- Core/Tools/WW3D/max2w3d/w3d_obsolete.h | 1 - Core/Tools/WW3D/max2w3d/w3dappdata.h | 2 + Core/Tools/WW3D/max2w3d/w3ddesc.h | 2 + Core/Tools/WW3D/max2w3d/w3ddlg.h | 1 + Core/Tools/WW3D/max2w3d/w3dexp.h | 2 + Core/Tools/WW3D/max2w3d/w3dmtl.h | 1 + Core/Tools/WW3D/max2w3d/w3dutil.h | 1 + Core/Tools/WW3D/pluglib/BITTYPE.H | 2 + Core/Tools/WW3D/pluglib/EULER.H | 1 + Core/Tools/WW3D/pluglib/PROGRESS.H | 2 + Core/Tools/WW3D/pluglib/Vector.H | 2 + Core/Tools/WW3D/pluglib/WWmatrix3.h | 2 +- Core/Tools/WW3D/pluglib/aaplane.h | 1 + Core/Tools/WW3D/pluglib/always.h | 2 + Core/Tools/WW3D/pluglib/bool.h | 1 + Core/Tools/WW3D/pluglib/borlandc.h | 1 + Core/Tools/WW3D/pluglib/chunkio.h | 2 + Core/Tools/WW3D/pluglib/errclass.h | 2 + Core/Tools/WW3D/pluglib/hashcalc.h | 2 +- Core/Tools/WW3D/pluglib/hsv.h | 2 + Core/Tools/WW3D/pluglib/iostruct.h | 4 +- Core/Tools/WW3D/pluglib/matrix3d.h | 1 + Core/Tools/WW3D/pluglib/matrix4.h | 2 +- Core/Tools/WW3D/pluglib/nodefilt.h | 1 + Core/Tools/WW3D/pluglib/nodelist.h | 1 + Core/Tools/WW3D/pluglib/noinit.h | 2 + Core/Tools/WW3D/pluglib/palette.h | 2 + Core/Tools/WW3D/pluglib/plane.h | 2 + Core/Tools/WW3D/pluglib/rawfile.h | 2 + Core/Tools/WW3D/pluglib/realcrc.h | 1 + Core/Tools/WW3D/pluglib/rgb.h | 2 + Core/Tools/WW3D/pluglib/uarray.h | 2 + Core/Tools/WW3D/pluglib/vector2.h | 1 + Core/Tools/WW3D/pluglib/vector3.h | 1 + Core/Tools/WW3D/pluglib/vector3i.h | 2 +- Core/Tools/WW3D/pluglib/vector4.h | 1 + Core/Tools/WW3D/pluglib/visualc.h | 1 + Core/Tools/WW3D/pluglib/w3d_file.h | 1 + Core/Tools/WW3D/pluglib/w3dquat.h | 1 + Core/Tools/WW3D/pluglib/watcom.h | 1 + Core/Tools/WW3D/pluglib/win.h | 2 + Core/Tools/WW3D/pluglib/wwfile.h | 2 + Core/Tools/WW3D/pluglib/wwmath.h | 2 +- Core/Tools/mangler/crc.h | 2 + Core/Tools/mangler/endian.h | 2 +- Core/Tools/mangler/mangler.h | 2 + Core/Tools/mangler/wlib/arraylist.h | 2 + Core/Tools/mangler/wlib/configfile.h | 2 + Core/Tools/mangler/wlib/critsec.h | 2 + Core/Tools/mangler/wlib/filed.h | 2 + Core/Tools/mangler/wlib/linkedlist.h | 2 + Core/Tools/mangler/wlib/mboxd.h | 2 + Core/Tools/mangler/wlib/monod.h | 1 + Core/Tools/mangler/wlib/odevice.h | 2 + Core/Tools/mangler/wlib/sem4.h | 2 + Core/Tools/mangler/wlib/stderrd.h | 2 + Core/Tools/mangler/wlib/stdoutd.h | 2 + Core/Tools/mangler/wlib/streamer.h | 2 + Core/Tools/mangler/wlib/syslogd.h | 2 + Core/Tools/mangler/wlib/threadfac.h | 2 + Core/Tools/mangler/wlib/threadsafe.h | 2 + Core/Tools/mangler/wlib/timezone.h | 2 + Core/Tools/mangler/wlib/ustring.h | 2 + Core/Tools/mangler/wlib/wdebug.h | 2 + Core/Tools/mangler/wlib/wstring.h | 2 + Core/Tools/mangler/wlib/wstypes.h | 2 + Core/Tools/mangler/wlib/wtime.h | 1 + Core/Tools/mangler/wlib/xtime.h | 1 + Core/Tools/mangler/wnet/tcp.h | 2 + Core/Tools/mangler/wnet/udp.h | 2 + Core/Tools/matchbot/debug.h | 2 + Core/Tools/matchbot/encrypt.h | 2 + Core/Tools/matchbot/generals.h | 2 + Core/Tools/matchbot/global.h | 2 + Core/Tools/matchbot/matcher.h | 2 + Core/Tools/matchbot/mydebug.h | 2 + Core/Tools/matchbot/rand.h | 2 + Core/Tools/matchbot/wlib/arraylist.h | 2 + Core/Tools/matchbot/wlib/configfile.h | 2 + Core/Tools/matchbot/wlib/critsec.h | 2 + Core/Tools/matchbot/wlib/filed.h | 2 + Core/Tools/matchbot/wlib/linkedlist.h | 2 + Core/Tools/matchbot/wlib/mboxd.h | 2 + Core/Tools/matchbot/wlib/monod.h | 1 + Core/Tools/matchbot/wlib/odevice.h | 2 + Core/Tools/matchbot/wlib/sem4.h | 2 + Core/Tools/matchbot/wlib/stderrd.h | 2 + Core/Tools/matchbot/wlib/stdoutd.h | 2 + Core/Tools/matchbot/wlib/streamer.h | 2 + Core/Tools/matchbot/wlib/syslogd.h | 2 + Core/Tools/matchbot/wlib/threadfac.h | 2 + Core/Tools/matchbot/wlib/threadsafe.h | 2 + Core/Tools/matchbot/wlib/timezone.h | 2 + Core/Tools/matchbot/wlib/ustring.h | 2 + Core/Tools/matchbot/wlib/wdebug.h | 2 + Core/Tools/matchbot/wlib/wstring.h | 2 + Core/Tools/matchbot/wlib/wstypes.h | 2 + Core/Tools/matchbot/wlib/wtime.h | 1 + Core/Tools/matchbot/wlib/xtime.h | 1 + Core/Tools/matchbot/wnet/tcp.h | 2 + Core/Tools/matchbot/wnet/udp.h | 2 + Core/Tools/timingTest/StdAfx.h | 1 + Core/Tools/wolSetup/StdAfx.h | 1 + Core/Tools/wolSetup/WOLAPI/chatdefs.h | 2 + Core/Tools/wolSetup/WOLAPI/downloaddefs.h | 2 + Core/Tools/wolSetup/WOLAPI/ftpdefs.h | 1 + Core/Tools/wolSetup/WOLAPI/netutildefs.h | 1 + Core/Tools/wolSetup/verchk.h | 2 + Core/Tools/wolSetup/wolSetup.h | 2 + .../GameEngine/Include/Common/ActionManager.h | 1 + .../GameEngine/Include/Common/BattleHonors.h | 1 + .../GameEngine/Include/Common/BezierSegment.h | 1 + .../Code/GameEngine/Include/Common/BitFlags.h | 1 + .../GameEngine/Include/Common/BitFlagsIO.h | 1 + .../GameEngine/Include/Common/BorderColors.h | 1 + .../Include/Common/BuildAssistant.h | 1 + .../Include/Common/ClientUpdateModule.h | 1 + .../GameEngine/Include/Common/CommandLine.h | 1 + .../Include/Common/CriticalSection.h | 1 + .../Include/Common/CustomMatchPreferences.h | 1 + .../Code/GameEngine/Include/Common/DamageFX.h | 1 + .../GameEngine/Include/Common/DataChunk.h | 1 + .../Code/GameEngine/Include/Common/Dict.h | 1 + .../GameEngine/Include/Common/Directory.h | 2 + .../GameEngine/Include/Common/DisabledTypes.h | 1 + .../Include/Common/DiscreteCircle.h | 1 + .../GameEngine/Include/Common/DrawModule.h | 1 + .../Code/GameEngine/Include/Common/Energy.h | 1 + .../Code/GameEngine/Include/Common/Errors.h | 1 + .../Include/Common/FunctionLexicon.h | 1 + .../GameEngine/Include/Common/GameCommon.h | 1 + .../GameEngine/Include/Common/GameEngine.h | 1 + .../Code/GameEngine/Include/Common/GameLOD.h | 1 + .../Include/Common/GameSpyMiscPreferences.h | 1 + .../GameEngine/Include/Common/GameState.h | 1 + .../GameEngine/Include/Common/GameStateMap.h | 1 + .../Code/GameEngine/Include/Common/GameType.h | 1 + .../Code/GameEngine/Include/Common/Geometry.h | 1 + .../GameEngine/Include/Common/GlobalData.h | 1 + .../Code/GameEngine/Include/Common/Handicap.h | 1 + Generals/Code/GameEngine/Include/Common/INI.h | 1 + .../Include/Common/IgnorePreferences.h | 1 + .../Code/GameEngine/Include/Common/KindOf.h | 1 + .../Include/Common/LadderPreferences.h | 1 + .../Code/GameEngine/Include/Common/Language.h | 1 + .../GameEngine/Include/Common/LatchRestore.h | 1 + .../GameEngine/Include/Common/MapObject.h | 1 + .../Include/Common/MapReaderWriterInfo.h | 1 + .../GameEngine/Include/Common/MessageStream.h | 1 + .../GameEngine/Include/Common/MissionStats.h | 1 + .../GameEngine/Include/Common/ModelState.h | 1 + .../Code/GameEngine/Include/Common/Module.h | 1 + .../GameEngine/Include/Common/ModuleFactory.h | 1 + .../Code/GameEngine/Include/Common/Money.h | 1 + .../Include/Common/MultiplayerSettings.h | 1 + .../Include/Common/NameKeyGenerator.h | 1 + .../GameEngine/Include/Common/OSDisplay.h | 1 + .../Include/Common/ObjectStatusTypes.h | 1 + .../GameEngine/Include/Common/Overridable.h | 1 + .../Code/GameEngine/Include/Common/Override.h | 1 + .../Include/Common/PartitionSolver.h | 1 + .../GameEngine/Include/Common/PerfMetrics.h | 1 + .../GameEngine/Include/Common/PerfTimer.h | 1 + .../Code/GameEngine/Include/Common/Player.h | 1 + .../GameEngine/Include/Common/PlayerList.h | 1 + .../Include/Common/PlayerTemplate.h | 1 + .../Include/Common/ProductionPrerequisite.h | 1 + .../Include/Common/QuickmatchPreferences.h | 1 + .../Include/Common/QuotedPrintable.h | 1 + .../Code/GameEngine/Include/Common/Radar.h | 1 + .../Code/GameEngine/Include/Common/Recorder.h | 1 - .../Code/GameEngine/Include/Common/Registry.h | 1 + .../Include/Common/ResourceGatheringManager.h | 1 + .../GameEngine/Include/Common/STLTypedefs.h | 1 + .../Code/GameEngine/Include/Common/Science.h | 1 + .../GameEngine/Include/Common/ScopedMutex.h | 1 + .../GameEngine/Include/Common/ScoreKeeper.h | 1 + .../Include/Common/SkirmishBattleHonors.h | 1 + .../Include/Common/SkirmishPreferences.h | 1 + .../Code/GameEngine/Include/Common/Snapshot.h | 1 + .../Include/Common/SparseMatchFinder.h | 1 + .../GameEngine/Include/Common/SpecialPower.h | 1 + .../Include/Common/SpecialPowerMaskType.h | 1 + .../Include/Common/SpecialPowerType.h | 1 + .../GameEngine/Include/Common/StackDump.h | 1 + .../GameEngine/Include/Common/StateMachine.h | 1 + .../Include/Common/StatsCollector.h | 1 + .../Include/Common/SubsystemInterface.h | 1 + .../GameEngine/Include/Common/SystemInfo.h | 1 + .../Code/GameEngine/Include/Common/Team.h | 1 + .../Code/GameEngine/Include/Common/Terrain.h | 1 + .../GameEngine/Include/Common/TerrainTypes.h | 1 + .../Code/GameEngine/Include/Common/Thing.h | 1 + .../GameEngine/Include/Common/ThingFactory.h | 1 + .../GameEngine/Include/Common/ThingSort.h | 1 + .../GameEngine/Include/Common/ThingTemplate.h | 1 + .../GameEngine/Include/Common/TunnelTracker.h | 1 + .../Code/GameEngine/Include/Common/Upgrade.h | 1 + .../Include/Common/UserPreferences.h | 1 + .../GameEngine/Include/Common/WellKnownKeys.h | 1 + .../Code/GameEngine/Include/Common/encrypt.h | 1 + .../Code/GameEngine/Include/Common/version.h | 1 + .../GameEngine/Include/GameClient/Anim2D.h | 1 + .../Include/GameClient/AnimateWindowManager.h | 1 + .../GameEngine/Include/GameClient/CDCheck.h | 1 + .../Include/GameClient/CampaignManager.h | 1 + .../GameEngine/Include/GameClient/Color.h | 1 + .../Include/GameClient/CommandXlat.h | 1 + .../Include/GameClient/ControlBar.h | 1 + .../Include/GameClient/ControlBarResizer.h | 1 + .../Include/GameClient/ControlBarScheme.h | 1 + .../GameEngine/Include/GameClient/Credits.h | 1 + .../GameEngine/Include/GameClient/Diplomacy.h | 1 + .../Include/GameClient/DisconnectMenu.h | 2 +- .../GameEngine/Include/GameClient/Display.h | 1 + .../Include/GameClient/DisplayString.h | 1 + .../Include/GameClient/DisplayStringManager.h | 1 + .../Include/GameClient/DrawGroupInfo.h | 1 + .../GameEngine/Include/GameClient/Drawable.h | 1 + .../Include/GameClient/DrawableInfo.h | 1 + .../Code/GameEngine/Include/GameClient/Eva.h | 1 + .../Include/GameClient/ExtendedMessageBox.h | 1 + .../GameEngine/Include/GameClient/FXList.h | 1 + .../GameEngine/Include/GameClient/FontDesc.h | 1 + .../Include/GameClient/GUICallbacks.h | 1 + .../Include/GameClient/GUICommandTranslator.h | 1 + .../GameEngine/Include/GameClient/Gadget.h | 1 + .../Include/GameClient/GadgetCheckBox.h | 1 + .../Include/GameClient/GadgetComboBox.h | 1 + .../Include/GameClient/GadgetListBox.h | 1 + .../Include/GameClient/GadgetProgressBar.h | 1 + .../Include/GameClient/GadgetPushButton.h | 1 + .../Include/GameClient/GadgetRadioButton.h | 1 + .../Include/GameClient/GadgetSlider.h | 1 + .../Include/GameClient/GadgetStaticText.h | 1 + .../Include/GameClient/GadgetTabControl.h | 1 + .../Include/GameClient/GadgetTextEntry.h | 1 + .../Include/GameClient/GameClient.h | 1 + .../GameEngine/Include/GameClient/GameFont.h | 1 + .../Include/GameClient/GameInfoWindow.h | 1 + .../Include/GameClient/GameWindow.h | 1 + .../Include/GameClient/GameWindowGlobal.h | 1 + .../Include/GameClient/GameWindowID.h | 1 + .../GameClient/GameWindowTransitions.h | 1 + .../Include/GameClient/GlobalLanguage.h | 1 + .../GameEngine/Include/GameClient/GraphDraw.h | 1 + .../Include/GameClient/HeaderTemplate.h | 1 + .../GameEngine/Include/GameClient/HintSpy.h | 1 + .../GameEngine/Include/GameClient/HotKey.h | 1 + .../GameEngine/Include/GameClient/Image.h | 1 + .../GameEngine/Include/GameClient/InGameUI.h | 1 + .../GameEngine/Include/GameClient/KeyDefs.h | 1 + .../GameEngine/Include/GameClient/Keyboard.h | 1 + .../Include/GameClient/LanguageFilter.h | 2 +- .../GameEngine/Include/GameClient/Line2D.h | 1 + .../Include/GameClient/LoadScreen.h | 1 + .../Include/GameClient/LookAtXlat.h | 1 + .../GameEngine/Include/GameClient/MapUtil.h | 1 + .../Include/GameClient/MessageBox.h | 1 + .../GameEngine/Include/GameClient/MetaEvent.h | 1 + .../AnimatedParticleSysBoneClientUpdate.h | 1 + .../GameClient/Module/BeaconClientUpdate.h | 1 + .../GameClient/Module/SwayClientUpdate.h | 1 + .../GameEngine/Include/GameClient/Mouse.h | 1 + .../Include/GameClient/ParticleSys.h | 1 + .../Include/GameClient/PlaceEventTranslator.h | 1 + .../Include/GameClient/ProcessAnimateWindow.h | 1 + .../Include/GameClient/RadiusDecal.h | 1 + .../GameEngine/Include/GameClient/RayEffect.h | 1 + .../Include/GameClient/SelectionInfo.h | 1 + .../Include/GameClient/SelectionXlat.h | 1 + .../GameEngine/Include/GameClient/Shadow.h | 1 + .../GameEngine/Include/GameClient/Shell.h | 1 + .../Include/GameClient/ShellHooks.h | 1 + .../Include/GameClient/ShellMenuScheme.h | 1 + .../Include/GameClient/Statistics.h | 1 + .../Include/GameClient/TerrainRoads.h | 1 + .../Include/GameClient/TerrainVisual.h | 1 + .../Code/GameEngine/Include/GameClient/View.h | 1 + .../GameEngine/Include/GameClient/Water.h | 1 + .../Include/GameClient/WinInstanceData.h | 1 + .../Include/GameClient/WindowLayout.h | 1 + .../Include/GameClient/WindowXlat.h | 1 + .../Code/GameEngine/Include/GameLogic/AI.h | 1 + .../GameEngine/Include/GameLogic/AIDock.h | 1 + .../GameEngine/Include/GameLogic/AIGuard.h | 1 + .../GameEngine/Include/GameLogic/AIPathfind.h | 1 + .../GameEngine/Include/GameLogic/AIPlayer.h | 1 + .../Include/GameLogic/AISkirmishPlayer.h | 1 + .../Include/GameLogic/AIStateMachine.h | 1 + .../GameEngine/Include/GameLogic/AITNGuard.h | 1 + .../Code/GameEngine/Include/GameLogic/Armor.h | 1 + .../GameEngine/Include/GameLogic/ArmorSet.h | 1 + .../GameEngine/Include/GameLogic/CaveSystem.h | 1 + .../Include/GameLogic/CrateSystem.h | 1 + .../GameEngine/Include/GameLogic/Damage.h | 1 + .../Include/GameLogic/ExperienceTracker.h | 1 + .../GameEngine/Include/GameLogic/FPUControl.h | 1 + .../Include/GameLogic/FiringTracker.h | 1 + .../GameEngine/Include/GameLogic/GameLogic.h | 1 + .../Include/GameLogic/GhostObject.h | 1 + .../GameEngine/Include/GameLogic/Locomotor.h | 1 + .../Include/GameLogic/LocomotorSet.h | 1 + .../Include/GameLogic/Module/AIUpdate.h | 1 + .../Include/GameLogic/Module/ActiveBody.h | 1 + .../GameLogic/Module/ActiveShroudUpgrade.h | 1 + .../Include/GameLogic/Module/ArmorUpgrade.h | 1 + .../Module/AssaultTransportAIUpdate.h | 1 + .../Module/AssistedTargetingUpdate.h | 1 + .../GameLogic/Module/AutoDepositUpdate.h | 1 + .../GameLogic/Module/AutoFindHealingUpdate.h | 1 + .../GameLogic/Module/AutoHealBehavior.h | 1 + .../GameLogic/Module/BaikonurLaunchPower.h | 1 + .../GameLogic/Module/BaseRegenerateUpdate.h | 1 + .../GameLogic/Module/BattlePlanUpdate.h | 1 + .../Include/GameLogic/Module/BehaviorModule.h | 1 + .../Include/GameLogic/Module/BodyModule.h | 1 + .../Include/GameLogic/Module/BoneFXDamage.h | 1 + .../Include/GameLogic/Module/BoneFXUpdate.h | 1 + .../Include/GameLogic/Module/BridgeBehavior.h | 1 + .../GameLogic/Module/BridgeScaffoldBehavior.h | 1 + .../GameLogic/Module/BridgeTowerBehavior.h | 1 + .../GameLogic/Module/CashBountyPower.h | 1 + .../GameLogic/Module/CashHackSpecialPower.h | 1 + .../Include/GameLogic/Module/CaveContain.h | 1 + .../GameLogic/Module/CheckpointUpdate.h | 1 + .../GameLogic/Module/ChinookAIUpdate.h | 1 + .../GameLogic/Module/CleanupAreaPower.h | 1 + .../GameLogic/Module/CleanupHazardUpdate.h | 1 + .../Include/GameLogic/Module/CollideModule.h | 1 + .../Module/CommandButtonHuntUpdate.h | 1 + .../GameLogic/Module/CommandSetUpgrade.h | 1 + .../Include/GameLogic/Module/ContainModule.h | 1 + .../Module/ConvertToCarBombCrateCollide.h | 1 + .../ConvertToHijackedVehicleCrateCollide.h | 1 + .../GameLogic/Module/CostModifierUpgrade.h | 1 + .../Include/GameLogic/Module/CrateCollide.h | 1 + .../Include/GameLogic/Module/CreateCrateDie.h | 1 + .../Include/GameLogic/Module/CreateModule.h | 1 + .../GameLogic/Module/CreateObjectDie.h | 1 + .../Include/GameLogic/Module/CrushDie.h | 1 + .../Include/GameLogic/Module/DamDie.h | 1 + .../Include/GameLogic/Module/DamageModule.h | 1 + .../Module/DefaultProductionExitUpdate.h | 1 + .../GameLogic/Module/DefectorSpecialPower.h | 1 + .../Include/GameLogic/Module/DelayedUpgrade.h | 1 + .../Module/DelayedWeaponSetUpgradeUpdate.h | 1 + .../Include/GameLogic/Module/DeletionUpdate.h | 1 + .../GameLogic/Module/DeliverPayloadAIUpdate.h | 1 + .../Include/GameLogic/Module/DemoTrapUpdate.h | 1 + .../GameLogic/Module/DemoralizeSpecialPower.h | 1 + .../GameLogic/Module/DeployStyleAIUpdate.h | 1 + .../Include/GameLogic/Module/DestroyDie.h | 1 + .../Include/GameLogic/Module/DestroyModule.h | 1 + .../Include/GameLogic/Module/DieModule.h | 1 + .../Include/GameLogic/Module/DockUpdate.h | 1 + .../Include/GameLogic/Module/DozerAIUpdate.h | 1 + .../GameLogic/Module/DumbProjectileBehavior.h | 1 + .../Module/DynamicGeometryInfoUpdate.h | 1 + .../Module/DynamicShroudClearingRangeUpdate.h | 1 + .../Include/GameLogic/Module/EMPUpdate.h | 1 + .../Include/GameLogic/Module/EjectPilotDie.h | 1 + .../GameLogic/Module/EnemyNearUpdate.h | 1 + .../Module/ExperienceScalarUpgrade.h | 1 + .../Include/GameLogic/Module/FXListDie.h | 1 + .../Module/FireOCLAfterWeaponCooldownUpdate.h | 1 + .../GameLogic/Module/FireSpreadUpdate.h | 1 + .../GameLogic/Module/FireWeaponCollide.h | 1 + .../GameLogic/Module/FireWeaponUpdate.h | 1 + .../Module/FireWeaponWhenDamagedBehavior.h | 1 + .../Module/FireWeaponWhenDeadBehavior.h | 1 + .../FirestormDynamicGeometryInfoUpdate.h | 1 + .../GameLogic/Module/FlammableUpdate.h | 1 + .../Include/GameLogic/Module/FloatUpdate.h | 1 + .../GameLogic/Module/GarrisonContain.h | 1 + .../Module/GenerateMinefieldBehavior.h | 1 + .../GameLogic/Module/GrantUpgradeCreate.h | 1 + .../GameLogic/Module/HackInternetAIUpdate.h | 1 + .../Include/GameLogic/Module/HealContain.h | 1 + .../GameLogic/Module/HealCrateCollide.h | 1 + .../GameLogic/Module/HeightDieUpdate.h | 1 + .../Module/HelicopterSlowDeathUpdate.h | 1 + .../Include/GameLogic/Module/HighlanderBody.h | 1 + .../Include/GameLogic/Module/HijackerUpdate.h | 1 + .../GameLogic/Module/HiveStructureBody.h | 1 + .../Include/GameLogic/Module/HordeUpdate.h | 1 + .../Include/GameLogic/Module/ImmortalBody.h | 1 + .../Include/GameLogic/Module/InactiveBody.h | 1 + .../GameLogic/Module/InstantDeathBehavior.h | 1 + .../Include/GameLogic/Module/JetAIUpdate.h | 1 + .../GameLogic/Module/JetSlowDeathBehavior.h | 1 + .../Include/GameLogic/Module/KeepObjectDie.h | 1 + .../Include/GameLogic/Module/LaserUpdate.h | 1 + .../Include/GameLogic/Module/LifetimeUpdate.h | 1 + .../GameLogic/Module/LocomotorSetUpgrade.h | 1 + .../GameLogic/Module/MaxHealthUpgrade.h | 1 + .../GameLogic/Module/MinefieldBehavior.h | 1 + .../GameLogic/Module/MissileAIUpdate.h | 1 + .../Module/MissileLauncherBuildingUpdate.h | 1 + .../GameLogic/Module/MobMemberSlavedUpdate.h | 1 + .../GameLogic/Module/MobNexusContain.h | 1 + .../GameLogic/Module/MoneyCrateCollide.h | 1 + .../Module/NeutronMissileSlowDeathUpdate.h | 1 + .../GameLogic/Module/NeutronMissileUpdate.h | 1 + .../GameLogic/Module/OCLSpecialPower.h | 1 + .../Include/GameLogic/Module/OCLUpdate.h | 1 + .../GameLogic/Module/ObjectCreationUpgrade.h | 1 + .../GameLogic/Module/ObjectDefectionHelper.h | 1 + .../Include/GameLogic/Module/ObjectHelper.h | 1 + .../GameLogic/Module/ObjectRepulsorHelper.h | 1 + .../GameLogic/Module/ObjectSMCHelper.h | 1 + .../Module/ObjectWeaponStatusHelper.h | 1 + .../Include/GameLogic/Module/OpenContain.h | 1 + .../GameLogic/Module/OverchargeBehavior.h | 1 + .../GameLogic/Module/OverlordContain.h | 1 + .../GameLogic/Module/POWTruckAIUpdate.h | 1 + .../GameLogic/Module/POWTruckBehavior.h | 1 + .../GameLogic/Module/ParachuteContain.h | 1 + .../GameLogic/Module/ParkingPlaceBehavior.h | 1 + .../Module/ParticleUplinkCannonUpdate.h | 1 + .../Include/GameLogic/Module/PhysicsUpdate.h | 1 + .../GameLogic/Module/PilotFindVehicleUpdate.h | 1 + .../Module/PointDefenseLaserUpdate.h | 1 + .../GameLogic/Module/PoisonedBehavior.h | 1 + .../GameLogic/Module/PowerPlantUpdate.h | 1 + .../GameLogic/Module/PowerPlantUpgrade.h | 1 + .../Include/GameLogic/Module/PreorderCreate.h | 1 + .../Include/GameLogic/Module/PrisonBehavior.h | 2 + .../GameLogic/Module/PrisonDockUpdate.h | 1 + .../GameLogic/Module/ProductionUpdate.h | 1 + .../GameLogic/Module/ProjectileStreamUpdate.h | 1 + .../Include/GameLogic/Module/ProneUpdate.h | 1 + .../Module/PropagandaCenterBehavior.h | 2 + .../Module/PropagandaTowerBehavior.h | 1 + .../Module/QueueProductionExitUpdate.h | 1 + .../Include/GameLogic/Module/RadarUpdate.h | 1 + .../Include/GameLogic/Module/RadarUpgrade.h | 1 + .../GameLogic/Module/RadiusDecalUpdate.h | 1 + .../Module/RailedTransportAIUpdate.h | 1 + .../GameLogic/Module/RailedTransportContain.h | 1 + .../Module/RailedTransportDockUpdate.h | 2 + .../GameLogic/Module/RailroadGuideAIUpdate.h | 1 + .../GameLogic/Module/RebuildHoleBehavior.h | 1 + .../GameLogic/Module/RebuildHoleExposeDie.h | 1 + .../GameLogic/Module/RepairDockUpdate.h | 1 + .../GameLogic/Module/SalvageCrateCollide.h | 1 + .../GameLogic/Module/ShroudCrateCollide.h | 1 + .../Include/GameLogic/Module/SlavedUpdate.h | 2 + .../GameLogic/Module/SlowDeathBehavior.h | 1 + .../Include/GameLogic/Module/SpawnBehavior.h | 1 + .../Module/SpawnPointProductionExitUpdate.h | 1 + .../Include/GameLogic/Module/SpecialAbility.h | 1 + .../GameLogic/Module/SpecialAbilityUpdate.h | 1 + .../Module/SpecialPowerCompletionDie.h | 1 + .../GameLogic/Module/SpecialPowerCreate.h | 1 + .../GameLogic/Module/SpecialPowerModule.h | 1 + .../Module/SpecialPowerUpdateModule.h | 1 + .../GameLogic/Module/SpyVisionSpecialPower.h | 1 + .../GameLogic/Module/SpyVisionUpdate.h | 1 + .../Include/GameLogic/Module/SquishCollide.h | 1 + .../GameLogic/Module/StatusBitsUpgrade.h | 1 + .../GameLogic/Module/StealthDetectorUpdate.h | 1 + .../Include/GameLogic/Module/StealthUpdate.h | 1 + .../Include/GameLogic/Module/StealthUpgrade.h | 1 + .../GameLogic/Module/StickyBombUpdate.h | 1 + .../Include/GameLogic/Module/StructureBody.h | 1 + .../Module/StructureCollapseUpdate.h | 1 + .../GameLogic/Module/StructureToppleUpdate.h | 1 + .../GameLogic/Module/SubObjectsUpgrade.h | 1 + .../GameLogic/Module/SupplyCenterCreate.h | 1 + .../GameLogic/Module/SupplyCenterDockUpdate.h | 1 + .../Module/SupplyCenterProductionExitUpdate.h | 1 + .../GameLogic/Module/SupplyTruckAIUpdate.h | 1 + .../GameLogic/Module/SupplyWarehouseCreate.h | 1 + .../Module/SupplyWarehouseCripplingBehavior.h | 1 + .../Module/SupplyWarehouseDockUpdate.h | 1 + .../GameLogic/Module/TechBuildingBehavior.h | 1 + .../GameLogic/Module/TensileFormationUpdate.h | 1 + .../Include/GameLogic/Module/ToppleUpdate.h | 1 + .../GameLogic/Module/TransitionDamageFX.h | 1 + .../GameLogic/Module/TransportAIUpdate.h | 1 + .../GameLogic/Module/TransportContain.h | 1 + .../Include/GameLogic/Module/TunnelContain.h | 1 + .../GameLogic/Module/UnitCrateCollide.h | 1 + .../Module/UnpauseSpecialPowerUpgrade.h | 1 + .../Include/GameLogic/Module/UpdateModule.h | 1 + .../Include/GameLogic/Module/UpgradeDie.h | 1 + .../Include/GameLogic/Module/UpgradeModule.h | 1 + .../GameLogic/Module/VeterancyCrateCollide.h | 1 + .../GameLogic/Module/VeterancyGainCreate.h | 1 + .../Include/GameLogic/Module/WanderAIUpdate.h | 1 + .../GameLogic/Module/WaveGuideUpdate.h | 1 + .../GameLogic/Module/WeaponBonusUpgrade.h | 1 + .../GameLogic/Module/WeaponSetUpgrade.h | 1 + .../Include/GameLogic/Module/WorkerAIUpdate.h | 1 + .../GameEngine/Include/GameLogic/Object.h | 1 + .../Include/GameLogic/ObjectCreationList.h | 1 + .../GameEngine/Include/GameLogic/ObjectIter.h | 1 + .../GameLogic/ObjectScriptStatusBits.h | 1 + .../Include/GameLogic/ObjectTypes.h | 1 + .../Include/GameLogic/PartitionManager.h | 1 + .../Include/GameLogic/PolygonTrigger.h | 1 + .../GameEngine/Include/GameLogic/Powers.h | 1 + .../GameEngine/Include/GameLogic/RankInfo.h | 1 + .../Include/GameLogic/ScriptActions.h | 1 + .../Include/GameLogic/ScriptConditions.h | 1 + .../Include/GameLogic/ScriptEngine.h | 1 + .../GameEngine/Include/GameLogic/Scripts.h | 1 + .../GameEngine/Include/GameLogic/SidesList.h | 1 + .../Code/GameEngine/Include/GameLogic/Squad.h | 1 + .../Include/GameLogic/TerrainLogic.h | 1 + .../GameEngine/Include/GameLogic/TurretAI.h | 1 + .../Include/GameLogic/VictoryConditions.h | 1 + .../GameEngine/Include/GameLogic/Weapon.h | 1 + .../GameLogic/WeaponBonusConditionFlags.h | 1 + .../GameEngine/Include/GameLogic/WeaponSet.h | 1 + .../Include/GameLogic/WeaponSetFlags.h | 1 + .../Include/GameLogic/WeaponSetType.h | 1 + .../Include/GameLogic/WeaponStatus.h | 1 + .../Include/GameNetwork/Connection.h | 1 + .../Include/GameNetwork/ConnectionManager.h | 1 + .../Include/GameNetwork/DisconnectManager.h | 2 +- .../Include/GameNetwork/DownloadManager.h | 1 + .../Include/GameNetwork/FileTransfer.h | 1 + .../Include/GameNetwork/FirewallHelper.h | 1 + .../Include/GameNetwork/FrameData.h | 2 +- .../Include/GameNetwork/FrameDataManager.h | 2 +- .../Include/GameNetwork/FrameMetrics.h | 1 + .../GameEngine/Include/GameNetwork/GUIUtil.h | 1 + .../GameEngine/Include/GameNetwork/GameInfo.h | 1 + .../Include/GameNetwork/GameMessageParser.h | 1 - .../GameEngine/Include/GameNetwork/GameSpy.h | 1 + .../Include/GameNetwork/GameSpy/BuddyDefs.h | 1 + .../Include/GameNetwork/GameSpy/BuddyThread.h | 1 + .../Include/GameNetwork/GameSpy/GSConfig.h | 1 + .../GameNetwork/GameSpy/GameResultsThread.h | 1 + .../Include/GameNetwork/GameSpy/LadderDefs.h | 1 + .../Include/GameNetwork/GameSpy/LobbyUtils.h | 1 + .../GameNetwork/GameSpy/MainMenuUtils.h | 1 + .../Include/GameNetwork/GameSpy/PeerDefs.h | 1 + .../GameSpy/PeerDefsImplementation.h | 1 + .../Include/GameNetwork/GameSpy/PeerThread.h | 1 + .../GameSpy/PersistentStorageDefs.h | 1 + .../GameSpy/PersistentStorageThread.h | 1 + .../Include/GameNetwork/GameSpy/PingThread.h | 1 + .../GameNetwork/GameSpy/StagingRoomGameInfo.h | 1 + .../Include/GameNetwork/GameSpy/ThreadUtils.h | 1 + .../Include/GameNetwork/GameSpyChat.h | 1 + .../Include/GameNetwork/GameSpyGP.h | 1 + .../Include/GameNetwork/GameSpyOverlay.h | 1 + .../GameNetwork/GameSpyPersistentStorage.h | 1 + .../Include/GameNetwork/GameSpyThread.h | 1 + .../Include/GameNetwork/IPEnumeration.h | 1 + .../GameEngine/Include/GameNetwork/LANAPI.h | 1 + .../Include/GameNetwork/LANAPICallbacks.h | 2 + .../Include/GameNetwork/LANGameInfo.h | 1 + .../Code/GameEngine/Include/GameNetwork/NAT.h | 1 + .../Include/GameNetwork/NetCommandList.h | 2 +- .../Include/GameNetwork/NetCommandMsg.h | 1 + .../Include/GameNetwork/NetCommandRef.h | 2 +- .../GameNetwork/NetCommandWrapperList.h | 1 + .../Include/GameNetwork/NetPacket.h | 4 +- .../Include/GameNetwork/NetworkDefs.h | 2 +- .../Include/GameNetwork/NetworkInterface.h | 1 + .../Include/GameNetwork/RankPointValue.h | 1 + .../Include/GameNetwork/Transport.h | 1 + .../GameEngine/Include/GameNetwork/User.h | 1 + .../GameNetwork/WOLBrowser/FEBDispatch.h | 2 + .../GameNetwork/WOLBrowser/WebBrowser.h | 1 + .../Include/GameNetwork/networkutil.h | 2 +- .../Code/GameEngine/Include/GameNetwork/udp.h | 2 +- .../GameEngine/Include/Precompiled/PreRTS.h | 2 + .../Include/W3DDevice/Common/W3DConvert.h | 1 + .../W3DDevice/Common/W3DFunctionLexicon.h | 1 + .../W3DDevice/Common/W3DModuleFactory.h | 1 + .../Include/W3DDevice/Common/W3DRadar.h | 1 + .../W3DDevice/Common/W3DThingFactory.h | 1 + .../Include/W3DDevice/GameClient/HeightMap.h | 2 +- .../GameClient/Module/W3DDebrisDraw.h | 1 + .../GameClient/Module/W3DDefaultDraw.h | 1 + .../Module/W3DDependencyModelDraw.h | 1 + .../GameClient/Module/W3DLaserDraw.h | 1 + .../GameClient/Module/W3DModelDraw.h | 1 + .../GameClient/Module/W3DOverlordTankDraw.h | 1 + .../GameClient/Module/W3DPoliceCarDraw.h | 1 + .../Module/W3DProjectileStreamDraw.h | 1 + .../W3DDevice/GameClient/Module/W3DRopeDraw.h | 1 + .../GameClient/Module/W3DScienceModelDraw.h | 1 + .../GameClient/Module/W3DSupplyDraw.h | 1 + .../W3DDevice/GameClient/Module/W3DTankDraw.h | 1 + .../GameClient/Module/W3DTankTruckDraw.h | 1 + .../GameClient/Module/W3DTracerDraw.h | 1 + .../GameClient/Module/W3DTruckDraw.h | 1 + .../Include/W3DDevice/GameClient/TerrainTex.h | 1 + .../Include/W3DDevice/GameClient/TileData.h | 1 + .../W3DDevice/GameClient/W3DAssetManager.h | 1 + .../GameClient/W3DAssetManagerExposed.h | 1 + .../W3DDevice/GameClient/W3DBibBuffer.h | 1 + .../W3DDevice/GameClient/W3DBridgeBuffer.h | 1 + .../W3DDevice/GameClient/W3DBufferManager.h | 1 + .../W3DDevice/GameClient/W3DCustomEdging.h | 1 + .../W3DDevice/GameClient/W3DCustomScene.h | 1 + .../W3DDevice/GameClient/W3DDebugIcons.h | 2 +- .../Include/W3DDevice/GameClient/W3DDisplay.h | 1 + .../W3DDevice/GameClient/W3DDisplayString.h | 1 + .../GameClient/W3DDisplayStringManager.h | 1 + .../W3DDevice/GameClient/W3DDynamicLight.h | 1 + .../W3DDevice/GameClient/W3DFileSystem.h | 2 +- .../W3DDevice/GameClient/W3DGUICallbacks.h | 1 + .../Include/W3DDevice/GameClient/W3DGadget.h | 1 + .../W3DDevice/GameClient/W3DGameClient.h | 1 + .../W3DDevice/GameClient/W3DGameFont.h | 1 + .../W3DDevice/GameClient/W3DGameWindow.h | 1 + .../GameClient/W3DGameWindowManager.h | 1 + .../W3DDevice/GameClient/W3DInGameUI.h | 1 + .../Include/W3DDevice/GameClient/W3DMirror.h | 2 +- .../Include/W3DDevice/GameClient/W3DMouse.h | 1 + .../W3DDevice/GameClient/W3DParticleSys.h | 1 + .../Include/W3DDevice/GameClient/W3DPoly.h | 1 + .../W3DDevice/GameClient/W3DProjectedShadow.h | 2 + .../W3DDevice/GameClient/W3DRoadBuffer.h | 1 + .../Include/W3DDevice/GameClient/W3DScene.h | 1 + .../W3DDevice/GameClient/W3DShaderManager.h | 1 + .../Include/W3DDevice/GameClient/W3DShadow.h | 2 +- .../Include/W3DDevice/GameClient/W3DShroud.h | 2 +- .../W3DDevice/GameClient/W3DStatusCircle.h | 2 +- .../W3DDevice/GameClient/W3DTerrainTracks.h | 1 + .../W3DDevice/GameClient/W3DTerrainVisual.h | 1 + .../W3DDevice/GameClient/W3DTreeBuffer.h | 1 + .../Include/W3DDevice/GameClient/W3DView.h | 1 + .../GameClient/W3DVolumetricShadow.h | 2 +- .../Include/W3DDevice/GameClient/W3DWater.h | 1 + .../W3DDevice/GameClient/W3DWaterTracks.h | 2 +- .../W3DDevice/GameClient/W3DWaypointBuffer.h | 1 + .../W3DDevice/GameClient/W3DWebBrowser.h | 1 + .../W3DDevice/GameClient/WorldHeightMap.h | 1 + .../W3DDevice/GameLogic/W3DGameLogic.h | 1 + .../W3DDevice/GameLogic/W3DGhostObject.h | 1 + .../W3DDevice/GameLogic/W3DTerrainLogic.h | 1 + .../Win32Device/Common/Win32GameEngine.h | 1 + .../Win32Device/GameClient/Win32DIKeyboard.h | 1 + .../Win32Device/GameClient/Win32DIMouse.h | 1 + .../Win32Device/GameClient/Win32Mouse.h | 1 + .../Code/Libraries/Include/Lib/BaseType.h | 1 + Generals/Code/Libraries/Include/Lib/trig.h | 2 + .../Source/WWVegas/WW3D2/aabtreebuilder.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/animobj.h | 1 + .../Libraries/Source/WWVegas/WW3D2/assetmgr.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/bmp2d.h | 1 + .../Libraries/Source/WWVegas/WW3D2/boxrobj.h | 1 + .../Libraries/Source/WWVegas/WW3D2/camera.h | 1 + .../Libraries/Source/WWVegas/WW3D2/dazzle.h | 1 + .../Libraries/Source/WWVegas/WW3D2/ddsfile.h | 1 + .../Libraries/Source/WWVegas/WW3D2/decalmsh.h | 1 + .../Libraries/Source/WWVegas/WW3D2/dx8caps.h | 1 + .../Libraries/Source/WWVegas/WW3D2/dx8fvf.h | 2 +- .../Source/WWVegas/WW3D2/dx8indexbuffer.h | 1 + .../Source/WWVegas/WW3D2/dx8renderer.h | 2 +- .../Source/WWVegas/WW3D2/dx8texman.h | 1 + .../Source/WWVegas/WW3D2/dx8vertexbuffer.h | 1 + .../Source/WWVegas/WW3D2/dx8wrapper.h | 1 + .../Libraries/Source/WWVegas/WW3D2/hanimmgr.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/hlod.h | 2 +- .../Source/WWVegas/WW3D2/hmorphanim.h | 1 + .../Libraries/Source/WWVegas/WW3D2/hrawanim.h | 1 + .../Libraries/Source/WWVegas/WW3D2/htreemgr.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/light.h | 2 +- .../Source/WWVegas/WW3D2/lightenvironment.h | 1 + .../Libraries/Source/WWVegas/WW3D2/mapper.h | 1 + .../Libraries/Source/WWVegas/WW3D2/matpass.h | 1 + .../Source/WWVegas/WW3D2/matrixmapper.h | 1 + .../Libraries/Source/WWVegas/WW3D2/mesh.h | 2 +- .../Source/WWVegas/WW3D2/meshbuild.h | 1 + .../Source/WWVegas/WW3D2/meshgeometry.h | 2 + .../Source/WWVegas/WW3D2/meshmatdesc.h | 2 + .../Libraries/Source/WWVegas/WW3D2/meshmdl.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/motchan.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/nullrobj.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/part_buf.h | 2 + .../Libraries/Source/WWVegas/WW3D2/part_emt.h | 2 + .../Libraries/Source/WWVegas/WW3D2/part_ldr.h | 1 - .../Libraries/Source/WWVegas/WW3D2/render2d.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/rinfo.h | 1 - .../Libraries/Source/WWVegas/WW3D2/scene.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/shader.h | 2 +- .../Source/WWVegas/WW3D2/sortingrenderer.h | 1 + .../Source/WWVegas/WW3D2/texproject.h | 1 + .../Libraries/Source/WWVegas/WW3D2/texture.h | 2 +- .../Source/WWVegas/WW3D2/texturefilter.h | 2 + .../Source/WWVegas/WW3D2/textureloader.h | 1 + .../Source/WWVegas/WW3D2/texturethumbnail.h | 1 + .../Source/WWVegas/WW3D2/vertmaterial.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/w3d_file.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/ww3d.h | 2 +- Generals/Code/Main/WinMain.h | 2 + .../Code/Tools/GUIEdit/Include/DialogProc.h | 1 + .../Code/Tools/GUIEdit/Include/EditWindow.h | 1 + Generals/Code/Tools/GUIEdit/Include/GUIEdit.h | 1 + .../Code/Tools/GUIEdit/Include/GUIEditColor.h | 1 + .../Tools/GUIEdit/Include/GUIEditDisplay.h | 1 + .../GUIEdit/Include/GUIEditWindowManager.h | 1 + .../Tools/GUIEdit/Include/HierarchyView.h | 1 + .../Code/Tools/GUIEdit/Include/LayoutScheme.h | 1 + .../Code/Tools/GUIEdit/Include/Properties.h | 1 + Generals/Code/Tools/GUIEdit/Include/WinMain.h | 1 + .../Tools/ParticleEditor/CButtonShowColor.h | 1 + .../ParticleEditor/CParticleEditorPage.h | 1 - .../Tools/ParticleEditor/EmissionTypePanels.h | 1 + .../Tools/ParticleEditor/ISwapablePanel.h | 1 + .../Tools/ParticleEditor/MoreParmsDialog.h | 1 + .../Tools/ParticleEditor/ParticleEditor.h | 1 + .../Tools/ParticleEditor/ParticleTypePanels.h | 1 + .../Tools/ParticleEditor/ShaderTypePanels.h | 1 + Generals/Code/Tools/ParticleEditor/StdAfx.h | 1 + .../Tools/ParticleEditor/VelocityTypePanels.h | 1 + .../WorldBuilder/include/AutoEdgeOutTool.h | 1 + .../WorldBuilder/include/BaseBuildProps.h | 2 + .../WorldBuilder/include/BlendEdgeTool.h | 1 + .../WorldBuilder/include/BlendMaterial.h | 2 + .../Tools/WorldBuilder/include/BorderTool.h | 1 + .../Tools/WorldBuilder/include/BrushTool.h | 1 + .../Tools/WorldBuilder/include/BuildList.h | 2 + .../WorldBuilder/include/BuildListTool.h | 1 + .../WorldBuilder/include/CButtonShowColor.h | 1 + .../Tools/WorldBuilder/include/CUndoable.h | 1 + .../WorldBuilder/include/CameraOptions.h | 2 + .../Tools/WorldBuilder/include/CellWidth.h | 2 + .../WorldBuilder/include/ContourOptions.h | 2 + .../Tools/WorldBuilder/include/DrawObject.h | 2 + .../Tools/WorldBuilder/include/EditAction.h | 2 + .../WorldBuilder/include/EditCondition.h | 2 + .../WorldBuilder/include/EditCoordParameter.h | 2 + .../Tools/WorldBuilder/include/EditGroup.h | 2 + .../include/EditObjectParameter.h | 2 + .../WorldBuilder/include/EditParameter.h | 2 + .../include/ExportScriptsOptions.h | 2 + .../WorldBuilder/include/EyedropperTool.h | 1 + .../WorldBuilder/include/FeatherOptions.h | 2 + .../Tools/WorldBuilder/include/FeatherTool.h | 1 + .../Tools/WorldBuilder/include/FenceOptions.h | 2 + .../Tools/WorldBuilder/include/FenceTool.h | 1 + .../WorldBuilder/include/FloodFillTool.h | 1 + .../WorldBuilder/include/GlobalLightOptions.h | 2 + .../Tools/WorldBuilder/include/GroveOptions.h | 1 + .../Tools/WorldBuilder/include/GroveTool.h | 1 + .../WorldBuilder/include/HandScrollTool.h | 1 + .../WorldBuilder/include/ImpassableOptions.h | 1 + .../Tools/WorldBuilder/include/LayersList.h | 1 + .../Tools/WorldBuilder/include/LightOptions.h | 2 + .../Code/Tools/WorldBuilder/include/MainFrm.h | 1 + .../Tools/WorldBuilder/include/MapPreview.h | 1 + .../Tools/WorldBuilder/include/MapSettings.h | 2 + .../WorldBuilder/include/MeshMoldOptions.h | 2 + .../Tools/WorldBuilder/include/MeshMoldTool.h | 1 + .../Tools/WorldBuilder/include/MoundOptions.h | 2 + .../Tools/WorldBuilder/include/MoundTool.h | 1 + .../Tools/WorldBuilder/include/MyToolbar.h | 1 - .../Tools/WorldBuilder/include/NewHeightMap.h | 2 + .../WorldBuilder/include/ObjectOptions.h | 2 + .../WorldBuilder/include/ObjectPreview.h | 2 + .../Tools/WorldBuilder/include/ObjectTool.h | 1 + .../Code/Tools/WorldBuilder/include/OpenMap.h | 2 + .../Tools/WorldBuilder/include/OptionsPanel.h | 2 + .../WorldBuilder/include/PickUnitDialog.h | 2 + .../Tools/WorldBuilder/include/PointerTool.h | 1 + .../Tools/WorldBuilder/include/PolygonTool.h | 1 + .../Tools/WorldBuilder/include/RampOptions.h | 1 + .../Tools/WorldBuilder/include/RampTool.h | 1 + .../Tools/WorldBuilder/include/RoadOptions.h | 2 + .../Tools/WorldBuilder/include/RoadTool.h | 1 + .../Code/Tools/WorldBuilder/include/SaveMap.h | 2 + .../WorldBuilder/include/ScorchOptions.h | 2 + .../Tools/WorldBuilder/include/ScorchTool.h | 1 + .../WorldBuilder/include/ScriptActionsFalse.h | 2 + .../WorldBuilder/include/ScriptActionsTrue.h | 2 + .../WorldBuilder/include/ScriptConditions.h | 2 + .../Tools/WorldBuilder/include/ScriptDialog.h | 2 + .../WorldBuilder/include/ScriptProperties.h | 2 + .../WorldBuilder/include/SelectMacrotexture.h | 2 + .../WorldBuilder/include/ShadowOptions.h | 2 + .../Tools/WorldBuilder/include/SplashScreen.h | 1 + .../Code/Tools/WorldBuilder/include/StdAfx.h | 1 + .../Tools/WorldBuilder/include/TeamBehavior.h | 2 + .../Tools/WorldBuilder/include/TeamGeneric.h | 1 + .../Tools/WorldBuilder/include/TeamIdentity.h | 2 + .../WorldBuilder/include/TeamReinforcement.h | 2 + .../WorldBuilder/include/TerrainMaterial.h | 2 + .../Tools/WorldBuilder/include/TerrainModal.h | 2 + .../WorldBuilder/include/TerrainSwatches.h | 2 + .../Tools/WorldBuilder/include/TileTool.h | 1 + .../Code/Tools/WorldBuilder/include/Tool.h | 1 + .../Tools/WorldBuilder/include/WBFrameWnd.h | 2 + .../Tools/WorldBuilder/include/WBHeightMap.h | 2 + .../WorldBuilder/include/WBPopupSlider.h | 2 + .../WorldBuilder/include/WHeightMapEdit.h | 1 + .../Tools/WorldBuilder/include/WaterOptions.h | 2 + .../Tools/WorldBuilder/include/WaterTool.h | 1 + .../WorldBuilder/include/WaypointOptions.h | 2 + .../Tools/WorldBuilder/include/WaypointTool.h | 1 + .../Tools/WorldBuilder/include/WorldBuilder.h | 1 + .../WorldBuilder/include/WorldBuilderDoc.h | 1 + .../WorldBuilder/include/WorldBuilderView.h | 1 + .../WorldBuilder/include/addplayerdialog.h | 2 + .../Tools/WorldBuilder/include/brushoptions.h | 2 + .../Tools/WorldBuilder/include/euladialog.h | 2 + .../WorldBuilder/include/mapobjectprops.h | 2 + .../WorldBuilder/include/playerlistdlg.h | 2 + .../Tools/WorldBuilder/include/propedit.h | 2 + .../Tools/WorldBuilder/include/teamsdialog.h | 2 + .../Code/Tools/WorldBuilder/include/wbview.h | 1 + .../Tools/WorldBuilder/include/wbview3d.h | 2 + .../GameEngine/Include/Common/AcademyStats.h | 1 + .../GameEngine/Include/Common/ActionManager.h | 1 + .../GameEngine/Include/Common/BattleHonors.h | 1 + .../GameEngine/Include/Common/BezierSegment.h | 1 + .../Code/GameEngine/Include/Common/BitFlags.h | 1 + .../GameEngine/Include/Common/BitFlagsIO.h | 1 + .../GameEngine/Include/Common/BorderColors.h | 1 + .../Include/Common/BuildAssistant.h | 1 + .../Include/Common/ClientUpdateModule.h | 1 + .../GameEngine/Include/Common/CommandLine.h | 1 + .../Include/Common/CriticalSection.h | 1 + .../Include/Common/CustomMatchPreferences.h | 1 + .../Code/GameEngine/Include/Common/DamageFX.h | 1 + .../GameEngine/Include/Common/DataChunk.h | 1 + .../Code/GameEngine/Include/Common/Dict.h | 1 + .../GameEngine/Include/Common/Directory.h | 2 + .../GameEngine/Include/Common/DisabledTypes.h | 1 + .../Include/Common/DiscreteCircle.h | 1 + .../GameEngine/Include/Common/DrawModule.h | 1 + .../Code/GameEngine/Include/Common/Energy.h | 1 + .../Code/GameEngine/Include/Common/Errors.h | 1 + .../Include/Common/FunctionLexicon.h | 1 + .../GameEngine/Include/Common/GameCommon.h | 1 - .../GameEngine/Include/Common/GameEngine.h | 1 + .../Code/GameEngine/Include/Common/GameLOD.h | 1 + .../Include/Common/GameSpyMiscPreferences.h | 1 + .../GameEngine/Include/Common/GameState.h | 1 + .../GameEngine/Include/Common/GameStateMap.h | 1 + .../Code/GameEngine/Include/Common/GameType.h | 1 + .../Code/GameEngine/Include/Common/Geometry.h | 1 + .../GameEngine/Include/Common/GlobalData.h | 1 + .../Code/GameEngine/Include/Common/Handicap.h | 1 + .../Code/GameEngine/Include/Common/INI.h | 1 + .../Include/Common/IgnorePreferences.h | 1 + .../Code/GameEngine/Include/Common/KindOf.h | 1 + .../Include/Common/LadderPreferences.h | 1 + .../Code/GameEngine/Include/Common/Language.h | 1 + .../GameEngine/Include/Common/LatchRestore.h | 1 + .../GameEngine/Include/Common/MapObject.h | 1 + .../Include/Common/MapReaderWriterInfo.h | 1 + .../GameEngine/Include/Common/MessageStream.h | 1 + .../GameEngine/Include/Common/MissionStats.h | 1 + .../GameEngine/Include/Common/ModelState.h | 1 + .../Code/GameEngine/Include/Common/Module.h | 1 + .../GameEngine/Include/Common/ModuleFactory.h | 1 + .../Code/GameEngine/Include/Common/Money.h | 1 + .../Include/Common/MultiplayerSettings.h | 1 + .../Include/Common/NameKeyGenerator.h | 1 + .../GameEngine/Include/Common/OSDisplay.h | 1 + .../Include/Common/ObjectStatusTypes.h | 1 + .../GameEngine/Include/Common/Overridable.h | 1 + .../Code/GameEngine/Include/Common/Override.h | 1 + .../Include/Common/PartitionSolver.h | 1 + .../GameEngine/Include/Common/PerfMetrics.h | 1 + .../GameEngine/Include/Common/PerfTimer.h | 1 + .../Code/GameEngine/Include/Common/Player.h | 1 + .../GameEngine/Include/Common/PlayerList.h | 1 + .../Include/Common/PlayerTemplate.h | 1 + .../Include/Common/ProductionPrerequisite.h | 1 + .../Include/Common/QuickmatchPreferences.h | 1 + .../Include/Common/QuotedPrintable.h | 1 + .../Code/GameEngine/Include/Common/Radar.h | 1 + .../Code/GameEngine/Include/Common/Recorder.h | 1 - .../Code/GameEngine/Include/Common/Registry.h | 1 + .../Include/Common/ResourceGatheringManager.h | 1 + .../GameEngine/Include/Common/STLTypedefs.h | 1 + .../Code/GameEngine/Include/Common/Science.h | 1 + .../GameEngine/Include/Common/ScopedMutex.h | 1 + .../GameEngine/Include/Common/ScoreKeeper.h | 1 + .../Include/Common/SkirmishBattleHonors.h | 1 + .../Include/Common/SkirmishPreferences.h | 1 + .../Code/GameEngine/Include/Common/Snapshot.h | 1 + .../Include/Common/SparseMatchFinder.h | 1 + .../GameEngine/Include/Common/SpecialPower.h | 1 + .../Include/Common/SpecialPowerMaskType.h | 1 + .../Include/Common/SpecialPowerType.h | 1 + .../GameEngine/Include/Common/StackDump.h | 1 + .../GameEngine/Include/Common/StateMachine.h | 1 + .../Include/Common/StatsCollector.h | 1 + .../Include/Common/SubsystemInterface.h | 1 + .../GameEngine/Include/Common/SystemInfo.h | 1 + .../Code/GameEngine/Include/Common/Team.h | 1 + .../Code/GameEngine/Include/Common/Terrain.h | 1 + .../GameEngine/Include/Common/TerrainTypes.h | 1 + .../Code/GameEngine/Include/Common/Thing.h | 1 + .../GameEngine/Include/Common/ThingFactory.h | 1 + .../GameEngine/Include/Common/ThingSort.h | 1 + .../GameEngine/Include/Common/ThingTemplate.h | 1 + .../GameEngine/Include/Common/TunnelTracker.h | 1 + .../Code/GameEngine/Include/Common/Upgrade.h | 1 + .../Include/Common/UserPreferences.h | 1 + .../GameEngine/Include/Common/WellKnownKeys.h | 1 + .../Code/GameEngine/Include/Common/encrypt.h | 1 + .../Code/GameEngine/Include/Common/version.h | 1 + .../GameEngine/Include/GameClient/Anim2D.h | 1 + .../Include/GameClient/AnimateWindowManager.h | 1 + .../GameEngine/Include/GameClient/CDCheck.h | 1 + .../Include/GameClient/CampaignManager.h | 1 + .../GameEngine/Include/GameClient/Color.h | 1 + .../Include/GameClient/CommandXlat.h | 1 + .../Include/GameClient/ControlBar.h | 1 + .../Include/GameClient/ControlBarResizer.h | 1 + .../Include/GameClient/ControlBarScheme.h | 1 + .../GameEngine/Include/GameClient/Credits.h | 1 + .../GameEngine/Include/GameClient/Diplomacy.h | 1 + .../Include/GameClient/DisconnectMenu.h | 2 +- .../GameEngine/Include/GameClient/Display.h | 1 + .../Include/GameClient/DisplayString.h | 1 + .../Include/GameClient/DisplayStringManager.h | 1 + .../Include/GameClient/DrawGroupInfo.h | 1 + .../GameEngine/Include/GameClient/Drawable.h | 1 + .../Include/GameClient/DrawableInfo.h | 1 + .../Code/GameEngine/Include/GameClient/Eva.h | 1 + .../Include/GameClient/ExtendedMessageBox.h | 1 + .../GameEngine/Include/GameClient/FXList.h | 1 + .../GameEngine/Include/GameClient/FontDesc.h | 1 + .../Include/GameClient/GUICallbacks.h | 1 + .../Include/GameClient/GUICommandTranslator.h | 1 + .../GameEngine/Include/GameClient/Gadget.h | 1 + .../Include/GameClient/GadgetCheckBox.h | 1 + .../Include/GameClient/GadgetComboBox.h | 1 + .../Include/GameClient/GadgetListBox.h | 1 + .../Include/GameClient/GadgetProgressBar.h | 1 + .../Include/GameClient/GadgetPushButton.h | 1 + .../Include/GameClient/GadgetRadioButton.h | 1 + .../Include/GameClient/GadgetSlider.h | 1 + .../Include/GameClient/GadgetStaticText.h | 1 + .../Include/GameClient/GadgetTabControl.h | 1 + .../Include/GameClient/GadgetTextEntry.h | 1 + .../Include/GameClient/GameClient.h | 1 + .../GameEngine/Include/GameClient/GameFont.h | 1 + .../Include/GameClient/GameInfoWindow.h | 1 + .../Include/GameClient/GameWindow.h | 1 + .../Include/GameClient/GameWindowGlobal.h | 1 + .../Include/GameClient/GameWindowID.h | 1 + .../GameClient/GameWindowTransitions.h | 1 + .../Include/GameClient/GlobalLanguage.h | 1 + .../GameEngine/Include/GameClient/GraphDraw.h | 1 + .../Include/GameClient/HeaderTemplate.h | 1 + .../GameEngine/Include/GameClient/HintSpy.h | 1 + .../GameEngine/Include/GameClient/HotKey.h | 1 + .../GameEngine/Include/GameClient/Image.h | 1 + .../GameEngine/Include/GameClient/InGameUI.h | 1 + .../GameEngine/Include/GameClient/KeyDefs.h | 1 + .../GameEngine/Include/GameClient/Keyboard.h | 1 + .../Include/GameClient/LanguageFilter.h | 2 +- .../GameEngine/Include/GameClient/Line2D.h | 1 + .../Include/GameClient/LoadScreen.h | 1 + .../Include/GameClient/LookAtXlat.h | 1 + .../GameEngine/Include/GameClient/MapUtil.h | 1 + .../Include/GameClient/MessageBox.h | 1 + .../GameEngine/Include/GameClient/MetaEvent.h | 1 + .../AnimatedParticleSysBoneClientUpdate.h | 1 + .../GameClient/Module/BeaconClientUpdate.h | 1 + .../GameClient/Module/SwayClientUpdate.h | 1 + .../GameEngine/Include/GameClient/Mouse.h | 1 + .../Include/GameClient/ParabolicEase.h | 2 + .../Include/GameClient/ParticleSys.h | 1 + .../Include/GameClient/PlaceEventTranslator.h | 1 + .../Include/GameClient/ProcessAnimateWindow.h | 1 + .../Include/GameClient/RadiusDecal.h | 1 + .../GameEngine/Include/GameClient/RayEffect.h | 1 + .../Include/GameClient/SelectionInfo.h | 1 + .../Include/GameClient/SelectionXlat.h | 1 + .../GameEngine/Include/GameClient/Shadow.h | 1 + .../GameEngine/Include/GameClient/Shell.h | 1 + .../Include/GameClient/ShellHooks.h | 1 + .../Include/GameClient/ShellMenuScheme.h | 1 + .../GameEngine/Include/GameClient/Smudge.h | 1 + .../Code/GameEngine/Include/GameClient/Snow.h | 1 + .../Include/GameClient/Statistics.h | 1 + .../Include/GameClient/TerrainRoads.h | 1 + .../Include/GameClient/TerrainVisual.h | 1 + .../Code/GameEngine/Include/GameClient/View.h | 1 + .../GameEngine/Include/GameClient/Water.h | 1 + .../Include/GameClient/WinInstanceData.h | 1 + .../Include/GameClient/WindowLayout.h | 1 + .../Include/GameClient/WindowXlat.h | 1 + .../Code/GameEngine/Include/GameLogic/AI.h | 1 + .../GameEngine/Include/GameLogic/AIDock.h | 1 + .../GameEngine/Include/GameLogic/AIGuard.h | 1 + .../Include/GameLogic/AIGuardRetaliate.h | 1 + .../GameEngine/Include/GameLogic/AIPathfind.h | 1 + .../GameEngine/Include/GameLogic/AIPlayer.h | 1 + .../Include/GameLogic/AISkirmishPlayer.h | 1 + .../Include/GameLogic/AIStateMachine.h | 1 + .../GameEngine/Include/GameLogic/AITNGuard.h | 1 + .../Code/GameEngine/Include/GameLogic/Armor.h | 1 + .../GameEngine/Include/GameLogic/ArmorSet.h | 1 + .../GameEngine/Include/GameLogic/CaveSystem.h | 1 + .../Include/GameLogic/CrateSystem.h | 1 + .../GameEngine/Include/GameLogic/Damage.h | 1 + .../Include/GameLogic/ExperienceTracker.h | 1 + .../GameEngine/Include/GameLogic/FPUControl.h | 1 + .../Include/GameLogic/FiringTracker.h | 1 + .../GameEngine/Include/GameLogic/GameLogic.h | 1 + .../Include/GameLogic/GhostObject.h | 1 + .../GameEngine/Include/GameLogic/Locomotor.h | 1 + .../Include/GameLogic/LocomotorSet.h | 1 + .../Include/GameLogic/Module/AIUpdate.h | 1 + .../Include/GameLogic/Module/ActiveBody.h | 1 + .../GameLogic/Module/ActiveShroudUpgrade.h | 1 + .../Module/AnimationSteeringUpdate.h | 1 + .../Include/GameLogic/Module/ArmorUpgrade.h | 1 + .../Module/AssaultTransportAIUpdate.h | 1 + .../Module/AssistedTargetingUpdate.h | 1 + .../GameLogic/Module/AutoDepositUpdate.h | 1 + .../GameLogic/Module/AutoFindHealingUpdate.h | 1 + .../GameLogic/Module/AutoHealBehavior.h | 1 + .../GameLogic/Module/BaikonurLaunchPower.h | 1 + .../GameLogic/Module/BaseRegenerateUpdate.h | 1 + .../Module/BattleBusSlowDeathBehavior.h | 1 + .../GameLogic/Module/BattlePlanUpdate.h | 1 + .../Include/GameLogic/Module/BehaviorModule.h | 1 + .../Include/GameLogic/Module/BodyModule.h | 1 + .../Include/GameLogic/Module/BoneFXDamage.h | 1 + .../Include/GameLogic/Module/BoneFXUpdate.h | 1 + .../Include/GameLogic/Module/BridgeBehavior.h | 1 + .../GameLogic/Module/BridgeScaffoldBehavior.h | 1 + .../GameLogic/Module/BridgeTowerBehavior.h | 1 + .../GameLogic/Module/BunkerBusterBehavior.h | 1 + .../GameLogic/Module/CashBountyPower.h | 1 + .../GameLogic/Module/CashHackSpecialPower.h | 1 + .../Include/GameLogic/Module/CaveContain.h | 1 + .../GameLogic/Module/CheckpointUpdate.h | 1 + .../GameLogic/Module/ChinookAIUpdate.h | 1 + .../GameLogic/Module/CleanupAreaPower.h | 1 + .../GameLogic/Module/CleanupHazardUpdate.h | 1 + .../Include/GameLogic/Module/CollideModule.h | 1 + .../Module/CommandButtonHuntUpdate.h | 1 + .../GameLogic/Module/CommandSetUpgrade.h | 1 + .../Include/GameLogic/Module/ContainModule.h | 1 + .../Module/ConvertToCarBombCrateCollide.h | 1 + .../ConvertToHijackedVehicleCrateCollide.h | 1 + .../GameLogic/Module/CostModifierUpgrade.h | 1 + .../Module/CountermeasuresBehavior.h | 1 + .../Include/GameLogic/Module/CrateCollide.h | 1 + .../Include/GameLogic/Module/CreateCrateDie.h | 1 + .../Include/GameLogic/Module/CreateModule.h | 1 + .../GameLogic/Module/CreateObjectDie.h | 1 + .../Include/GameLogic/Module/CrushDie.h | 1 + .../Include/GameLogic/Module/DamDie.h | 1 + .../Include/GameLogic/Module/DamageModule.h | 1 + .../Module/DefaultProductionExitUpdate.h | 1 + .../GameLogic/Module/DefectorSpecialPower.h | 1 + .../Include/GameLogic/Module/DeletionUpdate.h | 1 + .../GameLogic/Module/DeliverPayloadAIUpdate.h | 1 + .../Include/GameLogic/Module/DemoTrapUpdate.h | 1 + .../GameLogic/Module/DemoralizeSpecialPower.h | 1 + .../GameLogic/Module/DeployStyleAIUpdate.h | 1 + .../Include/GameLogic/Module/DestroyDie.h | 1 + .../Include/GameLogic/Module/DestroyModule.h | 1 + .../Include/GameLogic/Module/DieModule.h | 1 + .../Include/GameLogic/Module/DockUpdate.h | 1 + .../Include/GameLogic/Module/DozerAIUpdate.h | 1 + .../GameLogic/Module/DumbProjectileBehavior.h | 1 + .../Module/DynamicGeometryInfoUpdate.h | 1 + .../Module/DynamicShroudClearingRangeUpdate.h | 1 + .../Include/GameLogic/Module/EMPUpdate.h | 1 + .../Include/GameLogic/Module/EjectPilotDie.h | 1 + .../GameLogic/Module/EnemyNearUpdate.h | 1 + .../Module/ExperienceScalarUpgrade.h | 1 + .../Include/GameLogic/Module/FXListDie.h | 1 + .../Module/FireOCLAfterWeaponCooldownUpdate.h | 1 + .../GameLogic/Module/FireSpreadUpdate.h | 1 + .../GameLogic/Module/FireWeaponCollide.h | 1 + .../GameLogic/Module/FireWeaponPower.h | 1 + .../GameLogic/Module/FireWeaponUpdate.h | 1 + .../Module/FireWeaponWhenDamagedBehavior.h | 1 + .../Module/FireWeaponWhenDeadBehavior.h | 1 + .../FirestormDynamicGeometryInfoUpdate.h | 1 + .../GameLogic/Module/FlammableUpdate.h | 1 + .../GameLogic/Module/FlightDeckBehavior.h | 1 + .../Include/GameLogic/Module/FloatUpdate.h | 1 + .../GameLogic/Module/GarrisonContain.h | 1 + .../Module/GenerateMinefieldBehavior.h | 1 + .../GameLogic/Module/GrantScienceUpgrade.h | 1 + .../GameLogic/Module/GrantStealthBehavior.h | 1 + .../GameLogic/Module/GrantUpgradeCreate.h | 1 + .../GameLogic/Module/HackInternetAIUpdate.h | 1 + .../Include/GameLogic/Module/HealContain.h | 1 + .../GameLogic/Module/HealCrateCollide.h | 1 + .../GameLogic/Module/HeightDieUpdate.h | 1 + .../Module/HelicopterSlowDeathUpdate.h | 1 + .../Include/GameLogic/Module/HelixContain.h | 1 + .../Include/GameLogic/Module/HighlanderBody.h | 1 + .../Include/GameLogic/Module/HijackerUpdate.h | 1 + .../GameLogic/Module/HiveStructureBody.h | 1 + .../Include/GameLogic/Module/HordeUpdate.h | 1 + .../Include/GameLogic/Module/ImmortalBody.h | 1 + .../Include/GameLogic/Module/InactiveBody.h | 1 + .../GameLogic/Module/InstantDeathBehavior.h | 1 + .../GameLogic/Module/InternetHackContain.h | 1 + .../Include/GameLogic/Module/JetAIUpdate.h | 1 + .../GameLogic/Module/JetSlowDeathBehavior.h | 1 + .../Include/GameLogic/Module/KeepObjectDie.h | 1 + .../Include/GameLogic/Module/LaserUpdate.h | 1 + .../Include/GameLogic/Module/LifetimeUpdate.h | 1 + .../GameLogic/Module/LockWeaponCreate.h | 1 + .../GameLogic/Module/LocomotorSetUpgrade.h | 1 + .../GameLogic/Module/MaxHealthUpgrade.h | 1 + .../GameLogic/Module/MinefieldBehavior.h | 1 + .../GameLogic/Module/MissileAIUpdate.h | 1 + .../Module/MissileLauncherBuildingUpdate.h | 1 + .../GameLogic/Module/MobMemberSlavedUpdate.h | 1 + .../GameLogic/Module/MobNexusContain.h | 1 + .../GameLogic/Module/ModelConditionUpgrade.h | 1 + .../GameLogic/Module/MoneyCrateCollide.h | 1 + .../GameLogic/Module/NeutronBlastBehavior.h | 1 + .../Module/NeutronMissileSlowDeathUpdate.h | 1 + .../GameLogic/Module/NeutronMissileUpdate.h | 1 + .../GameLogic/Module/OCLSpecialPower.h | 1 + .../Include/GameLogic/Module/OCLUpdate.h | 1 + .../GameLogic/Module/ObjectCreationUpgrade.h | 1 + .../GameLogic/Module/ObjectDefectionHelper.h | 1 + .../Include/GameLogic/Module/ObjectHelper.h | 1 + .../GameLogic/Module/ObjectRepulsorHelper.h | 1 + .../GameLogic/Module/ObjectSMCHelper.h | 1 + .../Module/ObjectWeaponStatusHelper.h | 1 + .../Include/GameLogic/Module/OpenContain.h | 1 + .../GameLogic/Module/OverchargeBehavior.h | 1 + .../GameLogic/Module/OverlordContain.h | 1 + .../GameLogic/Module/POWTruckAIUpdate.h | 1 + .../GameLogic/Module/POWTruckBehavior.h | 1 + .../GameLogic/Module/ParachuteContain.h | 1 + .../GameLogic/Module/ParkingPlaceBehavior.h | 1 + .../Module/ParticleUplinkCannonUpdate.h | 1 + .../GameLogic/Module/PassengersFireUpgrade.h | 1 + .../Include/GameLogic/Module/PhysicsUpdate.h | 1 + .../GameLogic/Module/PilotFindVehicleUpdate.h | 1 + .../Module/PointDefenseLaserUpdate.h | 1 + .../GameLogic/Module/PoisonedBehavior.h | 1 + .../GameLogic/Module/PowerPlantUpdate.h | 1 + .../GameLogic/Module/PowerPlantUpgrade.h | 1 + .../Include/GameLogic/Module/PreorderCreate.h | 1 + .../Include/GameLogic/Module/PrisonBehavior.h | 2 + .../GameLogic/Module/PrisonDockUpdate.h | 1 + .../GameLogic/Module/ProductionUpdate.h | 1 + .../GameLogic/Module/ProjectileStreamUpdate.h | 1 + .../Include/GameLogic/Module/ProneUpdate.h | 1 + .../Module/PropagandaCenterBehavior.h | 2 + .../Module/PropagandaTowerBehavior.h | 1 + .../Module/QueueProductionExitUpdate.h | 1 + .../Include/GameLogic/Module/RadarUpdate.h | 1 + .../Include/GameLogic/Module/RadarUpgrade.h | 1 + .../GameLogic/Module/RadiusDecalUpdate.h | 1 + .../Module/RailedTransportAIUpdate.h | 1 + .../GameLogic/Module/RailedTransportContain.h | 1 + .../Module/RailedTransportDockUpdate.h | 2 + .../GameLogic/Module/RailroadGuideAIUpdate.h | 1 + .../GameLogic/Module/RebuildHoleBehavior.h | 1 + .../GameLogic/Module/RebuildHoleExposeDie.h | 1 + .../GameLogic/Module/RepairDockUpdate.h | 1 + .../GameLogic/Module/ReplaceObjectUpgrade.h | 1 + .../GameLogic/Module/RiderChangeContain.h | 1 + .../SabotageCommandCenterCrateCollide.h | 1 + .../Module/SabotageFakeBuildingCrateCollide.h | 1 + .../SabotageInternetCenterCrateCollide.h | 1 + .../SabotageMilitaryFactoryCrateCollide.h | 1 + .../Module/SabotagePowerPlantCrateCollide.h | 1 + .../Module/SabotageSuperweaponCrateCollide.h | 1 + .../Module/SabotageSupplyCenterCrateCollide.h | 1 + .../SabotageSupplyDropzoneCrateCollide.h | 1 + .../GameLogic/Module/SalvageCrateCollide.h | 1 + .../GameLogic/Module/ShroudCrateCollide.h | 1 + .../Include/GameLogic/Module/SlavedUpdate.h | 2 + .../GameLogic/Module/SlowDeathBehavior.h | 1 + .../Module/SmartBombTargetHomingUpdate.h | 1 + .../Include/GameLogic/Module/SpawnBehavior.h | 1 + .../Module/SpawnPointProductionExitUpdate.h | 1 + .../Include/GameLogic/Module/SpecialAbility.h | 1 + .../GameLogic/Module/SpecialAbilityUpdate.h | 1 + .../Module/SpecialPowerCompletionDie.h | 1 + .../GameLogic/Module/SpecialPowerCreate.h | 1 + .../GameLogic/Module/SpecialPowerModule.h | 1 + .../Module/SpecialPowerUpdateModule.h | 1 + .../Module/SpectreGunshipDeploymentUpdate.h | 1 + .../GameLogic/Module/SpectreGunshipUpdate.h | 1 + .../GameLogic/Module/SpyVisionSpecialPower.h | 1 + .../GameLogic/Module/SpyVisionUpdate.h | 1 + .../Include/GameLogic/Module/SquishCollide.h | 1 + .../GameLogic/Module/StatusBitsUpgrade.h | 1 + .../GameLogic/Module/StatusDamageHelper.h | 1 + .../GameLogic/Module/StealthDetectorUpdate.h | 1 + .../Include/GameLogic/Module/StealthUpdate.h | 1 + .../Include/GameLogic/Module/StealthUpgrade.h | 1 + .../GameLogic/Module/StickyBombUpdate.h | 1 + .../Include/GameLogic/Module/StructureBody.h | 1 + .../Module/StructureCollapseUpdate.h | 1 + .../GameLogic/Module/StructureToppleUpdate.h | 1 + .../GameLogic/Module/SubObjectsUpgrade.h | 1 + .../GameLogic/Module/SubdualDamageHelper.h | 1 + .../GameLogic/Module/SupplyCenterCreate.h | 1 + .../GameLogic/Module/SupplyCenterDockUpdate.h | 1 + .../Module/SupplyCenterProductionExitUpdate.h | 1 + .../GameLogic/Module/SupplyTruckAIUpdate.h | 1 + .../GameLogic/Module/SupplyWarehouseCreate.h | 1 + .../Module/SupplyWarehouseCripplingBehavior.h | 1 + .../Module/SupplyWarehouseDockUpdate.h | 1 + .../GameLogic/Module/TechBuildingBehavior.h | 1 + .../GameLogic/Module/TempWeaponBonusHelper.h | 1 + .../GameLogic/Module/TensileFormationUpdate.h | 1 + .../Include/GameLogic/Module/ToppleUpdate.h | 1 + .../GameLogic/Module/TransitionDamageFX.h | 1 + .../GameLogic/Module/TransportAIUpdate.h | 1 + .../GameLogic/Module/TransportContain.h | 1 + .../Include/GameLogic/Module/TunnelContain.h | 1 + .../Include/GameLogic/Module/UndeadBody.h | 1 + .../GameLogic/Module/UnitCrateCollide.h | 1 + .../Module/UnpauseSpecialPowerUpgrade.h | 1 + .../Include/GameLogic/Module/UpdateModule.h | 1 + .../Include/GameLogic/Module/UpgradeDie.h | 1 + .../Include/GameLogic/Module/UpgradeModule.h | 1 + .../GameLogic/Module/VeterancyCrateCollide.h | 1 + .../GameLogic/Module/VeterancyGainCreate.h | 1 + .../Include/GameLogic/Module/WanderAIUpdate.h | 1 + .../GameLogic/Module/WaveGuideUpdate.h | 1 + .../GameLogic/Module/WeaponBonusUpdate.h | 1 + .../GameLogic/Module/WeaponBonusUpgrade.h | 1 + .../GameLogic/Module/WeaponSetUpgrade.h | 1 + .../Include/GameLogic/Module/WorkerAIUpdate.h | 1 + .../GameEngine/Include/GameLogic/Object.h | 1 + .../Include/GameLogic/ObjectCreationList.h | 1 + .../GameEngine/Include/GameLogic/ObjectIter.h | 1 + .../GameLogic/ObjectScriptStatusBits.h | 1 + .../Include/GameLogic/ObjectTypes.h | 1 + .../Include/GameLogic/PartitionManager.h | 1 + .../Include/GameLogic/PolygonTrigger.h | 1 + .../GameEngine/Include/GameLogic/Powers.h | 1 + .../GameEngine/Include/GameLogic/RankInfo.h | 1 + .../Include/GameLogic/ScriptActions.h | 1 + .../Include/GameLogic/ScriptConditions.h | 1 + .../Include/GameLogic/ScriptEngine.h | 1 + .../GameEngine/Include/GameLogic/Scripts.h | 1 + .../GameEngine/Include/GameLogic/SidesList.h | 1 + .../Code/GameEngine/Include/GameLogic/Squad.h | 1 + .../Include/GameLogic/TerrainLogic.h | 1 + .../GameEngine/Include/GameLogic/TurretAI.h | 1 + .../Include/GameLogic/VictoryConditions.h | 1 + .../GameEngine/Include/GameLogic/Weapon.h | 1 + .../GameLogic/WeaponBonusConditionFlags.h | 1 + .../GameEngine/Include/GameLogic/WeaponSet.h | 1 + .../Include/GameLogic/WeaponSetFlags.h | 1 + .../Include/GameLogic/WeaponSetType.h | 1 + .../Include/GameLogic/WeaponStatus.h | 1 + .../Include/GameNetwork/Connection.h | 1 + .../Include/GameNetwork/ConnectionManager.h | 1 + .../Include/GameNetwork/DisconnectManager.h | 2 +- .../Include/GameNetwork/DownloadManager.h | 1 + .../Include/GameNetwork/FileTransfer.h | 1 + .../Include/GameNetwork/FirewallHelper.h | 1 + .../Include/GameNetwork/FrameData.h | 2 +- .../Include/GameNetwork/FrameDataManager.h | 2 +- .../Include/GameNetwork/FrameMetrics.h | 1 + .../GameEngine/Include/GameNetwork/GUIUtil.h | 1 + .../GameEngine/Include/GameNetwork/GameInfo.h | 1 + .../Include/GameNetwork/GameMessageParser.h | 1 - .../Include/GameNetwork/GameSpy/BuddyDefs.h | 1 + .../Include/GameNetwork/GameSpy/BuddyThread.h | 1 + .../Include/GameNetwork/GameSpy/GSConfig.h | 1 + .../GameNetwork/GameSpy/GameResultsThread.h | 1 + .../Include/GameNetwork/GameSpy/LadderDefs.h | 1 + .../Include/GameNetwork/GameSpy/LobbyUtils.h | 1 + .../GameNetwork/GameSpy/MainMenuUtils.h | 1 + .../Include/GameNetwork/GameSpy/PeerDefs.h | 1 + .../GameSpy/PeerDefsImplementation.h | 1 + .../Include/GameNetwork/GameSpy/PeerThread.h | 1 + .../GameSpy/PersistentStorageDefs.h | 1 + .../GameSpy/PersistentStorageThread.h | 1 + .../Include/GameNetwork/GameSpy/PingThread.h | 1 + .../GameNetwork/GameSpy/StagingRoomGameInfo.h | 1 + .../Include/GameNetwork/GameSpy/ThreadUtils.h | 1 + .../Include/GameNetwork/GameSpyChat.h | 1 + .../Include/GameNetwork/GameSpyGP.h | 1 + .../Include/GameNetwork/GameSpyOverlay.h | 1 + .../Include/GameNetwork/GameSpyThread.h | 1 + .../Include/GameNetwork/IPEnumeration.h | 1 + .../GameEngine/Include/GameNetwork/LANAPI.h | 1 + .../Include/GameNetwork/LANAPICallbacks.h | 2 + .../Include/GameNetwork/LANGameInfo.h | 1 + .../Code/GameEngine/Include/GameNetwork/NAT.h | 1 + .../Include/GameNetwork/NetCommandList.h | 2 +- .../Include/GameNetwork/NetCommandMsg.h | 1 + .../Include/GameNetwork/NetCommandRef.h | 2 +- .../GameNetwork/NetCommandWrapperList.h | 1 + .../Include/GameNetwork/NetPacket.h | 4 +- .../Include/GameNetwork/NetworkDefs.h | 2 +- .../Include/GameNetwork/NetworkInterface.h | 1 + .../Include/GameNetwork/RankPointValue.h | 1 + .../Include/GameNetwork/Transport.h | 1 + .../GameEngine/Include/GameNetwork/User.h | 1 + .../GameNetwork/WOLBrowser/FEBDispatch.h | 2 + .../GameNetwork/WOLBrowser/WebBrowser.h | 1 + .../Include/GameNetwork/networkutil.h | 2 +- .../Code/GameEngine/Include/GameNetwork/udp.h | 2 +- .../GameEngine/Include/Precompiled/PreRTS.h | 2 + .../Include/W3DDevice/Common/W3DConvert.h | 1 + .../W3DDevice/Common/W3DFunctionLexicon.h | 1 + .../W3DDevice/Common/W3DModuleFactory.h | 1 + .../Include/W3DDevice/Common/W3DRadar.h | 1 + .../W3DDevice/Common/W3DThingFactory.h | 1 + .../W3DDevice/GameClient/BaseHeightMap.h | 2 +- .../W3DDevice/GameClient/FlatHeightMap.h | 2 +- .../Include/W3DDevice/GameClient/HeightMap.h | 1 - .../GameClient/Module/W3DDebrisDraw.h | 1 + .../GameClient/Module/W3DDefaultDraw.h | 1 + .../Module/W3DDependencyModelDraw.h | 1 + .../GameClient/Module/W3DLaserDraw.h | 1 + .../GameClient/Module/W3DModelDraw.h | 1 + .../Module/W3DOverlordAircraftDraw.h | 1 + .../GameClient/Module/W3DOverlordTankDraw.h | 1 + .../GameClient/Module/W3DOverlordTruckDraw.h | 1 + .../GameClient/Module/W3DPoliceCarDraw.h | 1 + .../Module/W3DProjectileStreamDraw.h | 1 + .../W3DDevice/GameClient/Module/W3DPropDraw.h | 1 + .../W3DDevice/GameClient/Module/W3DRopeDraw.h | 1 + .../GameClient/Module/W3DScienceModelDraw.h | 1 + .../GameClient/Module/W3DSupplyDraw.h | 1 + .../W3DDevice/GameClient/Module/W3DTankDraw.h | 1 + .../GameClient/Module/W3DTankTruckDraw.h | 1 + .../GameClient/Module/W3DTracerDraw.h | 1 + .../W3DDevice/GameClient/Module/W3DTreeDraw.h | 1 + .../GameClient/Module/W3DTruckDraw.h | 1 + .../Include/W3DDevice/GameClient/TerrainTex.h | 1 + .../Include/W3DDevice/GameClient/TileData.h | 1 + .../W3DDevice/GameClient/W3DAssetManager.h | 1 + .../GameClient/W3DAssetManagerExposed.h | 1 + .../W3DDevice/GameClient/W3DBibBuffer.h | 1 + .../W3DDevice/GameClient/W3DBridgeBuffer.h | 1 + .../W3DDevice/GameClient/W3DBufferManager.h | 1 + .../W3DDevice/GameClient/W3DCustomEdging.h | 1 + .../W3DDevice/GameClient/W3DCustomScene.h | 1 + .../W3DDevice/GameClient/W3DDebugIcons.h | 2 +- .../Include/W3DDevice/GameClient/W3DDisplay.h | 1 + .../W3DDevice/GameClient/W3DDisplayString.h | 1 + .../GameClient/W3DDisplayStringManager.h | 1 + .../W3DDevice/GameClient/W3DDynamicLight.h | 1 + .../W3DDevice/GameClient/W3DFileSystem.h | 2 +- .../W3DDevice/GameClient/W3DGUICallbacks.h | 1 + .../Include/W3DDevice/GameClient/W3DGadget.h | 1 + .../W3DDevice/GameClient/W3DGameClient.h | 1 + .../W3DDevice/GameClient/W3DGameFont.h | 1 + .../W3DDevice/GameClient/W3DGameWindow.h | 1 + .../GameClient/W3DGameWindowManager.h | 1 + .../W3DDevice/GameClient/W3DInGameUI.h | 1 + .../Include/W3DDevice/GameClient/W3DMirror.h | 2 +- .../Include/W3DDevice/GameClient/W3DMouse.h | 1 + .../W3DDevice/GameClient/W3DParticleSys.h | 1 + .../Include/W3DDevice/GameClient/W3DPoly.h | 1 + .../W3DDevice/GameClient/W3DProjectedShadow.h | 2 + .../W3DDevice/GameClient/W3DPropBuffer.h | 1 + .../W3DDevice/GameClient/W3DRoadBuffer.h | 1 + .../Include/W3DDevice/GameClient/W3DScene.h | 1 + .../W3DDevice/GameClient/W3DShaderManager.h | 1 + .../Include/W3DDevice/GameClient/W3DShadow.h | 2 +- .../Include/W3DDevice/GameClient/W3DShroud.h | 2 +- .../Include/W3DDevice/GameClient/W3DSmudge.h | 1 + .../Include/W3DDevice/GameClient/W3DSnow.h | 2 + .../W3DDevice/GameClient/W3DStatusCircle.h | 2 +- .../GameClient/W3DTerrainBackground.h | 1 + .../W3DDevice/GameClient/W3DTerrainTracks.h | 1 + .../W3DDevice/GameClient/W3DTerrainVisual.h | 1 + .../W3DDevice/GameClient/W3DTreeBuffer.h | 1 + .../Include/W3DDevice/GameClient/W3DView.h | 1 + .../GameClient/W3DVolumetricShadow.h | 2 +- .../Include/W3DDevice/GameClient/W3DWater.h | 1 + .../W3DDevice/GameClient/W3DWaterTracks.h | 2 +- .../W3DDevice/GameClient/W3DWaypointBuffer.h | 1 + .../W3DDevice/GameClient/W3DWebBrowser.h | 1 + .../W3DDevice/GameClient/WorldHeightMap.h | 1 + .../W3DDevice/GameClient/camerashakesystem.h | 1 + .../W3DDevice/GameLogic/W3DGameLogic.h | 1 + .../W3DDevice/GameLogic/W3DGhostObject.h | 1 + .../W3DDevice/GameLogic/W3DTerrainLogic.h | 1 + .../Win32Device/Common/Win32GameEngine.h | 1 + .../Win32Device/GameClient/Win32DIKeyboard.h | 1 + .../Win32Device/GameClient/Win32DIMouse.h | 1 + .../Win32Device/GameClient/Win32Mouse.h | 1 + .../Code/Libraries/Include/Lib/BaseType.h | 1 + GeneralsMD/Code/Libraries/Include/Lib/trig.h | 2 + .../Source/WWVegas/WW3D2/aabtreebuilder.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/animobj.h | 1 + .../Libraries/Source/WWVegas/WW3D2/assetmgr.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/bmp2d.h | 1 + .../Libraries/Source/WWVegas/WW3D2/boxrobj.h | 1 + .../Libraries/Source/WWVegas/WW3D2/camera.h | 1 + .../Libraries/Source/WWVegas/WW3D2/dazzle.h | 1 + .../Libraries/Source/WWVegas/WW3D2/ddsfile.h | 1 + .../Libraries/Source/WWVegas/WW3D2/decalmsh.h | 1 + .../Libraries/Source/WWVegas/WW3D2/dx8caps.h | 1 + .../Libraries/Source/WWVegas/WW3D2/dx8fvf.h | 2 +- .../Source/WWVegas/WW3D2/dx8indexbuffer.h | 1 + .../Source/WWVegas/WW3D2/dx8renderer.h | 2 +- .../WWVegas/WW3D2/dx8rendererdebugger.h | 2 +- .../Source/WWVegas/WW3D2/dx8texman.h | 1 + .../Source/WWVegas/WW3D2/dx8vertexbuffer.h | 1 + .../Source/WWVegas/WW3D2/dx8wrapper.h | 1 + .../Libraries/Source/WWVegas/WW3D2/hanimmgr.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/hlod.h | 2 +- .../Source/WWVegas/WW3D2/hmorphanim.h | 1 + .../Libraries/Source/WWVegas/WW3D2/hrawanim.h | 1 + .../Libraries/Source/WWVegas/WW3D2/htreemgr.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/light.h | 2 +- .../Source/WWVegas/WW3D2/lightenvironment.h | 1 + .../Libraries/Source/WWVegas/WW3D2/linegrp.h | 1 + .../Libraries/Source/WWVegas/WW3D2/mapper.h | 1 + .../Libraries/Source/WWVegas/WW3D2/matpass.h | 1 + .../Source/WWVegas/WW3D2/matrixmapper.h | 1 + .../Libraries/Source/WWVegas/WW3D2/mesh.h | 2 +- .../Source/WWVegas/WW3D2/meshbuild.h | 1 + .../Source/WWVegas/WW3D2/meshgeometry.h | 2 + .../Source/WWVegas/WW3D2/meshmatdesc.h | 2 + .../Libraries/Source/WWVegas/WW3D2/meshmdl.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/motchan.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/nullrobj.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/part_buf.h | 2 + .../Libraries/Source/WWVegas/WW3D2/part_emt.h | 2 + .../Libraries/Source/WWVegas/WW3D2/part_ldr.h | 1 - .../Libraries/Source/WWVegas/WW3D2/render2d.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/rinfo.h | 1 - .../Libraries/Source/WWVegas/WW3D2/scene.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/shader.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/shdlib.h | 2 + .../Source/WWVegas/WW3D2/sortingrenderer.h | 1 + .../Source/WWVegas/WW3D2/texproject.h | 1 + .../Libraries/Source/WWVegas/WW3D2/texture.h | 2 +- .../Source/WWVegas/WW3D2/texturefilter.h | 2 + .../Source/WWVegas/WW3D2/texturethumbnail.h | 1 + .../Source/WWVegas/WW3D2/vertmaterial.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/w3d_file.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/ww3d.h | 2 +- GeneralsMD/Code/Main/WinMain.h | 2 + .../Code/Tools/GUIEdit/Include/DialogProc.h | 1 + .../Code/Tools/GUIEdit/Include/EditWindow.h | 1 + .../Code/Tools/GUIEdit/Include/GUIEdit.h | 1 + .../Code/Tools/GUIEdit/Include/GUIEditColor.h | 1 + .../Tools/GUIEdit/Include/GUIEditDisplay.h | 1 + .../GUIEdit/Include/GUIEditWindowManager.h | 1 + .../Tools/GUIEdit/Include/HierarchyView.h | 1 + .../Code/Tools/GUIEdit/Include/LayoutScheme.h | 1 + .../Code/Tools/GUIEdit/Include/Properties.h | 1 + .../Code/Tools/GUIEdit/Include/WinMain.h | 1 + .../Tools/ParticleEditor/CButtonShowColor.h | 1 + .../Tools/ParticleEditor/CColorAlphaDialog.h | 1 - .../ParticleEditor/CParticleEditorPage.h | 1 - .../Tools/ParticleEditor/CSwitchesDialog.h | 1 - .../Tools/ParticleEditor/EmissionTypePanels.h | 1 + .../Tools/ParticleEditor/ISwapablePanel.h | 1 + .../Tools/ParticleEditor/MoreParmsDialog.h | 1 + .../Tools/ParticleEditor/ParticleEditor.h | 1 + .../ParticleEditor/ParticleEditorDialog.h | 1 - .../Tools/ParticleEditor/ParticleTypePanels.h | 1 + .../Tools/ParticleEditor/ShaderTypePanels.h | 1 + GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h | 1 + .../Tools/ParticleEditor/VelocityTypePanels.h | 1 + .../WorldBuilder/include/AutoEdgeOutTool.h | 1 + .../WorldBuilder/include/BaseBuildProps.h | 2 + .../WorldBuilder/include/BlendEdgeTool.h | 1 + .../WorldBuilder/include/BlendMaterial.h | 2 + .../Tools/WorldBuilder/include/BorderTool.h | 1 + .../Tools/WorldBuilder/include/BrushTool.h | 1 + .../Tools/WorldBuilder/include/BuildList.h | 2 + .../WorldBuilder/include/BuildListTool.h | 1 + .../WorldBuilder/include/CButtonShowColor.h | 1 + .../Tools/WorldBuilder/include/CUndoable.h | 1 + .../WorldBuilder/include/CameraOptions.h | 2 + .../Tools/WorldBuilder/include/CellWidth.h | 2 + .../WorldBuilder/include/ContourOptions.h | 2 + .../Tools/WorldBuilder/include/DrawObject.h | 1 + .../Tools/WorldBuilder/include/EditAction.h | 2 + .../WorldBuilder/include/EditCondition.h | 2 + .../WorldBuilder/include/EditCoordParameter.h | 2 + .../Tools/WorldBuilder/include/EditGroup.h | 2 + .../include/EditObjectParameter.h | 2 + .../WorldBuilder/include/EditParameter.h | 2 + .../include/ExportScriptsOptions.h | 2 + .../WorldBuilder/include/EyedropperTool.h | 1 + .../WorldBuilder/include/FeatherOptions.h | 2 + .../Tools/WorldBuilder/include/FeatherTool.h | 1 + .../Tools/WorldBuilder/include/FenceOptions.h | 2 + .../Tools/WorldBuilder/include/FenceTool.h | 1 + .../WorldBuilder/include/FloodFillTool.h | 1 + .../WorldBuilder/include/GlobalLightOptions.h | 2 + .../Tools/WorldBuilder/include/GroveOptions.h | 1 + .../Tools/WorldBuilder/include/GroveTool.h | 1 + .../WorldBuilder/include/HandScrollTool.h | 1 + .../WorldBuilder/include/ImpassableOptions.h | 2 +- .../Tools/WorldBuilder/include/LayersList.h | 1 + .../Tools/WorldBuilder/include/LightOptions.h | 2 + .../Code/Tools/WorldBuilder/include/MainFrm.h | 1 + .../Tools/WorldBuilder/include/MapPreview.h | 1 + .../Tools/WorldBuilder/include/MapSettings.h | 2 + .../WorldBuilder/include/MeshMoldOptions.h | 2 + .../Tools/WorldBuilder/include/MeshMoldTool.h | 1 + .../Tools/WorldBuilder/include/MoundOptions.h | 2 + .../Tools/WorldBuilder/include/MoundTool.h | 1 + .../Tools/WorldBuilder/include/MyToolbar.h | 1 - .../Tools/WorldBuilder/include/NewHeightMap.h | 2 + .../WorldBuilder/include/ObjectOptions.h | 2 + .../WorldBuilder/include/ObjectPreview.h | 2 + .../Tools/WorldBuilder/include/ObjectTool.h | 1 + .../Code/Tools/WorldBuilder/include/OpenMap.h | 2 + .../Tools/WorldBuilder/include/OptionsPanel.h | 2 + .../WorldBuilder/include/PickUnitDialog.h | 2 + .../Tools/WorldBuilder/include/PointerTool.h | 1 + .../Tools/WorldBuilder/include/PolygonTool.h | 1 + .../Tools/WorldBuilder/include/RampOptions.h | 1 + .../Tools/WorldBuilder/include/RampTool.h | 1 + .../Tools/WorldBuilder/include/RoadOptions.h | 2 + .../Tools/WorldBuilder/include/RoadTool.h | 1 + .../Tools/WorldBuilder/include/RulerOptions.h | 1 + .../Tools/WorldBuilder/include/RulerTool.h | 1 + .../Code/Tools/WorldBuilder/include/SaveMap.h | 2 + .../WorldBuilder/include/ScorchOptions.h | 2 + .../Tools/WorldBuilder/include/ScorchTool.h | 1 + .../WorldBuilder/include/ScriptActionsFalse.h | 2 + .../WorldBuilder/include/ScriptActionsTrue.h | 2 + .../WorldBuilder/include/ScriptConditions.h | 2 + .../Tools/WorldBuilder/include/ScriptDialog.h | 2 + .../WorldBuilder/include/ScriptProperties.h | 2 + .../WorldBuilder/include/SelectMacrotexture.h | 2 + .../WorldBuilder/include/ShadowOptions.h | 2 + .../Tools/WorldBuilder/include/SplashScreen.h | 2 +- .../Code/Tools/WorldBuilder/include/StdAfx.h | 1 + .../Tools/WorldBuilder/include/TeamBehavior.h | 2 + .../Tools/WorldBuilder/include/TeamGeneric.h | 2 +- .../Tools/WorldBuilder/include/TeamIdentity.h | 2 + .../WorldBuilder/include/TeamReinforcement.h | 2 + .../WorldBuilder/include/TerrainMaterial.h | 2 + .../Tools/WorldBuilder/include/TerrainModal.h | 2 + .../WorldBuilder/include/TerrainSwatches.h | 2 + .../Tools/WorldBuilder/include/TileTool.h | 1 + .../Code/Tools/WorldBuilder/include/Tool.h | 1 + .../Tools/WorldBuilder/include/WBFrameWnd.h | 2 + .../Tools/WorldBuilder/include/WBHeightMap.h | 1 + .../WorldBuilder/include/WBPopupSlider.h | 2 + .../WorldBuilder/include/WHeightMapEdit.h | 1 + .../Tools/WorldBuilder/include/WaterOptions.h | 2 + .../Tools/WorldBuilder/include/WaterTool.h | 1 + .../WorldBuilder/include/WaypointOptions.h | 2 + .../Tools/WorldBuilder/include/WaypointTool.h | 1 + .../Tools/WorldBuilder/include/WorldBuilder.h | 1 + .../WorldBuilder/include/WorldBuilderDoc.h | 1 + .../WorldBuilder/include/WorldBuilderView.h | 1 + .../WorldBuilder/include/addplayerdialog.h | 2 + .../Tools/WorldBuilder/include/brushoptions.h | 2 + .../Tools/WorldBuilder/include/euladialog.h | 2 + .../WorldBuilder/include/mapobjectprops.h | 2 + .../WorldBuilder/include/playerlistdlg.h | 2 + .../Tools/WorldBuilder/include/propedit.h | 2 + .../Tools/WorldBuilder/include/teamsdialog.h | 2 + .../Code/Tools/WorldBuilder/include/wbview.h | 1 + .../Tools/WorldBuilder/include/wbview3d.h | 2 + GeneralsMD/Code/Tools/wdump/FindDialog.h | 2 + GeneralsMD/Code/Tools/wdump/chunk_d.h | 2 + GeneralsMD/Code/Tools/wdump/mainfrm.h | 1 + GeneralsMD/Code/Tools/wdump/rawfilem.h | 2 + GeneralsMD/Code/Tools/wdump/stdafx.h | 1 + GeneralsMD/Code/Tools/wdump/wdeview.h | 2 + GeneralsMD/Code/Tools/wdump/wdlview.h | 2 + GeneralsMD/Code/Tools/wdump/wdtview.h | 2 + GeneralsMD/Code/Tools/wdump/wdump.h | 1 + GeneralsMD/Code/Tools/wdump/wdumpdoc.h | 1 + GeneralsMD/Code/Tools/wdump/wdview.h | 1 + .../cpp/harmonize_linebreaks_pragmaonce.py | 157 ++++++++++++++++++ 2128 files changed, 2680 insertions(+), 238 deletions(-) create mode 100644 scripts/cpp/harmonize_linebreaks_pragmaonce.py diff --git a/Core/GameEngine/Include/Common/ArchiveFile.h b/Core/GameEngine/Include/Common/ArchiveFile.h index b1d942f7e2..7c3d1c7a8f 100644 --- a/Core/GameEngine/Include/Common/ArchiveFile.h +++ b/Core/GameEngine/Include/Common/ArchiveFile.h @@ -27,6 +27,7 @@ ////////////////////////////////////////// #pragma once + #include "Lib/BaseType.h" #include "Common/AsciiString.h" #include "Common/ArchiveFileSystem.h" diff --git a/Core/GameEngine/Include/Common/ArchiveFileSystem.h b/Core/GameEngine/Include/Common/ArchiveFileSystem.h index 8dd76d158a..a482e593b9 100644 --- a/Core/GameEngine/Include/Common/ArchiveFileSystem.h +++ b/Core/GameEngine/Include/Common/ArchiveFileSystem.h @@ -42,6 +42,7 @@ //---------------------------------------------------------------------------- #pragma once + #define MUSIC_BIG "Music.big" //---------------------------------------------------------------------------- diff --git a/Core/GameEngine/Include/Common/AsciiString.h b/Core/GameEngine/Include/Common/AsciiString.h index 990766b9f0..e978575720 100644 --- a/Core/GameEngine/Include/Common/AsciiString.h +++ b/Core/GameEngine/Include/Common/AsciiString.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include #include #include diff --git a/Core/GameEngine/Include/Common/AudioAffect.h b/Core/GameEngine/Include/Common/AudioAffect.h index 4b16b09546..f58cb9e18b 100644 --- a/Core/GameEngine/Include/Common/AudioAffect.h +++ b/Core/GameEngine/Include/Common/AudioAffect.h @@ -25,7 +25,9 @@ // EA Pacific // John McDonald, Jr // Do not distribute + #pragma once + #include // if it is set by the options panel, use the system setting parameter. Otherwise, this will be diff --git a/Core/GameEngine/Include/Common/AudioEventInfo.h b/Core/GameEngine/Include/Common/AudioEventInfo.h index ce05848865..ff412fcb6f 100644 --- a/Core/GameEngine/Include/Common/AudioEventInfo.h +++ b/Core/GameEngine/Include/Common/AudioEventInfo.h @@ -27,6 +27,7 @@ // Author: John K. McDonald, March 2002 #pragma once + #include "Common/AsciiString.h" #include "Common/GameMemory.h" #include "Common/STLTypedefs.h" diff --git a/Core/GameEngine/Include/Common/AudioEventRTS.h b/Core/GameEngine/Include/Common/AudioEventRTS.h index 2125023f81..5a6f0f4510 100644 --- a/Core/GameEngine/Include/Common/AudioEventRTS.h +++ b/Core/GameEngine/Include/Common/AudioEventRTS.h @@ -27,6 +27,7 @@ // Author: John K. McDonald, March 2002 #pragma once + #include "Common/AsciiString.h" #include "Common/GameAudio.h" #include "Common/GameMemory.h" diff --git a/Core/GameEngine/Include/Common/AudioHandleSpecialValues.h b/Core/GameEngine/Include/Common/AudioHandleSpecialValues.h index d12c192b3f..102f9ed860 100644 --- a/Core/GameEngine/Include/Common/AudioHandleSpecialValues.h +++ b/Core/GameEngine/Include/Common/AudioHandleSpecialValues.h @@ -27,6 +27,7 @@ // Do not distribute #pragma once + enum AudioHandleSpecialValues CPP_11(: Int) { AHSV_Error = 0x00, diff --git a/Core/GameEngine/Include/Common/AudioRandomValue.h b/Core/GameEngine/Include/Common/AudioRandomValue.h index 894b2fddfe..4efc9c26b3 100644 --- a/Core/GameEngine/Include/Common/AudioRandomValue.h +++ b/Core/GameEngine/Include/Common/AudioRandomValue.h @@ -28,6 +28,7 @@ // Split out into separate Logic/Client/Audio headers by MDC Sept 2002 #pragma once + #include "Lib/BaseType.h" // do NOT use these functions directly, rather use the macros below diff --git a/Core/GameEngine/Include/Common/AudioRequest.h b/Core/GameEngine/Include/Common/AudioRequest.h index 36596d8697..a0321fdb48 100644 --- a/Core/GameEngine/Include/Common/AudioRequest.h +++ b/Core/GameEngine/Include/Common/AudioRequest.h @@ -27,6 +27,7 @@ // Do not distribute #pragma once + #include "Common/GameAudio.h" #include "Common/GameMemory.h" diff --git a/Core/GameEngine/Include/Common/AudioSettings.h b/Core/GameEngine/Include/Common/AudioSettings.h index f0335c94c8..93a485e848 100644 --- a/Core/GameEngine/Include/Common/AudioSettings.h +++ b/Core/GameEngine/Include/Common/AudioSettings.h @@ -27,6 +27,7 @@ // Do not distribute #pragma once + #include "Common/AsciiString.h" enum { MAX_HW_PROVIDERS = 4 }; diff --git a/Core/GameEngine/Include/Common/CRCDebug.h b/Core/GameEngine/Include/Common/CRCDebug.h index 8045def003..1fbeffebe6 100644 --- a/Core/GameEngine/Include/Common/CRCDebug.h +++ b/Core/GameEngine/Include/Common/CRCDebug.h @@ -26,8 +26,8 @@ // 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 #pragma once + #include "Common/Debug.h" #ifndef NO_DEBUG_CRC diff --git a/Core/GameEngine/Include/Common/Debug.h b/Core/GameEngine/Include/Common/Debug.h index 8152db19fc..0fd8814fdf 100644 --- a/Core/GameEngine/Include/Common/Debug.h +++ b/Core/GameEngine/Include/Common/Debug.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + class AsciiString; #define NO_RELEASE_DEBUG_LOGGING diff --git a/Core/GameEngine/Include/Common/FileSystem.h b/Core/GameEngine/Include/Common/FileSystem.h index 1735b47a19..546242d32a 100644 --- a/Core/GameEngine/Include/Common/FileSystem.h +++ b/Core/GameEngine/Include/Common/FileSystem.h @@ -42,6 +42,7 @@ //---------------------------------------------------------------------------- #pragma once + //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- 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 c1673cd654..c88b9303ac 100644 --- a/Core/GameEngine/Include/Common/GameAudio.h +++ b/Core/GameEngine/Include/Common/GameAudio.h @@ -40,6 +40,7 @@ //---------------------------------------------------------------------------- #pragma once + // Includes #include "Lib/BaseType.h" #include "Common/STLTypedefs.h" diff --git a/Core/GameEngine/Include/Common/GameMemory.h b/Core/GameEngine/Include/Common/GameMemory.h index 1f0f70a851..b2a3015165 100644 --- a/Core/GameEngine/Include/Common/GameMemory.h +++ b/Core/GameEngine/Include/Common/GameMemory.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // Turn off memory pool checkpointing for now. #ifndef DISABLE_MEMORYPOOL_CHECKPOINTING #define DISABLE_MEMORYPOOL_CHECKPOINTING 1 diff --git a/Core/GameEngine/Include/Common/GameSounds.h b/Core/GameEngine/Include/Common/GameSounds.h index 30eb3047c6..4f3a5f955e 100644 --- a/Core/GameEngine/Include/Common/GameSounds.h +++ b/Core/GameEngine/Include/Common/GameSounds.h @@ -40,6 +40,7 @@ //---------------------------------------------------------------------------- #pragma once + #include "Common/SubsystemInterface.h" #include "Common/GameAudio.h" #include "Common/GameType.h" diff --git a/Core/GameEngine/Include/Common/LocalFile.h b/Core/GameEngine/Include/Common/LocalFile.h index 906a76daea..db9568ee0e 100644 --- a/Core/GameEngine/Include/Common/LocalFile.h +++ b/Core/GameEngine/Include/Common/LocalFile.h @@ -43,7 +43,6 @@ #pragma once - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- diff --git a/Core/GameEngine/Include/Common/LocalFileSystem.h b/Core/GameEngine/Include/Common/LocalFileSystem.h index e0d21329ef..08f00af5d2 100644 --- a/Core/GameEngine/Include/Common/LocalFileSystem.h +++ b/Core/GameEngine/Include/Common/LocalFileSystem.h @@ -27,6 +27,7 @@ ////////////////////////////////////////////////////////// #pragma once + #include "Common/SubsystemInterface.h" #include "FileSystem.h" // for typedefs, etc. diff --git a/Core/GameEngine/Include/Common/MiscAudio.h b/Core/GameEngine/Include/Common/MiscAudio.h index cb13fb70d3..fa7b47f3c1 100644 --- a/Core/GameEngine/Include/Common/MiscAudio.h +++ b/Core/GameEngine/Include/Common/MiscAudio.h @@ -26,6 +26,7 @@ // This file is for miscellaneous sound hooks that don't have another happy home. #pragma once + #include "Common/AudioEventRTS.h" struct MiscAudio diff --git a/Core/GameEngine/Include/Common/RAMFile.h b/Core/GameEngine/Include/Common/RAMFile.h index 29866f779a..084aa8d857 100644 --- a/Core/GameEngine/Include/Common/RAMFile.h +++ b/Core/GameEngine/Include/Common/RAMFile.h @@ -43,7 +43,6 @@ #pragma once - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- diff --git a/Core/GameEngine/Include/Common/RandomValue.h b/Core/GameEngine/Include/Common/RandomValue.h index 80ad62e234..011477a337 100644 --- a/Core/GameEngine/Include/Common/RandomValue.h +++ b/Core/GameEngine/Include/Common/RandomValue.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, January 1998 #pragma once + #include "Lib/BaseType.h" extern void InitRandom( void ); diff --git a/Core/GameEngine/Include/Common/StreamingArchiveFile.h b/Core/GameEngine/Include/Common/StreamingArchiveFile.h index ae36bf234d..bf481b1978 100644 --- a/Core/GameEngine/Include/Common/StreamingArchiveFile.h +++ b/Core/GameEngine/Include/Common/StreamingArchiveFile.h @@ -43,7 +43,6 @@ #pragma once - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- diff --git a/Core/GameEngine/Include/Common/UnicodeString.h b/Core/GameEngine/Include/Common/UnicodeString.h index 7cc9cf45d1..52866c8f1f 100644 --- a/Core/GameEngine/Include/Common/UnicodeString.h +++ b/Core/GameEngine/Include/Common/UnicodeString.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include #include #include diff --git a/Core/GameEngine/Include/Common/Xfer.h b/Core/GameEngine/Include/Common/Xfer.h index d9df57848a..f9c8228800 100644 --- a/Core/GameEngine/Include/Common/Xfer.h +++ b/Core/GameEngine/Include/Common/Xfer.h @@ -38,6 +38,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Science.h" #include "Common/Upgrade.h" diff --git a/Core/GameEngine/Include/Common/XferCRC.h b/Core/GameEngine/Include/Common/XferCRC.h index 3581ff4245..b57769e86d 100644 --- a/Core/GameEngine/Include/Common/XferCRC.h +++ b/Core/GameEngine/Include/Common/XferCRC.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/Xfer.h" diff --git a/Core/GameEngine/Include/Common/XferDeepCRC.h b/Core/GameEngine/Include/Common/XferDeepCRC.h index 36fe37fe33..7125d41fe0 100644 --- a/Core/GameEngine/Include/Common/XferDeepCRC.h +++ b/Core/GameEngine/Include/Common/XferDeepCRC.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/Xfer.h" #include "Common/XferCRC.h" diff --git a/Core/GameEngine/Include/Common/XferLoad.h b/Core/GameEngine/Include/Common/XferLoad.h index 4eeb7c96f8..0da4ed1424 100644 --- a/Core/GameEngine/Include/Common/XferLoad.h +++ b/Core/GameEngine/Include/Common/XferLoad.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include #include "Common/Xfer.h" diff --git a/Core/GameEngine/Include/Common/XferSave.h b/Core/GameEngine/Include/Common/XferSave.h index 7ef8b02b86..f836910bee 100644 --- a/Core/GameEngine/Include/Common/XferSave.h +++ b/Core/GameEngine/Include/Common/XferSave.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/Xfer.h" diff --git a/Core/GameEngine/Include/Common/crc.h b/Core/GameEngine/Include/Common/crc.h index 5ffcbae2b7..0cc7ae74ad 100644 --- a/Core/GameEngine/Include/Common/crc.h +++ b/Core/GameEngine/Include/Common/crc.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, October 2001 #pragma once + #include "Lib/BaseType.h" #ifdef RTS_DEBUG diff --git a/Core/GameEngine/Include/Common/file.h b/Core/GameEngine/Include/Common/file.h index 3243238b0d..80e6644591 100644 --- a/Core/GameEngine/Include/Common/file.h +++ b/Core/GameEngine/Include/Common/file.h @@ -43,7 +43,6 @@ #pragma once - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- diff --git a/Core/GameEngine/Include/Common/simpleplayer.h b/Core/GameEngine/Include/Common/simpleplayer.h index 98043b2ff1..ff93823701 100644 --- a/Core/GameEngine/Include/Common/simpleplayer.h +++ b/Core/GameEngine/Include/Common/simpleplayer.h @@ -17,6 +17,7 @@ */ #pragma once + #include "wmsdk.h" // diff --git a/Core/GameEngine/Include/Common/urllaunch.h b/Core/GameEngine/Include/Common/urllaunch.h index da3062f81c..ca23690143 100644 --- a/Core/GameEngine/Include/Common/urllaunch.h +++ b/Core/GameEngine/Include/Common/urllaunch.h @@ -17,6 +17,7 @@ */ #pragma once + HRESULT MakeEscapedURL( LPWSTR pszInURL, LPWSTR *ppszOutURL ); HRESULT LaunchURL( LPCWSTR pszURL ); diff --git a/Core/GameEngine/Include/GameClient/ClientRandomValue.h b/Core/GameEngine/Include/GameClient/ClientRandomValue.h index 16f2502328..f5488a2666 100644 --- a/Core/GameEngine/Include/GameClient/ClientRandomValue.h +++ b/Core/GameEngine/Include/GameClient/ClientRandomValue.h @@ -28,6 +28,7 @@ // Split out into separate Logic/Client/Audio headers by MDC Sept 2002 #pragma once + #include "Lib/BaseType.h" // do NOT use these functions directly, rather use the macros below diff --git a/Core/GameEngine/Include/GameClient/WindowVideoManager.h b/Core/GameEngine/Include/GameClient/WindowVideoManager.h index a57d872912..ab0346b3e4 100644 --- a/Core/GameEngine/Include/GameClient/WindowVideoManager.h +++ b/Core/GameEngine/Include/GameClient/WindowVideoManager.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Core/GameEngine/Include/GameLogic/LogicRandomValue.h b/Core/GameEngine/Include/GameLogic/LogicRandomValue.h index 2a18dc8686..1ba4824304 100644 --- a/Core/GameEngine/Include/GameLogic/LogicRandomValue.h +++ b/Core/GameEngine/Include/GameLogic/LogicRandomValue.h @@ -28,6 +28,7 @@ // Split out into separate Logic/Client/Audio headers by MDC Sept 2002 #pragma once + #include "Lib/BaseType.h" // do NOT use these functions directly, rather use the macros below diff --git a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h index 886b4d0929..84f3dc3b7f 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFile.h @@ -27,6 +27,7 @@ /////////////////////////////////////////////////////////// #pragma once + #include "Common/ArchiveFile.h" #include "Common/AsciiString.h" #include "Common/List.h" diff --git a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h index 9e9a3179e9..45b45c793c 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdBIGFileSystem.h @@ -27,6 +27,7 @@ ///////////////////////////////////////////////////////////// #pragma once + #include "Common/ArchiveFileSystem.h" class StdBIGFileSystem : public ArchiveFileSystem diff --git a/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFile.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFile.h index 0d250e0091..97f5830b96 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFile.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFile.h @@ -27,6 +27,7 @@ ////////////////////////////////////////////////// #pragma once + #include "Common/LocalFile.h" class StdLocalFile : public LocalFile diff --git a/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h index e9a4d86b16..d2a32c2a84 100644 --- a/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h +++ b/Core/GameEngineDevice/Include/StdDevice/Common/StdLocalFileSystem.h @@ -27,6 +27,7 @@ /////////////////////////////////////////////////////////////// #pragma once + #include "Common/LocalFileSystem.h" class StdLocalFileSystem : public LocalFileSystem diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h index 35adfea67b..6d77772bbd 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFile.h @@ -27,6 +27,7 @@ /////////////////////////////////////////////////////////// #pragma once + #include "Common/ArchiveFile.h" #include "Common/AsciiString.h" #include "Common/List.h" diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h index 675181afcc..fbad69d1ce 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32BIGFileSystem.h @@ -27,6 +27,7 @@ ///////////////////////////////////////////////////////////// #pragma once + #include "Common/ArchiveFileSystem.h" class Win32BIGFileSystem : public ArchiveFileSystem diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h index e0623022c9..43faf6ea80 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFile.h @@ -27,6 +27,7 @@ ////////////////////////////////////////////////// #pragma once + #include "Common/LocalFile.h" class Win32LocalFile : public LocalFile diff --git a/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h index ce902c2452..7adf424986 100644 --- a/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h +++ b/Core/GameEngineDevice/Include/Win32Device/Common/Win32LocalFileSystem.h @@ -27,6 +27,7 @@ /////////////////////////////////////////////////////////////// #pragma once + #include "Common/LocalFileSystem.h" class Win32LocalFileSystem : public LocalFileSystem diff --git a/Core/Libraries/Include/Lib/BaseTypeCore.h b/Core/Libraries/Include/Lib/BaseTypeCore.h index 1de72f8291..550bdd5adf 100644 --- a/Core/Libraries/Include/Lib/BaseTypeCore.h +++ b/Core/Libraries/Include/Lib/BaseTypeCore.h @@ -26,6 +26,7 @@ /////////////////////////////////////////////////////////////////////////////// // tell the compiler to only load this file once + #pragma once #include diff --git a/Core/Libraries/Include/rts/debug.h b/Core/Libraries/Include/rts/debug.h index e0e679111d..d758693cbc 100644 --- a/Core/Libraries/Include/rts/debug.h +++ b/Core/Libraries/Include/rts/debug.h @@ -26,5 +26,7 @@ // // Proxy header for debug module ////////////////////////////////////////////////////////////////////////////// + #pragma once + #include "../../Source/debug/debug.h" diff --git a/Core/Libraries/Include/rts/profile.h b/Core/Libraries/Include/rts/profile.h index 8fccf54a39..06faf42d04 100644 --- a/Core/Libraries/Include/rts/profile.h +++ b/Core/Libraries/Include/rts/profile.h @@ -26,5 +26,7 @@ // // Proxy header for profile module ////////////////////////////////////////////////////////////////////////////// + # pragma once + #include "../../Source/profile/profile.h" diff --git a/Core/Libraries/Source/Compression/Compression.h b/Core/Libraries/Source/Compression/Compression.h index d218f29848..d93ac23226 100644 --- a/Core/Libraries/Source/Compression/Compression.h +++ b/Core/Libraries/Source/Compression/Compression.h @@ -21,6 +21,7 @@ ////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Lib/BaseTypeCore.h" enum CompressionType diff --git a/Core/Libraries/Source/Compression/EAC/codex.h b/Core/Libraries/Source/Compression/EAC/codex.h index 7999e36a55..2b80d2171f 100644 --- a/Core/Libraries/Source/Compression/EAC/codex.h +++ b/Core/Libraries/Source/Compression/EAC/codex.h @@ -37,7 +37,6 @@ /* */ /*------------------------------------------------------------------*/ - #pragma once #ifdef __cplusplus diff --git a/Core/Libraries/Source/Compression/EAC/gimex.h b/Core/Libraries/Source/Compression/EAC/gimex.h index bc8b96636a..c1cc3325e1 100644 --- a/Core/Libraries/Source/Compression/EAC/gimex.h +++ b/Core/Libraries/Source/Compression/EAC/gimex.h @@ -62,6 +62,7 @@ gimex.h - Primary header file for the GIMEX API. /* 3.46 021205 FB about firstextension */ /* */ /*------------------------------------------------------------------*/ + #pragma once #if defined(_MSC_VER) diff --git a/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.h b/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.h index 6c69b74b0d..0a14bd00af 100644 --- a/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.h +++ b/Core/Libraries/Source/Compression/LZHCompress/NoxCompress.h @@ -21,6 +21,7 @@ // Author: Jeff Brown, January 1999 #pragma once + #define MAP_EXTENSION ".map" #define LZH_EXTENSION ".nxz" #define RUL_EXTENSION ".rul" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h index 9f3200106c..a7c9171422 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h @@ -38,6 +38,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "refcount.h" #include "simplevec.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h index ec10b05f63..5c15c415bb 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h @@ -32,8 +32,8 @@ * * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "proto.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h b/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h index 8107ae1a3b..1f8a3267a3 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h @@ -38,6 +38,7 @@ // #pragma once + #include "simplevec.h" #include "Vector.H" #include "hashtemplate.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h b/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h index 9ea1566bb4..bb25aa729c 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h @@ -17,6 +17,7 @@ */ #pragma once + #include "always.h" #include "hashtemplate.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h b/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h index c91f6cd3c6..d12ceb63c5 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h @@ -17,6 +17,7 @@ */ #pragma once + #include "always.h" #include "ww3dformat.h" #include "vector3.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/classid.h b/Core/Libraries/Source/WWVegas/WW3D2/classid.h index 667027cc99..a734133cfb 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/classid.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/classid.h @@ -32,8 +32,8 @@ * * *-------------------------------------------------------------------------*/ - #pragma once + #include "always.h" /* diff --git a/Core/Libraries/Source/WWVegas/WW3D2/collect.h b/Core/Libraries/Source/WWVegas/WW3D2/collect.h index fe30fe4431..c51e245b31 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/collect.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "rendobj.h" #include "composite.h" #include "Vector.H" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h b/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h index 19e0e26742..e4974a0054 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "dx8wrapper.h" #include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/coltest.h b/Core/Libraries/Source/WWVegas/WW3D2/coltest.h index 3855549261..0601a81947 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/coltest.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/coltest.h @@ -37,8 +37,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "castres.h" #include "lineseg.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/coltype.h b/Core/Libraries/Source/WWVegas/WW3D2/coltype.h index 30343bf5cc..b0f10f2cc4 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/coltype.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/coltype.h @@ -37,10 +37,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // // Collision 'Types' diff --git a/Core/Libraries/Source/WWVegas/WW3D2/composite.h b/Core/Libraries/Source/WWVegas/WW3D2/composite.h index 9f7905d9d6..74bd0e26cb 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/composite.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/composite.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "rendobj.h" #include "wwstring.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h index 6431e26c17..6d7cbc1aa6 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "matrix3d.h" #include "matrix4.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/distlod.h b/Core/Libraries/Source/WWVegas/WW3D2/distlod.h index ed6606d750..01e39339b1 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/distlod.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/distlod.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "proto.h" #include "rendobj.h" #include "composite.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h index 1e871aea14..38facb816f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h @@ -37,8 +37,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "multilist.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h index cb34569b6d..ba850f7325 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h @@ -36,7 +36,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once #include "always.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h index f77c153468..ad470a6df3 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.h @@ -29,7 +29,9 @@ //****************************************************************************************** // $Header: $ //****************************************************************************************** + #pragma once + #include #include "d3d8.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h index a45e04e2e1..814c3aec38 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h @@ -32,8 +32,8 @@ * * *-------------------------------------------------------------------------*/ - #pragma once + #include "meshgeometry.h" #include "meshmatdesc.h" #include "matinfo.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/font3d.h b/Core/Libraries/Source/WWVegas/WW3D2/font3d.h index f2aa0f7b45..aecc6a55e2 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/font3d.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/font3d.h @@ -32,8 +32,8 @@ * * *---------------------------------------------------------------------------------------------*/ - #pragma once + #include "always.h" #include "refcount.h" #include "vector4.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/formconv.h b/Core/Libraries/Source/WWVegas/WW3D2/formconv.h index 39e527babd..55fbd18974 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/formconv.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/formconv.h @@ -38,6 +38,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "ww3dformat.h" #include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h b/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h index 179f0a7542..26d6add36d 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hanim.h b/Core/Libraries/Source/WWVegas/WW3D2/hanim.h index af70da3895..e243e3630e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hanim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hanim.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "quat.h" #include "refcount.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h index 8f4613ac65..144cdace01 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "quat.h" #include "refcount.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.H b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.H index f78fbcb11a..a14060eabf 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.H +++ b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.H @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "w3d_file.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/htree.h b/Core/Libraries/Source/WWVegas/WW3D2/htree.h index 54fd7054be..a3a2e42b71 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/htree.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/htree.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "pivot.h" #include "quat.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/intersec.h b/Core/Libraries/Source/WWVegas/WW3D2/intersec.h index 04552eba3e..06905a9145 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/intersec.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/intersec.h @@ -48,6 +48,7 @@ */ #pragma once + #include "always.h" #include "matrix3d.h" #include "layer.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/inttest.h b/Core/Libraries/Source/WWVegas/WW3D2/inttest.h index b2e94190d6..720d0a007e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/inttest.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/inttest.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "aabox.h" #include "obbox.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/layer.h b/Core/Libraries/Source/WWVegas/WW3D2/layer.h index e03758cc54..527aca4ad2 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/layer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/layer.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "LISTNODE.H" #include "vector3.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h index 34d6e9367e..9c7ae3c9ee 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "rendobj.h" #include "vector3.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h index 0e2f2cbcb6..11c0c145c9 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "wwdebug.h" #include "Vector.H" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h b/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h index 0b7dcfd839..498ddb96b8 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h @@ -37,6 +37,7 @@ #if 0 #pragma once + #include "always.h" #include "vector3.h" #include "bittype.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h index c9fac2cb09..0618719438 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include class TextureClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h b/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h index 3c4eb38303..106ca11512 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h @@ -17,6 +17,7 @@ */ #pragma once + #include "always.h" struct IDirect3DTexture8; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pivot.h b/Core/Libraries/Source/WWVegas/WW3D2/pivot.h index 9aea998381..f8ab446df9 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/pivot.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/pivot.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "vector3.h" #include "matrix3d.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h index 00ff3b45f2..fafa9da723 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "sharebuf.h" #include "shader.h" #include "vector4.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/predlod.h b/Core/Libraries/Source/WWVegas/WW3D2/predlod.h index c1ad9856e8..f8bceca60a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/predlod.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/predlod.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + // 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", diff --git a/Core/Libraries/Source/WWVegas/WW3D2/projector.h b/Core/Libraries/Source/WWVegas/WW3D2/projector.h index 051d3c5611..24b8632af4 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/projector.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/projector.h @@ -36,7 +36,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "always.h" #include "matrix3d.h" #include "matrix4.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.h b/Core/Libraries/Source/WWVegas/WW3D2/proto.h index 6a15b3760d..e1879f665b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/proto.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include #include "w3d_file.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proxy.h b/Core/Libraries/Source/WWVegas/WW3D2/proxy.h index 1c5efa0766..faf45a367e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/proxy.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/proxy.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "wwstring.h" #include "matrix3d.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h b/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h index 2bac5f3897..2c40e1f54f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "Vector.H" #include "wwstring.h" #include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h index a505935403..d9f705e125 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "render2d.h" #include "refcount.h" #include "Vector.H" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h index 7785ee0c80..aabc0c4c79 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "robjlist.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h index de5de54af4..41440091ec 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h @@ -38,8 +38,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "refcount.h" #include "sphere.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h index 2548b0d8cf..b4ab20f494 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h b/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h index 3d6a6fd6ef..db3437f94b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/segline.h b/Core/Libraries/Source/WWVegas/WW3D2/segline.h index d15c93125b..576957a568 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/segline.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/segline.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "rendobj.h" #include "shader.h" #include "simplevec.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h index 50abb82530..f55809f1c2 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h @@ -35,7 +35,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "always.h" #include "shader.h" #include "texture.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h b/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h index 77f6a8357d..9040e4f5df 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h b/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h index 0a8f43ef88..2cca8aba34 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "refcount.h" #include "Vector.H" #include "vector3.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundlibrarybridge.h b/Core/Libraries/Source/WWVegas/WW3D2/soundlibrarybridge.h index a0a8d2f5f8..367fcc4573 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/soundlibrarybridge.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/soundlibrarybridge.h @@ -33,7 +33,9 @@ *--------------------------------------------------------------------------------------------- * Functions: * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + // Forward declarations. class Matrix3D; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h index ae5616d41e..c5ce0b6815 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + // TheSuperHackers @build xezon 05/04/2025 Compile in WWAUDIO for Renegade's w3dview tool. #define noWWAUDIO 1 diff --git a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h index 7b16f6db96..5b854cf4fb 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h b/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h index 0a44ec8851..d5e81a52fe 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h @@ -35,7 +35,9 @@ *---------------------------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "robjlist.h" #include "w3d_file.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/statistics.h b/Core/Libraries/Source/WWVegas/WW3D2/statistics.h index 4956ca7046..1b89610cbc 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/statistics.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/statistics.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 "always.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streak.h b/Core/Libraries/Source/WWVegas/WW3D2/streak.h index a17526d81c..f0eb918425 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streak.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/streak.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "rendobj.h" #include "shader.h" #include "simplevec.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h index 05e49e4bf7..a51033d565 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h @@ -35,7 +35,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "always.h" #include "shader.h" #include "texture.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h b/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h index 7b331a0335..001840bb37 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h @@ -17,6 +17,7 @@ */ #pragma once + #include "always.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h index 58affd53cd..f9986efb2b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "ww3dformat.h" #include "refcount.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h b/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h index c2c4cf2c83..668ace7d1a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h @@ -32,8 +32,8 @@ * * *-------------------------------------------------------------------------*/ - #pragma once + #include "always.h" #include "dynamesh.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h index cab41442f4..193358f152 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "matrix3d.h" #include "matrix4.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h b/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h index a6ccb161ac..363883df04 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #pragma warning (push, 3) #pragma warning (disable: 4018 4284 4786 4788) #include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_obsolete.h b/Core/Libraries/Source/WWVegas/WW3D2/w3d_obsolete.h index 16040ce96b..eb9a537f99 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_obsolete.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_obsolete.h @@ -34,7 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once ///////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h index 73b61761ed..90b3da3e16 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "w3d_file.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h b/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h index a3a98d25fc..c600f8ca70 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" /* diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h b/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h index 57936aecf6..762ca32879 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "Vector.H" #include "wwstring.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h b/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h index 27c144c5f3..e9f9d89874 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h @@ -40,6 +40,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "wwstring.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h b/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h index 46248b49c6..d308fcab62 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h @@ -34,7 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once #include "saveloadids.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ww3dtrig.h b/Core/Libraries/Source/WWVegas/WW3D2/ww3dtrig.h index e62e46fff7..2720d320ca 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ww3dtrig.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ww3dtrig.h @@ -34,7 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once /* diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h b/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h index 5973ee5d70..e5e4182652 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AABTreeSoundCullClass.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "aabtreecull.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h index 4e37cbf421..d65dd7f432 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudibleSound.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #pragma warning (push, 3) #include "mss.h" #pragma warning (pop) diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h b/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h index 52f5838902..0a268f93f4 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudioEvents.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "simplevec.h" #include "bittype.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h b/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h index 5a64cf2509..780db12a58 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/AudioSaveLoad.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "saveloadsubsystem.h" #include "Vector.H" #include "bittype.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Listener.h b/Core/Libraries/Source/WWVegas/WWAudio/Listener.h index 222302e0b4..8ecfdac993 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/Listener.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/Listener.h @@ -34,7 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once #include "Sound3D.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h b/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h index d8ce9b71a0..780e40816d 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/LogicalListener.h @@ -31,6 +31,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "SoundSceneObj.h" #include "bittype.h" #include "vector3.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h b/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h index 9eb1fec93b..fc25c02062 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/LogicalSound.h @@ -31,6 +31,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "SoundSceneObj.h" #include "bittype.h" #include "vector3.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h b/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h index ab76ef31f4..af30e19fc0 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/PriorityVector.h @@ -31,6 +31,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "Vector.H" //////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h b/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h index 88e8e873c0..f3c036f5fc 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/Sound3D.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "AudibleSound.h" #include "mempool.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h index 818301a3bf..8e66f5b4ae 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundBuffer.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #pragma warning (push, 3) #include "mss.h" #pragma warning (pop) diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h index 00122d4bc7..1d21530414 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundChunkIDs.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "saveloadids.h" #include "definitionclassids.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h index 2ecb94daeb..c9aea3c389 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundCullObj.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "SoundSceneObj.h" #include "cullsys.h" #include "refcount.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h index fda4c9e793..a5f525aaa6 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundScene.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "aabtreecull.h" #include "gridcull.h" #include "Listener.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h b/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h index daa4f3d62c..c6d63a410a 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/SoundSceneObj.h @@ -33,6 +33,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "refcount.h" #include "WWAudio.h" #include "bittype.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Threads.h b/Core/Libraries/Source/WWVegas/WWAudio/Threads.h index 6802fdd141..8070525135 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/Threads.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/Threads.h @@ -31,6 +31,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "windows.h" #include "Vector.H" #include "mutex.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/Utils.h b/Core/Libraries/Source/WWVegas/WWAudio/Utils.h index 5c3e5e36bd..ffff71bff5 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/Utils.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/Utils.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #pragma warning (push, 3) #include "mss.h" #pragma warning (pop) diff --git a/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h b/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h index ae89c7554d..1ee408d6df 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/WWAudio.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #pragma warning (push, 3) #include "mss.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/listenerhandle.h b/Core/Libraries/Source/WWVegas/WWAudio/listenerhandle.h index 1c03613a71..1524b235f3 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/listenerhandle.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/listenerhandle.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "sound3dhandle.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.h b/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.h index 743ded36b8..f76b8100b9 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/sound2dhandle.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "soundhandle.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.h b/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.h index 2306debb53..2040057aa5 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/sound3dhandle.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "soundhandle.h" diff --git a/Core/Libraries/Source/WWVegas/WWAudio/soundhandle.h b/Core/Libraries/Source/WWVegas/WWAudio/soundhandle.h index 5d3cc860a0..297a9ba2a3 100644 --- a/Core/Libraries/Source/WWVegas/WWAudio/soundhandle.h +++ b/Core/Libraries/Source/WWVegas/WWAudio/soundhandle.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "WWAudio.h" ////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h b/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h index ef14ee2d17..4d265cbbe6 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwdebug.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + // TheSuperHackers @todo Recover WWDEBUG? #ifdef WWDEBUG #include diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwhack.h b/Core/Libraries/Source/WWVegas/WWDebug/wwhack.h index 10937db9a8..97d0b7e695 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwhack.h +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwhack.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + /* ** FORCE_LINK is a hack to force a module in a lib to be linked into the EXE. */ diff --git a/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.h b/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.h index aa6140934b..b994bbe16b 100644 --- a/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.h +++ b/Core/Libraries/Source/WWVegas/WWDebug/wwmemlog.h @@ -36,8 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #define LOG_MEMORY // Comment this out to disable memlog compiling in class MemLogClass; diff --git a/Core/Libraries/Source/WWVegas/WWDownload/Download.h b/Core/Libraries/Source/WWVegas/WWDownload/Download.h index 73b1a03e36..bed1916507 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/Download.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/Download.h @@ -17,7 +17,9 @@ */ // Download.h : Declaration of the CDownload + #pragma once + //#include "../resource.h" // main symbols #include "WWDownload/ftp.h" #include "WWDownload/downloaddefs.h" diff --git a/Core/Libraries/Source/WWVegas/WWDownload/DownloadDebug.h b/Core/Libraries/Source/WWVegas/WWDownload/DownloadDebug.h index f4fdfc20b0..4948c19cc6 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/DownloadDebug.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/DownloadDebug.h @@ -17,5 +17,7 @@ */ // DownloadDebug.h + #pragma once + #include "Common/Debug.h" diff --git a/Core/Libraries/Source/WWVegas/WWDownload/Registry.h b/Core/Libraries/Source/WWVegas/WWDownload/Registry.h index 7c32d09479..527e9adfde 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/Registry.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/Registry.h @@ -21,6 +21,7 @@ // Author: Matthew D. Campbell, December 2001 #pragma once + #include /** diff --git a/Core/Libraries/Source/WWVegas/WWDownload/downloaddefs.h b/Core/Libraries/Source/WWVegas/WWDownload/downloaddefs.h index a5012d53f5..d8d94d308a 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/downloaddefs.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/downloaddefs.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // CDownload statuses #define DOWNLOADSTATUS_NONE 0 diff --git a/Core/Libraries/Source/WWVegas/WWDownload/ftp.h b/Core/Libraries/Source/WWVegas/WWDownload/ftp.h index d6a311e4b9..31c767482b 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/ftp.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/ftp.h @@ -17,6 +17,7 @@ */ // ftp.h : Declaration of the Cftp + #pragma once //#include "../resource.h" // main symbols diff --git a/Core/Libraries/Source/WWVegas/WWDownload/ftpdefs.h b/Core/Libraries/Source/WWVegas/WWDownload/ftpdefs.h index 6ea78a8f5a..1306a38ecb 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/ftpdefs.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/ftpdefs.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 // CFtp return codes. diff --git a/Core/Libraries/Source/WWVegas/WWDownload/urlBuilder.h b/Core/Libraries/Source/WWVegas/WWDownload/urlBuilder.h index 077c0dc35e..2d5ae532dd 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/urlBuilder.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/urlBuilder.h @@ -15,6 +15,8 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + void FormatURLFromRegistry( std::string& gamePatchURL, std::string& mapPatchURL, std::string& configURL, std::string& motdURL ); diff --git a/Core/Libraries/Source/WWVegas/WWLib/BSEARCH.H b/Core/Libraries/Source/WWVegas/WWLib/BSEARCH.H index c9e2e07a78..aed9a03a44 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/BSEARCH.H +++ b/Core/Libraries/Source/WWVegas/WWLib/BSEARCH.H @@ -16,7 +16,6 @@ ** along with this program. If not, see . */ - #pragma once /* diff --git a/Core/Libraries/Source/WWVegas/WWLib/BUFF.H b/Core/Libraries/Source/WWVegas/WWLib/BUFF.H index 70a1fc60f1..164b927e7b 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/BUFF.H +++ b/Core/Libraries/Source/WWVegas/WWLib/BUFF.H @@ -33,6 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once /* diff --git a/Core/Libraries/Source/WWVegas/WWLib/CRC.H b/Core/Libraries/Source/WWVegas/WWLib/CRC.H index 69a561f0e9..e042b3d1e9 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/CRC.H +++ b/Core/Libraries/Source/WWVegas/WWLib/CRC.H @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include // TheSuperHackers @build feliwir 17/04/2025 include _ltrotl macros diff --git a/Core/Libraries/Source/WWVegas/WWLib/CallbackHook.h b/Core/Libraries/Source/WWVegas/WWLib/CallbackHook.h index eafadf65e4..23a26db662 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/CallbackHook.h +++ b/Core/Libraries/Source/WWVegas/WWLib/CallbackHook.h @@ -32,7 +32,9 @@ * $Revision: 1 $ * ******************************************************************************/ + #pragma once + class CallbackHook { public: diff --git a/Core/Libraries/Source/WWVegas/WWLib/Except.h b/Core/Libraries/Source/WWVegas/WWLib/Except.h index b04bcd61ae..e67a4b1f64 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/Except.h +++ b/Core/Libraries/Source/WWVegas/WWLib/Except.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #ifdef _MSC_VER #include "win.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/HASHLIST.H b/Core/Libraries/Source/WWVegas/WWLib/HASHLIST.H index 0d4a930cc8..1911b838f5 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/HASHLIST.H +++ b/Core/Libraries/Source/WWVegas/WWLib/HASHLIST.H @@ -43,6 +43,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #pragma warning (push) #pragma warning (disable: 4786) diff --git a/Core/Libraries/Source/WWVegas/WWLib/INDEX.H b/Core/Libraries/Source/WWVegas/WWLib/INDEX.H index 297edf74bd..c38f4d81fc 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/INDEX.H +++ b/Core/Libraries/Source/WWVegas/WWLib/INDEX.H @@ -48,7 +48,9 @@ * IndexClass::~IndexClass -- Destructor for index handler object. * * compfunc -- Support function for bsearch and bsort. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "BSEARCH.H" #if !defined(__BORLANDC__) || !defined(_USERENTRY) diff --git a/Core/Libraries/Source/WWVegas/WWLib/INI.H b/Core/Libraries/Source/WWVegas/WWLib/INI.H index 21eb0946b4..dcfa6a631c 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/INI.H +++ b/Core/Libraries/Source/WWVegas/WWLib/INI.H @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include //#include "listnode.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.H b/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.H index 2e8ea037e7..159552c1e1 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/LISTNODE.H @@ -33,6 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once /* diff --git a/Core/Libraries/Source/WWVegas/WWLib/MPU.H b/Core/Libraries/Source/WWVegas/WWLib/MPU.H index 261ed4f094..2321fdcff4 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/MPU.H +++ b/Core/Libraries/Source/WWVegas/WWLib/MPU.H @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + unsigned long Get_CPU_Clock(unsigned long & high); unsigned long Get_CPU_Rate(unsigned long & high); diff --git a/Core/Libraries/Source/WWVegas/WWLib/PIPE.H b/Core/Libraries/Source/WWVegas/WWLib/PIPE.H index 55f161412c..2c88d93a14 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/PIPE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/PIPE.H @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + /* ** A "push through" pipe interface abstract class used for such purposes as compression ** and translation of data. In STL terms, this is functionally similar to an output diff --git a/Core/Libraries/Source/WWVegas/WWLib/Point.h b/Core/Libraries/Source/WWVegas/WWLib/Point.h index f27890c77b..888f15fdef 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/Point.h +++ b/Core/Libraries/Source/WWVegas/WWLib/Point.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + template class TRect; /* diff --git a/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.H b/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.H index 01cd3944a9..583fa3716e 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/RAMFILE.H @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "WWFILE.H" diff --git a/Core/Libraries/Source/WWVegas/WWLib/RANDOM.H b/Core/Libraries/Source/WWVegas/WWLib/RANDOM.H index 3fab1fa283..2f677888bf 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/RANDOM.H +++ b/Core/Libraries/Source/WWVegas/WWLib/RANDOM.H @@ -34,7 +34,9 @@ * Functions: * * Pick_Random_Number -- Picks a random number between two values (inclusive). * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + // "unreferenced inline function has been removed" Yea, so what? #pragma warning(disable : 4514) diff --git a/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H b/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H index dede7ea79a..b3ee84191a 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/RAWFILE.H @@ -37,7 +37,9 @@ * RawFileClass::~RawFileClass -- Default deconstructor for a file object. * * RawFileClass::Is_Open -- Checks to see if the file is open or not. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + //#include // #include "win.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/SLIST.H b/Core/Libraries/Source/WWVegas/WWLib/SLIST.H index ee7c7456da..343d7105e7 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/SLIST.H +++ b/Core/Libraries/Source/WWVegas/WWLib/SLIST.H @@ -50,7 +50,9 @@ * 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 + #include "SLNODE.H" #ifndef NULL diff --git a/Core/Libraries/Source/WWVegas/WWLib/SLNODE.H b/Core/Libraries/Source/WWVegas/WWLib/SLNODE.H index 8750d63a8e..7c703ff5e3 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/SLNODE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/SLNODE.H @@ -31,7 +31,9 @@ *-------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/STRAW.H b/Core/Libraries/Source/WWVegas/WWLib/STRAW.H index 7273e98ddd..f8c78699df 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/STRAW.H +++ b/Core/Libraries/Source/WWVegas/WWLib/STRAW.H @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + /* ** This is a demand driven data carrier. It will retrieve the byte request by passing ** the request down the chain (possibly processing on the way) in order to fulfill the diff --git a/Core/Libraries/Source/WWVegas/WWLib/Signaler.h b/Core/Libraries/Source/WWVegas/WWLib/Signaler.h index e5f2bf97c7..073d032498 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/Signaler.h +++ b/Core/Libraries/Source/WWVegas/WWLib/Signaler.h @@ -36,7 +36,9 @@ * $Revision: 4 $ * ******************************************************************************/ + #pragma once + template class Signaler { public: diff --git a/Core/Libraries/Source/WWVegas/WWLib/TARGA.H b/Core/Libraries/Source/WWVegas/WWLib/TARGA.H index 90e18c7261..f0e082a3f2 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/TARGA.H +++ b/Core/Libraries/Source/WWVegas/WWLib/TARGA.H @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #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 diff --git a/Core/Libraries/Source/WWVegas/WWLib/Vector.H b/Core/Libraries/Source/WWVegas/WWLib/Vector.H index 83a30b7f07..8fb1ce0ef3 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/Vector.H +++ b/Core/Libraries/Source/WWVegas/WWLib/Vector.H @@ -50,7 +50,9 @@ * DynamicVectorClass::Uninitialized_Add -- Add an empty place to the vector. * * DynamicVectorClass::Insert -- insert an object at the desired index * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "always.h" #include #include diff --git a/Core/Libraries/Source/WWVegas/WWLib/WWCOMUtil.h b/Core/Libraries/Source/WWVegas/WWLib/WWCOMUtil.h index 66b4f7ba4f..079d3a40f3 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/WWCOMUtil.h +++ b/Core/Libraries/Source/WWVegas/WWLib/WWCOMUtil.h @@ -33,7 +33,9 @@ * $Modtime: 8/02/01 3:00p $ * ******************************************************************************/ + #pragma once + #include //! Invoke PropertyGet on IDispatch interface. diff --git a/Core/Libraries/Source/WWVegas/WWLib/WWFILE.H b/Core/Libraries/Source/WWVegas/WWLib/WWFILE.H index 3cda2e63d2..16b1bbfa0a 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/WWFILE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/WWFILE.H @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #define YEAR(dt) (((dt & 0xFE000000) >> (9 + 16)) + 1980) #define MONTH(dt) ((dt & 0x01E00000) >> (5 + 16)) #define DAY(dt) ((dt & 0x001F0000) >> (0 + 16)) diff --git a/Core/Libraries/Source/WWVegas/WWLib/XPIPE.H b/Core/Libraries/Source/WWVegas/WWLib/XPIPE.H index 02a7b279c7..4de1947bbc 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/XPIPE.H +++ b/Core/Libraries/Source/WWVegas/WWLib/XPIPE.H @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "BUFF.H" #include "PIPE.H" #include "WWFILE.H" diff --git a/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.H b/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.H index a887ae2012..c5e64cfbb9 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.H +++ b/Core/Libraries/Source/WWVegas/WWLib/XSTRAW.H @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "BUFF.H" #include "STRAW.H" #include "WWFILE.H" diff --git a/Core/Libraries/Source/WWVegas/WWLib/always.h b/Core/Libraries/Source/WWVegas/WWLib/always.h index 288f42aea7..2f0382f0b6 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/always.h +++ b/Core/Libraries/Source/WWVegas/WWLib/always.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "WWCommon.h" #include "WWDefines.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h b/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h index 4787399611..7bec6900cc 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h +++ b/Core/Libraries/Source/WWVegas/WWLib/b64pipe.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "PIPE.H" /* diff --git a/Core/Libraries/Source/WWVegas/WWLib/b64straw.h b/Core/Libraries/Source/WWVegas/WWLib/b64straw.h index 24ea324d8f..8ec279e430 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/b64straw.h +++ b/Core/Libraries/Source/WWVegas/WWLib/b64straw.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "STRAW.H" /* 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 0e5cffcae8..be591c8b47 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/bfiofile.h +++ b/Core/Libraries/Source/WWVegas/WWLib/bfiofile.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "RAWFILE.H" /* diff --git a/Core/Libraries/Source/WWVegas/WWLib/binheap.h b/Core/Libraries/Source/WWVegas/WWLib/binheap.h index 384c813901..fa4aa9447a 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/binheap.h +++ b/Core/Libraries/Source/WWVegas/WWLib/binheap.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + /*=============================================================================================*/ // Includes. /*=============================================================================================*/ diff --git a/Core/Libraries/Source/WWVegas/WWLib/bittype.h b/Core/Libraries/Source/WWVegas/WWLib/bittype.h index 6ebcc2ab84..fb16c80172 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/bittype.h +++ b/Core/Libraries/Source/WWVegas/WWLib/bittype.h @@ -34,7 +34,9 @@ *-------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + typedef unsigned char uint8; typedef unsigned short uint16; typedef unsigned long uint32; diff --git a/Core/Libraries/Source/WWVegas/WWLib/bound.h b/Core/Libraries/Source/WWVegas/WWLib/bound.h index 6847f12ae0..8f526382a5 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/bound.h +++ b/Core/Libraries/Source/WWVegas/WWLib/bound.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + template inline T Bound(T original, T minval, T maxval) { diff --git a/Core/Libraries/Source/WWVegas/WWLib/bufffile.h b/Core/Libraries/Source/WWVegas/WWLib/bufffile.h index af9a60a422..ddb6561278 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/bufffile.h +++ b/Core/Libraries/Source/WWVegas/WWLib/bufffile.h @@ -39,6 +39,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "RAWFILE.H" diff --git a/Core/Libraries/Source/WWVegas/WWLib/chunkio.h b/Core/Libraries/Source/WWVegas/WWLib/chunkio.h index d8f5d08268..47ce699b02 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/chunkio.h +++ b/Core/Libraries/Source/WWVegas/WWLib/chunkio.h @@ -34,7 +34,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/cpudetect.h b/Core/Libraries/Source/WWVegas/WWLib/cpudetect.h index a92b00dab9..76389cd91c 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/cpudetect.h +++ b/Core/Libraries/Source/WWVegas/WWLib/cpudetect.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "wwstring.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/crandom.h b/Core/Libraries/Source/WWVegas/WWLib/crandom.h index 9cb21efb08..a383ae725a 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/crandom.h +++ b/Core/Libraries/Source/WWVegas/WWLib/crandom.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/crcpipe.h b/Core/Libraries/Source/WWVegas/WWLib/crcpipe.h index a1a78042b8..b281ef33d2 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/crcpipe.h +++ b/Core/Libraries/Source/WWVegas/WWLib/crcpipe.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "CRC.H" #include "PIPE.H" diff --git a/Core/Libraries/Source/WWVegas/WWLib/crcstraw.h b/Core/Libraries/Source/WWVegas/WWLib/crcstraw.h index 18658fd606..9fac57cd0a 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/crcstraw.h +++ b/Core/Libraries/Source/WWVegas/WWLib/crcstraw.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "CRC.H" #include "STRAW.H" diff --git a/Core/Libraries/Source/WWVegas/WWLib/cstraw.h b/Core/Libraries/Source/WWVegas/WWLib/cstraw.h index 99edbe9c51..1b775f38e6 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/cstraw.h +++ b/Core/Libraries/Source/WWVegas/WWLib/cstraw.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "BUFF.H" #include "STRAW.H" diff --git a/Core/Libraries/Source/WWVegas/WWLib/ffactory.h b/Core/Libraries/Source/WWVegas/WWLib/ffactory.h index 97bb58cc97..7ecc2b6b81 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/ffactory.h +++ b/Core/Libraries/Source/WWVegas/WWLib/ffactory.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/gcd_lcm.h b/Core/Libraries/Source/WWVegas/WWLib/gcd_lcm.h index 1cf9970325..e5ce3b0225 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/gcd_lcm.h +++ b/Core/Libraries/Source/WWVegas/WWLib/gcd_lcm.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "always.h" // The greatest common divisor (GCD) is the greatest integer which is a diff --git a/Core/Libraries/Source/WWVegas/WWLib/hash.h b/Core/Libraries/Source/WWVegas/WWLib/hash.h index 2861956c40..c91e48c511 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/hash.h +++ b/Core/Libraries/Source/WWVegas/WWLib/hash.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" class HashTableIteratorClass; diff --git a/Core/Libraries/Source/WWVegas/WWLib/hashcalc.h b/Core/Libraries/Source/WWVegas/WWLib/hashcalc.h index d38b90fd8c..a01fbf08ff 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/hashcalc.h +++ b/Core/Libraries/Source/WWVegas/WWLib/hashcalc.h @@ -33,8 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once +#pragma once /* ** HashCalculatorClass diff --git a/Core/Libraries/Source/WWVegas/WWLib/hashtab.h b/Core/Libraries/Source/WWVegas/WWLib/hashtab.h index 9d527510f1..7a66ce6bbc 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/hashtab.h +++ b/Core/Libraries/Source/WWVegas/WWLib/hashtab.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #if 0 template class NamedObjectHashTableClass diff --git a/Core/Libraries/Source/WWVegas/WWLib/hashtemplate.h b/Core/Libraries/Source/WWVegas/WWLib/hashtemplate.h index 742541371f..79de6a2cad 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/hashtemplate.h +++ b/Core/Libraries/Source/WWVegas/WWLib/hashtemplate.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "wwstring.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/incdec.h b/Core/Libraries/Source/WWVegas/WWLib/incdec.h index 0a0fd5d516..e8e8ae76ed 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/incdec.h +++ b/Core/Libraries/Source/WWVegas/WWLib/incdec.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + /* ** These templates allow enumeration types to have simple bitwise ** arithmatic performed. The operators must be instatiated for the 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 85f7a6433f..60f4b2cf4e 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/iostruct.h +++ b/Core/Libraries/Source/WWVegas/WWLib/iostruct.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #ifndef BITTYPE_H #include "bittype.h" #endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzo.h b/Core/Libraries/Source/WWVegas/WWLib/lzo.h index d33a6d7801..afecc22791 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzo.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzo.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "lzoconf.h" #include "lzo1x.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzo1x.h b/Core/Libraries/Source/WWVegas/WWLib/lzo1x.h index a4d8868ede..cae5f0e368 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzo1x.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzo1x.h @@ -60,6 +60,7 @@ */ #pragma once + #include "lzoconf.h" //#ifdef __cplusplus diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzo_conf.h b/Core/Libraries/Source/WWVegas/WWLib/lzo_conf.h index c4acd8596c..8dfc79c325 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzo_conf.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzo_conf.h @@ -66,6 +66,7 @@ */ #pragma once + #ifndef __LZOCONF_H # include "lzoconf.h" #endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzoconf.h b/Core/Libraries/Source/WWVegas/WWLib/lzoconf.h index 38d77a6875..b3bf5e85e9 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzoconf.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzoconf.h @@ -60,6 +60,7 @@ */ #pragma once + #define LZO_VERSION 0x0200 #define LZO_VERSION_STRING "0.20" #define LZO_VERSION_DATE "11 Aug 1996" diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzopipe.h b/Core/Libraries/Source/WWVegas/WWLib/lzopipe.h index bf11aa74ac..5ec7ce525f 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzopipe.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzopipe.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "PIPE.H" diff --git a/Core/Libraries/Source/WWVegas/WWLib/lzostraw.h b/Core/Libraries/Source/WWVegas/WWLib/lzostraw.h index db7b23a057..aa44453786 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/lzostraw.h +++ b/Core/Libraries/Source/WWVegas/WWLib/lzostraw.h @@ -33,6 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once #include "STRAW.H" diff --git a/Core/Libraries/Source/WWVegas/WWLib/mempool.h b/Core/Libraries/Source/WWVegas/WWLib/mempool.h index fdc92f8427..3eae0cf003 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/mempool.h +++ b/Core/Libraries/Source/WWVegas/WWLib/mempool.h @@ -42,8 +42,8 @@ * AutoPoolClass::operator delete -- overriden delete which calls the internal ObjectPool * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "bittype.h" #include "wwdebug.h" #include "mutex.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/mmsys.h b/Core/Libraries/Source/WWVegas/WWLib/mmsys.h index c7b7c2c4b2..caf5335dc0 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/mmsys.h +++ b/Core/Libraries/Source/WWVegas/WWLib/mmsys.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + /* ** This header just includes mmsystem.h with warning 4201 disabled */ diff --git a/Core/Libraries/Source/WWVegas/WWLib/multilist.h b/Core/Libraries/Source/WWVegas/WWLib/multilist.h index bcc63d2bac..f99c5613e5 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/multilist.h +++ b/Core/Libraries/Source/WWVegas/WWLib/multilist.h @@ -36,8 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "mempool.h" #include diff --git a/Core/Libraries/Source/WWVegas/WWLib/mutex.h b/Core/Libraries/Source/WWVegas/WWLib/mutex.h index 61d09b32c3..cce5055f47 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/mutex.h +++ b/Core/Libraries/Source/WWVegas/WWLib/mutex.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 "always.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/noinit.h b/Core/Libraries/Source/WWVegas/WWLib/noinit.h index c5075260f7..dfbe3b1573 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/noinit.h +++ b/Core/Libraries/Source/WWVegas/WWLib/noinit.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + /********************************************************************** ** This class is solely used as a parameter to a constructor that does ** absolutely no initialization to the object being constructed. By using diff --git a/Core/Libraries/Source/WWVegas/WWLib/notifier.h b/Core/Libraries/Source/WWVegas/WWLib/notifier.h index c1847f1f38..037dceb2c4 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/notifier.h +++ b/Core/Libraries/Source/WWVegas/WWLib/notifier.h @@ -34,7 +34,9 @@ * * 06/28/02 KM Notify name change to avoid MAX conflicts * ******************************************************************************/ + #pragma once + // Reduce warning level for STL #if defined(_MSC_VER) #pragma warning(push, 3) diff --git a/Core/Libraries/Source/WWVegas/WWLib/nstrdup.h b/Core/Libraries/Source/WWVegas/WWLib/nstrdup.h index 7958da4ce4..5419dc2177 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/nstrdup.h +++ b/Core/Libraries/Source/WWVegas/WWLib/nstrdup.h @@ -35,4 +35,5 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + char * nstrdup(const char *str); diff --git a/Core/Libraries/Source/WWVegas/WWLib/ntree.h b/Core/Libraries/Source/WWVegas/WWLib/ntree.h index 4769e0029a..8aa9e1a621 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/ntree.h +++ b/Core/Libraries/Source/WWVegas/WWLib/ntree.h @@ -34,7 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once #include "refcount.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/rcfile.h b/Core/Libraries/Source/WWVegas/WWLib/rcfile.h index 2eb96bc56e..6a91465f53 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/rcfile.h +++ b/Core/Libraries/Source/WWVegas/WWLib/rcfile.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "WWFILE.H" #include "win.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/readline.h b/Core/Libraries/Source/WWVegas/WWLib/readline.h index dc8c904ca7..3fbda10412 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/readline.h +++ b/Core/Libraries/Source/WWVegas/WWLib/readline.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "STRAW.H" #include "WWFILE.H" #include diff --git a/Core/Libraries/Source/WWVegas/WWLib/realcrc.h b/Core/Libraries/Source/WWVegas/WWLib/realcrc.h index 1aedd373a4..c858e5f583 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/realcrc.h +++ b/Core/Libraries/Source/WWVegas/WWLib/realcrc.h @@ -33,6 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once unsigned long CRC_Memory( const unsigned char *data, unsigned long length, unsigned long crc = 0 ); diff --git a/Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h b/Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h index f843f80b95..fa2a880f37 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h +++ b/Core/Libraries/Source/WWVegas/WWLib/ref_ptr.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/refcount.h b/Core/Libraries/Source/WWVegas/WWLib/refcount.h index e0f1251631..7ebe68b9f4 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/refcount.h +++ b/Core/Libraries/Source/WWVegas/WWLib/refcount.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/registry.h b/Core/Libraries/Source/WWVegas/WWLib/registry.h index 387aa35531..277058a9c4 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/registry.h +++ b/Core/Libraries/Source/WWVegas/WWLib/registry.h @@ -34,6 +34,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/search.h b/Core/Libraries/Source/WWVegas/WWLib/search.h index 548a4bc881..0e8bc9c18a 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/search.h +++ b/Core/Libraries/Source/WWVegas/WWLib/search.h @@ -48,7 +48,9 @@ * IndexClass::~IndexClass -- Destructor for index handler object. * * compfunc -- Support function for bsearch and bsort. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + /* ** The "bool" integral type was defined by the C++ comittee in ** November of '94. Until the compiler supports this, use the following diff --git a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h index 628780c873..ce8fcf8584 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h +++ b/Core/Libraries/Source/WWVegas/WWLib/sharebuf.h @@ -33,7 +33,9 @@ *-------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "refcount.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/simplevec.h b/Core/Libraries/Source/WWVegas/WWLib/simplevec.h index 6bd0acdfbb..15be28017f 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/simplevec.h +++ b/Core/Libraries/Source/WWVegas/WWLib/simplevec.h @@ -48,6 +48,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include #include // for memmove diff --git a/Core/Libraries/Source/WWVegas/WWLib/stimer.h b/Core/Libraries/Source/WWVegas/WWLib/stimer.h index aa9259960f..54d080ba41 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/stimer.h +++ b/Core/Libraries/Source/WWVegas/WWLib/stimer.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + /**************************************************************************** ** Timer constants. These are used when setting the countdown timer. ** Note that this is based upon a timer that ticks every 60th of a second. diff --git a/Core/Libraries/Source/WWVegas/WWLib/strtok_r.h b/Core/Libraries/Source/WWVegas/WWLib/strtok_r.h index dedcde4ac1..0d0d22d691 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/strtok_r.h +++ b/Core/Libraries/Source/WWVegas/WWLib/strtok_r.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #ifndef _UNIX char *strtok_r(char *strptr, const char *delimiters, char **lasts); #endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/swap.h b/Core/Libraries/Source/WWVegas/WWLib/swap.h index d8a83f8440..b0a61e46c9 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/swap.h +++ b/Core/Libraries/Source/WWVegas/WWLib/swap.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + /********************************************************************** ** Swaps two objects. */ 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/tgatodxt.h b/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.h index d7b6392350..778b5934a3 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.h +++ b/Core/Libraries/Source/WWVegas/WWLib/tgatodxt.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #pragma message ("(gth) disabling TGAtoDXTClass temporarily so I can test the WW libs merge...") #if 0 diff --git a/Core/Libraries/Source/WWVegas/WWLib/thread.h b/Core/Libraries/Source/WWVegas/WWLib/thread.h index 37efab9fb2..c55665a3cb 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/thread.h +++ b/Core/Libraries/Source/WWVegas/WWLib/thread.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 "always.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/trect.h b/Core/Libraries/Source/WWVegas/WWLib/trect.h index 5074a6f176..b302888f5f 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/trect.h +++ b/Core/Libraries/Source/WWVegas/WWLib/trect.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "Point.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/trim.h b/Core/Libraries/Source/WWVegas/WWLib/trim.h index 90aa79323c..cdb550eaa9 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/trim.h +++ b/Core/Libraries/Source/WWVegas/WWLib/trim.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include char * strtrim(char * buffer); diff --git a/Core/Libraries/Source/WWVegas/WWLib/uarray.h b/Core/Libraries/Source/WWVegas/WWLib/uarray.h index f38957d2b4..26904fcfe6 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/uarray.h +++ b/Core/Libraries/Source/WWVegas/WWLib/uarray.h @@ -36,7 +36,9 @@ * UniqueArrayClass::~UniqueArrayClass -- destructor * * UniqueArrayClass::Add -- Add an item to the array * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #ifndef HASHCALC_H #include "hashcalc.h" #endif diff --git a/Core/Libraries/Source/WWVegas/WWLib/verchk.h b/Core/Libraries/Source/WWVegas/WWLib/verchk.h index 4901d7e269..2dbebead96 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/verchk.h +++ b/Core/Libraries/Source/WWVegas/WWLib/verchk.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include // Obtain version information from the specified file. 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 862c4f3101..9790e4a305 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/widestring.h +++ b/Core/Libraries/Source/WWVegas/WWLib/widestring.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include #include #include "always.h" diff --git a/Core/Libraries/Source/WWVegas/WWLib/win.h b/Core/Libraries/Source/WWVegas/WWLib/win.h index dbed74903f..70ef32dc39 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/win.h +++ b/Core/Libraries/Source/WWVegas/WWLib/win.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + /* ** This header file includes the Windows headers. If there are any special pragmas that need ** to occur around this process, they are performed here. Typically, certain warnings will need diff --git a/Core/Libraries/Source/WWVegas/WWLib/wwstring.h b/Core/Libraries/Source/WWVegas/WWLib/wwstring.h index 67cbdec7c0..1f30ccec7c 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/wwstring.h +++ b/Core/Libraries/Source/WWVegas/WWLib/wwstring.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "mutex.h" #include "win.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/Vector3i.h b/Core/Libraries/Source/WWVegas/WWMath/Vector3i.h index 2e67e7e0c4..d91f87b6c4 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/Vector3i.h +++ b/Core/Libraries/Source/WWVegas/WWMath/Vector3i.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" class Vector3i diff --git a/Core/Libraries/Source/WWVegas/WWMath/aabox.h b/Core/Libraries/Source/WWVegas/WWMath/aabox.h index 5eeb4e3bad..eb0b29669f 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/aabox.h +++ b/Core/Libraries/Source/WWVegas/WWMath/aabox.h @@ -53,6 +53,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "matrix3d.h" #include "lineseg.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h b/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h index aee208904a..7d0928bc5a 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h +++ b/Core/Libraries/Source/WWVegas/WWMath/aabtreecull.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "cullsys.h" #include "aaplane.h" #include "wwmath.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/aaplane.h b/Core/Libraries/Source/WWVegas/WWMath/aaplane.h index 79e57a5ffc..0e7cb97e02 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/aaplane.h +++ b/Core/Libraries/Source/WWVegas/WWMath/aaplane.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "vector3.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h index 6080f508a9..504429dc53 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/cardinalspline.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "hermitespline.h" /** diff --git a/Core/Libraries/Source/WWVegas/WWMath/castres.h b/Core/Libraries/Source/WWVegas/WWMath/castres.h index 7a5ea81597..69a577df6f 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/castres.h +++ b/Core/Libraries/Source/WWVegas/WWMath/castres.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "vector3.h" #include "bittype.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h b/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h index 15292b7e44..e970ece445 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/catmullromspline.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "hermitespline.h" /** diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmath.h b/Core/Libraries/Source/WWVegas/WWMath/colmath.h index 84b278417a..5c7d999a66 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmath.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmath.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.h b/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.h index 0607d4977b..70b8c50c0b 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathaabox.h @@ -39,6 +39,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "aabox.h" #include "vector3.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.h b/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.h index 7ebc58d538..528ac9b688 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathfrustum.h @@ -38,6 +38,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "aabox.h" #include "vector3.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathinlines.h b/Core/Libraries/Source/WWVegas/WWMath/colmathinlines.h index b1b26b32b4..d06e715bea 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathinlines.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathinlines.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "colmathaabox.h" #include "colmathfrustum.h" #include "colmathline.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathline.h b/Core/Libraries/Source/WWVegas/WWMath/colmathline.h index 76f5172484..3dd52c2ebb 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathline.h @@ -35,7 +35,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + /* ** Inline collision functions dealing with line segments */ diff --git a/Core/Libraries/Source/WWVegas/WWMath/colmathplane.h b/Core/Libraries/Source/WWVegas/WWMath/colmathplane.h index b252ce4fe2..dcf0027ec5 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/colmathplane.h +++ b/Core/Libraries/Source/WWVegas/WWMath/colmathplane.h @@ -40,6 +40,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "plane.h" #include "aabox.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/cullsys.h b/Core/Libraries/Source/WWVegas/WWMath/cullsys.h index c36826b994..a493fd1641 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/cullsys.h +++ b/Core/Libraries/Source/WWVegas/WWMath/cullsys.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "wwdebug.h" #include "stdlib.h" #include "refcount.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/culltype.h b/Core/Libraries/Source/WWVegas/WWMath/culltype.h index 37bd178603..83ebc08b3a 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/culltype.h +++ b/Core/Libraries/Source/WWVegas/WWMath/culltype.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" /* diff --git a/Core/Libraries/Source/WWVegas/WWMath/curve.h b/Core/Libraries/Source/WWVegas/WWMath/curve.h index fa98d1d538..5b27820dbf 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/curve.h +++ b/Core/Libraries/Source/WWVegas/WWMath/curve.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/euler.h b/Core/Libraries/Source/WWVegas/WWMath/euler.h index f6bb2aaa0a..70dc0521cd 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/euler.h +++ b/Core/Libraries/Source/WWVegas/WWMath/euler.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "matrix3d.h" #include "quat.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/frustum.h b/Core/Libraries/Source/WWVegas/WWMath/frustum.h index 55537b02f9..0d46f6a692 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/frustum.h +++ b/Core/Libraries/Source/WWVegas/WWMath/frustum.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "vector3.h" #include "plane.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/hermitespline.h b/Core/Libraries/Source/WWVegas/WWMath/hermitespline.h index ceb87b9707..70d3f83bea 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/hermitespline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/hermitespline.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "curve.h" /* diff --git a/Core/Libraries/Source/WWVegas/WWMath/lineseg.h b/Core/Libraries/Source/WWVegas/WWMath/lineseg.h index 3017ce6799..3e0f90a0f1 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/lineseg.h +++ b/Core/Libraries/Source/WWVegas/WWMath/lineseg.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "vector3.h" #include "castres.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h b/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h index 7a57f0c347..489adeff57 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h +++ b/Core/Libraries/Source/WWVegas/WWMath/lookuptable.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "simplevec.h" #include "wwstring.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/matrix3.h b/Core/Libraries/Source/WWVegas/WWMath/matrix3.h index e247d37ea5..98fec5b56b 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/matrix3.h +++ b/Core/Libraries/Source/WWVegas/WWMath/matrix3.h @@ -56,8 +56,8 @@ * Matrix3x3::Rotate_Z -- Post-multiplies the matrix with a rotation about Z * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "vector3.h" #include "wwdebug.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h b/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h index 5600b2cf21..66384b9c7b 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h +++ b/Core/Libraries/Source/WWVegas/WWMath/matrix3d.h @@ -79,6 +79,7 @@ #define NO_ALLOW_TEMPORARIES #pragma once + #ifdef _UNIX #include "osdep.h" #endif diff --git a/Core/Libraries/Source/WWVegas/WWMath/matrix4.h b/Core/Libraries/Source/WWVegas/WWMath/matrix4.h index 678763ff47..3da1991021 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/matrix4.h +++ b/Core/Libraries/Source/WWVegas/WWMath/matrix4.h @@ -56,7 +56,6 @@ * Matrix4x4::operator /= -- "divide equals" operator * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once #include "always.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/normalcone.h b/Core/Libraries/Source/WWVegas/WWMath/normalcone.h index 04c764d4ee..d4cd659e52 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/normalcone.h +++ b/Core/Libraries/Source/WWVegas/WWMath/normalcone.h @@ -42,7 +42,9 @@ ** The term 'NormalCone' is a bit of a misnomer; it is really a circular portion of a sphere. ** -ehc */ + #pragma once + #include "vector3.h" #include "matrix3.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/obbox.h b/Core/Libraries/Source/WWVegas/WWMath/obbox.h index f41f6d2ddb..4e3f7f141c 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/obbox.h +++ b/Core/Libraries/Source/WWVegas/WWMath/obbox.h @@ -42,6 +42,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "vector3.h" #include "matrix3.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/ode.h b/Core/Libraries/Source/WWVegas/WWMath/ode.h index b496f10a98..24d159ba44 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/ode.h +++ b/Core/Libraries/Source/WWVegas/WWMath/ode.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "Vector.H" #include "wwdebug.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/plane.h b/Core/Libraries/Source/WWVegas/WWMath/plane.h index 8b2ef19cd6..43f18f5eb1 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/plane.h +++ b/Core/Libraries/Source/WWVegas/WWMath/plane.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "vector3.h" #include "sphere.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/pot.h b/Core/Libraries/Source/WWVegas/WWMath/pot.h index 89df84060b..8d5af74010 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/pot.h +++ b/Core/Libraries/Source/WWVegas/WWMath/pot.h @@ -35,5 +35,6 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + int Find_POT(int val); unsigned int Find_POT_Log2(unsigned int val); diff --git a/Core/Libraries/Source/WWVegas/WWMath/quat.h b/Core/Libraries/Source/WWVegas/WWMath/quat.h index af2a91fb5d..1b43b0793f 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/quat.h +++ b/Core/Libraries/Source/WWVegas/WWMath/quat.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "wwmath.h" #include "matrix3.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/rect.h b/Core/Libraries/Source/WWVegas/WWMath/rect.h index ef10049f86..b99fd42c8a 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/rect.h +++ b/Core/Libraries/Source/WWVegas/WWMath/rect.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "vector2.h" class RectClass diff --git a/Core/Libraries/Source/WWVegas/WWMath/sphere.h b/Core/Libraries/Source/WWVegas/WWMath/sphere.h index 86e623c8fa..1c8fc4ea97 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/sphere.h +++ b/Core/Libraries/Source/WWVegas/WWMath/sphere.h @@ -48,8 +48,8 @@ * operator * -- Transform a sphere * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "vector3.h" #include "matrix3d.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/tcbspline.h b/Core/Libraries/Source/WWVegas/WWMath/tcbspline.h index a8a3200217..23ec6b7e45 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/tcbspline.h +++ b/Core/Libraries/Source/WWVegas/WWMath/tcbspline.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "hermitespline.h" /* diff --git a/Core/Libraries/Source/WWVegas/WWMath/tri.h b/Core/Libraries/Source/WWVegas/WWMath/tri.h index 46308c1710..77c9889e0b 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/tri.h +++ b/Core/Libraries/Source/WWVegas/WWMath/tri.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "vector4.h" #include "vector3.h" diff --git a/Core/Libraries/Source/WWVegas/WWMath/v3_rnd.h b/Core/Libraries/Source/WWVegas/WWMath/v3_rnd.h index 5b5a727fc9..c7d5581c6e 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/v3_rnd.h +++ b/Core/Libraries/Source/WWVegas/WWMath/v3_rnd.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "always.h" #include "vector3.h" #include "RANDOM.H" diff --git a/Core/Libraries/Source/WWVegas/WWMath/vector2.h b/Core/Libraries/Source/WWVegas/WWMath/vector2.h index 3b1c035d5f..5396e4ee5a 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vector2.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vector2.h @@ -50,6 +50,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "wwmath.h" #include diff --git a/Core/Libraries/Source/WWVegas/WWMath/vector2i.h b/Core/Libraries/Source/WWVegas/WWMath/vector2i.h index e6b8bdc52b..0645d090a0 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vector2i.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vector2i.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" class Vector2i diff --git a/Core/Libraries/Source/WWVegas/WWMath/vector3.h b/Core/Libraries/Source/WWVegas/WWMath/vector3.h index c9d3f9e6a3..092ac90aee 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vector3.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vector3.h @@ -64,6 +64,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "wwmath.h" #include diff --git a/Core/Libraries/Source/WWVegas/WWMath/vector4.h b/Core/Libraries/Source/WWVegas/WWMath/vector4.h index 641e49f04c..7e89509239 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vector4.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vector4.h @@ -45,6 +45,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "wwmath.h" #include diff --git a/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.h b/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.h index ec1b980328..6fbf1a7e75 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vehiclecurve.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "curve.h" #include "Vector.H" diff --git a/Core/Libraries/Source/WWVegas/WWMath/vp.h b/Core/Libraries/Source/WWVegas/WWMath/vp.h index 21ccbdf2e3..937188093f 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/vp.h +++ b/Core/Libraries/Source/WWVegas/WWMath/vp.h @@ -46,6 +46,7 @@ */ #pragma once + class Vector2; class Vector3; class Vector4; diff --git a/Core/Libraries/Source/WWVegas/WWMath/wwmath.h b/Core/Libraries/Source/WWVegas/WWMath/wwmath.h index 2a1b48fdc0..35372397a9 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/wwmath.h +++ b/Core/Libraries/Source/WWVegas/WWMath/wwmath.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include #include diff --git a/Core/Libraries/Source/WWVegas/WWMath/wwmathids.h b/Core/Libraries/Source/WWVegas/WWMath/wwmathids.h index f9af6fe4b5..786757d843 100644 --- a/Core/Libraries/Source/WWVegas/WWMath/wwmathids.h +++ b/Core/Libraries/Source/WWVegas/WWMath/wwmathids.h @@ -35,7 +35,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "saveloadids.h" /* diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.h index c45f520a4c..471c39ceac 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definition.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" // SKB Remove because of G conflicts with CLASSID_?? #include "definitionclassids.h" diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionclassids.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionclassids.h index ed1b641ddf..8d74a2d5a0 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionclassids.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionclassids.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "bittype.h" diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactory.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactory.h index f556bfd7d5..a7230b95d4 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactory.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactory.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "bittype.h" #include "definitionclassids.h" diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.h index 24e22f9f70..dd317f0759 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionfactorymgr.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "bittype.h" #include "definitionclassids.h" diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.h index ea7e1afb3f..31a10261bf 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/definitionmgr.h @@ -34,7 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once #include "always.h" diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/editable.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/editable.h index 4fe64cde56..059b5dcf9a 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/editable.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/editable.h @@ -41,10 +41,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - #include "always.h" #include "persist.h" #include "parameter.h" diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.h index 9a85b4d660..f86d20bec5 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameter.h @@ -36,8 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include #include diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h index 39a07ee0fa..22adf86cb2 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/parameterlist.h @@ -34,11 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - - #include "always.h" #include "Vector.H" #include "parameter.h" diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/parametertypes.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/parametertypes.h index 4bef4824e7..8964521f6f 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/parametertypes.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/parametertypes.h @@ -34,10 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - #include "always.h" ////////////////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/persist.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/persist.h index 9bd68e60ac..8c544127cb 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/persist.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/persist.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "refcount.h" #include "postloadable.h" diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h index af06d92eca..0599936a17 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/persistfactory.h @@ -34,11 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - - #include "always.h" #include "bittype.h" #include "chunkio.h" diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.h index 6658b447f5..8ce0566a07 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/pointerremap.h @@ -34,7 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once #ifdef _UNIX diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/postloadable.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/postloadable.h index 9396c9b4a3..d6c0e555f2 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/postloadable.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/postloadable.h @@ -35,6 +35,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once ////////////////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.h index 376b64e657..1b314da806 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveload.h @@ -34,7 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once #include "always.h" diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadids.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadids.h index ccf12efe24..ee8e111ce1 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadids.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadids.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + ////////////////////////////////////////////////////////////////////////////////// // // Chunk ID Ranges. diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.h index 28de12f80c..776dbae40f 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadstatus.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 "always.h" diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h index 3f845c6d6b..46c7d98da2 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/saveloadsubsystem.h @@ -34,10 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - #include "always.h" #include "bittype.h" #include "postloadable.h" diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h index 202b261ac3..914ac836df 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h @@ -16,8 +16,8 @@ ** along with this program. If not, see . */ - #pragma once + #include "definitionfactory.h" ////////////////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h index 861270842a..af9f6dbd24 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpleparameter.h @@ -34,11 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once - - #include "always.h" #include "parameter.h" #include "vector2.h" diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h index 5c28397d4a..7c45af94f6 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/twiddler.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "definition.h" #include "definitionclassids.h" diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/wwsaveload.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/wwsaveload.h index 28975d441e..8863266b1b 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/wwsaveload.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/wwsaveload.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + /** ** WWSaveLoad ** The Init and Shutdown functions should be called once by the App. diff --git a/Core/Libraries/Source/debug/_pch.h b/Core/Libraries/Source/debug/_pch.h index 7d8ae72962..a242090ae8 100644 --- a/Core/Libraries/Source/debug/_pch.h +++ b/Core/Libraries/Source/debug/_pch.h @@ -26,7 +26,9 @@ // // Precompiled header (module internal) ////////////////////////////////////////////////////////////////////////////// + #pragma once + #include "debug.h" // we need windows.h at too many places... diff --git a/Core/Libraries/Source/debug/debug.h b/Core/Libraries/Source/debug/debug.h index d228500724..11b75830a1 100644 --- a/Core/Libraries/Source/debug/debug.h +++ b/Core/Libraries/Source/debug/debug.h @@ -26,7 +26,9 @@ // // Debugging module ////////////////////////////////////////////////////////////////////////////// + #pragma once + /** \page lib_var Library variants diff --git a/Core/Libraries/Source/debug/debug_cmd.h b/Core/Libraries/Source/debug/debug_cmd.h index cf80c053e2..3e7f0bc45c 100644 --- a/Core/Libraries/Source/debug/debug_cmd.h +++ b/Core/Libraries/Source/debug/debug_cmd.h @@ -26,7 +26,9 @@ // // Debug command interface ////////////////////////////////////////////////////////////////////////////// + #pragma once + /** \interface DebugCmdInterface debug.h diff --git a/Core/Libraries/Source/debug/debug_debug.h b/Core/Libraries/Source/debug/debug_debug.h index 08e6f0d7cf..956fa6f229 100644 --- a/Core/Libraries/Source/debug/debug_debug.h +++ b/Core/Libraries/Source/debug/debug_debug.h @@ -26,7 +26,9 @@ // // main Debug object (singleton) ////////////////////////////////////////////////////////////////////////////// + #pragma once + /** \class Debug debug.h diff --git a/Core/Libraries/Source/debug/debug_doc.h b/Core/Libraries/Source/debug/debug_doc.h index f55b00c9ab..364da4d85a 100644 --- a/Core/Libraries/Source/debug/debug_doc.h +++ b/Core/Libraries/Source/debug/debug_doc.h @@ -26,7 +26,9 @@ // // additional Doxygen module documentation ////////////////////////////////////////////////////////////////////////////// + #pragma once + // This generates a small main page for Doxygen if a module only // documentation is built. #ifndef DOXYGEN_GLOBAL_DOC diff --git a/Core/Libraries/Source/debug/debug_io.h b/Core/Libraries/Source/debug/debug_io.h index 066dcc70a5..f1d14a7ec5 100644 --- a/Core/Libraries/Source/debug/debug_io.h +++ b/Core/Libraries/Source/debug/debug_io.h @@ -26,7 +26,9 @@ // // Debug I/O interface ////////////////////////////////////////////////////////////////////////////// + #pragma once + /** \interface DebugIOInterface debug.h diff --git a/Core/Libraries/Source/debug/debug_macro.h b/Core/Libraries/Source/debug/debug_macro.h index 366f8a028b..b4b0f07400 100644 --- a/Core/Libraries/Source/debug/debug_macro.h +++ b/Core/Libraries/Source/debug/debug_macro.h @@ -26,7 +26,9 @@ // // Debugging macros ////////////////////////////////////////////////////////////////////////////// + #pragma once + // I'm putting the documentation for the following macros // here because Doxygen otherwise includes the values of each macro // in the documentation. I don't want that (it would expose some diff --git a/Core/Libraries/Source/debug/debug_stack.h b/Core/Libraries/Source/debug/debug_stack.h index 97a8807ccf..fdb6677f8f 100644 --- a/Core/Libraries/Source/debug/debug_stack.h +++ b/Core/Libraries/Source/debug/debug_stack.h @@ -26,7 +26,9 @@ // // Stack walker ////////////////////////////////////////////////////////////////////////////// + #pragma once + /// \brief stack walker class (singleton) class DebugStackwalk { diff --git a/Core/Libraries/Source/debug/internal.h b/Core/Libraries/Source/debug/internal.h index 0080fbcef6..775bcc8445 100644 --- a/Core/Libraries/Source/debug/internal.h +++ b/Core/Libraries/Source/debug/internal.h @@ -26,7 +26,9 @@ // // Internal header ////////////////////////////////////////////////////////////////////////////// + #pragma once + // make sure we're not omitting the frame pointer #pragma optimize("y",off) diff --git a/Core/Libraries/Source/debug/internal_except.h b/Core/Libraries/Source/debug/internal_except.h index 9b55a7e35c..2e17cd0f03 100644 --- a/Core/Libraries/Source/debug/internal_except.h +++ b/Core/Libraries/Source/debug/internal_except.h @@ -26,7 +26,9 @@ // // Unhandled exception handler ////////////////////////////////////////////////////////////////////////////// + #pragma once + /// \internal exception handler class DebugExceptionhandler { diff --git a/Core/Libraries/Source/debug/internal_io.h b/Core/Libraries/Source/debug/internal_io.h index d23a3add3f..8c2948cabf 100644 --- a/Core/Libraries/Source/debug/internal_io.h +++ b/Core/Libraries/Source/debug/internal_io.h @@ -26,7 +26,9 @@ // // Internal header: I/O classes ////////////////////////////////////////////////////////////////////////////// + #pragma once + /// \internal \brief con debug I/O class class DebugIOCon: public DebugIOInterface { diff --git a/Core/Libraries/Source/debug/test2/StdAfx.h b/Core/Libraries/Source/debug/test2/StdAfx.h index 1cbe23e482..a435c4af8d 100644 --- a/Core/Libraries/Source/debug/test2/StdAfx.h +++ b/Core/Libraries/Source/debug/test2/StdAfx.h @@ -20,6 +20,7 @@ // or project specific include files that are used frequently, but // are changed infrequently // + #pragma once #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers diff --git a/Core/Libraries/Source/profile/_pch.h b/Core/Libraries/Source/profile/_pch.h index e544dca02d..598796c700 100644 --- a/Core/Libraries/Source/profile/_pch.h +++ b/Core/Libraries/Source/profile/_pch.h @@ -26,7 +26,9 @@ // // Precompiled header (module internal) ////////////////////////////////////////////////////////////////////////////// + #pragma once + #define WIN32_LEAN_AND_MEAN #define STRICT #include diff --git a/Core/Libraries/Source/profile/internal.h b/Core/Libraries/Source/profile/internal.h index e537afac76..438c03c8ff 100644 --- a/Core/Libraries/Source/profile/internal.h +++ b/Core/Libraries/Source/profile/internal.h @@ -26,7 +26,9 @@ // // Internal header ////////////////////////////////////////////////////////////////////////////// + #pragma once + #include "../debug/debug.h" #include "internal_funclevel.h" #include "internal_highlevel.h" diff --git a/Core/Libraries/Source/profile/internal_cmd.h b/Core/Libraries/Source/profile/internal_cmd.h index 1b0ce0e3b4..b46cb1e17c 100644 --- a/Core/Libraries/Source/profile/internal_cmd.h +++ b/Core/Libraries/Source/profile/internal_cmd.h @@ -26,7 +26,9 @@ // // Profile module command interface ////////////////////////////////////////////////////////////////////////////// + #pragma once + class ProfileCmdInterface: public DebugCmdInterface { struct Factory diff --git a/Core/Libraries/Source/profile/internal_funclevel.h b/Core/Libraries/Source/profile/internal_funclevel.h index 293b5455e2..81d6f81893 100644 --- a/Core/Libraries/Source/profile/internal_funclevel.h +++ b/Core/Libraries/Source/profile/internal_funclevel.h @@ -26,7 +26,9 @@ // // Function level profiling (internal header) ////////////////////////////////////////////////////////////////////////////// + #pragma once + class ProfileFuncLevelTracer { friend class ProfileCmdInterface; diff --git a/Core/Libraries/Source/profile/internal_highlevel.h b/Core/Libraries/Source/profile/internal_highlevel.h index 35c40739eb..2d9c572755 100644 --- a/Core/Libraries/Source/profile/internal_highlevel.h +++ b/Core/Libraries/Source/profile/internal_highlevel.h @@ -26,7 +26,9 @@ // // High level profiling (internal header) ////////////////////////////////////////////////////////////////////////////// + #pragma once + /// an internal high level profile ID class ProfileId { diff --git a/Core/Libraries/Source/profile/internal_result.h b/Core/Libraries/Source/profile/internal_result.h index e5cb5ca579..a62f082a39 100644 --- a/Core/Libraries/Source/profile/internal_result.h +++ b/Core/Libraries/Source/profile/internal_result.h @@ -26,7 +26,9 @@ // // Internal result functions ////////////////////////////////////////////////////////////////////////////// + #pragma once + /// \brief Simple CSV format flat file result function, for all threads. class ProfileResultFileCSV: public ProfileResultInterface { diff --git a/Core/Libraries/Source/profile/profile.h b/Core/Libraries/Source/profile/profile.h index 906e5754d5..92dde861b8 100644 --- a/Core/Libraries/Source/profile/profile.h +++ b/Core/Libraries/Source/profile/profile.h @@ -26,7 +26,9 @@ // // Profiling module ////////////////////////////////////////////////////////////////////////////// + #pragma once + // include all our public header files (use double quotes here) #include "profile_doc.h" #include "profile_highlevel.h" diff --git a/Core/Libraries/Source/profile/profile_doc.h b/Core/Libraries/Source/profile/profile_doc.h index 9454820d7d..7fb82b37ab 100644 --- a/Core/Libraries/Source/profile/profile_doc.h +++ b/Core/Libraries/Source/profile/profile_doc.h @@ -26,7 +26,9 @@ // // additional Doxygen module documentation ////////////////////////////////////////////////////////////////////////////// + #pragma once + // This generates a small main page for Doxygen if a module only // documentation is built. #ifndef DOXYGEN_GLOBAL_DOC diff --git a/Core/Libraries/Source/profile/profile_funclevel.h b/Core/Libraries/Source/profile/profile_funclevel.h index c7cddf0a1a..afe2227b0f 100644 --- a/Core/Libraries/Source/profile/profile_funclevel.h +++ b/Core/Libraries/Source/profile/profile_funclevel.h @@ -26,7 +26,9 @@ // // Function level profiling ////////////////////////////////////////////////////////////////////////////// + #pragma once + /** \brief The function level profiler. diff --git a/Core/Libraries/Source/profile/profile_highlevel.h b/Core/Libraries/Source/profile/profile_highlevel.h index 9eaac63fed..dea386181b 100644 --- a/Core/Libraries/Source/profile/profile_highlevel.h +++ b/Core/Libraries/Source/profile/profile_highlevel.h @@ -26,7 +26,9 @@ // // High level profiling ////////////////////////////////////////////////////////////////////////////// + #pragma once + /// \internal internal Id representation class ProfileId; diff --git a/Core/Libraries/Source/profile/profile_result.h b/Core/Libraries/Source/profile/profile_result.h index 61d58b9d61..64a619ebfd 100644 --- a/Core/Libraries/Source/profile/profile_result.h +++ b/Core/Libraries/Source/profile/profile_result.h @@ -26,7 +26,9 @@ // // Result function interface and result functions ////////////////////////////////////////////////////////////////////////////// + #pragma once + /** \brief Result function class. diff --git a/Core/Tools/Autorun/ARGS.H b/Core/Tools/Autorun/ARGS.H index 6638d0f610..fad81dea36 100644 --- a/Core/Tools/Autorun/ARGS.H +++ b/Core/Tools/Autorun/ARGS.H @@ -29,7 +29,9 @@ // ArgC_ArgV.h // //================================================================================================ + #pragma once + //---------------------------------------------------------------------------- // INCLUDES //---------------------------------------------------------------------------- diff --git a/Core/Tools/Autorun/CDCNTRL.H b/Core/Tools/Autorun/CDCNTRL.H index a48c0275df..869fa2dd22 100644 --- a/Core/Tools/Autorun/CDCNTRL.H +++ b/Core/Tools/Autorun/CDCNTRL.H @@ -36,7 +36,6 @@ #pragma once - //#include "always.h" //#include #define STRICT diff --git a/Core/Tools/Autorun/CallbackHook.h b/Core/Tools/Autorun/CallbackHook.h index 943204d708..1bbaac4a92 100644 --- a/Core/Tools/Autorun/CallbackHook.h +++ b/Core/Tools/Autorun/CallbackHook.h @@ -32,7 +32,9 @@ * $Revision: 2 $ * ******************************************************************************/ + #pragma once + class CallbackHook { public: diff --git a/Core/Tools/Autorun/DrawButton.h b/Core/Tools/Autorun/DrawButton.h index 917c36368c..5cd3ba8341 100644 --- a/Core/Tools/Autorun/DrawButton.h +++ b/Core/Tools/Autorun/DrawButton.h @@ -30,7 +30,9 @@ * * * Last Update : October 5, 2000 [MML] * *----------------------------------------------------------------------*/ + #pragma once + #include #include #include "TTFont.h" diff --git a/Core/Tools/Autorun/Locale_API.h b/Core/Tools/Autorun/Locale_API.h index e3534562c6..73cd605453 100644 --- a/Core/Tools/Autorun/Locale_API.h +++ b/Core/Tools/Autorun/Locale_API.h @@ -35,6 +35,7 @@ *************************************************************************************************/ #pragma once + #include /****************************************************************************/ diff --git a/Core/Tools/Autorun/POINT.h b/Core/Tools/Autorun/POINT.h index 64eebc9875..5c2df4f84b 100644 --- a/Core/Tools/Autorun/POINT.h +++ b/Core/Tools/Autorun/POINT.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include //#include "always.h" //#include "cctypes.h" diff --git a/Core/Tools/Autorun/RECT.h b/Core/Tools/Autorun/RECT.h index ee0c225f7a..4b554fa3a5 100644 --- a/Core/Tools/Autorun/RECT.h +++ b/Core/Tools/Autorun/RECT.h @@ -36,7 +36,9 @@ * Intersect -- Find the intersection between two rectangles. * * Intersect -- Simple intersect between two rectangles. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include #include "POINT.h" diff --git a/Core/Tools/Autorun/TTFont.h b/Core/Tools/Autorun/TTFont.h index e461c84ad9..56138857bf 100644 --- a/Core/Tools/Autorun/TTFont.h +++ b/Core/Tools/Autorun/TTFont.h @@ -35,7 +35,9 @@ *----------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -*/ + #pragma once + #include #include "POINT.h" #include "RECT.h" diff --git a/Core/Tools/Autorun/Utils.h b/Core/Tools/Autorun/Utils.h index 040d690444..4a5ecb729c 100644 --- a/Core/Tools/Autorun/Utils.h +++ b/Core/Tools/Autorun/Utils.h @@ -33,7 +33,9 @@ *-------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include diff --git a/Core/Tools/Autorun/ViewHTML.h b/Core/Tools/Autorun/ViewHTML.h index fccb9ae7a2..9279465937 100644 --- a/Core/Tools/Autorun/ViewHTML.h +++ b/Core/Tools/Autorun/ViewHTML.h @@ -31,7 +31,9 @@ * $Revision: 3 $ * ******************************************************************************/ + #pragma once + #include "CallbackHook.h" bool ViewHTML(const char* url, bool wait = false, const CallbackHook& callback = CallbackHook()); diff --git a/Core/Tools/Autorun/WSYS_FileSystem.h b/Core/Tools/Autorun/WSYS_FileSystem.h index 8b4ebf49fa..7906b70da7 100644 --- a/Core/Tools/Autorun/WSYS_FileSystem.h +++ b/Core/Tools/Autorun/WSYS_FileSystem.h @@ -37,7 +37,6 @@ #pragma once - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- diff --git a/Core/Tools/Autorun/WSYS_RAMFile.h b/Core/Tools/Autorun/WSYS_RAMFile.h index 145cf6fc2e..f890ee7f43 100644 --- a/Core/Tools/Autorun/WSYS_RAMFile.h +++ b/Core/Tools/Autorun/WSYS_RAMFile.h @@ -37,7 +37,6 @@ #pragma once - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- diff --git a/Core/Tools/Autorun/WSYS_StdFile.h b/Core/Tools/Autorun/WSYS_StdFile.h index 8f6c79195f..867c71e5c3 100644 --- a/Core/Tools/Autorun/WSYS_StdFile.h +++ b/Core/Tools/Autorun/WSYS_StdFile.h @@ -37,7 +37,6 @@ #pragma once - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- diff --git a/Core/Tools/Autorun/WSYS_StdFileSystem.h b/Core/Tools/Autorun/WSYS_StdFileSystem.h index 795e314d03..62a0ab21e2 100644 --- a/Core/Tools/Autorun/WSYS_StdFileSystem.h +++ b/Core/Tools/Autorun/WSYS_StdFileSystem.h @@ -37,7 +37,6 @@ #pragma once - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- diff --git a/Core/Tools/Autorun/WSYS_file.h b/Core/Tools/Autorun/WSYS_file.h index fd43365507..34cd965d82 100644 --- a/Core/Tools/Autorun/WSYS_file.h +++ b/Core/Tools/Autorun/WSYS_file.h @@ -37,7 +37,6 @@ #pragma once - //---------------------------------------------------------------------------- // Includes //---------------------------------------------------------------------------- diff --git a/Core/Tools/Autorun/Wnd_File.h b/Core/Tools/Autorun/Wnd_File.h index 0bc411c197..eabc7e861b 100644 --- a/Core/Tools/Autorun/Wnd_File.h +++ b/Core/Tools/Autorun/Wnd_File.h @@ -38,7 +38,9 @@ // James McNeill // //**************************************************************************** + #pragma once + //------------------------------------------------------------------------------ // include files... //------------------------------------------------------------------------------ diff --git a/Core/Tools/Autorun/autorun.h b/Core/Tools/Autorun/autorun.h index 3219e57e14..65a10e1124 100644 --- a/Core/Tools/Autorun/autorun.h +++ b/Core/Tools/Autorun/autorun.h @@ -35,6 +35,7 @@ *************************************************************************************************/ #pragma once + #include #include #include diff --git a/Core/Tools/Autorun/gimex.h b/Core/Tools/Autorun/gimex.h index 0fa68937af..b1dd321c79 100644 --- a/Core/Tools/Autorun/gimex.h +++ b/Core/Tools/Autorun/gimex.h @@ -21,7 +21,9 @@ /* ABSTRACT gimex.h - Graphics IMport EXport (GIMEX) v2.26 @ */ + #pragma once + #ifdef __cplusplus extern "C" { #endif diff --git a/Core/Tools/Autorun/leanAndMeanAutorun.h b/Core/Tools/Autorun/leanAndMeanAutorun.h index b85d44712a..5713622d7f 100644 --- a/Core/Tools/Autorun/leanAndMeanAutorun.h +++ b/Core/Tools/Autorun/leanAndMeanAutorun.h @@ -20,6 +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 #define LEAN_AND_MEAN diff --git a/Core/Tools/Autorun/locale.h b/Core/Tools/Autorun/locale.h index d1060b652f..f4a5fb07ed 100644 --- a/Core/Tools/Autorun/locale.h +++ b/Core/Tools/Autorun/locale.h @@ -21,7 +21,9 @@ /* ABSTRACT locale.h - REAL fonts @ */ + #pragma once + //#ifdef __cplusplus //extern "C" { //#endif diff --git a/Core/Tools/Babylon/Babylon.h b/Core/Tools/Babylon/Babylon.h index b1b18881cf..22b3020573 100644 --- a/Core/Tools/Babylon/Babylon.h +++ b/Core/Tools/Babylon/Babylon.h @@ -18,6 +18,7 @@ // Babylon.h : main header file for the BABYLON application // + #pragma once #ifndef __AFXWIN_H__ diff --git a/Core/Tools/Babylon/BabylonDlg.h b/Core/Tools/Babylon/BabylonDlg.h index 415a1ecb1a..677e782611 100644 --- a/Core/Tools/Babylon/BabylonDlg.h +++ b/Core/Tools/Babylon/BabylonDlg.h @@ -18,6 +18,7 @@ // BabylonDlg.h : header file // + #pragma once #include "resource.h" diff --git a/Core/Tools/Babylon/DlgProxy.h b/Core/Tools/Babylon/DlgProxy.h index 01fc93b255..2473539fb3 100644 --- a/Core/Tools/Babylon/DlgProxy.h +++ b/Core/Tools/Babylon/DlgProxy.h @@ -18,6 +18,7 @@ // DlgProxy.h : header file // + #pragma once class CBabylonDlg; diff --git a/Core/Tools/Babylon/ExportDlg.h b/Core/Tools/Babylon/ExportDlg.h index ae55d22d5d..af799753f6 100644 --- a/Core/Tools/Babylon/ExportDlg.h +++ b/Core/Tools/Babylon/ExportDlg.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ExportDlg.h : header file // diff --git a/Core/Tools/Babylon/GenerateDlg.h b/Core/Tools/Babylon/GenerateDlg.h index d1cbaa4a9e..1be84d2b50 100644 --- a/Core/Tools/Babylon/GenerateDlg.h +++ b/Core/Tools/Babylon/GenerateDlg.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // GenerateDlg.h : header file // diff --git a/Core/Tools/Babylon/MatchDlg.h b/Core/Tools/Babylon/MatchDlg.h index 5bc3c8be33..56fa8dacc0 100644 --- a/Core/Tools/Babylon/MatchDlg.h +++ b/Core/Tools/Babylon/MatchDlg.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // MatchDlg.h : header file // diff --git a/Core/Tools/Babylon/ProceedDlg.h b/Core/Tools/Babylon/ProceedDlg.h index cefa221b58..ee42c7809b 100644 --- a/Core/Tools/Babylon/ProceedDlg.h +++ b/Core/Tools/Babylon/ProceedDlg.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ProceedDlg.h : header file // #define IDALWAYS 101 diff --git a/Core/Tools/Babylon/Report.h b/Core/Tools/Babylon/Report.h index 614e6411bd..93a66d12cd 100644 --- a/Core/Tools/Babylon/Report.h +++ b/Core/Tools/Babylon/Report.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // Report.h : header file // diff --git a/Core/Tools/Babylon/RetranslateDlg.h b/Core/Tools/Babylon/RetranslateDlg.h index 3c29a44fc5..4c7354ff65 100644 --- a/Core/Tools/Babylon/RetranslateDlg.h +++ b/Core/Tools/Babylon/RetranslateDlg.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // RetranslateDlg.h : header file // diff --git a/Core/Tools/Babylon/StdAfx.h b/Core/Tools/Babylon/StdAfx.h index 6bbc4e1eba..14880ad8a4 100644 --- a/Core/Tools/Babylon/StdAfx.h +++ b/Core/Tools/Babylon/StdAfx.h @@ -20,6 +20,7 @@ // or project specific include files that are used frequently, but // are changed infrequently // + #pragma once #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers diff --git a/Core/Tools/Babylon/TransDB.h b/Core/Tools/Babylon/TransDB.h index d2d0ba1a65..fd508f9e18 100644 --- a/Core/Tools/Babylon/TransDB.h +++ b/Core/Tools/Babylon/TransDB.h @@ -20,7 +20,9 @@ // ParseStr.h // // + #pragma once + #include "olestring.h" #include "list.h" #include "bin.h" diff --git a/Core/Tools/Babylon/VIEWDBSII.h b/Core/Tools/Babylon/VIEWDBSII.h index fe491a5eea..a9ea386653 100644 --- a/Core/Tools/Babylon/VIEWDBSII.h +++ b/Core/Tools/Babylon/VIEWDBSII.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // VIEWDBSII.h : header file // diff --git a/Core/Tools/Babylon/VerifyDlg.h b/Core/Tools/Babylon/VerifyDlg.h index de40c17830..04964b6f3f 100644 --- a/Core/Tools/Babylon/VerifyDlg.h +++ b/Core/Tools/Babylon/VerifyDlg.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // VerifyDlg.h : header file // diff --git a/Core/Tools/Babylon/VerifyTextDlg.h b/Core/Tools/Babylon/VerifyTextDlg.h index aca72de561..fca1dda0fd 100644 --- a/Core/Tools/Babylon/VerifyTextDlg.h +++ b/Core/Tools/Babylon/VerifyTextDlg.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // VerifyTextDlg.h : header file // diff --git a/Core/Tools/Babylon/XLStuff.h b/Core/Tools/Babylon/XLStuff.h index 93126916ee..90361bab44 100644 --- a/Core/Tools/Babylon/XLStuff.h +++ b/Core/Tools/Babylon/XLStuff.h @@ -20,7 +20,9 @@ // XLStuff.h // // + #pragma once + #include "BabylonDlg.h" typedef enum { xlAll = -4104, diff --git a/Core/Tools/Babylon/bin.h b/Core/Tools/Babylon/bin.h index f664812408..f928b15033 100644 --- a/Core/Tools/Babylon/bin.h +++ b/Core/Tools/Babylon/bin.h @@ -21,6 +21,7 @@ // #pragma once + #include "list.h" #include "olestring.h" diff --git a/Core/Tools/Babylon/expimp.h b/Core/Tools/Babylon/expimp.h index a998c39b23..b15d0252dc 100644 --- a/Core/Tools/Babylon/expimp.h +++ b/Core/Tools/Babylon/expimp.h @@ -19,7 +19,9 @@ // // expimp.h // + #pragma once + #include "TransDB.h" #include "BabylonDlg.h" diff --git a/Core/Tools/Babylon/fileops.h b/Core/Tools/Babylon/fileops.h index 864af4beac..11a6bc0947 100644 --- a/Core/Tools/Babylon/fileops.h +++ b/Core/Tools/Babylon/fileops.h @@ -19,7 +19,9 @@ // // File IO support // + #pragma once + static const int FA_NOFILE = 0; static const int FA_READONLY = 0x00000001; static const int FA_DIRECTORY = 0x00000002; diff --git a/Core/Tools/Babylon/iff.h b/Core/Tools/Babylon/iff.h index 6f3a84fc0c..7d1860032d 100644 --- a/Core/Tools/Babylon/iff.h +++ b/Core/Tools/Babylon/iff.h @@ -17,6 +17,7 @@ */ #pragma once + #define MakeID(a,b,c,d) ( (int) ( ( (int) (a) ) << 24 | ( (int) (b) ) << 16 | \ ( (int) (c) ) << 8 | ( (int) (d) ) ) ) diff --git a/Core/Tools/Babylon/loadsave.h b/Core/Tools/Babylon/loadsave.h index 7d3525ea18..cde180af92 100644 --- a/Core/Tools/Babylon/loadsave.h +++ b/Core/Tools/Babylon/loadsave.h @@ -19,7 +19,9 @@ // // 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 ); diff --git a/Core/Tools/Babylon/olestring.h b/Core/Tools/Babylon/olestring.h index 7b542afc32..1e3dd2908d 100644 --- a/Core/Tools/Babylon/olestring.h +++ b/Core/Tools/Babylon/olestring.h @@ -19,7 +19,9 @@ // // OLEString // + #pragma once + const unsigned int OLESTRING_DEFAULT_SIZE = 256; class OLEString diff --git a/Core/Tools/Babylon/transcs.h b/Core/Tools/Babylon/transcs.h index 047e73bc7a..559fa4f7eb 100644 --- a/Core/Tools/Babylon/transcs.h +++ b/Core/Tools/Babylon/transcs.h @@ -19,6 +19,7 @@ // // transcs.h Translate char set // + #pragma once void CreateTranslationTable ( void ); diff --git a/Core/Tools/CRCDiff/KVPair.h b/Core/Tools/CRCDiff/KVPair.h index 980ed953d2..6ef7043b3a 100644 --- a/Core/Tools/CRCDiff/KVPair.h +++ b/Core/Tools/CRCDiff/KVPair.h @@ -22,7 +22,9 @@ // Creation Date: 9/4/2002 // Description: Key/Value Pair class // --------------------------------------------------------------------------- + #pragma once + #include #include diff --git a/Core/Tools/CRCDiff/debug.h b/Core/Tools/CRCDiff/debug.h index 3283c9df9b..1945b6ef99 100644 --- a/Core/Tools/CRCDiff/debug.h +++ b/Core/Tools/CRCDiff/debug.h @@ -19,7 +19,9 @@ // FILE: debug.h ////////////////////////////////////////////////////////////// // Minimal debug info // Author: Matthew D. Campbell, Sept 2002 + #pragma once + #ifdef DEBUG #include diff --git a/Core/Tools/CRCDiff/expander.h b/Core/Tools/CRCDiff/expander.h index 6f411f7a90..4373e87208 100644 --- a/Core/Tools/CRCDiff/expander.h +++ b/Core/Tools/CRCDiff/expander.h @@ -22,7 +22,9 @@ // Creation Date: 9/13/2002 // Description: Key/value pair template expansion class // --------------------------------------------------------------------------- + #pragma once + #include #include #include diff --git a/Core/Tools/CRCDiff/misc.h b/Core/Tools/CRCDiff/misc.h index e21c73bf4e..54bc699580 100644 --- a/Core/Tools/CRCDiff/misc.h +++ b/Core/Tools/CRCDiff/misc.h @@ -22,7 +22,9 @@ // Creation Date: 9/12/2002 // Description: misc utils // --------------------------------------------------------------------------- + #pragma once + #include std::string intToString(int val); diff --git a/Core/Tools/DebugWindow/DebugWindow.h b/Core/Tools/DebugWindow/DebugWindow.h index 7ec9f7d220..27d437e628 100644 --- a/Core/Tools/DebugWindow/DebugWindow.h +++ b/Core/Tools/DebugWindow/DebugWindow.h @@ -18,6 +18,7 @@ // DebugWindow.h : main header file for the DEBUGWINDOW DLL // + #pragma once #ifndef __AFXWIN_H__ diff --git a/Core/Tools/DebugWindow/StdAfx.h b/Core/Tools/DebugWindow/StdAfx.h index d8953dc416..93949ef824 100644 --- a/Core/Tools/DebugWindow/StdAfx.h +++ b/Core/Tools/DebugWindow/StdAfx.h @@ -20,6 +20,7 @@ // or project specific include files that are used frequently, but // are changed infrequently // + #pragma once #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers diff --git a/Core/Tools/ImagePacker/Include/ImageDirectory.h b/Core/Tools/ImagePacker/Include/ImageDirectory.h index af87fd7e9d..d2b64c33ef 100644 --- a/Core/Tools/ImagePacker/Include/ImageDirectory.h +++ b/Core/Tools/ImagePacker/Include/ImageDirectory.h @@ -39,6 +39,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Core/Tools/ImagePacker/Include/ImageInfo.h b/Core/Tools/ImagePacker/Include/ImageInfo.h index f77bd26a77..3dce43dfc0 100644 --- a/Core/Tools/ImagePacker/Include/ImageInfo.h +++ b/Core/Tools/ImagePacker/Include/ImageInfo.h @@ -38,6 +38,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Core/Tools/ImagePacker/Include/ImagePacker.h b/Core/Tools/ImagePacker/Include/ImagePacker.h index d1ac1b599a..b03abd8c86 100644 --- a/Core/Tools/ImagePacker/Include/ImagePacker.h +++ b/Core/Tools/ImagePacker/Include/ImagePacker.h @@ -38,6 +38,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include diff --git a/Core/Tools/ImagePacker/Include/TexturePage.h b/Core/Tools/ImagePacker/Include/TexturePage.h index 90520fc65d..c0bc646790 100644 --- a/Core/Tools/ImagePacker/Include/TexturePage.h +++ b/Core/Tools/ImagePacker/Include/TexturePage.h @@ -39,6 +39,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include diff --git a/Core/Tools/ImagePacker/Include/WinMain.h b/Core/Tools/ImagePacker/Include/WinMain.h index 06803d375a..c5ebe3b4af 100644 --- a/Core/Tools/ImagePacker/Include/WinMain.h +++ b/Core/Tools/ImagePacker/Include/WinMain.h @@ -38,6 +38,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include diff --git a/Core/Tools/ImagePacker/Include/WindowProc.h b/Core/Tools/ImagePacker/Include/WindowProc.h index d745ec78bc..57886fd6c3 100644 --- a/Core/Tools/ImagePacker/Include/WindowProc.h +++ b/Core/Tools/ImagePacker/Include/WindowProc.h @@ -38,6 +38,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Core/Tools/Launcher/BFISH.H b/Core/Tools/Launcher/BFISH.H index 70b44d3b57..5290954ee7 100644 --- a/Core/Tools/Launcher/BFISH.H +++ b/Core/Tools/Launcher/BFISH.H @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include diff --git a/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.h b/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.h index 5042cf10d8..976219ce74 100644 --- a/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.h +++ b/Core/Tools/Launcher/Toolkit/Debug/DebugPrint.h @@ -33,7 +33,9 @@ * $Revision: $ * ******************************************************************************/ + #pragma once + #ifdef RTS_DEBUG #ifdef __cplusplus diff --git a/Core/Tools/Launcher/Toolkit/Storage/File.h b/Core/Tools/Launcher/Toolkit/Storage/File.h index 169f1d2d0f..245c93f5a0 100644 --- a/Core/Tools/Launcher/Toolkit/Storage/File.h +++ b/Core/Tools/Launcher/Toolkit/Storage/File.h @@ -33,7 +33,9 @@ * $Revision: $ * ****************************************************************************/ + #pragma once + #include #include "Stream.h" #include "Rights.h" diff --git a/Core/Tools/Launcher/Toolkit/Storage/Rights.h b/Core/Tools/Launcher/Toolkit/Storage/Rights.h index 3b5adea180..5414573fd8 100644 --- a/Core/Tools/Launcher/Toolkit/Storage/Rights.h +++ b/Core/Tools/Launcher/Toolkit/Storage/Rights.h @@ -33,7 +33,9 @@ * $Revision: $ * ****************************************************************************/ + #pragma once + // Access rights typedef enum { diff --git a/Core/Tools/Launcher/Toolkit/Storage/Stream.h b/Core/Tools/Launcher/Toolkit/Storage/Stream.h index 5cf9f33c5a..1803bd64d8 100644 --- a/Core/Tools/Launcher/Toolkit/Storage/Stream.h +++ b/Core/Tools/Launcher/Toolkit/Storage/Stream.h @@ -33,7 +33,9 @@ * $Revision: $ * ****************************************************************************/ + #pragma once + #include class Stream diff --git a/Core/Tools/Launcher/Toolkit/Support/RefCounted.h b/Core/Tools/Launcher/Toolkit/Support/RefCounted.h index 652efab0db..314c71003d 100644 --- a/Core/Tools/Launcher/Toolkit/Support/RefCounted.h +++ b/Core/Tools/Launcher/Toolkit/Support/RefCounted.h @@ -36,7 +36,9 @@ * $Revision: $ * ******************************************************************************/ + #pragma once + #include class RefCounted diff --git a/Core/Tools/Launcher/Toolkit/Support/RefPtr.h b/Core/Tools/Launcher/Toolkit/Support/RefPtr.h index 18e078965a..0e4e5c255d 100644 --- a/Core/Tools/Launcher/Toolkit/Support/RefPtr.h +++ b/Core/Tools/Launcher/Toolkit/Support/RefPtr.h @@ -64,7 +64,9 @@ * $Revision: $ * ******************************************************************************/ + #pragma once + #include "Visualc.h" #include "RefCounted.h" #include diff --git a/Core/Tools/Launcher/Toolkit/Support/StringConvert.h b/Core/Tools/Launcher/Toolkit/Support/StringConvert.h index 5b10849a02..c7a1515f33 100644 --- a/Core/Tools/Launcher/Toolkit/Support/StringConvert.h +++ b/Core/Tools/Launcher/Toolkit/Support/StringConvert.h @@ -33,7 +33,9 @@ * $Revision: $ * ******************************************************************************/ + #pragma once + #include "UTypes.h" class UString; diff --git a/Core/Tools/Launcher/Toolkit/Support/UString.h b/Core/Tools/Launcher/Toolkit/Support/UString.h index 8cba13cacb..a9b23e20f8 100644 --- a/Core/Tools/Launcher/Toolkit/Support/UString.h +++ b/Core/Tools/Launcher/Toolkit/Support/UString.h @@ -33,7 +33,9 @@ * $Revision: $ * ******************************************************************************/ + #pragma once + #include "UTypes.h" #include "RefCounted.h" diff --git a/Core/Tools/Launcher/Toolkit/Support/UTypes.h b/Core/Tools/Launcher/Toolkit/Support/UTypes.h index d2d97ea1dc..77e5eaa8ba 100644 --- a/Core/Tools/Launcher/Toolkit/Support/UTypes.h +++ b/Core/Tools/Launcher/Toolkit/Support/UTypes.h @@ -33,7 +33,9 @@ * $Revision: $ * ******************************************************************************/ + #pragma once + //! Signed integer value typedef int Int; diff --git a/Core/Tools/Launcher/Toolkit/Support/Visualc.h b/Core/Tools/Launcher/Toolkit/Support/Visualc.h index 1b73f41cdd..e8bd635539 100644 --- a/Core/Tools/Launcher/Toolkit/Support/Visualc.h +++ b/Core/Tools/Launcher/Toolkit/Support/Visualc.h @@ -33,7 +33,9 @@ * $Revision: $ * ******************************************************************************/ + #pragma once + #if defined(_MSC_VER) // "unreferenced inline function has been removed" diff --git a/Core/Tools/Launcher/configfile.h b/Core/Tools/Launcher/configfile.h index f76106b9c8..19354c6009 100644 --- a/Core/Tools/Launcher/configfile.h +++ b/Core/Tools/Launcher/configfile.h @@ -25,7 +25,9 @@ Author : Neal Kettler Start Date : June 9, 1997 Last Update : June 17, 1997 \***************************************************************************/ + #pragma once + #include "dictionary.h" #include "wstring.h" diff --git a/Core/Tools/Launcher/dialog.h b/Core/Tools/Launcher/dialog.h index 518d0a75fb..101db772c8 100644 --- a/Core/Tools/Launcher/dialog.h +++ b/Core/Tools/Launcher/dialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include"winblows.h" #include HWND Create_Patch_Dialog(void); diff --git a/Core/Tools/Launcher/dictionary.h b/Core/Tools/Launcher/dictionary.h index c716b54859..640190a5b5 100644 --- a/Core/Tools/Launcher/dictionary.h +++ b/Core/Tools/Launcher/dictionary.h @@ -34,7 +34,9 @@ linked list at the slot the hashing function specifies. If everything is working well, this is much faster than a linked list, but only if your hashing function is good. \****************************************************************************/ + #pragma once + #include #include #include diff --git a/Core/Tools/Launcher/filed.h b/Core/Tools/Launcher/filed.h index 0936a99805..f490b05d1c 100644 --- a/Core/Tools/Launcher/filed.h +++ b/Core/Tools/Launcher/filed.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include "odevice.h" class FileD : public OutputDevice diff --git a/Core/Tools/Launcher/findpatch.h b/Core/Tools/Launcher/findpatch.h index 480bb768d2..f21669014b 100644 --- a/Core/Tools/Launcher/findpatch.h +++ b/Core/Tools/Launcher/findpatch.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include #include #include diff --git a/Core/Tools/Launcher/loadbmp.h b/Core/Tools/Launcher/loadbmp.h index fb511f69ca..e2614fbe6c 100644 --- a/Core/Tools/Launcher/loadbmp.h +++ b/Core/Tools/Launcher/loadbmp.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include #include #include "wstypes.h" diff --git a/Core/Tools/Launcher/monod.h b/Core/Tools/Launcher/monod.h index d4dfee99e9..4f94fd065e 100644 --- a/Core/Tools/Launcher/monod.h +++ b/Core/Tools/Launcher/monod.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 diff --git a/Core/Tools/Launcher/odevice.h b/Core/Tools/Launcher/odevice.h index f27719c771..8cb924ea42 100644 --- a/Core/Tools/Launcher/odevice.h +++ b/Core/Tools/Launcher/odevice.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // This virtual base class provides an interface for output devices // that can be used for the debugging package. class OutputDevice diff --git a/Core/Tools/Launcher/patch.h b/Core/Tools/Launcher/patch.h index 86290ae9fd..b724c59ff9 100644 --- a/Core/Tools/Launcher/patch.h +++ b/Core/Tools/Launcher/patch.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include "winblows.h" #include "dialog.h" #include "resource.h" diff --git a/Core/Tools/Launcher/process.h b/Core/Tools/Launcher/process.h index b0e5d5e15a..d3f2625bee 100644 --- a/Core/Tools/Launcher/process.h +++ b/Core/Tools/Launcher/process.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include #include "wstypes.h" #include "wdebug.h" diff --git a/Core/Tools/Launcher/streamer.h b/Core/Tools/Launcher/streamer.h index fc802c15af..ec79562070 100644 --- a/Core/Tools/Launcher/streamer.h +++ b/Core/Tools/Launcher/streamer.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include #include #include diff --git a/Core/Tools/Launcher/wdebug.h b/Core/Tools/Launcher/wdebug.h index 2057b778b6..72f732b648 100644 --- a/Core/Tools/Launcher/wdebug.h +++ b/Core/Tools/Launcher/wdebug.h @@ -49,7 +49,9 @@ This won't compile, read the code until you figure it out. Only then will you be ready to leave grasshopper. \*****************************************************************************/ + #pragma once + #include #include "odevice.h" #include "streamer.h" diff --git a/Core/Tools/Launcher/winblows.h b/Core/Tools/Launcher/winblows.h index 997a9a80d3..9e6d14ef1f 100644 --- a/Core/Tools/Launcher/winblows.h +++ b/Core/Tools/Launcher/winblows.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #define WIN32_LEAN_AND_MEAN #include #include diff --git a/Core/Tools/Launcher/wstring.h b/Core/Tools/Launcher/wstring.h index 28c1e081e5..00f39c2ffc 100644 --- a/Core/Tools/Launcher/wstring.h +++ b/Core/Tools/Launcher/wstring.h @@ -25,7 +25,9 @@ Author : Neal Kettler Start Date : June 1, 1997 Last Update : June 17, 1997 \****************************************************************************/ + #pragma once + #include #include #include "wstypes.h" diff --git a/Core/Tools/Launcher/wstypes.h b/Core/Tools/Launcher/wstypes.h index 695c8e903d..d521a5872a 100644 --- a/Core/Tools/Launcher/wstypes.h +++ b/Core/Tools/Launcher/wstypes.h @@ -27,7 +27,9 @@ Last Update : June 17, 1997 Standard type definitions for the sake of portability and readability. \***************************************************************************/ + #pragma once + #ifndef TRUE #define TRUE 1 #endif diff --git a/Core/Tools/MapCacheBuilder/Include/WinMain.h b/Core/Tools/MapCacheBuilder/Include/WinMain.h index 06803d375a..c5ebe3b4af 100644 --- a/Core/Tools/MapCacheBuilder/Include/WinMain.h +++ b/Core/Tools/MapCacheBuilder/Include/WinMain.h @@ -38,6 +38,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include diff --git a/Core/Tools/PATCHGET/CHATAPI.H b/Core/Tools/PATCHGET/CHATAPI.H index c798538d2f..e0e9d90eb4 100644 --- a/Core/Tools/PATCHGET/CHATAPI.H +++ b/Core/Tools/PATCHGET/CHATAPI.H @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include "COMINIT.H" #include #include diff --git a/Core/Tools/PATCHGET/COMINIT.H b/Core/Tools/PATCHGET/COMINIT.H index b0a0e4786b..c35f69a2de 100644 --- a/Core/Tools/PATCHGET/COMINIT.H +++ b/Core/Tools/PATCHGET/COMINIT.H @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + namespace patchget { diff --git a/Core/Tools/PATCHGET/DownloadManager.h b/Core/Tools/PATCHGET/DownloadManager.h index ce561febd5..443156920c 100644 --- a/Core/Tools/PATCHGET/DownloadManager.h +++ b/Core/Tools/PATCHGET/DownloadManager.h @@ -21,6 +21,7 @@ // Author: Matthew D. Campbell, July 2002 #pragma once + #include "WWDownload/downloaddefs.h" #include "WWDownload/Download.h" #include diff --git a/Core/Tools/PATCHGET/PROCESS.H b/Core/Tools/PATCHGET/PROCESS.H index 723dfa26d3..4611eb3d13 100644 --- a/Core/Tools/PATCHGET/PROCESS.H +++ b/Core/Tools/PATCHGET/PROCESS.H @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include #include "WSTYPES.H" diff --git a/Core/Tools/PATCHGET/Registry.h b/Core/Tools/PATCHGET/Registry.h index da1980e6fe..644dbdcf2b 100644 --- a/Core/Tools/PATCHGET/Registry.h +++ b/Core/Tools/PATCHGET/Registry.h @@ -21,6 +21,7 @@ // Author: Matthew D. Campbell, December 2001 #pragma once + #include namespace patchget diff --git a/Core/Tools/PATCHGET/WINBLOWS.H b/Core/Tools/PATCHGET/WINBLOWS.H index 30f4f2779a..534208b551 100644 --- a/Core/Tools/PATCHGET/WINBLOWS.H +++ b/Core/Tools/PATCHGET/WINBLOWS.H @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #define WIN32_LEAN_AND_MEAN #include #include diff --git a/Core/Tools/PATCHGET/WSTYPES.H b/Core/Tools/PATCHGET/WSTYPES.H index dab994d6ba..df4ee9b894 100644 --- a/Core/Tools/PATCHGET/WSTYPES.H +++ b/Core/Tools/PATCHGET/WSTYPES.H @@ -27,7 +27,9 @@ Last Update : June 17, 1997 Standard type definitions for the sake of portability and readability. \***************************************************************************/ + #pragma once + #ifndef TRUE #define TRUE 1 #endif diff --git a/Core/Tools/PATCHGET/debug.h b/Core/Tools/PATCHGET/debug.h index b8650f6367..e61a99033a 100644 --- a/Core/Tools/PATCHGET/debug.h +++ b/Core/Tools/PATCHGET/debug.h @@ -19,7 +19,9 @@ // FILE: debug.h ////////////////////////////////////////////////////////////// // Minimal debug info // Author: Matthew D. Campbell, Sept 2002 + #pragma once + namespace patchget { diff --git a/Core/Tools/W3DView/AddToLineupDialog.h b/Core/Tools/W3DView/AddToLineupDialog.h index 936a215c06..5c331479da 100644 --- a/Core/Tools/W3DView/AddToLineupDialog.h +++ b/Core/Tools/W3DView/AddToLineupDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // AddToLineupDialog.h : header file // diff --git a/Core/Tools/W3DView/AdvancedAnimSheet.h b/Core/Tools/W3DView/AdvancedAnimSheet.h index 64f8aaea84..691787da8d 100644 --- a/Core/Tools/W3DView/AdvancedAnimSheet.h +++ b/Core/Tools/W3DView/AdvancedAnimSheet.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // AdvancedAnimSheet.h : header file // diff --git a/Core/Tools/W3DView/AggregateNameDialog.h b/Core/Tools/W3DView/AggregateNameDialog.h index 6c24116b4f..2d71d778dc 100644 --- a/Core/Tools/W3DView/AggregateNameDialog.h +++ b/Core/Tools/W3DView/AggregateNameDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // AggregateNameDialog.h : header file // diff --git a/Core/Tools/W3DView/AmbientLightDialog.h b/Core/Tools/W3DView/AmbientLightDialog.h index f0dba4a0f2..1ffd5dca66 100644 --- a/Core/Tools/W3DView/AmbientLightDialog.h +++ b/Core/Tools/W3DView/AmbientLightDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // AmbientLightDialog.h : header file // diff --git a/Core/Tools/W3DView/AnimMixingPage.h b/Core/Tools/W3DView/AnimMixingPage.h index e3743a211a..50c6c369d0 100644 --- a/Core/Tools/W3DView/AnimMixingPage.h +++ b/Core/Tools/W3DView/AnimMixingPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // AnimMixingPage.h : header file // diff --git a/Core/Tools/W3DView/AnimReportPage.h b/Core/Tools/W3DView/AnimReportPage.h index a3df1d2b2d..8f5caac740 100644 --- a/Core/Tools/W3DView/AnimReportPage.h +++ b/Core/Tools/W3DView/AnimReportPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // AnimReportPage.h : header file // diff --git a/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h b/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h index aa35b77364..9024d742c3 100644 --- a/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h +++ b/Core/Tools/W3DView/AnimatedSoundOptionsDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // AnimatedSoundOptionsDialog.h : header file // diff --git a/Core/Tools/W3DView/AnimationPropPage.h b/Core/Tools/W3DView/AnimationPropPage.h index 1a48e97634..0e035b0593 100644 --- a/Core/Tools/W3DView/AnimationPropPage.h +++ b/Core/Tools/W3DView/AnimationPropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // AnimationPropPage.h : header file // diff --git a/Core/Tools/W3DView/AnimationSpeed.h b/Core/Tools/W3DView/AnimationSpeed.h index d7912c753d..0cd1c8894b 100644 --- a/Core/Tools/W3DView/AnimationSpeed.h +++ b/Core/Tools/W3DView/AnimationSpeed.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // AnimationSpeed.h : header file // diff --git a/Core/Tools/W3DView/AssetInfo.h b/Core/Tools/W3DView/AssetInfo.h index 0b8378a410..b93944c093 100644 --- a/Core/Tools/W3DView/AssetInfo.h +++ b/Core/Tools/W3DView/AssetInfo.h @@ -34,7 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once #include "rendobj.h" diff --git a/Core/Tools/W3DView/AssetPropertySheet.h b/Core/Tools/W3DView/AssetPropertySheet.h index 5fc975545a..cb9446b6d0 100644 --- a/Core/Tools/W3DView/AssetPropertySheet.h +++ b/Core/Tools/W3DView/AssetPropertySheet.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // AssetPropertySheet.h : header file // diff --git a/Core/Tools/W3DView/AssetTypes.h b/Core/Tools/W3DView/AssetTypes.h index 748f2df258..bb85e71c6d 100644 --- a/Core/Tools/W3DView/AssetTypes.h +++ b/Core/Tools/W3DView/AssetTypes.h @@ -34,7 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once typedef enum diff --git a/Core/Tools/W3DView/BackgroundBMPDialog.h b/Core/Tools/W3DView/BackgroundBMPDialog.h index 4687b3f4c3..71a86752a9 100644 --- a/Core/Tools/W3DView/BackgroundBMPDialog.h +++ b/Core/Tools/W3DView/BackgroundBMPDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // BackgroundBMPDialog.h : header file // diff --git a/Core/Tools/W3DView/BackgroundColorDialog.h b/Core/Tools/W3DView/BackgroundColorDialog.h index 4f2ed781b5..5999e968f0 100644 --- a/Core/Tools/W3DView/BackgroundColorDialog.h +++ b/Core/Tools/W3DView/BackgroundColorDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // BackgroundColorDialog.h : header file // diff --git a/Core/Tools/W3DView/BackgroundObjectDialog.h b/Core/Tools/W3DView/BackgroundObjectDialog.h index 79e64d1264..0032e55126 100644 --- a/Core/Tools/W3DView/BackgroundObjectDialog.h +++ b/Core/Tools/W3DView/BackgroundObjectDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // BackgroundObjectDialog.h : header file // diff --git a/Core/Tools/W3DView/BoneMgrDialog.h b/Core/Tools/W3DView/BoneMgrDialog.h index 2436fcd270..b3eb773c93 100644 --- a/Core/Tools/W3DView/BoneMgrDialog.h +++ b/Core/Tools/W3DView/BoneMgrDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // BoneMgrDialog.h : header file // diff --git a/Core/Tools/W3DView/CameraDistanceDialog.h b/Core/Tools/W3DView/CameraDistanceDialog.h index 0fc3001f77..ffde9e0757 100644 --- a/Core/Tools/W3DView/CameraDistanceDialog.h +++ b/Core/Tools/W3DView/CameraDistanceDialog.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 "resource.h" diff --git a/Core/Tools/W3DView/CameraSettingsDialog.h b/Core/Tools/W3DView/CameraSettingsDialog.h index 629e365b08..bd94ce278f 100644 --- a/Core/Tools/W3DView/CameraSettingsDialog.h +++ b/Core/Tools/W3DView/CameraSettingsDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // CameraSettingsDialog.h : header file // diff --git a/Core/Tools/W3DView/ColorBar.h b/Core/Tools/W3DView/ColorBar.h index d594ad3e53..a1efce422d 100644 --- a/Core/Tools/W3DView/ColorBar.h +++ b/Core/Tools/W3DView/ColorBar.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ColorBar.h : header file // diff --git a/Core/Tools/W3DView/ColorPicker.h b/Core/Tools/W3DView/ColorPicker.h index 3c61f1254a..6d4941b0a1 100644 --- a/Core/Tools/W3DView/ColorPicker.h +++ b/Core/Tools/W3DView/ColorPicker.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ColorPicker.h : header file // diff --git a/Core/Tools/W3DView/ColorPickerDialogClass.h b/Core/Tools/W3DView/ColorPickerDialogClass.h index d73e043b73..64f6ea6e97 100644 --- a/Core/Tools/W3DView/ColorPickerDialogClass.h +++ b/Core/Tools/W3DView/ColorPickerDialogClass.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ColorPickerDialogClass.h : header file // diff --git a/Core/Tools/W3DView/ColorSelectionDialog.h b/Core/Tools/W3DView/ColorSelectionDialog.h index dbe7079ba3..3c42553ed3 100644 --- a/Core/Tools/W3DView/ColorSelectionDialog.h +++ b/Core/Tools/W3DView/ColorSelectionDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ColorSelectionDialog.h : header file // diff --git a/Core/Tools/W3DView/ColorUtils.h b/Core/Tools/W3DView/ColorUtils.h index c425f399b5..3eeb6a55bb 100644 --- a/Core/Tools/W3DView/ColorUtils.h +++ b/Core/Tools/W3DView/ColorUtils.h @@ -21,7 +21,9 @@ // ColorUtils.H // // + #pragma once + ///////////////////////////////////////////////////////////////////////////// // Callbacks ///////////////////////////////////////////////////////////////////////////// diff --git a/Core/Tools/W3DView/DataTreeView.h b/Core/Tools/W3DView/DataTreeView.h index 8aaab2b3a2..26bd64d870 100644 --- a/Core/Tools/W3DView/DataTreeView.h +++ b/Core/Tools/W3DView/DataTreeView.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // DataTreeView.h : header file // diff --git a/Core/Tools/W3DView/DeviceSelectionDialog.h b/Core/Tools/W3DView/DeviceSelectionDialog.h index 8c046ab7a6..18d67c60ca 100644 --- a/Core/Tools/W3DView/DeviceSelectionDialog.h +++ b/Core/Tools/W3DView/DeviceSelectionDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // DeviceSelectionDialog.h : header file // diff --git a/Core/Tools/W3DView/DialogToolbar.h b/Core/Tools/W3DView/DialogToolbar.h index 446f1a1d60..09b160b6ab 100644 --- a/Core/Tools/W3DView/DialogToolbar.h +++ b/Core/Tools/W3DView/DialogToolbar.h @@ -34,7 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once #include "resource.h" diff --git a/Core/Tools/W3DView/DirectoryDialog.h b/Core/Tools/W3DView/DirectoryDialog.h index 0b086c271b..b0395a5151 100644 --- a/Core/Tools/W3DView/DirectoryDialog.h +++ b/Core/Tools/W3DView/DirectoryDialog.h @@ -34,7 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once ///////////////////////////////////////////////////////////////////////// diff --git a/Core/Tools/W3DView/EditLODDialog.h b/Core/Tools/W3DView/EditLODDialog.h index 71f9eeda40..94187d1ea4 100644 --- a/Core/Tools/W3DView/EditLODDialog.h +++ b/Core/Tools/W3DView/EditLODDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EditLODDialog.h : header file // diff --git a/Core/Tools/W3DView/EmitterColorPropPage.h b/Core/Tools/W3DView/EmitterColorPropPage.h index 22b238e356..4c33199bbb 100644 --- a/Core/Tools/W3DView/EmitterColorPropPage.h +++ b/Core/Tools/W3DView/EmitterColorPropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EmitterColorPropPage.h : header file // diff --git a/Core/Tools/W3DView/EmitterFramePropPage.h b/Core/Tools/W3DView/EmitterFramePropPage.h index 45aea4a033..7e7c7cbf64 100644 --- a/Core/Tools/W3DView/EmitterFramePropPage.h +++ b/Core/Tools/W3DView/EmitterFramePropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EmitterFramePropPage.h : header file // diff --git a/Core/Tools/W3DView/EmitterGeneralPropPage.h b/Core/Tools/W3DView/EmitterGeneralPropPage.h index 7a639ec1b8..bb81f4a261 100644 --- a/Core/Tools/W3DView/EmitterGeneralPropPage.h +++ b/Core/Tools/W3DView/EmitterGeneralPropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EmitterGeneralPropPage.h : header file // diff --git a/Core/Tools/W3DView/EmitterInstanceList.h b/Core/Tools/W3DView/EmitterInstanceList.h index cd80fe0021..bb66fc2316 100644 --- a/Core/Tools/W3DView/EmitterInstanceList.h +++ b/Core/Tools/W3DView/EmitterInstanceList.h @@ -31,6 +31,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "Vector.H" #include "part_ldr.h" #include "part_emt.h" diff --git a/Core/Tools/W3DView/EmitterLineGroupPropPage.h b/Core/Tools/W3DView/EmitterLineGroupPropPage.h index 3be310fd62..2a575eff3e 100644 --- a/Core/Tools/W3DView/EmitterLineGroupPropPage.h +++ b/Core/Tools/W3DView/EmitterLineGroupPropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EmitterLineGroupPropPage.h : header file // diff --git a/Core/Tools/W3DView/EmitterLinePropPage.h b/Core/Tools/W3DView/EmitterLinePropPage.h index c6d87aafad..00f2c2feee 100644 --- a/Core/Tools/W3DView/EmitterLinePropPage.h +++ b/Core/Tools/W3DView/EmitterLinePropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EmitterLinePropPage.h : header file // diff --git a/Core/Tools/W3DView/EmitterParticlePropPage.h b/Core/Tools/W3DView/EmitterParticlePropPage.h index 77664e701f..ae3702d755 100644 --- a/Core/Tools/W3DView/EmitterParticlePropPage.h +++ b/Core/Tools/W3DView/EmitterParticlePropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EmitterParticlePropPage.h : header file // diff --git a/Core/Tools/W3DView/EmitterPhysicsPropPage.h b/Core/Tools/W3DView/EmitterPhysicsPropPage.h index fe1e319cb0..2b2c35cd60 100644 --- a/Core/Tools/W3DView/EmitterPhysicsPropPage.h +++ b/Core/Tools/W3DView/EmitterPhysicsPropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EmitterPhysicsPropPage.h : header file // diff --git a/Core/Tools/W3DView/EmitterPropertySheet.h b/Core/Tools/W3DView/EmitterPropertySheet.h index 0be0a0a5df..f0861029c8 100644 --- a/Core/Tools/W3DView/EmitterPropertySheet.h +++ b/Core/Tools/W3DView/EmitterPropertySheet.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EmitterPropertySheet.h : header file // diff --git a/Core/Tools/W3DView/EmitterRotationPropPage.h b/Core/Tools/W3DView/EmitterRotationPropPage.h index ce9e741c12..aba163b3c0 100644 --- a/Core/Tools/W3DView/EmitterRotationPropPage.h +++ b/Core/Tools/W3DView/EmitterRotationPropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EmitterRotationPropPage.h : header file // diff --git a/Core/Tools/W3DView/EmitterSizePropPage.h b/Core/Tools/W3DView/EmitterSizePropPage.h index 480f279bca..14e4ca369b 100644 --- a/Core/Tools/W3DView/EmitterSizePropPage.h +++ b/Core/Tools/W3DView/EmitterSizePropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EmitterSizePropPage.h : header file // diff --git a/Core/Tools/W3DView/EmitterUserPropPage.h b/Core/Tools/W3DView/EmitterUserPropPage.h index d6fdd6e1da..514c98ab92 100644 --- a/Core/Tools/W3DView/EmitterUserPropPage.h +++ b/Core/Tools/W3DView/EmitterUserPropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EmitterUserPropPage.h : header file // diff --git a/Core/Tools/W3DView/GammaDialog.h b/Core/Tools/W3DView/GammaDialog.h index 1e3ce19307..43adf086f4 100644 --- a/Core/Tools/W3DView/GammaDialog.h +++ b/Core/Tools/W3DView/GammaDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // GammaDialog.h : header file // diff --git a/Core/Tools/W3DView/Globals.h b/Core/Tools/W3DView/Globals.h index 434e898fdb..4486775017 100644 --- a/Core/Tools/W3DView/Globals.h +++ b/Core/Tools/W3DView/Globals.h @@ -24,6 +24,7 @@ // // ///////////////////////////////////////////////////////////////////// + #pragma once ////////////////////////////////////////////////////// diff --git a/Core/Tools/W3DView/GraphicView.h b/Core/Tools/W3DView/GraphicView.h index daa2971cc0..8a6faa8b5d 100644 --- a/Core/Tools/W3DView/GraphicView.h +++ b/Core/Tools/W3DView/GraphicView.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // GraphicView.h : header file // diff --git a/Core/Tools/W3DView/HierarchyPropPage.h b/Core/Tools/W3DView/HierarchyPropPage.h index cebff6afcf..bd70b4f939 100644 --- a/Core/Tools/W3DView/HierarchyPropPage.h +++ b/Core/Tools/W3DView/HierarchyPropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // HierarchyPropPage.h : header file // diff --git a/Core/Tools/W3DView/MainFrm.h b/Core/Tools/W3DView/MainFrm.h index b3accc9e7b..67652f0a10 100644 --- a/Core/Tools/W3DView/MainFrm.h +++ b/Core/Tools/W3DView/MainFrm.h @@ -19,6 +19,7 @@ // MainFrm.h : interface of the CMainFrame class // ///////////////////////////////////////////////////////////////////////////// + #pragma once #include "DataTreeView.h" diff --git a/Core/Tools/W3DView/MeshPropPage.h b/Core/Tools/W3DView/MeshPropPage.h index 812f4c22e8..4286b4ea33 100644 --- a/Core/Tools/W3DView/MeshPropPage.h +++ b/Core/Tools/W3DView/MeshPropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // MeshPropPage.h : header file // diff --git a/Core/Tools/W3DView/OpacitySettingsDialog.h b/Core/Tools/W3DView/OpacitySettingsDialog.h index 6bc2a83e04..f362a012e5 100644 --- a/Core/Tools/W3DView/OpacitySettingsDialog.h +++ b/Core/Tools/W3DView/OpacitySettingsDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // OpacitySettingsDialog.h : header file // diff --git a/Core/Tools/W3DView/OpacityVectorDialog.h b/Core/Tools/W3DView/OpacityVectorDialog.h index cec555ff80..d2cc35fd87 100644 --- a/Core/Tools/W3DView/OpacityVectorDialog.h +++ b/Core/Tools/W3DView/OpacityVectorDialog.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 "resource.h" diff --git a/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h b/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h index c4bd91afbe..2339682a1e 100644 --- a/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h +++ b/Core/Tools/W3DView/ParticleBlurTimeKeyDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ParticleBlurTimeKeyDialog.h : header file // diff --git a/Core/Tools/W3DView/ParticleFrameKeyDialog.h b/Core/Tools/W3DView/ParticleFrameKeyDialog.h index 6b0f57ad2f..03f045ec1e 100644 --- a/Core/Tools/W3DView/ParticleFrameKeyDialog.h +++ b/Core/Tools/W3DView/ParticleFrameKeyDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ParticleFrameKeyDialog.h : header file // diff --git a/Core/Tools/W3DView/ParticleRotationKeyDialog.h b/Core/Tools/W3DView/ParticleRotationKeyDialog.h index 3c102d106d..37df1e0f41 100644 --- a/Core/Tools/W3DView/ParticleRotationKeyDialog.h +++ b/Core/Tools/W3DView/ParticleRotationKeyDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ParticleRotationKeyDialog.h : header file // diff --git a/Core/Tools/W3DView/ParticleSizeDialog.h b/Core/Tools/W3DView/ParticleSizeDialog.h index f7167c7398..80bb2be66a 100644 --- a/Core/Tools/W3DView/ParticleSizeDialog.h +++ b/Core/Tools/W3DView/ParticleSizeDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ParticleSizeDialog.h : header file // diff --git a/Core/Tools/W3DView/PlaySoundDialog.h b/Core/Tools/W3DView/PlaySoundDialog.h index 396ec3f913..eed77d841b 100644 --- a/Core/Tools/W3DView/PlaySoundDialog.h +++ b/Core/Tools/W3DView/PlaySoundDialog.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 "resource.h" diff --git a/Core/Tools/W3DView/ResolutionDialog.h b/Core/Tools/W3DView/ResolutionDialog.h index d3d09c057e..b826814f73 100644 --- a/Core/Tools/W3DView/ResolutionDialog.h +++ b/Core/Tools/W3DView/ResolutionDialog.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 "resource.h" diff --git a/Core/Tools/W3DView/RestrictedFileDialog.h b/Core/Tools/W3DView/RestrictedFileDialog.h index 414b693d76..2c4e7640e5 100644 --- a/Core/Tools/W3DView/RestrictedFileDialog.h +++ b/Core/Tools/W3DView/RestrictedFileDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // RestrictedFileDialog.h : header file // diff --git a/Core/Tools/W3DView/RingColorPropPage.h b/Core/Tools/W3DView/RingColorPropPage.h index 8bdb0009eb..63bd6d40a6 100644 --- a/Core/Tools/W3DView/RingColorPropPage.h +++ b/Core/Tools/W3DView/RingColorPropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // RingColorPropPage.h : header file // diff --git a/Core/Tools/W3DView/RingGeneralPropPage.h b/Core/Tools/W3DView/RingGeneralPropPage.h index f0cb2f85cf..c09517824a 100644 --- a/Core/Tools/W3DView/RingGeneralPropPage.h +++ b/Core/Tools/W3DView/RingGeneralPropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // RingGeneralPropPage.h : header file // diff --git a/Core/Tools/W3DView/RingPropertySheet.h b/Core/Tools/W3DView/RingPropertySheet.h index eddd915bda..d221010715 100644 --- a/Core/Tools/W3DView/RingPropertySheet.h +++ b/Core/Tools/W3DView/RingPropertySheet.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "RingColorPropPage.h" #include "RingGeneralPropPage.h" #include "RingSizePropPage.h" diff --git a/Core/Tools/W3DView/RingSizePropPage.h b/Core/Tools/W3DView/RingSizePropPage.h index 3ec5ff82ba..22def9c8f5 100644 --- a/Core/Tools/W3DView/RingSizePropPage.h +++ b/Core/Tools/W3DView/RingSizePropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // RingSizePropPage.h : header file // diff --git a/Core/Tools/W3DView/SaveSettingsDialog.h b/Core/Tools/W3DView/SaveSettingsDialog.h index 6673e6f710..859caeda99 100644 --- a/Core/Tools/W3DView/SaveSettingsDialog.h +++ b/Core/Tools/W3DView/SaveSettingsDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // SaveSettingsDialog.h : header file // diff --git a/Core/Tools/W3DView/ScaleDialog.h b/Core/Tools/W3DView/ScaleDialog.h index 5888453dd7..f01746b3c5 100644 --- a/Core/Tools/W3DView/ScaleDialog.h +++ b/Core/Tools/W3DView/ScaleDialog.h @@ -15,8 +15,8 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ -#pragma once +#pragma once #include "resource.h" diff --git a/Core/Tools/W3DView/SceneLightDialog.h b/Core/Tools/W3DView/SceneLightDialog.h index 197028f2fe..0dc4c05a1d 100644 --- a/Core/Tools/W3DView/SceneLightDialog.h +++ b/Core/Tools/W3DView/SceneLightDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // SceneLightDialog.h : header file // diff --git a/Core/Tools/W3DView/ScreenCursor.h b/Core/Tools/W3DView/ScreenCursor.h index 273bbc65f9..3227d2ddd9 100644 --- a/Core/Tools/W3DView/ScreenCursor.h +++ b/Core/Tools/W3DView/ScreenCursor.h @@ -30,7 +30,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once #include "resource.h" diff --git a/Core/Tools/W3DView/SoundEditDialog.h b/Core/Tools/W3DView/SoundEditDialog.h index aafa12de31..6cf71c059f 100644 --- a/Core/Tools/W3DView/SoundEditDialog.h +++ b/Core/Tools/W3DView/SoundEditDialog.h @@ -15,8 +15,8 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ -#pragma once +#pragma once #include "wwstring.h" #include "resource.h" diff --git a/Core/Tools/W3DView/SphereColorPropPage.h b/Core/Tools/W3DView/SphereColorPropPage.h index 3f83deecaa..a461d862c7 100644 --- a/Core/Tools/W3DView/SphereColorPropPage.h +++ b/Core/Tools/W3DView/SphereColorPropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // SphereColorPropPage.h : header file // diff --git a/Core/Tools/W3DView/SphereGeneralPropPage.h b/Core/Tools/W3DView/SphereGeneralPropPage.h index 83de201e70..f3e3c919ed 100644 --- a/Core/Tools/W3DView/SphereGeneralPropPage.h +++ b/Core/Tools/W3DView/SphereGeneralPropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // SphereGeneralPropPage.h : header file // diff --git a/Core/Tools/W3DView/SpherePropertySheet.h b/Core/Tools/W3DView/SpherePropertySheet.h index cbbd418b0e..65b9a5777c 100644 --- a/Core/Tools/W3DView/SpherePropertySheet.h +++ b/Core/Tools/W3DView/SpherePropertySheet.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "SphereColorPropPage.h" #include "SphereGeneralPropPage.h" #include "SphereSizePropPage.h" diff --git a/Core/Tools/W3DView/SphereSizePropPage.h b/Core/Tools/W3DView/SphereSizePropPage.h index b65710dfbd..ac6657054e 100644 --- a/Core/Tools/W3DView/SphereSizePropPage.h +++ b/Core/Tools/W3DView/SphereSizePropPage.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // SphereSizePropPage.h : header file // diff --git a/Core/Tools/W3DView/SphereUtils.h b/Core/Tools/W3DView/SphereUtils.h index 3e039d5786..cb60d55545 100644 --- a/Core/Tools/W3DView/SphereUtils.h +++ b/Core/Tools/W3DView/SphereUtils.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "sphereobj.h" ///////////////////////////////////////////////////////////// diff --git a/Core/Tools/W3DView/StdAfx.h b/Core/Tools/W3DView/StdAfx.h index 5fe3b593a1..c95bcb3a63 100644 --- a/Core/Tools/W3DView/StdAfx.h +++ b/Core/Tools/W3DView/StdAfx.h @@ -20,6 +20,7 @@ // or project specific include files that are used frequently, but // are changed infrequently // + #pragma once #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers diff --git a/Core/Tools/W3DView/TextureMgrDialog.h b/Core/Tools/W3DView/TextureMgrDialog.h index aa9de225ce..0d6302b323 100644 --- a/Core/Tools/W3DView/TextureMgrDialog.h +++ b/Core/Tools/W3DView/TextureMgrDialog.h @@ -33,6 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once #include "Vector.H" diff --git a/Core/Tools/W3DView/TexturePathDialog.h b/Core/Tools/W3DView/TexturePathDialog.h index 0debcb859b..0d83bfe3df 100644 --- a/Core/Tools/W3DView/TexturePathDialog.h +++ b/Core/Tools/W3DView/TexturePathDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // TexturePathDialog.h : header file // diff --git a/Core/Tools/W3DView/TextureSettingsDialog.h b/Core/Tools/W3DView/TextureSettingsDialog.h index fc63f4b2ac..8d19946823 100644 --- a/Core/Tools/W3DView/TextureSettingsDialog.h +++ b/Core/Tools/W3DView/TextureSettingsDialog.h @@ -29,6 +29,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once #ifdef WW3D_DX8 diff --git a/Core/Tools/W3DView/Toolbar.h b/Core/Tools/W3DView/Toolbar.h index cf1e1e4a6a..9bb0a5a71f 100644 --- a/Core/Tools/W3DView/Toolbar.h +++ b/Core/Tools/W3DView/Toolbar.h @@ -22,6 +22,7 @@ // // Declaration of a 'fancy' toolbar using hi-color buttons // + #pragma once ////////////////////////////////////////////////////////////// diff --git a/Core/Tools/W3DView/Utils.h b/Core/Tools/W3DView/Utils.h index e9a05738f1..1e1168c599 100644 --- a/Core/Tools/W3DView/Utils.h +++ b/Core/Tools/W3DView/Utils.h @@ -22,7 +22,9 @@ // // Module containing usefull misc. utility functions // + #pragma once + #include "Vector.H" // Forward declarations diff --git a/Core/Tools/W3DView/Vector3RndCombo.H b/Core/Tools/W3DView/Vector3RndCombo.H index c7fa84ef82..ac47806695 100644 --- a/Core/Tools/W3DView/Vector3RndCombo.H +++ b/Core/Tools/W3DView/Vector3RndCombo.H @@ -30,8 +30,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + // Forward declarations class Vector3Randomizer; class Vector3; diff --git a/Core/Tools/W3DView/ViewerAssetMgr.h b/Core/Tools/W3DView/ViewerAssetMgr.h index 08431fe779..3025ccbfbe 100644 --- a/Core/Tools/W3DView/ViewerAssetMgr.h +++ b/Core/Tools/W3DView/ViewerAssetMgr.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "assetmgr.h" diff --git a/Core/Tools/W3DView/ViewerScene.h b/Core/Tools/W3DView/ViewerScene.h index 775d4b950f..aac9078201 100644 --- a/Core/Tools/W3DView/ViewerScene.h +++ b/Core/Tools/W3DView/ViewerScene.h @@ -34,7 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once #include "scene.h" diff --git a/Core/Tools/W3DView/VolumeRandomDialog.h b/Core/Tools/W3DView/VolumeRandomDialog.h index 5519494d03..10956f3122 100644 --- a/Core/Tools/W3DView/VolumeRandomDialog.h +++ b/Core/Tools/W3DView/VolumeRandomDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // VolumeRandomDialog.h : header file // diff --git a/Core/Tools/W3DView/W3DView.h b/Core/Tools/W3DView/W3DView.h index 4680eaa493..e7e3f1bde3 100644 --- a/Core/Tools/W3DView/W3DView.h +++ b/Core/Tools/W3DView/W3DView.h @@ -18,6 +18,7 @@ // W3DView.h : main header file for the W3DVIEW application // + #pragma once #ifndef __AFXWIN_H__ diff --git a/Core/Tools/W3DView/W3DViewDoc.h b/Core/Tools/W3DView/W3DViewDoc.h index e9e122696e..cab9ffd9b1 100644 --- a/Core/Tools/W3DView/W3DViewDoc.h +++ b/Core/Tools/W3DView/W3DViewDoc.h @@ -19,6 +19,7 @@ // W3DViewDoc.h : interface of the CW3DViewDoc class // ///////////////////////////////////////////////////////////////////////////// + #pragma once #include "scene.h" diff --git a/Core/Tools/W3DView/W3DViewView.h b/Core/Tools/W3DView/W3DViewView.h index 62a02999f0..024b2af2af 100644 --- a/Core/Tools/W3DView/W3DViewView.h +++ b/Core/Tools/W3DView/W3DViewView.h @@ -19,6 +19,7 @@ // W3DViewView.h : interface of the CW3DViewView class // ///////////////////////////////////////////////////////////////////////////// + #pragma once class CW3DViewView : public CView diff --git a/Core/Tools/WW3D/max2w3d/ExportAllDlg.h b/Core/Tools/WW3D/max2w3d/ExportAllDlg.h index c715b3184f..536e822a13 100644 --- a/Core/Tools/WW3D/max2w3d/ExportAllDlg.h +++ b/Core/Tools/WW3D/max2w3d/ExportAllDlg.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "dllmain.h" #include "resource.h" diff --git a/Core/Tools/WW3D/max2w3d/FormClass.h b/Core/Tools/WW3D/max2w3d/FormClass.h index 86df4028dc..9f12c95df3 100644 --- a/Core/Tools/WW3D/max2w3d/FormClass.h +++ b/Core/Tools/WW3D/max2w3d/FormClass.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include diff --git a/Core/Tools/WW3D/max2w3d/GameMtlDlg.h b/Core/Tools/WW3D/max2w3d/GameMtlDlg.h index bfcd12096d..e5fe6042b7 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlDlg.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlDlg.h @@ -34,10 +34,10 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - - #pragma once + class GameMtl; + class GameMtlPassDlg; diff --git a/Core/Tools/WW3D/max2w3d/GameMtlForm.h b/Core/Tools/WW3D/max2w3d/GameMtlForm.h index 06e7537bd3..6febb29d35 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlForm.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlForm.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "FormClass.h" class GameMtl; diff --git a/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.h b/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.h index 046c785772..27a47f9172 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlPassDlg.h @@ -34,9 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - - #pragma once + #include class GameMtl; diff --git a/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.h b/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.h index 9b0274f897..298cf9bd35 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlShaderDlg.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include #include "GameMtlForm.h" diff --git a/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.h b/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.h index 25dfa89024..6c7bcebc14 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlTextureDlg.h @@ -34,10 +34,10 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - - #pragma once + #include + #include "GameMtlForm.h" class GameMtl; diff --git a/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.h b/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.h index d1db41105c..63b3caa9c7 100644 --- a/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.h +++ b/Core/Tools/WW3D/max2w3d/GameMtlVertexMaterialDlg.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include #include "GameMtlForm.h" diff --git a/Core/Tools/WW3D/max2w3d/InputDlg.h b/Core/Tools/WW3D/max2w3d/InputDlg.h index b3c47ebdd5..28beae3a67 100644 --- a/Core/Tools/WW3D/max2w3d/InputDlg.h +++ b/Core/Tools/WW3D/max2w3d/InputDlg.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "dllmain.h" #include "resource.h" diff --git a/Core/Tools/WW3D/max2w3d/LightGlareSave.h b/Core/Tools/WW3D/max2w3d/LightGlareSave.h index d17641294c..74aad4b041 100644 --- a/Core/Tools/WW3D/max2w3d/LightGlareSave.h +++ b/Core/Tools/WW3D/max2w3d/LightGlareSave.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include #include "w3d_file.h" #include "chunkio.h" diff --git a/Core/Tools/WW3D/max2w3d/MeshDeform.h b/Core/Tools/WW3D/max2w3d/MeshDeform.h index 61879137af..5f50d7629e 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeform.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeform.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include #include "Vector.H" diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformData.h b/Core/Tools/WW3D/max2w3d/MeshDeformData.h index 3eb6a37ee7..9690b0cab8 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformData.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformData.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include #include "Vector.H" #include "MeshDeformSet.h" diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformDefs.h b/Core/Tools/WW3D/max2w3d/MeshDeformDefs.h index 15c88bd677..9b297fdbaa 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformDefs.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformDefs.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include #include "Vector.H" diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformPanel.h b/Core/Tools/WW3D/max2w3d/MeshDeformPanel.h index f08d2dab5a..ffd5bfd567 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformPanel.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformPanel.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include #include "resource.h" diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSave.h b/Core/Tools/WW3D/max2w3d/MeshDeformSave.h index 46a1c7b183..92fdd47c0a 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformSave.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformSave.h @@ -34,7 +34,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include #include "Vector.H" diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSaveDefs.h b/Core/Tools/WW3D/max2w3d/MeshDeformSaveDefs.h index 719e7e842c..2202b6b66b 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformSaveDefs.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformSaveDefs.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include /////////////////////////////////////////////////////////////////////////// diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.h b/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.h index cd51f73263..633d72cc41 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformSaveSet.h @@ -34,7 +34,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include #include "Vector.H" diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformSet.h b/Core/Tools/WW3D/max2w3d/MeshDeformSet.h index 6d3aecca5c..da5110f014 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformSet.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformSet.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include #include "Vector.H" #include "MeshDeformDefs.h" diff --git a/Core/Tools/WW3D/max2w3d/MeshDeformUndo.h b/Core/Tools/WW3D/max2w3d/MeshDeformUndo.h index ddb1f1fe6c..3483e0674e 100644 --- a/Core/Tools/WW3D/max2w3d/MeshDeformUndo.h +++ b/Core/Tools/WW3D/max2w3d/MeshDeformUndo.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include #include "Vector.H" #include "MeshDeformDefs.h" diff --git a/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.h b/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.h index 03125f2dfa..5b0875507b 100644 --- a/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.h +++ b/Core/Tools/WW3D/max2w3d/PS2GameMtlShaderDlg.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include #include "GameMtlForm.h" diff --git a/Core/Tools/WW3D/max2w3d/SceneSetupDlg.h b/Core/Tools/WW3D/max2w3d/SceneSetupDlg.h index 2f51a5a3ad..ce1d5de584 100644 --- a/Core/Tools/WW3D/max2w3d/SceneSetupDlg.h +++ b/Core/Tools/WW3D/max2w3d/SceneSetupDlg.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + // SceneSetupDlg.h : header file // diff --git a/Core/Tools/WW3D/max2w3d/SnapPoints.h b/Core/Tools/WW3D/max2w3d/SnapPoints.h index ae9ddc0ba8..3ef1a76789 100644 --- a/Core/Tools/WW3D/max2w3d/SnapPoints.h +++ b/Core/Tools/WW3D/max2w3d/SnapPoints.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "max.h" class ChunkSaveClass; diff --git a/Core/Tools/WW3D/max2w3d/TARGA.H b/Core/Tools/WW3D/max2w3d/TARGA.H index cc10915ca7..02cf38aee4 100644 --- a/Core/Tools/WW3D/max2w3d/TARGA.H +++ b/Core/Tools/WW3D/max2w3d/TARGA.H @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #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 diff --git a/Core/Tools/WW3D/max2w3d/aabtreebuilder.h b/Core/Tools/WW3D/max2w3d/aabtreebuilder.h index 7ef5e125f0..7d7cfe9894 100644 --- a/Core/Tools/WW3D/max2w3d/aabtreebuilder.h +++ b/Core/Tools/WW3D/max2w3d/aabtreebuilder.h @@ -36,8 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "vector3.h" #include "vector3i.h" diff --git a/Core/Tools/WW3D/max2w3d/animationcompressionsettings.h b/Core/Tools/WW3D/max2w3d/animationcompressionsettings.h index 19fbea0154..921ad26d04 100644 --- a/Core/Tools/WW3D/max2w3d/animationcompressionsettings.h +++ b/Core/Tools/WW3D/max2w3d/animationcompressionsettings.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include #include #include "w3dutil.h" diff --git a/Core/Tools/WW3D/max2w3d/bchannel.h b/Core/Tools/WW3D/max2w3d/bchannel.h index dbf9be7712..594681ec01 100644 --- a/Core/Tools/WW3D/max2w3d/bchannel.h +++ b/Core/Tools/WW3D/max2w3d/bchannel.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Tools/WW3D/max2w3d/boneicon.h b/Core/Tools/WW3D/max2w3d/boneicon.h index 670f386e06..a9ecbd4207 100644 --- a/Core/Tools/WW3D/max2w3d/boneicon.h +++ b/Core/Tools/WW3D/max2w3d/boneicon.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + struct VertexStruct { float X,Y,Z; diff --git a/Core/Tools/WW3D/max2w3d/bpick.h b/Core/Tools/WW3D/max2w3d/bpick.h index 17b019ab4e..bb21289021 100644 --- a/Core/Tools/WW3D/max2w3d/bpick.h +++ b/Core/Tools/WW3D/max2w3d/bpick.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "max.h" //#include "dllmain.h" //#include "resource.h" diff --git a/Core/Tools/WW3D/max2w3d/colboxsave.h b/Core/Tools/WW3D/max2w3d/colboxsave.h index 90cbc77b93..b044069be1 100644 --- a/Core/Tools/WW3D/max2w3d/colboxsave.h +++ b/Core/Tools/WW3D/max2w3d/colboxsave.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include #include "w3d_file.h" #include "chunkio.h" diff --git a/Core/Tools/WW3D/max2w3d/dazzlesave.h b/Core/Tools/WW3D/max2w3d/dazzlesave.h index 9220872932..0571edbbef 100644 --- a/Core/Tools/WW3D/max2w3d/dazzlesave.h +++ b/Core/Tools/WW3D/max2w3d/dazzlesave.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include #include "w3d_file.h" #include "chunkio.h" diff --git a/Core/Tools/WW3D/max2w3d/dllmain.h b/Core/Tools/WW3D/max2w3d/dllmain.h index 68326cd384..f3eec14c3f 100644 --- a/Core/Tools/WW3D/max2w3d/dllmain.h +++ b/Core/Tools/WW3D/max2w3d/dllmain.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include extern HINSTANCE AppInstance; diff --git a/Core/Tools/WW3D/max2w3d/exportlog.h b/Core/Tools/WW3D/max2w3d/exportlog.h index 5a82f49a66..d9b4e58f23 100644 --- a/Core/Tools/WW3D/max2w3d/exportlog.h +++ b/Core/Tools/WW3D/max2w3d/exportlog.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include /** diff --git a/Core/Tools/WW3D/max2w3d/floaterdialog.h b/Core/Tools/WW3D/max2w3d/floaterdialog.h index 5e590be396..de6d7f0427 100644 --- a/Core/Tools/WW3D/max2w3d/floaterdialog.h +++ b/Core/Tools/WW3D/max2w3d/floaterdialog.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include class Interface; diff --git a/Core/Tools/WW3D/max2w3d/gamemaps.h b/Core/Tools/WW3D/max2w3d/gamemaps.h index dee08f6e67..d5240ee18d 100644 --- a/Core/Tools/WW3D/max2w3d/gamemaps.h +++ b/Core/Tools/WW3D/max2w3d/gamemaps.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include #include "stdmat.h" diff --git a/Core/Tools/WW3D/max2w3d/gamemtl.h b/Core/Tools/WW3D/max2w3d/gamemtl.h index 8cf22525c9..42df7ce8a5 100644 --- a/Core/Tools/WW3D/max2w3d/gamemtl.h +++ b/Core/Tools/WW3D/max2w3d/gamemtl.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include #include "w3dmtl.h" #include "w3d_file.h" diff --git a/Core/Tools/WW3D/max2w3d/genlodextensiondialog.h b/Core/Tools/WW3D/max2w3d/genlodextensiondialog.h index 066820045a..c028e8a6fb 100644 --- a/Core/Tools/WW3D/max2w3d/genlodextensiondialog.h +++ b/Core/Tools/WW3D/max2w3d/genlodextensiondialog.h @@ -35,7 +35,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include class Interface; diff --git a/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.h b/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.h index 190e0d23c9..fcb8ef9614 100644 --- a/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.h +++ b/Core/Tools/WW3D/max2w3d/genmtlnamesdialog.h @@ -35,7 +35,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include class Interface; diff --git a/Core/Tools/WW3D/max2w3d/geometryexportcontext.h b/Core/Tools/WW3D/max2w3d/geometryexportcontext.h index 819b32629e..c1d83f18d8 100644 --- a/Core/Tools/WW3D/max2w3d/geometryexportcontext.h +++ b/Core/Tools/WW3D/max2w3d/geometryexportcontext.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include class ChunkSaveClass; diff --git a/Core/Tools/WW3D/max2w3d/geometryexporttask.h b/Core/Tools/WW3D/max2w3d/geometryexporttask.h index 950f94c66c..c7b16bf17a 100644 --- a/Core/Tools/WW3D/max2w3d/geometryexporttask.h +++ b/Core/Tools/WW3D/max2w3d/geometryexporttask.h @@ -35,7 +35,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include #include #include "w3d_file.h" diff --git a/Core/Tools/WW3D/max2w3d/gridsnapmodifier.h b/Core/Tools/WW3D/max2w3d/gridsnapmodifier.h index 6b6c19d51b..b921e787df 100644 --- a/Core/Tools/WW3D/max2w3d/gridsnapmodifier.h +++ b/Core/Tools/WW3D/max2w3d/gridsnapmodifier.h @@ -35,7 +35,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + class ClassDesc; ClassDesc * Get_Grid_Snap_Modifier_Desc(void); diff --git a/Core/Tools/WW3D/max2w3d/hiersave.h b/Core/Tools/WW3D/max2w3d/hiersave.h index e8f7d1888e..fb88aae355 100644 --- a/Core/Tools/WW3D/max2w3d/hiersave.h +++ b/Core/Tools/WW3D/max2w3d/hiersave.h @@ -34,7 +34,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "always.h" #include diff --git a/Core/Tools/WW3D/max2w3d/hlodsave.h b/Core/Tools/WW3D/max2w3d/hlodsave.h index 9574d5f359..0adf30f7ac 100644 --- a/Core/Tools/WW3D/max2w3d/hlodsave.h +++ b/Core/Tools/WW3D/max2w3d/hlodsave.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include diff --git a/Core/Tools/WW3D/max2w3d/logdlg.h b/Core/Tools/WW3D/max2w3d/logdlg.h index 8b124f965e..9be2b8c7e6 100644 --- a/Core/Tools/WW3D/max2w3d/logdlg.h +++ b/Core/Tools/WW3D/max2w3d/logdlg.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include diff --git a/Core/Tools/WW3D/max2w3d/maxworldinfo.h b/Core/Tools/WW3D/max2w3d/maxworldinfo.h index 254664ff1d..d04603eb3a 100644 --- a/Core/Tools/WW3D/max2w3d/maxworldinfo.h +++ b/Core/Tools/WW3D/max2w3d/maxworldinfo.h @@ -35,6 +35,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once #include diff --git a/Core/Tools/WW3D/max2w3d/meshbuild.h b/Core/Tools/WW3D/max2w3d/meshbuild.h index 4d06d82a4d..b8a5c794ce 100644 --- a/Core/Tools/WW3D/max2w3d/meshbuild.h +++ b/Core/Tools/WW3D/max2w3d/meshbuild.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "vector2.h" #include "vector3.h" diff --git a/Core/Tools/WW3D/max2w3d/meshsave.h b/Core/Tools/WW3D/max2w3d/meshsave.h index 930686bbbe..0574d55b15 100644 --- a/Core/Tools/WW3D/max2w3d/meshsave.h +++ b/Core/Tools/WW3D/max2w3d/meshsave.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "rawfile.h" // have to include this before Max.h #include #include "BITTYPE.H" diff --git a/Core/Tools/WW3D/max2w3d/namedsel.h b/Core/Tools/WW3D/max2w3d/namedsel.h index 5b94ea67f6..28c7c71bec 100644 --- a/Core/Tools/WW3D/max2w3d/namedsel.h +++ b/Core/Tools/WW3D/max2w3d/namedsel.h @@ -34,6 +34,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once #include "max.h" diff --git a/Core/Tools/WW3D/max2w3d/nullsave.h b/Core/Tools/WW3D/max2w3d/nullsave.h index afc84b23f7..116c6ed95c 100644 --- a/Core/Tools/WW3D/max2w3d/nullsave.h +++ b/Core/Tools/WW3D/max2w3d/nullsave.h @@ -34,7 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once #include diff --git a/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.h b/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.h index 89d2d7d361..96fa0d295b 100644 --- a/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.h +++ b/Core/Tools/WW3D/max2w3d/presetexportoptionsdialog.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include #include #include "w3dutil.h" diff --git a/Core/Tools/WW3D/max2w3d/rcmenu.h b/Core/Tools/WW3D/max2w3d/rcmenu.h index 68da2de96f..27a782c6d4 100644 --- a/Core/Tools/WW3D/max2w3d/rcmenu.h +++ b/Core/Tools/WW3D/max2w3d/rcmenu.h @@ -34,7 +34,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "max.h" #include "dllmain.h" #include "resource.h" diff --git a/Core/Tools/WW3D/max2w3d/simpdib.h b/Core/Tools/WW3D/max2w3d/simpdib.h index 6a17174579..535446c851 100644 --- a/Core/Tools/WW3D/max2w3d/simpdib.h +++ b/Core/Tools/WW3D/max2w3d/simpdib.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Tools/WW3D/max2w3d/skin.h b/Core/Tools/WW3D/max2w3d/skin.h index 160a694e9a..ff5f7baf2a 100644 --- a/Core/Tools/WW3D/max2w3d/skin.h +++ b/Core/Tools/WW3D/max2w3d/skin.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include #include "simpmod.h" #include "simpobj.h" diff --git a/Core/Tools/WW3D/max2w3d/skindata.h b/Core/Tools/WW3D/max2w3d/skindata.h index 877bfb8ea0..6726465dc8 100644 --- a/Core/Tools/WW3D/max2w3d/skindata.h +++ b/Core/Tools/WW3D/max2w3d/skindata.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "max.h" #include "namedsel.h" diff --git a/Core/Tools/WW3D/max2w3d/util.h b/Core/Tools/WW3D/max2w3d/util.h index 1ca9ca0a28..96eb55e03f 100644 --- a/Core/Tools/WW3D/max2w3d/util.h +++ b/Core/Tools/WW3D/max2w3d/util.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Tools/WW3D/max2w3d/vchannel.h b/Core/Tools/WW3D/max2w3d/vchannel.h index c22b942c7d..fbe8beb7f4 100644 --- a/Core/Tools/WW3D/max2w3d/vchannel.h +++ b/Core/Tools/WW3D/max2w3d/vchannel.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Tools/WW3D/max2w3d/vxl.h b/Core/Tools/WW3D/max2w3d/vxl.h index 7b1ef45edd..7941bdc9eb 100644 --- a/Core/Tools/WW3D/max2w3d/vxl.h +++ b/Core/Tools/WW3D/max2w3d/vxl.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Tools/WW3D/max2w3d/vxldbg.h b/Core/Tools/WW3D/max2w3d/vxldbg.h index 0b0ffc4d13..8a734b8a74 100644 --- a/Core/Tools/WW3D/max2w3d/vxldbg.h +++ b/Core/Tools/WW3D/max2w3d/vxldbg.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Tools/WW3D/max2w3d/vxllayer.h b/Core/Tools/WW3D/max2w3d/vxllayer.h index 18996b7084..31705cf76c 100644 --- a/Core/Tools/WW3D/max2w3d/vxllayer.h +++ b/Core/Tools/WW3D/max2w3d/vxllayer.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include diff --git a/Core/Tools/WW3D/max2w3d/w3d_file.h b/Core/Tools/WW3D/max2w3d/w3d_file.h index 13993d152a..57fd907a71 100644 --- a/Core/Tools/WW3D/max2w3d/w3d_file.h +++ b/Core/Tools/WW3D/max2w3d/w3d_file.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "BITTYPE.H" #include "iostruct.h" diff --git a/Core/Tools/WW3D/max2w3d/w3d_obsolete.h b/Core/Tools/WW3D/max2w3d/w3d_obsolete.h index 7c3a0f27b4..6d36fd2ac2 100644 --- a/Core/Tools/WW3D/max2w3d/w3d_obsolete.h +++ b/Core/Tools/WW3D/max2w3d/w3d_obsolete.h @@ -34,7 +34,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once ///////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Core/Tools/WW3D/max2w3d/w3dappdata.h b/Core/Tools/WW3D/max2w3d/w3dappdata.h index 1e1a6e2c64..a79acf429a 100644 --- a/Core/Tools/WW3D/max2w3d/w3dappdata.h +++ b/Core/Tools/WW3D/max2w3d/w3dappdata.h @@ -35,7 +35,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include /* diff --git a/Core/Tools/WW3D/max2w3d/w3ddesc.h b/Core/Tools/WW3D/max2w3d/w3ddesc.h index 145d5b4ae0..2eb3ce2d8a 100644 --- a/Core/Tools/WW3D/max2w3d/w3ddesc.h +++ b/Core/Tools/WW3D/max2w3d/w3ddesc.h @@ -34,7 +34,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "always.h" #include diff --git a/Core/Tools/WW3D/max2w3d/w3ddlg.h b/Core/Tools/WW3D/max2w3d/w3ddlg.h index d3cc90cd6e..49801726ba 100644 --- a/Core/Tools/WW3D/max2w3d/w3ddlg.h +++ b/Core/Tools/WW3D/max2w3d/w3ddlg.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include #include "w3dutil.h" diff --git a/Core/Tools/WW3D/max2w3d/w3dexp.h b/Core/Tools/WW3D/max2w3d/w3dexp.h index 18f8c4dae6..df69186b38 100644 --- a/Core/Tools/WW3D/max2w3d/w3dexp.h +++ b/Core/Tools/WW3D/max2w3d/w3dexp.h @@ -34,7 +34,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "always.h" #include #include "dllmain.h" diff --git a/Core/Tools/WW3D/max2w3d/w3dmtl.h b/Core/Tools/WW3D/max2w3d/w3dmtl.h index d70b63f804..7238563086 100644 --- a/Core/Tools/WW3D/max2w3d/w3dmtl.h +++ b/Core/Tools/WW3D/max2w3d/w3dmtl.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "w3d_file.h" #include "Vector.H" diff --git a/Core/Tools/WW3D/max2w3d/w3dutil.h b/Core/Tools/WW3D/max2w3d/w3dutil.h index 96f6e7b036..ad1e6a4e57 100644 --- a/Core/Tools/WW3D/max2w3d/w3dutil.h +++ b/Core/Tools/WW3D/max2w3d/w3dutil.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include #include "utilapi.h" #include "dllmain.h" diff --git a/Core/Tools/WW3D/pluglib/BITTYPE.H b/Core/Tools/WW3D/pluglib/BITTYPE.H index feb17a2bf0..803142c16f 100644 --- a/Core/Tools/WW3D/pluglib/BITTYPE.H +++ b/Core/Tools/WW3D/pluglib/BITTYPE.H @@ -27,7 +27,9 @@ * Programmer: Greg Hjelstrom * *****************************************************************/ + #pragma once + typedef unsigned char uint8; typedef unsigned short uint16; typedef unsigned long uint32; diff --git a/Core/Tools/WW3D/pluglib/EULER.H b/Core/Tools/WW3D/pluglib/EULER.H index 7a2b42d5ee..9901ed406e 100644 --- a/Core/Tools/WW3D/pluglib/EULER.H +++ b/Core/Tools/WW3D/pluglib/EULER.H @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include diff --git a/Core/Tools/WW3D/pluglib/PROGRESS.H b/Core/Tools/WW3D/pluglib/PROGRESS.H index c72e9ed908..bb57b2d952 100644 --- a/Core/Tools/WW3D/pluglib/PROGRESS.H +++ b/Core/Tools/WW3D/pluglib/PROGRESS.H @@ -34,7 +34,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "always.h" class Progress_Meter_Class diff --git a/Core/Tools/WW3D/pluglib/Vector.H b/Core/Tools/WW3D/pluglib/Vector.H index 126c77998c..893ee38c06 100644 --- a/Core/Tools/WW3D/pluglib/Vector.H +++ b/Core/Tools/WW3D/pluglib/Vector.H @@ -49,7 +49,9 @@ * DynamicVectorClass::ID -- Find matching value in the dynamic vector. * * DynamicVectorClass::Uninitialized_Add -- Add an empty place to the vector. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "noinit.h" #include #include diff --git a/Core/Tools/WW3D/pluglib/WWmatrix3.h b/Core/Tools/WW3D/pluglib/WWmatrix3.h index b12a1118d6..3611036e39 100644 --- a/Core/Tools/WW3D/pluglib/WWmatrix3.h +++ b/Core/Tools/WW3D/pluglib/WWmatrix3.h @@ -53,8 +53,8 @@ * Matrix3::Rotate_Z -- Post-multiplies the matrix with a rotation about Z * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "vector3.h" //#include "wwdebug.h" diff --git a/Core/Tools/WW3D/pluglib/aaplane.h b/Core/Tools/WW3D/pluglib/aaplane.h index 79e57a5ffc..0e7cb97e02 100644 --- a/Core/Tools/WW3D/pluglib/aaplane.h +++ b/Core/Tools/WW3D/pluglib/aaplane.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "vector3.h" diff --git a/Core/Tools/WW3D/pluglib/always.h b/Core/Tools/WW3D/pluglib/always.h index 3eb00ddeee..79a856d238 100644 --- a/Core/Tools/WW3D/pluglib/always.h +++ b/Core/Tools/WW3D/pluglib/always.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #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) 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 5b36be25b7..3481762211 100644 --- a/Core/Tools/WW3D/pluglib/chunkio.h +++ b/Core/Tools/WW3D/pluglib/chunkio.h @@ -34,7 +34,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #ifndef ALWAYS_H #include "always.h" #endif diff --git a/Core/Tools/WW3D/pluglib/errclass.h b/Core/Tools/WW3D/pluglib/errclass.h index 2f0fb59bfb..60c26fa0cf 100644 --- a/Core/Tools/WW3D/pluglib/errclass.h +++ b/Core/Tools/WW3D/pluglib/errclass.h @@ -34,7 +34,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include diff --git a/Core/Tools/WW3D/pluglib/hashcalc.h b/Core/Tools/WW3D/pluglib/hashcalc.h index d38b90fd8c..a01fbf08ff 100644 --- a/Core/Tools/WW3D/pluglib/hashcalc.h +++ b/Core/Tools/WW3D/pluglib/hashcalc.h @@ -33,8 +33,8 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once +#pragma once /* ** HashCalculatorClass diff --git a/Core/Tools/WW3D/pluglib/hsv.h b/Core/Tools/WW3D/pluglib/hsv.h index 32d122b4b2..67842cf556 100644 --- a/Core/Tools/WW3D/pluglib/hsv.h +++ b/Core/Tools/WW3D/pluglib/hsv.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + class RGBClass; class HSVClass; diff --git a/Core/Tools/WW3D/pluglib/iostruct.h b/Core/Tools/WW3D/pluglib/iostruct.h index d6b4cb9a16..7cd4bed0cb 100644 --- a/Core/Tools/WW3D/pluglib/iostruct.h +++ b/Core/Tools/WW3D/pluglib/iostruct.h @@ -33,11 +33,13 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#pragma once +#pragma once #pragma once + #ifndef BITTYPE_H + #include "BITTYPE.H" #endif diff --git a/Core/Tools/WW3D/pluglib/matrix3d.h b/Core/Tools/WW3D/pluglib/matrix3d.h index 1d68521003..9d3ba1296e 100644 --- a/Core/Tools/WW3D/pluglib/matrix3d.h +++ b/Core/Tools/WW3D/pluglib/matrix3d.h @@ -71,6 +71,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #ifdef _UNIX #include "osdep.h" #endif diff --git a/Core/Tools/WW3D/pluglib/matrix4.h b/Core/Tools/WW3D/pluglib/matrix4.h index 6964d80c96..08b43d2179 100644 --- a/Core/Tools/WW3D/pluglib/matrix4.h +++ b/Core/Tools/WW3D/pluglib/matrix4.h @@ -52,8 +52,8 @@ * Matrix4::operator /= -- "divide equals" operator * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "vector4.h" #include "matrix3d.h" diff --git a/Core/Tools/WW3D/pluglib/nodefilt.h b/Core/Tools/WW3D/pluglib/nodefilt.h index 1e02e90db5..a8c0a43ed5 100644 --- a/Core/Tools/WW3D/pluglib/nodefilt.h +++ b/Core/Tools/WW3D/pluglib/nodefilt.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include diff --git a/Core/Tools/WW3D/pluglib/nodelist.h b/Core/Tools/WW3D/pluglib/nodelist.h index c98363e908..2b0f377e41 100644 --- a/Core/Tools/WW3D/pluglib/nodelist.h +++ b/Core/Tools/WW3D/pluglib/nodelist.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include diff --git a/Core/Tools/WW3D/pluglib/noinit.h b/Core/Tools/WW3D/pluglib/noinit.h index c5075260f7..dfbe3b1573 100644 --- a/Core/Tools/WW3D/pluglib/noinit.h +++ b/Core/Tools/WW3D/pluglib/noinit.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + /********************************************************************** ** This class is solely used as a parameter to a constructor that does ** absolutely no initialization to the object being constructed. By using diff --git a/Core/Tools/WW3D/pluglib/palette.h b/Core/Tools/WW3D/pluglib/palette.h index b67bc5c42e..37fd35125c 100644 --- a/Core/Tools/WW3D/pluglib/palette.h +++ b/Core/Tools/WW3D/pluglib/palette.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "rgb.h" /* diff --git a/Core/Tools/WW3D/pluglib/plane.h b/Core/Tools/WW3D/pluglib/plane.h index a0d36654d2..0d6d809679 100644 --- a/Core/Tools/WW3D/pluglib/plane.h +++ b/Core/Tools/WW3D/pluglib/plane.h @@ -34,7 +34,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #ifndef VECTOR3_H #include "vector3.h" #endif diff --git a/Core/Tools/WW3D/pluglib/rawfile.h b/Core/Tools/WW3D/pluglib/rawfile.h index 939ef16eff..40d81d696a 100644 --- a/Core/Tools/WW3D/pluglib/rawfile.h +++ b/Core/Tools/WW3D/pluglib/rawfile.h @@ -37,7 +37,9 @@ * RawFileClass::~RawFileClass -- Default deconstructor for a file object. * * RawFileClass::Is_Open -- Checks to see if the file is open or not. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + //#include // #include "win.h" diff --git a/Core/Tools/WW3D/pluglib/realcrc.h b/Core/Tools/WW3D/pluglib/realcrc.h index 1aedd373a4..c858e5f583 100644 --- a/Core/Tools/WW3D/pluglib/realcrc.h +++ b/Core/Tools/WW3D/pluglib/realcrc.h @@ -33,6 +33,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once unsigned long CRC_Memory( const unsigned char *data, unsigned long length, unsigned long crc = 0 ); diff --git a/Core/Tools/WW3D/pluglib/rgb.h b/Core/Tools/WW3D/pluglib/rgb.h index 411d432ed1..8803b13d20 100644 --- a/Core/Tools/WW3D/pluglib/rgb.h +++ b/Core/Tools/WW3D/pluglib/rgb.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + class PaletteClass; class HSVClass; diff --git a/Core/Tools/WW3D/pluglib/uarray.h b/Core/Tools/WW3D/pluglib/uarray.h index a441ac796e..7c61de4728 100644 --- a/Core/Tools/WW3D/pluglib/uarray.h +++ b/Core/Tools/WW3D/pluglib/uarray.h @@ -36,7 +36,9 @@ * UniqueArrayClass::~UniqueArrayClass -- destructor * * UniqueArrayClass::Add -- Add an item to the array * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #ifndef HASHCALC_H #include "hashcalc.h" #endif diff --git a/Core/Tools/WW3D/pluglib/vector2.h b/Core/Tools/WW3D/pluglib/vector2.h index 04d4cd524f..df1431b514 100644 --- a/Core/Tools/WW3D/pluglib/vector2.h +++ b/Core/Tools/WW3D/pluglib/vector2.h @@ -50,6 +50,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "wwmath.h" #include diff --git a/Core/Tools/WW3D/pluglib/vector3.h b/Core/Tools/WW3D/pluglib/vector3.h index f848510650..1148df55a5 100644 --- a/Core/Tools/WW3D/pluglib/vector3.h +++ b/Core/Tools/WW3D/pluglib/vector3.h @@ -64,6 +64,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "wwmath.h" #include diff --git a/Core/Tools/WW3D/pluglib/vector3i.h b/Core/Tools/WW3D/pluglib/vector3i.h index 4382838e2e..4f65ee531c 100644 --- a/Core/Tools/WW3D/pluglib/vector3i.h +++ b/Core/Tools/WW3D/pluglib/vector3i.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" class Vector3i diff --git a/Core/Tools/WW3D/pluglib/vector4.h b/Core/Tools/WW3D/pluglib/vector4.h index 6fe9ab205e..cc2223bc75 100644 --- a/Core/Tools/WW3D/pluglib/vector4.h +++ b/Core/Tools/WW3D/pluglib/vector4.h @@ -45,6 +45,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "wwmath.h" #include 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 0469015121..44c0747975 100644 --- a/Core/Tools/WW3D/pluglib/w3d_file.h +++ b/Core/Tools/WW3D/pluglib/w3d_file.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #ifndef BITTYPE_H diff --git a/Core/Tools/WW3D/pluglib/w3dquat.h b/Core/Tools/WW3D/pluglib/w3dquat.h index c8222c92f2..a6219a3bf8 100644 --- a/Core/Tools/WW3D/pluglib/w3dquat.h +++ b/Core/Tools/WW3D/pluglib/w3dquat.h @@ -36,6 +36,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "wwmath.h" #include "WWmatrix3.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 ed44dbce41..009b4e7412 100644 --- a/Core/Tools/WW3D/pluglib/win.h +++ b/Core/Tools/WW3D/pluglib/win.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + /* ** This header file includes the Windows headers. If there are any special pragmas that need ** to occur around this process, they are performed here. Typically, certain warnings will need diff --git a/Core/Tools/WW3D/pluglib/wwfile.h b/Core/Tools/WW3D/pluglib/wwfile.h index 10fda74e63..1ae0e39403 100644 --- a/Core/Tools/WW3D/pluglib/wwfile.h +++ b/Core/Tools/WW3D/pluglib/wwfile.h @@ -33,7 +33,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #ifdef _UNIX #include "osdep.h" #endif diff --git a/Core/Tools/WW3D/pluglib/wwmath.h b/Core/Tools/WW3D/pluglib/wwmath.h index 1bf77eb095..9bb2cc9bcc 100644 --- a/Core/Tools/WW3D/pluglib/wwmath.h +++ b/Core/Tools/WW3D/pluglib/wwmath.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include #include diff --git a/Core/Tools/mangler/crc.h b/Core/Tools/mangler/crc.h index 6a7c22beaa..0ff76e0ce9 100644 --- a/Core/Tools/mangler/crc.h +++ b/Core/Tools/mangler/crc.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #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); diff --git a/Core/Tools/mangler/endian.h b/Core/Tools/mangler/endian.h index cdd2d69ef6..9cf4efffa3 100644 --- a/Core/Tools/mangler/endian.h +++ b/Core/Tools/mangler/endian.h @@ -15,8 +15,8 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ -#pragma once +#pragma once /* ** Network order is big-endian. diff --git a/Core/Tools/mangler/mangler.h b/Core/Tools/mangler/mangler.h index 9a37ae61e2..4368290acd 100644 --- a/Core/Tools/mangler/mangler.h +++ b/Core/Tools/mangler/mangler.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // Packet should consist of a GlobalHeaderType followed by a GlobalPacketType with the fields set as // indicated. diff --git a/Core/Tools/mangler/wlib/arraylist.h b/Core/Tools/mangler/wlib/arraylist.h index d4f1b7e18f..58c8481842 100644 --- a/Core/Tools/mangler/wlib/arraylist.h +++ b/Core/Tools/mangler/wlib/arraylist.h @@ -43,7 +43,9 @@ for! A good copy constructor is one that won't blindly duplicate pointers that don't belong to them, etc... \****************************************************************************/ + #pragma once + #include #include #include diff --git a/Core/Tools/mangler/wlib/configfile.h b/Core/Tools/mangler/wlib/configfile.h index 0aa719873c..eba5a02c81 100644 --- a/Core/Tools/mangler/wlib/configfile.h +++ b/Core/Tools/mangler/wlib/configfile.h @@ -25,7 +25,9 @@ Author : Neal Kettler Start Date : June 9, 1997 Last Update : May 13, 1999 \***************************************************************************/ + #pragma once + #include "wstypes.h" #include "dictionary.h" #include "wstring.h" diff --git a/Core/Tools/mangler/wlib/critsec.h b/Core/Tools/mangler/wlib/critsec.h index 2ce22dc040..687667d74d 100644 --- a/Core/Tools/mangler/wlib/critsec.h +++ b/Core/Tools/mangler/wlib/critsec.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include "wstypes.h" #ifdef _WIN32 #include diff --git a/Core/Tools/mangler/wlib/filed.h b/Core/Tools/mangler/wlib/filed.h index 7036e7b3a1..2d00ab1afa 100644 --- a/Core/Tools/mangler/wlib/filed.h +++ b/Core/Tools/mangler/wlib/filed.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include "odevice.h" class FileD : public OutputDevice diff --git a/Core/Tools/mangler/wlib/linkedlist.h b/Core/Tools/mangler/wlib/linkedlist.h index c4298bf5a7..8589c3c45c 100644 --- a/Core/Tools/mangler/wlib/linkedlist.h +++ b/Core/Tools/mangler/wlib/linkedlist.h @@ -32,7 +32,9 @@ 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. \****************************************************************************/ + #pragma once + #include #include #include diff --git a/Core/Tools/mangler/wlib/mboxd.h b/Core/Tools/mangler/wlib/mboxd.h index 221524ddf6..a45eff3700 100644 --- a/Core/Tools/mangler/wlib/mboxd.h +++ b/Core/Tools/mangler/wlib/mboxd.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include "odevice.h" class MboxD : public OutputDevice diff --git a/Core/Tools/mangler/wlib/monod.h b/Core/Tools/mangler/wlib/monod.h index d4dfee99e9..4f94fd065e 100644 --- a/Core/Tools/mangler/wlib/monod.h +++ b/Core/Tools/mangler/wlib/monod.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 diff --git a/Core/Tools/mangler/wlib/odevice.h b/Core/Tools/mangler/wlib/odevice.h index f27719c771..8cb924ea42 100644 --- a/Core/Tools/mangler/wlib/odevice.h +++ b/Core/Tools/mangler/wlib/odevice.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // This virtual base class provides an interface for output devices // that can be used for the debugging package. class OutputDevice diff --git a/Core/Tools/mangler/wlib/sem4.h b/Core/Tools/mangler/wlib/sem4.h index 4f208e0f14..175663dea1 100644 --- a/Core/Tools/mangler/wlib/sem4.h +++ b/Core/Tools/mangler/wlib/sem4.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include #ifndef _WINDOWS #include diff --git a/Core/Tools/mangler/wlib/stderrd.h b/Core/Tools/mangler/wlib/stderrd.h index 4dbfd3790d..3af596103e 100644 --- a/Core/Tools/mangler/wlib/stderrd.h +++ b/Core/Tools/mangler/wlib/stderrd.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include "odevice.h" class StderrD : public OutputDevice diff --git a/Core/Tools/mangler/wlib/stdoutd.h b/Core/Tools/mangler/wlib/stdoutd.h index ffd3d2813b..a7f51a76da 100644 --- a/Core/Tools/mangler/wlib/stdoutd.h +++ b/Core/Tools/mangler/wlib/stdoutd.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include "odevice.h" class StdoutD : public OutputDevice diff --git a/Core/Tools/mangler/wlib/streamer.h b/Core/Tools/mangler/wlib/streamer.h index 52c5a568ce..d0121a89be 100644 --- a/Core/Tools/mangler/wlib/streamer.h +++ b/Core/Tools/mangler/wlib/streamer.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include #include #include diff --git a/Core/Tools/mangler/wlib/syslogd.h b/Core/Tools/mangler/wlib/syslogd.h index 0b52c2f833..5cf2c7bf0a 100644 --- a/Core/Tools/mangler/wlib/syslogd.h +++ b/Core/Tools/mangler/wlib/syslogd.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include #include #ifndef _WINDOWS diff --git a/Core/Tools/mangler/wlib/threadfac.h b/Core/Tools/mangler/wlib/threadfac.h index ef9504f350..027de9be53 100644 --- a/Core/Tools/mangler/wlib/threadfac.h +++ b/Core/Tools/mangler/wlib/threadfac.h @@ -19,7 +19,9 @@ // // Platform independent thread creation (Win32 & POSIX) // + #pragma once + #ifdef _WIN32 #include #endif diff --git a/Core/Tools/mangler/wlib/threadsafe.h b/Core/Tools/mangler/wlib/threadsafe.h index 0d69d10fc7..bc5492885d 100644 --- a/Core/Tools/mangler/wlib/threadsafe.h +++ b/Core/Tools/mangler/wlib/threadsafe.h @@ -30,7 +30,9 @@ // #ifdef _REENTRANT + #pragma once + #define strtok ("strtok() is not MT-SAFE!") #define ascctime ("asctime() is not MT-SAFE!") // Can't just do ctime, as Windows' objidl.h uses it as a FILETIME thingie diff --git a/Core/Tools/mangler/wlib/timezone.h b/Core/Tools/mangler/wlib/timezone.h index 0cc318185b..3849cad000 100644 --- a/Core/Tools/mangler/wlib/timezone.h +++ b/Core/Tools/mangler/wlib/timezone.h @@ -24,7 +24,9 @@ we are now in. It even accounts for daylight savings! One caveat is that it only tells you info about what the daylight savings info is now, not 5 minutes from now, not 2 hours ago. Oh well. \****************************************************************************/ + #pragma once + // Just fill in both the timezone description and its offset from GMT void GetTimezoneInfo(const char * &timezone_str, int &timezone_offset); diff --git a/Core/Tools/mangler/wlib/ustring.h b/Core/Tools/mangler/wlib/ustring.h index fca4820197..c06e0d0674 100644 --- a/Core/Tools/mangler/wlib/ustring.h +++ b/Core/Tools/mangler/wlib/ustring.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include #include #include diff --git a/Core/Tools/mangler/wlib/wdebug.h b/Core/Tools/mangler/wlib/wdebug.h index 310f355afd..ef7e6e922d 100644 --- a/Core/Tools/mangler/wlib/wdebug.h +++ b/Core/Tools/mangler/wlib/wdebug.h @@ -49,7 +49,9 @@ This won't compile, read the code until you figure it out. Only then will you be ready to leave grasshopper. \*****************************************************************************/ + #pragma once + #define USE_DEBUG_SEM #include "wstypes.h" diff --git a/Core/Tools/mangler/wlib/wstring.h b/Core/Tools/mangler/wlib/wstring.h index 37a5701f6e..dc3cf29dd7 100644 --- a/Core/Tools/mangler/wlib/wstring.h +++ b/Core/Tools/mangler/wlib/wstring.h @@ -25,7 +25,9 @@ Author : Neal Kettler Start Date : June 1, 1997 Last Update : June 17, 1997 \****************************************************************************/ + #pragma once + #include #include #include "wstypes.h" diff --git a/Core/Tools/mangler/wlib/wstypes.h b/Core/Tools/mangler/wlib/wstypes.h index 6929ad89a1..8ac37ead63 100644 --- a/Core/Tools/mangler/wlib/wstypes.h +++ b/Core/Tools/mangler/wlib/wstypes.h @@ -27,7 +27,9 @@ Last Update : June 17, 1997 Standard type definitions for the sake of portability and readability. \***************************************************************************/ + #pragma once + #ifdef _REENTRANT // reentrant = threaded // Headers with non threadsafe libs need to come before my hacky // threadsafe.h otherwise they won't compile diff --git a/Core/Tools/mangler/wlib/wtime.h b/Core/Tools/mangler/wlib/wtime.h index fc0f8479a0..d76259ce68 100644 --- a/Core/Tools/mangler/wlib/wtime.h +++ b/Core/Tools/mangler/wlib/wtime.h @@ -20,6 +20,7 @@ wtime Neal Kettler \****************************************************************************/ + #pragma once #include diff --git a/Core/Tools/mangler/wlib/xtime.h b/Core/Tools/mangler/wlib/xtime.h index 0284b63768..8c66f80b0f 100644 --- a/Core/Tools/mangler/wlib/xtime.h +++ b/Core/Tools/mangler/wlib/xtime.h @@ -28,6 +28,7 @@ The call to update the current time will break in 2038. Hopefully by then somebody will replace the lame time() function :-) \****************************************************************************/ + #pragma once #include diff --git a/Core/Tools/mangler/wnet/tcp.h b/Core/Tools/mangler/wnet/tcp.h index 71231bb83d..e414cf0865 100644 --- a/Core/Tools/mangler/wnet/tcp.h +++ b/Core/Tools/mangler/wnet/tcp.h @@ -20,7 +20,9 @@ TCP Neal Kettler neal@westwood.com \****************************************************************************/ + #pragma once + #include #include #include diff --git a/Core/Tools/mangler/wnet/udp.h b/Core/Tools/mangler/wnet/udp.h index 23a2508e1f..b409398132 100644 --- a/Core/Tools/mangler/wnet/udp.h +++ b/Core/Tools/mangler/wnet/udp.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include #include #include diff --git a/Core/Tools/matchbot/debug.h b/Core/Tools/matchbot/debug.h index 8ae3f56caa..1df2a06947 100644 --- a/Core/Tools/matchbot/debug.h +++ b/Core/Tools/matchbot/debug.h @@ -19,7 +19,9 @@ // FILE: debug.h ////////////////////////////////////////////////////////////// // Minimal debug info // Author: Matthew D. Campbell, Sept 2002 + #pragma once + #ifdef DEBUG #include diff --git a/Core/Tools/matchbot/encrypt.h b/Core/Tools/matchbot/encrypt.h index 2430c1c956..f4c204a647 100644 --- a/Core/Tools/matchbot/encrypt.h +++ b/Core/Tools/matchbot/encrypt.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #define MAX_ENCRYPTED_STRING 8 //char *do_encrypt(char *, char *); char *do_encrypt(char *); diff --git a/Core/Tools/matchbot/generals.h b/Core/Tools/matchbot/generals.h index ca928c2b55..a00619d704 100644 --- a/Core/Tools/matchbot/generals.h +++ b/Core/Tools/matchbot/generals.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #ifdef _WIN32 #include #endif diff --git a/Core/Tools/matchbot/global.h b/Core/Tools/matchbot/global.h index f5f8f00d13..577df4b2c2 100644 --- a/Core/Tools/matchbot/global.h +++ b/Core/Tools/matchbot/global.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #ifdef _WIN32 #include #ifdef IN diff --git a/Core/Tools/matchbot/matcher.h b/Core/Tools/matchbot/matcher.h index c3aa102ccd..2d35c8e32f 100644 --- a/Core/Tools/matchbot/matcher.h +++ b/Core/Tools/matchbot/matcher.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #ifdef _WIN32 #include #endif diff --git a/Core/Tools/matchbot/mydebug.h b/Core/Tools/matchbot/mydebug.h index 517f950999..91227b3cfa 100644 --- a/Core/Tools/matchbot/mydebug.h +++ b/Core/Tools/matchbot/mydebug.h @@ -49,7 +49,9 @@ This won't compile, read the code until you figure it out. Only then will you be ready to leave grasshopper. \*****************************************************************************/ + #pragma once + #define USE_SEM #include "wstypes.h" diff --git a/Core/Tools/matchbot/rand.h b/Core/Tools/matchbot/rand.h index 0ca793ac84..73ae3ec9be 100644 --- a/Core/Tools/matchbot/rand.h +++ b/Core/Tools/matchbot/rand.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include class RandClass diff --git a/Core/Tools/matchbot/wlib/arraylist.h b/Core/Tools/matchbot/wlib/arraylist.h index d4f1b7e18f..58c8481842 100644 --- a/Core/Tools/matchbot/wlib/arraylist.h +++ b/Core/Tools/matchbot/wlib/arraylist.h @@ -43,7 +43,9 @@ for! A good copy constructor is one that won't blindly duplicate pointers that don't belong to them, etc... \****************************************************************************/ + #pragma once + #include #include #include diff --git a/Core/Tools/matchbot/wlib/configfile.h b/Core/Tools/matchbot/wlib/configfile.h index 0aa719873c..eba5a02c81 100644 --- a/Core/Tools/matchbot/wlib/configfile.h +++ b/Core/Tools/matchbot/wlib/configfile.h @@ -25,7 +25,9 @@ Author : Neal Kettler Start Date : June 9, 1997 Last Update : May 13, 1999 \***************************************************************************/ + #pragma once + #include "wstypes.h" #include "dictionary.h" #include "wstring.h" diff --git a/Core/Tools/matchbot/wlib/critsec.h b/Core/Tools/matchbot/wlib/critsec.h index 2ce22dc040..687667d74d 100644 --- a/Core/Tools/matchbot/wlib/critsec.h +++ b/Core/Tools/matchbot/wlib/critsec.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include "wstypes.h" #ifdef _WIN32 #include diff --git a/Core/Tools/matchbot/wlib/filed.h b/Core/Tools/matchbot/wlib/filed.h index 7036e7b3a1..2d00ab1afa 100644 --- a/Core/Tools/matchbot/wlib/filed.h +++ b/Core/Tools/matchbot/wlib/filed.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include "odevice.h" class FileD : public OutputDevice diff --git a/Core/Tools/matchbot/wlib/linkedlist.h b/Core/Tools/matchbot/wlib/linkedlist.h index c4298bf5a7..8589c3c45c 100644 --- a/Core/Tools/matchbot/wlib/linkedlist.h +++ b/Core/Tools/matchbot/wlib/linkedlist.h @@ -32,7 +32,9 @@ 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. \****************************************************************************/ + #pragma once + #include #include #include diff --git a/Core/Tools/matchbot/wlib/mboxd.h b/Core/Tools/matchbot/wlib/mboxd.h index 221524ddf6..a45eff3700 100644 --- a/Core/Tools/matchbot/wlib/mboxd.h +++ b/Core/Tools/matchbot/wlib/mboxd.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include "odevice.h" class MboxD : public OutputDevice diff --git a/Core/Tools/matchbot/wlib/monod.h b/Core/Tools/matchbot/wlib/monod.h index d4dfee99e9..4f94fd065e 100644 --- a/Core/Tools/matchbot/wlib/monod.h +++ b/Core/Tools/matchbot/wlib/monod.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 diff --git a/Core/Tools/matchbot/wlib/odevice.h b/Core/Tools/matchbot/wlib/odevice.h index f27719c771..8cb924ea42 100644 --- a/Core/Tools/matchbot/wlib/odevice.h +++ b/Core/Tools/matchbot/wlib/odevice.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // This virtual base class provides an interface for output devices // that can be used for the debugging package. class OutputDevice diff --git a/Core/Tools/matchbot/wlib/sem4.h b/Core/Tools/matchbot/wlib/sem4.h index 4f208e0f14..175663dea1 100644 --- a/Core/Tools/matchbot/wlib/sem4.h +++ b/Core/Tools/matchbot/wlib/sem4.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include #ifndef _WINDOWS #include diff --git a/Core/Tools/matchbot/wlib/stderrd.h b/Core/Tools/matchbot/wlib/stderrd.h index 4dbfd3790d..3af596103e 100644 --- a/Core/Tools/matchbot/wlib/stderrd.h +++ b/Core/Tools/matchbot/wlib/stderrd.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include "odevice.h" class StderrD : public OutputDevice diff --git a/Core/Tools/matchbot/wlib/stdoutd.h b/Core/Tools/matchbot/wlib/stdoutd.h index ffd3d2813b..a7f51a76da 100644 --- a/Core/Tools/matchbot/wlib/stdoutd.h +++ b/Core/Tools/matchbot/wlib/stdoutd.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include "odevice.h" class StdoutD : public OutputDevice diff --git a/Core/Tools/matchbot/wlib/streamer.h b/Core/Tools/matchbot/wlib/streamer.h index 52c5a568ce..d0121a89be 100644 --- a/Core/Tools/matchbot/wlib/streamer.h +++ b/Core/Tools/matchbot/wlib/streamer.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include #include #include diff --git a/Core/Tools/matchbot/wlib/syslogd.h b/Core/Tools/matchbot/wlib/syslogd.h index 0b52c2f833..5cf2c7bf0a 100644 --- a/Core/Tools/matchbot/wlib/syslogd.h +++ b/Core/Tools/matchbot/wlib/syslogd.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include #include #ifndef _WINDOWS diff --git a/Core/Tools/matchbot/wlib/threadfac.h b/Core/Tools/matchbot/wlib/threadfac.h index ef9504f350..027de9be53 100644 --- a/Core/Tools/matchbot/wlib/threadfac.h +++ b/Core/Tools/matchbot/wlib/threadfac.h @@ -19,7 +19,9 @@ // // Platform independent thread creation (Win32 & POSIX) // + #pragma once + #ifdef _WIN32 #include #endif diff --git a/Core/Tools/matchbot/wlib/threadsafe.h b/Core/Tools/matchbot/wlib/threadsafe.h index 0d69d10fc7..bc5492885d 100644 --- a/Core/Tools/matchbot/wlib/threadsafe.h +++ b/Core/Tools/matchbot/wlib/threadsafe.h @@ -30,7 +30,9 @@ // #ifdef _REENTRANT + #pragma once + #define strtok ("strtok() is not MT-SAFE!") #define ascctime ("asctime() is not MT-SAFE!") // Can't just do ctime, as Windows' objidl.h uses it as a FILETIME thingie diff --git a/Core/Tools/matchbot/wlib/timezone.h b/Core/Tools/matchbot/wlib/timezone.h index 0cc318185b..3849cad000 100644 --- a/Core/Tools/matchbot/wlib/timezone.h +++ b/Core/Tools/matchbot/wlib/timezone.h @@ -24,7 +24,9 @@ we are now in. It even accounts for daylight savings! One caveat is that it only tells you info about what the daylight savings info is now, not 5 minutes from now, not 2 hours ago. Oh well. \****************************************************************************/ + #pragma once + // Just fill in both the timezone description and its offset from GMT void GetTimezoneInfo(const char * &timezone_str, int &timezone_offset); diff --git a/Core/Tools/matchbot/wlib/ustring.h b/Core/Tools/matchbot/wlib/ustring.h index fca4820197..c06e0d0674 100644 --- a/Core/Tools/matchbot/wlib/ustring.h +++ b/Core/Tools/matchbot/wlib/ustring.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include #include #include diff --git a/Core/Tools/matchbot/wlib/wdebug.h b/Core/Tools/matchbot/wlib/wdebug.h index 5b27b80019..1a363ccca9 100644 --- a/Core/Tools/matchbot/wlib/wdebug.h +++ b/Core/Tools/matchbot/wlib/wdebug.h @@ -49,7 +49,9 @@ This won't compile, read the code until you figure it out. Only then will you be ready to leave grasshopper. \*****************************************************************************/ + #pragma once + #define USE_DEBUG_SEM #include "wstypes.h" diff --git a/Core/Tools/matchbot/wlib/wstring.h b/Core/Tools/matchbot/wlib/wstring.h index 37a5701f6e..dc3cf29dd7 100644 --- a/Core/Tools/matchbot/wlib/wstring.h +++ b/Core/Tools/matchbot/wlib/wstring.h @@ -25,7 +25,9 @@ Author : Neal Kettler Start Date : June 1, 1997 Last Update : June 17, 1997 \****************************************************************************/ + #pragma once + #include #include #include "wstypes.h" diff --git a/Core/Tools/matchbot/wlib/wstypes.h b/Core/Tools/matchbot/wlib/wstypes.h index 6929ad89a1..8ac37ead63 100644 --- a/Core/Tools/matchbot/wlib/wstypes.h +++ b/Core/Tools/matchbot/wlib/wstypes.h @@ -27,7 +27,9 @@ Last Update : June 17, 1997 Standard type definitions for the sake of portability and readability. \***************************************************************************/ + #pragma once + #ifdef _REENTRANT // reentrant = threaded // Headers with non threadsafe libs need to come before my hacky // threadsafe.h otherwise they won't compile diff --git a/Core/Tools/matchbot/wlib/wtime.h b/Core/Tools/matchbot/wlib/wtime.h index fc0f8479a0..d76259ce68 100644 --- a/Core/Tools/matchbot/wlib/wtime.h +++ b/Core/Tools/matchbot/wlib/wtime.h @@ -20,6 +20,7 @@ wtime Neal Kettler \****************************************************************************/ + #pragma once #include diff --git a/Core/Tools/matchbot/wlib/xtime.h b/Core/Tools/matchbot/wlib/xtime.h index 0284b63768..8c66f80b0f 100644 --- a/Core/Tools/matchbot/wlib/xtime.h +++ b/Core/Tools/matchbot/wlib/xtime.h @@ -28,6 +28,7 @@ The call to update the current time will break in 2038. Hopefully by then somebody will replace the lame time() function :-) \****************************************************************************/ + #pragma once #include diff --git a/Core/Tools/matchbot/wnet/tcp.h b/Core/Tools/matchbot/wnet/tcp.h index 71231bb83d..e414cf0865 100644 --- a/Core/Tools/matchbot/wnet/tcp.h +++ b/Core/Tools/matchbot/wnet/tcp.h @@ -20,7 +20,9 @@ TCP Neal Kettler neal@westwood.com \****************************************************************************/ + #pragma once + #include #include #include diff --git a/Core/Tools/matchbot/wnet/udp.h b/Core/Tools/matchbot/wnet/udp.h index 23a2508e1f..b409398132 100644 --- a/Core/Tools/matchbot/wnet/udp.h +++ b/Core/Tools/matchbot/wnet/udp.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include #include #include diff --git a/Core/Tools/timingTest/StdAfx.h b/Core/Tools/timingTest/StdAfx.h index e86eb5ae25..fd99f02206 100644 --- a/Core/Tools/timingTest/StdAfx.h +++ b/Core/Tools/timingTest/StdAfx.h @@ -20,6 +20,7 @@ // or project specific include files that are used frequently, but // are changed infrequently // + #pragma once #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers diff --git a/Core/Tools/wolSetup/StdAfx.h b/Core/Tools/wolSetup/StdAfx.h index 2e28ae3d77..9c16d70d2f 100644 --- a/Core/Tools/wolSetup/StdAfx.h +++ b/Core/Tools/wolSetup/StdAfx.h @@ -20,6 +20,7 @@ // or project specific include files that are used frequently, but // are changed infrequently // + #pragma once #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers diff --git a/Core/Tools/wolSetup/WOLAPI/chatdefs.h b/Core/Tools/wolSetup/WOLAPI/chatdefs.h index 0bc6f2b6bd..e0175d7574 100644 --- a/Core/Tools/wolSetup/WOLAPI/chatdefs.h +++ b/Core/Tools/wolSetup/WOLAPI/chatdefs.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // gks 11/3/1999: version numbers for SetClientVersion // GMU 01/12/01 : bumped CHAT_VERSION_MINOR to 15 // BGC 6/7/01: now version 16 diff --git a/Core/Tools/wolSetup/WOLAPI/downloaddefs.h b/Core/Tools/wolSetup/WOLAPI/downloaddefs.h index b1c601ff87..cd78d834a1 100644 --- a/Core/Tools/wolSetup/WOLAPI/downloaddefs.h +++ b/Core/Tools/wolSetup/WOLAPI/downloaddefs.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // CDownload statuses #define DOWNLOADSTATUS_NONE 0 diff --git a/Core/Tools/wolSetup/WOLAPI/ftpdefs.h b/Core/Tools/wolSetup/WOLAPI/ftpdefs.h index 6ea78a8f5a..1306a38ecb 100644 --- a/Core/Tools/wolSetup/WOLAPI/ftpdefs.h +++ b/Core/Tools/wolSetup/WOLAPI/ftpdefs.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 // CFtp return codes. diff --git a/Core/Tools/wolSetup/WOLAPI/netutildefs.h b/Core/Tools/wolSetup/WOLAPI/netutildefs.h index e7f58c7bd6..926bc1f2fa 100644 --- a/Core/Tools/wolSetup/WOLAPI/netutildefs.h +++ b/Core/Tools/wolSetup/WOLAPI/netutildefs.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 #define NETUTIL_E_ERROR MAKE_HRESULT( SEVERITY_ERROR, FACILITY_ITF, 100) diff --git a/Core/Tools/wolSetup/verchk.h b/Core/Tools/wolSetup/verchk.h index 7d014bd564..4584bc1632 100644 --- a/Core/Tools/wolSetup/verchk.h +++ b/Core/Tools/wolSetup/verchk.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif diff --git a/Core/Tools/wolSetup/wolSetup.h b/Core/Tools/wolSetup/wolSetup.h index 64ce849dfb..80350df119 100644 --- a/Core/Tools/wolSetup/wolSetup.h +++ b/Core/Tools/wolSetup/wolSetup.h @@ -18,7 +18,9 @@ // FILE: wolSetup.h ////////////////////////////////////////////////////// // Author: Matthew D. Campbell, December 2001 + #pragma once + #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif diff --git a/Generals/Code/GameEngine/Include/Common/ActionManager.h b/Generals/Code/GameEngine/Include/Common/ActionManager.h index 6ae2be6d29..54e982788e 100644 --- a/Generals/Code/GameEngine/Include/Common/ActionManager.h +++ b/Generals/Code/GameEngine/Include/Common/ActionManager.h @@ -33,6 +33,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/SubsystemInterface.h" diff --git a/Generals/Code/GameEngine/Include/Common/BattleHonors.h b/Generals/Code/GameEngine/Include/Common/BattleHonors.h index 0815f9e46d..96ed04409f 100644 --- a/Generals/Code/GameEngine/Include/Common/BattleHonors.h +++ b/Generals/Code/GameEngine/Include/Common/BattleHonors.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/Common/BezierSegment.h b/Generals/Code/GameEngine/Include/Common/BezierSegment.h index a1a68496bd..b16df7d8ce 100644 --- a/Generals/Code/GameEngine/Include/Common/BezierSegment.h +++ b/Generals/Code/GameEngine/Include/Common/BezierSegment.h @@ -28,6 +28,7 @@ // DO NOT DISTRIBUTE #pragma once + #include #include "Common/STLTypedefs.h" diff --git a/Generals/Code/GameEngine/Include/Common/BitFlags.h b/Generals/Code/GameEngine/Include/Common/BitFlags.h index 21dc6d98a4..b923379633 100644 --- a/Generals/Code/GameEngine/Include/Common/BitFlags.h +++ b/Generals/Code/GameEngine/Include/Common/BitFlags.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" diff --git a/Generals/Code/GameEngine/Include/Common/BitFlagsIO.h b/Generals/Code/GameEngine/Include/Common/BitFlagsIO.h index 1c0c2be83a..2d7be09044 100644 --- a/Generals/Code/GameEngine/Include/Common/BitFlagsIO.h +++ b/Generals/Code/GameEngine/Include/Common/BitFlagsIO.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/BitFlags.h" #include "Common/INI.h" #include "Common/Xfer.h" 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 6562197f8f..40573cae97 100644 --- a/Generals/Code/GameEngine/Include/Common/BuildAssistant.h +++ b/Generals/Code/GameEngine/Include/Common/BuildAssistant.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" #include "Lib/BaseType.h" diff --git a/Generals/Code/GameEngine/Include/Common/ClientUpdateModule.h b/Generals/Code/GameEngine/Include/Common/ClientUpdateModule.h index 063f3a1798..c90e0adffa 100644 --- a/Generals/Code/GameEngine/Include/Common/ClientUpdateModule.h +++ b/Generals/Code/GameEngine/Include/Common/ClientUpdateModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include diff --git a/Generals/Code/GameEngine/Include/Common/CommandLine.h b/Generals/Code/GameEngine/Include/Common/CommandLine.h index 149ff809a0..48e078dc3d 100644 --- a/Generals/Code/GameEngine/Include/Common/CommandLine.h +++ b/Generals/Code/GameEngine/Include/Common/CommandLine.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, September 2001 #pragma once + class CommandLine { public: diff --git a/Generals/Code/GameEngine/Include/Common/CriticalSection.h b/Generals/Code/GameEngine/Include/Common/CriticalSection.h index fbd21670b6..b44a88f2ff 100644 --- a/Generals/Code/GameEngine/Include/Common/CriticalSection.h +++ b/Generals/Code/GameEngine/Include/Common/CriticalSection.h @@ -27,6 +27,7 @@ // Author: JohnM And MattC, August 13, 2002 #pragma once + #include "Common/PerfTimer.h" #ifdef PERF_TIMERS diff --git a/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h b/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h index cfde742fba..d5631fb4e4 100644 --- a/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/CustomMatchPreferences.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/Common/DamageFX.h b/Generals/Code/GameEngine/Include/Common/DamageFX.h index 80a47d4a9a..0b6e3ad711 100644 --- a/Generals/Code/GameEngine/Include/Common/DamageFX.h +++ b/Generals/Code/GameEngine/Include/Common/DamageFX.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameCommon.h" #include "Common/NameKeyGenerator.h" diff --git a/Generals/Code/GameEngine/Include/Common/DataChunk.h b/Generals/Code/GameEngine/Include/Common/DataChunk.h index 56bfb66989..9c0e747d9c 100644 --- a/Generals/Code/GameEngine/Include/Common/DataChunk.h +++ b/Generals/Code/GameEngine/Include/Common/DataChunk.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, October 2000 #pragma once + #include "Common/GameMemory.h" #include "Common/Dict.h" #include "Common/MapReaderWriterInfo.h" diff --git a/Generals/Code/GameEngine/Include/Common/Dict.h b/Generals/Code/GameEngine/Include/Common/Dict.h index d868b86941..80f26dc7b7 100644 --- a/Generals/Code/GameEngine/Include/Common/Dict.h +++ b/Generals/Code/GameEngine/Include/Common/Dict.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Errors.h" #include "Common/NameKeyGenerator.h" diff --git a/Generals/Code/GameEngine/Include/Common/Directory.h b/Generals/Code/GameEngine/Include/Common/Directory.h index 713e0bdf54..7d1f0adf7e 100644 --- a/Generals/Code/GameEngine/Include/Common/Directory.h +++ b/Generals/Code/GameEngine/Include/Common/Directory.h @@ -27,7 +27,9 @@ // Desc: Directory info class /////////////////////////////////////////////////////////////////////////////////////////////////// #if (0) + #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" #include "Common/STLTypedefs.h" diff --git a/Generals/Code/GameEngine/Include/Common/DisabledTypes.h b/Generals/Code/GameEngine/Include/Common/DisabledTypes.h index d540184619..31fd14a0b7 100644 --- a/Generals/Code/GameEngine/Include/Common/DisabledTypes.h +++ b/Generals/Code/GameEngine/Include/Common/DisabledTypes.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" diff --git a/Generals/Code/GameEngine/Include/Common/DiscreteCircle.h b/Generals/Code/GameEngine/Include/Common/DiscreteCircle.h index b5b2e4211f..1ec8fcd5ab 100644 --- a/Generals/Code/GameEngine/Include/Common/DiscreteCircle.h +++ b/Generals/Code/GameEngine/Include/Common/DiscreteCircle.h @@ -28,6 +28,7 @@ // DO NOT DISTRIBUTE #pragma once + //------------------------------------------------------------------------------------------------- /** One horizontal line of the circle we are going to generate, the points drawn should be from diff --git a/Generals/Code/GameEngine/Include/Common/DrawModule.h b/Generals/Code/GameEngine/Include/Common/DrawModule.h index 3c22211120..b9e458a64a 100644 --- a/Generals/Code/GameEngine/Include/Common/DrawModule.h +++ b/Generals/Code/GameEngine/Include/Common/DrawModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Module.h" diff --git a/Generals/Code/GameEngine/Include/Common/Energy.h b/Generals/Code/GameEngine/Include/Common/Energy.h index 53d3d000db..ecdda0f2f6 100644 --- a/Generals/Code/GameEngine/Include/Common/Energy.h +++ b/Generals/Code/GameEngine/Include/Common/Energy.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + // INLCUDES ///////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" diff --git a/Generals/Code/GameEngine/Include/Common/Errors.h b/Generals/Code/GameEngine/Include/Common/Errors.h index 6bcf0a7903..2c2cec27c6 100644 --- a/Generals/Code/GameEngine/Include/Common/Errors.h +++ b/Generals/Code/GameEngine/Include/Common/Errors.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + /** An ErrorCode is the repository for failure modes. In almost all situations, these values will be THROWN, not returned as error codes. Feel free diff --git a/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h b/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h index 1ea88f5335..bdc82b65de 100644 --- a/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h +++ b/Generals/Code/GameEngine/Include/Common/FunctionLexicon.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/SubsystemInterface.h" #include "Common/NameKeyGenerator.h" #include "Common/GameMemory.h" diff --git a/Generals/Code/GameEngine/Include/Common/GameCommon.h b/Generals/Code/GameEngine/Include/Common/GameCommon.h index 2b3ff8fbc2..77d9eb99d8 100644 --- a/Generals/Code/GameEngine/Include/Common/GameCommon.h +++ b/Generals/Code/GameEngine/Include/Common/GameCommon.h @@ -46,6 +46,7 @@ //----------------------------------------------------------------------------- #pragma once + // ---------------------------------------------------------------------------------------------- #include "Lib/BaseType.h" #include "WWCommon.h" diff --git a/Generals/Code/GameEngine/Include/Common/GameEngine.h b/Generals/Code/GameEngine/Include/Common/GameEngine.h index b28340b224..0846229246 100644 --- a/Generals/Code/GameEngine/Include/Common/GameEngine.h +++ b/Generals/Code/GameEngine/Include/Common/GameEngine.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, April 2001 #pragma once + #include "Common/SubsystemInterface.h" #include "Common/GameType.h" diff --git a/Generals/Code/GameEngine/Include/Common/GameLOD.h b/Generals/Code/GameEngine/Include/Common/GameLOD.h index 3ad9d288f7..0e3390d77c 100644 --- a/Generals/Code/GameEngine/Include/Common/GameLOD.h +++ b/Generals/Code/GameEngine/Include/Common/GameLOD.h @@ -32,6 +32,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + enum ParticlePriorityType CPP_11(: Int); #define MAX_LOD_PRESETS_PER_LEVEL 32 //number of hardware configs preset for each low,medium,high,veryhigh diff --git a/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h b/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h index 9810d7cdfc..603b93c219 100644 --- a/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/Common/GameState.h b/Generals/Code/GameEngine/Include/Common/GameState.h index fc34872645..5259cc99da 100644 --- a/Generals/Code/GameEngine/Include/Common/GameState.h +++ b/Generals/Code/GameEngine/Include/Common/GameState.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" #include "Common/Snapshot.h" diff --git a/Generals/Code/GameEngine/Include/Common/GameStateMap.h b/Generals/Code/GameEngine/Include/Common/GameStateMap.h index b8d5717e11..bbfad135a5 100644 --- a/Generals/Code/GameEngine/Include/Common/GameStateMap.h +++ b/Generals/Code/GameEngine/Include/Common/GameStateMap.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INLCUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" #include "Common/SubsystemInterface.h" diff --git a/Generals/Code/GameEngine/Include/Common/GameType.h b/Generals/Code/GameEngine/Include/Common/GameType.h index ab4d21fa6b..23a9a12928 100644 --- a/Generals/Code/GameEngine/Include/Common/GameType.h +++ b/Generals/Code/GameEngine/Include/Common/GameType.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, April 2001 #pragma once + #include "Lib/BaseType.h" // the default size of the world map diff --git a/Generals/Code/GameEngine/Include/Common/Geometry.h b/Generals/Code/GameEngine/Include/Common/Geometry.h index 506b59eaf8..9501c2c9d4 100644 --- a/Generals/Code/GameEngine/Include/Common/Geometry.h +++ b/Generals/Code/GameEngine/Include/Common/Geometry.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Lib/BaseType.h" #include "Common/AsciiString.h" #include "Common/Snapshot.h" diff --git a/Generals/Code/GameEngine/Include/Common/GlobalData.h b/Generals/Code/GameEngine/Include/Common/GlobalData.h index 1368244842..f2ee30eaf1 100644 --- a/Generals/Code/GameEngine/Include/Common/GlobalData.h +++ b/Generals/Code/GameEngine/Include/Common/GlobalData.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameCommon.h" // ensure we get DUMP_PERF_STATS, or not #include "Common/AsciiString.h" #include "Common/GameType.h" diff --git a/Generals/Code/GameEngine/Include/Common/Handicap.h b/Generals/Code/GameEngine/Include/Common/Handicap.h index 41701fbb6c..2ffabc9458 100644 --- a/Generals/Code/GameEngine/Include/Common/Handicap.h +++ b/Generals/Code/GameEngine/Include/Common/Handicap.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + #include "Lib/BaseType.h" // ---------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/Common/INI.h b/Generals/Code/GameEngine/Include/Common/INI.h index b662284c99..861f61f7e4 100644 --- a/Generals/Code/GameEngine/Include/Common/INI.h +++ b/Generals/Code/GameEngine/Include/Common/INI.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include // for offsetof, which we don't use but everyone who includes us does #include "Common/STLTypedefs.h" diff --git a/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h b/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h index f4b8d4f269..1801f0c519 100644 --- a/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h +++ b/Generals/Code/GameEngine/Include/Common/IgnorePreferences.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/Common/KindOf.h b/Generals/Code/GameEngine/Include/Common/KindOf.h index 35feb75e57..8dbec5da7c 100644 --- a/Generals/Code/GameEngine/Include/Common/KindOf.h +++ b/Generals/Code/GameEngine/Include/Common/KindOf.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" diff --git a/Generals/Code/GameEngine/Include/Common/LadderPreferences.h b/Generals/Code/GameEngine/Include/Common/LadderPreferences.h index a7b979fcf3..e28d63721e 100644 --- a/Generals/Code/GameEngine/Include/Common/LadderPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/LadderPreferences.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/Common/Language.h b/Generals/Code/GameEngine/Include/Common/Language.h index d09f1f26f8..da786c4c8a 100644 --- a/Generals/Code/GameEngine/Include/Common/Language.h +++ b/Generals/Code/GameEngine/Include/Common/Language.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/Common/LatchRestore.h b/Generals/Code/GameEngine/Include/Common/LatchRestore.h index a0e970fc9b..eb516c4b7e 100644 --- a/Generals/Code/GameEngine/Include/Common/LatchRestore.h +++ b/Generals/Code/GameEngine/Include/Common/LatchRestore.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + /* 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: diff --git a/Generals/Code/GameEngine/Include/Common/MapObject.h b/Generals/Code/GameEngine/Include/Common/MapObject.h index a7bb54ceef..9b29e983ad 100644 --- a/Generals/Code/GameEngine/Include/Common/MapObject.h +++ b/Generals/Code/GameEngine/Include/Common/MapObject.h @@ -28,6 +28,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Common/Dict.h" #include "Common/GameMemory.h" #include "GameClient/TerrainRoads.h" diff --git a/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h b/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h index 94bf82ac0a..733d6d26c9 100644 --- a/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h +++ b/Generals/Code/GameEngine/Include/Common/MapReaderWriterInfo.h @@ -27,6 +27,7 @@ // Author: John Ahlquist, October 2001 #pragma once + #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 diff --git a/Generals/Code/GameEngine/Include/Common/MessageStream.h b/Generals/Code/GameEngine/Include/Common/MessageStream.h index 49c6c11060..057ade8916 100644 --- a/Generals/Code/GameEngine/Include/Common/MessageStream.h +++ b/Generals/Code/GameEngine/Include/Common/MessageStream.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, February 2001 #pragma once + #include "Common/GameCommon.h" // ensure we get DUMP_PERF_STATS, or not #include "Common/SubsystemInterface.h" #include "Lib/BaseType.h" diff --git a/Generals/Code/GameEngine/Include/Common/MissionStats.h b/Generals/Code/GameEngine/Include/Common/MissionStats.h index c528135d86..e57116f8c7 100644 --- a/Generals/Code/GameEngine/Include/Common/MissionStats.h +++ b/Generals/Code/GameEngine/Include/Common/MissionStats.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + #include "Lib/BaseType.h" #include "Common/GameCommon.h" #include "Common/Snapshot.h" diff --git a/Generals/Code/GameEngine/Include/Common/ModelState.h b/Generals/Code/GameEngine/Include/Common/ModelState.h index 90869ce714..5997dd8e2e 100644 --- a/Generals/Code/GameEngine/Include/Common/ModelState.h +++ b/Generals/Code/GameEngine/Include/Common/ModelState.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, April 2001 #pragma once + #include "Lib/BaseType.h" #include "Common/INI.h" #include "Common/BitFlags.h" diff --git a/Generals/Code/GameEngine/Include/Common/Module.h b/Generals/Code/GameEngine/Include/Common/Module.h index 173783e980..78a26efb02 100644 --- a/Generals/Code/GameEngine/Include/Common/Module.h +++ b/Generals/Code/GameEngine/Include/Common/Module.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" diff --git a/Generals/Code/GameEngine/Include/Common/ModuleFactory.h b/Generals/Code/GameEngine/Include/Common/ModuleFactory.h index e10d8e2f2b..f3f4182f90 100644 --- a/Generals/Code/GameEngine/Include/Common/ModuleFactory.h +++ b/Generals/Code/GameEngine/Include/Common/ModuleFactory.h @@ -35,6 +35,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include diff --git a/Generals/Code/GameEngine/Include/Common/Money.h b/Generals/Code/GameEngine/Include/Common/Money.h index 42fc6e313d..b14e6d19c5 100644 --- a/Generals/Code/GameEngine/Include/Common/Money.h +++ b/Generals/Code/GameEngine/Include/Common/Money.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + #include "Lib/BaseType.h" #include "Common/Debug.h" #include "Common/Snapshot.h" diff --git a/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h b/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h index 14d54c5db5..9cfb403465 100644 --- a/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h +++ b/Generals/Code/GameEngine/Include/Common/MultiplayerSettings.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameClient/Color.h" // FORWARD DECLARATIONS /////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h b/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h index f1babf0b37..01d237638d 100644 --- a/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h +++ b/Generals/Code/GameEngine/Include/Common/NameKeyGenerator.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Lib/BaseType.h" #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" diff --git a/Generals/Code/GameEngine/Include/Common/OSDisplay.h b/Generals/Code/GameEngine/Include/Common/OSDisplay.h index 9c8750af0d..1385a944b1 100644 --- a/Generals/Code/GameEngine/Include/Common/OSDisplay.h +++ b/Generals/Code/GameEngine/Include/Common/OSDisplay.h @@ -27,6 +27,7 @@ // Do Not Distribute #pragma once + #include "Lib/BaseType.h" class AsciiString; diff --git a/Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h b/Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h index 3fe9aa4ae9..f443ad0ac7 100644 --- a/Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h +++ b/Generals/Code/GameEngine/Include/Common/ObjectStatusTypes.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" diff --git a/Generals/Code/GameEngine/Include/Common/Overridable.h b/Generals/Code/GameEngine/Include/Common/Overridable.h index e3f84cbeb9..f395127884 100644 --- a/Generals/Code/GameEngine/Include/Common/Overridable.h +++ b/Generals/Code/GameEngine/Include/Common/Overridable.h @@ -27,6 +27,7 @@ // Do Not Distribute #pragma once + #include "Common/GameMemory.h" /* diff --git a/Generals/Code/GameEngine/Include/Common/Override.h b/Generals/Code/GameEngine/Include/Common/Override.h index 9330fbdb43..d89ee69324 100644 --- a/Generals/Code/GameEngine/Include/Common/Override.h +++ b/Generals/Code/GameEngine/Include/Common/Override.h @@ -27,6 +27,7 @@ // Do Not Distribute #pragma once + #include "Common/Overridable.h" /* diff --git a/Generals/Code/GameEngine/Include/Common/PartitionSolver.h b/Generals/Code/GameEngine/Include/Common/PartitionSolver.h index 86ee954589..6487bb7448 100644 --- a/Generals/Code/GameEngine/Include/Common/PartitionSolver.h +++ b/Generals/Code/GameEngine/Include/Common/PartitionSolver.h @@ -38,6 +38,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/Common/PerfMetrics.h b/Generals/Code/GameEngine/Include/Common/PerfMetrics.h index 9503f458d8..f2d82d8615 100644 --- a/Generals/Code/GameEngine/Include/Common/PerfMetrics.h +++ b/Generals/Code/GameEngine/Include/Common/PerfMetrics.h @@ -27,6 +27,7 @@ // Do Not Distribute #pragma once + // For load timings enum { PERFMETRICS_LOAD_STARTFRAME = 0 }; enum { PERFMETRICS_LOAD_STOPFRAME = 1 }; diff --git a/Generals/Code/GameEngine/Include/Common/PerfTimer.h b/Generals/Code/GameEngine/Include/Common/PerfTimer.h index 1faae0a4ed..071b35b348 100644 --- a/Generals/Code/GameEngine/Include/Common/PerfTimer.h +++ b/Generals/Code/GameEngine/Include/Common/PerfTimer.h @@ -27,6 +27,7 @@ // July 2002 #pragma once + #include "Utility/intrin_compat.h" #if defined(RTS_DEBUG) diff --git a/Generals/Code/GameEngine/Include/Common/Player.h b/Generals/Code/GameEngine/Include/Common/Player.h index d5534f08bf..722af4d604 100644 --- a/Generals/Code/GameEngine/Include/Common/Player.h +++ b/Generals/Code/GameEngine/Include/Common/Player.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + #include "Common/Debug.h" #include "Common/Energy.h" #include "Common/GameType.h" diff --git a/Generals/Code/GameEngine/Include/Common/PlayerList.h b/Generals/Code/GameEngine/Include/Common/PlayerList.h index 4d05e59831..2f0362b489 100644 --- a/Generals/Code/GameEngine/Include/Common/PlayerList.h +++ b/Generals/Code/GameEngine/Include/Common/PlayerList.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + #include "Common/SubsystemInterface.h" #include "Common/GameCommon.h" #include "Common/NameKeyGenerator.h" diff --git a/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h b/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h index 25bdff4f6d..80f3eba14b 100644 --- a/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h +++ b/Generals/Code/GameEngine/Include/Common/PlayerTemplate.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" #include "Common/Debug.h" diff --git a/Generals/Code/GameEngine/Include/Common/ProductionPrerequisite.h b/Generals/Code/GameEngine/Include/Common/ProductionPrerequisite.h index a432a03a34..a6f97ad35d 100644 --- a/Generals/Code/GameEngine/Include/Common/ProductionPrerequisite.h +++ b/Generals/Code/GameEngine/Include/Common/ProductionPrerequisite.h @@ -41,6 +41,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h b/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h index 79004a0f75..fdf0d8fe99 100644 --- a/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/QuickmatchPreferences.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/Common/QuotedPrintable.h b/Generals/Code/GameEngine/Include/Common/QuotedPrintable.h index b5e2400652..af373e9bb6 100644 --- a/Generals/Code/GameEngine/Include/Common/QuotedPrintable.h +++ b/Generals/Code/GameEngine/Include/Common/QuotedPrintable.h @@ -28,6 +28,7 @@ //////////////////////////////////////////////////////////////////////////// #pragma once + UnicodeString QuotedPrintableToUnicodeString(AsciiString original); AsciiString UnicodeStringToQuotedPrintable(UnicodeString original); diff --git a/Generals/Code/GameEngine/Include/Common/Radar.h b/Generals/Code/GameEngine/Include/Common/Radar.h index 7e5532b98d..3a1dc99ef9 100644 --- a/Generals/Code/GameEngine/Include/Common/Radar.h +++ b/Generals/Code/GameEngine/Include/Common/Radar.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/SubsystemInterface.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 731ce4cc0e..83ecb7dd24 100644 --- a/Generals/Code/GameEngine/Include/Common/Registry.h +++ b/Generals/Code/GameEngine/Include/Common/Registry.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, December 2001 #pragma once + #include /** diff --git a/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h b/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h index b56b1b3f1a..437f6d2fdd 100644 --- a/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h +++ b/Generals/Code/GameEngine/Include/Common/ResourceGatheringManager.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameType.h" #include "Common/Snapshot.h" diff --git a/Generals/Code/GameEngine/Include/Common/STLTypedefs.h b/Generals/Code/GameEngine/Include/Common/STLTypedefs.h index 634d646704..6d5e8176f3 100644 --- a/Generals/Code/GameEngine/Include/Common/STLTypedefs.h +++ b/Generals/Code/GameEngine/Include/Common/STLTypedefs.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // srj sez: this must come first, first, first. #define _STLP_USE_NEWALLOC 1 diff --git a/Generals/Code/GameEngine/Include/Common/Science.h b/Generals/Code/GameEngine/Include/Common/Science.h index dff3f35472..f7bfcd6ce0 100644 --- a/Generals/Code/GameEngine/Include/Common/Science.h +++ b/Generals/Code/GameEngine/Include/Common/Science.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Overridable.h" #include "Common/NameKeyGenerator.h" diff --git a/Generals/Code/GameEngine/Include/Common/ScopedMutex.h b/Generals/Code/GameEngine/Include/Common/ScopedMutex.h index 24a6c67d1d..aadd9531e2 100644 --- a/Generals/Code/GameEngine/Include/Common/ScopedMutex.h +++ b/Generals/Code/GameEngine/Include/Common/ScopedMutex.h @@ -22,6 +22,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + class ScopedMutex { private: diff --git a/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h b/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h index a400156ec3..98bf12b894 100644 --- a/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h +++ b/Generals/Code/GameEngine/Include/Common/ScoreKeeper.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h b/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h index 79dad0ebbf..ce1c68254d 100644 --- a/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h +++ b/Generals/Code/GameEngine/Include/Common/SkirmishBattleHonors.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h b/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h index ef4fb200c7..855fd78744 100644 --- a/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/SkirmishPreferences.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/Common/Snapshot.h b/Generals/Code/GameEngine/Include/Common/Snapshot.h index 4ba10885d9..e8a3ef7434 100644 --- a/Generals/Code/GameEngine/Include/Common/Snapshot.h +++ b/Generals/Code/GameEngine/Include/Common/Snapshot.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" diff --git a/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h b/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h index 4743dc2cad..8d983f3a84 100644 --- a/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h +++ b/Generals/Code/GameEngine/Include/Common/SparseMatchFinder.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/BitFlags.h" #include "Common/STLTypedefs.h" diff --git a/Generals/Code/GameEngine/Include/Common/SpecialPower.h b/Generals/Code/GameEngine/Include/Common/SpecialPower.h index 0cc873484c..8317c3e104 100644 --- a/Generals/Code/GameEngine/Include/Common/SpecialPower.h +++ b/Generals/Code/GameEngine/Include/Common/SpecialPower.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameMemory.h" diff --git a/Generals/Code/GameEngine/Include/Common/SpecialPowerMaskType.h b/Generals/Code/GameEngine/Include/Common/SpecialPowerMaskType.h index 997f9cf590..f72371b0e8 100644 --- a/Generals/Code/GameEngine/Include/Common/SpecialPowerMaskType.h +++ b/Generals/Code/GameEngine/Include/Common/SpecialPowerMaskType.h @@ -27,6 +27,7 @@ // JKMCD Aug 2002 #pragma once + #include "Common/BitFlags.h" #include "Common/BitFlagsIO.h" #include "Common/SpecialPowerType.h" diff --git a/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h b/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h index 899cd3b4c4..4fc2a6031d 100644 --- a/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h +++ b/Generals/Code/GameEngine/Include/Common/SpecialPowerType.h @@ -27,6 +27,7 @@ // JKMCD Aug 2002 #pragma once + // ------------------------------------------------------------------------------------------------ // don't forget to add new strings to SpecialPowerMaskType::s_bitNameList[] // ------------------------------------------------------------------------------------------------ diff --git a/Generals/Code/GameEngine/Include/Common/StackDump.h b/Generals/Code/GameEngine/Include/Common/StackDump.h index dc1f4779af..9a0e836dcf 100644 --- a/Generals/Code/GameEngine/Include/Common/StackDump.h +++ b/Generals/Code/GameEngine/Include/Common/StackDump.h @@ -23,6 +23,7 @@ //////////////////////////////////////////////////////////////////////////////// #pragma once + #ifndef IG_DEGBUG_STACKTRACE #define IG_DEBUG_STACKTRACE 1 #endif diff --git a/Generals/Code/GameEngine/Include/Common/StateMachine.h b/Generals/Code/GameEngine/Include/Common/StateMachine.h index b04c43c672..30897106e7 100644 --- a/Generals/Code/GameEngine/Include/Common/StateMachine.h +++ b/Generals/Code/GameEngine/Include/Common/StateMachine.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, January 2002 #pragma once + #include "Common/GameMemory.h" #include "Common/GameType.h" #include "Common/ModelState.h" diff --git a/Generals/Code/GameEngine/Include/Common/StatsCollector.h b/Generals/Code/GameEngine/Include/Common/StatsCollector.h index 72689cd45c..9b67159c40 100644 --- a/Generals/Code/GameEngine/Include/Common/StatsCollector.h +++ b/Generals/Code/GameEngine/Include/Common/StatsCollector.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/Common/SubsystemInterface.h b/Generals/Code/GameEngine/Include/Common/SubsystemInterface.h index 441f9baea3..56b67014a3 100644 --- a/Generals/Code/GameEngine/Include/Common/SubsystemInterface.h +++ b/Generals/Code/GameEngine/Include/Common/SubsystemInterface.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/INI.h" #include "Common/STLTypedefs.h" diff --git a/Generals/Code/GameEngine/Include/Common/SystemInfo.h b/Generals/Code/GameEngine/Include/Common/SystemInfo.h index e121acc905..8b08868eab 100644 --- a/Generals/Code/GameEngine/Include/Common/SystemInfo.h +++ b/Generals/Code/GameEngine/Include/Common/SystemInfo.h @@ -27,4 +27,5 @@ // Author: John K. McDonald, December 2002 #pragma once + extern const Bool TheSystemIsUnicode; diff --git a/Generals/Code/GameEngine/Include/Common/Team.h b/Generals/Code/GameEngine/Include/Common/Team.h index 198ef93826..1f3bd75793 100644 --- a/Generals/Code/GameEngine/Include/Common/Team.h +++ b/Generals/Code/GameEngine/Include/Common/Team.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, Steven Johnson, March 2001 #pragma once + #include "Common/GameType.h" #include "Common/Snapshot.h" #include "Common/Thing.h" diff --git a/Generals/Code/GameEngine/Include/Common/Terrain.h b/Generals/Code/GameEngine/Include/Common/Terrain.h index 9ba238e4cd..dd6ea409a3 100644 --- a/Generals/Code/GameEngine/Include/Common/Terrain.h +++ b/Generals/Code/GameEngine/Include/Common/Terrain.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/Common/TerrainTypes.h b/Generals/Code/GameEngine/Include/Common/TerrainTypes.h index 0e054b78f7..012393a484 100644 --- a/Generals/Code/GameEngine/Include/Common/TerrainTypes.h +++ b/Generals/Code/GameEngine/Include/Common/TerrainTypes.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "Common/SubsystemInterface.h" diff --git a/Generals/Code/GameEngine/Include/Common/Thing.h b/Generals/Code/GameEngine/Include/Common/Thing.h index faa8caf8ec..838480831e 100644 --- a/Generals/Code/GameEngine/Include/Common/Thing.h +++ b/Generals/Code/GameEngine/Include/Common/Thing.h @@ -47,6 +47,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/Common/ThingFactory.h b/Generals/Code/GameEngine/Include/Common/ThingFactory.h index 30c5e7396d..4d4871aedb 100644 --- a/Generals/Code/GameEngine/Include/Common/ThingFactory.h +++ b/Generals/Code/GameEngine/Include/Common/ThingFactory.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" diff --git a/Generals/Code/GameEngine/Include/Common/ThingSort.h b/Generals/Code/GameEngine/Include/Common/ThingSort.h index debdd1d15c..e35702922c 100644 --- a/Generals/Code/GameEngine/Include/Common/ThingSort.h +++ b/Generals/Code/GameEngine/Include/Common/ThingSort.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameCommon.h" //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/Common/ThingTemplate.h b/Generals/Code/GameEngine/Include/Common/ThingTemplate.h index 8db9e1a70d..1e0eb5617d 100644 --- a/Generals/Code/GameEngine/Include/Common/ThingTemplate.h +++ b/Generals/Code/GameEngine/Include/Common/ThingTemplate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" diff --git a/Generals/Code/GameEngine/Include/Common/TunnelTracker.h b/Generals/Code/GameEngine/Include/Common/TunnelTracker.h index 0156a532d3..0680ac5fca 100644 --- a/Generals/Code/GameEngine/Include/Common/TunnelTracker.h +++ b/Generals/Code/GameEngine/Include/Common/TunnelTracker.h @@ -28,6 +28,7 @@ // Author: Graham Smallwood, March, 2002 #pragma once + #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/Snapshot.h" diff --git a/Generals/Code/GameEngine/Include/Common/Upgrade.h b/Generals/Code/GameEngine/Include/Common/Upgrade.h index f13928b5ac..f85b56389c 100644 --- a/Generals/Code/GameEngine/Include/Common/Upgrade.h +++ b/Generals/Code/GameEngine/Include/Common/Upgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" diff --git a/Generals/Code/GameEngine/Include/Common/UserPreferences.h b/Generals/Code/GameEngine/Include/Common/UserPreferences.h index d34af4f388..f3f1b9cb9a 100644 --- a/Generals/Code/GameEngine/Include/Common/UserPreferences.h +++ b/Generals/Code/GameEngine/Include/Common/UserPreferences.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/Common/WellKnownKeys.h b/Generals/Code/GameEngine/Include/Common/WellKnownKeys.h index e8d9331189..67cacd62e2 100644 --- a/Generals/Code/GameEngine/Include/Common/WellKnownKeys.h +++ b/Generals/Code/GameEngine/Include/Common/WellKnownKeys.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/NameKeyGenerator.h" #ifdef INSTANTIATE_WELL_KNOWN_KEYS diff --git a/Generals/Code/GameEngine/Include/Common/encrypt.h b/Generals/Code/GameEngine/Include/Common/encrypt.h index 9904004b62..e441432f9e 100644 --- a/Generals/Code/GameEngine/Include/Common/encrypt.h +++ b/Generals/Code/GameEngine/Include/Common/encrypt.h @@ -27,6 +27,7 @@ // Author: Anonymous #pragma once + // 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 '/' diff --git a/Generals/Code/GameEngine/Include/Common/version.h b/Generals/Code/GameEngine/Include/Common/version.h index 889b4fc001..088a0f7217 100644 --- a/Generals/Code/GameEngine/Include/Common/version.h +++ b/Generals/Code/GameEngine/Include/Common/version.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, November 2001 #pragma once + #include /** diff --git a/Generals/Code/GameEngine/Include/GameClient/Anim2D.h b/Generals/Code/GameEngine/Include/GameClient/Anim2D.h index bced1ca822..e3853a3710 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Anim2D.h +++ b/Generals/Code/GameEngine/Include/GameClient/Anim2D.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h b/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h index 1edce24500..a3e72e0dae 100644 --- a/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h +++ b/Generals/Code/GameEngine/Include/GameClient/AnimateWindowManager.h @@ -46,6 +46,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameClient/CDCheck.h b/Generals/Code/GameEngine/Include/GameClient/CDCheck.h index e3da06d63b..e5e3a8921e 100644 --- a/Generals/Code/GameEngine/Include/GameClient/CDCheck.h +++ b/Generals/Code/GameEngine/Include/GameClient/CDCheck.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + typedef void (*gameStartCallback) (void); Bool IsFirstCDPresent(void); diff --git a/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h b/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h index 4551509f40..2ea11594e4 100644 --- a/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h +++ b/Generals/Code/GameEngine/Include/GameClient/CampaignManager.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameClient/Color.h b/Generals/Code/GameEngine/Include/GameClient/Color.h index 02c9ff08cc..87c497de18 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Color.h +++ b/Generals/Code/GameEngine/Include/GameClient/Color.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h b/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h index 009ff19315..b7f5e88b5d 100644 --- a/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/CommandXlat.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, Dec 2001 #pragma once + #include "GameClient/InGameUI.h" enum GUICommandType CPP_11(: Int); diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h index 1379ac1de4..c8b686550b 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/Generals/Code/GameEngine/Include/GameClient/ControlBar.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameType.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBarResizer.h b/Generals/Code/GameEngine/Include/GameClient/ControlBarResizer.h index 0fa6b9ca44..62b82e01ad 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ControlBarResizer.h +++ b/Generals/Code/GameEngine/Include/GameClient/ControlBarResizer.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h b/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h index ff322e3c3c..7c4852c262 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h +++ b/Generals/Code/GameEngine/Include/GameClient/ControlBarScheme.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameClient/Credits.h b/Generals/Code/GameEngine/Include/GameClient/Credits.h index d40a94fdef..bba068bd64 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Credits.h +++ b/Generals/Code/GameEngine/Include/GameClient/Credits.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameClient/Diplomacy.h b/Generals/Code/GameEngine/Include/GameClient/Diplomacy.h index 6d221bb058..a26861cf43 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Diplomacy.h +++ b/Generals/Code/GameEngine/Include/GameClient/Diplomacy.h @@ -27,6 +27,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + void PopulateInGameDiplomacyPopup( void ); void UpdateDiplomacyBriefingText(AsciiString newText, Bool clear); diff --git a/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h b/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h index 437990fd41..457c263feb 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h +++ b/Generals/Code/GameEngine/Include/GameClient/DisconnectMenu.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "GameNetwork/DisconnectManager.h" enum DisconnectMenuStateType CPP_11(: Int) { diff --git a/Generals/Code/GameEngine/Include/GameClient/Display.h b/Generals/Code/GameEngine/Include/GameClient/Display.h index 52a18c4947..6036450c29 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Display.h +++ b/Generals/Code/GameEngine/Include/GameClient/Display.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, March 2001 #pragma once + #include #include "Common/SubsystemInterface.h" #include "View.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/DisplayString.h b/Generals/Code/GameEngine/Include/GameClient/DisplayString.h index c873308015..164ad25bbb 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DisplayString.h +++ b/Generals/Code/GameEngine/Include/GameClient/DisplayString.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/DisplayStringManager.h b/Generals/Code/GameEngine/Include/GameClient/DisplayStringManager.h index 3373a18537..6ce394d3fe 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DisplayStringManager.h +++ b/Generals/Code/GameEngine/Include/GameClient/DisplayStringManager.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/SubsystemInterface.h" #include "GameClient/DisplayString.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/DrawGroupInfo.h b/Generals/Code/GameEngine/Include/GameClient/DrawGroupInfo.h index f5f48b58e6..0637bd8ec4 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DrawGroupInfo.h +++ b/Generals/Code/GameEngine/Include/GameClient/DrawGroupInfo.h @@ -27,6 +27,7 @@ // Author: John K. McDonald, March 2002 #pragma once + struct DrawGroupInfo { AsciiString m_fontName; diff --git a/Generals/Code/GameEngine/Include/GameClient/Drawable.h b/Generals/Code/GameEngine/Include/GameClient/Drawable.h index 8f35480ec7..a1451e8391 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Drawable.h +++ b/Generals/Code/GameEngine/Include/GameClient/Drawable.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, March 2001 #pragma once + #include "Common/AudioEventRTS.h" #include "Common/GameType.h" #include "Common/ModelState.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/DrawableInfo.h b/Generals/Code/GameEngine/Include/GameClient/DrawableInfo.h index 151bd86e99..1b469cc39c 100644 --- a/Generals/Code/GameEngine/Include/GameClient/DrawableInfo.h +++ b/Generals/Code/GameEngine/Include/GameClient/DrawableInfo.h @@ -27,6 +27,7 @@ // Author: Mark Wilczynski, August 2002 #pragma once + #include "Common/GameType.h" class Drawable; diff --git a/Generals/Code/GameEngine/Include/GameClient/Eva.h b/Generals/Code/GameEngine/Include/GameClient/Eva.h index ae190c4e2a..a4c2fa1e86 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Eva.h +++ b/Generals/Code/GameEngine/Include/GameClient/Eva.h @@ -27,6 +27,7 @@ // DO NOT DISTRIBUTE #pragma once + #include "Common/SubsystemInterface.h" #include "Common/AudioEventRTS.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h b/Generals/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h index dbf58cd5ac..25c13a718f 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h +++ b/Generals/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameClient/GameWindowManager.h" // return codes for message box callbacks diff --git a/Generals/Code/GameEngine/Include/GameClient/FXList.h b/Generals/Code/GameEngine/Include/GameClient/FXList.h index 597108eee6..9a10758ade 100644 --- a/Generals/Code/GameEngine/Include/GameClient/FXList.h +++ b/Generals/Code/GameEngine/Include/GameClient/FXList.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "Common/NameKeyGenerator.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/FontDesc.h b/Generals/Code/GameEngine/Include/GameClient/FontDesc.h index a57f4bdff8..2c92e123c9 100644 --- a/Generals/Code/GameEngine/Include/GameClient/FontDesc.h +++ b/Generals/Code/GameEngine/Include/GameClient/FontDesc.h @@ -27,6 +27,7 @@ // Author: Mark Wilczynski, October 2002 #pragma once + #include "Common/GameType.h" struct FontDesc diff --git a/Generals/Code/GameEngine/Include/GameClient/GUICallbacks.h b/Generals/Code/GameEngine/Include/GameClient/GUICallbacks.h index f5d25ccbfc..908dc916ff 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GUICallbacks.h +++ b/Generals/Code/GameEngine/Include/GameClient/GUICallbacks.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/GameWindow.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/GUICommandTranslator.h b/Generals/Code/GameEngine/Include/GameClient/GUICommandTranslator.h index 595e8133fb..9c2bad908d 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GUICommandTranslator.h +++ b/Generals/Code/GameEngine/Include/GameClient/GUICommandTranslator.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameClient/InGameUI.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/Gadget.h b/Generals/Code/GameEngine/Include/GameClient/Gadget.h index 5079dfe5f0..f0140ad47b 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Gadget.h +++ b/Generals/Code/GameEngine/Include/GameClient/Gadget.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetCheckBox.h b/Generals/Code/GameEngine/Include/GameClient/GadgetCheckBox.h index 16b6065ca0..8c7ef8334c 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetCheckBox.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetCheckBox.h @@ -60,6 +60,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h b/Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h index 5d00949f54..5619581ef5 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetComboBox.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h b/Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h index 5d0c3f290a..850e4af4ba 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetListBox.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetProgressBar.h b/Generals/Code/GameEngine/Include/GameClient/GadgetProgressBar.h index 7e98adb5cc..a4ce368485 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetProgressBar.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetProgressBar.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetPushButton.h b/Generals/Code/GameEngine/Include/GameClient/GadgetPushButton.h index d93bb32bb4..5a8691a392 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetPushButton.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetPushButton.h @@ -57,6 +57,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetRadioButton.h b/Generals/Code/GameEngine/Include/GameClient/GadgetRadioButton.h index 0033e3d9bf..331927813c 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetRadioButton.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetRadioButton.h @@ -63,6 +63,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetSlider.h b/Generals/Code/GameEngine/Include/GameClient/GadgetSlider.h index 537dc408e2..3ffc2a4500 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetSlider.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetSlider.h @@ -52,6 +52,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetStaticText.h b/Generals/Code/GameEngine/Include/GameClient/GadgetStaticText.h index f9e919fe78..83090aec76 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetStaticText.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetStaticText.h @@ -54,6 +54,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetTabControl.h b/Generals/Code/GameEngine/Include/GameClient/GadgetTabControl.h index 018b57739d..17a91ba631 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetTabControl.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetTabControl.h @@ -43,6 +43,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + enum { GTC_BACKGROUND = 0, diff --git a/Generals/Code/GameEngine/Include/GameClient/GadgetTextEntry.h b/Generals/Code/GameEngine/Include/GameClient/GadgetTextEntry.h index 2b55591f57..b7efd3251f 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GadgetTextEntry.h +++ b/Generals/Code/GameEngine/Include/GameClient/GadgetTextEntry.h @@ -49,6 +49,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/GameClient.h b/Generals/Code/GameEngine/Include/GameClient/GameClient.h index e2d95d79fb..16b1f1d7a4 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameClient.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameClient.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, March 2001 #pragma once + #include "Common/GameType.h" #include "Common/MessageStream.h" // for GameMessageTranslator #include "Common/Snapshot.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/GameFont.h b/Generals/Code/GameEngine/Include/GameClient/GameFont.h index ef4e45720b..2307e00547 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameFont.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameFont.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/SubsystemInterface.h" #include "Lib/BaseType.h" #include "Common/AsciiString.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/GameInfoWindow.h b/Generals/Code/GameEngine/Include/GameClient/GameInfoWindow.h index b6d6fe2f60..a7c8dea16b 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameInfoWindow.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameInfoWindow.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/GameWindow.h" #include "GameNetwork/LANGameInfo.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindow.h b/Generals/Code/GameEngine/Include/GameClient/GameWindow.h index fd109d480b..05bcc41d18 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameWindow.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameWindow.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindowGlobal.h b/Generals/Code/GameEngine/Include/GameClient/GameWindowGlobal.h index dfffde2351..d27d107b9e 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameWindowGlobal.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameWindowGlobal.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindowID.h b/Generals/Code/GameEngine/Include/GameClient/GameWindowID.h index 94f0048839..9d5eec2be5 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameWindowID.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameWindowID.h @@ -46,6 +46,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h b/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h index 2837e69afd..c267fa9f03 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h +++ b/Generals/Code/GameEngine/Include/GameClient/GameWindowTransitions.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameCommon.h" //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameClient/GlobalLanguage.h b/Generals/Code/GameEngine/Include/GameClient/GlobalLanguage.h index 9d4a8eb27e..531df38574 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GlobalLanguage.h +++ b/Generals/Code/GameEngine/Include/GameClient/GlobalLanguage.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameClient/GraphDraw.h b/Generals/Code/GameEngine/Include/GameClient/GraphDraw.h index fcbce3d5cb..97cc938851 100644 --- a/Generals/Code/GameEngine/Include/GameClient/GraphDraw.h +++ b/Generals/Code/GameEngine/Include/GameClient/GraphDraw.h @@ -47,6 +47,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/PerfTimer.h" #include "Common/STLTypedefs.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/HeaderTemplate.h b/Generals/Code/GameEngine/Include/GameClient/HeaderTemplate.h index ff80a5ede3..15f8816c37 100644 --- a/Generals/Code/GameEngine/Include/GameClient/HeaderTemplate.h +++ b/Generals/Code/GameEngine/Include/GameClient/HeaderTemplate.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameClient/HintSpy.h b/Generals/Code/GameEngine/Include/GameClient/HintSpy.h index a3b7645c92..06ae41156f 100644 --- a/Generals/Code/GameEngine/Include/GameClient/HintSpy.h +++ b/Generals/Code/GameEngine/Include/GameClient/HintSpy.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, Dec 2001 #pragma once + #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameClient/HotKey.h b/Generals/Code/GameEngine/Include/GameClient/HotKey.h index 31b083551c..84becd005d 100644 --- a/Generals/Code/GameEngine/Include/GameClient/HotKey.h +++ b/Generals/Code/GameEngine/Include/GameClient/HotKey.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameClient/Image.h b/Generals/Code/GameEngine/Include/GameClient/Image.h index 97e5220729..71f9089a46 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Image.h +++ b/Generals/Code/GameEngine/Include/GameClient/Image.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/AsciiString.h" #include "Common/GameMemory.h" #include "Common/SubsystemInterface.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/InGameUI.h b/Generals/Code/GameEngine/Include/GameClient/InGameUI.h index 0e41a22a34..b00567e185 100644 --- a/Generals/Code/GameEngine/Include/GameClient/InGameUI.h +++ b/Generals/Code/GameEngine/Include/GameClient/InGameUI.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameCommon.h" #include "Common/GameType.h" #include "Common/MessageStream.h" // for GameMessageTranslator diff --git a/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h b/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h index 880aca6a73..a6e19e19bc 100644 --- a/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h +++ b/Generals/Code/GameEngine/Include/GameClient/KeyDefs.h @@ -52,6 +52,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #ifndef DIRECTINPUT_VERSION diff --git a/Generals/Code/GameEngine/Include/GameClient/Keyboard.h b/Generals/Code/GameEngine/Include/GameClient/Keyboard.h index ec7d63148b..638df5a3a3 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Keyboard.h +++ b/Generals/Code/GameEngine/Include/GameClient/Keyboard.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/LanguageFilter.h b/Generals/Code/GameEngine/Include/GameClient/LanguageFilter.h index 75bed70586..da533ce974 100644 --- a/Generals/Code/GameEngine/Include/GameClient/LanguageFilter.h +++ b/Generals/Code/GameEngine/Include/GameClient/LanguageFilter.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "Common/STLTypedefs.h" #include "Common/AsciiString.h" #include "Common/UnicodeString.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/Line2D.h b/Generals/Code/GameEngine/Include/GameClient/Line2D.h index f03a23cb18..218ebb40b8 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Line2D.h +++ b/Generals/Code/GameEngine/Include/GameClient/Line2D.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + typedef std::vector Coord2DVector; typedef std::vector Coord3DVector; diff --git a/Generals/Code/GameEngine/Include/GameClient/LoadScreen.h b/Generals/Code/GameEngine/Include/GameClient/LoadScreen.h index f9fff7dbd3..f0f2ac53fe 100644 --- a/Generals/Code/GameEngine/Include/GameClient/LoadScreen.h +++ b/Generals/Code/GameEngine/Include/GameClient/LoadScreen.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h b/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h index 1e6e1b1df5..8aa865f59a 100644 --- a/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/LookAtXlat.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, Dec 2001 #pragma once + #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameClient/MapUtil.h b/Generals/Code/GameEngine/Include/GameClient/MapUtil.h index 8510415f3a..866a7039cc 100644 --- a/Generals/Code/GameEngine/Include/GameClient/MapUtil.h +++ b/Generals/Code/GameEngine/Include/GameClient/MapUtil.h @@ -28,6 +28,7 @@ //////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/AsciiString.h" #include "Common/UnicodeString.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/MessageBox.h b/Generals/Code/GameEngine/Include/GameClient/MessageBox.h index 5685b0f462..cf5951e099 100644 --- a/Generals/Code/GameEngine/Include/GameClient/MessageBox.h +++ b/Generals/Code/GameEngine/Include/GameClient/MessageBox.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #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 diff --git a/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h b/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h index ebce69bb7e..497f78f901 100644 --- a/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h +++ b/Generals/Code/GameEngine/Include/GameClient/MetaEvent.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, Dec 2001 #pragma once + #include "Common/SubsystemInterface.h" #include "GameClient/InGameUI.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h b/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h index 97e92cdaff..f3296be380 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h +++ b/Generals/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h b/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h index e60dafc942..d50ac63373 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h +++ b/Generals/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h b/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h index cb491d73c7..e2046660e7 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h +++ b/Generals/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/Mouse.h b/Generals/Code/GameEngine/Include/GameClient/Mouse.h index e0f99ad67c..0b4b979c90 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Mouse.h +++ b/Generals/Code/GameEngine/Include/GameClient/Mouse.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h b/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h index 3a8c65e5bf..0ccc11899b 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h +++ b/Generals/Code/GameEngine/Include/GameClient/ParticleSys.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include #include "Common/AsciiString.h" #include "Common/GameMemory.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h b/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h index 30d723e7e1..3d367d3c95 100644 --- a/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h +++ b/Generals/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, Dec 2001 #pragma once + #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h b/Generals/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h index 2ffc8b35f1..1e82c6d0e7 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h +++ b/Generals/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h @@ -49,6 +49,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h b/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h index b99d6d0634..c1b3bd5ad1 100644 --- a/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h +++ b/Generals/Code/GameEngine/Include/GameClient/RadiusDecal.h @@ -26,6 +26,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameCommon.h" #include "Common/GameType.h" #include "GameClient/Color.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/RayEffect.h b/Generals/Code/GameEngine/Include/GameClient/RayEffect.h index f01fc68100..f7442da69b 100644 --- a/Generals/Code/GameEngine/Include/GameClient/RayEffect.h +++ b/Generals/Code/GameEngine/Include/GameClient/RayEffect.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDE //////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/SubsystemInterface.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/SelectionInfo.h b/Generals/Code/GameEngine/Include/GameClient/SelectionInfo.h index 22e9dee20f..e0d07c059a 100644 --- a/Generals/Code/GameEngine/Include/GameClient/SelectionInfo.h +++ b/Generals/Code/GameEngine/Include/GameClient/SelectionInfo.h @@ -27,6 +27,7 @@ // Author: John McDonald, Jr, October 2002 #pragma once + #include "GameClient/InGameUI.h" // This structure gives you a rough idea about the counts of the kinds of guys in the diff --git a/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h b/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h index 6bae7f4708..c6df1833a8 100644 --- a/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/SelectionXlat.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, Dec 2001 #pragma once + #include "GameClient/InGameUI.h" class ThingTemplate; diff --git a/Generals/Code/GameEngine/Include/GameClient/Shadow.h b/Generals/Code/GameEngine/Include/GameClient/Shadow.h index 96e28766e7..0ea345a84f 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Shadow.h +++ b/Generals/Code/GameEngine/Include/GameClient/Shadow.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // // skeleton definition of shadow types // diff --git a/Generals/Code/GameEngine/Include/GameClient/Shell.h b/Generals/Code/GameEngine/Include/GameClient/Shell.h index 762a3199be..4e0f88c471 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Shell.h +++ b/Generals/Code/GameEngine/Include/GameClient/Shell.h @@ -93,6 +93,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// // FORWARD REFERENCES ///////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/ShellHooks.h b/Generals/Code/GameEngine/Include/GameClient/ShellHooks.h index c543127a74..d6fe041860 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ShellHooks.h +++ b/Generals/Code/GameEngine/Include/GameClient/ShellHooks.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, October 2002 #pragma once + // // 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 diff --git a/Generals/Code/GameEngine/Include/GameClient/ShellMenuScheme.h b/Generals/Code/GameEngine/Include/GameClient/ShellMenuScheme.h index 47ec5f4ca2..3219b1a87c 100644 --- a/Generals/Code/GameEngine/Include/GameClient/ShellMenuScheme.h +++ b/Generals/Code/GameEngine/Include/GameClient/ShellMenuScheme.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameClient/Statistics.h b/Generals/Code/GameEngine/Include/GameClient/Statistics.h index bd8cb8f77d..8031fe35fd 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Statistics.h +++ b/Generals/Code/GameEngine/Include/GameClient/Statistics.h @@ -38,6 +38,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/TerrainRoads.h b/Generals/Code/GameEngine/Include/GameClient/TerrainRoads.h index 109bcb65cb..c0c4ee72fc 100644 --- a/Generals/Code/GameEngine/Include/GameClient/TerrainRoads.h +++ b/Generals/Code/GameEngine/Include/GameClient/TerrainRoads.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "Common/SubsystemInterface.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/TerrainVisual.h b/Generals/Code/GameEngine/Include/GameClient/TerrainVisual.h index 32854ca6a7..a6cb48cb63 100644 --- a/Generals/Code/GameEngine/Include/GameClient/TerrainVisual.h +++ b/Generals/Code/GameEngine/Include/GameClient/TerrainVisual.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Terrain.h" #include "Common/Snapshot.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/View.h b/Generals/Code/GameEngine/Include/GameClient/View.h index 4f6c3072f6..9882babcc3 100644 --- a/Generals/Code/GameEngine/Include/GameClient/View.h +++ b/Generals/Code/GameEngine/Include/GameClient/View.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Snapshot.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/Water.h b/Generals/Code/GameEngine/Include/GameClient/Water.h index 49d2859ffd..7814c543bd 100644 --- a/Generals/Code/GameEngine/Include/GameClient/Water.h +++ b/Generals/Code/GameEngine/Include/GameClient/Water.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INLCLUDES ////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Overridable.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/WinInstanceData.h b/Generals/Code/GameEngine/Include/GameClient/WinInstanceData.h index f4453c50f6..242dbeca0a 100644 --- a/Generals/Code/GameEngine/Include/GameClient/WinInstanceData.h +++ b/Generals/Code/GameEngine/Include/GameClient/WinInstanceData.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameClient/WindowLayout.h b/Generals/Code/GameEngine/Include/GameClient/WindowLayout.h index ec4aba021a..155c6e91bb 100644 --- a/Generals/Code/GameEngine/Include/GameClient/WindowLayout.h +++ b/Generals/Code/GameEngine/Include/GameClient/WindowLayout.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameClient/GameWindow.h" diff --git a/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h b/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h index 2b4e5d7e67..d04f20d0ba 100644 --- a/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h +++ b/Generals/Code/GameEngine/Include/GameClient/WindowXlat.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, Dec 2001 #pragma once + #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/AI.h b/Generals/Code/GameEngine/Include/GameLogic/AI.h index 3970de22be..30e6e84925 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AI.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AI.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, November 2000 #pragma once + #include "Common/Snapshot.h" #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIDock.h b/Generals/Code/GameEngine/Include/GameLogic/AIDock.h index e2e008e8e6..994f7cd808 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIDock.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIDock.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, February 2002 #pragma once + #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h b/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h index 2e726760a6..45d6863d69 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIGuard.h @@ -38,6 +38,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h b/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h index e38a2e15e8..a66480e02e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIPathfind.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, October 2001 #pragma once + #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/Snapshot.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h b/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h index e5b72507ce..e4a8ab352b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIPlayer.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, January 2002 #pragma once + #include "Common/GameMemory.h" #include "Common/Snapshot.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h b/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h index 80a8188632..6c80a102ed 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, January 2002 #pragma once + #include "Common/GameMemory.h" #include "GameLogic/AIPlayer.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h b/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h index ca71b9b216..03f0de0e73 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, January 2002 #pragma once + #include "Lib/BaseType.h" #include "Common/AudioEventRTS.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h b/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h index 6f8100ae79..ec7efe9423 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h +++ b/Generals/Code/GameEngine/Include/GameLogic/AITNGuard.h @@ -38,6 +38,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Armor.h b/Generals/Code/GameEngine/Include/GameLogic/Armor.h index 1ac0804d9c..798de573a9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Armor.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Armor.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" #include "Common/STLTypedefs.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h b/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h index 2f3870136f..277f5eac20 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ArmorSet.h @@ -25,6 +25,7 @@ // ArmorSet.h #pragma once + #include "Lib/BaseType.h" #include "Common/GameType.h" #include "Common/SparseMatchFinder.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h b/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h index c451dc62ec..1a3637e75a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h +++ b/Generals/Code/GameEngine/Include/GameLogic/CaveSystem.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + 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. diff --git a/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h b/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h index 6c2ae77d41..7e4e4da313 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h +++ b/Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/INI.h" #include "Common/Overridable.h" #include "Common/Override.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Damage.h b/Generals/Code/GameEngine/Include/GameLogic/Damage.h index bd043b9cbd..452fde8ce2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Damage.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Damage.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Snapshot.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h b/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h index c9282ae551..d524772aac 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ExperienceTracker.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameCommon.h" #include "Common/GameType.h" #include "Common/GameMemory.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/FPUControl.h b/Generals/Code/GameEngine/Include/GameLogic/FPUControl.h index 6b78edbf91..8ea15e213f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/FPUControl.h +++ b/Generals/Code/GameEngine/Include/GameLogic/FPUControl.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + /** * 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 diff --git a/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h b/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h index 74dbc0a86f..46637984e5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h +++ b/Generals/Code/GameEngine/Include/GameLogic/FiringTracker.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/AudioEventRTS.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h index 99226923ef..c08589f493 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h +++ b/Generals/Code/GameEngine/Include/GameLogic/GameLogic.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameCommon.h" // ensure we get DUMP_PERF_STATS, or not #include "Common/GameType.h" #include "Common/Snapshot.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h b/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h index 671e37ec47..9335f8b0de 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h +++ b/Generals/Code/GameEngine/Include/GameLogic/GhostObject.h @@ -28,6 +28,7 @@ // Author: Mark Wilczynski, August 2002 #pragma once + #include "Lib/BaseType.h" #include "Common/Snapshot.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h b/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h index 1290793b61..5a97f704ae 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Locomotor.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" #include "Common/Override.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h b/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h index 4384c4527a..a450366de2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h +++ b/Generals/Code/GameEngine/Include/GameLogic/LocomotorSet.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // no, please do NOT include this. //#include "GameLogic/Locomotor.h" #include "Common/GameCommon.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h index 549520b235..8994262dc8 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, 2001-2002 #pragma once + #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/AI.h" #include "GameLogic/AIStateMachine.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h index 3ab87c62d3..354e593357 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DamageFX.h" #include "GameLogic/Module/BodyModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h index e6379b8254..5592170002 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h index 6619ebbf91..35f8c146df 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h index e501d0f0bc..9a7cba0a7d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h @@ -29,6 +29,7 @@ // injured troops to return to the transport for healing purposes. #pragma once + #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h index 22787c6446..532cc02aed 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h index 87e7600d51..b0df5fec9d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h index 8d63165ae8..5786e66863 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h index a7db00bcc6..a1cfcafdb0 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h @@ -32,6 +32,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h index fb16d40ab5..813fbe822a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/SpecialPowerModule.h" class Object; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h index b820adc3c7..d481f0634d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/Module/DamageModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h index 8b5c0990ab..a746cd0b46 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/SpecialPowerUpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h index 04f10304c1..6feb21738a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameType.h" #include "Common/Module.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h index 5320b6972a..f63a0e6525 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BodyModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/ArmorSet.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h index d4285a12dd..b1959cb10f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DamageModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h index d0910dcaf0..9f6ff668e7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h index 94da620653..cdb1919498 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameClient/TerrainRoads.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h index fa49b47223..0c725e5da4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h index cb1726bdca..53f5b79bad 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DamageModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h index 0fe147ed16..553c99822e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h @@ -43,6 +43,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h index 26a358f604..de38921697 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h index 63ac29ca77..a5ee0e8aca 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CaveContain.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" #include "GameLogic/Module/OpenContain.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h index 48fa5fd8c7..08fc5d2dcf 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h index dfbc1f61ba..fc8102420d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, June 2002 #pragma once + #include "GameLogic/AIStateMachine.h" #include "GameLogic/Module/SupplyTruckAIUpdate.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h index 4958f84b99..fbdc7f8977 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h @@ -42,6 +42,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- #include "GameLogic/Module/SpecialPowerModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h index 4e5a1f7748..a9d12e58ee 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h index 9511d3e42e..2f1dde3040 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CollideModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h index b2e447867e..95efb7be17 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h index c4ec21959f..271d87744c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/UpgradeModule.h" //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h index d418ec1410..a07b9a856b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ContainModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h index f8dbe26eb4..a9cee09e8c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h index 541e1b6f22..653737df53 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h @@ -32,6 +32,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h index 11955e93e2..594ead4b3a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h index e6acb9a9b7..d560519cd0 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h index 3eb6e770ed..90dccafc31 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h index 9a7f1ac2f3..698b9f7232 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h index 945935304a..e8b61f9d90 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h index a9ba1d0cc6..4c81de8af1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/CrushDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h index 23d83e5ce5..6be4b92796 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DamDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h index c23f4246f9..2487b2f3d2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DamageModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h index 79a14c0b84..414402c641 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/UpdateModule.h" #include "Common/INI.h" #include "Lib/BaseType.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h index 40a548afd7..953ac68945 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h index 582dfd6e96..d5d3f63eb7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedUpgrade.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h index ee4785d3bf..5e0811dc40 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DelayedWeaponSetUpgradeUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h index 85777df086..fcb180e8f9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h index c99fb42d6c..f82fd57a74 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h @@ -27,6 +27,7 @@ // Desc: State machine that controls the approach and deployment of airborne cargo #pragma once + #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" #include "GameClient/RadiusDecal.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h index 7f74d72958..ecb65aef27 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h index eff6b76fde..2c0a9ebfb5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #ifdef ALLOW_DEMORALIZE // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h index 4d9514e55d..19223d5057 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h @@ -28,6 +28,7 @@ // When deployed, you can't move, when undeployed, you can't attack. #pragma once + #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h index 8b09b469cc..f2b8cce909 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "Common/INI.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h index ac6b1298b4..569b2bf541 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h index d7d7e02500..ac770552fe 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DieModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h index 547447f7d8..a6add30d44 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h index 1b72394c13..1488eecb0d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/AIUpdate.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h index a88539da7f..5c565545a7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h @@ -27,6 +27,7 @@ // Desc: #pragma once + #include "Common/GameType.h" #include "Common/GlobalData.h" #include "Common/STLTypedefs.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h index 3706ffee46..eaf2eef4d5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Geometry.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h index 43ac038894..aeb8eb9d75 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameClient/RadiusDecal.h"///< For the pseudo-wireframe decal effect diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h index 06bca8f73d..2472decda5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h index 188b1dc164..0cadd3fbba 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "Common/INI.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h index 72098f2c27..4d39ec7875 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h index bd997d1ddf..6456872aaa 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h index 7176d412b5..6e3da93801 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FXListDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h index 526f835d27..90a7187987 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + class UpgradeMuxData; #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h index 5700b4b95c..3f2c921286 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h index 4a32d238a8..0ec32bde61 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" #include "GameLogic/Weapon.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h index cf7e73b3bf..123e2c2e90 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/Weapon.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h index 316712606f..77003163c1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpgradeModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h index 00509c79e7..60772c23e3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h index c0b54d17ec..2e368c1950 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Geometry.h" #include "GameLogic/Module/DynamicGeometryInfoUpdate.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h index 42bd4e16ce..33ee283915 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameLogic/Module/DamageModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h index acd936f873..0c174ee602 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h index cb3f11605c..b2c9a74d98 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" #include "Common/ModelState.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h index f1b9fb2f47..91b1d68177 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h index 3715fe043e..c6731172ed 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #define DEFINE_OBJECT_STATUS_NAMES // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h index 8aaf98bc8b..7c161b47fa 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h @@ -27,6 +27,7 @@ // Desc: State machine that allows hacking cash from the internet (free money). #pragma once + #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h index 7f65b44809..def1c32bdf 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HealContain.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h index 438f988393..8768958c1a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h index e8ab079b33..85892be371 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h index 19ebfdfad7..2fe350c6b6 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameLogic/Module/SlowDeathBehavior.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h index a780a0f98d..bb721a431e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h index c339e19c3d..374e0e3c42 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h @@ -33,6 +33,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/UpdateModule.h" //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h index eeff9fa8ab..2c73c868f0 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/StructureBody.h" #include "GameLogic/Damage.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h index 0d157ff948..69556de729 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h index 334b912689..c430234a5d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h index e2084f460e..bc1708bbf3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BodyModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h index 21e8de41a7..1eb543cc56 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h @@ -27,6 +27,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h index f6921d1622..c1b5facba1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, June 2002 #pragma once + #include "Common/STLTypedefs.h" #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h index 3034eecc57..f668cdb007 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h index 978a0fabfb..e3d9361139 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "Common/INI.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h index 997685c3db..bedd3b2b55 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h index efa06b3227..67e3f81b68 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h index d361677cb0..e6c68e7af9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h index 51ede117e9..133cd88036 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h index f9cee6bb9e..d0ad4e355f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/CollideModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h index dd85f099bd..4712f41e5a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h @@ -27,6 +27,7 @@ // Desc: Missile behavior #pragma once + #include "Common/GameType.h" #include "Common/GlobalData.h" #include "GameLogic/Module/AIUpdate.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h index 0d5d3e7167..3e8466d67b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h index fc8f967e36..4f8e639bc2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h @@ -27,6 +27,7 @@ // Author: Mark Lorenzen, August 2002 #pragma once + #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) diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h index f8614f2053..f365c42520 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h index 42e5f419cf..12a474cb61 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h index 09e3efd275..e398d2cf80 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SlowDeathBehavior.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h index 0f2cee13e1..87b275cdde 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h @@ -27,6 +27,7 @@ // Desc: Missile behavior #pragma once + #include "GameClient/RadiusDecal.h" #include "Common/GameType.h" #include "Common/GlobalData.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h index 3d1c274df4..d6b0d0d305 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" #include "Common/Science.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h index 92f9388a45..c54e8186d2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h index c1df0cb290..739fa49163 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h index a91ecff1ef..1037db0bf2 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h index 90f8a32cda..c36df7483d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h index ee2c02f981..4cf6117fcb 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h index af5df93249..d43bf6ff9c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h index 3aac560395..5f90b50370 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ThingTemplate.h" #include "GameLogic/Object.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h index aadc6753cf..fecfaa2e13 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/OpenContain.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/CollideModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h index 8e0af6b1d5..82a23b5eaf 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DamageModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h index 4bfd1c9132..cb28040e67 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/TransportContain.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h index 655b9c077a..b046386039 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/AIUpdate.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h index d012f0cb3b..03a50f4f3f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h index df5d53298d..6e4d652e77 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h index b28c944aa6..35d4ea3b88 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h index 834bf3f112..f313a06f55 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/LaserUpdate.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h index 0b407d2690..5a0d882216 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, November 2001 #pragma once + #include "Common/AudioEventRTS.h" #include "Common/GameAudio.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h index ab9cd8db7a..9d064ba799 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h index 338a24902c..b26bbddc62 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h index e15d665fad..a535d3cf9f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DamageModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h index 74382ce50a..d30a0f3035 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h index 5730eea13b..d99f1ce828 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h index 7bfdb8189f..8e9eef96c3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h index 67b939919a..591d58ff38 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h @@ -26,7 +26,9 @@ // Author: Colin Day, August 2002 // Desc: Prison Behaviors /////////////////////////////////////////////////////////////////////////////////////////////////// + #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h index e74fccaf98..9857791ba9 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameLogic/Module/DockUpdate.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h index 031abc0f0a..239a853d12 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/ModelState.h" #include "GameLogic/Module/DieModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h index 6598fe5ff6..65afb8d35f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" // FORWARD REFERENCES ///////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h index 172fee8b94..1ca107561c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h index 3a93f8af1d..2673d20e8e 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h @@ -26,7 +26,9 @@ // Author: Colin Day, August 2002 // Desc: Propaganda Center Behavior /////////////////////////////////////////////////////////////////////////////////////////////////// + #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/PrisonBehavior.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h index f179b3c9b5..5d51f5f30d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/PropagandaTowerBehavior.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h index 87ee4409cd..0dd4fec2a6 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/UpdateModule.h" #include "Common/INI.h" #include "Lib/BaseType.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h index 987e833e7c..b800637373 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h index 74ee34ba81..daeaefac52 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h index 6c34605387..4add4ff719 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h @@ -26,6 +26,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameClient/RadiusDecal.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h index 6ee80c18d4..ac50fcfb50 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/AIUpdate.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h index af11c4197f..a1b5982f98 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/TransportContain.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h index ab352c5149..6e64d81837 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h @@ -26,7 +26,9 @@ // Author: Colin Day, August 2002 // Desc: Railed transport dock update /////////////////////////////////////////////////////////////////////////////////////////////////// + #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DockUpdate.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h index c13cd25fc3..056746f7a7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/AIUpdate.h" #include "GameLogic/Module/PhysicsUpdate.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h index 138c95ddbe..8cbcc525a4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h index 780e4d6c84..4f9f476657 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h index b254f9f6d5..c8d458ef50 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameLogic/Module/SupplyCenterDockUpdate.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h index 9b02eb25af..8c4639ca96 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "Common/STLTypedefs.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h index 1f3ceebaac..566cdf14c7 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h index 1ba27176e1..a4e8967c40 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h @@ -29,7 +29,9 @@ // 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 + 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 // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h index e0d019058a..fbd0bf6e52 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h index e8c29fd5fb..3f602420f0 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + const Int SPAWN_UPDATE_RATE = LOGICFRAMES_PER_SECOND/2; ///< This is a low priority module that only needs to be called every this many frames // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h index 37b410d179..0b1943bb8b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/UpdateModule.h" #include "Common/INI.h" #include "Lib/BaseType.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h index 876d16f431..0696e6e113 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h index 413442c7f6..d7eca3b994 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h index 29c0a440ba..7d332abe48 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h index 5caa294753..7d6d705f88 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h index e467d4c11a..00b87fac76 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/Module.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h index 403873eed9..41f95ad25d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "Common/GameType.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h index 6887062d47..09afaa6281 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h index 7aaeb97629..8f294cd529 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h index ab74fb002a..b8ea501847 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h index 67eb71fdcc..6e572c40c3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h index c4d6f03c19..3790710fc4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h index 12f20545f3..87cf4908b3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h index 1f3706c7f3..d6a860c17c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h index 65a05ff85e..a9f089efa3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/UpdateModule.h" //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureBody.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureBody.h index 7d46237fa4..33f8ff3b78 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureBody.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureBody.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h index dcdf416ba6..3c21400835 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h index 6058c2aef9..f4e6379dc1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h index 274a16f53c..dfc24b45e1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h index 062171b747..8f18f034c1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h index 27e054a92f..fea5c20041 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h index ebb96b1df2..ba9d02f11f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/UpdateModule.h" class Object; diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h index e1fa522ee5..6bb66bb753 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h @@ -27,6 +27,7 @@ // Desc: State machine that controls when and with who a Truck docks #pragma once + #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h index 3003142135..382a01be5a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h index 06f887dcf2..18b6e9440b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DamageModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h index b9c21172ff..b91526d912 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h index c68553dbe9..11354d2e81 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h index 55a6c23f38..6513153d78 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h index ce9891848f..f2e029c3ef 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/CollideModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h index 7f2d08b2f4..6bdd3318c0 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/DamageModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h index ad46bd669b..6ef47631dc 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h @@ -27,6 +27,7 @@ // Author: Graham Smallwood, July 2002 #pragma once + #include "GameLogic/Module/AIUpdate.h" //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TransportContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TransportContain.h index cb3594f342..1c0bf81914 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TransportContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TransportContain.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h b/Generals/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h index 240a7410ef..e164131f88 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" #include "GameLogic/Module/HealContain.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h index a4e1e50e5d..b1ad7f5895 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h index 86f7c1798d..f277ccaec5 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h index 68f9f3e261..f5e7c462ea 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "Common/GameType.h" #include "Common/DisabledTypes.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h b/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h index a37746b4c6..e8781d3162 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h b/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h index 0901701f92..6cce9a1fda 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "Common/STLTypedefs.h" #include "Common/Upgrade.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h index 90f92c7bfe..a07a65287a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h index 484391b32e..fbf0129636 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #define DEFINE_VETERANCY_NAMES // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameCommon.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h index b6c87976d2..3b94033618 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h @@ -27,6 +27,7 @@ // Author: Graham Smallwood, April 2002 #pragma once + #include "GameLogic/Module/AIUpdate.h" //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h index 992ee42931..16dbd2577f 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h index 73b3911d7b..79c1f42c7a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h index 997d9796b7..acb4df3d52 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h b/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h index 39411841dc..a124c77aff 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Object.h b/Generals/Code/GameEngine/Include/GameLogic/Object.h index aa3c9e68dc..5b64240b59 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Object.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Object.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, October 2000 #pragma once + #include "Lib/BaseType.h" #include "ref_ptr.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h index b1a64df63f..594532122b 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectCreationList.h @@ -31,6 +31,7 @@ // All OCLs return the first object that is created (or NULL if not applicable). #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h index 116334d451..03f15d38e3 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectIter.h @@ -27,6 +27,7 @@ // Author: Steven Johnson, September 2001 #pragma once + #include "Common/GameType.h" #include "Common/GameMemory.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h index 6b02731135..5fdf12c639 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h @@ -27,6 +27,7 @@ // JKMCD Aug 2002 #pragma once + //------------------------------------------------------------------------------------------------- /** Object status bits */ //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h b/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h index d6be69fca3..0309c09bd4 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ObjectTypes.h @@ -28,6 +28,7 @@ // DO NOT DISTRIBUTE #pragma once + #include "Common/AsciiString.h" #include "Common/Snapshot.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h index 8ae5d24845..f924fa3a0a 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h +++ b/Generals/Code/GameEngine/Include/GameLogic/PartitionManager.h @@ -45,6 +45,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameLogic/PolygonTrigger.h b/Generals/Code/GameEngine/Include/GameLogic/PolygonTrigger.h index 0e2ba3f109..2cd94188ee 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/PolygonTrigger.h +++ b/Generals/Code/GameEngine/Include/GameLogic/PolygonTrigger.h @@ -32,6 +32,7 @@ // Author: John Ahlquist, November 2001 #pragma once + #include "Common/GameMemory.h" #include "Common/Snapshot.h" #include "Common/STLTypedefs.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Powers.h b/Generals/Code/GameEngine/Include/GameLogic/Powers.h index 9150a33416..53438b1244 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Powers.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Powers.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // // skeleton definition of unit powers // diff --git a/Generals/Code/GameEngine/Include/GameLogic/RankInfo.h b/Generals/Code/GameEngine/Include/GameLogic/RankInfo.h index 51fe1e93b4..581928a9ef 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/RankInfo.h +++ b/Generals/Code/GameEngine/Include/GameLogic/RankInfo.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Science.h" #include "Common/UnicodeString.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h b/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h index 99ac56d299..4a9d99212c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ScriptActions.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + class ScriptAction; class GameWindow; class Team; diff --git a/Generals/Code/GameEngine/Include/GameLogic/ScriptConditions.h b/Generals/Code/GameEngine/Include/GameLogic/ScriptConditions.h index 0b51beb849..4bc9c058c8 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ScriptConditions.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ScriptConditions.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + class Condition; class ObjectTypes; class Parameter; diff --git a/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h b/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h index 2309741130..bc025c88d8 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h +++ b/Generals/Code/GameEngine/Include/GameLogic/ScriptEngine.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/STLTypedefs.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Scripts.h b/Generals/Code/GameEngine/Include/GameLogic/Scripts.h index 74e1d1b038..70428cc389 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Scripts.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Scripts.h @@ -28,6 +28,7 @@ // Author: John Ahlquist, November 2001 #pragma once + #include "Common/Snapshot.h" #include "GameNetwork/NetworkDefs.h" #include "Common/ObjectStatusTypes.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/SidesList.h b/Generals/Code/GameEngine/Include/GameLogic/SidesList.h index 92a9df1700..cb1033fa5c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/SidesList.h +++ b/Generals/Code/GameEngine/Include/GameLogic/SidesList.h @@ -28,6 +28,7 @@ // Author: John Ahlquist, November 2001 #pragma once + #include "Common/Dict.h" #include "Common/Errors.h" #include "Common/GameType.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Squad.h b/Generals/Code/GameEngine/Include/GameLogic/Squad.h index ab5154fbf5..d76b358b9d 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Squad.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Squad.h @@ -38,6 +38,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" #include "Common/GameMemory.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h b/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h index e35f3701c6..30ccb58394 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h +++ b/Generals/Code/GameEngine/Include/GameLogic/TerrainLogic.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameMemory.h" #include "Common/Snapshot.h" #include "Common/STLTypedefs.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h b/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h index 2bd2e7671d..3a2570aaae 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h +++ b/Generals/Code/GameEngine/Include/GameLogic/TurretAI.h @@ -27,6 +27,7 @@ // Simple turret behavior #pragma once + #include "Common/StateMachine.h" #include "Common/GameMemory.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h b/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h index d87510755d..3fca822233 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h +++ b/Generals/Code/GameEngine/Include/GameLogic/VictoryConditions.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, February 2002 #pragma once + #include "Common/SubsystemInterface.h" #include "Lib/BaseType.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/Weapon.h b/Generals/Code/GameEngine/Include/GameLogic/Weapon.h index c54500fc17..cc98bb2703 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/Weapon.h +++ b/Generals/Code/GameEngine/Include/GameLogic/Weapon.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameCommon.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h index bfaa401488..d8642d3123 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h +++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h @@ -27,4 +27,5 @@ // JKMCD Aug 2002 #pragma once + typedef UnsignedInt WeaponBonusConditionFlags; diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h index f7b53860c9..30af7e2edf 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h +++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponSet.h @@ -25,6 +25,7 @@ // WeaponSet.h #pragma once + #include "Lib/BaseType.h" #include "Common/GameType.h" #include "Common/KindOf.h" diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h index 8fe4cf42d7..f57263f6c0 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h +++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h @@ -27,6 +27,7 @@ // JKMCD Aug 2002 #pragma once + #include "GameLogic/WeaponSetType.h" typedef BitFlags WeaponSetFlags; diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h index 79b58305ae..b34868e60c 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h +++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponSetType.h @@ -27,6 +27,7 @@ // JKMCD Aug 2002 #pragma once + //------------------------------------------------------------------------------------------------- // IMPORTANT NOTE: you should endeavor to set up states such that the most "normal" // state is defined by the bit being off. That is, the typical "normal" condition diff --git a/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h b/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h index 49ffab48e4..0a80eb8bd1 100644 --- a/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h +++ b/Generals/Code/GameEngine/Include/GameLogic/WeaponStatus.h @@ -27,6 +27,7 @@ // JKMCD Aug 2002 #pragma once + enum WeaponStatus CPP_11(: Int) { READY_TO_FIRE, diff --git a/Generals/Code/GameEngine/Include/GameNetwork/Connection.h b/Generals/Code/GameEngine/Include/GameNetwork/Connection.h index 7b0c9e9e04..1cd335e367 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/Connection.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/Connection.h @@ -34,6 +34,7 @@ */ #pragma once + #include "GameNetwork/NetCommandList.h" #include "GameNetwork/User.h" #include "GameNetwork/Transport.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/ConnectionManager.h b/Generals/Code/GameEngine/Include/GameNetwork/ConnectionManager.h index f90a5930af..8588a3350b 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/ConnectionManager.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/ConnectionManager.h @@ -28,6 +28,7 @@ */ #pragma once + #include "GameNetwork/Connection.h" #include "GameNetwork/NetCommandList.h" #include "GameNetwork/Transport.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h b/Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h index f14b82f353..9b0b16dccf 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/DisconnectManager.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "GameNetwork/NetCommandRef.h" #include "Lib/BaseType.h" //#include "GameNetwork/ConnectionManager.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/DownloadManager.h b/Generals/Code/GameEngine/Include/GameNetwork/DownloadManager.h index 6c3baf2c14..25dc35b13b 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/DownloadManager.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/DownloadManager.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, July 2002 #pragma once + #include "WWDownload/downloaddefs.h" #include "WWDownload/Download.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/FileTransfer.h b/Generals/Code/GameEngine/Include/GameNetwork/FileTransfer.h index c3ea51e79c..e1ca2d1e27 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/FileTransfer.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/FileTransfer.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once + class GameInfo; // Convenience functions diff --git a/Generals/Code/GameEngine/Include/GameNetwork/FirewallHelper.h b/Generals/Code/GameEngine/Include/GameNetwork/FirewallHelper.h index c1c17e412e..9a61f82ba8 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/FirewallHelper.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/FirewallHelper.h @@ -47,6 +47,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + class UDP; #define NUM_TEST_PORTS 4 diff --git a/Generals/Code/GameEngine/Include/GameNetwork/FrameData.h b/Generals/Code/GameEngine/Include/GameNetwork/FrameData.h index c882256691..51e0428e91 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/FrameData.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/FrameData.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "Lib/BaseType.h" #include "GameNetwork/NetCommandList.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/FrameDataManager.h b/Generals/Code/GameEngine/Include/GameNetwork/FrameDataManager.h index 62b28ef8ce..2069b49673 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/FrameDataManager.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/FrameDataManager.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "GameNetwork/NetworkDefs.h" #include "GameNetwork/FrameData.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/FrameMetrics.h b/Generals/Code/GameEngine/Include/GameNetwork/FrameMetrics.h index 62ed372a6a..7661f3a16e 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/FrameMetrics.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/FrameMetrics.h @@ -25,6 +25,7 @@ /** FrameMetrics.h */ #pragma once + #include "Lib/BaseType.h" #include "GameNetwork/NetworkDefs.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GUIUtil.h b/Generals/Code/GameEngine/Include/GameNetwork/GUIUtil.h index 8968cc29b4..4f7db27a35 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GUIUtil.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GUIUtil.h @@ -26,6 +26,7 @@ // Author: Matthew D. Campbell, Sept 2002 #pragma once + class GameWindow; class GameInfo; diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h b/Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h index dc9b3b0e0d..103287154d 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameInfo.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, December 2001 #pragma once + #include "Common/Snapshot.h" #include "GameNetwork/NetworkDefs.h" #include "GameNetwork/FirewallHelper.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 8f097253c9..0f80d91bf2 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, February 2002 #pragma once + #include "gamespy/peer/peer.h" #include "GameClient/Color.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h index ca230ae724..d9cd0fe2ed 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h @@ -27,5 +27,6 @@ // Author: Matthew D. Campbell, July 2002 #pragma once + void HandleBuddyResponses(void); void PopulateOldBuddyMessages(void); diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h index 09e1aeafa8..1aea93930b 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, June 2002 #pragma once + #include "gamespy/gp/gp.h" #define MAX_BUDDY_CHAT_LEN 128 diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h index afa4379c16..b16659e775 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/AsciiString.h" #include "Common/STLTypedefs.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h index 2c97da5f63..b9cc6af3b2 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, August 2002 #pragma once + #include "Common/SubsystemInterface.h" // this class encapsulates a request for the thread diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h index f9ac1d224a..c9944902c9 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, August 2002 #pragma once + #include "Common/UnicodeString.h" #include "Common/AsciiString.h" #include "Common/STLTypedefs.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h index 1b1c1a4b15..a28bf1cc4a 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, Sept 2002 #pragma once + class GameWindow; GameWindow *GetGameListBox( void ); diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h index 1cc9a6f75e..c3dec63f6d 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + void HTTPThinkWrapper( void ); void StopAsyncDNSCheck( void ); void StartPatchCheck( void ); diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h index 7bca73fa00..5ed37aa8f7 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, June 2002 #pragma once + #include "gamespy/peer/peer.h" #include "gamespy/gp/gp.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h index b777052ff7..5cc3b606fc 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, Sept 2002 #pragma once + #include "GameNetwork/GameSpy/PeerDefs.h" #include "GameNetwork/GameSpy/PersistentStorageThread.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h index 3206a4387c..113f6a0af9 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, June 2002 #pragma once + #include "gamespy/peer/peer.h" #include "GameNetwork/NetworkDefs.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h index 54b53219d8..62d84b887a 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, July 2002 #pragma once + enum LocaleType CPP_11(: Int) { LOC_UNKNOWN = 0, diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h index 2fd5ae5918..348b1b2f35 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, July 2002 #pragma once + #include "gamespy/gstats/gpersist.h" #define MAX_BUDDY_CHAT_LEN 128 diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h index 0aea049ae2..aab2e51609 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h @@ -28,6 +28,7 @@ // Note: adapted from WOLAPI #pragma once + // this class encapsulates a request for the thread class PingRequest { diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h index dd6494329a..5f7572a343 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, Sept 2002 #pragma once + #include "GameNetwork/GameInfo.h" #include "GameNetwork/Transport.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h index 8df2fa6be9..ace441eaf0 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h @@ -27,5 +27,6 @@ // Author: Matthew D. Campbell, July 2002 #pragma once + std::wstring MultiByteToWideCharSingleLine( const char *orig ); std::string WideCharStringToMultiByte( const WideChar *orig ); diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyChat.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyChat.h index d4b62a6663..4b56c34b8e 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyChat.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyChat.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, February 2002 #pragma once + #include "gamespy/peer/peer.h" class GameWindow; diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGP.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGP.h index 85e1e25efa..df001959ed 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGP.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyGP.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, March 2002 #pragma once + #include "gamespy/gp/gp.h" void GPRecvBuddyRequestCallback(GPConnection * connection, GPRecvBuddyRequestArg * arg, void * param); diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h index 98c4a703ac..e56f238c1c 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, March 2002 #pragma once + #include "Common/NameKeyGenerator.h" #include "GameClient/WindowLayout.h" #include "GameClient/Gadget.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyPersistentStorage.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyPersistentStorage.h index 06a846fe2e..d5f4028f55 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyPersistentStorage.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyPersistentStorage.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, March 2002 #pragma once + class GameSpyPlayerInfoInterface : public SubsystemInterface { public: diff --git a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyThread.h b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyThread.h index d7646527c3..03046f692a 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/GameSpyThread.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/GameSpyThread.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, March 2002 #pragma once + #include "mutex.h" #include "thread.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/IPEnumeration.h b/Generals/Code/GameEngine/Include/GameNetwork/IPEnumeration.h index 1c7e90f454..cef08e33aa 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/IPEnumeration.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/IPEnumeration.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, October 2001 #pragma once + #include "GameNetwork/Transport.h" /** diff --git a/Generals/Code/GameEngine/Include/GameNetwork/LANAPI.h b/Generals/Code/GameEngine/Include/GameNetwork/LANAPI.h index fc96a8a0af..b4503653e8 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/LANAPI.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/LANAPI.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, October 2001 #pragma once + #include "GameNetwork/Transport.h" #include "GameNetwork/NetworkInterface.h" #include "GameNetwork/NetworkDefs.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h b/Generals/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h index e12d8d56b5..48d5ee28a8 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h @@ -27,7 +27,9 @@ // Author: Chris Huybregts, October 2001 // Description: LAN API Callbacks header /////////////////////////////////////////////////////////////////////////////////////// + #pragma once + #include "Common/NameKeyGenerator.h" #include "GameClient/Shell.h" #include "GameClient/GadgetListBox.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/LANGameInfo.h b/Generals/Code/GameEngine/Include/GameNetwork/LANGameInfo.h index d9ead1789f..69504d50bb 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/LANGameInfo.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/LANGameInfo.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, December 2001 #pragma once + #include "GameNetwork/GameInfo.h" #include "GameNetwork/LANPlayer.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NAT.h b/Generals/Code/GameEngine/Include/GameNetwork/NAT.h index add3c6202b..499b84d6ff 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NAT.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NAT.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Lib/BaseType.h" #include "GameNetwork/NetworkInterface.h" #include "GameNetwork/FirewallHelper.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandList.h b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandList.h index 2b1e4c6a12..2497f904fd 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandList.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandList.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "Common/GameMemory.h" #include "GameNetwork/NetCommandRef.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h index 24c1f76c16..4c585bb355 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h @@ -27,6 +27,7 @@ // are queued up to execute at a later time #pragma once + #include "Lib/BaseType.h" #include "GameNetwork/NetworkDefs.h" #include "Common/UnicodeString.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandRef.h b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandRef.h index af9fde4c7c..a5321e4df2 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandRef.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandRef.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "GameNetwork/NetCommandMsg.h" #include "Common/GameMemory.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h index 10917f9eaf..e61f43d7e1 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h @@ -26,6 +26,7 @@ // Bryan Cleveland #pragma once + #include "GameNetwork/NetCommandList.h" class NetCommandWrapperListNode : public MemoryPoolObject diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetPacket.h b/Generals/Code/GameEngine/Include/GameNetwork/NetPacket.h index ed37f4f4ca..bf657ae5c0 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetPacket.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetPacket.h @@ -32,10 +32,10 @@ for the data, but at least that wouldn't be repeating code, that would be specialized code. */ - - #pragma once + #include "NetworkDefs.h" + #include "GameNetwork/NetCommandList.h" #include "Common/MessageStream.h" #include "Common/GameMemory.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h b/Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h index 4481214522..138aaeb9db 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetworkDefs.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "Lib/BaseType.h" #include "Common/MessageStream.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/NetworkInterface.h b/Generals/Code/GameEngine/Include/GameNetwork/NetworkInterface.h index b9cd575298..74e3942ced 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/NetworkInterface.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/NetworkInterface.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, July 2001 #pragma once + #include "Common/MessageStream.h" #include "GameNetwork/ConnectionManager.h" #include "GameNetwork/User.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/RankPointValue.h b/Generals/Code/GameEngine/Include/GameNetwork/RankPointValue.h index 1e72352b17..973eaedf5c 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/RankPointValue.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/RankPointValue.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngine/Include/GameNetwork/Transport.h b/Generals/Code/GameEngine/Include/GameNetwork/Transport.h index 1a1768fb13..8701cddd6c 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/Transport.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/Transport.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, July 2001 #pragma once + #include "GameNetwork/udp.h" #include "GameNetwork/NetworkDefs.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/User.h b/Generals/Code/GameEngine/Include/GameNetwork/User.h index 4c32f9270e..959137cc0c 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/User.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/User.h @@ -27,6 +27,7 @@ */ #pragma once + #include "GameNetwork/NetworkDefs.h" #include "Common/UnicodeString.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h b/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h index e654fff0a3..e2a0207616 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h @@ -26,7 +26,9 @@ // FEBDispatch class is a template class which, when inherited from, can implement the // IDispatch for a COM object with a type library. // + #pragma once + #include extern CComModule _Module; #include diff --git a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h b/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h index 5f1f17be37..8122da61ae 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h @@ -41,6 +41,7 @@ ******************************************************************************/ #pragma once + #include "Common/SubsystemInterface.h" #include #include diff --git a/Generals/Code/GameEngine/Include/GameNetwork/networkutil.h b/Generals/Code/GameEngine/Include/GameNetwork/networkutil.h index aa366e6617..de7dc46c70 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/networkutil.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/networkutil.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "GameNetwork/NetworkDefs.h" #include "GameNetwork/NetworkInterface.h" diff --git a/Generals/Code/GameEngine/Include/GameNetwork/udp.h b/Generals/Code/GameEngine/Include/GameNetwork/udp.h index d3518ea0b6..f7dedc7ca0 100644 --- a/Generals/Code/GameEngine/Include/GameNetwork/udp.h +++ b/Generals/Code/GameEngine/Include/GameNetwork/udp.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #ifdef _UNIX #include #endif diff --git a/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h b/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h index df7bb9dcc3..4c773345d0 100644 --- a/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h +++ b/Generals/Code/GameEngine/Include/Precompiled/PreRTS.h @@ -25,7 +25,9 @@ // This file contains all the header files that shouldn't change frequently. // Be careful what you stick in here, because putting files that change often in here will // tend to cheese people's goats. + #pragma once + //----------------------------------------------------------------------------- // srj sez: this must come first, first, first. #define _STLP_USE_NEWALLOC 1 diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h index 471426c008..f964eb5c91 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h @@ -40,6 +40,7 @@ //============================================================================= #pragma once + //============================================================================= // Includes //============================================================================= diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h index fcdd5b0674..8cb5492aef 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/FunctionLexicon.h" //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h index bf92c0fe96..ec8c53ceec 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ModuleFactory.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h index 6f1c70d47d..2a4f0b554e 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Radar.h" #include "WW3D2/ww3dformat.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h index 8391a0e356..53bb89ba59 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/ThingFactory.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h index 62d7369601..e94fa96159 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "always.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h index 44d97ffe2f..db06b6189e 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/DrawModule.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h index 4162401f94..fb6b4bfbf6 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/DrawModule.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h index e2ad243a8d..070288bd88 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h @@ -33,6 +33,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h index ffb1b6def7..122af0b5aa 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" //#include "WW3D2/Line3D.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h index 0a9d17f59b..2589bcb7c4 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ModelState.h" #include "Common/DrawModule.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h index 48745d1b3d..88f7297770 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DTankDraw.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h index 9feea291a0..8c1fc03ded 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "W3DDevice/GameClient/Module/W3DTruckDraw.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h index 1be960dfe0..3ceeaaae5a 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h @@ -28,6 +28,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "GameLogic/Module/ProjectileStreamUpdate.h" // I am the draw module for this update. Very tight. diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h index 367dc0d5e0..58d0febbeb 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h index 6fd62fd1d9..5458195d7d 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h index cff0c3b630..44caa00fa8 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h index 4dea8bdfa5..b01db7f931 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "GameClient/ParticleSys.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h index d851bb8aae..a69530f3f8 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "Common/AudioEventRTS.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h index 1be5804a19..335f12a86d 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h index b513b39aa4..510a375a7f 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "Common/AudioEventRTS.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h index 570aa465a1..3e56c41f69 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h @@ -27,6 +27,7 @@ // Author: John Ahlquist, April 2001 #pragma once + //#define DO_8STAGE_TERRAIN_PASS //optimized terrain rendering for Nvidia based cards #include "WW3D2/texture.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h index 48447a0025..2912c673ca 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h @@ -27,6 +27,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include #include "Lib/BaseType.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h index d8045a3a5f..baae21cb17 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h @@ -43,6 +43,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "assetmgr.h" #include "Lib/BaseType.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h index b924320971..978eff7386 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h @@ -38,6 +38,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// // DEFINES //////////////////////////////////////////////////////////////////// // TYPE DEFINES /////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h index 16500ab274..8227e1a272 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h index 6827c3a762..ad5359665f 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h index c2d1e64bea..40e18524de 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Lib/BaseType.h" #include "dx8vertexbuffer.h" #include "dx8indexbuffer.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h index 335be01b0e..1682a72178 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h index e261e0ccb2..3786750238 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h @@ -23,6 +23,7 @@ //////////////////////////////////////////////////////////////////////////////// #pragma once + enum CustomScenePassModes CPP_11(: Int) { SCENE_PASS_DEFAULT, diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h index 7356fbd0c7..80fe0dc65b 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "always.h" #include "rendobj.h" #include "vertmaterial.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h index bf07fc4835..018e27ef81 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h @@ -32,6 +32,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameClient/Display.h" #include "WW3D2/lightenvironment.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h index 03282c8ac1..c08629bb4d 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h @@ -46,6 +46,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h index 5ec38b1378..4c52fe44f9 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameClient/DisplayStringManager.h" #include "W3DDevice/GameClient/W3DDisplayString.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h index e43be79ffd..deed969ea7 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h @@ -27,6 +27,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "WW3D2/light.h" #include "Lib/BaseType.h" class HeightMapRenderObjClass; diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h index b78f39faa7..9005e915cc 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h @@ -31,8 +31,8 @@ // /////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "WWLib/ffactory.h" #include "Common/ArchiveFileSystem.h" #include "Common/file.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h index d93a44e155..d3fd1d245c 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + class GameWindow; class WindowLayout; class WinInstanceData; diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h index c4e994a1c3..71a5c97e74 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h index 3a2550074f..5190395b81 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h @@ -33,6 +33,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h index 933f382117..6c79aa8888 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h index 4b211d8e1f..b72d30f9d6 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h index 06f54e87d4..6fba18ef01 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameClient/GameWindowManager.h" #include "W3DDevice/GameClient/W3DGameWindow.h" #include "W3DDevice/GameClient/W3DGadget.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h index 642f599e2b..1a8fe3a24f 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h @@ -32,6 +32,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h index ccb6194db1..62f23b2ecd 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "always.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h index c9cef2dbd4..bbb14f2b9a 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h index 8f8c7e01ae..fb66197064 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h @@ -26,6 +26,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameClient/ParticleSys.h" #include "WW3D2/pointgr.h" #include "WW3D2/streak.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h index 575d80793e..f7162e23fd 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "vector3.h" #include "plane.h" #include "simplevec.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h index 7f680ab098..b9697f2ba2 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h @@ -30,7 +30,9 @@ // // /////////////////////////////////////////////////////////////////////////////// + #pragma once + #include "GameClient/Shadow.h" class W3DShadowTexture; //forward reference diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h index 1babc183c8..19f9893f71 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h index 375f9580e4..5b203a5a66 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h @@ -32,6 +32,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h index fd9ad82c79..c927fa2727 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h @@ -32,6 +32,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "WW3D2/texture.h" enum FilterTypes CPP_11(: Int); enum FilterModes CPP_11(: Int); diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShadow.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShadow.h index bf35de18b0..16d8b46667 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShadow.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShadow.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "matrix4.h" #include "GameClient/Shadow.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShroud.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShroud.h index de07e00f75..3b8675cc95 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShroud.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShroud.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "WW3D2/matpass.h" #include "WW3D2/dx8wrapper.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DStatusCircle.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DStatusCircle.h index 9c84d04eff..4139426bd9 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DStatusCircle.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DStatusCircle.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "always.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h index 11b37579f9..345b61ad24 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h @@ -23,6 +23,7 @@ //////////////////////////////////////////////////////////////////////////////// #pragma once + #include "always.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h index dbc5d710f0..001ea69e8a 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameClient/TerrainVisual.h" #include "W3DDevice/GameClient/W3DWater.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h index 95d3155850..923cff2944 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h index 1564fb2403..56e115cfc2 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h @@ -33,6 +33,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h index ad615f29d9..bcf573c9d9 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "matrix4.h" #include "W3DDevice/GameClient/W3DBufferManager.h" #include "GameClient/Shadow.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h index 6e56c91d5c..3bc396b270 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h @@ -25,6 +25,7 @@ // FILE: W3DWater.h /////////////////////////////////////////////////// #pragma once + #include "always.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h index 4005e7044a..79ed4bf966 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + enum waveType CPP_11(: Int); //forward reference /// Custom render object that draws animated tracks/waves on the water. diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h index 874d3d292c..09b10f4249 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h @@ -49,6 +49,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h index 76e90ed696..1ccf20bdae 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h @@ -26,6 +26,7 @@ // July 2002, Bryan Cleveland #pragma once + #include "GameNetwork/WOLBrowser/WebBrowser.h" class TextureClass; diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h index 085f95d38d..af717de9de 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h @@ -28,6 +28,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Lib/BaseType.h" #include "WWLib/refcount.h" #include "WWMath/vector3.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h index 9dd078f616..24c774d8e7 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h @@ -32,6 +32,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h index c7a339bdb1..75e8ec9b68 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h @@ -28,6 +28,7 @@ // Author: Mark Wilczynski, August 2002 #pragma once + #include "GameLogic/GhostObject.h" #include "Lib/BaseType.h" #include "Common/GameCommon.h" diff --git a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DTerrainLogic.h b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DTerrainLogic.h index 4ee15281ea..e2cd3cab2c 100644 --- a/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DTerrainLogic.h +++ b/Generals/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DTerrainLogic.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/TerrainLogic.h" //------------------------------------------------------------------------------------------------- diff --git a/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h b/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h index 32c857678b..e0c3772355 100644 --- a/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h +++ b/Generals/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameEngine.h" #include "GameLogic/GameLogic.h" #include "GameNetwork/NetworkInterface.h" diff --git a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h index ee69cab0d2..f4641a287b 100644 --- a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h +++ b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #ifndef DIRECTINPUT_VERSION # define DIRECTINPUT_VERSION 0x800 diff --git a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h index 13473c693a..a0c531ff77 100644 --- a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h +++ b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h @@ -38,6 +38,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #ifndef DIRECTINPUT_VERSION # define DIRECTINPUT_VERSION 0x800 diff --git a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h index 65876cb43f..2ba373ba1d 100644 --- a/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h +++ b/Generals/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/Libraries/Include/Lib/BaseType.h b/Generals/Code/Libraries/Include/Lib/BaseType.h index 377698cb2f..79c091ada8 100644 --- a/Generals/Code/Libraries/Include/Lib/BaseType.h +++ b/Generals/Code/Libraries/Include/Lib/BaseType.h @@ -26,6 +26,7 @@ /////////////////////////////////////////////////////////////////////////////// // tell the compiler to only load this file once + #pragma once #include "Lib/BaseTypeCore.h" diff --git a/Generals/Code/Libraries/Include/Lib/trig.h b/Generals/Code/Libraries/Include/Lib/trig.h index dbfeb50c41..569f1ff349 100644 --- a/Generals/Code/Libraries/Include/Lib/trig.h +++ b/Generals/Code/Libraries/Include/Lib/trig.h @@ -20,7 +20,9 @@ // fast trig functions // Author: Sondra Iverson, March 1998 // Converted to Generals by Matthew D. Campbell, February 2002 + #pragma once + Real Sin(Real); Real Cos(Real); Real Tan(Real); diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h index 71d502d44a..9098dfb60e 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h @@ -36,8 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "vector3.h" #include "Vector3i.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h index 1444d7ab62..add343dadc 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h @@ -39,6 +39,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "composite.h" #include "htree.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h index bd7de137e1..fd7964f20b 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "Vector.H" #include "htreemgr.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h index 134340c97c..b09e595ecb 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "dynamesh.h" class Bitmap2DObjClass : public DynamicScreenMeshClass diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h index 61bce87233..2ef2495017 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h index f0b2c9789e..db25bf9260 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h @@ -44,6 +44,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "rendobj.h" #include "plane.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h index 63643a8dde..5c59019771 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h @@ -17,6 +17,7 @@ */ #pragma once + #include "always.h" #include "vector3.h" #include "matrix3d.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h index e20afc580d..2b3b92a10e 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h @@ -17,6 +17,7 @@ */ // 08/06/02 KM Added cube map and volume texture support + #pragma once #include "always.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h index 8513aacad1..c18d46bfad 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "bittype.h" #include "simplevec.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h index abf16f531a..b988cf269a 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h @@ -38,6 +38,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "ww3dformat.h" #include diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h index 4171b84b54..a7adf40f71 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h @@ -39,8 +39,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include #ifdef WWDEBUG diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h index 714faa854a..4d78c097a1 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "wwdebug.h" #include "refcount.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h index 7515580ed6..5e8b1b932c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h @@ -36,8 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "wwstring.h" #include "simplevec.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h index 353ce467f5..1059e5521f 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "texture.h" #include "dx8wrapper.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h index 9c5bd00868..9c77bd48ec 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "wwdebug.h" #include "refcount.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h index 623f796c3f..699532358d 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "dllist.h" #include "d3d8.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h index 440995cad0..203caef9ef 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "hash.h" #include "wwstring.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h index 9dab6ae2ca..c80f7ebb3b 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #ifndef ANIMOBJ_H #include "animobj.h" #endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h index ebd18d841e..984fc2c4cf 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "hanim.h" #include "simplevec.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h index c334919956..7e1642a12c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "hanim.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h index 6fc1f57bb8..981c5db91c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "bittype.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h index e3e96af8e5..4e0099d19c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "rendobj.h" #include "w3derr.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h index ae70cb8e40..832d2ce4d6 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "vector3.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h index 177371b8dc..f9a33656f5 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h @@ -38,6 +38,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "refcount.h" #include "w3d_file.h" #include "w3derr.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h index e137a3abf0..ab7dcfc4fa 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matpass.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #ifndef REFCOUNT_H #include "refcount.h" #endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h index 955f6c23e3..1e9f8ecc21 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h @@ -38,6 +38,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "bittype.h" #include "matrix4.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h index eff0bc5067..00e019f094 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "rendobj.h" #include "bittype.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h index 1577241a62..bf07f427bd 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h @@ -39,6 +39,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "vector2.h" #include "vector3.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h index 40efb9b5f3..3f2d7637d9 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h @@ -35,7 +35,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "always.h" #include "refcount.h" #include "bittype.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h index 4011a08292..2926692389 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h @@ -35,7 +35,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "always.h" #include "vector2.h" #include "vector3.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h index 92a94d36f5..2a48ea3b17 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "vector2.h" #include "vector3.h" #include "vector4.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h index 82a43a2588..5a3e7a9b0c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/motchan.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "bittype.h" #include "w3d_file.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h index 5790579cf9..4817c36236 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #ifndef RENDOBJ_H #include "rendobj.h" #endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h index 78acdffa05..a70cf24f65 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h @@ -33,7 +33,9 @@ *-------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "rendobj.h" #include "pointgr.h" #include "seglinerenderer.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h index 7f294f69da..96f6cf4ce8 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h @@ -33,7 +33,9 @@ *-------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "rendobj.h" #include "RANDOM.H" #include "part_buf.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h index 57a357710d..9d319cf38c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h @@ -32,7 +32,6 @@ * * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once #include "proto.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h index 1ee1dee282..a9bf9a5169 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "simplevec.h" #include "vector2.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h index cfe1c6bf6c..1387caaad5 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h @@ -37,7 +37,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once #include "always.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h index e65bff731a..8f7d0b78c7 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "refcount.h" #include "vector3.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.h index 21040ac083..634a948762 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" class DX8Wrapper; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h index b8707f2491..fec9b565c5 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h @@ -17,6 +17,7 @@ */ #pragma once + #include "always.h" class SortingNodeStruct; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texproject.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texproject.h index 272ac64e08..88ebc09e64 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texproject.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texproject.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "matrix3d.h" #include "matrix4.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.h index d1bb85f19c..3f2f2de4bd 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "refcount.h" #include "chunkio.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h index bea867f921..e3e9857267 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h @@ -36,7 +36,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #ifndef DX8_WRAPPER_H //#include "dx8wrapper.h" #endif diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h index 22ad2e0dd1..534dc47018 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/textureloader.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 "always.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h index 7907e38253..b61e427117 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.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 "always.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h index 8c4c116204..b0575f1a46 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "refcount.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h index 177e2c5dc4..d550e2ddf0 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "bittype.h" #include "iostruct.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h index ebc9bec54d..0d99448e53 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "vector3.h" #include "layer.h" diff --git a/Generals/Code/Main/WinMain.h b/Generals/Code/Main/WinMain.h index 3df35efee4..ad23e9ffdc 100644 --- a/Generals/Code/Main/WinMain.h +++ b/Generals/Code/Main/WinMain.h @@ -29,7 +29,9 @@ // Author: Colin Day, April 2001 // /////////////////////////////////////////////////////////////////////////////// + #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include diff --git a/Generals/Code/Tools/GUIEdit/Include/DialogProc.h b/Generals/Code/Tools/GUIEdit/Include/DialogProc.h index 7177a677b8..aab3989768 100644 --- a/Generals/Code/Tools/GUIEdit/Include/DialogProc.h +++ b/Generals/Code/Tools/GUIEdit/Include/DialogProc.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include diff --git a/Generals/Code/Tools/GUIEdit/Include/EditWindow.h b/Generals/Code/Tools/GUIEdit/Include/EditWindow.h index 13ec4d116a..8d2a34503e 100644 --- a/Generals/Code/Tools/GUIEdit/Include/EditWindow.h +++ b/Generals/Code/Tools/GUIEdit/Include/EditWindow.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #include diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h b/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h index 266a18d1eb..5432ab4fcf 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEdit.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include #include diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEditColor.h b/Generals/Code/Tools/GUIEdit/Include/GUIEditColor.h index bf68ee8a7b..13cd34a10c 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEditColor.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEditColor.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h b/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h index 27608e4354..dda18bf3ae 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEditDisplay.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h b/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h index 46b00f825c..d79cb6085e 100644 --- a/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h +++ b/Generals/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h @@ -33,6 +33,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include #include "W3DDevice/GameClient/W3DGameWindowManager.h" diff --git a/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h b/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h index b9e3335f46..c622a266c8 100644 --- a/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h +++ b/Generals/Code/Tools/GUIEdit/Include/HierarchyView.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #include diff --git a/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h b/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h index 9f73bca67c..550c035c87 100644 --- a/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h +++ b/Generals/Code/Tools/GUIEdit/Include/LayoutScheme.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include diff --git a/Generals/Code/Tools/GUIEdit/Include/Properties.h b/Generals/Code/Tools/GUIEdit/Include/Properties.h index ec75efc245..dacacce825 100644 --- a/Generals/Code/Tools/GUIEdit/Include/Properties.h +++ b/Generals/Code/Tools/GUIEdit/Include/Properties.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/Generals/Code/Tools/GUIEdit/Include/WinMain.h b/Generals/Code/Tools/GUIEdit/Include/WinMain.h index 3bb4051f1e..219ea88a00 100644 --- a/Generals/Code/Tools/GUIEdit/Include/WinMain.h +++ b/Generals/Code/Tools/GUIEdit/Include/WinMain.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include diff --git a/Generals/Code/Tools/ParticleEditor/CButtonShowColor.h b/Generals/Code/Tools/ParticleEditor/CButtonShowColor.h index 4821c0a2f4..b11567c625 100644 --- a/Generals/Code/Tools/ParticleEditor/CButtonShowColor.h +++ b/Generals/Code/Tools/ParticleEditor/CButtonShowColor.h @@ -17,6 +17,7 @@ */ #pragma once + #include "Lib/BaseType.h" class CButtonShowColor : public CButton 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 034e3012a6..5a3be36cca 100644 --- a/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.h +++ b/Generals/Code/Tools/ParticleEditor/EmissionTypePanels.h @@ -32,6 +32,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" #include "ISwapablePanel.h" diff --git a/Generals/Code/Tools/ParticleEditor/ISwapablePanel.h b/Generals/Code/Tools/ParticleEditor/ISwapablePanel.h index 231067641d..7d3dd89fcb 100644 --- a/Generals/Code/Tools/ParticleEditor/ISwapablePanel.h +++ b/Generals/Code/Tools/ParticleEditor/ISwapablePanel.h @@ -33,6 +33,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + #include "Lib/BaseType.h" // INCLUDES /////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.h b/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.h index a6d4140ccf..4cd07683ea 100644 --- a/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.h +++ b/Generals/Code/Tools/ParticleEditor/MoreParmsDialog.h @@ -32,6 +32,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" #include "Lib/BaseType.h" diff --git a/Generals/Code/Tools/ParticleEditor/ParticleEditor.h b/Generals/Code/Tools/ParticleEditor/ParticleEditor.h index 1612b1432e..5c2b350047 100644 --- a/Generals/Code/Tools/ParticleEditor/ParticleEditor.h +++ b/Generals/Code/Tools/ParticleEditor/ParticleEditor.h @@ -18,6 +18,7 @@ // DebugWindow.h : main header file for the DEBUGWINDOW DLL // + #pragma once #ifndef __AFXWIN_H__ diff --git a/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.h b/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.h index 88feba52e4..93b05b4b5d 100644 --- a/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.h +++ b/Generals/Code/Tools/ParticleEditor/ParticleTypePanels.h @@ -32,6 +32,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + #include "Resource.h" #include "ISwapablePanel.h" diff --git a/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.h b/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.h index 22a64dda50..f3d5ffe6f6 100644 --- a/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.h +++ b/Generals/Code/Tools/ParticleEditor/ShaderTypePanels.h @@ -32,6 +32,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// // DEFINES //////////////////////////////////////////////////////////////////// // TYPE DEFINES /////////////////////////////////////////////////////////////// diff --git a/Generals/Code/Tools/ParticleEditor/StdAfx.h b/Generals/Code/Tools/ParticleEditor/StdAfx.h index 35c7c20335..099ec6dbe0 100644 --- a/Generals/Code/Tools/ParticleEditor/StdAfx.h +++ b/Generals/Code/Tools/ParticleEditor/StdAfx.h @@ -20,6 +20,7 @@ // or project specific include files that are used frequently, but // are changed infrequently // + #pragma once #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers diff --git a/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.h b/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.h index ea529be30e..e6b499af11 100644 --- a/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.h +++ b/Generals/Code/Tools/ParticleEditor/VelocityTypePanels.h @@ -32,6 +32,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" #include "ISwapablePanel.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h b/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h index 84de8a53e5..7cc7b305f3 100644 --- a/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ diff --git a/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h b/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h index 8df773f7f4..b8ee509478 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h +++ b/Generals/Code/Tools/WorldBuilder/include/BaseBuildProps.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // BaseBuildProps.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h b/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h index fa6654da90..14bc29938d 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BlendEdgeTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ diff --git a/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h b/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h index 33b1ca4a4c..00f661fa1b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h +++ b/Generals/Code/Tools/WorldBuilder/include/BlendMaterial.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // BlendMaterial.h : header file // 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 a6699b5c65..19c829ca14 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BrushTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BrushTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ diff --git a/Generals/Code/Tools/WorldBuilder/include/BuildList.h b/Generals/Code/Tools/WorldBuilder/include/BuildList.h index 0c6c37bc01..26b7b28e03 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BuildList.h +++ b/Generals/Code/Tools/WorldBuilder/include/BuildList.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // BuildList.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h b/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h index e158d8648c..0a4b00ab25 100644 --- a/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/BuildListTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, Nov 2001 #pragma once + #include "Tool.h" #include "Common/AsciiString.h" #include "PickUnitDialog.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h b/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h index a56697e777..5b98bb34f6 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h +++ b/Generals/Code/Tools/WorldBuilder/include/CButtonShowColor.h @@ -17,6 +17,7 @@ */ #pragma once + class CButtonShowColor : public CButton { protected: diff --git a/Generals/Code/Tools/WorldBuilder/include/CUndoable.h b/Generals/Code/Tools/WorldBuilder/include/CUndoable.h index fea15b39ad..aef477a1ba 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CUndoable.h +++ b/Generals/Code/Tools/WorldBuilder/include/CUndoable.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Lib/BaseType.h" #include "../../GameEngine/Include/Common/MapObject.h" #include "../../GameEngine/Include/Common/GameCommon.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h b/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h index 5e8d7130ab..95863f9cd0 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/CameraOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // CameraOptions.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/CellWidth.h b/Generals/Code/Tools/WorldBuilder/include/CellWidth.h index bc081422cc..9b8c8fc88e 100644 --- a/Generals/Code/Tools/WorldBuilder/include/CellWidth.h +++ b/Generals/Code/Tools/WorldBuilder/include/CellWidth.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // CellWidth.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h b/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h index cba432dfbd..26f4cffbee 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ContourOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ContourOptions.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/DrawObject.h b/Generals/Code/Tools/WorldBuilder/include/DrawObject.h index ed9c6dcb84..e2b39381de 100644 --- a/Generals/Code/Tools/WorldBuilder/include/DrawObject.h +++ b/Generals/Code/Tools/WorldBuilder/include/DrawObject.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include "always.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/EditAction.h b/Generals/Code/Tools/WorldBuilder/include/EditAction.h index da9fb7d552..d060b685f3 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditAction.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditAction.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EditAction.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/EditCondition.h b/Generals/Code/Tools/WorldBuilder/include/EditCondition.h index 32451b07f5..b6f04353a5 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditCondition.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditCondition.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EditCondition.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h b/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h index f9e1a5a452..f2dc677090 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditCoordParameter.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EditCoordParameter.h : header file // #include "GameLogic/Scripts.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/EditGroup.h b/Generals/Code/Tools/WorldBuilder/include/EditGroup.h index 0bbf1a8f81..2a3585f808 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditGroup.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditGroup.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EditGroup.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h b/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h index 870a70b42a..6f1c4dd965 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditObjectParameter.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EditObjectParameter.h : header file // #include "GameLogic/Scripts.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/EditParameter.h b/Generals/Code/Tools/WorldBuilder/include/EditParameter.h index 5891d37299..082e10b3c6 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EditParameter.h +++ b/Generals/Code/Tools/WorldBuilder/include/EditParameter.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EditParameter.h : header file // #include "GameLogic/Scripts.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h b/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h index 6b409b132b..fa38ca049d 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ExportScriptsOptions.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h b/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h index 7fcdcfcc68..44929f34ae 100644 --- a/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/EyedropperTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ diff --git a/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h b/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h index f982c8cd1f..2cd482dd5f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/FeatherOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // brushoptions.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h b/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h index 8f35d378a8..f606a6c890 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/FeatherTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /**************************************************************************/ diff --git a/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h b/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h index 13beba41f9..8c11eefa41 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/FenceOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // FenceOptions.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/FenceTool.h b/Generals/Code/Tools/WorldBuilder/include/FenceTool.h index 8c36acb90e..67b9b3423f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FenceTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/FenceTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; class MapObject; diff --git a/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h b/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h index 0015c783da..1801fcc33f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/FloodFillTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /************************************************************************** diff --git a/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h b/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h index e60bcdc226..f38d6251bb 100644 --- a/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/GlobalLightOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // GLOBALLIGHTOPTIONS.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h b/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h index 9528f56f64..22df766d48 100644 --- a/Generals/Code/Tools/WorldBuilder/include/GroveOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/GroveOptions.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 diff --git a/Generals/Code/Tools/WorldBuilder/include/GroveTool.h b/Generals/Code/Tools/WorldBuilder/include/GroveTool.h index 23138a2630..3cfbedaa6e 100644 --- a/Generals/Code/Tools/WorldBuilder/include/GroveTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/GroveTool.h @@ -20,6 +20,7 @@ // Author: John Ahlquist, May 2001 #pragma once + #include "Lib/BaseType.h" #include "Tool.h" #include "Common/MapObject.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h b/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h index d01c9adcfe..2364347156 100644 --- a/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/HandScrollTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, May 2001 #pragma once + #include "Tool.h" /************************************************************************** HandScrollTool diff --git a/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h b/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h index 1da43ce50d..6312a67db7 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ImpassableOptions.h @@ -17,6 +17,7 @@ */ #pragma once + class ImpassableOptions : public CDialog { public: diff --git a/Generals/Code/Tools/WorldBuilder/include/LayersList.h b/Generals/Code/Tools/WorldBuilder/include/LayersList.h index d919ae1eb8..2dbbcb0dd1 100644 --- a/Generals/Code/Tools/WorldBuilder/include/LayersList.h +++ b/Generals/Code/Tools/WorldBuilder/include/LayersList.h @@ -32,6 +32,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" #include diff --git a/Generals/Code/Tools/WorldBuilder/include/LightOptions.h b/Generals/Code/Tools/WorldBuilder/include/LightOptions.h index 8b4fa8d2f4..e08e6b0759 100644 --- a/Generals/Code/Tools/WorldBuilder/include/LightOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/LightOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // LightOptions.h : header file // #include "OptionsPanel.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/MainFrm.h b/Generals/Code/Tools/WorldBuilder/include/MainFrm.h index fd69049a06..54e353ee81 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MainFrm.h +++ b/Generals/Code/Tools/WorldBuilder/include/MainFrm.h @@ -19,6 +19,7 @@ // MainFrm.h : interface of the CMainFrame class // ///////////////////////////////////////////////////////////////////////////// + #pragma once #include "Lib/BaseType.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/MapPreview.h b/Generals/Code/Tools/WorldBuilder/include/MapPreview.h index 5479d63308..d5aa64c475 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MapPreview.h +++ b/Generals/Code/Tools/WorldBuilder/include/MapPreview.h @@ -38,6 +38,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/Generals/Code/Tools/WorldBuilder/include/MapSettings.h b/Generals/Code/Tools/WorldBuilder/include/MapSettings.h index a8b5c5fe37..8fc0810a06 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MapSettings.h +++ b/Generals/Code/Tools/WorldBuilder/include/MapSettings.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // MapSettings.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h b/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h index 5837668319..0e6515be6f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/MeshMoldOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // MeshMoldOptions.h : header file // #include "WBPopupSlider.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h b/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h index 548a5eadd1..e945bb5979 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/MeshMoldTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, Oct. 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ diff --git a/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h b/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h index e03730f7a4..d81891a47b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/MoundOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // MoundOptions.h : header file // #include "WBPopupSlider.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/MoundTool.h b/Generals/Code/Tools/WorldBuilder/include/MoundTool.h index 00fd4c08c9..4e57d8eff9 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MoundTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/MoundTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /************************************************************************* diff --git a/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h b/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h index b4a39de893..00d6dee362 100644 --- a/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h +++ b/Generals/Code/Tools/WorldBuilder/include/MyToolbar.h @@ -22,7 +22,6 @@ #pragma once - /************************************************************************* ** CellSizeToolBar ***************************************************************************/ diff --git a/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h b/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h index 2828309ebe..9ae6fde449 100644 --- a/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h +++ b/Generals/Code/Tools/WorldBuilder/include/NewHeightMap.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // NewHeightMap.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h b/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h index 527e8ec394..3b94fd9b70 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ObjectOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ObjectOptions.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h b/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h index 3ad9aa407e..cc9b5259e9 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h +++ b/Generals/Code/Tools/WorldBuilder/include/ObjectPreview.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ObjectPreview.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h b/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h index eb98b7027d..613f678474 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/ObjectTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ diff --git a/Generals/Code/Tools/WorldBuilder/include/OpenMap.h b/Generals/Code/Tools/WorldBuilder/include/OpenMap.h index f4d5196034..80d679ccd8 100644 --- a/Generals/Code/Tools/WorldBuilder/include/OpenMap.h +++ b/Generals/Code/Tools/WorldBuilder/include/OpenMap.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // OpenMap.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h b/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h index 35df8149f7..ff459a0e90 100644 --- a/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h +++ b/Generals/Code/Tools/WorldBuilder/include/OptionsPanel.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // OptionsPanel.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h b/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h index 82db1cd44a..c6a58c0e32 100644 --- a/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/PickUnitDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // PickUnitDialog.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/PointerTool.h b/Generals/Code/Tools/WorldBuilder/include/PointerTool.h index 71d66dd89d..962a46946a 100644 --- a/Generals/Code/Tools/WorldBuilder/include/PointerTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/PointerTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "PolygonTool.h" class WorldHeightMapEdit; #include "../../GameEngine/Include/Common/MapObject.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h b/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h index c43f840caa..e4f52559fc 100644 --- a/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/PolygonTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, Nov. 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; class MapObject; diff --git a/Generals/Code/Tools/WorldBuilder/include/RampOptions.h b/Generals/Code/Tools/WorldBuilder/include/RampOptions.h index ea84cab8af..1d6828ae48 100644 --- a/Generals/Code/Tools/WorldBuilder/include/RampOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/RampOptions.h @@ -32,6 +32,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "OptionsPanel.h" #include "resource.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/RampTool.h b/Generals/Code/Tools/WorldBuilder/include/RampTool.h index 4f0dbffefe..0b5718ac81 100644 --- a/Generals/Code/Tools/WorldBuilder/include/RampTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/RampTool.h @@ -32,6 +32,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Tool.h" // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h b/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h index c19a42aab6..1536469cbf 100644 --- a/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/RoadOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // RoadOptions.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/RoadTool.h b/Generals/Code/Tools/WorldBuilder/include/RoadTool.h index d1e92e32d1..1abd0aa7bc 100644 --- a/Generals/Code/Tools/WorldBuilder/include/RoadTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/RoadTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, June 2001 #pragma once + #include "Tool.h" #include "W3DDevice/GameClient/WorldHeightMap.h" class WorldHeightMapEdit; diff --git a/Generals/Code/Tools/WorldBuilder/include/SaveMap.h b/Generals/Code/Tools/WorldBuilder/include/SaveMap.h index cdde39948e..4a849ff5ec 100644 --- a/Generals/Code/Tools/WorldBuilder/include/SaveMap.h +++ b/Generals/Code/Tools/WorldBuilder/include/SaveMap.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // SaveMap.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h b/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h index 7566efd955..1fdae4e413 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScorchOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ScorchOptions.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h b/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h index 7eddd2d681..0cdc3039b0 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScorchTool.h @@ -20,6 +20,7 @@ // Author: Dennis Griffin, April 2002 #pragma once + #include "Tool.h" class WorldHeightMapEdit; class MapObject; diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h index 5b839269d1..98fc05ef6f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ScriptActionsFalse.h : header file // class Script; diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h index 7213a0294c..3f41b7efd7 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ScriptActionsTrue.h : header file // class Script; diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h b/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h index c672b5eb2b..6233557c5d 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptConditions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ScriptConditionsDlg.h : header file // class Script; diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h b/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h index c3d63109c2..2e3e305579 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ScriptDialog.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h b/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h index 801ce27463..9ee638472b 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h +++ b/Generals/Code/Tools/WorldBuilder/include/ScriptProperties.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ScriptProperties.h : header file // class Script; diff --git a/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h b/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h index daa83ea95c..a310883828 100644 --- a/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h +++ b/Generals/Code/Tools/WorldBuilder/include/SelectMacrotexture.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // SelectMacrotexture.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h b/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h index 0b4abd8164..1af6e29d51 100644 --- a/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/ShadowOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ShadowOptions.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/SplashScreen.h b/Generals/Code/Tools/WorldBuilder/include/SplashScreen.h index a369f3c426..49d935e040 100644 --- a/Generals/Code/Tools/WorldBuilder/include/SplashScreen.h +++ b/Generals/Code/Tools/WorldBuilder/include/SplashScreen.h @@ -17,6 +17,7 @@ */ #pragma once + class SplashScreen : public CDialog { protected: diff --git a/Generals/Code/Tools/WorldBuilder/include/StdAfx.h b/Generals/Code/Tools/WorldBuilder/include/StdAfx.h index 2818b2c28a..26fcc9b8c7 100644 --- a/Generals/Code/Tools/WorldBuilder/include/StdAfx.h +++ b/Generals/Code/Tools/WorldBuilder/include/StdAfx.h @@ -20,6 +20,7 @@ // or project specific include files that are used frequently, but // are changed infrequently // + #pragma once #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers diff --git a/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h b/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h index b450b88c74..f588f65aaa 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h +++ b/Generals/Code/Tools/WorldBuilder/include/TeamBehavior.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // TeamBehavior.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h b/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h index 8bca0e4dd4..40c599c748 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h +++ b/Generals/Code/Tools/WorldBuilder/include/TeamGeneric.h @@ -17,6 +17,7 @@ */ #pragma once + class Dict; class TeamGeneric : public CPropertyPage diff --git a/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h b/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h index 7576b9ed51..58b74c8edb 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h +++ b/Generals/Code/Tools/WorldBuilder/include/TeamIdentity.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // TeamIdentity.h : header file // class Dict; diff --git a/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h b/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h index ff2437071c..cce3eb0069 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h +++ b/Generals/Code/Tools/WorldBuilder/include/TeamReinforcement.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // TeamReinforcement.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h b/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h index b3783c73cf..5018911070 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h +++ b/Generals/Code/Tools/WorldBuilder/include/TerrainMaterial.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // terrainmaterial.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h b/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h index 40c35332ce..6032a53b6f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h +++ b/Generals/Code/Tools/WorldBuilder/include/TerrainModal.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // TerrainModal.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h b/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h index 62f64da9d3..eeb972b450 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h +++ b/Generals/Code/Tools/WorldBuilder/include/TerrainSwatches.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // TerrainSwatches.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/TileTool.h b/Generals/Code/Tools/WorldBuilder/include/TileTool.h index 74a7f4c140..9d227e538a 100644 --- a/Generals/Code/Tools/WorldBuilder/include/TileTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/TileTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /************************************************************************* diff --git a/Generals/Code/Tools/WorldBuilder/include/Tool.h b/Generals/Code/Tools/WorldBuilder/include/Tool.h index 684fdc29e8..70515caca9 100644 --- a/Generals/Code/Tools/WorldBuilder/include/Tool.h +++ b/Generals/Code/Tools/WorldBuilder/include/Tool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Lib/BaseType.h" #include "Common/STLTypedefs.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h b/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h index b36ae226c5..129b12204f 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h +++ b/Generals/Code/Tools/WorldBuilder/include/WBFrameWnd.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // WBFrameWnd.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h b/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h index c1394b79da..0cf36b5305 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h +++ b/Generals/Code/Tools/WorldBuilder/include/WBHeightMap.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + #include "W3DDevice/GameClient/HeightMap.h" class WBHeightMap : public HeightMapRenderObjClass diff --git a/Generals/Code/Tools/WorldBuilder/include/WBPopupSlider.h b/Generals/Code/Tools/WorldBuilder/include/WBPopupSlider.h index 7e0ccb0c11..733b31b7f2 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WBPopupSlider.h +++ b/Generals/Code/Tools/WorldBuilder/include/WBPopupSlider.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // WBPopupSliderButton.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h b/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h index 237e8f24d3..fe2e8fa083 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h +++ b/Generals/Code/Tools/WorldBuilder/include/WHeightMapEdit.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "W3DDevice/GameClient/WorldHeightMap.h" class DataChunkOutput; diff --git a/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h b/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h index ffc8c1feb6..9cf098f0e3 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/WaterOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // WaterOptions.h : header file // #include "WBPopupSlider.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/WaterTool.h b/Generals/Code/Tools/WorldBuilder/include/WaterTool.h index 6460f2473d..075dd466f2 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WaterTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/WaterTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, Nov. 2001 #pragma once + #include "PolygonTool.h" class WorldHeightMapEdit; class MapObject; diff --git a/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h b/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h index e68a536554..3a4feaabd3 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/WaypointOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // WaypointOptions.h : header file // #include "OptionsPanel.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h b/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h index 5a8d35372a..5ca7deb3a3 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h +++ b/Generals/Code/Tools/WorldBuilder/include/WaypointTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; class MapObject; diff --git a/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h b/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h index 80300ace3a..5ea8f22dde 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h +++ b/Generals/Code/Tools/WorldBuilder/include/WorldBuilder.h @@ -18,6 +18,7 @@ // WorldBuilder.h : main header file for the WORLDBUILDER application // + #pragma once #ifndef __AFXWIN_H__ diff --git a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h index c4b475cbaf..01f04ea829 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h +++ b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h @@ -19,6 +19,7 @@ // WorldBuilderDoc.h : interface of the CWorldBuilderDoc class // ///////////////////////////////////////////////////////////////////////////// + #pragma once #include "Lib/BaseType.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h index 47b274a47b..a6dbf378b2 100644 --- a/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h +++ b/Generals/Code/Tools/WorldBuilder/include/WorldBuilderView.h @@ -19,6 +19,7 @@ // WorldBuilderView.h : interface of the CWorldBuilderView class // ///////////////////////////////////////////////////////////////////////////// + #pragma once #include "Lib/BaseType.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/addplayerdialog.h b/Generals/Code/Tools/WorldBuilder/include/addplayerdialog.h index 19d8cc58f6..2222f54b99 100644 --- a/Generals/Code/Tools/WorldBuilder/include/addplayerdialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/addplayerdialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // addplayerdialog.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/brushoptions.h b/Generals/Code/Tools/WorldBuilder/include/brushoptions.h index 4527eedb5a..fe9a13b162 100644 --- a/Generals/Code/Tools/WorldBuilder/include/brushoptions.h +++ b/Generals/Code/Tools/WorldBuilder/include/brushoptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // brushoptions.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/euladialog.h b/Generals/Code/Tools/WorldBuilder/include/euladialog.h index 10616f7ea3..87eb399ba1 100644 --- a/Generals/Code/Tools/WorldBuilder/include/euladialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/euladialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // euladialog.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h b/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h index 794c5e6bbc..8579629282 100644 --- a/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h +++ b/Generals/Code/Tools/WorldBuilder/include/mapobjectprops.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // mapobjectprops.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h b/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h index 452ab83f2a..3ec9c41051 100644 --- a/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h +++ b/Generals/Code/Tools/WorldBuilder/include/playerlistdlg.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // playerlistdlg.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/propedit.h b/Generals/Code/Tools/WorldBuilder/include/propedit.h index d3ec4f0d00..34c9c0beaa 100644 --- a/Generals/Code/Tools/WorldBuilder/include/propedit.h +++ b/Generals/Code/Tools/WorldBuilder/include/propedit.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // propedit.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h b/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h index f0babef02e..536bcd4ac7 100644 --- a/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h +++ b/Generals/Code/Tools/WorldBuilder/include/teamsdialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // teamsdialog.h : header file // diff --git a/Generals/Code/Tools/WorldBuilder/include/wbview.h b/Generals/Code/Tools/WorldBuilder/include/wbview.h index 5ab404bbba..9b8a879c2c 100644 --- a/Generals/Code/Tools/WorldBuilder/include/wbview.h +++ b/Generals/Code/Tools/WorldBuilder/include/wbview.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 "Lib/BaseType.h" diff --git a/Generals/Code/Tools/WorldBuilder/include/wbview3d.h b/Generals/Code/Tools/WorldBuilder/include/wbview3d.h index 28e1c243eb..f1f38c74c0 100644 --- a/Generals/Code/Tools/WorldBuilder/include/wbview3d.h +++ b/Generals/Code/Tools/WorldBuilder/include/wbview3d.h @@ -19,7 +19,9 @@ // WbView3d.h // Class to encapsulate height map. // Author: Steven Johnson, Aug 2001 + #pragma once + // wbview3d.h : header file // diff --git a/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h b/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h index 480cec67d9..910b7dc699 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/AcademyStats.h @@ -44,6 +44,7 @@ //----------------------------------------------------------------------------- #pragma once + #include "Lib/BaseType.h" #include "Common/Debug.h" #include "Common/Snapshot.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h b/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h index 136dadf1d0..125c3d0d12 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ActionManager.h @@ -33,6 +33,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/SubsystemInterface.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BattleHonors.h b/GeneralsMD/Code/GameEngine/Include/Common/BattleHonors.h index 2ae5f881dd..c9a727ce61 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BattleHonors.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BattleHonors.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BezierSegment.h b/GeneralsMD/Code/GameEngine/Include/Common/BezierSegment.h index c7adc6c76b..eb8dd12b6f 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BezierSegment.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BezierSegment.h @@ -28,6 +28,7 @@ // DO NOT DISTRIBUTE #pragma once + #include #include "Common/STLTypedefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h b/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h index 3997a41f48..fccf3c2ed9 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BitFlags.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/BitFlagsIO.h b/GeneralsMD/Code/GameEngine/Include/Common/BitFlagsIO.h index 82c0f404e3..2c9d8ba8aa 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BitFlagsIO.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BitFlagsIO.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/BitFlags.h" #include "Common/INI.h" #include "Common/Xfer.h" 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 70586f4776..23dad11fca 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/BuildAssistant.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" #include "Lib/BaseType.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ClientUpdateModule.h b/GeneralsMD/Code/GameEngine/Include/Common/ClientUpdateModule.h index d803498d74..182fd49a12 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ClientUpdateModule.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ClientUpdateModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include diff --git a/GeneralsMD/Code/GameEngine/Include/Common/CommandLine.h b/GeneralsMD/Code/GameEngine/Include/Common/CommandLine.h index 149ff809a0..48e078dc3d 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/CommandLine.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/CommandLine.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, September 2001 #pragma once + class CommandLine { public: diff --git a/GeneralsMD/Code/GameEngine/Include/Common/CriticalSection.h b/GeneralsMD/Code/GameEngine/Include/Common/CriticalSection.h index 7f31954a30..b27261582a 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/CriticalSection.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/CriticalSection.h @@ -27,6 +27,7 @@ // Author: JohnM And MattC, August 13, 2002 #pragma once + #include "Common/PerfTimer.h" #ifdef PERF_TIMERS diff --git a/GeneralsMD/Code/GameEngine/Include/Common/CustomMatchPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/CustomMatchPreferences.h index 29377d2e46..bd16ba4c12 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/CustomMatchPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/CustomMatchPreferences.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h b/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h index 2d43528fdb..bca57a3ce7 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DamageFX.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameCommon.h" #include "Common/NameKeyGenerator.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DataChunk.h b/GeneralsMD/Code/GameEngine/Include/Common/DataChunk.h index 79240aabc3..438580c5b3 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DataChunk.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DataChunk.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, October 2000 #pragma once + #include "Common/GameMemory.h" #include "Common/Dict.h" #include "Common/MapReaderWriterInfo.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Dict.h b/GeneralsMD/Code/GameEngine/Include/Common/Dict.h index 508ba3388d..8ce7f08680 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Dict.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Dict.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Errors.h" #include "Common/NameKeyGenerator.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Directory.h b/GeneralsMD/Code/GameEngine/Include/Common/Directory.h index 1ff185b46f..dce65db078 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Directory.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Directory.h @@ -27,7 +27,9 @@ // Desc: Directory info class /////////////////////////////////////////////////////////////////////////////////////////////////// #if (0) + #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" #include "Common/STLTypedefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h b/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h index e0ed81dffc..2dc05b2962 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DisabledTypes.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DiscreteCircle.h b/GeneralsMD/Code/GameEngine/Include/Common/DiscreteCircle.h index 60cb96315a..c85159f365 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DiscreteCircle.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DiscreteCircle.h @@ -28,6 +28,7 @@ // DO NOT DISTRIBUTE #pragma once + //------------------------------------------------------------------------------------------------- /** One horizontal line of the circle we are going to generate, the points drawn should be from diff --git a/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h b/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h index 7ee53477ac..2f9cfd1572 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/DrawModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Module.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Energy.h b/GeneralsMD/Code/GameEngine/Include/Common/Energy.h index fe09acaed5..6887530f70 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Energy.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Energy.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + // INLCUDES ///////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Errors.h b/GeneralsMD/Code/GameEngine/Include/Common/Errors.h index 77a80d0172..4b8316b087 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Errors.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Errors.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + /** An ErrorCode is the repository for failure modes. In almost all situations, these values will be THROWN, not returned as error codes. Feel free diff --git a/GeneralsMD/Code/GameEngine/Include/Common/FunctionLexicon.h b/GeneralsMD/Code/GameEngine/Include/Common/FunctionLexicon.h index b88922c93b..b4873899b9 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/FunctionLexicon.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/FunctionLexicon.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/SubsystemInterface.h" #include "Common/NameKeyGenerator.h" #include "Common/GameMemory.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h b/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h index 79d8a9d1fc..5cf1b10b62 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameCommon.h @@ -47,7 +47,6 @@ #pragma once - #define DONT_ALLOW_DEBUG_CHEATS_IN_RELEASE ///< Take of the DONT to get cheats back in to release //#define _CAMPEA_DEMO diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h b/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h index c32562bfd4..62d3502eed 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameEngine.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, April 2001 #pragma once + #include "Common/SubsystemInterface.h" #include "Common/GameType.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h b/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h index 71abfb9369..3eb6c8b3c5 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameLOD.h @@ -32,6 +32,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + enum ParticlePriorityType CPP_11(: Int); #define MAX_LOD_PRESETS_PER_LEVEL 32 //number of hardware configs preset for each low,medium,high,veryhigh diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h index a149416368..25bc00d3ff 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameSpyMiscPreferences.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameState.h b/GeneralsMD/Code/GameEngine/Include/Common/GameState.h index 749ba1fb66..6d67933dd7 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameState.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameState.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/STLTypedefs.h" #include "Common/Snapshot.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameStateMap.h b/GeneralsMD/Code/GameEngine/Include/Common/GameStateMap.h index 2259b0b1e8..af4f258754 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameStateMap.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameStateMap.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INLCUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" #include "Common/SubsystemInterface.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GameType.h b/GeneralsMD/Code/GameEngine/Include/Common/GameType.h index 8a0250f286..a079f07f81 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GameType.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GameType.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, April 2001 #pragma once + #include "Lib/BaseType.h" // the default size of the world map diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h b/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h index 673ba7c849..1efebfb6a8 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Geometry.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Lib/BaseType.h" #include "Common/AsciiString.h" #include "Common/Snapshot.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h index edaa5d6ebd..a4659e77ae 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/GlobalData.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameCommon.h" // ensure we get DUMP_PERF_STATS, or not #include "Common/AsciiString.h" #include "Common/GameType.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Handicap.h b/GeneralsMD/Code/GameEngine/Include/Common/Handicap.h index fd4173c5b2..47d52abf64 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Handicap.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Handicap.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + #include "Lib/BaseType.h" // ---------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/Common/INI.h b/GeneralsMD/Code/GameEngine/Include/Common/INI.h index 3678f88e33..957fd56bae 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/INI.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/INI.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include // for offsetof, which we don't use but everyone who includes us does #include "Common/STLTypedefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/IgnorePreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/IgnorePreferences.h index 1f163ab5d1..dc223cf403 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/IgnorePreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/IgnorePreferences.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h b/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h index b7d2b9c6bc..6b899dcca5 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/KindOf.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/LadderPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/LadderPreferences.h index 3bc8feba95..ca5c7e6519 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/LadderPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/LadderPreferences.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Language.h b/GeneralsMD/Code/GameEngine/Include/Common/Language.h index 9b75a3c70f..912b090bd8 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Language.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Language.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/Common/LatchRestore.h b/GeneralsMD/Code/GameEngine/Include/Common/LatchRestore.h index faaeae6573..a3bbe9c2ad 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/LatchRestore.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/LatchRestore.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + /* 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: diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MapObject.h b/GeneralsMD/Code/GameEngine/Include/Common/MapObject.h index 109e1a3166..1438662ecc 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MapObject.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MapObject.h @@ -28,6 +28,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Common/Dict.h" #include "Common/GameMemory.h" #include "GameClient/TerrainRoads.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h b/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h index 6e47d179b3..7d9b0ab3cb 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MapReaderWriterInfo.h @@ -27,6 +27,7 @@ // Author: John Ahlquist, October 2001 #pragma once + #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 diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h index 6f4304d4cc..915a2756ba 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MessageStream.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, February 2001 #pragma once + #include "Common/GameCommon.h" // ensure we get DUMP_PERF_STATS, or not #include "Common/SubsystemInterface.h" #include "Lib/BaseType.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MissionStats.h b/GeneralsMD/Code/GameEngine/Include/Common/MissionStats.h index b60656692d..a1cc8e0924 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MissionStats.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MissionStats.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + #include "Lib/BaseType.h" #include "Common/GameCommon.h" #include "Common/Snapshot.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h b/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h index 5951756ed5..84593b6083 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ModelState.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, April 2001 #pragma once + #include "Lib/BaseType.h" #include "Common/INI.h" #include "Common/BitFlags.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Module.h b/GeneralsMD/Code/GameEngine/Include/Common/Module.h index 360ecdf007..0c4619a9de 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Module.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Module.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h b/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h index a1009a3597..a7af21cd32 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ModuleFactory.h @@ -35,6 +35,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Money.h b/GeneralsMD/Code/GameEngine/Include/Common/Money.h index 1266be3e07..aa19879f43 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Money.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Money.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + #include "Lib/BaseType.h" #include "Common/Debug.h" #include "Common/Snapshot.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/MultiplayerSettings.h b/GeneralsMD/Code/GameEngine/Include/Common/MultiplayerSettings.h index 9157c3ab88..7518ef2660 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/MultiplayerSettings.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/MultiplayerSettings.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameClient/Color.h" #include "Common/Money.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h b/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h index b642d24120..bc98672b29 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/NameKeyGenerator.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Lib/BaseType.h" #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h b/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h index bdafe6189c..f5039a1713 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/OSDisplay.h @@ -27,6 +27,7 @@ // Do Not Distribute #pragma once + #include "Lib/BaseType.h" class AsciiString; diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h b/GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h index c358799dc0..df19b3743e 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ObjectStatusTypes.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/BitFlags.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h b/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h index 96c8612f5d..03ae479dd0 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Overridable.h @@ -27,6 +27,7 @@ // Do Not Distribute #pragma once + #include "Common/GameMemory.h" /* diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Override.h b/GeneralsMD/Code/GameEngine/Include/Common/Override.h index f511ecd5ce..45cd955858 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Override.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Override.h @@ -27,6 +27,7 @@ // Do Not Distribute #pragma once + #include "Common/Overridable.h" /* diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h b/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h index ead1e8013b..39c0951281 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/PartitionSolver.h @@ -38,6 +38,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PerfMetrics.h b/GeneralsMD/Code/GameEngine/Include/Common/PerfMetrics.h index d075af3471..9d3eb19584 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/PerfMetrics.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/PerfMetrics.h @@ -27,6 +27,7 @@ // Do Not Distribute #pragma once + // For load timings enum { PERFMETRICS_LOAD_STARTFRAME = 0 }; enum { PERFMETRICS_LOAD_STOPFRAME = 1 }; diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h b/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h index 46a58879d4..b2a4c60d05 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/PerfTimer.h @@ -27,6 +27,7 @@ // July 2002 #pragma once + #include "Utility/intrin_compat.h" #if defined(RTS_DEBUG) diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Player.h b/GeneralsMD/Code/GameEngine/Include/Common/Player.h index 96f42e10e7..8dd358a09a 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Player.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Player.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + #include "Common/AcademyStats.h" #include "Common/Debug.h" #include "Common/Energy.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h b/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h index 4a55d136ad..7fe0641a24 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/PlayerList.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + #include "Common/SubsystemInterface.h" #include "Common/GameCommon.h" #include "Common/NameKeyGenerator.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/PlayerTemplate.h b/GeneralsMD/Code/GameEngine/Include/Common/PlayerTemplate.h index 4da97ac433..032e1a5d0f 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/PlayerTemplate.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/PlayerTemplate.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" #include "Common/Debug.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ProductionPrerequisite.h b/GeneralsMD/Code/GameEngine/Include/Common/ProductionPrerequisite.h index 0abc05fcee..ad9d1f833b 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ProductionPrerequisite.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ProductionPrerequisite.h @@ -41,6 +41,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/Common/QuickmatchPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/QuickmatchPreferences.h index 647fcf027a..9abf5abf80 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/QuickmatchPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/QuickmatchPreferences.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/Common/QuotedPrintable.h b/GeneralsMD/Code/GameEngine/Include/Common/QuotedPrintable.h index 3e15273170..5f50ebfbf0 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/QuotedPrintable.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/QuotedPrintable.h @@ -28,6 +28,7 @@ //////////////////////////////////////////////////////////////////////////// #pragma once + UnicodeString QuotedPrintableToUnicodeString(AsciiString original); AsciiString UnicodeStringToQuotedPrintable(UnicodeString original); diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Radar.h b/GeneralsMD/Code/GameEngine/Include/Common/Radar.h index aeac1cac73..4214b70ab1 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Radar.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Radar.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/SubsystemInterface.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 7cd090509b..9ec63c2c19 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Registry.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Registry.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, December 2001 #pragma once + #include /** diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ResourceGatheringManager.h b/GeneralsMD/Code/GameEngine/Include/Common/ResourceGatheringManager.h index 806e0e8c69..265081de2b 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ResourceGatheringManager.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ResourceGatheringManager.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameType.h" #include "Common/Snapshot.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h b/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h index d59ecd568b..48eef5289e 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/STLTypedefs.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // srj sez: this must come first, first, first. #define _STLP_USE_NEWALLOC 1 diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Science.h b/GeneralsMD/Code/GameEngine/Include/Common/Science.h index 4c1df1b4fc..689b507845 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Science.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Science.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Overridable.h" #include "Common/NameKeyGenerator.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ScopedMutex.h b/GeneralsMD/Code/GameEngine/Include/Common/ScopedMutex.h index bf84e4e3ae..c6c85bf9cd 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ScopedMutex.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ScopedMutex.h @@ -22,6 +22,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + class ScopedMutex { private: diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h b/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h index 1422ec6092..d014819688 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ScoreKeeper.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h index cdda6e34c1..6826ab14f4 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishBattleHonors.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h index d4126ee463..ef1dc739a2 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SkirmishPreferences.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Snapshot.h b/GeneralsMD/Code/GameEngine/Include/Common/Snapshot.h index 59ec10bd8f..d6f8586f74 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Snapshot.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Snapshot.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h b/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h index 913efb1d90..c85dc0c618 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/BitFlags.h" #include "Common/STLTypedefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h index f12b5c423b..c1aa8e794d 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPower.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameMemory.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerMaskType.h b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerMaskType.h index 690b8f6740..fafff1ad21 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerMaskType.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerMaskType.h @@ -27,6 +27,7 @@ // JKMCD Aug 2002 #pragma once + #include "Common/BitFlags.h" #include "Common/BitFlagsIO.h" #include "Common/SpecialPowerType.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h index 7f9811cb83..163f410ddb 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SpecialPowerType.h @@ -27,6 +27,7 @@ // JKMCD Aug 2002 #pragma once + // ------------------------------------------------------------------------------------------------ // don't forget to add new strings to SpecialPowerMaskType::s_bitNameList[] // ------------------------------------------------------------------------------------------------ diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h b/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h index b45e3b225f..5c2990fe3a 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/StackDump.h @@ -23,6 +23,7 @@ //////////////////////////////////////////////////////////////////////////////// #pragma once + #ifndef IG_DEGBUG_STACKTRACE #define IG_DEBUG_STACKTRACE 1 #endif // Unsure about this one -ML 3/25/03 diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h index 2797b75d5f..2425fc2682 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, January 2002 #pragma once + #include "Common/GameMemory.h" #include "Common/GameType.h" #include "Common/ModelState.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/StatsCollector.h b/GeneralsMD/Code/GameEngine/Include/Common/StatsCollector.h index f6dc5085e7..a840699015 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/StatsCollector.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/StatsCollector.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SubsystemInterface.h b/GeneralsMD/Code/GameEngine/Include/Common/SubsystemInterface.h index acf82b7027..4ef134f756 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SubsystemInterface.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SubsystemInterface.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/INI.h" #include "Common/STLTypedefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SystemInfo.h b/GeneralsMD/Code/GameEngine/Include/Common/SystemInfo.h index ed01134e92..c2d1f06282 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/SystemInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/SystemInfo.h @@ -27,4 +27,5 @@ // Author: John K. McDonald, December 2002 #pragma once + extern const Bool TheSystemIsUnicode; diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Team.h b/GeneralsMD/Code/GameEngine/Include/Common/Team.h index eb7ace0a2d..1f2b6f7606 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Team.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Team.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, Steven Johnson, March 2001 #pragma once + #include "Common/GameType.h" #include "Common/Snapshot.h" #include "Common/Thing.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Terrain.h b/GeneralsMD/Code/GameEngine/Include/Common/Terrain.h index 83fb7e319e..69ce929983 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Terrain.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Terrain.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h b/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h index 7afbc2a5e1..1668c6a09b 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/TerrainTypes.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "Common/SubsystemInterface.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Thing.h b/GeneralsMD/Code/GameEngine/Include/Common/Thing.h index 626f19f46c..b4e25f0020 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Thing.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Thing.h @@ -47,6 +47,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h b/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h index 1d7387923d..facde87438 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ThingFactory.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h b/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h index 08ebe6e756..621f798a87 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ThingSort.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameCommon.h" //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h b/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h index efe3e6cb0f..2064295107 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/ThingTemplate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h b/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h index ab091d10c1..b628e5b1c8 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/TunnelTracker.h @@ -28,6 +28,7 @@ // Author: Graham Smallwood, March, 2002 #pragma once + #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/Snapshot.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h b/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h index 74d48bb876..07aa657a65 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/Upgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" diff --git a/GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h b/GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h index fb65c9801e..1e26fabe05 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/UserPreferences.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/Common/WellKnownKeys.h b/GeneralsMD/Code/GameEngine/Include/Common/WellKnownKeys.h index 28bc5ac4db..419990cbbe 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/WellKnownKeys.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/WellKnownKeys.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/NameKeyGenerator.h" #ifdef INSTANTIATE_WELL_KNOWN_KEYS diff --git a/GeneralsMD/Code/GameEngine/Include/Common/encrypt.h b/GeneralsMD/Code/GameEngine/Include/Common/encrypt.h index b25a63b48b..ff030f10d6 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/encrypt.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/encrypt.h @@ -27,6 +27,7 @@ // Author: Anonymous #pragma once + // 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 '/' diff --git a/GeneralsMD/Code/GameEngine/Include/Common/version.h b/GeneralsMD/Code/GameEngine/Include/Common/version.h index 8ddee64335..5c139fb614 100644 --- a/GeneralsMD/Code/GameEngine/Include/Common/version.h +++ b/GeneralsMD/Code/GameEngine/Include/Common/version.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, November 2001 #pragma once + #include /** diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h index 4f5da351a6..eed24494d8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Anim2D.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h index 4449bccefe..bd74f4c3d8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/AnimateWindowManager.h @@ -46,6 +46,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/CDCheck.h b/GeneralsMD/Code/GameEngine/Include/GameClient/CDCheck.h index 3078e3e8f4..067a026f58 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/CDCheck.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/CDCheck.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + typedef void (*gameStartCallback) (void); Bool IsFirstCDPresent(void); diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h index e8748e856e..f82e5a64b0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/CampaignManager.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Color.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Color.h index 5b60824d1d..34f4a5f296 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Color.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Color.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h index a3101e483a..2017aba7ac 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/CommandXlat.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, Dec 2001 #pragma once + #include "GameClient/InGameUI.h" enum GUICommandType CPP_11(: Int); diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h index 3b361e9294..e15b68975c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBar.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameType.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarResizer.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarResizer.h index c4c8b40766..089d52d7fa 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarResizer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarResizer.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h index b411d2ba50..19f4db3105 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ControlBarScheme.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Credits.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Credits.h index 6a256da077..a4a1782e84 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Credits.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Credits.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Diplomacy.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Diplomacy.h index 830fffbac0..83547b01d9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Diplomacy.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Diplomacy.h @@ -27,6 +27,7 @@ ////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + void PopulateInGameDiplomacyPopup( void ); void UpdateDiplomacyBriefingText(AsciiString newText, Bool clear); diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h index f9deb9870b..7cbcde1bac 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DisconnectMenu.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "GameNetwork/DisconnectManager.h" enum DisconnectMenuStateType CPP_11(: Int) { diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h index ce32defa1f..aba8118685 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Display.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, March 2001 #pragma once + #include #include "Common/SubsystemInterface.h" #include "View.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayString.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayString.h index 5543170731..7c206d5b25 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayString.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayString.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayStringManager.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayStringManager.h index b7fb2e99b9..bc3b70d56a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayStringManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DisplayStringManager.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/SubsystemInterface.h" #include "GameClient/DisplayString.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DrawGroupInfo.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DrawGroupInfo.h index ec01643086..7e2cf1a5ff 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DrawGroupInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DrawGroupInfo.h @@ -27,6 +27,7 @@ // Author: John K. McDonald, March 2002 #pragma once + struct DrawGroupInfo { AsciiString m_fontName; diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h index 4103ac180b..0ab9bf05c6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Drawable.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, March 2001 #pragma once + #include "Common/AudioEventRTS.h" #include "Common/GameType.h" #include "Common/ModelState.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/DrawableInfo.h b/GeneralsMD/Code/GameEngine/Include/GameClient/DrawableInfo.h index 38d077863c..356bc358ba 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/DrawableInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/DrawableInfo.h @@ -27,6 +27,7 @@ // Author: Mark Wilczynski, August 2002 #pragma once + #include "Common/GameType.h" class Drawable; diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Eva.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Eva.h index 9ccb4a0814..9255632b2d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Eva.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Eva.h @@ -27,6 +27,7 @@ // DO NOT DISTRIBUTE #pragma once + #include "Common/SubsystemInterface.h" #include "Common/AudioEventRTS.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h index b789ad9935..e5317020c4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ExtendedMessageBox.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameClient/GameWindowManager.h" // return codes for message box callbacks diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/FXList.h b/GeneralsMD/Code/GameEngine/Include/GameClient/FXList.h index 247e9d2675..31d30ae4fe 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/FXList.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/FXList.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "Common/NameKeyGenerator.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/FontDesc.h b/GeneralsMD/Code/GameEngine/Include/GameClient/FontDesc.h index 3e8fa9539c..2f28dde87f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/FontDesc.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/FontDesc.h @@ -27,6 +27,7 @@ // Author: Mark Wilczynski, October 2002 #pragma once + #include "Common/GameType.h" struct FontDesc diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GUICallbacks.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GUICallbacks.h index 3b4fbc4cd1..8eea727397 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GUICallbacks.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GUICallbacks.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/GameWindow.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GUICommandTranslator.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GUICommandTranslator.h index 54dc7c7258..9181b04bc5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GUICommandTranslator.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GUICommandTranslator.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameClient/InGameUI.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Gadget.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Gadget.h index 973cd34abe..79a26028f3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Gadget.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Gadget.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetCheckBox.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetCheckBox.h index 5c5bf1899c..3935858b45 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetCheckBox.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetCheckBox.h @@ -60,6 +60,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetComboBox.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetComboBox.h index f490731ea7..0c1ac74524 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetComboBox.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetComboBox.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetListBox.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetListBox.h index 0adad45eb5..60b7737d7b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetListBox.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetListBox.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetProgressBar.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetProgressBar.h index 6e32fb72f5..6d53b156da 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetProgressBar.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetProgressBar.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetPushButton.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetPushButton.h index e214552529..53d485e4d2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetPushButton.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetPushButton.h @@ -57,6 +57,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetRadioButton.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetRadioButton.h index 286d599da5..ca4fd50069 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetRadioButton.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetRadioButton.h @@ -63,6 +63,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetSlider.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetSlider.h index 08d93aca90..8eb102efae 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetSlider.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetSlider.h @@ -52,6 +52,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetStaticText.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetStaticText.h index 87c0643541..325c04b49c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetStaticText.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetStaticText.h @@ -54,6 +54,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTabControl.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTabControl.h index e40885424b..d4bb0d9a05 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTabControl.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTabControl.h @@ -43,6 +43,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + enum { GTC_BACKGROUND = 0, diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTextEntry.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTextEntry.h index 2e53376e9a..dde3a09bec 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTextEntry.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GadgetTextEntry.h @@ -49,6 +49,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h index 5c965a29ca..3a0d32e59f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameClient.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, March 2001 #pragma once + #include "Common/GameType.h" #include "Common/MessageStream.h" // for GameMessageTranslator #include "Common/Snapshot.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameFont.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameFont.h index 17151a94a7..08ce4da1ec 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameFont.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameFont.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/SubsystemInterface.h" #include "Lib/BaseType.h" #include "Common/AsciiString.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameInfoWindow.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameInfoWindow.h index a36251a769..c49fc678dd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameInfoWindow.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameInfoWindow.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/GameWindow.h" #include "GameNetwork/LANGameInfo.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h index 78b8fea190..18f652a9df 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindow.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowGlobal.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowGlobal.h index 04165870ed..38cd12ec2c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowGlobal.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowGlobal.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowID.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowID.h index acf4cda766..d4b6816d37 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowID.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowID.h @@ -46,6 +46,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h index 807adc2ce6..fcd6bca92d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GameWindowTransitions.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameCommon.h" //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GlobalLanguage.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GlobalLanguage.h index 17247a5f0c..aa9aa794a2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GlobalLanguage.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GlobalLanguage.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/GraphDraw.h b/GeneralsMD/Code/GameEngine/Include/GameClient/GraphDraw.h index 684c07697d..12ab92af41 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/GraphDraw.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/GraphDraw.h @@ -47,6 +47,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/PerfTimer.h" #include "Common/STLTypedefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/HeaderTemplate.h b/GeneralsMD/Code/GameEngine/Include/GameClient/HeaderTemplate.h index 3a4d5535ee..4ee31cf727 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/HeaderTemplate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/HeaderTemplate.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h b/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h index c69d1b7263..e8c45b0d03 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/HintSpy.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, Dec 2001 #pragma once + #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h b/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h index 1a0137abf6..690b324252 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/HotKey.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h index 44dda0b7e4..25ec6e0cf3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Image.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/AsciiString.h" #include "Common/GameMemory.h" #include "Common/SubsystemInterface.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h b/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h index 3fc1c94f77..21bd126c77 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/InGameUI.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameCommon.h" #include "Common/GameType.h" #include "Common/MessageStream.h" // for GameMessageTranslator diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h b/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h index e631167230..8d61ed62d3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/KeyDefs.h @@ -52,6 +52,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #ifndef DIRECTINPUT_VERSION diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Keyboard.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Keyboard.h index d322d697ae..770a7338fd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Keyboard.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Keyboard.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/LanguageFilter.h b/GeneralsMD/Code/GameEngine/Include/GameClient/LanguageFilter.h index 82c16293fa..ed65bc68dd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/LanguageFilter.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/LanguageFilter.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "Common/STLTypedefs.h" #include "Common/AsciiString.h" #include "Common/UnicodeString.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Line2D.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Line2D.h index 2e14a745fe..ba8031e8d7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Line2D.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Line2D.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + typedef std::vector Coord2DVector; typedef std::vector Coord3DVector; diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/LoadScreen.h b/GeneralsMD/Code/GameEngine/Include/GameClient/LoadScreen.h index 8b4b0d6594..a70892d2f5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/LoadScreen.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/LoadScreen.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h index 9b7a1d7221..d69dfe4858 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/LookAtXlat.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, Dec 2001 #pragma once + #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/MapUtil.h b/GeneralsMD/Code/GameEngine/Include/GameClient/MapUtil.h index 877aa7609f..94eb59ce6e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/MapUtil.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/MapUtil.h @@ -28,6 +28,7 @@ //////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/AsciiString.h" #include "Common/UnicodeString.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/MessageBox.h b/GeneralsMD/Code/GameEngine/Include/GameClient/MessageBox.h index f320e8d026..a3232268b8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/MessageBox.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/MessageBox.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #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 diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h b/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h index 585c99392a..f096807b8d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/MetaEvent.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, Dec 2001 #pragma once + #include "Common/SubsystemInterface.h" #include "GameClient/InGameUI.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h index 57bba3f2f5..cc1b8dc4d6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/AnimatedParticleSysBoneClientUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h index 300cfb554c..06ba80e7e4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/BeaconClientUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h index a52f6501b8..95aa0dcdcb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Module/SwayClientUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h index aed40853fc..d26d97317d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Mouse.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ParabolicEase.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ParabolicEase.h index 1fe13b8cad..3334def572 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ParabolicEase.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ParabolicEase.h @@ -23,7 +23,9 @@ // Ease in and out based on a parabolic function. // Author: Robert Minsk May 12, 2003 // ============================================================================ + #pragma once + // ============================================================================ #include "Lib/BaseType.h" // ============================================================================ diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h index f2f3b80841..beeb444c17 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ParticleSys.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include #include "Common/AsciiString.h" #include "Common/GameMemory.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h b/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h index e7576b2b84..188173300d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/PlaceEventTranslator.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, Dec 2001 #pragma once + #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h index 96383191f4..e498f8907b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ProcessAnimateWindow.h @@ -49,6 +49,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h b/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h index e3a5c048f8..6a434dc399 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/RadiusDecal.h @@ -26,6 +26,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameCommon.h" #include "Common/GameType.h" #include "GameClient/Color.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h b/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h index ea8c1103e2..2a2d1bc417 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/RayEffect.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDE //////////////////////////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" #include "Common/SubsystemInterface.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionInfo.h b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionInfo.h index e7808bbbaf..509c592357 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionInfo.h @@ -27,6 +27,7 @@ // Author: John McDonald, Jr, October 2002 #pragma once + #include "GameClient/InGameUI.h" // This structure gives you a rough idea about the counts of the kinds of guys in the diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h index c649519544..f3bd0827b7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/SelectionXlat.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, Dec 2001 #pragma once + #include "GameClient/InGameUI.h" class ThingTemplate; diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h index 7eac0d6462..3b8347c9d1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Shadow.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // // skeleton definition of shadow types // diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h index f50016c730..cacd073eeb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Shell.h @@ -93,6 +93,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// // FORWARD REFERENCES ///////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ShellHooks.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ShellHooks.h index f5f357b27c..addd9f559b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ShellHooks.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ShellHooks.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, October 2002 #pragma once + // // 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 diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/ShellMenuScheme.h b/GeneralsMD/Code/GameEngine/Include/GameClient/ShellMenuScheme.h index 0ed3ae15ab..08265632fd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/ShellMenuScheme.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/ShellMenuScheme.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Smudge.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Smudge.h index ca4f106b69..2522d5f670 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Smudge.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Smudge.h @@ -19,6 +19,7 @@ // FILE: Smudge.h ///////////////////////////////////////////////////////// #pragma once + #include "WW3D2/dllist.h" #include "WWMath/vector2.h" #include "WWMath/vector3.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Snow.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Snow.h index 721fb303b8..08679b14f0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Snow.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Snow.h @@ -19,6 +19,7 @@ // FILE: Snow.h ///////////////////////////////////////////////////////// #pragma once + #include "Lib/BaseType.h" #include "Common/SubsystemInterface.h" #include "Common/Overridable.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Statistics.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Statistics.h index 76b492cd52..2784870d75 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Statistics.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Statistics.h @@ -38,6 +38,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Lib/BaseType.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainRoads.h b/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainRoads.h index 513e2aaba6..440f1334a1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainRoads.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainRoads.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "Common/SubsystemInterface.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainVisual.h b/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainVisual.h index 01a0c36ef9..5fd50282f4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainVisual.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/TerrainVisual.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Terrain.h" #include "Common/Snapshot.h" #include "Common/MapObject.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/View.h b/GeneralsMD/Code/GameEngine/Include/GameClient/View.h index 776488118e..1e0f72fbae 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/View.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/View.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Snapshot.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/Water.h b/GeneralsMD/Code/GameEngine/Include/GameClient/Water.h index 7cb392c321..f938df6d8c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/Water.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/Water.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INLCLUDES ////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/Overridable.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/WinInstanceData.h b/GeneralsMD/Code/GameEngine/Include/GameClient/WinInstanceData.h index 306bff3fef..0d06d1252f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/WinInstanceData.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/WinInstanceData.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowLayout.h b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowLayout.h index 3706421bce..a4bdf6ce2b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowLayout.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowLayout.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameClient/GameWindow.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h index fde735c5ed..ce1714939d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameClient/WindowXlat.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, Dec 2001 #pragma once + #include "GameClient/InGameUI.h" //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h index 05c846a75c..50427c2fb1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AI.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, November 2000 #pragma once + #include "Common/Snapshot.h" #include "Common/SubsystemInterface.h" #include "Common/GameMemory.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h index 845728d988..a50a6de5f5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, February 2002 #pragma once + #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h index 1f7a0b64da..a9f6a68501 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuard.h @@ -38,6 +38,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h index cbc104e47a..ba9eb252ea 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIGuardRetaliate.h @@ -36,6 +36,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h index ebdde46ed7..a76f26cc52 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPathfind.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, October 2001 #pragma once + #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/Snapshot.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h index 8d6fd29e59..84aedef91d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIPlayer.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, January 2002 #pragma once + #include "Common/GameMemory.h" #include "Common/Snapshot.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h index 74cb95d3dc..623e2ef249 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AISkirmishPlayer.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, January 2002 #pragma once + #include "Common/GameMemory.h" #include "GameLogic/AIPlayer.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h index 0880dada29..3171df36bc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, January 2002 #pragma once + #include "Lib/BaseType.h" #include "Common/AudioEventRTS.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h index 2221daef2e..c5a34a6944 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/AITNGuard.h @@ -38,6 +38,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h index 3fe9582c72..8e876d7813 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Armor.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" #include "Common/STLTypedefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h index 86d720fac5..44e199a89f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ArmorSet.h @@ -25,6 +25,7 @@ // ArmorSet.h #pragma once + #include "Lib/BaseType.h" #include "Common/GameType.h" #include "Common/SparseMatchFinder.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h index 54b73a09ae..63f52d479f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/CaveSystem.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + 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. diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h index 14f333e0ea..ef6e956827 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/INI.h" #include "Common/Overridable.h" #include "Common/Override.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h index 0365da6d0b..df1b6e5f67 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Damage.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/BitFlags.h" #include "Common/GameType.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h index e35349ca85..a275b24b11 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ExperienceTracker.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameCommon.h" #include "Common/GameType.h" #include "Common/GameMemory.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/FPUControl.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/FPUControl.h index 204242cf5b..45faa07657 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/FPUControl.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/FPUControl.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + /** * 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 diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h index c07870d05d..237b009bb3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/FiringTracker.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/AudioEventRTS.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h index 577794f019..9f5fa504ae 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/GameLogic.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameCommon.h" // ensure we get DUMP_PERF_STATS, or not #include "Common/GameType.h" #include "Common/Snapshot.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h index 9336cf5542..06d6d73422 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/GhostObject.h @@ -28,6 +28,7 @@ // Author: Mark Wilczynski, August 2002 #pragma once + #include "Lib/BaseType.h" #include "Common/Snapshot.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h index 0bc8c9bb40..2a6ce943ff 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Locomotor.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/NameKeyGenerator.h" #include "Common/Override.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h index ced72e7e30..8072827d4a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/LocomotorSet.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // no, please do NOT include this. //#include "GameLogic/Locomotor.h" #include "Common/GameCommon.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h index df1abb3ff4..491bd0e02e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AIUpdate.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, 2001-2002 #pragma once + #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/AI.h" #include "GameLogic/AIStateMachine.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h index 49892bab4e..0fbd3a7efa 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveBody.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DamageFX.h" #include "GameLogic/Module/BodyModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h index 90651625f6..285dc25628 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ActiveShroudUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h index 3ae9da0649..6ffc8b3060 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AnimationSteeringUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h index cae5375337..38998a466e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ArmorUpgrade.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h index 72b487e171..edcaf28bea 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssaultTransportAIUpdate.h @@ -29,6 +29,7 @@ // injured troops to return to the transport for healing purposes. #pragma once + #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h index 43b3d5b9cc..23965134d7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AssistedTargetingUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h index e823d5b797..a70c06b973 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoDepositUpdate.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h index 0c7cbf7551..0ef89bcd78 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoFindHealingUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h index 4b4f4109c3..edd036f9a3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/AutoHealBehavior.h @@ -32,6 +32,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h index cd7017978c..771bbb4d1c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaikonurLaunchPower.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/SpecialPowerModule.h" class Object; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h index 5289e71a06..95c8c58f7a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BaseRegenerateUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/Module/DamageModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h index e1361b0347..55a301ded9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattleBusSlowDeathBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/SlowDeathBehavior.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h index aa4391c6b3..8eeed38c7d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BattlePlanUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/SpecialPowerUpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h index 6a2153adfc..0290d52b50 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BehaviorModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameType.h" #include "Common/Module.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h index 36f612ddf4..2e9e792cff 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BodyModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/ArmorSet.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h index cfbd7c1cbd..aede96065c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXDamage.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DamageModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h index ed84e2edd7..8aea676986 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BoneFXUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h index 34df12bf85..43b5d0bbe9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameClient/TerrainRoads.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h index f6189fec8c..42274c7486 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeScaffoldBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h index 3ad1e49c28..a4b9d18f73 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BridgeTowerBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DamageModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h index 1638f2f684..5439875ebd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/BunkerBusterBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h index 79113685d1..34b460715f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashBountyPower.h @@ -43,6 +43,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h index 374e9f0bf3..0eeb354440 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CashHackSpecialPower.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h index 5976a33cf6..fca16c556a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CaveContain.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" #include "GameLogic/Module/OpenContain.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h index 67cd463dea..4c3bb82e42 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CheckpointUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h index 9c5b6d3fc6..0b0279a046 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ChinookAIUpdate.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, June 2002 #pragma once + #include "GameLogic/AIStateMachine.h" #include "GameLogic/Module/SupplyTruckAIUpdate.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h index 5cf3203bd3..a94e05adb8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupAreaPower.h @@ -42,6 +42,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- #include "GameLogic/Module/SpecialPowerModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h index ada1b33a73..8268e7db55 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CleanupHazardUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h index 9edd74887e..3394bee886 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CollideModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h index f75e7861c1..a9e66f197c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandButtonHuntUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h index 9399c13d08..e034b17685 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CommandSetUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/UpgradeModule.h" //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h index 0e941cf1fb..f85817f831 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ContainModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "GameLogic/WeaponBonusConditionFlags.h" // Can't forward a typedef. This should me made a BitFlags class. #include "GameLogic/Damage.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h index 8ce91fc432..c748c8ec30 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToCarBombCrateCollide.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h index 54da943142..7abd85627d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ConvertToHijackedVehicleCrateCollide.h @@ -32,6 +32,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h index 7efe71859d..e9d82b2da3 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CostModifierUpgrade.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h index eb7c7e35c5..9ca8248b63 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CountermeasuresBehavior.h @@ -29,6 +29,7 @@ //------------------------------------------ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h index e18c315e42..8cf17d8f14 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrateCollide.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h index f37aa72109..2139b995cb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateCrateDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h index 2b7049e5b2..8b6de2d9fc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h index 184c4a60eb..12f0386c1f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CreateObjectDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h index 2f40c941e3..c18289db5b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/CrushDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h index dcced1e8de..896ead6813 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h index ba82a5c059..6555522a81 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DamageModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h index 02d72a69d1..4d2aea2d39 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefaultProductionExitUpdate.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/UpdateModule.h" #include "Common/INI.h" #include "Lib/BaseType.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h index 4984074b0c..b9d7310891 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DefectorSpecialPower.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h index d36577dd2e..436feb28d7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeletionUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h index abc92ebac9..e92b964b6e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeliverPayloadAIUpdate.h @@ -27,6 +27,7 @@ // Desc: State machine that controls the approach and deployment of airborne cargo #pragma once + #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" #include "GameClient/RadiusDecal.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h index 336c320a6b..9085a9c982 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoTrapUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h index 05c0174726..c4ed1c56f2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DemoralizeSpecialPower.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #ifdef ALLOW_DEMORALIZE // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h index 42106054c7..d79bccd2f7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DeployStyleAIUpdate.h @@ -28,6 +28,7 @@ // When deployed, you can't move, when undeployed, you can't attack. #pragma once + #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h index a04f89fdc7..f365c12956 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "Common/INI.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h index 6b877506df..c71fb13050 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DestroyModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h index 87f295821b..803cdde7c5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DieModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "GameLogic/Damage.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h index a3133d3c3a..92695de6c5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DockUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h index d2772a2c72..2d5d4bd399 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DozerAIUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/AIUpdate.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h index f81bf66020..ac230ffc2e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DumbProjectileBehavior.h @@ -27,6 +27,7 @@ // Desc: #pragma once + #include "Common/GameType.h" #include "Common/GlobalData.h" #include "Common/STLTypedefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h index 1c012582f9..96b0e953dd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicGeometryInfoUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Geometry.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h index b0c43e1a84..7b84745ca5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/DynamicShroudClearingRangeUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameClient/RadiusDecal.h"///< For the pseudo-wireframe decal effect diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h index 8bb6055e49..9e6712b508 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EMPUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/Module/DieModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h index a98dd7a932..b2a0e2cc03 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EjectPilotDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "Common/INI.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h index 62f2397b58..3929983db0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/EnemyNearUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h index 7f1605b1f5..eefcea7e94 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ExperienceScalarUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h index 724aed2a21..d299618064 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FXListDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h index 1e70199954..2c14a00b3c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireOCLAfterWeaponCooldownUpdate.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + class UpgradeMuxData; #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h index 1e814da38d..7d73089bc4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireSpreadUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h index c703d0dcfc..5d1f6fb04a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponCollide.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" #include "GameLogic/Weapon.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h index e833277df0..7e47a54840 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponPower.h @@ -43,6 +43,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/SpecialPowerModule.h" class Object; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h index 0fcfc79c12..3532abe855 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/Weapon.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h index f5d1b29cb9..801bfaaf24 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDamagedBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpgradeModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h index 8150861c9c..7a1271eca6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FireWeaponWhenDeadBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h index 780ba13261..6c0761be70 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FirestormDynamicGeometryInfoUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Geometry.h" #include "GameLogic/Module/DynamicGeometryInfoUpdate.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h index 47f9b18be5..67ab98c966 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlammableUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameLogic/Module/DamageModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h index 449f45d4b6..650166809a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FlightDeckBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h index 171f29735e..7da2cbce24 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/FloatUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h index 96aeba4d2e..b8c78b631a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GarrisonContain.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" #include "Common/ModelState.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h index 7f75458ab8..99a659b2e7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GenerateMinefieldBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h index 8e73f1803d..166afd3fb9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantScienceUpgrade.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/UpgradeModule.h" //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h index da94386c10..ed0491c3c7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantStealthBehavior.h @@ -28,6 +28,7 @@ //------------------------------------------ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h index 528735930f..bc23fcb8e1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/GrantUpgradeCreate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #define DEFINE_OBJECT_STATUS_NAMES // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h index c7b0a5c24f..6b049d7372 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HackInternetAIUpdate.h @@ -27,6 +27,7 @@ // Desc: State machine that allows hacking cash from the internet (free money). #pragma once + #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h index c840f16219..996c06653a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealContain.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h index c884f7f02d..e2f8bdcd91 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HealCrateCollide.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h index 05c4f63ccb..67ce4f20d1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HeightDieUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h index 04930b1c90..1e3ae0e31a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelicopterSlowDeathUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameLogic/Module/SlowDeathBehavior.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h index 9d4920a1a0..fc28147c1f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HelixContain.h @@ -32,6 +32,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/TransportContain.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h index 2ad5a12ddf..1ab52a67c1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HighlanderBody.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h index f1f9c10136..bbabac53f1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HijackerUpdate.h @@ -33,6 +33,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/UpdateModule.h" //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h index b6d5afbae9..7ff7780860 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HiveStructureBody.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/StructureBody.h" #include "GameLogic/Damage.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h index 3c89a606df..e114dc31e1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/HordeUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "Common/KindOf.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h index 099fdc0c86..b29376bb30 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ImmortalBody.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h index 910ad54c84..79ca7cd61c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InactiveBody.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BodyModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h index 1ea5e001f1..8000ecd3ce 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InstantDeathBehavior.h @@ -27,6 +27,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h index d0a0db57bc..8f300b2399 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/InternetHackContain.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/TransportContain.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h index abfdba541d..1840d30a4b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetAIUpdate.h @@ -26,6 +26,7 @@ // Author: Steven Johnson, June 2002 #pragma once + #include "Common/STLTypedefs.h" #include "Common/GameMemory.h" #include "GameLogic/AIStateMachine.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h index bd5a73081a..f9d8f8b50f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/JetSlowDeathBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h index 29101bb4a7..539ff20559 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/KeepObjectDie.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "Common/INI.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h index c06d61c89a..f921a04f53 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LaserUpdate.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ClientUpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h index 65057b2b67..7802e2bf50 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LifetimeUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h index 6a568478c7..8650a5a422 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LockWeaponCreate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h index e4ad14bb69..2df6b5e934 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/LocomotorSetUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h index 90f72eb041..d269b87720 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MaxHealthUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h index a97dde8195..f145d238be 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MinefieldBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/CollideModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h index 4f1a567aa5..f66f917348 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileAIUpdate.h @@ -27,6 +27,7 @@ // Desc: Missile behavior #pragma once + #include "Common/GameType.h" #include "Common/GlobalData.h" #include "GameLogic/Module/AIUpdate.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h index e8feceecc0..30bf8b44b4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MissileLauncherBuildingUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h index 0c669395a3..ce18cf4873 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobMemberSlavedUpdate.h @@ -27,6 +27,7 @@ // Author: Mark Lorenzen, August 2002 #pragma once + #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) diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h index 59ed97998c..a6cb49aa53 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MobNexusContain.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h index 4ea9c65443..a1adfe69b7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ModelConditionUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/UpgradeModule.h" enum ModelConditionFlagType CPP_11(: Int); diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h index dff99997c4..ed767becd8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/MoneyCrateCollide.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h index 380bb8d056..9f972ea26a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronBlastBehavior.h @@ -28,6 +28,7 @@ //------------------------------------------ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h index 72288c7493..fdcd161a87 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileSlowDeathUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SlowDeathBehavior.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h index 080984bbdf..41c6db5a18 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/NeutronMissileUpdate.h @@ -27,6 +27,7 @@ // Desc: Missile behavior #pragma once + #include "GameClient/RadiusDecal.h" #include "Common/GameType.h" #include "Common/GlobalData.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h index 4faaae702d..5fa059cff7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLSpecialPower.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" #include "Common/Science.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h index 287b94f677..3e7e0546a0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OCLUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h index 6db9abe3c5..eb2786bf1b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectCreationUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h index 4014ec5a9e..baa2c45508 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectDefectionHelper.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h index f11b24ae18..cdf4c59607 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectHelper.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h index b5c7df9f62..445c05d3f9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectRepulsorHelper.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h index 7550122c88..34fc3cd833 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectSMCHelper.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h index b72d7c66be..0a36cfea97 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ObjectWeaponStatusHelper.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ThingTemplate.h" #include "GameLogic/Object.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h index 42fafbf9a4..180fc86aac 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OpenContain.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/CollideModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h index 31970b02fd..23999c4b10 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverchargeBehavior.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DamageModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h index a1b38ea7bc..8cb487b76e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/OverlordContain.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/TransportContain.h" #include "GameLogic/GameLogic.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h index 222dc2360c..f937ba66b6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckAIUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/AIUpdate.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h index cb182ec572..1ef92bb49c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/POWTruckBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h index 16515cc74c..9aa2b664c7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParachuteContain.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h index bd036e90ca..053d3108e6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParkingPlaceBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h index 0de0afc356..015813b9a7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ParticleUplinkCannonUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "Common/Science.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h index 8159985619..a9d27ac14f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PassengersFireUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h index c821aaf4bc..4ba389c53d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PhysicsUpdate.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, November 2001 #pragma once + #include "Common/AudioEventRTS.h" #include "Common/GameAudio.h" #include "GameLogic/Module/BehaviorModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h index d0988afebc..78c39e8c2d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PilotFindVehicleUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h index 710f3de1b4..e66818f66f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PointDefenseLaserUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h index f14988437d..11537deedc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PoisonedBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DamageModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h index 53d112b6da..97c21634e5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h index dd23c01a02..c3b601bdd1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PowerPlantUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h index d7da71e63d..dad86a0cbd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PreorderCreate.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h index ebd4d792f1..600af3bbb2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonBehavior.h @@ -26,7 +26,9 @@ // Author: Colin Day, August 2002 // Desc: Prison Behaviors /////////////////////////////////////////////////////////////////////////////////////////////////// + #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h index eba299082d..2baf25279c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PrisonDockUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameLogic/Module/DockUpdate.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h index db3e090659..5c6cc19fe4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProductionUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/ModelState.h" #include "GameLogic/Module/DieModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h index 051ef18d97..3f79ac99c5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProjectileStreamUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" // FORWARD REFERENCES ///////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h index 3b2aaba88a..2aa7447993 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ProneUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h index 8be91d3806..abcfd6f6f5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaCenterBehavior.h @@ -26,7 +26,9 @@ // Author: Colin Day, August 2002 // Desc: Propaganda Center Behavior /////////////////////////////////////////////////////////////////////////////////////////////////// + #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/PrisonBehavior.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h index cb1457939c..da388a53f0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/PropagandaTowerBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/PropagandaTowerBehavior.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h index 7db64d46f3..d6eb4714fd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/QueueProductionExitUpdate.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/UpdateModule.h" #include "Common/INI.h" #include "Lib/BaseType.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h index 34b9cb27b0..c36d57bf36 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h index a59338188b..eb5b0c8968 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadarUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h index b5ba15b183..3d58a6ae6f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RadiusDecalUpdate.h @@ -26,6 +26,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameClient/RadiusDecal.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h index 74a4442131..3f29b21677 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportAIUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/AIUpdate.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h index 23a3fecfc9..4b5357b27f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportContain.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/TransportContain.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h index 65c4e97158..537d0293ba 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailedTransportDockUpdate.h @@ -26,7 +26,9 @@ // Author: Colin Day, August 2002 // Desc: Railed transport dock update /////////////////////////////////////////////////////////////////////////////////////////////////// + #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DockUpdate.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h index ef5acf7063..f142d92cfb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RailroadGuideAIUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/AIUpdate.h" #include "GameLogic/Module/PhysicsUpdate.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h index 75b5f7c665..8a37bc1e41 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h index b14f1bbeea..eaf5fff785 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RebuildHoleExposeDie.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h index ea46394e98..ff8c94e972 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RepairDockUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" #include "GameLogic/Module/SupplyCenterDockUpdate.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h index 9dd26ab415..0cdcb5234f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ReplaceObjectUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/UpgradeModule.h" //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h index 7684d25e22..7de0142439 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/RiderChangeContain.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/TransportContain.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h index 795ad102a9..ee0bd55023 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageCommandCenterCrateCollide.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h index 25e7f1453b..7788a47ccd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageFakeBuildingCrateCollide.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h index 3299b3e4c6..319dc68a3f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageInternetCenterCrateCollide.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h index 54df6d6beb..543e001657 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageMilitaryFactoryCrateCollide.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h index e9a2a12ef4..daff695180 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotagePowerPlantCrateCollide.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h index 30d0f34cf9..ed26201b13 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSuperweaponCrateCollide.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h index d946564666..c3f75fc1e9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyCenterCrateCollide.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h index bc27241f28..0bf5d1c2d7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SabotageSupplyDropzoneCrateCollide.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h index 3d2e6cf946..5540c678b5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SalvageCrateCollide.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "Common/STLTypedefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h index c1de5e162f..f77074e406 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ShroudCrateCollide.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h index 7b808decf7..2a77c29aeb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlavedUpdate.h @@ -29,7 +29,9 @@ // 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 + 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 // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h index 4f95e1c1ca..7fb3e462f5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SlowDeathBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SmartBombTargetHomingUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SmartBombTargetHomingUpdate.h index 2e361c0117..4f27ad1a9a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SmartBombTargetHomingUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SmartBombTargetHomingUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h index 2fcb986868..131105a662 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnBehavior.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + const Int SPAWN_UPDATE_RATE = LOGICFRAMES_PER_SECOND/2; ///< This is a low priority module that only needs to be called every this many frames // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h index ad42c7e7e1..8622540f49 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpawnPointProductionExitUpdate.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/UpdateModule.h" #include "Common/INI.h" #include "Lib/BaseType.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h index 5a0e2ca826..cd5abc5cd8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbility.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h index c611f9e7cb..bee145e9aa 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialAbilityUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/INI.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h index 3fe6c266d8..fef438647a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCompletionDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h index 0a31cbf403..c8d13c20e2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerCreate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h index 0907142d8a..8669842463 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/Module.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h index 96cd431243..01d4aed564 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpecialPowerUpdateModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "Common/GameType.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h index f7fae1e53c..ee44fd479d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipDeploymentUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/SpecialPowerUpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h index fb5c97a395..c494e4b1a5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpectreGunshipUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/KindOf.h" #include "GameLogic/Module/SpecialPowerUpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h index ac195b0cfa..0238e90e53 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionSpecialPower.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/SpecialPowerModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h index 0698435cdc..5ac32cbadd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SpyVisionUpdate.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" #include "GameLogic/Module/UpgradeModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h index 8c8f8f019b..598bd98db1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SquishCollide.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CollideModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h index 35afed9356..c195a74f2e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusBitsUpgrade.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h index 4177eacd80..c5add81882 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StatusDamageHelper.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h index 99d87dbdd5..6eab70e630 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthDetectorUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h index f80868a798..11b4471295 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h index 2ddeda86df..511dfb38a9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StealthUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h index 2fc45991fc..5d1c16d07f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StickyBombUpdate.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/UpdateModule.h" class WeaponTemplate; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureBody.h index a4b8ed8cc7..ebe9235daa 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureBody.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h index 10d5330ad4..ca645c3004 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureCollapseUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DieModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h index 12d0f8880c..916b28ac4e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/StructureToppleUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h index a4d9923032..db1460646a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubObjectsUpgrade.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // USER INCLUDES ////////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h index 2ece02cf98..46e45c2499 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SubdualDamageHelper.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h index df806c20ed..e4c739bce4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterCreate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h index 9620bed670..e6d0d2d282 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterDockUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h index 85d03869c5..f528eca261 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyCenterProductionExitUpdate.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/Module/UpdateModule.h" class Object; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h index 1b9b458a29..bc1af1eefc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyTruckAIUpdate.h @@ -27,6 +27,7 @@ // Desc: State machine that controls when and with who a Truck docks #pragma once + #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h index 1e33e7077f..eda60fef62 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCreate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/CreateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h index 65c75720b3..8a5c9bfefc 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseCripplingBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/DamageModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h index 6ba26c743a..b9b81d91cd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/SupplyWarehouseDockUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "Common/GameMemory.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h index 57a5072a20..19218186c9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TechBuildingBehavior.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/DieModule.h" #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h index 6caf78516b..ca711ff8d5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TempWeaponBonusHelper.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ObjectHelper.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h index a0aa3aa3e3..f67c53565a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TensileFormationUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h index d1103c6a68..5064096e48 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/ToppleUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/BehaviorModule.h" #include "GameLogic/Module/CollideModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h index 5785a06c09..b50f352b0c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransitionDamageFX.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameClient/ParticleSys.h" #include "GameLogic/Module/DamageModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h index a23bdacf6e..6b555e1700 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportAIUpdate.h @@ -27,6 +27,7 @@ // Author: Graham Smallwood, July 2002 #pragma once + #include "GameLogic/Module/AIUpdate.h" //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportContain.h index 9aaf3431a3..24ca96adaf 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TransportContain.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h index 81e9b3b099..f19373a9ab 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/TunnelContain.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/OpenContain.h" #include "GameLogic/Module/HealContain.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UndeadBody.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UndeadBody.h index 42c84c54c4..ebdd27facd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UndeadBody.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UndeadBody.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/ActiveBody.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h index 704fcba775..e4595a174a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnitCrateCollide.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h index 656122d2f4..5c6b610ee0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UnpauseSpecialPowerUpgrade.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h index 02f206dc63..00254e1247 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpdateModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "Common/GameType.h" #include "Common/DisabledTypes.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h index 043765eeaf..01b9f8fb7c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeDie.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/INI.h" #include "GameLogic/Module/DieModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h index d32fce3eb3..2be91e217e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/UpgradeModule.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/Module.h" #include "Common/STLTypedefs.h" #include "Common/Upgrade.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h index 92c329724b..a1cc5bdeec 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyCrateCollide.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Module.h" #include "GameLogic/Module/CrateCollide.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h index da5be7fe58..4ab22c5926 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/VeterancyGainCreate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #define DEFINE_VETERANCY_NAMES // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameCommon.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h index 7718e35a9d..dbfa033d1e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WanderAIUpdate.h @@ -27,6 +27,7 @@ // Author: Graham Smallwood, April 2002 #pragma once + #include "GameLogic/Module/AIUpdate.h" //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h index 99c2d131c8..ca6c583bc0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WaveGuideUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpdateModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h index 445b03e184..fc25099d38 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpdate.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h index 2df6100321..c8bc99561e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponBonusUpgrade.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h index 47c859a1ca..3604ce239b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WeaponSetUpgrade.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "GameLogic/Module/UpgradeModule.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h index 286247c666..afc308ccf6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Module/WorkerAIUpdate.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/StateMachine.h" #include "GameLogic/Module/AIUpdate.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h index c91ddf23ed..10f614c047 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Object.h @@ -27,6 +27,7 @@ // Author: Michael S. Booth, October 2000 #pragma once + #include "Lib/BaseType.h" #include "ref_ptr.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h index 05e6410ea6..d29b0f581b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectCreationList.h @@ -31,6 +31,7 @@ // All OCLs return the first object that is created (or NULL if not applicable). #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameMemory.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h index a678259176..6ef3f32d58 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectIter.h @@ -27,6 +27,7 @@ // Author: Steven Johnson, September 2001 #pragma once + #include "Common/GameType.h" #include "Common/GameMemory.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h index b216c3904a..975f48096f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectScriptStatusBits.h @@ -27,6 +27,7 @@ // JKMCD Aug 2002 #pragma once + //------------------------------------------------------------------------------------------------- /** Object status bits */ //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h index 31d122cede..f618852691 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ObjectTypes.h @@ -28,6 +28,7 @@ // DO NOT DISTRIBUTE #pragma once + #include "Common/AsciiString.h" #include "Common/Snapshot.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h index 352a25cd8d..978b04950f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/PartitionManager.h @@ -45,6 +45,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/PolygonTrigger.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/PolygonTrigger.h index 39b9f4ee8e..39ef5273f2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/PolygonTrigger.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/PolygonTrigger.h @@ -32,6 +32,7 @@ // Author: John Ahlquist, November 2001 #pragma once + #include "Common/GameMemory.h" #include "Common/Snapshot.h" #include "Common/STLTypedefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Powers.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Powers.h index f94dadb72f..5473296795 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Powers.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Powers.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // // skeleton definition of unit powers // diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/RankInfo.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/RankInfo.h index d286880628..3576c0c03e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/RankInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/RankInfo.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Science.h" #include "Common/UnicodeString.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h index dc7ff350b2..c849fb5fa8 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptActions.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + class ScriptAction; class GameWindow; class Team; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h index 29eb898da1..28d7e5bcf7 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptConditions.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + class Condition; class ObjectTypes; class Parameter; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h index f093cbf052..fe237cbcee 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/ScriptEngine.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameType.h" #include "Common/GameMemory.h" #include "Common/STLTypedefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h index 2151d52430..3b928470bd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Scripts.h @@ -28,6 +28,7 @@ // Author: John Ahlquist, November 2001 #pragma once + #include "Common/Snapshot.h" #include "GameNetwork/NetworkDefs.h" #include "Common/ObjectStatusTypes.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/SidesList.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/SidesList.h index 8a5dbb85b4..82ed837e4a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/SidesList.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/SidesList.h @@ -28,6 +28,7 @@ // Author: John Ahlquist, November 2001 #pragma once + #include "Common/Dict.h" #include "Common/Errors.h" #include "Common/GameType.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Squad.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Squad.h index c91c09f528..586f695b2b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Squad.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Squad.h @@ -38,6 +38,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/Snapshot.h" #include "Common/GameMemory.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h index de0da81554..e02d9192eb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/TerrainLogic.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameMemory.h" #include "Common/Snapshot.h" #include "Common/STLTypedefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h index 5aa9dfeaa9..30aa1d34cf 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h @@ -27,6 +27,7 @@ // Simple turret behavior #pragma once + #include "Common/StateMachine.h" #include "Common/GameMemory.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h index 92965f3862..adf651bda6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/VictoryConditions.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, February 2002 #pragma once + #include "Common/SubsystemInterface.h" #include "Lib/BaseType.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h index 1d957032d6..f6e45876c2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/Weapon.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/AudioEventRTS.h" #include "Common/GameCommon.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h index 97a0be1a72..39d26fb0d1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponBonusConditionFlags.h @@ -27,4 +27,5 @@ // JKMCD Aug 2002 #pragma once + typedef UnsignedInt WeaponBonusConditionFlags; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h index 58aa1e6299..75ad9b72df 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSet.h @@ -25,6 +25,7 @@ // WeaponSet.h #pragma once + #include "Lib/BaseType.h" #include "Common/GameType.h" #include "Common/KindOf.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h index 2a5e596de8..aede477042 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetFlags.h @@ -27,6 +27,7 @@ // JKMCD Aug 2002 #pragma once + #include "GameLogic/WeaponSetType.h" typedef BitFlags WeaponSetFlags; diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h index 1653ea0c2f..50b999c0b2 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponSetType.h @@ -27,6 +27,7 @@ // JKMCD Aug 2002 #pragma once + //------------------------------------------------------------------------------------------------- // IMPORTANT NOTE: you should endeavor to set up states such that the most "normal" // state is defined by the bit being off. That is, the typical "normal" condition diff --git a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h index e8fb22e7a8..be8e86c186 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h +++ b/GeneralsMD/Code/GameEngine/Include/GameLogic/WeaponStatus.h @@ -27,6 +27,7 @@ // JKMCD Aug 2002 #pragma once + enum WeaponStatus CPP_11(: Int) { READY_TO_FIRE, diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/Connection.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/Connection.h index f23b9ae20f..660a3dcfbb 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/Connection.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/Connection.h @@ -34,6 +34,7 @@ */ #pragma once + #include "GameNetwork/NetCommandList.h" #include "GameNetwork/User.h" #include "GameNetwork/Transport.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/ConnectionManager.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/ConnectionManager.h index 8b189ca140..98b98fe36e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/ConnectionManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/ConnectionManager.h @@ -28,6 +28,7 @@ */ #pragma once + #include "GameNetwork/Connection.h" #include "GameNetwork/NetCommandList.h" #include "GameNetwork/Transport.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/DisconnectManager.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/DisconnectManager.h index 5216ebf63e..cfc1fb952e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/DisconnectManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/DisconnectManager.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "GameNetwork/NetCommandRef.h" #include "Lib/BaseType.h" //#include "GameNetwork/ConnectionManager.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/DownloadManager.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/DownloadManager.h index e72ae50976..c4a52edf47 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/DownloadManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/DownloadManager.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, July 2002 #pragma once + #include "WWDownload/downloaddefs.h" #include "WWDownload/Download.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FileTransfer.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FileTransfer.h index cb0edd47c3..474599405f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FileTransfer.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FileTransfer.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////// #pragma once + class GameInfo; // Convenience functions diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h index 5700db7197..06e005789f 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FirewallHelper.h @@ -47,6 +47,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + class UDP; #define NUM_TEST_PORTS 4 diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h index 34849917ec..aa0427967e 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameData.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "Lib/BaseType.h" #include "GameNetwork/NetCommandList.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameDataManager.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameDataManager.h index bf6af83710..1ad6055da0 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameDataManager.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameDataManager.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "GameNetwork/NetworkDefs.h" #include "GameNetwork/FrameData.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameMetrics.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameMetrics.h index 1b687b9812..4a77c0f09d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameMetrics.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/FrameMetrics.h @@ -25,6 +25,7 @@ /** FrameMetrics.h */ #pragma once + #include "Lib/BaseType.h" #include "GameNetwork/NetworkDefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GUIUtil.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GUIUtil.h index 340c1a67a9..2d00645cb1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GUIUtil.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GUIUtil.h @@ -26,6 +26,7 @@ // Author: Matthew D. Campbell, Sept 2002 #pragma once + class GameWindow; class GameInfo; diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h index c8b02f997c..923641a3b1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameInfo.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, December 2001 #pragma once + #include "Common/Snapshot.h" #include "Common/Money.h" #include "GameNetwork/NetworkDefs.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 403e065178..b6522cba40 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyDefs.h @@ -27,5 +27,6 @@ // Author: Matthew D. Campbell, July 2002 #pragma once + void HandleBuddyResponses(void); void PopulateOldBuddyMessages(void); diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h index c79bbc73e7..de175b0e84 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/BuddyThread.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, June 2002 #pragma once + #include "gamespy/gp/gp.h" #define MAX_BUDDY_CHAT_LEN 128 diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h index 79b1c1224a..81b4207167 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GSConfig.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/AsciiString.h" #include "Common/STLTypedefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h index 2d88a24541..d437f58ce5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/GameResultsThread.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, August 2002 #pragma once + #include "Common/SubsystemInterface.h" // this class encapsulates a request for the thread diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h index 8fecd364ba..e59aebbd5d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LadderDefs.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, August 2002 #pragma once + #include "Common/UnicodeString.h" #include "Common/AsciiString.h" #include "Common/STLTypedefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h index 2cbde6f59a..d881d474e4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/LobbyUtils.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, Sept 2002 #pragma once + class GameWindow; GameWindow *GetGameListBox( void ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h index 44b675d4d6..44ca5bda7b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/MainMenuUtils.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + void HTTPThinkWrapper( void ); void StopAsyncDNSCheck( void ); void StartPatchCheck( void ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h index 5a48ac858d..41332be23a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefs.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, June 2002 #pragma once + #include "gamespy/peer/peer.h" #include "gamespy/gp/gp.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h index 9abbef670a..470879d939 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerDefsImplementation.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, Sept 2002 #pragma once + #include "GameNetwork/GameSpy/PeerDefs.h" #include "GameNetwork/GameSpy/PersistentStorageThread.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h index b1f7985506..5178e7d36b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PeerThread.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, June 2002 #pragma once + #include "gamespy/peer/peer.h" #include "GameNetwork/NetworkDefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h index a5920126ef..f039a0b2ab 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageDefs.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, July 2002 #pragma once + enum LocaleType CPP_11(: Int) { LOC_UNKNOWN = 0, diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h index 1496edca10..d2fa080cd4 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PersistentStorageThread.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, July 2002 #pragma once + #include "gamespy/gstats/gpersist.h" #define MAX_BUDDY_CHAT_LEN 128 diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h index f62ea3c355..df2f7f35c1 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/PingThread.h @@ -28,6 +28,7 @@ // Note: adapted from WOLAPI #pragma once + // this class encapsulates a request for the thread class PingRequest { diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h index 3e38c07c51..31ab279b7b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/StagingRoomGameInfo.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, Sept 2002 #pragma once + #include "GameNetwork/GameInfo.h" #include "GameNetwork/Transport.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h index 569eeee005..0db2a8df67 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpy/ThreadUtils.h @@ -27,5 +27,6 @@ // Author: Matthew D. Campbell, July 2002 #pragma once + std::wstring MultiByteToWideCharSingleLine( const char *orig ); std::string WideCharStringToMultiByte( const WideChar *orig ); diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyChat.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyChat.h index 6a50c2756a..cf149df174 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyChat.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyChat.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, February 2002 #pragma once + #include "gamespy/peer/peer.h" class GameWindow; diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGP.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGP.h index 49045b0890..6ce6092a55 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGP.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyGP.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, March 2002 #pragma once + #include "gamespy/gp/gp.h" void GPRecvBuddyRequestCallback(GPConnection * connection, GPRecvBuddyRequestArg * arg, void * param); diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h index a37990b2e7..b6dd903594 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyOverlay.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, March 2002 #pragma once + #include "Common/NameKeyGenerator.h" #include "GameClient/WindowLayout.h" #include "GameClient/Gadget.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyThread.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyThread.h index 63801de3ed..82434da418 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyThread.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/GameSpyThread.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, March 2002 #pragma once + #include "mutex.h" #include "thread.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/IPEnumeration.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/IPEnumeration.h index 67188ac578..df84a5d652 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/IPEnumeration.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/IPEnumeration.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, October 2001 #pragma once + #include "GameNetwork/Transport.h" /** diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPI.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPI.h index 126078167c..34a132c0ac 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPI.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPI.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, October 2001 #pragma once + #include "GameNetwork/Transport.h" #include "GameNetwork/NetworkInterface.h" #include "GameNetwork/NetworkDefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h index 9252ee3477..394b75dedd 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANAPICallbacks.h @@ -27,7 +27,9 @@ // Author: Chris Huybregts, October 2001 // Description: LAN API Callbacks header /////////////////////////////////////////////////////////////////////////////////////// + #pragma once + #include "Common/NameKeyGenerator.h" #include "GameClient/Shell.h" #include "GameClient/GadgetListBox.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANGameInfo.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANGameInfo.h index b0cf8a2b0a..0e4cb66323 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANGameInfo.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/LANGameInfo.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, December 2001 #pragma once + #include "GameNetwork/GameInfo.h" #include "GameNetwork/LANPlayer.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NAT.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NAT.h index 9110d12c34..b5eb44c959 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NAT.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NAT.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Lib/BaseType.h" #include "GameNetwork/NetworkInterface.h" #include "GameNetwork/FirewallHelper.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandList.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandList.h index 4a5df036eb..21aa6ff733 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandList.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandList.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "Common/GameMemory.h" #include "GameNetwork/NetCommandRef.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h index 10fbe10d62..6f47b794ca 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandMsg.h @@ -27,6 +27,7 @@ // are queued up to execute at a later time #pragma once + #include "Lib/BaseType.h" #include "GameNetwork/NetworkDefs.h" #include "Common/UnicodeString.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandRef.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandRef.h index 5183ecd98a..33e0d46b2d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandRef.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandRef.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "GameNetwork/NetCommandMsg.h" #include "Common/GameMemory.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h index b549624c45..f4ea0bed06 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetCommandWrapperList.h @@ -26,6 +26,7 @@ // Bryan Cleveland #pragma once + #include "GameNetwork/NetCommandList.h" class NetCommandWrapperListNode : public MemoryPoolObject diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetPacket.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetPacket.h index 77d44c2d05..f117df083a 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetPacket.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetPacket.h @@ -32,10 +32,10 @@ for the data, but at least that wouldn't be repeating code, that would be specialized code. */ - - #pragma once + #include "NetworkDefs.h" + #include "GameNetwork/NetCommandList.h" #include "Common/MessageStream.h" #include "Common/GameMemory.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h index 5b5afa8baa..171f33df3d 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkDefs.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "Lib/BaseType.h" #include "Common/MessageStream.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkInterface.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkInterface.h index 5c8be7d4fb..c0bf655eb6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkInterface.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/NetworkInterface.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, July 2001 #pragma once + #include "Common/MessageStream.h" #include "GameNetwork/ConnectionManager.h" #include "GameNetwork/User.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/RankPointValue.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/RankPointValue.h index 58ec00895b..a2f616a2f5 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/RankPointValue.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/RankPointValue.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/Transport.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/Transport.h index 60f32e6607..747f9d475b 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/Transport.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/Transport.h @@ -27,6 +27,7 @@ // Author: Matthew D. Campbell, July 2001 #pragma once + #include "GameNetwork/udp.h" #include "GameNetwork/NetworkDefs.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/User.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/User.h index 415c7e5113..0f69b8fea9 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/User.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/User.h @@ -27,6 +27,7 @@ */ #pragma once + #include "GameNetwork/NetworkDefs.h" #include "Common/UnicodeString.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h index eac6e0beb8..e87de2eb6c 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/FEBDispatch.h @@ -26,7 +26,9 @@ // FEBDispatch class is a template class which, when inherited from, can implement the // IDispatch for a COM object with a type library. // + #pragma once + #include extern CComModule _Module; #include diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h index 2a499cfb62..0338aad5aa 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/WOLBrowser/WebBrowser.h @@ -41,6 +41,7 @@ ******************************************************************************/ #pragma once + #include "Common/SubsystemInterface.h" #include #include diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/networkutil.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/networkutil.h index 3bc9145384..944e2ce0a6 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/networkutil.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/networkutil.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "GameNetwork/NetworkDefs.h" #include "GameNetwork/NetworkInterface.h" diff --git a/GeneralsMD/Code/GameEngine/Include/GameNetwork/udp.h b/GeneralsMD/Code/GameEngine/Include/GameNetwork/udp.h index 8742f8021e..fa97d0e130 100644 --- a/GeneralsMD/Code/GameEngine/Include/GameNetwork/udp.h +++ b/GeneralsMD/Code/GameEngine/Include/GameNetwork/udp.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #ifdef _UNIX #include #endif diff --git a/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h b/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h index 3539149c13..2d9fd88a3a 100644 --- a/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h +++ b/GeneralsMD/Code/GameEngine/Include/Precompiled/PreRTS.h @@ -25,7 +25,9 @@ // This file contains all the header files that shouldn't change frequently. // Be careful what you stick in here, because putting files that change often in here will // tend to cheese people's goats. + #pragma once + //----------------------------------------------------------------------------- // srj sez: this must come first, first, first. #define _STLP_USE_NEWALLOC 1 diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h index deea913eb0..6ad2a55fbb 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DConvert.h @@ -40,6 +40,7 @@ //============================================================================= #pragma once + //============================================================================= // Includes //============================================================================= diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h index 32d6a2a445..71e3dd5c47 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DFunctionLexicon.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/FunctionLexicon.h" //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h index ebc4abde4b..141457eafe 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DModuleFactory.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ModuleFactory.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h index 6e6625588d..193d755f68 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DRadar.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/Radar.h" #include "WW3D2/ww3dformat.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h index 9bbf68c366..b248a03fa9 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/Common/W3DThingFactory.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// #include "Common/ThingFactory.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h index 220bb74506..ade37299a4 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/BaseHeightMap.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "always.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h index b3134d2048..cebe16170a 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/FlatHeightMap.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "always.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h index 726b70d17a..7491d7333b 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/HeightMap.h @@ -22,7 +22,6 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once #include "always.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h index d4b8b28ae9..4c79a24677 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDebrisDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/DrawModule.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h index c57d5a7264..647d7379bf 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDefaultDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/GameType.h" #include "Common/DrawModule.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h index 0445a4a451..c6048a8ca7 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DDependencyModelDraw.h @@ -33,6 +33,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h index ec325cd983..45d468e3cc 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DLaserDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" //#include "WW3D2/Line3D.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h index ec1d0a40e2..32bdbc4a53 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DModelDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/ModelState.h" #include "Common/DrawModule.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h index aeda4372f1..b66926f960 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordAircraftDraw.h @@ -35,6 +35,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h index c3d45ced3a..72a3980959 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTankDraw.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DTankDraw.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h index 982486c86e..b20059f833 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DOverlordTruckDraw.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DTruckDraw.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h index 93dba22395..db3c632815 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPoliceCarDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "W3DDevice/GameClient/Module/W3DTruckDraw.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h index 7c40517d0c..6d559dd578 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DProjectileStreamDraw.h @@ -28,6 +28,7 @@ ///////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "GameLogic/Module/ProjectileStreamUpdate.h" // I am the draw module for this update. Very tight. diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h index eb680c3902..7222c39287 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DPropDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h index ccfc211053..2756e82c28 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DRopeDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h index c991631056..fac32b29a6 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DScienceModelDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h index 95189e4c4f..46b41a8617 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DSupplyDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "W3DDevice/GameClient/Module/W3DModelDraw.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h index a6d5d392ae..2c659194a9 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "GameClient/ParticleSys.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h index 6a626f8ef8..5bfc523f4a 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTankTruckDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "Common/AudioEventRTS.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h index 5e093a02d2..cfbb2f81ba 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTracerDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h index 4a467a14d8..9f0a0b3b7a 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTreeDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "WW3D2/line3d.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h index e01b698718..72e8d49bee 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/Module/W3DTruckDraw.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include "Common/DrawModule.h" #include "Common/AudioEventRTS.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h index d8806f55c4..36af8873d0 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TerrainTex.h @@ -27,6 +27,7 @@ // Author: John Ahlquist, April 2001 #pragma once + //#define DO_8STAGE_TERRAIN_PASS //optimized terrain rendering for Nvidia based cards #include "WW3D2/texture.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h index 2f45d0e0ad..b48b704b13 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/TileData.h @@ -27,6 +27,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include #include "Lib/BaseType.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h index 7bc63dca84..e987096c35 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManager.h @@ -43,6 +43,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "assetmgr.h" #include "Lib/BaseType.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h index 770b2ced96..d135069d0e 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DAssetManagerExposed.h @@ -38,6 +38,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// // DEFINES //////////////////////////////////////////////////////////////////// // TYPE DEFINES /////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h index 911ab74686..0d900feee8 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBibBuffer.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h index 54c55dd179..12531a7d12 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBridgeBuffer.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h index 9fa6b11ee9..dbe3f4c491 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DBufferManager.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Lib/BaseType.h" #include "dx8vertexbuffer.h" #include "dx8indexbuffer.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h index e8f08648c7..0a1037a1c1 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomEdging.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h index f5ca82e372..c92e08077a 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DCustomScene.h @@ -23,6 +23,7 @@ //////////////////////////////////////////////////////////////////////////////// #pragma once + enum CustomScenePassModes CPP_11(: Int) { SCENE_PASS_DEFAULT, diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h index 36e2199188..0bce9582b3 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDebugIcons.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "always.h" #include "rendobj.h" #include "vertmaterial.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h index d462698ab0..7f5ad9f174 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplay.h @@ -32,6 +32,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameClient/Display.h" #include "WW3D2/lightenvironment.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h index 0fad6c6e6d..69b4c8acf8 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayString.h @@ -46,6 +46,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h index 1ea7f3f044..2c1e775d65 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDisplayStringManager.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameClient/DisplayStringManager.h" #include "W3DDevice/GameClient/W3DDisplayString.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h index b839754da3..4039f98281 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DDynamicLight.h @@ -27,6 +27,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "WW3D2/light.h" #include "Lib/BaseType.h" class HeightMapRenderObjClass; diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h index fa5b5441fb..118b2307f6 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DFileSystem.h @@ -31,8 +31,8 @@ // /////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "WWLib/ffactory.h" #include "Common/ArchiveFileSystem.h" #include "Common/file.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h index bd9a52b39a..7a31839f3d 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGUICallbacks.h @@ -29,6 +29,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + class GameWindow; class WindowLayout; class WinInstanceData; diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h index 638efee2a8..f64935057f 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGadget.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h index 3ac31b03be..8e9060e82b 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameClient.h @@ -33,6 +33,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h index 363bb580e5..275d243bfd 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameFont.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h index fcf6e9f232..8895e0ecc8 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindow.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h index 41f2dc9f10..02e98a219f 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DGameWindowManager.h @@ -30,6 +30,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameClient/GameWindowManager.h" #include "W3DDevice/GameClient/W3DGameWindow.h" #include "W3DDevice/GameClient/W3DGadget.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h index 7c316b00d2..d717b02845 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DInGameUI.h @@ -32,6 +32,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h index 28af98d024..1b3e8b0b01 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMirror.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "always.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h index d4be8942af..e5e3a4c7f1 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DMouse.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h index 7fe8547adc..ac77c87cc4 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DParticleSys.h @@ -26,6 +26,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameClient/ParticleSys.h" #include "WW3D2/pointgr.h" #include "WW3D2/streak.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h index a1701db9f5..06ed0a7b94 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPoly.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "vector3.h" #include "plane.h" #include "simplevec.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h index 48a3eb5fed..e7b60c82a8 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DProjectedShadow.h @@ -30,7 +30,9 @@ // // /////////////////////////////////////////////////////////////////////////////// + #pragma once + #include "GameClient/Shadow.h" class W3DShadowTexture; //forward reference diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPropBuffer.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPropBuffer.h index db60c52fe8..bab5e660b7 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPropBuffer.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DPropBuffer.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h index f39c25ecbe..fd4d16727f 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DRoadBuffer.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h index 299ccb9ec2..b824cc12e8 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DScene.h @@ -32,6 +32,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h index 699b4dd05c..bea0a432d5 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShaderManager.h @@ -32,6 +32,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + #include "WW3D2/texture.h" enum FilterTypes CPP_11(: Int); enum FilterModes CPP_11(: Int); diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShadow.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShadow.h index 755c667955..df0e5d4d01 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShadow.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShadow.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "matrix4.h" #include "GameClient/Shadow.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShroud.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShroud.h index a187237649..587f65afa6 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShroud.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DShroud.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "WW3D2/matpass.h" #include "WW3D2/dx8wrapper.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSmudge.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSmudge.h index d65cdec4fb..22ef380299 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSmudge.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSmudge.h @@ -19,6 +19,7 @@ // FILE: W3DSmudge.h ///////////////////////////////////////////////////////// #pragma once + #include "GameClient/Smudge.h" #include "sharebuf.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h index 88a57289ca..e4a4235196 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DSnow.h @@ -17,7 +17,9 @@ */ // FILE: W3DSnow.h ///////////////////////////////////////////////////////// + #pragma once + #include "GameClient/Snow.h" class DX8IndexBufferClass; diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DStatusCircle.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DStatusCircle.h index 4d44f207e1..70860e2e58 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DStatusCircle.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DStatusCircle.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "always.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainBackground.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainBackground.h index 5cc68c3fe4..0dda7d483f 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainBackground.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainBackground.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h index 42a5757e65..f1477731bd 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainTracks.h @@ -23,6 +23,7 @@ //////////////////////////////////////////////////////////////////////////////// #pragma once + #include "always.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h index cd92ba88fb..35046b9a59 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTerrainVisual.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameClient/TerrainVisual.h" #include "W3DDevice/GameClient/W3DWater.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h index 22e05f049f..736c52f9a4 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DTreeBuffer.h @@ -43,6 +43,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h index bbf5936e6e..df1dc76879 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DView.h @@ -33,6 +33,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h index d1823bcbc6..2208d9e6fb 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DVolumetricShadow.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + #include "matrix4.h" #include "W3DDevice/GameClient/W3DBufferManager.h" #include "GameClient/Shadow.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h index 376d12103b..b8e9900c83 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWater.h @@ -25,6 +25,7 @@ // FILE: W3DWater.h /////////////////////////////////////////////////// #pragma once + #include "always.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h index a06ff7be54..7ca19b39fb 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaterTracks.h @@ -22,8 +22,8 @@ // // //////////////////////////////////////////////////////////////////////////////// - #pragma once + enum waveType CPP_11(: Int); //forward reference /// Custom render object that draws animated tracks/waves on the water. diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h index 9bebac2023..c1ed235461 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWaypointBuffer.h @@ -49,6 +49,7 @@ //----------------------------------------------------------------------------- #pragma once + //----------------------------------------------------------------------------- // Includes //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h index b1c26fb144..ec5b778498 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/W3DWebBrowser.h @@ -26,6 +26,7 @@ // July 2002, Bryan Cleveland #pragma once + #include "GameNetwork/WOLBrowser/WebBrowser.h" class TextureClass; diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h index 100b4fdf8b..dda02da96b 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/WorldHeightMap.h @@ -28,6 +28,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Lib/BaseType.h" #include "WWLib/refcount.h" #include "WWMath/vector3.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/camerashakesystem.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/camerashakesystem.h index e9ca04e33c..48e6bfe604 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/camerashakesystem.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameClient/camerashakesystem.h @@ -35,6 +35,7 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once #include "always.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h index 1106b94fc3..c6bb4f4c7f 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGameLogic.h @@ -32,6 +32,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h index 24a89eb00f..9974f59d49 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DGhostObject.h @@ -28,6 +28,7 @@ // Author: Mark Wilczynski, August 2002 #pragma once + #include "GameLogic/GhostObject.h" #include "Lib/BaseType.h" #include "Common/GameCommon.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DTerrainLogic.h b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DTerrainLogic.h index f424ffee6d..3ca892e818 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DTerrainLogic.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/W3DDevice/GameLogic/W3DTerrainLogic.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "GameLogic/TerrainLogic.h" //------------------------------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h index c5a17ec814..c2ab18a95e 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/Common/Win32GameEngine.h @@ -31,6 +31,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include "Common/GameEngine.h" #include "GameLogic/GameLogic.h" #include "GameNetwork/NetworkInterface.h" diff --git a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h index f7171a46d2..57894924d3 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIKeyboard.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #ifndef DIRECTINPUT_VERSION # define DIRECTINPUT_VERSION 0x800 diff --git a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h index 11798a025b..25d769ed58 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32DIMouse.h @@ -38,6 +38,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #ifndef DIRECTINPUT_VERSION # define DIRECTINPUT_VERSION 0x800 diff --git a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h index 79a498db2f..acd55b8d34 100644 --- a/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h +++ b/GeneralsMD/Code/GameEngineDevice/Include/Win32Device/GameClient/Win32Mouse.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/Libraries/Include/Lib/BaseType.h b/GeneralsMD/Code/Libraries/Include/Lib/BaseType.h index aeb492274b..0a2c026728 100644 --- a/GeneralsMD/Code/Libraries/Include/Lib/BaseType.h +++ b/GeneralsMD/Code/Libraries/Include/Lib/BaseType.h @@ -26,6 +26,7 @@ /////////////////////////////////////////////////////////////////////////////// // tell the compiler to only load this file once + #pragma once #include "Lib/BaseTypeCore.h" diff --git a/GeneralsMD/Code/Libraries/Include/Lib/trig.h b/GeneralsMD/Code/Libraries/Include/Lib/trig.h index 705e24ee6a..d6f3fa22cd 100644 --- a/GeneralsMD/Code/Libraries/Include/Lib/trig.h +++ b/GeneralsMD/Code/Libraries/Include/Lib/trig.h @@ -20,7 +20,9 @@ // fast trig functions // Author: Sondra Iverson, March 1998 // Converted to Generals by Matthew D. Campbell, February 2002 + #pragma once + Real Sin(Real); Real Cos(Real); Real Tan(Real); diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h index 5c577cf1c9..b3b2584263 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/aabtreebuilder.h @@ -36,8 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "vector3.h" #include "Vector3i.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h index 0136702e2e..1fd4717ce4 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h @@ -39,6 +39,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "composite.h" #include "htree.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h index 2054efde76..0f5d19a85a 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "Vector.H" #include "htreemgr.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h index 1de3f0e120..abf993dd32 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "dynamesh.h" class Bitmap2DObjClass : public DynamicScreenMeshClass diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h index 95ced09770..5a93e0e1c1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h @@ -35,6 +35,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h index 1fc0fc5fd8..8766dea3a1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h @@ -44,6 +44,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "rendobj.h" #include "plane.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h index 571816e40c..24d3877940 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h @@ -17,6 +17,7 @@ */ #pragma once + #include "always.h" #include "vector3.h" #include "matrix3d.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h index fa162d9567..4ac4e73a2e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h @@ -17,6 +17,7 @@ */ // 08/06/02 KM Added cube map and volume texture support + #pragma once #include "always.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h index c9b418739a..734cccc323 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "bittype.h" #include "simplevec.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h index b95053cfcf..88a1dba262 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8caps.h @@ -38,6 +38,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "ww3dformat.h" #include diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h index 61a20ea50f..30098c9805 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8fvf.h @@ -39,8 +39,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include #ifdef WWDEBUG diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h index cff76f93e4..41c410388e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "wwdebug.h" #include "refcount.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h index 7f426f8e98..9b791652cc 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8renderer.h @@ -37,8 +37,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "wwstring.h" #include "simplevec.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h index 4836334c1d..555e654d70 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h @@ -36,8 +36,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" class StringClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h index 4eea8504e3..e9f07e55c8 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8texman.h @@ -38,6 +38,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "texture.h" #include "dx8wrapper.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h index 713cbde439..b198ec9ec8 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h @@ -38,6 +38,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "wwdebug.h" #include "refcount.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h index b816683990..b763a47880 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h @@ -40,6 +40,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "dllist.h" #include "d3d8.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h index f6e58b1a33..64d06c9045 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "hash.h" #include "wwstring.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h index aa2840b6fc..e899d592c1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #ifndef ANIMOBJ_H #include "animobj.h" #endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h index 67d2d96a01..6771abd756 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "hanim.h" #include "simplevec.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h index 2851dea881..9c549afe57 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "hanim.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h index b43a53812a..e1b747a507 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "bittype.h" #include "hashtemplate.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h index 6e4e284334..cb8396e5a5 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "rendobj.h" #include "w3derr.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h index 6c1dac5f8f..d804028726 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.h @@ -38,6 +38,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "vector3.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.h index cb06bd847a..1e37ea0cd4 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.h @@ -37,6 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "shader.h" #include "vector4.h" #include "vector3.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h index 0236033cb6..70eae24e3c 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h @@ -38,6 +38,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "refcount.h" #include "w3d_file.h" #include "w3derr.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.h index c7782a2904..5afda7388b 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matpass.h @@ -38,6 +38,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #ifndef REFCOUNT_H #include "refcount.h" #endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h index a0642e1835..13d2f8c846 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.h @@ -38,6 +38,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "bittype.h" #include "matrix4.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h index 0c8b497cb1..a2a9a16aba 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "rendobj.h" #include "bittype.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h index 5ad1b9ca27..8d64114a1f 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshbuild.h @@ -39,6 +39,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "vector2.h" #include "vector3.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h index 07b38bddb8..1c571f94a1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h @@ -35,7 +35,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "always.h" #include "refcount.h" #include "bittype.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h index 334ec6ffe4..d0bbc93eec 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.h @@ -35,7 +35,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "always.h" #include "vector2.h" #include "vector3.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h index e3dbd862d6..c94234d9e1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "vector2.h" #include "vector3.h" #include "vector4.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h index cf98568c79..354ac9c7f8 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/motchan.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "bittype.h" #include "w3d_file.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h index cfcd2ea653..cddecf8910 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #ifndef RENDOBJ_H #include "rendobj.h" #endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h index f9e7b481f0..95053db630 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h @@ -33,7 +33,9 @@ *-------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "rendobj.h" #include "pointgr.h" #include "seglinerenderer.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h index fda1f66711..42936478db 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h @@ -33,7 +33,9 @@ *-------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include "rendobj.h" #include "RANDOM.H" #include "part_buf.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h index deae8fb4b7..98b3b48726 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h @@ -32,7 +32,6 @@ * * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once #include "proto.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h index 7590197ab3..c9e02b89a3 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" //#include "simplevec.h" #include "Vector.H" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h index 9e8aac4e62..37e2be0337 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h @@ -37,7 +37,6 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once #include "always.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h index 995244b50b..50f8bbc128 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "refcount.h" #include "vector3.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.h index 7adf449ae8..aabc03bd0e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" class DX8Wrapper; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shdlib.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shdlib.h index 1109e03b9d..0307babe95 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shdlib.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shdlib.h @@ -35,7 +35,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #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. diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h index 6d4ef2430e..06f0b5e826 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h @@ -17,6 +17,7 @@ */ #pragma once + #include "always.h" class SortingNodeStruct; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texproject.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texproject.h index d2082affb1..0489220f64 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texproject.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texproject.h @@ -38,6 +38,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #pragma once + #include "always.h" #include "matrix3d.h" #include "matrix4.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.h index 77bddb8b41..f1130c9a15 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texture.h @@ -39,8 +39,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "refcount.h" #include "chunkio.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h index 24ca128d3c..3571471e4e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturefilter.h @@ -36,7 +36,9 @@ *---------------------------------------------------------------------------------------------* * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #ifndef DX8_WRAPPER_H //#include "dx8wrapper.h" #endif diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h index d5a2f30b08..465bcc367e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h @@ -17,6 +17,7 @@ */ // 08/07/02 KM Texture class redesign (revisited) + #pragma once #include "always.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h index ebe6d0841a..229fa48630 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "refcount.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h index efdaa8dd33..87a8623c58 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h @@ -35,8 +35,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "bittype.h" #include "iostruct.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h index 1d6c8fce16..b248548ebe 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h @@ -34,8 +34,8 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ - #pragma once + #include "always.h" #include "vector3.h" #include "layer.h" diff --git a/GeneralsMD/Code/Main/WinMain.h b/GeneralsMD/Code/Main/WinMain.h index a849536513..594964a79b 100644 --- a/GeneralsMD/Code/Main/WinMain.h +++ b/GeneralsMD/Code/Main/WinMain.h @@ -29,7 +29,9 @@ // Author: Colin Day, April 2001 // /////////////////////////////////////////////////////////////////////////////// + #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/DialogProc.h b/GeneralsMD/Code/Tools/GUIEdit/Include/DialogProc.h index f884a55e53..60a5473621 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/DialogProc.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/DialogProc.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h b/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h index e72b6c87b9..e021fdc3f0 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/EditWindow.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #include diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h index ddbe54cdbf..86122e9b6f 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEdit.h @@ -28,6 +28,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////////////////////////// #include #include diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditColor.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditColor.h index 5282666247..71fccd5568 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditColor.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditColor.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h index 0fbaa5d919..e7741c4016 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditDisplay.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h index 2b91458737..98e6f0f310 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/GUIEditWindowManager.h @@ -33,6 +33,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// #pragma once + #include #include "W3DDevice/GameClient/W3DGameWindowManager.h" diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h b/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h index 95c2b4f98e..8b319ef474 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/HierarchyView.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include #include diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h b/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h index b65b0c4cd1..dbbe51d888 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/LayoutScheme.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h b/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h index eb79e5d8b1..b584d35a44 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/Properties.h @@ -45,6 +45,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// // USER INCLUDES ////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/Tools/GUIEdit/Include/WinMain.h b/GeneralsMD/Code/Tools/GUIEdit/Include/WinMain.h index b1349ea682..051704cdd5 100644 --- a/GeneralsMD/Code/Tools/GUIEdit/Include/WinMain.h +++ b/GeneralsMD/Code/Tools/GUIEdit/Include/WinMain.h @@ -44,6 +44,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + // SYSTEM INCLUDES //////////////////////////////////////////////////////////// #include diff --git a/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.h b/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.h index 2e52a26dc3..8d99dc6c7f 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/CButtonShowColor.h @@ -17,6 +17,7 @@ */ #pragma once + #include "Lib/BaseType.h" class CButtonShowColor : public CButton 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 7783d1d8e1..347c65f152 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/EmissionTypePanels.h @@ -32,6 +32,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" #include "ISwapablePanel.h" diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ISwapablePanel.h b/GeneralsMD/Code/Tools/ParticleEditor/ISwapablePanel.h index 2bc1b01060..96b1255898 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/ISwapablePanel.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/ISwapablePanel.h @@ -33,6 +33,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + #include "Lib/BaseType.h" // INCLUDES /////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.h b/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.h index 9dcb1a034b..a8be3b1cd4 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/MoreParmsDialog.h @@ -32,6 +32,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" #include "Lib/BaseType.h" diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.h b/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.h index e3404af71e..cc285778c9 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/ParticleEditor.h @@ -18,6 +18,7 @@ // DebugWindow.h : main header file for the DEBUGWINDOW DLL // + #pragma once #ifndef __AFXWIN_H__ 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 cb70fcf8c6..3858e1256a 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/ParticleTypePanels.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/ParticleTypePanels.h @@ -32,6 +32,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + #include "Resource.h" #include "ISwapablePanel.h" diff --git a/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.h b/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.h index f2c79a276c..4b4875a37d 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/ShaderTypePanels.h @@ -32,6 +32,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// // DEFINES //////////////////////////////////////////////////////////////////// // TYPE DEFINES /////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h b/GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h index d185a970f0..a5879cdae3 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/StdAfx.h @@ -20,6 +20,7 @@ // or project specific include files that are used frequently, but // are changed infrequently // + #pragma once #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers diff --git a/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.h b/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.h index 801c0b8e20..ecc4ac0738 100644 --- a/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.h +++ b/GeneralsMD/Code/Tools/ParticleEditor/VelocityTypePanels.h @@ -32,6 +32,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Resource.h" #include "ISwapablePanel.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h index 2f10b8e909..c4a76c63e1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/AutoEdgeOutTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h index 988388d230..309efe287f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BaseBuildProps.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // BaseBuildProps.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h index ede9ce2fd6..d3a62b2121 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendEdgeTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h index 57ab610710..713b517da4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BlendMaterial.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // BlendMaterial.h : header file // 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 a69e28c9ee..7c767c82bb 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BrushTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildList.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildList.h index 858c2282d5..5136504304 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildList.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildList.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // BuildList.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h index 2586e1797e..f764a82e14 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/BuildListTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, Nov 2001 #pragma once + #include "Tool.h" #include "Common/AsciiString.h" #include "PickUnitDialog.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h index 4c3e479ca1..3685c56952 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CButtonShowColor.h @@ -17,6 +17,7 @@ */ #pragma once + class CButtonShowColor : public CButton { protected: diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h index 30b3632d8b..683e45cded 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CUndoable.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Lib/BaseType.h" #include "../../GameEngine/Include/Common/MapObject.h" #include "../../GameEngine/Include/Common/GameCommon.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h index 50020b93d1..3ba623f52d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CameraOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // CameraOptions.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h b/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h index 37db06cf25..8dd420e5c1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/CellWidth.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // CellWidth.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h index 1d208d07ab..974aeca6f8 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ContourOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ContourOptions.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h b/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h index baa4cf5d89..77ea5426b1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/DrawObject.h @@ -17,6 +17,7 @@ */ #pragma once + #include "always.h" #include "rendobj.h" #include "w3d_file.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h index 52ad4e481d..67c8affbb2 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditAction.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EditAction.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h index 7a4c5ccd44..56dd2efe3a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCondition.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EditCondition.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h index 344a4a20b0..1f007f9b47 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditCoordParameter.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EditCoordParameter.h : header file // #include "GameLogic/Scripts.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h index 2e46ecc096..b75952dfef 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditGroup.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EditGroup.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h index 6ea030292d..2f4c11394d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditObjectParameter.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EditObjectParameter.h : header file // #include "GameLogic/Scripts.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h index 7d463774e2..8141ef0df3 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EditParameter.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // EditParameter.h : header file // #include "GameLogic/Scripts.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h index fd1e91ea2d..30a2a22e6c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ExportScriptsOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ExportScriptsOptions.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h index 0d579c953a..90b25177a4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/EyedropperTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h index 65acc1316c..66ef13d917 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // brushoptions.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h index ef8632159e..c0617139f9 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FeatherTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /**************************************************************************/ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h index fb02db8012..dff1241e7a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // FenceOptions.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h index 26a9bd56cb..2ea16a9e35 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FenceTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; class MapObject; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h index fa7d877328..e33be6a576 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/FloodFillTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /************************************************************************** diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h index c99edf725b..7ea4d1f37b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/GlobalLightOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // GLOBALLIGHTOPTIONS.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h index f2e61f3ff3..27101c9733 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveOptions.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 diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h index 45d1e87ef8..cd69ab6eca 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/GroveTool.h @@ -20,6 +20,7 @@ // Author: John Ahlquist, May 2001 #pragma once + #include "Lib/BaseType.h" #include "Tool.h" #include "Common/MapObject.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h index 23a50bb430..fa47bbfa1c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/HandScrollTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, May 2001 #pragma once + #include "Tool.h" /************************************************************************** HandScrollTool diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h index 0334a26432..ad3cbad52a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ImpassableOptions.h @@ -16,8 +16,8 @@ ** along with this program. If not, see . */ - #pragma once + class ImpassableOptions : public CDialog { public: diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h b/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h index 9fad59c3eb..00a8c5f5aa 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/LayersList.h @@ -32,6 +32,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Common/AsciiString.h" #include diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h index 5fa20ff475..3e15583256 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/LightOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // LightOptions.h : header file // #include "OptionsPanel.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h index c8e7bd0835..e8081da8c4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MainFrm.h @@ -19,6 +19,7 @@ // MainFrm.h : interface of the CMainFrame class // ///////////////////////////////////////////////////////////////////////////// + #pragma once #include "Lib/BaseType.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MapPreview.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MapPreview.h index 3c149d9ab4..64c6676520 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MapPreview.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MapPreview.h @@ -38,6 +38,7 @@ /////////////////////////////////////////////////////////////////////////////// #pragma once + //----------------------------------------------------------------------------- // SYSTEM INCLUDES //////////////////////////////////////////////////////////// //----------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h index 3367b67195..d6e1517d69 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MapSettings.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // MapSettings.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h index f81377350f..973c9c285e 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // MeshMoldOptions.h : header file // #include "WBPopupSlider.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h index a81dea3a8e..66ed3e1c98 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MeshMoldTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, Oct. 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h index f307cf0baa..2d0ef585e2 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // MoundOptions.h : header file // #include "WBPopupSlider.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h index 2cf60229e2..5d28cfbf99 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MoundTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /************************************************************************* diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h b/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h index 511cf9a03e..ab80c80544 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/MyToolbar.h @@ -22,7 +22,6 @@ #pragma once - /************************************************************************* ** CellSizeToolBar ***************************************************************************/ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h index 3d2f11f828..3a37645625 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/NewHeightMap.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // NewHeightMap.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h index 981bb68721..94af9739d8 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ObjectOptions.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h index 34ebd9448b..70b5262e5c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectPreview.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ObjectPreview.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h index b8ccaac383..8e58449bba 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ObjectTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /*************************************************************************/ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h index edde9bd2e0..f43de286e7 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/OpenMap.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // OpenMap.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h b/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h index fc55b44b17..b105a97c9f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/OptionsPanel.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // OptionsPanel.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h index 8fe4a306ac..18ee6f3dd2 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/PickUnitDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // PickUnitDialog.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h index 30f652ff0f..4dd8dd1876 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/PointerTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "PolygonTool.h" class WorldHeightMapEdit; #include "../../GameEngine/Include/Common/MapObject.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h index 92a37bcd91..674709b8ef 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/PolygonTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, Nov. 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; class MapObject; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h index bb2d42870f..8137f0a91c 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RampOptions.h @@ -32,6 +32,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "OptionsPanel.h" #include "resource.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h index fb36ac590c..41f979d645 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RampTool.h @@ -32,6 +32,7 @@ /*---------------------------------------------------------------------------*/ #pragma once + // INCLUDES /////////////////////////////////////////////////////////////////// #include "Tool.h" // DEFINES //////////////////////////////////////////////////////////////////// diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h index 8857a61880..939e00a619 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // RoadOptions.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h index cf546fd395..1bae16e13d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RoadTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, June 2001 #pragma once + #include "Tool.h" #include "W3DDevice/GameClient/WorldHeightMap.h" class WorldHeightMapEdit; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h index 84c25dd9d2..38cf6e0ba8 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerOptions.h @@ -17,6 +17,7 @@ */ #pragma once + // RulerOptions.h : header file // #include "OptionsPanel.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h index 9b318d03f8..4d0ff121ec 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/RulerTool.h @@ -20,6 +20,7 @@ // Author: Mike Lytle, January 2003 #pragma once + #include "Tool.h" class RulerTool : public Tool diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h index 2e9a0ea138..553e42c649 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/SaveMap.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // SaveMap.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h index 56f411108e..8746d03995 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ScorchOptions.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h index 5bd81fb974..a644cc2343 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScorchTool.h @@ -20,6 +20,7 @@ // Author: Dennis Griffin, April 2002 #pragma once + #include "Tool.h" class WorldHeightMapEdit; class MapObject; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h index 715142dad4..284c6412db 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsFalse.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ScriptActionsFalse.h : header file // class Script; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h index ee20b0e73a..f10b085569 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptActionsTrue.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ScriptActionsTrue.h : header file // class Script; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h index e37037d137..7d8d9397ee 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptConditions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ScriptConditionsDlg.h : header file // class Script; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h index d9989f3bfd..3bebff4376 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ScriptDialog.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h index e7f0d24ddd..49d0b001de 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ScriptProperties.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ScriptProperties.h : header file // class Script; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h b/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h index 518e879a2e..1b6c2cba68 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/SelectMacrotexture.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // SelectMacrotexture.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h index 0c06c8087c..a4b742afa2 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/ShadowOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // ShadowOptions.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/SplashScreen.h b/GeneralsMD/Code/Tools/WorldBuilder/include/SplashScreen.h index 725908b7b0..f492f825f5 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/SplashScreen.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/SplashScreen.h @@ -16,8 +16,8 @@ ** along with this program. If not, see . */ - #pragma once + class SplashScreen : public CDialog { protected: diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/StdAfx.h b/GeneralsMD/Code/Tools/WorldBuilder/include/StdAfx.h index d66d9a836c..11f689c620 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/StdAfx.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/StdAfx.h @@ -20,6 +20,7 @@ // or project specific include files that are used frequently, but // are changed infrequently // + #pragma once #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h index d09982a31f..67134dedad 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamBehavior.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // TeamBehavior.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h index c51f7f88cb..a180fa298d 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamGeneric.h @@ -16,8 +16,8 @@ ** along with this program. If not, see . */ - #pragma once + class Dict; class TeamGeneric : public CPropertyPage diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h index 1e239fd12e..2fee1ad6b6 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamIdentity.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // TeamIdentity.h : header file // class Dict; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h index 9c7221c68d..bdf0bc025a 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TeamReinforcement.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // TeamReinforcement.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h index ee9963e970..98349d4ef4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainMaterial.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // terrainmaterial.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h index 1ba89d78f9..e2f5f6cca1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainModal.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // TerrainModal.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h index 2f853f72e5..d7174476e6 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TerrainSwatches.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // TerrainSwatches.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h index 4022fa3d83..c42d23e415 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/TileTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; /************************************************************************* diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h index 23691c5702..dcb2b9ead4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/Tool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Lib/BaseType.h" #include "Common/STLTypedefs.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h index 44a0957b7c..f67256a84f 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WBFrameWnd.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // WBFrameWnd.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h index 0c7bf809f0..e521aff4b8 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WBHeightMap.h @@ -17,6 +17,7 @@ */ #pragma once + #include "W3DDevice/GameClient/FlatHeightMap.h" #include "W3DDevice/GameClient/HeightMap.h" #define dont_USE_FLAT_HEIGHT_MAP // Use the origina height map for mission disk. jba. [4/15/2003] diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WBPopupSlider.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WBPopupSlider.h index 81fdb677ed..a5e4dc265b 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WBPopupSlider.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WBPopupSlider.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // WBPopupSliderButton.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h index 9cc7124d90..c748ad6fe1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WHeightMapEdit.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "W3DDevice/GameClient/WorldHeightMap.h" class DataChunkOutput; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h index 2ecc6c26cf..7d55f6c785 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // WaterOptions.h : header file // #include "WBPopupSlider.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h index 542f3b4857..65f1e142ae 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaterTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, Nov. 2001 #pragma once + #include "PolygonTool.h" class WorldHeightMapEdit; class MapObject; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h index 41cbf351c6..6934e7f6ba 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointOptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // WaypointOptions.h : header file // #include "OptionsPanel.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h index a5c1284edb..b6db067ffc 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WaypointTool.h @@ -21,6 +21,7 @@ // Author: John Ahlquist, April 2001 #pragma once + #include "Tool.h" class WorldHeightMapEdit; class MapObject; diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h index 2fffbf1986..90159d4c73 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilder.h @@ -18,6 +18,7 @@ // WorldBuilder.h : main header file for the WORLDBUILDER application // + #pragma once #ifndef __AFXWIN_H__ diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h index 21f54a7848..5ee67174cc 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderDoc.h @@ -19,6 +19,7 @@ // WorldBuilderDoc.h : interface of the CWorldBuilderDoc class // ///////////////////////////////////////////////////////////////////////////// + #pragma once #include "Lib/BaseType.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h index ec520cac7f..919d8522bd 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/WorldBuilderView.h @@ -19,6 +19,7 @@ // WorldBuilderView.h : interface of the CWorldBuilderView class // ///////////////////////////////////////////////////////////////////////////// + #pragma once #include "Lib/BaseType.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/addplayerdialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/addplayerdialog.h index ed2b4350ce..88d7b0ad09 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/addplayerdialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/addplayerdialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // addplayerdialog.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h b/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h index 1dd06c4786..251eceee38 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/brushoptions.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // brushoptions.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/euladialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/euladialog.h index 5ec0085945..1e9d912fad 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/euladialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/euladialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // euladialog.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h b/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h index f6de4030db..7494200872 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/mapobjectprops.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // mapobjectprops.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h b/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h index c0117ff43b..37f4a3c9f4 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/playerlistdlg.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // playerlistdlg.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/propedit.h b/GeneralsMD/Code/Tools/WorldBuilder/include/propedit.h index ab615655bf..a6a1781381 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/propedit.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/propedit.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // propedit.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h b/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h index 0e409e3d3f..ea4e3419f1 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/teamsdialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // teamsdialog.h : header file // diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h index bbdade43ff..60f9cdd642 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview.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 "Lib/BaseType.h" diff --git a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h index bdec268c29..95d71082e5 100644 --- a/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h +++ b/GeneralsMD/Code/Tools/WorldBuilder/include/wbview3d.h @@ -20,7 +20,9 @@ // WbView3d.h // Class to encapsulate height map. // Author: Steven Johnson, Aug 2001 + #pragma once + // wbview3d.h : header file // diff --git a/GeneralsMD/Code/Tools/wdump/FindDialog.h b/GeneralsMD/Code/Tools/wdump/FindDialog.h index 788381ced9..07e3f616b9 100644 --- a/GeneralsMD/Code/Tools/wdump/FindDialog.h +++ b/GeneralsMD/Code/Tools/wdump/FindDialog.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // FindDialog.h : header file // diff --git a/GeneralsMD/Code/Tools/wdump/chunk_d.h b/GeneralsMD/Code/Tools/wdump/chunk_d.h index 1f580ff532..8a06a4707c 100644 --- a/GeneralsMD/Code/Tools/wdump/chunk_d.h +++ b/GeneralsMD/Code/Tools/wdump/chunk_d.h @@ -19,7 +19,9 @@ // Chunk_D.h: interface for the ChunkData class. // ////////////////////////////////////////////////////////////////////// + #pragma once + class ChunkItem; class ChunkType { diff --git a/GeneralsMD/Code/Tools/wdump/mainfrm.h b/GeneralsMD/Code/Tools/wdump/mainfrm.h index 3ff7b487ad..9015bd9f31 100644 --- a/GeneralsMD/Code/Tools/wdump/mainfrm.h +++ b/GeneralsMD/Code/Tools/wdump/mainfrm.h @@ -19,6 +19,7 @@ // MainFrm.h : interface of the CMainFrame class // ///////////////////////////////////////////////////////////////////////////// + #pragma once class CMainFrame : public CFrameWnd diff --git a/GeneralsMD/Code/Tools/wdump/rawfilem.h b/GeneralsMD/Code/Tools/wdump/rawfilem.h index 39f03069c4..2dbb6ffd2f 100644 --- a/GeneralsMD/Code/Tools/wdump/rawfilem.h +++ b/GeneralsMD/Code/Tools/wdump/rawfilem.h @@ -37,7 +37,9 @@ * RawFileMClass::~RawFileMClass -- Default deconstructor for a file object. * * RawFileMClass::Is_Open -- Checks to see if the file is open or not. * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ + #pragma once + #include #include #include diff --git a/GeneralsMD/Code/Tools/wdump/stdafx.h b/GeneralsMD/Code/Tools/wdump/stdafx.h index 6c55227d5b..13957be316 100644 --- a/GeneralsMD/Code/Tools/wdump/stdafx.h +++ b/GeneralsMD/Code/Tools/wdump/stdafx.h @@ -20,6 +20,7 @@ // or project specific include files that are used frequently, but // are changed infrequently // + #pragma once #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers diff --git a/GeneralsMD/Code/Tools/wdump/wdeview.h b/GeneralsMD/Code/Tools/wdump/wdeview.h index f603a99228..5b280f8670 100644 --- a/GeneralsMD/Code/Tools/wdump/wdeview.h +++ b/GeneralsMD/Code/Tools/wdump/wdeview.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // WDView.h : header file // diff --git a/GeneralsMD/Code/Tools/wdump/wdlview.h b/GeneralsMD/Code/Tools/wdump/wdlview.h index 7a7d76e902..28fb9103dd 100644 --- a/GeneralsMD/Code/Tools/wdump/wdlview.h +++ b/GeneralsMD/Code/Tools/wdump/wdlview.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // WDLView.h : header file // diff --git a/GeneralsMD/Code/Tools/wdump/wdtview.h b/GeneralsMD/Code/Tools/wdump/wdtview.h index 476e80c3eb..37590e07f6 100644 --- a/GeneralsMD/Code/Tools/wdump/wdtview.h +++ b/GeneralsMD/Code/Tools/wdump/wdtview.h @@ -15,7 +15,9 @@ ** You should have received a copy of the GNU General Public License ** along with this program. If not, see . */ + #pragma once + // WDTView.h : header file // diff --git a/GeneralsMD/Code/Tools/wdump/wdump.h b/GeneralsMD/Code/Tools/wdump/wdump.h index bf633077ea..0cfc802e3b 100644 --- a/GeneralsMD/Code/Tools/wdump/wdump.h +++ b/GeneralsMD/Code/Tools/wdump/wdump.h @@ -18,6 +18,7 @@ // wdump.h : main header file for the WDUMP application // + #pragma once #ifndef __AFXWIN_H__ diff --git a/GeneralsMD/Code/Tools/wdump/wdumpdoc.h b/GeneralsMD/Code/Tools/wdump/wdumpdoc.h index eb4fa263a7..5a6c941574 100644 --- a/GeneralsMD/Code/Tools/wdump/wdumpdoc.h +++ b/GeneralsMD/Code/Tools/wdump/wdumpdoc.h @@ -19,6 +19,7 @@ // wdumpDoc.h : interface of the CWdumpDoc class // ///////////////////////////////////////////////////////////////////////////// + #pragma once #include "chunk_d.h" diff --git a/GeneralsMD/Code/Tools/wdump/wdview.h b/GeneralsMD/Code/Tools/wdump/wdview.h index f470d76e7a..de270893e5 100644 --- a/GeneralsMD/Code/Tools/wdump/wdview.h +++ b/GeneralsMD/Code/Tools/wdump/wdview.h @@ -19,6 +19,7 @@ // wdumpView.h : interface of the CWdumpView class // ///////////////////////////////////////////////////////////////////////////// + #pragma once class CWdumpView : public CView 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() From 39978be1054d9dda249acb03709592356fd9631d Mon Sep 17 00:00:00 2001 From: Bart Roossien Date: Thu, 23 Oct 2025 22:21:20 +0200 Subject: [PATCH 5/5] Fix: Removed an unnecessary backslash causing compiler error in VC6. --- .../Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h index 914ac836df..b90eb038f9 100644 --- a/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h +++ b/Core/Libraries/Source/WWVegas/WWSaveLoad/simpledefinitionfactory.h @@ -77,4 +77,4 @@ SimpleDefinitionFactoryClass::Get_Class_ID (void) const #define DECLARE_DEFINITION_FACTORY(_class, _id, _name) \ char _class ## Name[] = _name; \ -SimpleDefinitionFactoryClass<_class, _id, _class ## Name> \ +SimpleDefinitionFactoryClass<_class, _id, _class ## Name>