actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

oops, forgot to commit:

Browse Source 
replace GAMESTATE->m_pUnlockingSys with UNLOCKSYS
This commit is contained in:
Andrew Wong
2003-09-19 07:02:53 +00:00
parent 79c2560527
commit 54e490fd20
11 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/UnlockSystem.cpp
+12 -10
View File
@@ -28,8 +28,12 @@ using namespace std;
#include "stdio.h"
UnlockSystem* UNLOCKSYS = NULL; // global and accessable from anywhere in our program
UnlockSystem::UnlockSystem()
{
UNLOCKSYS = this;
ArcadePoints = 0;
DancePoints = 0;
SongPoints = 0;
@@ -150,33 +154,31 @@ void UnlockEntry::UpdateLocked()
if (!isLocked)
return;
const UnlockSystem *UNLOCKS = GAMESTATE->m_pUnlockingSys;
isLocked = true;
if ( m_fArcadePointsRequired && UNLOCKS->ArcadePoints >= m_fArcadePointsRequired )
if ( m_fArcadePointsRequired && UNLOCKSYS->ArcadePoints >= m_fArcadePointsRequired )
isLocked = false;
if ( m_fDancePointsRequired && UNLOCKS->DancePoints >= m_fDancePointsRequired )
if ( m_fDancePointsRequired && UNLOCKSYS->DancePoints >= m_fDancePointsRequired )
isLocked = false;
if ( m_fSongPointsRequired && UNLOCKS->SongPoints >= m_fSongPointsRequired )
if ( m_fSongPointsRequired && UNLOCKSYS->SongPoints >= m_fSongPointsRequired )
isLocked = false;
if ( m_fExtraStagesCleared && UNLOCKS->ExtraClearPoints >= m_fExtraStagesCleared )
if ( m_fExtraStagesCleared && UNLOCKSYS->ExtraClearPoints >= m_fExtraStagesCleared )
isLocked = false;
if ( m_fExtraStagesFailed && UNLOCKS->ExtraFailPoints >= m_fExtraStagesFailed )
if ( m_fExtraStagesFailed && UNLOCKSYS->ExtraFailPoints >= m_fExtraStagesFailed )
isLocked = false;
if ( m_fStagesCleared && UNLOCKS->StagesCleared >= m_fStagesCleared )
if ( m_fStagesCleared && UNLOCKSYS->StagesCleared >= m_fStagesCleared )
isLocked = false;
if ( m_fToastysSeen && UNLOCKS->ToastyPoints >= m_fToastysSeen )
if ( m_fToastysSeen && UNLOCKSYS->ToastyPoints >= m_fToastysSeen )
isLocked = false;
if ( m_iRouletteSeed )
{
const CString &tmp = UNLOCKS->RouletteSeeds;
const CString &tmp = UNLOCKSYS->RouletteSeeds;
LOG->Trace("Seed in question: %d Roulette seeds: %s", m_iRouletteSeed, tmp.c_str() );
if( tmp[m_iRouletteSeed] == '1' )