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

Restore properly the scroll speed after a demo play

Browse Source
This commit is contained in:
Mathieu Schroeter 2019-02-20 18:13:47 +01:00
parent fe1a260d92
commit f2c2caeff9
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/event.cxx
View File

@ -1642,6 +1642,7 @@ CEvent::CEvent ()
m_bHelp = false; m_bHelp = false;
m_bAllMissions = false; m_bAllMissions = false;
m_scrollSpeed = 1; m_scrollSpeed = 1;
m_scrollSpeedPrev = -1;
m_bPause = false; m_bPause = false;
m_bShift = false; m_bShift = false;
m_shiftPhase = 0; m_shiftPhase = 0;
@ -5223,9 +5224,11 @@ CEvent::DemoRecStart ()
InitRandom (); InitRandom ();
m_pDecor->SetTime (0); m_pDecor->SetTime (0);
m_speed = 1; m_speed = 1;
this->m_scrollSpeedPrev = this->m_scrollSpeed;
this->m_scrollSpeed = 3; if (this->m_scrollSpeedPrev == -1)
this->m_scrollSpeedPrev = this->m_scrollSpeed;
this->m_scrollSpeed = 3;
m_bStartRecording = true; m_bStartRecording = true;
} }
@ -5266,10 +5269,15 @@ CEvent::DemoRecStop ()
} }
m_pDemoSDLBuffer.clear (); m_pDemoSDLBuffer.clear ();
m_bDemoRec = false; m_bDemoRec = false;
m_demoTime = 0; m_demoTime = 0;
m_bStartRecording = false; m_bStartRecording = false;
this->m_scrollSpeed = this->m_scrollSpeedPrev;
if (this->m_scrollSpeedPrev >= 0)
{
this->m_scrollSpeed = this->m_scrollSpeedPrev;
this->m_scrollSpeedPrev = -1;
}
} }
// Début de la reproduction d'une démo. // Début de la reproduction d'une démo.
@ -5349,8 +5357,9 @@ CEvent::DemoPlayStart (const std::string * demoFile)
return false; return false;
} }
this->m_scrollSpeedPrev = m_scrollSpeed; if (this->m_scrollSpeedPrev == -1)
this->m_scrollSpeed = 3; this->m_scrollSpeedPrev = this->m_scrollSpeed;
this->m_scrollSpeed = 3;
ChangePhase (EV_PHASE_PLAY); ChangePhase (EV_PHASE_PLAY);
InitRandom (); InitRandom ();
@ -5373,10 +5382,15 @@ CEvent::DemoPlayStop ()
m_pDemoSDLBuffer.clear (); m_pDemoSDLBuffer.clear ();
m_bDemoPlay = false; m_bDemoPlay = false;
m_bDemoRec = false; m_bDemoRec = false;
m_demoTime = 0; m_demoTime = 0;
this->m_scrollSpeed = this->m_scrollSpeedPrev;
if (this->m_scrollSpeedPrev >= 0)
{
this->m_scrollSpeed = this->m_scrollSpeedPrev;
this->m_scrollSpeedPrev = -1;
}
ChangePhase (EV_PHASE_INIT); ChangePhase (EV_PHASE_INIT);
} }