summaryrefslogtreecommitdiffstats
path: root/src/object/task/taskbuild.h
diff options
context:
space:
mode:
authorMichał Konopacki <konopacki.m@gmail.com>2012-09-11 23:29:00 +0200
committerMichał Konopacki <konopacki.m@gmail.com>2012-09-11 23:29:00 +0200
commit44e4bcef45a1e606dcbb4a0b25fac3d649d9ebf9 (patch)
tree766038be0bdd2aa940c464e57e5b8e97520c4e66 /src/object/task/taskbuild.h
parent68d9c61e97522213d27745c4c6dac4c839bff77d (diff)
parent064fedb81495d2185a994a5f5a87063cd1b22607 (diff)
downloadcolobot-44e4bcef45a1e606dcbb4a0b25fac3d649d9ebf9.tar.gz
colobot-44e4bcef45a1e606dcbb4a0b25fac3d649d9ebf9.tar.bz2
colobot-44e4bcef45a1e606dcbb4a0b25fac3d649d9ebf9.zip
Merge branch 'dev-object' of github.com:adiblol/colobot into dev-object
Diffstat (limited to 'src/object/task/taskbuild.h')
-rw-r--r--src/object/task/taskbuild.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/object/task/taskbuild.h b/src/object/task/taskbuild.h
index 682086d..25300b3 100644
--- a/src/object/task/taskbuild.h
+++ b/src/object/task/taskbuild.h
@@ -63,23 +63,23 @@ protected:
void DeleteMark(Math::Vector pos, float radius);
protected:
- ObjectType m_type; // type of construction
- CObject* m_metal; // transforms metal object
- CObject* m_power; // the vehicle battery
- CObject* m_building; // building built
- TaskBuildPhase m_phase; // phase of the operation
- bool m_bError; // true -> operation impossible
- bool m_bBuild; // true -> building built
- bool m_bBlack; // true -> lights black -> white
- float m_time; // absolute time
- float m_lastParticule; // time of generation last particle
- float m_progress; // progression (0..1)
- float m_speed; // speed of progression
- float m_angleY; // rotation angle of the vehicle
- float m_angleZ; // angle of rotation of the gun
- Math::Vector m_buildingPos; // initial position of the building
- float m_buildingHeight; // height of the building
- int m_lightRank[TBMAXLIGHT];// lights for the effects
- int m_soundChannel;
+ ObjectType m_type; // type of construction
+ CObject* m_metal; // transforms metal object
+ CObject* m_power; // the vehicle battery
+ CObject* m_building; // building built
+ TaskBuildPhase m_phase; // phase of the operation
+ bool m_bError; // true -> operation impossible
+ bool m_bBuild; // true -> building built
+ bool m_bBlack; // true -> lights black -> white
+ float m_time; // absolute time
+ float m_lastParticle; // time of generation last particle
+ float m_progress; // progression (0..1)
+ float m_speed; // speed of progression
+ float m_angleY; // rotation angle of the vehicle
+ float m_angleZ; // angle of rotation of the gun
+ Math::Vector m_buildingPos; // initial position of the building
+ float m_buildingHeight; // height of the building
+ int m_lightRank[TBMAXLIGHT]; // lights for the effects
+ int m_soundChannel;
};