Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 0 additions & 5 deletions Core/GameEngine/Include/Common/ArchiveFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@

#pragma once

#ifndef __ARCHIVEFILE_H
#define __ARCHIVEFILE_H

#include "Lib/BaseType.h"
#include "Common/AsciiString.h"
#include "Common/ArchiveFileSystem.h"
Expand Down Expand Up @@ -73,5 +70,3 @@ class ArchiveFile
File *m_file; ///< file pointer to the archive file on disk. Kept open so we don't have to continuously open and close the file all the time.
DetailedArchivedDirectoryInfo m_rootDirectory;
};

#endif // __ARCHIVEFILE_H
5 changes: 0 additions & 5 deletions Core/GameEngine/Include/Common/ArchiveFileSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@

#pragma once

#ifndef __ARCHIVEFILESYSTEM_H_
#define __ARCHIVEFILESYSTEM_H_

#define MUSIC_BIG "Music.big"

//----------------------------------------------------------------------------
Expand Down Expand Up @@ -180,5 +177,3 @@ extern ArchiveFileSystem *TheArchiveFileSystem;
//----------------------------------------------------------------------------
// Inlining
//----------------------------------------------------------------------------

#endif // __ARCHIVEFILESYSTEM_H_
5 changes: 0 additions & 5 deletions Core/GameEngine/Include/Common/AsciiString.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@

#pragma once

#ifndef ASCIISTRING_H
#define ASCIISTRING_H

#include <stdarg.h>
#include <stdio.h>
#include <string.h>
Expand Down Expand Up @@ -599,5 +596,3 @@ inline Bool operator>=(const AsciiString& s1, const char* s2)
{
return strcmp(s1.str(), s2) >= 0;
}

#endif // ASCIISTRING_H
6 changes: 1 addition & 5 deletions Core/GameEngine/Include/Common/AudioAffect.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,8 @@
// EA Pacific
// John McDonald, Jr
// Do not distribute
#pragma once

#ifndef _AUDIOAFFECT_H_
#define _AUDIOAFFECT_H_
#pragma once

#include <Lib/BaseType.h>

Expand All @@ -44,5 +42,3 @@ enum AudioAffect CPP_11(: Int)

AudioAffect_SystemSetting = 0x10,
};

#endif // _AUDIOAFFECT_H_
4 changes: 0 additions & 4 deletions Core/GameEngine/Include/Common/AudioEventInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
// Author: John K. McDonald, March 2002

#pragma once
#ifndef _H_AUDIOEVENTINFO_
#define _H_AUDIOEVENTINFO_

#include "Common/AsciiString.h"
#include "Common/GameMemory.h"
Expand Down Expand Up @@ -135,5 +133,3 @@ struct AudioEventInfo : public MemoryPoolObject
static const FieldParse m_audioEventInfo[]; ///< the parse table for INI definition
const FieldParse *getFieldParse( void ) const { return m_audioEventInfo; }
};

#endif /* _H_AUDIOEVENTINFO_ */
5 changes: 0 additions & 5 deletions Core/GameEngine/Include/Common/AudioEventRTS.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
// Author: John K. McDonald, March 2002

#pragma once
#ifndef _H_AUDIOEVENTRTS_
#define _H_AUDIOEVENTRTS_

#include "Common/AsciiString.h"
#include "Common/GameAudio.h"
Expand Down Expand Up @@ -212,6 +210,3 @@ class DynamicAudioEventRTS : public MemoryPoolObject
AudioEventRTS m_event;
};
EMPTY_DTOR(DynamicAudioEventRTS)

#endif /* _H_AUDIOEVENTRTS_ */

5 changes: 0 additions & 5 deletions Core/GameEngine/Include/Common/AudioHandleSpecialValues.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@

#pragma once

#ifndef _AUDIOHANDLESPECIALVALUES_H_
#define _AUDIOHANDLESPECIALVALUES_H_

enum AudioHandleSpecialValues CPP_11(: Int)
{
AHSV_Error = 0x00,
Expand All @@ -41,5 +38,3 @@ enum AudioHandleSpecialValues CPP_11(: Int)
AHSV_StopTheMusicFade,
AHSV_FirstHandle
};

#endif // _AUDIOHANDLESPECIALVALUES_H_
5 changes: 0 additions & 5 deletions Core/GameEngine/Include/Common/AudioRandomValue.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@

#pragma once

#ifndef _AUDIO_RANDOM_VALUE_H_
#define _AUDIO_RANDOM_VALUE_H_

#include "Lib/BaseType.h"

