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/taskfireant.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/taskfireant.h')
-rw-r--r-- | src/object/task/taskfireant.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/object/task/taskfireant.h b/src/object/task/taskfireant.h index 1d8ef62..4fa77b8 100644 --- a/src/object/task/taskfireant.h +++ b/src/object/task/taskfireant.h @@ -58,6 +58,6 @@ protected: bool m_bError; bool m_bFire; float m_time; - float m_lastParticule; + float m_lastParticle; }; |