diff options
author | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-09 14:28:19 +0200 |
---|---|---|
committer | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-09 14:28:19 +0200 |
commit | 6892d37a4f497821d8059dc40bc6ead4085d66d8 (patch) | |
tree | 079cfa9559b0a0c05bdfbd0297d1afe8acd33ad5 /src/object/auto/autolabo.h | |
parent | b3d5491af4f953e8d63800897c40d602de9e9305 (diff) | |
download | colobot-6892d37a4f497821d8059dc40bc6ead4085d66d8.tar.gz colobot-6892d37a4f497821d8059dc40bc6ead4085d66d8.tar.bz2 colobot-6892d37a4f497821d8059dc40bc6ead4085d66d8.zip |
[src/object/auto] Folder rewritten
Diffstat (limited to 'src/object/auto/autolabo.h')
-rw-r--r-- | src/object/auto/autolabo.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/object/auto/autolabo.h b/src/object/auto/autolabo.h index 244e633..8225462 100644 --- a/src/object/auto/autolabo.h +++ b/src/object/auto/autolabo.h @@ -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 @@ -47,7 +48,7 @@ public: void Init(); bool EventProcess(const Event &event); - Error RetError(); + Error GetError(); bool CreateInterface(bool bSelect); @@ -56,9 +57,9 @@ public: protected: void UpdateInterface(); - void OkayButton(CWindow *pw, EventMsg event); - bool TestResearch(EventMsg event); - void SetResearch(EventMsg event); + void OkayButton(Ui::CWindow *pw, EventType event); + bool TestResearch(EventType event); + void SetResearch(EventType event); void SoundManip(float time, float amplitude, float frequency); protected: @@ -66,8 +67,8 @@ protected: float m_progress; float m_speed; float m_timeVirus; - float m_lastParticule; - EventMsg m_research; + float m_lastParticle; + EventType m_research; int m_partiRank[3]; int m_partiSphere; int m_soundChannel; |