From ebed57aa22b772211387a5561f995eee8f5faed1 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Tue, 26 Jun 2012 22:23:05 +0200 Subject: Whitespace and language change - changed tabs to spaces and DOS line endings to Unix (except in CBot and metafile) - changed language to English - fixed #include in d3dengine.h --- src/object/task/taskwait.cpp | 148 +++++++++++++++++++++---------------------- 1 file changed, 74 insertions(+), 74 deletions(-) (limited to 'src/object/task/taskwait.cpp') diff --git a/src/object/task/taskwait.cpp b/src/object/task/taskwait.cpp index f501405..03bddcb 100644 --- a/src/object/task/taskwait.cpp +++ b/src/object/task/taskwait.cpp @@ -1,74 +1,74 @@ -// * This file is part of the COLOBOT source code -// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch -// * -// * 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 -// * the Free Software Foundation, either version 3 of the License, or -// * (at your option) any later version. -// * -// * This program is distributed in the hope that it will be useful, -// * but WITHOUT ANY WARRANTY; without even the implied warranty of -// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// * GNU General Public License for more details. -// * -// * You should have received a copy of the GNU General Public License -// * along with this program. If not, see http://www.gnu.org/licenses/. - -// taskwait.cpp - - -#include - -#include "object/task/taskwait.h" - -#include "old/d3dengine.h" - - - -// Object's constructor. - -CTaskWait::CTaskWait(CInstanceManager* iMan, CObject* object) - : CTask(iMan, object) -{ -} - -// Object's destructor. - -CTaskWait::~CTaskWait() -{ -} - - -// Management of an event. - -bool CTaskWait::EventProcess(const Event &event) -{ - if ( m_engine->RetPause() ) return true; - if ( event.event != EVENT_FRAME ) return true; - - m_passTime += event.rTime; - m_bEnded = (m_passTime >= m_waitTime); - return true; -} - - -// Assigns the goal was achieved. - -Error CTaskWait::Start(float time) -{ - m_waitTime = time; // duration to wait - m_passTime = 0.0f; // time elapsed - m_bEnded = false; - return ERR_OK; -} - -// Indicates whether the action is finished. - -Error CTaskWait::IsEnded() -{ - if ( m_engine->RetPause() ) return ERR_CONTINUE; - if ( m_bEnded ) return ERR_STOP; - return ERR_CONTINUE; -} - - +// * This file is part of the COLOBOT source code +// * Copyright (C) 2001-2008, Daniel ROUX & EPSITEC SA, www.epsitec.ch +// * +// * 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 +// * the Free Software Foundation, either version 3 of the License, or +// * (at your option) any later version. +// * +// * This program is distributed in the hope that it will be useful, +// * but WITHOUT ANY WARRANTY; without even the implied warranty of +// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// * GNU General Public License for more details. +// * +// * You should have received a copy of the GNU General Public License +// * along with this program. If not, see http://www.gnu.org/licenses/. + +// taskwait.cpp + + +#include + +#include "object/task/taskwait.h" + +#include "old/d3dengine.h" + + + +// Object's constructor. + +CTaskWait::CTaskWait(CInstanceManager* iMan, CObject* object) + : CTask(iMan, object) +{ +} + +// Object's destructor. + +CTaskWait::~CTaskWait() +{ +} + + +// Management of an event. + +bool CTaskWait::EventProcess(const Event &event) +{ + if ( m_engine->RetPause() ) return true; + if ( event.event != EVENT_FRAME ) return true; + + m_passTime += event.rTime; + m_bEnded = (m_passTime >= m_waitTime); + return true; +} + + +// Assigns the goal was achieved. + +Error CTaskWait::Start(float time) +{ + m_waitTime = time; // duration to wait + m_passTime = 0.0f; // time elapsed + m_bEnded = false; + return ERR_OK; +} + +// Indicates whether the action is finished. + +Error CTaskWait::IsEnded() +{ + if ( m_engine->RetPause() ) return ERR_CONTINUE; + if ( m_bEnded ) return ERR_STOP; + return ERR_CONTINUE; +} + + -- cgit v1.2.3-1-g7c22