diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-19 22:53:06 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-19 22:53:06 +0200 |
| commit | 7479f486b671acb2a6aea2c84a56b383aaba00ca (patch) | |
| tree | 4043545a14234dfaa2d7d08d59c7ee9ee97f0de9 /src/object/auto/autojostle.cpp | |
| parent | 901f10b2bac18a2063cd21798f22b3917e8519b5 (diff) | |
| parent | 57d33d79ea570773d84ad81d4a61f50e079979ef (diff) | |
| download | colobot-7479f486b671acb2a6aea2c84a56b383aaba00ca.tar.gz colobot-7479f486b671acb2a6aea2c84a56b383aaba00ca.tar.bz2 colobot-7479f486b671acb2a6aea2c84a56b383aaba00ca.zip | |
Forgotten fix in dev-graphics
Diffstat (limited to 'src/object/auto/autojostle.cpp')
| -rw-r--r-- | src/object/auto/autojostle.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/object/auto/autojostle.cpp b/src/object/auto/autojostle.cpp index 3944297..788b562 100644 --- a/src/object/auto/autojostle.cpp +++ b/src/object/auto/autojostle.cpp @@ -1,5 +1,6 @@ // * This file is part of the COLOBOT source code // * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * Copyright (C) 2012 Polish Portal of Colobot (PPC) // * // * This program is free software: you can redistribute it and/or modify // * it under the terms of the GNU General Public License as published by @@ -15,11 +16,9 @@ // * along with this program. If not, see http://www.gnu.org/licenses/. -#include <stdio.h> - #include "object/auto/autojostle.h" - +#include <stdio.h> // Object's constructor. @@ -71,7 +70,7 @@ void CAutoJostle::Start(int param, float force) m_time = 0.0f; m_error = ERR_CONTINUE; - type = m_object->RetType(); + type = m_object->GetType(); if ( type >= OBJECT_PLANT5 && type <= OBJECT_PLANT7 ) // clover? { @@ -89,8 +88,8 @@ bool CAutoJostle::EventProcess(const Event &event) CAuto::EventProcess(event); - if ( m_engine->RetPause() ) return true; - if ( event.event != EVENT_FRAME ) return true; + if ( m_engine->GetPause() ) return true; + if ( event.type != EVENT_FRAME ) return true; if ( m_progress < 1.0f ) { |