diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-25 19:59:17 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-25 19:59:17 +0200 |
| commit | b08a63790c0fbeacb3f96a74e3eb15abe8c70dab (patch) | |
| tree | 7260140ae1ea308bd256370c6fcbbc57dbd13441 /src/graphics/common/pyro.h | |
| parent | f58918031c001a0159eaf8f18d4e451e70089d30 (diff) | |
| download | colobot-b08a63790c0fbeacb3f96a74e3eb15abe8c70dab.tar.gz colobot-b08a63790c0fbeacb3f96a74e3eb15abe8c70dab.tar.bz2 colobot-b08a63790c0fbeacb3f96a74e3eb15abe8c70dab.zip | |
SDL project
- added (very basic) SDL template in CApplication and CEngine
- split project into two targets: colobot_old (dependent on DirectX and WinAPI)
and colobot_new (dependent on SDL and OpenGL)
- moved sound.h/cpp to old/ and created new template in Snd namespace
- added platform-independent dialog boxes in app/system.h/cpp
Diffstat (limited to 'src/graphics/common/pyro.h')
| -rw-r--r-- | src/graphics/common/pyro.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/graphics/common/pyro.h b/src/graphics/common/pyro.h index 704febf..e6b5844 100644 --- a/src/graphics/common/pyro.h +++ b/src/graphics/common/pyro.h @@ -19,9 +19,11 @@ #pragma once -#include "graphics/common/engine.h" -#include "object/object.h" #include "common/misc.h" +#include "graphics/common/engine.h" +//#include "object/object.h" +// TEMPORARILY! +enum ObjectType {}; class CInstanceManager; @@ -93,7 +95,7 @@ public: CPyro(CInstanceManager* iMan); ~CPyro(); - void DeleteObject(bool bAll=FALSE); + void DeleteObject(bool bAll=false); bool Create(PyroType type, CObject* pObj, float force=1.0f); bool EventProcess(const Event &event); Error IsEnded(); |