diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-26 23:08:41 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-06-26 23:08:41 +0200 |
| commit | 77bd13f49fb974cb50918b18d166ab61240c0d34 (patch) | |
| tree | 2a824960ef146e23ca772c8dc0215e70f586ed8f /src/object/auto/autoresearch.cpp | |
| parent | 6a059b437dca706a72233a57ba4c22011aba6dde (diff) | |
| parent | c2a7375788aea0cf1c0f4c45e4823a8a9a85264d (diff) | |
| download | colobot-77bd13f49fb974cb50918b18d166ab61240c0d34.tar.gz colobot-77bd13f49fb974cb50918b18d166ab61240c0d34.tar.bz2 colobot-77bd13f49fb974cb50918b18d166ab61240c0d34.zip | |
Merge branch 'dev-opengl' into dev
Diffstat (limited to 'src/object/auto/autoresearch.cpp')
| -rw-r--r-- | src/object/auto/autoresearch.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/object/auto/autoresearch.cpp b/src/object/auto/autoresearch.cpp index bc6dbd0..410e6ac 100644 --- a/src/object/auto/autoresearch.cpp +++ b/src/object/auto/autoresearch.cpp @@ -388,7 +388,7 @@ void CAutoResearch::UpdateInterface() DeadInterface(pw, EVENT_OBJECT_RPHAZER, g_researchEnable&RESEARCH_PHAZER); DeadInterface(pw, EVENT_OBJECT_RSHIELD, g_researchEnable&RESEARCH_SHIELD); DeadInterface(pw, EVENT_OBJECT_RATOMIC, g_researchEnable&RESEARCH_ATOMIC); - + OkayButton(pw, EVENT_OBJECT_RTANK); OkayButton(pw, EVENT_OBJECT_RFLY); OkayButton(pw, EVENT_OBJECT_RTHUMP); @@ -446,7 +446,7 @@ void CAutoResearch::UpdateInterface(float rTime) void CAutoResearch::OkayButton(CWindow *pw, EventMsg event) { CControl* control; - + control = pw->SearchControl(event); if ( control == 0 ) return; @@ -601,7 +601,7 @@ bool CAutoResearch::Read(char *line) m_lastUpdateTime = 0.0f; m_lastParticule = 0.0f; - + return true; } |