immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed some phases to more meaningful names

master
krzys-h 2015-07-19 23:11:41 +02:00
parent a2f1aa195b
commit 1c947f9a80
3 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/object/robotmain.cpp
View File

@ -163,7 +163,7 @@ CRobotMain::CRobotMain(CController* controller)
m_missionTimerStarted = false; m_missionTimerStarted = false;
m_missionTimer = 0.0f; m_missionTimer = 0.0f;
m_phase = PHASE_NAME; m_phase = PHASE_PLAYER_SELECT;
m_cameraRank = -1; m_cameraRank = -1;
m_visitLast = EVENT_NULL; m_visitLast = EVENT_NULL;
m_visitObject = 0; m_visitObject = 0;
@ -527,14 +527,14 @@ void CRobotMain::ChangePhase(Phase phase)
float sx = (32.0f+2.0f)/640.0f; float sx = (32.0f+2.0f)/640.0f;
float sy = (32.0f+2.0f)/480.0f; float sy = (32.0f+2.0f)/480.0f;
if (m_phase != PHASE_PERSO) if (m_phase != PHASE_APPERANCE)
{ {
m_engine->SetDrawWorld(true); m_engine->SetDrawWorld(true);
m_engine->SetDrawFront(false); m_engine->SetDrawFront(false);
m_fixScene = false; m_fixScene = false;
} }
if (m_phase == PHASE_INIT) if (m_phase == PHASE_MAIN_MENU)
{ {
m_engine->DeleteTexture("generic.png"); m_engine->DeleteTexture("generic.png");
} }
@ -568,7 +568,7 @@ void CRobotMain::ChangePhase(Phase phase)
{ {
GetLogger()->Error("An error occured while trying to load a level\n"); GetLogger()->Error("An error occured while trying to load a level\n");
GetLogger()->Error("%s\n", e.what()); GetLogger()->Error("%s\n", e.what());
ChangePhase(PHASE_INIT); ChangePhase(PHASE_MAIN_MENU);
} }
} }
@ -689,7 +689,7 @@ bool CRobotMain::ProcessEvent(Event &event)
if (event.type == EVENT_KEY_DOWN && if (event.type == EVENT_KEY_DOWN &&
event.key.key == KEY(BACKQUOTE)) // Pause ? event.key.key == KEY(BACKQUOTE)) // Pause ?
{ {
if (m_phase != PHASE_NAME && if (m_phase != PHASE_PLAYER_SELECT &&
!m_movie->IsExist() && !m_movie->IsExist() &&
!m_movieLock && !m_editLock) !m_movieLock && !m_editLock)
{ {
@ -1032,7 +1032,7 @@ bool CRobotMain::ProcessEvent(Event &event)
return false; return false;
} }
if (m_phase == PHASE_PERSO) if (m_phase == PHASE_APPERANCE)
EventObject(event); EventObject(event);
if (m_phase == PHASE_WIN || if (m_phase == PHASE_WIN ||
@ -1047,7 +1047,7 @@ bool CRobotMain::ProcessEvent(Event &event)
event.key.key == KEY(RETURN)) event.key.key == KEY(RETURN))
{ {
if (m_winTerminate) if (m_winTerminate)
ChangePhase(PHASE_INIT); ChangePhase(PHASE_MAIN_MENU);
else else
ChangePhase(PHASE_LEVEL_LIST); ChangePhase(PHASE_LEVEL_LIST);
} }
@ -1055,7 +1055,7 @@ bool CRobotMain::ProcessEvent(Event &event)
case EVENT_BUTTON_OK: case EVENT_BUTTON_OK:
if (m_winTerminate) if (m_winTerminate)
ChangePhase(PHASE_INIT); ChangePhase(PHASE_MAIN_MENU);
else else
ChangePhase(PHASE_LEVEL_LIST); ChangePhase(PHASE_LEVEL_LIST);
@ -2226,7 +2226,7 @@ void CRobotMain::HiliteClear()
//! Highlights the object with the mouse hovers over //! Highlights the object with the mouse hovers over
void CRobotMain::HiliteObject(Math::Point pos) void CRobotMain::HiliteObject(Math::Point pos)
{ {
if (m_fixScene && m_phase != PHASE_PERSO) return; if (m_fixScene && m_phase != PHASE_APPERANCE) return;
if (m_movieLock) return; if (m_movieLock) return;
if (m_movie->IsExist()) return; if (m_movie->IsExist()) return;
if (m_app->GetMouseMode() == MOUSE_NONE) return; if (m_app->GetMouseMode() == MOUSE_NONE) return;
@ -2285,7 +2285,7 @@ void CRobotMain::HiliteObject(Math::Point pos)
//! Highlights the object with the mouse hovers over //! Highlights the object with the mouse hovers over
void CRobotMain::HiliteFrame(float rTime) void CRobotMain::HiliteFrame(float rTime)
{ {
if (m_fixScene && m_phase != PHASE_PERSO) return; if (m_fixScene && m_phase != PHASE_APPERANCE) return;
if (m_movieLock) return; if (m_movieLock) return;
if (m_movie->IsExist()) return; if (m_movie->IsExist()) return;
@ -2638,7 +2638,7 @@ bool CRobotMain::EventFrame(const Event &event)
if (m_engine->GetFog()) if (m_engine->GetFog())
m_camera->SetOverBaseColor(m_particle->GetFogColor(m_engine->GetEyePt())); m_camera->SetOverBaseColor(m_particle->GetFogColor(m_engine->GetEyePt()));
} }
if (m_phase == PHASE_PERSO || if (m_phase == PHASE_APPERANCE ||
m_phase == PHASE_WIN || m_phase == PHASE_WIN ||
m_phase == PHASE_LOST) m_phase == PHASE_LOST)
{ {

14
src/object/robotmain.h
View File

@ -43,9 +43,12 @@
enum Phase enum Phase
{ {
PHASE_INIT, PHASE_WELCOME1,
PHASE_NAME, PHASE_WELCOME2,
PHASE_PERSO, PHASE_WELCOME3,
PHASE_PLAYER_SELECT,
PHASE_APPERANCE,
PHASE_MAIN_MENU,
PHASE_LEVEL_LIST, PHASE_LEVEL_LIST,
PHASE_LOADING, PHASE_LOADING,
PHASE_SIMUL, PHASE_SIMUL,
@ -65,10 +68,7 @@ enum Phase
PHASE_READs, PHASE_READs,
PHASE_WIN, PHASE_WIN,
PHASE_LOST, PHASE_LOST,
PHASE_WELCOME1, PHASE_QUIT_SCREEN,
PHASE_WELCOME2,
PHASE_WELCOME3,
PHASE_GENERIC,
}; };

72
src/ui/maindialog.cpp
View File

@ -126,7 +126,7 @@ CMainDialog::CMainDialog()
m_particle = nullptr; m_particle = nullptr;
m_pause = nullptr; m_pause = nullptr;
m_phase = PHASE_NAME; m_phase = PHASE_PLAYER_SELECT;
m_phaseSetup = PHASE_SETUPg; m_phaseSetup = PHASE_SETUPg;
m_sceneRead[0] = 0; m_sceneRead[0] = 0;
m_stackRead[0] = 0; m_stackRead[0] = 0;
@ -237,7 +237,7 @@ void CMainDialog::ChangePhase(Phase phase)
sx = (32.0f+2.0f)/640.0f; sx = (32.0f+2.0f)/640.0f;
sy = (32.0f+2.0f)/480.0f; sy = (32.0f+2.0f)/480.0f;
if ( m_phase == PHASE_INIT ) if ( m_phase == PHASE_MAIN_MENU )
{ {
pos.x = 0.35f; pos.x = 0.35f;
pos.y = 0.10f; pos.y = 0.10f;
@ -367,7 +367,7 @@ void CMainDialog::ChangePhase(Phase phase)
m_engine->SetBackForce(true); m_engine->SetBackForce(true);
} }
if ( m_phase == PHASE_NAME ) if ( m_phase == PHASE_PLAYER_SELECT )
{ {
pos.x = 0.10f; pos.x = 0.10f;
pos.y = 0.10f; pos.y = 0.10f;
@ -472,7 +472,7 @@ void CMainDialog::ChangePhase(Phase phase)
m_engine->SetBackForce(true); m_engine->SetBackForce(true);
} }
if ( m_phase == PHASE_PERSO ) if ( m_phase == PHASE_APPERANCE )
{ {
pos.x = 0.10f; pos.x = 0.10f;
pos.y = 0.10f; pos.y = 0.10f;
@ -1642,7 +1642,7 @@ void CMainDialog::ChangePhase(Phase phase)
m_engine->SetBackForce(true); m_engine->SetBackForce(true);
} }
if ( m_phase == PHASE_GENERIC ) if ( m_phase == PHASE_QUIT_SCREEN )
{ {
pos.x = 0.0f; pos.x = 0.0f;
pos.y = 0.0f; pos.y = 0.0f;
@ -1708,8 +1708,8 @@ void CMainDialog::ChangePhase(Phase phase)
m_engine->SetBackForce(true); m_engine->SetBackForce(true);
} }
if ( m_phase == PHASE_INIT || if ( m_phase == PHASE_MAIN_MENU ||
m_phase == PHASE_NAME || m_phase == PHASE_PLAYER_SELECT ||
m_phase == PHASE_LEVEL_LIST || m_phase == PHASE_LEVEL_LIST ||
m_phase == PHASE_SETUPd || m_phase == PHASE_SETUPd ||
m_phase == PHASE_SETUPg || m_phase == PHASE_SETUPg ||
@ -1821,7 +1821,7 @@ bool CMainDialog::EventProcess(const Event &event)
} }
if ( m_phase == PHASE_WELCOME3 && m_phaseTime >= welcomeLength ) if ( m_phase == PHASE_WELCOME3 && m_phaseTime >= welcomeLength )
{ {
m_main->ChangePhase(PHASE_NAME); m_main->ChangePhase(PHASE_PLAYER_SELECT);
return true; return true;
} }
@ -1873,15 +1873,15 @@ bool CMainDialog::EventProcess(const Event &event)
(event.type == EVENT_KEY_DOWN && event.key.key == KEY(RETURN) ) ) (event.type == EVENT_KEY_DOWN && event.key.key == KEY(RETURN) ) )
{ {
StopDialog(); StopDialog();
if ( m_phase == PHASE_NAME ) if ( m_phase == PHASE_PLAYER_SELECT )
{ {
NameDelete(); NameDelete();
} }
if ( m_phase == PHASE_INIT ) if ( m_phase == PHASE_MAIN_MENU )
{ {
//? m_eventQueue->MakeEvent(newEvent, EVENT_QUIT); //? m_eventQueue->MakeEvent(newEvent, EVENT_QUIT);
//? m_eventQueue->AddEvent(newEvent); //? m_eventQueue->AddEvent(newEvent);
m_main->ChangePhase(PHASE_GENERIC); m_main->ChangePhase(PHASE_QUIT_SCREEN);
} }
if ( m_phase == PHASE_SIMUL ) if ( m_phase == PHASE_SIMUL )
{ {
@ -1940,7 +1940,7 @@ bool CMainDialog::EventProcess(const Event &event)
return false; return false;
} }
if ( m_phase == PHASE_INIT ) if ( m_phase == PHASE_MAIN_MENU )
{ {
switch( event.type ) switch( event.type )
{ {
@ -1949,7 +1949,7 @@ bool CMainDialog::EventProcess(const Event &event)
{ {
//? StartQuit(); // would you leave? //? StartQuit(); // would you leave?
m_sound->Play(SOUND_TZOING); m_sound->Play(SOUND_TZOING);
m_main->ChangePhase(PHASE_GENERIC); m_main->ChangePhase(PHASE_QUIT_SCREEN);
return false; return false;
} }
return true; return true;
@ -1958,7 +1958,7 @@ bool CMainDialog::EventProcess(const Event &event)
case EVENT_INTERFACE_QUIT: case EVENT_INTERFACE_QUIT:
//? StartQuit(); // would you leave? //? StartQuit(); // would you leave?
m_sound->Play(SOUND_TZOING); m_sound->Play(SOUND_TZOING);
m_main->ChangePhase(PHASE_GENERIC); m_main->ChangePhase(PHASE_QUIT_SCREEN);
break; break;
case EVENT_INTERFACE_TRAINER: case EVENT_INTERFACE_TRAINER:
@ -1991,7 +1991,7 @@ bool CMainDialog::EventProcess(const Event &event)
break; break;
case EVENT_INTERFACE_NAME: case EVENT_INTERFACE_NAME:
m_main->ChangePhase(PHASE_NAME); m_main->ChangePhase(PHASE_PLAYER_SELECT);
break; break;
default: default:
@ -2000,7 +2000,7 @@ bool CMainDialog::EventProcess(const Event &event)
return false; return false;
} }
if ( m_phase == PHASE_NAME ) if ( m_phase == PHASE_PLAYER_SELECT )
{ {
switch( event.type ) switch( event.type )
{ {
@ -2017,7 +2017,7 @@ bool CMainDialog::EventProcess(const Event &event)
if ( pb == 0 ) break; if ( pb == 0 ) break;
if ( pb->TestState(STATE_ENABLE) ) if ( pb->TestState(STATE_ENABLE) )
{ {
m_main->ChangePhase(PHASE_INIT); m_main->ChangePhase(PHASE_MAIN_MENU);
} }
} }
break; break;
@ -2037,11 +2037,11 @@ bool CMainDialog::EventProcess(const Event &event)
case EVENT_INTERFACE_PERSO: case EVENT_INTERFACE_PERSO:
NameSelect(); NameSelect();
m_main->ChangePhase(PHASE_PERSO); m_main->ChangePhase(PHASE_APPERANCE);
break; break;
case EVENT_INTERFACE_NCANCEL: case EVENT_INTERFACE_NCANCEL:
m_main->ChangePhase(PHASE_INIT); m_main->ChangePhase(PHASE_MAIN_MENU);
break; break;
case EVENT_INTERFACE_NDELETE: case EVENT_INTERFACE_NDELETE:
@ -2058,7 +2058,7 @@ bool CMainDialog::EventProcess(const Event &event)
return false; return false;
} }
if ( m_phase == PHASE_PERSO ) if ( m_phase == PHASE_APPERANCE )
{ {
PlayerApperance& apperance = m_main->GetPlayerProfile()->GetApperance(); PlayerApperance& apperance = m_main->GetPlayerProfile()->GetApperance();
switch( event.type ) switch( event.type )
@ -2066,11 +2066,11 @@ bool CMainDialog::EventProcess(const Event &event)
case EVENT_KEY_DOWN: case EVENT_KEY_DOWN:
if ( event.key.key == KEY(RETURN) ) if ( event.key.key == KEY(RETURN) )
{ {
m_main->ChangePhase(PHASE_INIT); m_main->ChangePhase(PHASE_MAIN_MENU);
} }
if ( event.key.key == KEY(ESCAPE) ) if ( event.key.key == KEY(ESCAPE) )
{ {
m_main->ChangePhase(PHASE_NAME); m_main->ChangePhase(PHASE_PLAYER_SELECT);
} }
break; break;
@ -2167,12 +2167,12 @@ bool CMainDialog::EventProcess(const Event &event)
case EVENT_INTERFACE_POK: case EVENT_INTERFACE_POK:
m_main->GetPlayerProfile()->SaveApperance(); m_main->GetPlayerProfile()->SaveApperance();
m_main->ChangePhase(PHASE_INIT); m_main->ChangePhase(PHASE_MAIN_MENU);
break; break;
case EVENT_INTERFACE_PCANCEL: case EVENT_INTERFACE_PCANCEL:
m_main->GetPlayerProfile()->LoadApperance(); // reload apperance from file m_main->GetPlayerProfile()->LoadApperance(); // reload apperance from file
m_main->ChangePhase(PHASE_NAME); m_main->ChangePhase(PHASE_PLAYER_SELECT);
break; break;
default: default:
@ -2190,7 +2190,7 @@ bool CMainDialog::EventProcess(const Event &event)
event.type == EVENT_INTERFACE_BACK || event.type == EVENT_INTERFACE_BACK ||
(event.type == EVENT_KEY_DOWN && event.key.key == KEY(ESCAPE)) ) (event.type == EVENT_KEY_DOWN && event.key.key == KEY(ESCAPE)) )
{ {
m_main->ChangePhase(PHASE_INIT); m_main->ChangePhase(PHASE_MAIN_MENU);
return false; return false;
} }
@ -2251,7 +2251,7 @@ bool CMainDialog::EventProcess(const Event &event)
{ {
SetupMemorize(); SetupMemorize();
m_engine->ApplyChange(); m_engine->ApplyChange();
m_main->ChangePhase(PHASE_INIT); m_main->ChangePhase(PHASE_MAIN_MENU);
return false; return false;
} }
@ -2762,23 +2762,23 @@ bool CMainDialog::EventProcess(const Event &event)
if ( event.type == EVENT_KEY_DOWN || if ( event.type == EVENT_KEY_DOWN ||
event.type == EVENT_MOUSE_BUTTON_DOWN ) event.type == EVENT_MOUSE_BUTTON_DOWN )
{ {
m_main->ChangePhase(PHASE_NAME); m_main->ChangePhase(PHASE_PLAYER_SELECT);
return true; return true;
} }
} }
if ( m_phase == PHASE_GENERIC ) if ( m_phase == PHASE_QUIT_SCREEN )
{ {
if ( event.type == EVENT_INTERFACE_ABORT ) if ( event.type == EVENT_INTERFACE_ABORT )
{ {
ChangePhase(PHASE_INIT); ChangePhase(PHASE_MAIN_MENU);
} }
if ( event.type == EVENT_KEY_DOWN ) if ( event.type == EVENT_KEY_DOWN )
{ {
if ( event.key.key == KEY(ESCAPE) ) if ( event.key.key == KEY(ESCAPE) )
{ {
ChangePhase(PHASE_INIT); ChangePhase(PHASE_MAIN_MENU);
} }
else else
{ {
@ -2809,7 +2809,7 @@ void CMainDialog::GlintMove()
pw = static_cast<CWindow*>(m_interface->SearchControl(EVENT_WINDOW5)); pw = static_cast<CWindow*>(m_interface->SearchControl(EVENT_WINDOW5));
if ( pw == 0 ) return; if ( pw == 0 ) return;
if ( m_phase == PHASE_INIT ) if ( m_phase == PHASE_MAIN_MENU )
{ {
pg = static_cast<CGroup*>(pw->SearchControl(EVENT_INTERFACE_GLINTl)); pg = static_cast<CGroup*>(pw->SearchControl(EVENT_INTERFACE_GLINTl));
if ( pg != 0 ) if ( pg != 0 )
@ -2840,7 +2840,7 @@ void CMainDialog::GlintMove()
} }
} }
if ( m_phase == PHASE_NAME || if ( m_phase == PHASE_PLAYER_SELECT ||
m_phase == PHASE_LEVEL_LIST ) m_phase == PHASE_LEVEL_LIST )
{ {
pg = static_cast<CGroup*>(pw->SearchControl(EVENT_INTERFACE_GLINTl)); pg = static_cast<CGroup*>(pw->SearchControl(EVENT_INTERFACE_GLINTl));
@ -3055,12 +3055,12 @@ void CMainDialog::FrameParticle(float rTime)
if ( m_bDialog || !m_bRain ) return; if ( m_bDialog || !m_bRain ) return;
if ( m_phase == PHASE_INIT ) if ( m_phase == PHASE_MAIN_MENU )
{ {
pParti = partiPosInit; pParti = partiPosInit;
pGlint = glintPosInit; pGlint = glintPosInit;
} }
else if ( m_phase == PHASE_NAME || else if ( m_phase == PHASE_PLAYER_SELECT ||
m_phase == PHASE_LEVEL_LIST || m_phase == PHASE_LEVEL_LIST ||
m_phase == PHASE_SETUPd || m_phase == PHASE_SETUPd ||
m_phase == PHASE_SETUPg || m_phase == PHASE_SETUPg ||
@ -3469,7 +3469,7 @@ void CMainDialog::NameSelect()
m_main->SelectPlayer(pl->GetItemName(sel)); m_main->SelectPlayer(pl->GetItemName(sel));
} }
m_main->ChangePhase(PHASE_INIT); m_main->ChangePhase(PHASE_MAIN_MENU);
} }
// Creates a new player. // Creates a new player.
@ -5793,7 +5793,7 @@ bool CMainDialog::GetHimselfDamage()
bool CMainDialog::GetGamerOnlyHead() bool CMainDialog::GetGamerOnlyHead()
{ {
return (m_phase == PHASE_PERSO && m_apperanceTab == 0); return (m_phase == PHASE_APPERANCE && m_apperanceTab == 0);
} }
float CMainDialog::GetPersoAngle() float CMainDialog::GetPersoAngle()