[colobot] 178/390: Removed m_checkEndTime
Didier Raboud
odyx at moszumanska.debian.org
Fri Jun 12 14:21:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch upstream/latest
in repository colobot.
commit bfdc5775478e04fa4392c1af8f5c22cfa1807af2
Author: krzys-h <krzys_h at interia.pl>
Date: Sun Nov 9 19:19:14 2014 +0100
Removed m_checkEndTime
It was disabled some time ago
---
src/object/robotmain.cpp | 5 +----
src/object/robotmain.h | 1 -
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/object/robotmain.cpp b/src/object/robotmain.cpp
index 76319e2..2af9afe 100644
--- a/src/object/robotmain.cpp
+++ b/src/object/robotmain.cpp
@@ -645,7 +645,6 @@ CRobotMain::CRobotMain(CApplication* app, bool loadProfile)
m_time = 0.0f;
m_gameTime = 0.0f;
- m_checkEndTime = 0.0f;
m_missionTimerEnabled = false;
m_missionTimerStarted = false;
@@ -3553,9 +3552,8 @@ bool CRobotMain::EventFrame(const Event &event)
if (m_phase == PHASE_SIMUL)
{
- if (!m_editLock /*&& m_checkEndTime+1.0f < m_time*/)
+ if (!m_editLock)
{
- m_checkEndTime = m_time;
CheckEndMission(true);
UpdateAudio(true);
}
@@ -4739,7 +4737,6 @@ void CRobotMain::CreateScene(bool soluce, bool fixScene, bool resetObject)
m_app->ResetKeyStates();
m_time = 0.0f;
m_gameTime = 0.0f;
- m_checkEndTime = 0.0f;
m_infoUsed = 0;
m_selectObject = sel;
diff --git a/src/object/robotmain.h b/src/object/robotmain.h
index 0b89975..875ff51 100644
--- a/src/object/robotmain.h
+++ b/src/object/robotmain.h
@@ -468,7 +468,6 @@ protected:
float m_time;
float m_gameTime;
- float m_checkEndTime;
float m_winDelay;
float m_lostDelay;
bool m_fixScene; // scene fixed, no interraction
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list