diff options
| author | Didier Raboud <odyx@debian.org> | 2014-07-02 11:33:47 +0200 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2014-07-02 11:33:47 +0200 |
| commit | 2e136acd34c45e5e6d105cabf91c67e5865c38fe (patch) | |
| tree | 8561603160cce0b41ba31250539a22d37a2951de /src/object/task/taskrecover.cpp | |
| parent | 562be6fe765d7742f7c38fbd82f8cc26369e238b (diff) | |
| parent | d9fee8b2adad613cf8c10d153cd5cd7b261b7863 (diff) | |
| download | colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.tar.gz colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.tar.bz2 colobot-2e136acd34c45e5e6d105cabf91c67e5865c38fe.zip | |
Merge tag 'colobot-gold-0.1.3-alpha' into debian
Diffstat (limited to 'src/object/task/taskrecover.cpp')
| -rw-r--r-- | src/object/task/taskrecover.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/object/task/taskrecover.cpp b/src/object/task/taskrecover.cpp index af84099..d8bbafd 100644 --- a/src/object/task/taskrecover.cpp +++ b/src/object/task/taskrecover.cpp @@ -105,9 +105,11 @@ bool CTaskRecover::EventProcess(const Event &event) if ( power != 0 ) { energy = power->GetEnergy(); - power->SetEnergy(energy-ENERGY_RECOVER*event.rTime*m_speed); + energy -= event.rTime * ENERGY_RECOVER / power->GetCapacity() * m_speed; + power->SetEnergy(energy); } + speed.x = (Math::Rand()-0.5f)*0.1f*m_progress; speed.y = (Math::Rand()-0.5f)*0.1f*m_progress; speed.z = (Math::Rand()-0.5f)*0.1f*m_progress; |