diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp index 2749000fef..a69ee85ad4 100644 --- a/stepmania/src/Course.cpp +++ b/stepmania/src/Course.cpp @@ -208,7 +208,7 @@ void Course::Init() m_sSubTitleTranslit = ""; m_sBannerPath = ""; m_sCDTitlePath = ""; - m_LoadedFromProfile = ProfileSlot_INVALID; + m_LoadedFromProfile = ProfileSlot_Invalid; m_iTrailCacheSeed = 0; } diff --git a/stepmania/src/Course.h b/stepmania/src/Course.h index e210d82573..8fee3c6567 100644 --- a/stepmania/src/Course.h +++ b/stepmania/src/Course.h @@ -190,8 +190,8 @@ public: bool GetTrailUnsorted( StepsType st, CourseDifficulty cd, Trail &trail ) const; bool GetTrailSorted( StepsType st, CourseDifficulty cd, Trail &trail ) const; - bool IsAnEdit() const { return m_LoadedFromProfile != ProfileSlot_INVALID; } - ProfileSlot m_LoadedFromProfile; // ProfileSlot_INVALID if wasn't loaded from a profile + bool IsAnEdit() const { return m_LoadedFromProfile != ProfileSlot_Invalid; } + ProfileSlot m_LoadedFromProfile; // ProfileSlot_Invalid if wasn't loaded from a profile typedef pair CacheEntry; struct CacheData diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h index e60c4b1222..f7b38158e8 100644 --- a/stepmania/src/GameConstantsAndTypes.h +++ b/stepmania/src/GameConstantsAndTypes.h @@ -208,7 +208,7 @@ enum ProfileSlot ProfileSlot_Player2, ProfileSlot_Machine, NUM_ProfileSlot, - ProfileSlot_INVALID + ProfileSlot_Invalid }; #define FOREACH_ProfileSlot( slot ) FOREACH_ENUM2( ProfileSlot, slot ) diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp index 3f257381fa..bd97b8d420 100644 --- a/stepmania/src/Song.cpp +++ b/stepmania/src/Song.cpp @@ -47,7 +47,7 @@ Song::Song() m_ForegroundChanges = AutoPtrCopyOnWrite(new VBackgroundChange); - m_LoadedFromProfile = ProfileSlot_INVALID; + m_LoadedFromProfile = ProfileSlot_Invalid; m_fMusicSampleStartSeconds = -1; m_fMusicSampleLengthSeconds = DEFAULT_MUSIC_SAMPLE_LENGTH; m_fMusicLengthSeconds = 0; @@ -1143,7 +1143,7 @@ void Song::FreeAllLoadedFromProfile( ProfileSlot slot ) Steps* pSteps = m_vpSteps[s]; if( !pSteps->WasLoadedFromProfile() ) continue; - if( slot == ProfileSlot_INVALID || pSteps->GetLoadedFromProfileSlot() == slot ) + if( slot == ProfileSlot_Invalid || pSteps->GetLoadedFromProfileSlot() == slot ) apToRemove.push_back( pSteps ); } diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp index 2d9d971c9c..987b57fcbc 100644 --- a/stepmania/src/SongManager.cpp +++ b/stepmania/src/SongManager.cpp @@ -1742,10 +1742,10 @@ void SongManager::FreeAllLoadedFromProfile( ProfileSlot slot ) FOREACH( Course*, m_pCourses, c ) { Course *pCourse = *c; - if( pCourse->GetLoadedFromProfileSlot() == ProfileSlot_INVALID ) + if( pCourse->GetLoadedFromProfileSlot() == ProfileSlot_Invalid ) continue; - if( slot == ProfileSlot_INVALID || pCourse->GetLoadedFromProfileSlot() == slot ) + if( slot == ProfileSlot_Invalid || pCourse->GetLoadedFromProfileSlot() == slot ) apToDelete.push_back( *c ); } @@ -1766,7 +1766,7 @@ int SongManager::GetNumStepsLoadedFromProfile() FOREACH( Steps*, vpAllSteps, ss ) { - if( (*ss)->GetLoadedFromProfileSlot() != ProfileSlot_INVALID ) + if( (*ss)->GetLoadedFromProfileSlot() != ProfileSlot_Invalid ) iCount++; } } diff --git a/stepmania/src/SongManager.h b/stepmania/src/SongManager.h index 279a0b2851..bfc3a5fc18 100644 --- a/stepmania/src/SongManager.h +++ b/stepmania/src/SongManager.h @@ -41,7 +41,7 @@ public: void LoadAllFromProfileDir( const RString &sProfileDir, ProfileSlot slot ); int GetNumStepsLoadedFromProfile(); - void FreeAllLoadedFromProfile( ProfileSlot slot = ProfileSlot_INVALID ); + void FreeAllLoadedFromProfile( ProfileSlot slot = ProfileSlot_Invalid ); void LoadGroupSymLinks( RString sDir, RString sGroupFolder ); diff --git a/stepmania/src/StepMania-net2005.vcproj b/stepmania/src/StepMania-net2005.vcproj index 011abea1a2..7e609e61cf 100644 --- a/stepmania/src/StepMania-net2005.vcproj +++ b/stepmania/src/StepMania-net2005.vcproj @@ -51,7 +51,7 @@ AdditionalOptions="/EHa" Optimization="0" AdditionalIncludeDirectories=".;vorbis;libjpeg;"lua-5.1\include";ffmpeg\include;BaseClasses" - PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG" + PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,_CRT_SECURE_NO_DEPRECATE" ExceptionHandling="0" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -158,7 +158,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="2" AdditionalIncludeDirectories=".;vorbis;libjpeg;"lua-5.1\include";ffmpeg\include;BaseClasses" - PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE" + PreprocessorDefinitions="WIN32,NDEBUG,_WINDOWS,WINDOWS,RELEASE,_CRT_SECURE_NO_DEPRECATE" StringPooling="true" MinimalRebuild="false" ExceptionHandling="0" @@ -263,7 +263,7 @@ AdditionalOptions="/EHa" Optimization="0" AdditionalIncludeDirectories=".;vorbis;libjpeg;"lua-5.1\include";ffmpeg\include;BaseClasses" - PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG" + PreprocessorDefinitions="WIN32,_DEBUG,_WINDOWS,WINDOWS,DEBUG,_CRT_SECURE_NO_DEPRECATE" ExceptionHandling="0" BasicRuntimeChecks="3" RuntimeLibrary="3" diff --git a/stepmania/src/Steps.cpp b/stepmania/src/Steps.cpp index 383c9c9b29..95c5a34d02 100644 --- a/stepmania/src/Steps.cpp +++ b/stepmania/src/Steps.cpp @@ -30,7 +30,7 @@ Steps::Steps() { m_bSavedToDisk = false; m_StepsType = StepsType_Invalid; - m_LoadedFromProfile = ProfileSlot_INVALID; + m_LoadedFromProfile = ProfileSlot_Invalid; m_iHash = 0; m_Difficulty = DIFFICULTY_INVALID; m_iMeter = 0; @@ -282,7 +282,7 @@ void Steps::Compress() const return; } - if( !m_sFilename.empty() && m_LoadedFromProfile == ProfileSlot_INVALID ) + if( !m_sFilename.empty() && m_LoadedFromProfile == ProfileSlot_Invalid ) { /* * We have a file on disk; clear all data in memory. diff --git a/stepmania/src/Steps.h b/stepmania/src/Steps.h index 8addbdbe5b..a523b957ad 100644 --- a/stepmania/src/Steps.h +++ b/stepmania/src/Steps.h @@ -34,7 +34,7 @@ public: // Use a special value of difficulty bool IsAnEdit() const { return m_Difficulty == DIFFICULTY_EDIT; } bool IsAPlayerEdit() const { return IsAnEdit() && GetLoadedFromProfileSlot() < ProfileSlot_Machine; } - bool WasLoadedFromProfile() const { return m_LoadedFromProfile != ProfileSlot_INVALID; } + bool WasLoadedFromProfile() const { return m_LoadedFromProfile != ProfileSlot_Invalid; } ProfileSlot GetLoadedFromProfileSlot() const { return m_LoadedFromProfile; } RString GetDescription() const { return Real()->m_sDescription; } Difficulty GetDifficulty() const { return Real()->m_Difficulty; } @@ -84,7 +84,7 @@ private: RString m_sFilename; bool m_bSavedToDisk; // true if this was loaded from disk or has been saved to disk. - ProfileSlot m_LoadedFromProfile; // ProfileSlot_INVALID if wasn't loaded from a profile + ProfileSlot m_LoadedFromProfile; // ProfileSlot_Invalid if wasn't loaded from a profile /* These values are pulled from the autogen source first, if there is one. */ mutable unsigned m_iHash; // only used if m_Difficulty == DIFFICULTY_EDIT diff --git a/stepmania/src/UnlockManager.cpp b/stepmania/src/UnlockManager.cpp index 0b39534040..7d40081200 100644 --- a/stepmania/src/UnlockManager.cpp +++ b/stepmania/src/UnlockManager.cpp @@ -453,7 +453,7 @@ void UnlockManager::Load() else { const UnlockRequirement ut = StringToUnlockRequirement( cmd.GetName() ); - if( ut != UnlockRequirement_INVALID ) + if( ut != UnlockRequirement_Invalid ) current.m_fRequirement[ut] = cmd.GetArg(1); } } diff --git a/stepmania/src/UnlockManager.h b/stepmania/src/UnlockManager.h index fe3cad32d7..c66d99c950 100644 --- a/stepmania/src/UnlockManager.h +++ b/stepmania/src/UnlockManager.h @@ -24,7 +24,7 @@ enum UnlockRequirement UnlockRequirement_Toasties, UnlockRequirement_StagesCleared, NUM_UnlockRequirement, - UnlockRequirement_INVALID, + UnlockRequirement_Invalid, }; LuaDeclareType( UnlockRequirement ); @@ -35,7 +35,7 @@ enum UnlockRewardType { UnlockRewardType_Course, UnlockRewardType_Modifier, NUM_UnlockRewardType, - UnlockRewardType_INVALID + UnlockRewardType_Invalid }; const RString& UnlockRewardTypeToString( UnlockRewardType i ); const RString& UnlockRewardTypeToLocalizedString( UnlockRewardType i ); @@ -52,7 +52,7 @@ class UnlockEntry public: UnlockEntry() { - m_Type = UnlockRewardType_INVALID; + m_Type = UnlockRewardType_Invalid; m_pSong = NULL; m_dc = DIFFICULTY_INVALID; diff --git a/stepmania/src/song.h b/stepmania/src/song.h index 781f65c373..7cb31bb527 100644 --- a/stepmania/src/song.h +++ b/stepmania/src/song.h @@ -87,7 +87,7 @@ public: RString m_sGroupName; - ProfileSlot m_LoadedFromProfile; // ProfileSlot_INVALID if wasn't loaded from a profile + ProfileSlot m_LoadedFromProfile; // ProfileSlot_Invalid if wasn't loaded from a profile bool m_bIsSymLink; RString m_sMainTitle, m_sSubTitle, m_sArtist; @@ -199,8 +199,8 @@ public: void AddSteps( Steps* pSteps ); // we are responsible for deleting the memory pointed to by pSteps! void DeleteSteps( const Steps* pSteps, bool bReAutoGen = true ); - void FreeAllLoadedFromProfile( ProfileSlot slot = ProfileSlot_INVALID ); - bool WasLoadedFromProfile() const { return m_LoadedFromProfile != ProfileSlot_INVALID; } + void FreeAllLoadedFromProfile( ProfileSlot slot = ProfileSlot_Invalid ); + bool WasLoadedFromProfile() const { return m_LoadedFromProfile != ProfileSlot_Invalid; } void GetStepsLoadedFromProfile( ProfileSlot slot, vector &vpStepsOut ) const; int GetNumStepsLoadedFromProfile( ProfileSlot slot ) const; bool IsEditAlreadyLoaded( Steps* pSteps ) const;