Merge remote-tracking branch 'upstream/master'

src/animation/CutsceneMgr.cpp

@@ -410,7 +410,7 @@ CCutsceneMgr::Update(void)
 
 	if (!ms_running) return;
 
-	ms_cutsceneTimer += CTimer::GetTimeStepNonClipped() * 0.02f;
+	ms_cutsceneTimer += CTimer::GetTimeStepNonClippedInSeconds();
 	if (CGeneral::faststricmp(ms_cutsceneName, "end") && TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_FLYBY && ms_cutsceneLoadStatus == CUTSCENE_LOADING_0) {
 		if (CPad::GetPad(0)->GetCrossJustDown()
 			|| (CGame::playingIntro && CPad::GetPad(0)->GetStartJustDown())

src/control/TrafficLights.cpp

@@ -40,9 +40,9 @@ CTrafficLights::DisplayActualLight(CEntity *ent)
 	for(i = 1; i < 6; i++){
 		assert(mi->Get2dEffect(i));
 		yMin = min(yMin, mi->Get2dEffect(i)->pos.y);
-		yMax = min(yMax, mi->Get2dEffect(i)->pos.y);
+		yMax = max(yMax, mi->Get2dEffect(i)->pos.y);
 		zMin = min(zMin, mi->Get2dEffect(i)->pos.z);
-		zMax = min(zMax, mi->Get2dEffect(i)->pos.z);
+		zMax = max(zMax, mi->Get2dEffect(i)->pos.z);
 	}
 
 	CVector pos1, pos2;

src/core/Cam.cpp

@@ -3511,7 +3511,7 @@ CCam::Process_FlyBy(const CVector&, float, float, float)
 
 	Up = CVector(0.0f, 0.0f, 1.0f);
 	if(TheCamera.m_bStartingSpline)
-		m_fTimeElapsedFloat += CTimer::GetTimeStepInMilliseconds();
+		m_fTimeElapsedFloat += CTimer::GetTimeStepNonClippedInMilliseconds();
 	else{
 		m_fTimeElapsedFloat = 0.0f;
 		m_uiFinishTime = MS(TheCamera.m_arrPathArray[2].m_arr_PathData[10*((int)TheCamera.m_arrPathArray[2].m_arr_PathData[0]-1) + 1]);

src/core/Timer.h

@@ -21,6 +21,7 @@ class CTimer
 	static float GetTimeStepInMilliseconds() { return ms_fTimeStep / 50.0f * 1000.0f; }
 	static const float &GetTimeStepNonClipped(void) { return ms_fTimeStepNonClipped; }
 	static float GetTimeStepNonClippedInSeconds(void) { return ms_fTimeStepNonClipped / 50.0f; }
+	static float GetTimeStepNonClippedInMilliseconds(void) { return ms_fTimeStepNonClipped / 50.0f * 1000.0f; }
 	static void SetTimeStepNonClipped(float ts) { ms_fTimeStepNonClipped = ts; }
 	static const uint32 &GetFrameCounter(void) { return m_FrameCounter; }
 	static void SetFrameCounter(uint32 fc) { m_FrameCounter = fc; }