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

Added debug menu option for resetting key mappings to default. Added sanity checking requirement to ScreenMapControllers.

Browse Source
This commit is contained in:
Kyzentun
2014-11-30 14:45:52 -07:00
parent e8c208395d
commit d3b5f5eb98
8 changed files with 171 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ScreenMapControllers.cpp
+61 -4
View File
@@ -200,6 +200,10 @@ void ScreenMapControllers::Init()
m_NoSetListPrompt->SetName("NoSetListPrompt");
this->AddChild(m_NoSetListPrompt);
m_SanityMessage.Load(THEME->GetPathG(m_sName, "sanitymessage"));
m_SanityMessage->SetName("SanityMessage");
this->AddChild(m_SanityMessage);
m_Warning.Load(THEME->GetPathG(m_sName, "warning"));
m_Warning->SetName("Warning");
m_Warning->SetDrawOrder(DRAW_ORDER_TRANSITIONS);
@@ -222,6 +226,7 @@ void ScreenMapControllers::BeginScreen()
m_fLockInputSecs= THEME->GetMetricF(m_sName, "LockInputSecs");
m_AutoDismissWarningSecs= THEME->GetMetricF(m_sName, "AutoDismissWarningSecs");
m_AutoDismissNoSetListPromptSecs= 0.0f;
m_AutoDismissSanitySecs= 0.0f;
m_Warning->PlayCommand("TweenOn");
}
@@ -247,6 +252,14 @@ void ScreenMapControllers::Update( float fDeltaTime )
m_NoSetListPrompt->PlayCommand("TweenOff");
}
}
if(m_AutoDismissSanitySecs > 0.0f)
{
m_AutoDismissSanitySecs-= fDeltaTime;
if(m_AutoDismissSanitySecs <= 0.0f)
{
m_SanityMessage->PlayCommand("TweenOff");
}
}
//
// Update devices text
@@ -349,6 +362,18 @@ bool ScreenMapControllers::Input( const InputEventPlus &input )
}
return false;
}
if(m_AutoDismissSanitySecs > 0.0f)
{
if(input.type == IET_FIRST_PRESS &&
input.DeviceI.device == DEVICE_KEYBOARD &&
input.DeviceI.button == KEY_ENTER)
{
m_AutoDismissSanitySecs = 0.0f;
m_SanityMessage->PlayCommand("TweenOff");
}
return false;
}
if( input.type != IET_FIRST_PRESS && input.type != IET_REPEAT )
{
@@ -706,8 +731,11 @@ void ScreenMapControllers::ReloadFromDisk()
void ScreenMapControllers::SaveToDisk()
{
INPUTMAPPER->SaveMappingsToDisk();
m_ChangeOccurred= false;
if(SanityCheckWrapper())
{
INPUTMAPPER->SaveMappingsToDisk();
m_ChangeOccurred= false;
}
}
void ScreenMapControllers::SetListMode()
@@ -732,8 +760,13 @@ void ScreenMapControllers::ExitAction()
{
if(m_ChangeOccurred)
{
ScreenPrompt::Prompt(SM_DoSaveAndExit, SAVE_PROMPT, PROMPT_YES_NO_CANCEL,
ANSWER_YES);
// If the current mapping doesn't pass the sanity check, then the user
// can't navigate the prompt screen to pick a choice. -Kyz
if(SanityCheckWrapper())
{
ScreenPrompt::Prompt(SM_DoSaveAndExit, SAVE_PROMPT,
PROMPT_YES_NO_CANCEL, ANSWER_YES);
}
}
else
{
@@ -742,6 +775,30 @@ void ScreenMapControllers::ExitAction()
}
}
bool ScreenMapControllers::SanityCheckWrapper()
{
vector<RString> reasons_not_sane;
INPUTMAPPER->SanityCheckMappings(reasons_not_sane);
if(reasons_not_sane.empty())
{
return true;
}
else
{
FOREACH(RString, reasons_not_sane, reason)
{
*reason= THEME->GetString("ScreenMapControllers", *reason);
}
RString joined_reasons= join("\n", reasons_not_sane);
joined_reasons= THEME->GetString("ScreenMapControllers", "VitalButtons") + "\n" + joined_reasons;
Message msg("SetText");
msg.SetParam("Text", joined_reasons);
m_SanityMessage->HandleMessage(msg);
m_AutoDismissSanitySecs= THEME->GetMetricF(m_sName, "AutoDismissSanitySecs");
return false;
}
}
void ScreenMapControllers::ActionRow::Load(RString const& scr_name,
RString const& name, ScreenMapControllers::action_fun_t action,
ActorFrame* line, ActorScroller* scroller)