// do NOT use these functions directly, rather use the macros below
Expand All @@ -43,5 +40,3 @@ extern Real GetGameAudioRandomValueReal( Real lo, Real hi, const char *file, int
#define GameAudioRandomValueReal( lo, hi ) GetGameAudioRandomValueReal( lo, hi, __FILE__, __LINE__ )

//--------------------------------------------------------------------------------------------------------------

#endif // _AUDIO_RANDOM_VALUE_H_
5 changes: 0 additions & 5 deletions Core/GameEngine/Include/Common/AudioRequest.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@

#pragma once

#ifndef _AUDIOREQUEST_H_
#define _AUDIOREQUEST_H_

#include "Common/GameAudio.h"
#include "Common/GameMemory.h"

Expand All @@ -57,5 +54,3 @@ struct AudioRequest : public MemoryPoolObject
Bool m_usePendingEvent;
Bool m_requiresCheckForSample;
};

#endif // _AUDIOREQUEST_H_
5 changes: 0 additions & 5 deletions Core/GameEngine/Include/Common/AudioSettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@

#pragma once

#ifndef _AUDIOSETTINGS_H_
#define _AUDIOSETTINGS_H_

#include "Common/AsciiString.h"

enum { MAX_HW_PROVIDERS = 4 };
Expand Down Expand Up @@ -103,5 +100,3 @@ struct AudioSettings
//between 75% and 100%, not 100% to 125%!
Real m_zoomSoundVolumePercentageAmount; //The amount of sound volume dedicated to zooming.
};

#endif // _AUDIOSETTINGS_H_
7 changes: 1 addition & 6 deletions Core/GameEngine/Include/Common/CRCDebug.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,7 @@
// Macros/functions/etc to help logging values for tracking down sync errors
// Author: Matthew D. Campbell, June 2002

// no #pragma once - we want to be able to conditionally define NO_DEBUG_CRC in indiv .cpp files

#ifndef __CRCDEBUG_H__
#define __CRCDEBUG_H__
#pragma once

#include "Common/Debug.h"

Expand Down Expand Up @@ -129,5 +126,3 @@
extern Int NET_CRC_INTERVAL;
extern Int REPLAY_CRC_INTERVAL;
extern Bool TheDebugIgnoreSyncErrors;

#endif // __CRCDEBUG_H__
5 changes: 0 additions & 5 deletions Core/GameEngine/Include/Common/Debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@

#pragma once

#ifndef __DEBUG_H_
#define __DEBUG_H_

class AsciiString;

#define NO_RELEASE_DEBUG_LOGGING
Expand Down Expand Up @@ -260,5 +257,3 @@ class SimpleProfiler
#endif

// MACROS //////////////////////////////////////////////////////////////////

#endif // __DEBUG_H_
9 changes: 0 additions & 9 deletions Core/GameEngine/Include/Common/DynamicAudioEventInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@

#pragma once


#ifndef DYNAMICAUDIOEVENTINFO_H_INCLUDED
#define DYNAMICAUDIOEVENTINFO_H_INCLUDED

#include "Common/AudioEventInfo.h"
#include "Common/BitFlags.h"

Expand Down Expand Up @@ -155,8 +151,3 @@ inline Bool DynamicAudioEventInfo::wasPriorityOverriden() const
{
return m_overriddenFields.test( OVERRIDE_PRIORITY );
}



#endif // DYNAMICAUDIOEVENTINFO_H_INCLUDED

7 changes: 0 additions & 7 deletions Core/GameEngine/Include/Common/FileSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@

#pragma once

#ifndef __FILESYSTEM_H
#define __FILESYSTEM_H

//----------------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------------
Expand Down Expand Up @@ -182,7 +179,3 @@ extern FileSystem* TheFileSystem;
//----------------------------------------------------------------------------
// Inlining
//----------------------------------------------------------------------------



#endif // __WSYS_FILESYSTEM_H
1 change: 1 addition & 0 deletions Core/GameEngine/Include/Common/FramePacer.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
** You should have received a copy of the GNU General Public License
** along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

#pragma once

#include "Common/FrameRateLimit.h"
Expand Down
5 changes: 0 additions & 5 deletions Core/GameEngine/Include/Common/GameAudio.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@

#pragma once

#ifndef __COMMON_GAMEAUDIO_H_
#define __COMMON_GAMEAUDIO_H_

// Includes
#include "Lib/BaseType.h"
#include "Common/STLTypedefs.h"
Expand Down Expand Up @@ -431,5 +428,3 @@ class AudioManagerDummy : public AudioManager


