backup/planetblupi
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
Code Issues Projects Releases Activity

Fix cheat text visibility regression

Browse Source
This commit is contained in:
Mathieu Schroeter 2017-10-11 16:50:00 +02:00
parent 1b242ca3aa
commit c81b41192d
2 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/event.cxx
View File

@ -1552,7 +1552,6 @@ CEvent::CEvent ()
m_bSpeed = false; m_bSpeed = false;
m_bHelp = false; m_bHelp = false;
m_bAllMissions = false; m_bAllMissions = false;
m_bChangeCheat = false;
m_scrollSpeed = 1; m_scrollSpeed = 1;
m_bPause = false; m_bPause = false;
m_bShift = false; m_bShift = false;
@ -1968,12 +1967,10 @@ CEvent::DrawButtons ()
bool bEnable; bool bEnable;
if ( if (
(m_phase == EV_PHASE_PLAY && m_bChangeCheat) || (m_phase == EV_PHASE_PLAY) ||
(m_phase != EV_PHASE_PLAY && m_phase != EV_PHASE_INSERT && (m_phase != EV_PHASE_PLAY && m_phase != EV_PHASE_INSERT &&
m_phase != EV_PHASE_INTRO1 && m_phase != EV_PHASE_BYE)) m_phase != EV_PHASE_INTRO1 && m_phase != EV_PHASE_BYE))
{ {
m_bChangeCheat = false;
text[0] = 0; text[0] = 0;
if (m_bAllMissions) if (m_bAllMissions)
AddCheatCode (text, cheat_code[3]); AddCheatCode (text, cheat_code[3]);
@ -1985,14 +1982,17 @@ CEvent::DrawButtons ()
AddCheatCode (text, cheat_code[6]); AddCheatCode (text, cheat_code[6]);
if (m_pDecor->GetSuper ()) if (m_pDecor->GetSuper ())
AddCheatCode (text, cheat_code[7]); AddCheatCode (text, cheat_code[7]);
pos.x = 2;
pos.y = 2; if (text[0])
rect.left = pos.x; {
rect.right = pos.x + 300; pos.x = 2;
rect.top = pos.y; pos.y = 2;
rect.bottom = pos.y + DIMLITTLEY; rect.left = pos.x;
m_pPixmap->DrawPart (-1, CHBACK, pos, rect, 1); // dessine le fond rect.right = pos.x + 300;
DrawText (m_pPixmap, pos, text, FONTLITTLE); rect.top = pos.y;
rect.bottom = pos.y + DIMLITTLEY;
DrawText (m_pPixmap, pos, text, FONTLITTLE);
}
} }
if (m_phase == EV_PHASE_INIT) if (m_phase == EV_PHASE_INIT)
@ -3188,7 +3188,6 @@ CEvent::ChangePhase (Uint32 phase)
m_pDecor->NextPhase (0); // refait la carte tout de suite m_pDecor->NextPhase (0); // refait la carte tout de suite
m_pDecor->StatisticInit (); m_pDecor->StatisticInit ();
m_pDecor->TerminatedInit (); m_pDecor->TerminatedInit ();
m_bChangeCheat = true; // affiche les cheat-codes
} }
if (m_phase == EV_PHASE_BUILD) if (m_phase == EV_PHASE_BUILD)
@ -5111,42 +5110,36 @@ CEvent::TreatEventBase (const SDL_Event & event)
{ {
m_bAllMissions = !m_bAllMissions; m_bAllMissions = !m_bAllMissions;
bEnable = m_bAllMissions; bEnable = m_bAllMissions;
m_bChangeCheat = true;
break; break;
} }
case 4: // quick ? case 4: // quick ?
{ {
m_bSpeed = !m_bSpeed; m_bSpeed = !m_bSpeed;
bEnable = m_bSpeed; bEnable = m_bSpeed;
m_bChangeCheat = true;
break; break;
} }
case 5: // helpme ? case 5: // helpme ?
{ {
m_bHelp = !m_bHelp; m_bHelp = !m_bHelp;
bEnable = m_bHelp; bEnable = m_bHelp;
m_bChangeCheat = true;
break; break;
} }
case 6: // invincible ? case 6: // invincible ?
{ {
m_pDecor->SetInvincible (!m_pDecor->GetInvincible ()); m_pDecor->SetInvincible (!m_pDecor->GetInvincible ());
bEnable = m_pDecor->GetInvincible (); bEnable = m_pDecor->GetInvincible ();
m_bChangeCheat = true;
break; break;
} }
case 7: // superblupi ? case 7: // superblupi ?
{ {
m_pDecor->SetSuper (!m_pDecor->GetSuper ()); m_pDecor->SetSuper (!m_pDecor->GetSuper ());
bEnable = m_pDecor->GetSuper (); bEnable = m_pDecor->GetSuper ();
m_bChangeCheat = true;
break; break;
} }
case 8: // construire ? case 8: // construire ?
{ {
m_bAccessBuild = !m_bAccessBuild; m_bAccessBuild = !m_bAccessBuild;
bEnable = m_bAccessBuild; bEnable = m_bAccessBuild;
m_bChangeCheat = true;
break; break;
} }
} }

1
src/event.h
View File

@ -238,7 +238,6 @@ protected:
bool m_bSpeed; bool m_bSpeed;
bool m_bHelp; bool m_bHelp;
bool m_bAllMissions; bool m_bAllMissions;
bool m_bChangeCheat;
Sint32 m_scrollSpeed; Sint32 m_scrollSpeed;
bool m_bPause; bool m_bPause;
bool m_bShift; bool m_bShift;