Skip to content

Commit 2f72335

Browse files
committed
[GEN][ZH] Cleans up inconsistencies (#654)
1 parent bbf0830 commit 2f72335

File tree

367 files changed

+8098
-8251
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

367 files changed

+8098
-8251
lines changed

Generals/Code/GameEngine/Include/Common/ArchiveFileSystem.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ class ArchiveFileSystem : public SubsystemInterface
172172

173173
// Unprotected this for copy-protection routines
174174
AsciiString getArchiveFilenameForFile(const AsciiString& filename) const;
175-
176175
void loadMods( void );
177176

178177
protected:

Generals/Code/GameEngine/Include/Common/BuildAssistant.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@ class BuildAssistant : public SubsystemInterface
112112

113113
enum LocalLegalToBuildOptions
114114
{
115-
TERRAIN_RESTRICTIONS = 0x00000001, ///< Check for basic terrain restrictions
116-
CLEAR_PATH = 0x00000002, ///< Must be able to path find to location
117-
NO_OBJECT_OVERLAP = 0X00000004, ///< Can't overlap enemy objects, or locally controled objects that can't move out of the way
118-
USE_QUICK_PATHFIND = 0x00000008, ///< Use the quick pathfind method for CLEAR_PATH
119-
SHROUD_REVEALED = 0x00000010, ///< Check to make sure the shroud is revealed
120-
NO_ENEMY_OBJECT_OVERLAP=0x00000020, ///< Can't overlap enemy objects only.
115+
TERRAIN_RESTRICTIONS = 0x00000001, ///< Check for basic terrain restrictions
116+
CLEAR_PATH = 0x00000002, ///< Must be able to path find to location
117+
NO_OBJECT_OVERLAP = 0X00000004, ///< Can't overlap enemy objects, or locally controled objects that can't move out of the way
118+
USE_QUICK_PATHFIND = 0x00000008, ///< Use the quick pathfind method for CLEAR_PATH
119+
SHROUD_REVEALED = 0x00000010, ///< Check to make sure the shroud is revealed
120+
NO_ENEMY_OBJECT_OVERLAP = 0x00000020, ///< Can't overlap enemy objects only.
121121
};
122122

123123
public:

Generals/Code/GameEngine/Include/Common/FileSystem.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,6 @@ class FileSystem : public SubsystemInterface
138138
void loadMusicFilesFromCD();
139139
void unloadMusicFilesFromCD();
140140
protected:
141-
142-
143141
};
144142

145143
extern FileSystem* TheFileSystem;

Generals/Code/GameEngine/Include/Common/GameMemory.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,6 @@ private: \
730730
public: /* include this line at the end to reset visibility to 'public' */
731731

732732

733-
734733
// ----------------------------------------------------------------------------
735734
/**
736735
This class is provided as a simple and safe way to integrate C++ object allocation
@@ -768,7 +767,6 @@ class MemoryPoolObject
768767
};
769768

770769

771-
772770
// INLINING ///////////////////////////////////////////////////////////////////
773771

774772
// ----------------------------------------------------------------------------
@@ -890,10 +888,9 @@ class STLSpecialAlloc
890888
static void deallocate(void* __p, size_t);
891889
};
892890

893-
#endif //DISABLE_GAMEMEMORY
891+
#endif // DISABLE_GAMEMEMORY
894892

895893

896-
// ----------------------------------------------------------------------------
897894
/**
898895
A simple utility class to ensure exception safety; this holds a MemoryPoolObject
899896
and deletes it in its destructor. Especially useful for iterators!
@@ -910,7 +907,6 @@ class MemoryPoolObjectHolder
910907
};
911908

912909

913-
// ----------------------------------------------------------------------------
914910
/**
915911
Sometimes you want to make a class's destructor protected so that it can only
916912
be destroyed under special circumstances. MemoryPoolObject short-circuits this
@@ -924,4 +920,5 @@ ARGVIS: void deleteInstance() { MemoryPoolObject::deleteInstance(); } public:
924920

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

923+
927924
#endif // _GAME_MEMORY_H_

Generals/Code/GameEngine/Include/Common/GlobalData.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ class GlobalData : public SubsystemInterface
412412
UnsignedInt m_unlookPersistDuration; ///< How long after unlook until the sighting info executes the undo
413413

414414
Bool m_shouldUpdateTGAToDDS; ///< Should we attempt to update old TGAs to DDS stuff on loadup?
415-
415+
416416
UnsignedInt m_doubleClickTimeMS; ///< What is the maximum amount of time that can seperate two clicks in order
417417
///< for us to generate a double click message?
418418

@@ -486,7 +486,6 @@ class GlobalData : public SubsystemInterface
486486

487487
Bool m_isBreakableMovie; ///< if we enter a breakable movie, set this flag
488488
Bool m_breakTheMovie; ///< The user has hit escape!
489-
490489
AsciiString m_modDir;
491490
AsciiString m_modBIG;
492491

Generals/Code/GameEngine/Include/Common/KindOf.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ enum KindOfType
144144
KINDOF_DONT_AUTO_CRUSH_INFANTRY, ///< These units don't try to crush the infantry if ai.
145145

146146
KINDOF_COUNT // total number of kindofs
147-
148147
};
149148

150149
typedef BitFlags<KINDOF_COUNT> KindOfMaskType;

Generals/Code/GameEngine/Include/Common/MiscAudio.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,4 @@ struct MiscAudio
7373
};
7474

7575

76-
#endif /* _MISCAUDIO_H_ */
76+
#endif /* _MISCAUDIO_H_ */

Generals/Code/GameEngine/Include/Common/Money.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ class Money : public Snapshot
8383
void setPlayerIndex(Int ndx) { m_playerIndex = ndx; }
8484

8585
protected:
86-
8786
// snapshot methods
8887
virtual void crc( Xfer *xfer );
8988
virtual void xfer( Xfer *xfer );

Generals/Code/GameEngine/Include/Common/PlayerTemplate.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ class PlayerTemplate
126126
Int getSpecialPowerShortcutButtonCount( void ) const {return m_specialPowerShortcutButtonCount; }
127127

128128
AsciiString getLoadScreenMusic( void ) const {return m_loadScreenMusic; }
129-
130129

131130
static const FieldParse* getFieldParse();
132131

@@ -200,7 +199,6 @@ class PlayerTemplateStore : public SubsystemInterface
200199
const PlayerTemplate* getNthPlayerTemplate(Int i) const;
201200
const PlayerTemplate* findPlayerTemplate(NameKeyType namekey) const;
202201
inline Int getPlayerTemplateCount() const { return m_playerTemplates.size(); }
203-
204202

205203
// This function will fill outStringList with all the sides found in all the templates
206204
void getAllSideStrings(AsciiStringList *outStringList);

Generals/Code/GameEngine/Include/Common/StackDump.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929

3030
#ifndef IG_DEGBUG_STACKTRACE
3131
#define IG_DEBUG_STACKTRACE 1
32-
#endif
33-
32+
#endif // Unsure about this one -ML 3/25/03
3433
#if defined(_DEBUG) || defined(_INTERNAL) || defined(IG_DEBUG_STACKTRACE)
3534

3635
// Writes a stackdump (provide a callback : gets called per line)
@@ -71,5 +70,4 @@ __inline void DumpExceptionInfo( unsigned int u, EXCEPTION_POINTERS* e_info ) {}
7170

7271
extern AsciiString g_LastErrorDump;
7372

74-
7573
#endif // __STACKDUMP_H_

0 commit comments

Comments
 (0)