extern AudioManager *TheAudio;

#endif // __COMMON_GAMEAUDIO_H_
6 changes: 0 additions & 6 deletions Core/GameEngine/Include/Common/GameMemory.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@

#pragma once

#ifndef _GAME_MEMORY_H_
#define _GAME_MEMORY_H_

// Turn off memory pool checkpointing for now.
#ifndef DISABLE_MEMORYPOOL_CHECKPOINTING
#define DISABLE_MEMORYPOOL_CHECKPOINTING 1
Expand Down Expand Up @@ -913,6 +910,3 @@ class MemoryPoolObjectHolder


#define EMPTY_DTOR(CLASS) inline CLASS::~CLASS() { }


#endif // _GAME_MEMORY_H_
6 changes: 0 additions & 6 deletions Core/GameEngine/Include/Common/GameMusic.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@

#pragma once

#ifndef __COMMON_GAMEMUSIC_H_
#define __COMMON_GAMEMUSIC_H_


//----------------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------------
Expand Down Expand Up @@ -114,5 +110,3 @@ class MusicManager

void setVolume( Real m_volume );
};

#endif // __COMMON_GAMEMUSIC_H_
5 changes: 0 additions & 5 deletions Core/GameEngine/Include/Common/GameSounds.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
//----------------------------------------------------------------------------

#pragma once
#ifndef __COMMON_GAMESOUNDS_H_
#define __COMMON_GAMESOUNDS_H_

#include "Common/SubsystemInterface.h"
#include "Common/GameAudio.h"
Expand Down Expand Up @@ -98,6 +96,3 @@ class SoundManager : public SubsystemInterface
UnsignedInt m_numPlaying2DSamples;
UnsignedInt m_numPlaying3DSamples;
};

#endif // __COMMON_GAMESOUNDS_H_

8 changes: 0 additions & 8 deletions Core/GameEngine/Include/Common/LocalFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@

#pragma once

#ifndef __LOCALFILE_H
#define __LOCALFILE_H



//----------------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------------
Expand Down Expand Up @@ -134,6 +129,3 @@ class LocalFile : public File
//----------------------------------------------------------------------------
// Inlining
//----------------------------------------------------------------------------


#endif // __LOCALFILE_H
5 changes: 0 additions & 5 deletions Core/GameEngine/Include/Common/LocalFileSystem.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@

#pragma once

#ifndef __LOCALFILESYSTEM_H
#define __LOCALFILESYSTEM_H

#include "Common/SubsystemInterface.h"
#include "FileSystem.h" // for typedefs, etc.

Expand All @@ -54,5 +51,3 @@ class LocalFileSystem : public SubsystemInterface
};

extern LocalFileSystem *TheLocalFileSystem;

#endif // __LOCALFILESYSTEM_H
7 changes: 0 additions & 7 deletions Core/GameEngine/Include/Common/MiscAudio.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,6 @@

#pragma once

#ifndef _MISCAUDIO_H_
#define _MISCAUDIO_H_

#include "Common/AudioEventRTS.h"

struct MiscAudio
Expand Down Expand Up @@ -73,7 +70,3 @@ struct MiscAudio
AudioEventRTS m_sabotageResetTimerBuilding; ///< When Saboteur hits a building
AudioEventRTS m_aircraftWheelScreech; ///< When a jet lands on a runway.
};


#endif /* _MISCAUDIO_H_ */

8 changes: 0 additions & 8 deletions Core/GameEngine/Include/Common/RAMFile.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@

#pragma once

#ifndef __RAMFILE_H
#define __RAMFILE_H



//----------------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------------
Expand Down Expand Up @@ -130,6 +125,3 @@ class RAMFile : public File
//----------------------------------------------------------------------------
// Inlining
//----------------------------------------------------------------------------


#endif // __WSYS_RAMFILE_H
5 changes: 0 additions & 5 deletions Core/GameEngine/Include/Common/RandomValue.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@

#pragma once

#ifndef _RANDOM_VALUE_H_
#define _RANDOM_VALUE_H_

#include "Lib/BaseType.h"

extern void InitRandom( void );
Expand All @@ -40,5 +37,3 @@ extern UnsignedInt GetGameLogicRandomSeed( void ); ///< Get the seed (used for
extern UnsignedInt GetGameLogicRandomSeedCRC( void );///< Get the seed (used for CRCs)

//--------------------------------------------------------------------------------------------------------------

#endif // _RANDOM_VALUE_H_
Loading
Loading