diff options
author | krzys-h <krzys_h@interia.pl> | 2013-05-19 21:48:29 +0200 |
---|---|---|
committer | krzys-h <krzys_h@interia.pl> | 2013-05-19 21:48:29 +0200 |
commit | f90a4b48f5ecdc498c32b1b4a35d57f107f36fd5 (patch) | |
tree | a44f5a61c7729db9fd0e37aafce2140e88d7991f /src/object/auto/autoresearch.h | |
parent | 6798641a71e18e1e3ea798617deb38f557b3c497 (diff) | |
download | colobot-f90a4b48f5ecdc498c32b1b4a35d57f107f36fd5.tar.gz colobot-f90a4b48f5ecdc498c32b1b4a35d57f107f36fd5.tar.bz2 colobot-f90a4b48f5ecdc498c32b1b4a35d57f107f36fd5.zip |
Added object.research(type)
Diffstat (limited to 'src/object/auto/autoresearch.h')
-rw-r--r-- | src/object/auto/autoresearch.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/object/auto/autoresearch.h b/src/object/auto/autoresearch.h index 6c804ef..dcb9f7b 100644 --- a/src/object/auto/autoresearch.h +++ b/src/object/auto/autoresearch.h @@ -41,6 +41,7 @@ public: void DeleteObject(bool bAll=false); void Init(); + Error StartAction(int result); bool EventProcess(const Event &event); Error GetError(); @@ -54,7 +55,6 @@ protected: void UpdateInterface(float rTime); void OkayButton(Ui::CWindow *pw, EventType event); bool TestResearch(EventType event); - void SetResearch(EventType event); void FireStopUpdate(float progress, bool bLightOn); protected: @@ -64,7 +64,7 @@ protected: float m_timeVirus; float m_lastUpdateTime; float m_lastParticle; - EventType m_research; + ResearchType m_research; int m_partiStop[6]; int m_channelSound; }; |