diff options
| author | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-15 16:54:35 +0200 |
|---|---|---|
| committer | Michał Konopacki <konopacki.m@gmail.com> | 2012-09-15 16:54:35 +0200 |
| commit | 95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65 (patch) | |
| tree | 4bca38da7bc4983d47192adfcc3cc01407cfb776 /src/object/task/taskshield.h | |
| parent | d439f4fa93eb45175dcdfa773af8f68efa1bad9d (diff) | |
| parent | a1400f496bbe9f78f71736dce43863b6833be669 (diff) | |
| download | colobot-95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65.tar.gz colobot-95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65.tar.bz2 colobot-95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65.zip | |
Merge branch 'dev-object' into dev
Conflicts:
src/object/robotmain.cpp
src/object/robotmain.h
Diffstat (limited to 'src/object/task/taskshield.h')
| -rw-r--r-- | src/object/task/taskshield.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/object/task/taskshield.h b/src/object/task/taskshield.h index 5842ae0..4a6811c 100644 --- a/src/object/task/taskshield.h +++ b/src/object/task/taskshield.h @@ -63,7 +63,7 @@ protected: Error Stop(); bool CreateLight(Math::Vector pos); void IncreaseShield(); - float RetRadius(); + float GetRadius(); protected: TaskShieldPhase m_phase; @@ -71,12 +71,12 @@ protected: float m_speed; float m_time; float m_delay; - float m_lastParticule; + float m_lastParticle; float m_lastRay; float m_lastIncrease; float m_energyUsed; bool m_bError; - Math::Vector m_shieldPos; + Math::Vector m_shieldPos; int m_rankSphere; int m_soundChannel; int m_effectLight; |