Simple one to fix.
This commit is contained in:
Jason Felds
+95
-94
@@ -1,94 +1,95 @@
|
|||||||
#include "global.h"
|
#include "global.h"
|
||||||
#include "ScreenUnlockBrowse.h"
|
#include "ScreenUnlockBrowse.h"
|
||||||
#include "UnlockManager.h"
|
#include "UnlockManager.h"
|
||||||
|
|
||||||
|
|
||||||
REGISTER_SCREEN_CLASS( ScreenUnlockBrowse );
|
REGISTER_SCREEN_CLASS( ScreenUnlockBrowse );
|
||||||
|
|
||||||
void ScreenUnlockBrowse::Init()
|
void ScreenUnlockBrowse::Init()
|
||||||
{
|
{
|
||||||
// fill m_aGameCommands before calling Init()
|
int index = 0;
|
||||||
FOREACH_CONST( UnlockEntry, UNLOCKMAN->m_UnlockEntries, ue )
|
// fill m_aGameCommands before calling Init()
|
||||||
{
|
for (UnlockEntry const &ue : UNLOCKMAN->m_UnlockEntries)
|
||||||
GameCommand gc;
|
{
|
||||||
UnlockEntryStatus st = ue->GetUnlockEntryStatus();
|
GameCommand gc;
|
||||||
switch( st )
|
UnlockEntryStatus st = ue.GetUnlockEntryStatus();
|
||||||
{
|
switch( st )
|
||||||
default:
|
{
|
||||||
FAIL_M(ssprintf("Invalid UnlockEntryStatus: %i", st));
|
default:
|
||||||
case UnlockEntryStatus_RequirementsMet:
|
FAIL_M(ssprintf("Invalid UnlockEntryStatus: %i", st));
|
||||||
case UnlockEntryStatus_Unlocked:
|
case UnlockEntryStatus_RequirementsMet:
|
||||||
gc.m_bInvalid = false;
|
case UnlockEntryStatus_Unlocked:
|
||||||
break;
|
gc.m_bInvalid = false;
|
||||||
case UnlockEntryStatus_RequrementsNotMet:
|
break;
|
||||||
break;
|
case UnlockEntryStatus_RequrementsNotMet:
|
||||||
}
|
break;
|
||||||
gc.m_iIndex = ue - UNLOCKMAN->m_UnlockEntries.begin();
|
}
|
||||||
// gc.m_sUnlockEntryID = ue->m_sEntryID;
|
gc.m_iIndex = index++;
|
||||||
gc.m_sName = ssprintf("%d",gc.m_iIndex);
|
// gc.m_sUnlockEntryID = ue->m_sEntryID;
|
||||||
|
gc.m_sName = ssprintf("%d",gc.m_iIndex);
|
||||||
m_aGameCommands.push_back( gc );
|
|
||||||
}
|
m_aGameCommands.push_back( gc );
|
||||||
|
}
|
||||||
ScreenSelectMaster::Init();
|
|
||||||
|
ScreenSelectMaster::Init();
|
||||||
m_banner.SetName( "Banner" );
|
|
||||||
LOAD_ALL_COMMANDS_AND_SET_XY( m_banner );
|
m_banner.SetName( "Banner" );
|
||||||
this->AddChild( &m_banner );
|
LOAD_ALL_COMMANDS_AND_SET_XY( m_banner );
|
||||||
|
this->AddChild( &m_banner );
|
||||||
this->SubscribeToMessage( Message_MenuSelectionChanged );
|
|
||||||
}
|
this->SubscribeToMessage( Message_MenuSelectionChanged );
|
||||||
|
}
|
||||||
void ScreenUnlockBrowse::BeginScreen()
|
|
||||||
{
|
void ScreenUnlockBrowse::BeginScreen()
|
||||||
ScreenSelectMaster::BeginScreen();
|
{
|
||||||
|
ScreenSelectMaster::BeginScreen();
|
||||||
HandleMessage( Message(MessageIDToString(Message_MenuSelectionChanged)) );
|
|
||||||
}
|
HandleMessage( Message(MessageIDToString(Message_MenuSelectionChanged)) );
|
||||||
|
}
|
||||||
bool ScreenUnlockBrowse::MenuStart( const InputEventPlus &input )
|
|
||||||
{
|
bool ScreenUnlockBrowse::MenuStart( const InputEventPlus &input )
|
||||||
m_soundStart.Play();
|
{
|
||||||
this->PostScreenMessage( SM_BeginFadingOut, 0 );
|
m_soundStart.Play();
|
||||||
return true;
|
this->PostScreenMessage( SM_BeginFadingOut, 0 );
|
||||||
}
|
return true;
|
||||||
|
}
|
||||||
void ScreenUnlockBrowse::HandleMessage( const Message &msg )
|
|
||||||
{
|
void ScreenUnlockBrowse::HandleMessage( const Message &msg )
|
||||||
if( msg == Message_MenuSelectionChanged )
|
{
|
||||||
{
|
if( msg == Message_MenuSelectionChanged )
|
||||||
int iSelection = this->GetSelectionIndex(PLAYER_1);
|
{
|
||||||
const UnlockEntry &ue = UNLOCKMAN->m_UnlockEntries[ iSelection ];
|
int iSelection = this->GetSelectionIndex(PLAYER_1);
|
||||||
if( ue.IsLocked() )
|
const UnlockEntry &ue = UNLOCKMAN->m_UnlockEntries[ iSelection ];
|
||||||
m_banner.LoadFallback();
|
if( ue.IsLocked() )
|
||||||
else
|
m_banner.LoadFallback();
|
||||||
m_banner.LoadBannerFromUnlockEntry( &ue );
|
else
|
||||||
}
|
m_banner.LoadBannerFromUnlockEntry( &ue );
|
||||||
|
}
|
||||||
ScreenSelectMaster::HandleMessage( msg );
|
|
||||||
}
|
ScreenSelectMaster::HandleMessage( msg );
|
||||||
|
}
|
||||||
/*
|
|
||||||
* (c) 2006 Chris Danford
|
/*
|
||||||
* All rights reserved.
|
* (c) 2006 Chris Danford
|
||||||
*
|
* All rights reserved.
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
*
|
||||||
* copy of this software and associated documentation files (the
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
* "Software"), to deal in the Software without restriction, including
|
* copy of this software and associated documentation files (the
|
||||||
* without limitation the rights to use, copy, modify, merge, publish,
|
* "Software"), to deal in the Software without restriction, including
|
||||||
* distribute, and/or sell copies of the Software, and to permit persons to
|
* without limitation the rights to use, copy, modify, merge, publish,
|
||||||
* whom the Software is furnished to do so, provided that the above
|
* distribute, and/or sell copies of the Software, and to permit persons to
|
||||||
* copyright notice(s) and this permission notice appear in all copies of
|
* whom the Software is furnished to do so, provided that the above
|
||||||
* the Software and that both the above copyright notice(s) and this
|
* copyright notice(s) and this permission notice appear in all copies of
|
||||||
* permission notice appear in supporting documentation.
|
* the Software and that both the above copyright notice(s) and this
|
||||||
*
|
* permission notice appear in supporting documentation.
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
*
|
||||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||||
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
||||||
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
||||||
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
||||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
||||||
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
||||||
* PERFORMANCE OF THIS SOFTWARE.
|
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
||||||
*/
|
* PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user