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

Handle properly the stup exit like with the read screen

Browse Source 
Lokk for previous commits...
This commit is contained in:
Mathieu Schroeter 2018-08-08 07:26:49 +02:00
parent f1c84ce99c
commit 78461d694f
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/def.h
View File

@ -611,6 +611,8 @@ enum ShiftDirection {
#define EV_MUSIC_STOP (EV_OFFSET+550) #define EV_MUSIC_STOP (EV_OFFSET+550)
#define EV_SETUP_EXIT (EV_OFFSET+560)
#define EV_PREV (EV_OFFSET+600) #define EV_PREV (EV_OFFSET+600)
#define EV_NEXT (EV_OFFSET+601) #define EV_NEXT (EV_OFFSET+601)
#define EV_MOVIE (EV_OFFSET+602) #define EV_MOVIE (EV_OFFSET+602)

7
src/event.cxx
View File

@ -484,7 +484,7 @@ static Phase table[] =
{ translate ("Faster") }, { translate ("Faster") },
}, },
{ {
EV_PHASE_STOP, EV_SETUP_EXIT,
0, {1, 40}, 0, {1, 40},
11, 424, 11, 424,
{ translate ("Finish") }, { translate ("Finish") },
@ -5668,7 +5668,6 @@ CEvent::TreatEventBase (const SDL_Event & event)
switch (m_phase) switch (m_phase)
{ {
case EV_PHASE_PLAY: case EV_PHASE_PLAY:
case EV_PHASE_SETUP:
case EV_PHASE_SETUPp: case EV_PHASE_SETUPp:
case EV_PHASE_WRITE: case EV_PHASE_WRITE:
case EV_PHASE_WRITEp: case EV_PHASE_WRITEp:
@ -5676,6 +5675,7 @@ CEvent::TreatEventBase (const SDL_Event & event)
ChangePhase (EV_PHASE_STOP); ChangePhase (EV_PHASE_STOP);
return true; return true;
case EV_PHASE_SETUP:
case EV_PHASE_READ: case EV_PHASE_READ:
ChangePhase ( ChangePhase (
this->m_pDecor->GetTime () ? EV_PHASE_STOP : EV_PHASE_INFO); this->m_pDecor->GetTime () ? EV_PHASE_STOP : EV_PHASE_INFO);
@ -5724,10 +5724,10 @@ CEvent::TreatEventBase (const SDL_Event & event)
case EV_PHASE_PLAY: case EV_PHASE_PLAY:
case EV_PHASE_WRITE: case EV_PHASE_WRITE:
case EV_PHASE_SETUP:
ChangePhase (EV_PHASE_STOP); ChangePhase (EV_PHASE_STOP);
return true; return true;
case EV_PHASE_SETUP:
case EV_PHASE_READ: case EV_PHASE_READ:
ChangePhase ( ChangePhase (
this->m_pDecor->GetTime () ? EV_PHASE_STOP : EV_PHASE_INFO); this->m_pDecor->GetTime () ? EV_PHASE_STOP : EV_PHASE_INFO);
@ -6214,6 +6214,7 @@ CEvent::TreatEventBase (const SDL_Event & event)
ChangePhase (EV_PHASE_PLAY); // joue ChangePhase (EV_PHASE_PLAY); // joue
break; break;
case EV_SETUP_EXIT:
case EV_READ_EXIT: case EV_READ_EXIT:
ChangePhase (this->m_pDecor->GetTime () ? EV_PHASE_STOP : EV_PHASE_INFO); ChangePhase (this->m_pDecor->GetTime () ? EV_PHASE_STOP : EV_PHASE_INFO);
break; break;