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

Invalid

Browse Source
This commit is contained in:
Glenn Maynard
2006-10-07 04:25:28 +00:00
parent 8a4ddd1515
commit 2ce839e4eb
39 changed files with 79 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Course.h
+1 -1
View File
@@ -24,7 +24,7 @@ enum CourseType
COURSE_TYPE_ENDLESS, // if set to REPEAT
COURSE_TYPE_SURVIVAL, // if life meter type is TIME
NUM_CourseType,
CourseType_INVALID
CourseType_Invalid
};
#define FOREACH_CourseType( i ) FOREACH_ENUM2( CourseType, i )
const RString& CourseTypeToString( CourseType i );
stepmania/src/GameCommand.cpp
+9 -9
View File
@@ -50,13 +50,13 @@ void GameCommand::Init()
m_pCourse = NULL;
m_pTrail = NULL;
m_pCharacter = NULL;
m_SortOrder = SortOrder_INVALID;
m_SortOrder = SortOrder_Invalid;
m_sUnlockEntryID = "";
m_sSoundPath = "";
m_vsScreensToPrepare.clear();
m_iWeightPounds = -1;
m_iGoalCalories = -1;
m_GoalType = GoalType_INVALID;
m_GoalType = GoalType_Invalid;
m_sProfileID = "";
m_sUrl = "";
@@ -134,13 +134,13 @@ bool GameCommand::DescribesCurrentMode( PlayerNumber pn ) const
return false;
if( !m_sSongGroup.empty() && GAMESTATE->m_sPreferredSongGroup != m_sSongGroup )
return false;
if( m_SortOrder != SortOrder_INVALID && GAMESTATE->m_PreferredSortOrder != m_SortOrder )
if( m_SortOrder != SortOrder_Invalid && GAMESTATE->m_PreferredSortOrder != m_SortOrder )
return false;
if( m_iWeightPounds != -1 && PROFILEMAN->GetProfile(pn)->m_iWeightPounds != m_iWeightPounds )
return false;
if( m_iGoalCalories != -1 && PROFILEMAN->GetProfile(pn)->m_iGoalCalories != m_iGoalCalories )
return false;
if( m_GoalType != GoalType_INVALID && PROFILEMAN->GetProfile(pn)->m_GoalType != m_GoalType )
if( m_GoalType != GoalType_Invalid && PROFILEMAN->GetProfile(pn)->m_GoalType != m_GoalType )
return false;
if( !m_sProfileID.empty() && ProfileManager::m_sDefaultLocalProfileID[pn].Get() != m_sProfileID )
return false;
@@ -322,7 +322,7 @@ void GameCommand::LoadOne( const Command& cmd )
else if( sName == "sort" )
{
m_SortOrder = StringToSortOrder( sValue );
if( m_SortOrder == SortOrder_INVALID )
if( m_SortOrder == SortOrder_Invalid )
{
m_sInvalidReason = ssprintf( "SortOrder \"%s\" is not valid.", sValue.c_str() );
m_bInvalid |= true;
@@ -715,7 +715,7 @@ void GameCommand::ApplySelf( const vector<PlayerNumber> &vpns ) const
}
if( !m_sSongGroup.empty() )
GAMESTATE->m_sPreferredSongGroup.Set( m_sSongGroup );
if( m_SortOrder != SortOrder_INVALID )
if( m_SortOrder != SortOrder_Invalid )
GAMESTATE->m_PreferredSortOrder = m_SortOrder;
if( !m_sUnlockEntryID.empty() )
UNLOCKMAN->UnlockEntryID( m_sUnlockEntryID );
@@ -727,7 +727,7 @@ void GameCommand::ApplySelf( const vector<PlayerNumber> &vpns ) const
if( m_iGoalCalories != -1 )
FOREACH_CONST( PlayerNumber, vpns, pn )
PROFILEMAN->GetProfile(*pn)->m_iGoalCalories = m_iGoalCalories;
if( m_GoalType != GoalType_INVALID )
if( m_GoalType != GoalType_Invalid )
FOREACH_CONST( PlayerNumber, vpns, pn )
PROFILEMAN->GetProfile(*pn)->m_GoalType = m_GoalType;
if( !m_sProfileID.empty() )
@@ -792,10 +792,10 @@ bool GameCommand::IsZero() const
m_pCharacter != NULL ||
m_CourseDifficulty != DIFFICULTY_Invalid ||
!m_sSongGroup.empty() ||
m_SortOrder != SortOrder_INVALID ||
m_SortOrder != SortOrder_Invalid ||
m_iWeightPounds != -1 ||
m_iGoalCalories != -1 ||
m_GoalType != GoalType_INVALID ||
m_GoalType != GoalType_Invalid ||
!m_sProfileID.empty() ||
!m_sUrl.empty() )
return false;
stepmania/src/GameConstantsAndTypes.h
+7 -7
View File
@@ -119,7 +119,7 @@ enum SortOrder
SORT_ENDLESS_COURSES,
SORT_ROULETTE,
NUM_SortOrder,
SortOrder_INVALID
SortOrder_Invalid
};
const SortOrder MAX_SELECTABLE_SORT = (SortOrder)(SORT_ROULETTE-1);
#define FOREACH_SortOrder( so ) FOREACH_ENUM2( SortOrder, so )
@@ -345,7 +345,7 @@ enum PerDifficultyAward
AWARD_PERCENT_90_W3,
AWARD_PERCENT_100_W3,
NUM_PerDifficultyAward,
PER_DIFFICULTY_AWARD_INVALID,
PER_DIFFICULTY_AWARD_Invalid,
};
#define FOREACH_PerDifficultyAward( pma ) FOREACH_ENUM2( PerDifficultyAward, pma )
const RString& PerDifficultyAwardToString( PerDifficultyAward pma );
@@ -367,7 +367,7 @@ enum PeakComboAward
AWARD_9000_PEAK_COMBO,
AWARD_10000_PEAK_COMBO,
NUM_PeakComboAward,
PEAK_COMBO_AWARD_INVALID,
PEAK_COMBO_AWARD_Invalid,
};
#define FOREACH_PeakComboAward( pca ) FOREACH_ENUM2( PeakComboAward, pca )
const RString& PeakComboAwardToString( PeakComboAward pma );
@@ -406,7 +406,7 @@ enum GoalType
GoalType_Time,
GoalType_None,
NUM_GoalType,
GoalType_INVALID,
GoalType_Invalid,
};
#define FOREACH_GoalType( gt ) FOREACH_ENUM2( GoalType, gt )
const RString& GoalTypeToString( GoalType gt );
@@ -421,7 +421,7 @@ enum EditMode
EditMode_Home,
EditMode_Full,
NUM_EditMode,
EditMode_INVALID,
EditMode_Invalid,
};
const RString& EditModeToString( EditMode em );
EditMode StringToEditMode( const RString& s );
@@ -444,7 +444,7 @@ enum Stage
STAGE_EVENT,
STAGE_DEMO,
NUM_Stage,
STAGE_INVALID,
STAGE_Invalid,
};
#define FOREACH_Stage( s ) FOREACH_ENUM2( Stage, s )
const RString& StageToString( Stage s );
@@ -466,7 +466,7 @@ enum MultiPlayerStatus
MultiPlayerStatus_Unplugged,
MultiPlayerStatus_MissingMultitap,
NUM_MultiPlayerStatus,
MultiPlayerStatus_INVALID
MultiPlayerStatus_Invalid
};
const RString& MultiPlayerStatusToString( MultiPlayerStatus i );
stepmania/src/GameManager.cpp
+3 -3
View File
@@ -2892,7 +2892,7 @@ MenuButton GameManager::GetMenuButtonSecondaryFunction( const Game *pGame, GameB
FOREACH_GameController(gc)
{
int iCol = pStyle->GameInputToColumn( GameInput(gc,gb) );
if( iCol != Column_INVALID )
if( iCol != Column_Invalid )
bUsedInGameplay = true;
}
}
@@ -2901,12 +2901,12 @@ MenuButton GameManager::GetMenuButtonSecondaryFunction( const Game *pGame, GameB
FOREACH_MenuButton(m)
{
if( !bUsedInGameplay && pGame->m_InputScheme.m_DedicatedMenuButton[m] == gb )
return MenuButton_INVALID;
return MenuButton_Invalid;
else if( bUsedInGameplay && pGame->m_InputScheme.m_SecondaryMenuButton[m] == gb )
return m;
}
return MenuButton_INVALID; // only used in gameplay
return MenuButton_Invalid; // only used in gameplay
}
stepmania/src/GameState.cpp
+3 -3
View File
@@ -202,10 +202,10 @@ void GameState::Reset()
m_PreferredDifficulty[p].Set( DIFFICULTY_Invalid );
m_PreferredCourseDifficulty[p].Set( DIFFICULTY_MEDIUM );
}
m_SortOrder.Set( SortOrder_INVALID );
m_SortOrder.Set( SortOrder_Invalid );
m_PreferredSortOrder = GetDefaultSort();
m_PlayMode.Set( PlayMode_Invalid );
m_EditMode = EditMode_INVALID;
m_EditMode = EditMode_Invalid;
m_bDemonstrationOrJukebox = false;
m_bJukeboxUsesModifiers = false;
m_iCurrentStageIndex = 0;
@@ -390,7 +390,7 @@ void GameState::PlayersFinalized()
ApplyPreferredModifiers( pn, sModifiers );
}
// Only set the sort order if it wasn't already set by a GameCommand (or by an earlier profile)
if( m_PreferredSortOrder == SortOrder_INVALID && pProfile->m_SortOrder != SortOrder_INVALID )
if( m_PreferredSortOrder == SortOrder_Invalid && pProfile->m_SortOrder != SortOrder_Invalid )
m_PreferredSortOrder = pProfile->m_SortOrder;
if( pProfile->m_LastDifficulty != DIFFICULTY_Invalid )
m_PreferredDifficulty[pn].Set( pProfile->m_LastDifficulty );
stepmania/src/GameState.h
+1 -1
View File
@@ -112,7 +112,7 @@ public:
BroadcastOnChange<SortOrder> m_SortOrder; // set by MusicWheel
SortOrder m_PreferredSortOrder; // used by MusicWheel
EditMode m_EditMode;
bool IsEditing() const { return m_EditMode != EditMode_INVALID; }
bool IsEditing() const { return m_EditMode != EditMode_Invalid; }
bool m_bDemonstrationOrJukebox; // ScreenGameplay does special stuff when this is true
bool m_bJukeboxUsesModifiers;
int m_iNumStagesOfThisSong;
stepmania/src/Grade.h
+2 -1
View File
@@ -31,8 +31,9 @@ enum Grade
Grade_Tier20,
Grade_Failed, // = E
NUM_Grade,
Grade_NoData, // ~GRADE_INVALID
GRADE_Invalid,
};
#define Grade_NoData GRADE_Invalid
/* This is in the header so the test sets don't require Grade.cpp (through PrefsManager),
* since that pulls in ThemeManager. */
stepmania/src/InputEventPlus.h
+1 -1
View File
@@ -12,7 +12,7 @@ class InputEventPlus
public:
InputEventPlus():
type(IET_FIRST_PRESS),
MenuI(MenuButton_INVALID),
MenuI(MenuButton_Invalid),
pn(PLAYER_INVALID),
mp(MultiPlayer_Invalid) { }
DeviceInput DeviceI;
stepmania/src/InputMapper.cpp
+2 -2
View File
@@ -936,12 +936,12 @@ MenuButton InputScheme::GameInputToMenuButton( GameInput GameI ) const
return i;
}
return MenuButton_INVALID; // invalid GameInput
return MenuButton_Invalid; // invalid GameInput
}
void InputScheme::MenuButtonToGameInputs( MenuButton MenuI, PlayerNumber pn, GameInput GameIout[4] ) const
{
ASSERT( MenuI != MenuButton_INVALID );
ASSERT( MenuI != MenuButton_Invalid );
GameIout[0].MakeInvalid(); // initialize
GameIout[1].MakeInvalid();
stepmania/src/MenuInput.h
+1 -1
View File
@@ -15,7 +15,7 @@ enum MenuButton
MENU_BUTTON_COIN,
MENU_BUTTON_OPERATOR,
NUM_MenuButton, // leave this at the end
MenuButton_INVALID
MenuButton_Invalid
};
#define FOREACH_MenuButton( m ) FOREACH_ENUM2( MenuButton, m )
stepmania/src/MusicSortDisplay.cpp
+1 -1
View File
@@ -16,7 +16,7 @@ MusicSortDisplay::MusicSortDisplay()
void MusicSortDisplay::Set( SortOrder so )
{
if( so == SortOrder_INVALID )
if( so == SortOrder_Invalid )
this->UnloadTexture();
else
Load( THEME->GetPathG("MusicSortDisplay",SortOrderToString(so)) );
stepmania/src/MusicWheel.cpp
+3 -3
View File
@@ -61,7 +61,7 @@ static SortOrder ForceAppropriateSort( PlayMode pm, SortOrder so )
case SORT_ONI_COURSES:
case SORT_NONSTOP_COURSES:
case SORT_ENDLESS_COURSES:
so = SortOrder_INVALID;
so = SortOrder_Invalid;
break;
}
@@ -148,13 +148,13 @@ void MusicWheel::BeginScreen()
/* Never start in the mode menu; some elements may not initialize correctly. */
if( GAMESTATE->m_SortOrder == SORT_MODE_MENU )
GAMESTATE->m_SortOrder.Set( SortOrder_INVALID );
GAMESTATE->m_SortOrder.Set( SortOrder_Invalid );
GAMESTATE->m_SortOrder.Set( ForceAppropriateSort(GAMESTATE->m_PlayMode, GAMESTATE->m_SortOrder) );
/* Only save the sort order if the player didn't already have one. If he did, don't
* overwrite it. */
if( GAMESTATE->m_PreferredSortOrder == SortOrder_INVALID )
if( GAMESTATE->m_PreferredSortOrder == SortOrder_Invalid )
GAMESTATE->m_PreferredSortOrder = GAMESTATE->m_SortOrder;
// HACK: invalidate currently selected song in the case that it
stepmania/src/NoteDataUtil.cpp
+4 -4
View File
@@ -43,7 +43,7 @@ NoteType NoteDataUtil::GetSmallestNoteTypeForMeasure( const NoteData &n, int iMe
}
if( nt == NUM_NoteType ) // we didn't find one
return NOTE_TYPE_INVALID; // well-formed notes created in the editor should never get here
return NOTE_TYPE_Invalid; // well-formed notes created in the editor should never get here
else
return nt;
}
@@ -337,7 +337,7 @@ void NoteDataUtil::GetSMNoteDataString( const NoteData &in, RString &sRet )
NoteType nt = GetSmallestNoteTypeForMeasure( *nd, m );
int iRowSpacing;
if( nt == NOTE_TYPE_INVALID )
if( nt == NOTE_TYPE_Invalid )
iRowSpacing = 1;
else
iRowSpacing = int(roundf( NoteTypeToBeat(nt) * ROWS_PER_BEAT ));
@@ -1644,11 +1644,11 @@ void NoteDataUtil::Stomp( NoteData &inout, StepsType st, int iStartIndex, int iE
void NoteDataUtil::SnapToNearestNoteType( NoteData &inout, NoteType nt1, NoteType nt2, int iStartIndex, int iEndIndex )
{
// nt2 is optional and should be NOTE_TYPE_INVALID if it is not used
// nt2 is optional and should be NOTE_TYPE_Invalid if it is not used
float fSnapInterval1 = NoteTypeToBeat( nt1 );
float fSnapInterval2 = 10000; // nothing will ever snap to this. That's what we want!
if( nt2 != NOTE_TYPE_INVALID )
if( nt2 != NOTE_TYPE_Invalid )
fSnapInterval2 = NoteTypeToBeat( nt2 );
// iterate over all TapNotes in the interval and snap them
stepmania/src/NoteDataUtil.h
+1 -1
View File
@@ -91,7 +91,7 @@ namespace NoteDataUtil
inline void SnapToNearestNoteType( NoteData &inout, NoteType nt, int iStartIndex, int iEndIndex )
{
SnapToNearestNoteType( inout, nt, NOTE_TYPE_INVALID, iStartIndex, iEndIndex );
SnapToNearestNoteType( inout, nt, NOTE_TYPE_Invalid, iStartIndex, iEndIndex );
}
// True if no notes in row that aren't true in the mask
stepmania/src/NoteTypes.cpp
+1 -1
View File
@@ -45,7 +45,7 @@ float NoteTypeToBeat( NoteType nt )
case NOTE_TYPE_64TH: return 1.0f/16; // sixty-fourth notes
case NOTE_TYPE_192ND: return 1.0f/48; // sixty-fourth note triplets
default: ASSERT(0); // and fall through
case NOTE_TYPE_INVALID: return 1.0f/48;
case NOTE_TYPE_Invalid: return 1.0f/48;
}
}
stepmania/src/NoteTypes.h
+1 -1
View File
@@ -186,7 +186,7 @@ enum NoteType
NOTE_TYPE_64TH, // sixty-fourth note
NOTE_TYPE_192ND,// sixty-fourth note triplet
NUM_NoteType,
NOTE_TYPE_INVALID
NOTE_TYPE_Invalid
};
const RString& NoteTypeToString( NoteType nt );
const RString& NoteTypeToLocalizedString( NoteType nt );
stepmania/src/NotesWriterDWI.cpp
+2 -2
View File
@@ -223,7 +223,7 @@ void NotesWriterDWI::WriteDWINotesField( RageFile &f, const Steps &out, int star
break;
case NOTE_TYPE_48TH:
case NOTE_TYPE_192ND:
case NOTE_TYPE_INVALID:
case NOTE_TYPE_Invalid:
// since, for whatever reason, the only way to do
// 48ths is through a block of 192nds...
f.Write( "`" );
@@ -300,7 +300,7 @@ void NotesWriterDWI::WriteDWINotesField( RageFile &f, const Steps &out, int star
break;
case NOTE_TYPE_48TH:
case NOTE_TYPE_192ND:
case NOTE_TYPE_INVALID:
case NOTE_TYPE_Invalid:
f.Write( "'" );
break;
default:
stepmania/src/PlayerStageStats.cpp
+5 -5
View File
@@ -42,8 +42,8 @@ void PlayerStageStats::Init()
fFirstSecond = FLT_MAX;
fLastSecond = 0;
m_pdaToShow = PER_DIFFICULTY_AWARD_INVALID;
m_pcaToShow = PEAK_COMBO_AWARD_INVALID;
m_pdaToShow = PER_DIFFICULTY_AWARD_Invalid;
m_pcaToShow = PEAK_COMBO_AWARD_Invalid;
m_iPersonalHighScoreIndex = -1;
m_iMachineHighScoreIndex = -1;
m_rc = RankingCategory_Invalid;
@@ -528,7 +528,7 @@ void PlayerStageStats::CalcAwards( PlayerNumber p, bool bGaveUp, bool bUsedAutop
{
LOG->Trace( "hand out awards" );
m_pcaToShow = PEAK_COMBO_AWARD_INVALID;
m_pcaToShow = PEAK_COMBO_AWARD_Invalid;
if( bGaveUp || bUsedAutoplay )
return;
@@ -573,7 +573,7 @@ void PlayerStageStats::CalcAwards( PlayerNumber p, bool bGaveUp, bool bUsedAutop
if( !vPdas.empty() )
m_pdaToShow = vPdas.back();
else
m_pdaToShow = PER_DIFFICULTY_AWARD_INVALID;
m_pdaToShow = PER_DIFFICULTY_AWARD_Invalid;
LOG->Trace( "done with per difficulty awards" );
@@ -593,7 +593,7 @@ void PlayerStageStats::CalcAwards( PlayerNumber p, bool bGaveUp, bool bUsedAutop
if( !GAMESTATE->m_vLastPeakComboAwards[p].empty() )
m_pcaToShow = GAMESTATE->m_vLastPeakComboAwards[p].back();
else
m_pcaToShow = PEAK_COMBO_AWARD_INVALID;
m_pcaToShow = PEAK_COMBO_AWARD_Invalid;
LOG->Trace( "done with per combo awards" );
stepmania/src/Profile.cpp
+1 -1
View File
@@ -99,7 +99,7 @@ void Profile::InitGeneralData()
{
m_sGuid = MakeGuid();
m_SortOrder = SortOrder_INVALID;
m_SortOrder = SortOrder_Invalid;
m_LastDifficulty = DIFFICULTY_Invalid;
m_LastCourseDifficulty = DIFFICULTY_Invalid;
m_lastSong.Unset();
stepmania/src/RageDisplay.cpp
+1 -1
View File
@@ -625,7 +625,7 @@ PixelFormat RageDisplay::FindPixelFormat( int iBPP, int iRmask, int iGmask, int
return iPixFmt;
}
return PixelFormat_INVALID;
return PixelFormat_Invalid;
}
/* These convert to OpenGL's coordinate system: -1,-1 is the bottom-left, +1,+1 is the
stepmania/src/RageDisplay.h
+1 -1
View File
@@ -63,7 +63,7 @@ enum PixelFormat
PixelFormat_BGR8,
PixelFormat_A1BGR5,
NUM_PixelFormat,
PixelFormat_INVALID
PixelFormat_Invalid
};
const RString& PixelFormatToString( PixelFormat i );
stepmania/src/RageDisplay_OGL.cpp
+2 -2
View File
@@ -1647,7 +1647,7 @@ PixelFormat RageDisplay_OGL::GetImgPixelFormat( RageSurface* &img, bool &bFreeIm
if( !bPalettedTexture && img->fmt.BytesPerPixel == 1 && !g_bColorIndexTableWorks )
bSupported = false;
if( pixfmt == PixelFormat_INVALID || !SupportsSurfaceFormat(pixfmt) )
if( pixfmt == PixelFormat_Invalid || !SupportsSurfaceFormat(pixfmt) )
bSupported = false;
if( !bSupported )
@@ -1717,7 +1717,7 @@ unsigned RageDisplay_OGL::CreateTexture(
/* Find the pixel format of the surface we've been given. */
bool bFreeImg;
PixelFormat SurfacePixFmt = GetImgPixelFormat( pImg, bFreeImg, pImg->w, pImg->h, pixfmt == PixelFormat_PAL );
ASSERT( SurfacePixFmt != PixelFormat_INVALID );
ASSERT( SurfacePixFmt != PixelFormat_Invalid );
GLenum glTexFormat = g_GLPixFmtInfo[pixfmt].internalfmt;
GLenum glImageFormat = g_GLPixFmtInfo[SurfacePixFmt].format;
stepmania/src/ScreenEdit.cpp
+3 -3
View File
@@ -622,7 +622,7 @@ static MenuDef g_CourseMode(
static int g_iLastInsertTapAttackTrack = -1;
static float g_fLastInsertAttackDurationSeconds = -1;
static float g_fLastInsertAttackPositionSeconds = -1;
static BackgroundLayer g_CurrentBGChangeLayer = BACKGROUND_LAYER_INVALID;
static BackgroundLayer g_CurrentBGChangeLayer = BACKGROUND_LAYER_Invalid;
static void SetDefaultEditorNoteSkin( size_t num, RString &sNameOut, RString &defaultValueOut )
{
@@ -2366,7 +2366,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
}
else if( SM == SM_GoToNextScreen )
{
GAMESTATE->m_EditMode = EditMode_INVALID;
GAMESTATE->m_EditMode = EditMode_Invalid;
}
else if( SM == SM_BackFromMainMenu )
{
@@ -3352,7 +3352,7 @@ void ScreenEdit::HandleBGChangeChoice( BGChangeChoice c, const vector<int> &iAns
{
m_pSong->AddBackgroundChange( g_CurrentBGChangeLayer, newChange );
}
g_CurrentBGChangeLayer = BACKGROUND_LAYER_INVALID;
g_CurrentBGChangeLayer = BACKGROUND_LAYER_Invalid;
}
void ScreenEdit::SetupCourseAttacks()
stepmania/src/ScreenEdit.h
+1 -1
View File
@@ -158,7 +158,7 @@ struct MapEditButtonToMenuButton
{
FOREACH_EditButton(e)
for( int slot = 0; slot < NUM_EDIT_TO_MENU_SLOTS; ++slot )
button[e][slot] = MenuButton_INVALID;
button[e][slot] = MenuButton_Invalid;
}
};
stepmania/src/ScreenGameplay.cpp
+3 -3
View File
@@ -2110,7 +2110,7 @@ void ScreenGameplay::Input( const InputEventPlus &input )
* However, if this is also a style button, don't do this. (pump center = start)
*/
bool bHoldingGiveUp = false;
if( GAMESTATE->GetCurrentStyle()->GameInputToColumn(input.GameI) == Column_INVALID )
if( GAMESTATE->GetCurrentStyle()->GameInputToColumn(input.GameI) == Column_Invalid )
{
bHoldingGiveUp |= ( START_GIVES_UP && input.MenuI == MENU_BUTTON_START );
bHoldingGiveUp |= ( BACK_GIVES_UP && input.MenuI == MENU_BUTTON_BACK );
@@ -2175,7 +2175,7 @@ void ScreenGameplay::Input( const InputEventPlus &input )
{
if( input.mp != MultiPlayer_Invalid &&
input.type==IET_FIRST_PRESS &&
iCol != Column_INVALID &&
iCol != Column_Invalid &&
GAMESTATE->IsMultiPlayerEnabled(input.mp) )
{
m_vPlayerInfo[input.mp].m_pPlayer->Step( iCol, -1, input.DeviceI.ts, false, bRelease );
@@ -2187,7 +2187,7 @@ void ScreenGameplay::Input( const InputEventPlus &input )
// handle a step or battle item activate
//
if( input.type==IET_FIRST_PRESS &&
iCol != Column_INVALID &&
iCol != Column_Invalid &&
GAMESTATE->IsHumanPlayer( input.pn ) )
{
AbortGiveUp( true );
stepmania/src/ScreenMapControllers.cpp
+1 -1
View File
@@ -108,7 +108,7 @@ void ScreenMapControllers::Init()
pSecondary->LoadFromFont( THEME->GetPathF("Common","title") );
MenuButton mb = GAMEMAN->GetMenuButtonSecondaryFunction( GAMESTATE->GetCurrentGame(), pKey->m_GameButton );
RString sText;
if( mb != MenuButton_INVALID )
if( mb != MenuButton_Invalid )
sText = MenuButtonToLocalizedString( mb );
ActorUtil::LoadAllCommands( *pSecondary, m_sName );
pSecondary->SetText( sText );
stepmania/src/ScreenNameEntry.cpp
+1 -1
View File
@@ -346,7 +346,7 @@ void ScreenNameEntry::Input( const InputEventPlus &input )
return; // ignore
const int iCol = GAMESTATE->GetCurrentStyle()->GameInputToColumn( input.GameI );
if( iCol != Column_INVALID && m_bStillEnteringName[input.pn] )
if( iCol != Column_Invalid && m_bStillEnteringName[input.pn] )
{
int iStringIndex = m_ColToStringIndex[input.pn][iCol];
if( iStringIndex != -1 )
stepmania/src/ScreenNetSelectMusic.cpp
+1 -1
View File
@@ -278,7 +278,7 @@ void ScreenNetSelectMusic::HandleScreenMessage( const ScreenMessage SM )
{
//XXX: HACK: This will causes ScreenSelectOptions to go back here.
NSMAN->ReportNSSOnOff(1);
GAMESTATE->m_EditMode = EditMode_INVALID;
GAMESTATE->m_EditMode = EditMode_Invalid;
NSMAN->ReportPlayerOptions();
//Update changes
stepmania/src/ScreenRanking.cpp
+2 -2
View File
@@ -63,7 +63,7 @@ static void GetAllCoursesToShow( vector<Course*> &vpOut, CourseType ct, bool bSh
{
vpOut.clear();
vector<Course*> vpCourses;
if( ct == CourseType_INVALID )
if( ct == CourseType_Invalid )
SONGMAN->GetAllCourses( vpCourses, false );
else
SONGMAN->GetCourses( ct, vpCourses, false );
@@ -442,7 +442,7 @@ void ScreenRankingScroller::Init()
case PageType_NonstopCourses: ct = COURSE_TYPE_NONSTOP; break;
case PageType_OniCourses: ct = COURSE_TYPE_ONI; break;
case PageType_SurvivalCourses: ct = COURSE_TYPE_SURVIVAL; break;
case PageType_AllCourses: ct = CourseType_INVALID; break;
case PageType_AllCourses: ct = CourseType_Invalid; break;
}
m_ListScoreRowItems.LoadCourses( ct, SHOW_ONLY_MOST_RECENT_SCORES, NUM_MOST_RECENT_SCORES_TO_SHOW );
stepmania/src/ScreenSelectMaster.cpp
+1 -1
View File
@@ -65,7 +65,7 @@ void ScreenSelectMaster::Init()
ScreenSelect::Init();
m_TrackingRepeatingInput = MenuButton_INVALID;
m_TrackingRepeatingInput = MenuButton_Invalid;
vector<PlayerNumber> vpns;
if( SHARED_SELECTION )
stepmania/src/ScreenSelectMusic.cpp
+1 -1
View File
@@ -884,7 +884,7 @@ void ScreenSelectMusic::AfterMusicChange()
g_bWantFallbackCdTitle = false;
bool bWantBanner = true;
static SortOrder s_lastSortOrder = SortOrder_INVALID;
static SortOrder s_lastSortOrder = SortOrder_Invalid;
if( GAMESTATE->m_SortOrder != s_lastSortOrder )
{
// Reload to let Lua metrics have a chance to change the help text.
stepmania/src/ScreenTestInput.cpp
+1 -1
View File
@@ -63,7 +63,7 @@ class InputList: public BitmapText
if( !PREFSMAN->m_bOnlyDedicatedMenuButtons )
{
MenuButton mb = GAMEMAN->GetMenuButtonSecondaryFunction( GAMESTATE->GetCurrentGame(), gi.button );
if( mb != MenuButton_INVALID )
if( mb != MenuButton_Invalid )
sTemp += ssprintf( " - (%s %s)", MenuButtonToLocalizedString(mb).c_str(), SECONDARY.GetValue().c_str() );
}
}
stepmania/src/StageStats.cpp
+2 -2
View File
@@ -22,7 +22,7 @@ StageStats::StageStats()
pStyle = NULL;
vpPlayedSongs.clear();
vpPossibleSongs.clear();
StageType = STAGE_INVALID;
StageType = STAGE_Invalid;
bGaveUp = false;
bUsedAutoplay = false;
fGameplaySeconds = 0;
@@ -88,7 +88,7 @@ void StageStats::AddStats( const StageStats& other )
vpPlayedSongs.push_back( *s );
FOREACH_CONST( Song*, other.vpPossibleSongs, s )
vpPossibleSongs.push_back( *s );
StageType = STAGE_INVALID; // meaningless
StageType = STAGE_Invalid; // meaningless
bGaveUp |= other.bGaveUp;
bUsedAutoplay |= other.bUsedAutoplay;
stepmania/src/StageStats.h
+1 -1
View File
@@ -31,7 +31,7 @@ public:
const Style* pStyle;
vector<Song*> vpPlayedSongs;
vector<Song*> vpPossibleSongs;
enum { STAGE_INVALID, STAGE_NORMAL, STAGE_EXTRA, STAGE_EXTRA2 } StageType;
enum { STAGE_Invalid, STAGE_NORMAL, STAGE_EXTRA, STAGE_EXTRA2 } StageType;
bool bGaveUp; // exited gameplay by giving up
bool bUsedAutoplay; // used autoplay at any point during gameplay
stepmania/src/Style.cpp
+2 -2
View File
@@ -57,11 +57,11 @@ GameInput Style::StyleInputToGameInput( int iCol, PlayerNumber pn ) const
int Style::GameInputToColumn( const GameInput &GameI ) const
{
if( m_iInputColumn[GameI.controller][GameI.button] == NO_MAPPING )
return Column_INVALID;
return Column_Invalid;
for( int i = 0; i <= GameI.button; ++i )
if( m_iInputColumn[GameI.controller][i] == END_MAPPING )
return Column_INVALID;
return Column_Invalid;
return m_iInputColumn[GameI.controller][GameI.button];
}
stepmania/src/Style.h
+1 -1
View File
@@ -10,7 +10,7 @@
const int MAX_COLS_PER_PLAYER = MAX_NOTE_TRACKS;
static const int Column_INVALID = -1;
static const int Column_Invalid = -1;
class NoteData;
class Game;
stepmania/src/Workout.cpp
+2 -2
View File
@@ -168,7 +168,7 @@ bool Workout::LoadFromFile( RString sFile )
RString s;
xml.GetChildValue("WorkoutProgram",s);
m_WorkoutProgram = StringToWorkoutProgram( s );
if( m_WorkoutProgram == WorkoutProgram_INVALID )
if( m_WorkoutProgram == WorkoutProgram_Invalid )
m_WorkoutProgram = (WorkoutProgram)0;
xml.GetChildValue("Minutes",m_iMinutes);
@@ -179,7 +179,7 @@ bool Workout::LoadFromFile( RString sFile )
xml.GetChildValue("WorkoutStepsType",s);
m_WorkoutStepsType = StringToWorkoutStepsType( s );
if( m_WorkoutStepsType == WorkoutStepsType_INVALID )
if( m_WorkoutStepsType == WorkoutStepsType_Invalid )
m_WorkoutStepsType = (WorkoutStepsType)0;
XNode *songGenres = xml.GetChild("SongGenres");
stepmania/src/Workout.h
+2 -2
View File
@@ -12,7 +12,7 @@ enum WorkoutProgram
WorkoutProgram_Runner,
WorkoutProgram_Flat,
NUM_WorkoutProgram,
WorkoutProgram_INVALID
WorkoutProgram_Invalid
};
const RString& WorkoutProgramToLocalizedString( WorkoutProgram i );
const RString& WorkoutProgramToLocalizedString( WorkoutProgram i );
@@ -23,7 +23,7 @@ enum WorkoutStepsType
WorkoutStepsType_NormalSteps,
WorkoutStepsType_WorkoutSteps,
NUM_WorkoutStepsType,
WorkoutStepsType_INVALID
WorkoutStepsType_Invalid
};
const RString& WorkoutStepsTypeToLocalizedString( WorkoutStepsType i );
WorkoutStepsType StringToWorkoutStepsType( const RString& str );
stepmania/src/song.h
+1 -1
View File
@@ -28,7 +28,7 @@ enum BackgroundLayer
BACKGROUND_LAYER_1,
BACKGROUND_LAYER_2,
NUM_BackgroundLayer,
BACKGROUND_LAYER_INVALID
BACKGROUND_LAYER_Invalid
};
#define FOREACH_BackgroundLayer( bl ) FOREACH_ENUM2( BackgroundLayer, bl )