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 the phase where to return from the READ phase

Browse Source 
If the game is not started, it must just return to the INFO phase
instead of the STOP phase.
This commit is contained in:
Mathieu Schroeter 2018-08-08 07:15:55 +02:00
parent b1c6fa9003
commit 1e45e9ee1c
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/def.h
View File

@ -556,6 +556,7 @@ enum ShiftDirection {
#define EV_READ7 (EV_OFFSET+307)
#define EV_READ8 (EV_OFFSET+308)
#define EV_READ9 (EV_OFFSET+309)
#define EV_READ10 (EV_OFFSET+320)
#define EV_WRITE0 (EV_OFFSET+310)
#define EV_WRITE1 (EV_OFFSET+311)

18
src/event.cxx
View File

@ -642,7 +642,7 @@ static Phase table[] =
{},
},
{
EV_PHASE_STOP,
EV_READ10,
0, {1, 40},
16, 424,
{ translate ("Finish") },
@ -5670,13 +5670,17 @@ CEvent::TreatEventBase (const SDL_Event & event)
case EV_PHASE_PLAY:
case EV_PHASE_SETUP:
case EV_PHASE_SETUPp:
case EV_PHASE_READ:
case EV_PHASE_WRITE:
case EV_PHASE_WRITEp:
case EV_PHASE_HELP:
ChangePhase (EV_PHASE_STOP);
return true;
case EV_PHASE_READ:
ChangePhase (
this->m_pDecor->GetTime () ? EV_PHASE_STOP : EV_PHASE_INFO);
return true;
case EV_PHASE_STOP:
ChangePhase (EV_PHASE_PLAY);
return true;
@ -5719,12 +5723,16 @@ CEvent::TreatEventBase (const SDL_Event & event)
return true;
case EV_PHASE_PLAY:
case EV_PHASE_READ:
case EV_PHASE_WRITE:
case EV_PHASE_SETUP:
ChangePhase (EV_PHASE_STOP);
return true;
case EV_PHASE_READ:
ChangePhase (
this->m_pDecor->GetTime () ? EV_PHASE_STOP : EV_PHASE_INFO);
return true;
case EV_PHASE_INIT:
case EV_PHASE_LOST:
case EV_PHASE_BUILD:
@ -6206,6 +6214,10 @@ CEvent::TreatEventBase (const SDL_Event & event)
ChangePhase (EV_PHASE_PLAY); // joue
break;
case EV_READ10:
ChangePhase (this->m_pDecor->GetTime () ? EV_PHASE_STOP : EV_PHASE_INFO);
break;
case EV_WRITE0:
case EV_WRITE1:
case EV_WRITE2: