1) SOMEONE can't spell "accessible" 2) Global commenting consistency 3) persistance -> persistence

This commit is contained in:
Ben "root" Anderson
2013-11-30 09:50:54 -06:00
parent d59b7fd0c0
commit a040c4a586
57 changed files with 58 additions and 58 deletions
+1 -1
View File
@@ -5,7 +5,7 @@
#include "RageFile.h"
#include <cstring>
AnnouncerManager* ANNOUNCER = NULL; // global object accessable from anywhere in the program
AnnouncerManager* ANNOUNCER = NULL; // global and accessible from anywhere in our program
const RString EMPTY_ANNOUNCER_NAME = "Empty";
+1 -1
View File
@@ -42,7 +42,7 @@ protected:
};
extern AnnouncerManager* ANNOUNCER; // global and accessable from anywhere in our program
extern AnnouncerManager* ANNOUNCER; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -47,7 +47,7 @@ static Preference<bool> g_bPalettedBannerCache( "PalettedBannerCache", false );
* CacheBanner to avoid doing extra work.
*/
BannerCache *BANNERCACHE;
BannerCache *BANNERCACHE; // global and accessible from anywhere in our program
static map<RString,RageSurface *> g_BannerPathToImage;
+1 -1
View File
@@ -31,7 +31,7 @@ private:
IniFile BannerData;
};
extern BannerCache *BANNERCACHE; // global and accessable from anywhere in our program
extern BannerCache *BANNERCACHE; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -10,7 +10,7 @@
#include "XmlFileUtil.h"
#include <ctime>
Bookkeeper* BOOKKEEPER = NULL; // global and accessable from anywhere in our program
Bookkeeper* BOOKKEEPER = NULL; // global and accessible from anywhere in our program
static const RString COINS_DAT = "Save/Coins.xml";
+1 -1
View File
@@ -61,7 +61,7 @@ private:
map<Date,int> m_mapCoinsForHour;
};
extern Bookkeeper* BOOKKEEPER; // global and accessable from anywhere in our program
extern Bookkeeper* BOOKKEEPER; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -7,7 +7,7 @@
#define CHARACTERS_DIR "/Characters/"
CharacterManager* CHARMAN = NULL; // global object accessable from anywhere in the program
CharacterManager* CHARMAN = NULL; // global object accessible from anywhere in the program
CharacterManager::CharacterManager()
{
+1 -1
View File
@@ -34,7 +34,7 @@ private:
};
extern CharacterManager* CHARMAN; // global and accessable from anywhere in our program
extern CharacterManager* CHARMAN; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -11,7 +11,7 @@
#include "libtomcrypt/src/headers/tomcrypt.h"
CryptManager* CRYPTMAN = NULL; // global and accessable from anywhere in our program
CryptManager* CRYPTMAN = NULL; // global and accessible from anywhere in our program
static const RString PRIVATE_KEY_PATH = "Data/private.rsa";
static const RString PUBLIC_KEY_PATH = "Data/public.rsa";
+1 -1
View File
@@ -35,7 +35,7 @@ public:
void PushSelf( lua_State *L );
};
extern CryptManager* CRYPTMAN; // global and accessable from anywhere in our program
extern CryptManager* CRYPTMAN; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -5,7 +5,7 @@
#include "RageLog.h"
#include <map>
FontManager* FONT = NULL; // global and accessable from anywhere in our program
FontManager* FONT = NULL; // global and accessible from anywhere in our program
// map from file name to a texture holder
typedef pair<RString,RString> FontName;
+1 -1
View File
@@ -18,7 +18,7 @@ public:
//void PruneFonts();
};
extern FontManager* FONT; // global and accessable from anywhere in our program
extern FontManager* FONT; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -12,7 +12,7 @@
#include "Style.h"
#include "Foreach.h"
GameManager* GAMEMAN = NULL; // global and accessable from anywhere in our program
GameManager* GAMEMAN = NULL; // global and accessible from anywhere in our program
enum
{
+1 -1
View File
@@ -55,7 +55,7 @@ public:
void PushSelf( lua_State *L );
};
extern GameManager* GAMEMAN; // global and accessable from anywhere in our program
extern GameManager* GAMEMAN; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -42,7 +42,7 @@
#include <ctime>
#include <set>
GameState* GAMESTATE = NULL; // global and accessable from anywhere in our program
GameState* GAMESTATE = NULL; // global and accessible from anywhere in our program
#define NAME_BLACKLIST_FILE "/Data/NamesBlacklist.txt"
+1 -1
View File
@@ -82,7 +82,7 @@ namespace
* this won't cause timing problems, because the event timestamp is preserved. */
static Preference<float> g_fInputDebounceTime( "InputDebounceTime", 0 );
InputFilter* INPUTFILTER = NULL; // global and accessable from anywhere in our program
InputFilter* INPUTFILTER = NULL; // global and accessible from anywhere in our program
static const float TIME_BEFORE_REPEATS = 0.375f;
+1 -1
View File
@@ -92,7 +92,7 @@ private:
InputFilter& operator=(const InputFilter& rhs);
};
extern InputFilter* INPUTFILTER; // global and accessable from anywhere in our program
extern InputFilter* INPUTFILTER; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -26,7 +26,7 @@ namespace
PlayerNumber g_JoinControllers;
};
InputMapper* INPUTMAPPER = NULL; // global and accessable from anywhere in our program
InputMapper* INPUTMAPPER = NULL; // global and accessible from anywhere in our program
InputMapper::InputMapper()
{
+1 -1
View File
@@ -202,7 +202,7 @@ private:
InputMapper& operator=(const InputMapper& rhs);
};
extern InputMapper* INPUTMAPPER; // global and accessable from anywhere in our program
extern InputMapper* INPUTMAPPER; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -6,7 +6,7 @@
#include "Foreach.h"
#include "InputMapper.h"
InputQueue* INPUTQUEUE = NULL; // global and accessable from anywhere in our program
InputQueue* INPUTQUEUE = NULL; // global and accessible from anywhere in our program
const unsigned MAX_INPUT_QUEUE_LENGTH = 32;
+1 -1
View File
@@ -52,7 +52,7 @@ private:
float m_fMaxSecondsBack;
};
extern InputQueue* INPUTQUEUE; // global and accessable from anywhere in our program
extern InputQueue* INPUTQUEUE; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -93,7 +93,7 @@ static void GetUsedGameInputs( vector<GameInput> &vGameInputsOut )
vGameInputsOut.push_back( *gi );
}
LightsManager* LIGHTSMAN = NULL; // global and accessable from anywhere in our program
LightsManager* LIGHTSMAN = NULL; // global and accessible from anywhere in our program
LightsManager::LightsManager()
{
+1 -1
View File
@@ -104,7 +104,7 @@ private:
int m_iControllerTestManualCycleCurrent;
};
extern LightsManager* LIGHTSMAN; // global and accessable from anywhere in our program
extern LightsManager* LIGHTSMAN; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -13,7 +13,7 @@
#include "arch/MemoryCard/MemoryCardDriver_Null.h"
#include "LuaManager.h"
MemoryCardManager* MEMCARDMAN = NULL; // global and accessable from anywhere in our program
MemoryCardManager* MEMCARDMAN = NULL; // global and accessible from anywhere in our program
static void MemoryCardOsMountPointInit( size_t /*PlayerNumber*/ i, RString &sNameOut, RString &defaultValueOut )
{
+1 -1
View File
@@ -75,7 +75,7 @@ protected:
RageSound m_soundDisconnect;
};
extern MemoryCardManager* MEMCARDMAN; // global and accessable from anywhere in our program
extern MemoryCardManager* MEMCARDMAN; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -9,7 +9,7 @@
#include <set>
#include <map>
MessageManager* MESSAGEMAN = NULL; // global and accessable from anywhere in our program
MessageManager* MESSAGEMAN = NULL; // global and accessible from anywhere in our program
static const char *MessageIDNames[] = {
+1 -1
View File
@@ -193,7 +193,7 @@ public:
void PushSelf( lua_State *L );
};
extern MessageManager* MESSAGEMAN; // global and accessable from anywhere in our program
extern MessageManager* MESSAGEMAN; // global and accessible from anywhere in our program
template<class T>
class BroadcastOnChange
+1 -1
View File
@@ -5,7 +5,7 @@
#include "RageLog.h"
#include "RageDisplay.h"
ModelManager* MODELMAN = NULL;
ModelManager* MODELMAN = NULL; // global and accessible from anywhere in our program
ModelManager::ModelManager()
{
+1 -1
View File
@@ -52,7 +52,7 @@ protected:
ModelManagerPrefs m_Prefs;
};
extern ModelManager* MODELMAN; // global and accessable from anywhere in our program
extern ModelManager* MODELMAN; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -18,7 +18,7 @@
#include "SpecialFiles.h"
/** @brief Have the NoteSkinManager available throughout the program. */
NoteSkinManager* NOTESKIN = NULL;
NoteSkinManager* NOTESKIN = NULL; // global and accessible from anywhere in our program
const RString GAME_COMMON_NOTESKIN_NAME = "common";
const RString GAME_BASE_NOTESKIN_NAME = "default";
+1 -1
View File
@@ -54,7 +54,7 @@ protected:
PlayerNumber m_PlayerNumber;
GameController m_GameController;
};
extern NoteSkinManager* NOTESKIN; // global and accessible from anywhere in our program
class LockNoteSkin
+1 -1
View File
@@ -16,7 +16,7 @@
//STATIC_INI_PATH = "Data/Static.ini"; // overlay on the 2 above, can't be overridden
//TYPE_TXT_FILE = "Data/Type.txt";
PrefsManager* PREFSMAN = NULL; // global and accessable from anywhere in our program
PrefsManager* PREFSMAN = NULL; // global and accessible from anywhere in our program
static const char *MusicWheelUsesSectionsNames[] = {
"Never",
+1 -1
View File
@@ -339,7 +339,7 @@ protected:
* pointer anyway). */
extern bool g_bAutoRestart;
extern PrefsManager* PREFSMAN; // global and accessable from anywhere in our program
extern PrefsManager* PREFSMAN; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -25,7 +25,7 @@
#include "CharacterManager.h"
ProfileManager* PROFILEMAN = NULL; // global and accessable from anywhere in our program
ProfileManager* PROFILEMAN = NULL; // global and accessible from anywhere in our program
static void DefaultLocalProfileIDInit( size_t /*PlayerNumber*/ i, RString &sNameOut, RString &defaultValueOut )
{
+1 -1
View File
@@ -124,7 +124,7 @@ private:
Profile *m_pMachineProfile;
};
extern ProfileManager* PROFILEMAN; // global and accessable from anywhere in our program
extern ProfileManager* PROFILEMAN; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -43,7 +43,7 @@ struct Centering
static vector<Centering> g_CenteringStack( 1, Centering(0, 0, 0, 0) );
RageDisplay* DISPLAY = NULL;
RageDisplay* DISPLAY = NULL; // global and accessible from anywhere in our program
Preference<bool> LOG_FPS( "LogFPS", true );
Preference<float> g_fFrameLimitPercent( "FrameLimitPercent", 0.0f );
+1 -1
View File
@@ -410,7 +410,7 @@ protected:
};
extern RageDisplay* DISPLAY; // global and accessable from anywhere in our program
extern RageDisplay* DISPLAY; // global and accessible from anywhere in our program
#endif
/*
+1 -1
View File
@@ -7,7 +7,7 @@
#include "LuaManager.h"
#include "LocalizedString.h"
RageInput* INPUTMAN = NULL; // globally accessable input device
RageInput* INPUTMAN = NULL; // global and accessible from anywhere in our program
Preference<RString> g_sInputDrivers( "InputDrivers", "" ); // "" == DEFAULT_INPUT_DRIVER_LIST
+1 -1
View File
@@ -34,7 +34,7 @@ public:
extern Preference<RString> g_sInputDrivers;
extern RageInput* INPUTMAN; // global and accessable from anywhere in our program
extern RageInput* INPUTMAN; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -12,7 +12,7 @@
#endif
#include <map>
RageLog* LOG; // global and accessable from anywhere in the program
RageLog* LOG; // global and accessible from anywhere in the program
/*
* We have a couple log types and a couple logs.
+1 -1
View File
@@ -41,7 +41,7 @@ private:
void AddToRecentLogs( const RString &buf );
};
extern RageLog* LOG; // global and accessable from anywhere in our program
extern RageLog* LOG; // global and accessible from anywhere in our program
#endif
/*
+1 -1
View File
@@ -29,7 +29,7 @@
#include <map>
RageTextureManager* TEXTUREMAN = NULL;
RageTextureManager* TEXTUREMAN = NULL; // global and accessible from anywhere in our program
namespace
{
+1 -1
View File
@@ -93,7 +93,7 @@ private:
RageTextureID::TexPolicy m_TexturePolicy;
};
extern RageTextureManager* TEXTUREMAN; // global and accessable from anywhere in our program
extern RageTextureManager* TEXTUREMAN; // global and accessible from anywhere in our program
#endif
+2 -2
View File
@@ -32,7 +32,7 @@
*
* If a screen is added to the screen stack that isn't in the current screen group
* (added to by GroupScreen), the screen group is reset: all prepared screens are
* unloaded and the persistance list is cleared.
* unloaded and the persistence list is cleared.
*
* Note that not all screens yet support reuse in this way; proper use of BeginScreen
* is required. This will misbehave if a screen pushes another screen that's already
@@ -73,7 +73,7 @@
#include "Foreach.h"
#include "ActorUtil.h"
ScreenManager* SCREENMAN = NULL; // global and accessable from anywhere in our program
ScreenManager* SCREENMAN = NULL; // global and accessible from anywhere in our program
static Preference<bool> g_bDelayedScreenLoad( "DelayedScreenLoad", false );
//static Preference<bool> g_bPruneFonts( "PruneFonts", true );
+1 -1
View File
@@ -104,7 +104,7 @@ private:
};
extern ScreenManager* SCREENMAN; // global and accessable from anywhere in our program
extern ScreenManager* SCREENMAN; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -27,7 +27,7 @@
#define CACHE_INDEX SpecialFiles::CACHE_DIR + "index.cache"
SongCacheIndex *SONGINDEX;
SongCacheIndex *SONGINDEX; // global and accessible from anywhere in our program
RString SongCacheIndex::GetCacheFilePath( const RString &sGroup, const RString &sPath )
{
+1 -1
View File
@@ -19,7 +19,7 @@ public:
unsigned GetCacheHash( const RString &path ) const;
};
extern SongCacheIndex *SONGINDEX; // global and accessable from anywhere in our program
extern SongCacheIndex *SONGINDEX; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -36,7 +36,7 @@
#include "UnlockManager.h"
#include "SpecialFiles.h"
SongManager* SONGMAN = NULL; // global and accessable from anywhere in our program
SongManager* SONGMAN = NULL; // global and accessible from anywhere in our program
const RString ADDITIONAL_SONGS_DIR = "/AdditionalSongs/";
const RString ADDITIONAL_COURSES_DIR = "/AdditionalCourses/";
+1 -1
View File
@@ -217,7 +217,7 @@ protected:
ThemeMetric1D<RageColor> COURSE_GROUP_COLOR;
};
extern SongManager* SONGMAN; // global and accessable from anywhere in our program
extern SongManager* SONGMAN; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -14,7 +14,7 @@
#include "CryptManager.h"
#include "XmlFileUtil.h"
StatsManager* STATSMAN = NULL; // global object accessable from anywhere in the program
StatsManager* STATSMAN = NULL; // global object accessible from anywhere in the program
void AddPlayerStatsToProfile( Profile *pProfile, const StageStats &ss, PlayerNumber pn );
XNode* MakeRecentScoreNode( const StageStats &ss, Trail *pTrail, const PlayerStageStats &pss, MultiPlayer mp );
+1 -1
View File
@@ -39,7 +39,7 @@ private:
StageStats m_AccumPlayedStageStats;
};
extern StatsManager* STATSMAN; // global and accessable from anywhere in our program
extern StatsManager* STATSMAN; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -26,7 +26,7 @@
#include "XmlFileUtil.h"
#include <deque>
ThemeManager* THEME = NULL; // global object accessable from anywhere in the program
ThemeManager* THEME = NULL; // global object accessible from anywhere in the program
static const RString THEME_INFO_INI = "ThemeInfo.ini";
+1 -1
View File
@@ -128,7 +128,7 @@ protected:
bool m_bPseudoLocalize;
};
extern ThemeManager* THEME; // global and accessable from anywhere in our program
extern ThemeManager* THEME; // global and accessible from anywhere in our program
#endif
+1 -1
View File
@@ -19,7 +19,7 @@
#include "GameManager.h"
#include "Style.h"
UnlockManager* UNLOCKMAN = NULL; // global and accessable from anywhere in our program
UnlockManager* UNLOCKMAN = NULL; // global and accessible from anywhere in our program
#define UNLOCK_NAMES THEME->GetMetric ("UnlockManager","UnlockNames")
#define UNLOCK(x) THEME->GetMetricR("UnlockManager", ssprintf("Unlock%sCommand",x.c_str()));
+1 -1
View File
@@ -179,7 +179,7 @@ private:
set<RString> m_RouletteCodes; // "codes" which are available in roulette and which unlock if rouletted
};
extern UnlockManager* UNLOCKMAN; // global and accessable from anywhere in program
extern UnlockManager* UNLOCKMAN; // global and accessible from anywhere in program
#endif
+1 -1
View File
@@ -9,7 +9,7 @@ bool ArchHooks::g_bQuitting = false;
bool ArchHooks::g_bToggleWindowed = false;
// Keep from pulling RageThreads.h into ArchHooks.h
static RageMutex g_Mutex( "ArchHooks" );
ArchHooks *HOOKS = NULL;
ArchHooks *HOOKS = NULL; // global and accessible from anywhere in our program
ArchHooks::ArchHooks(): m_bHasFocus(true), m_bFocusChanged(false)
{
+1 -1
View File
@@ -140,7 +140,7 @@ private:
#endif
extern ArchHooks *HOOKS; // global and accessable from anywhere in our program
extern ArchHooks *HOOKS; // global and accessible from anywhere in our program
/**
* @file