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/task/taskfire.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/task/taskfire.cpp')
| -rw-r--r-- | src/object/task/taskfire.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/object/task/taskfire.cpp b/src/object/task/taskfire.cpp index 8d300e6..92c51da 100644 --- a/src/object/task/taskfire.cpp +++ b/src/object/task/taskfire.cpp @@ -316,7 +316,7 @@ Error CTaskFire::Start(float delay) else if ( m_bRay ) fire = m_delay*ENERGY_FIREr; else fire = m_delay*ENERGY_FIRE; if ( energy < fire/power->RetCapacity()+0.05f ) return ERR_FIRE_ENERGY; - + m_speed = 1.0f/m_delay; m_progress = 0.0f; m_time = 0.0f; |