diff options
Diffstat (limited to 'src/object/task')
| -rw-r--r-- | src/object/task/task.h | 23 | ||||
| -rw-r--r-- | src/object/task/taskbuild.h | 4 | ||||
| -rw-r--r-- | src/object/task/taskfire.cpp | 6 | ||||
| -rw-r--r-- | src/object/task/taskgoto.cpp | 6 | ||||
| -rw-r--r-- | src/object/task/taskgoto.h | 2 | ||||
| -rw-r--r-- | src/object/task/taskmanip.cpp | 16 | ||||
| -rw-r--r-- | src/object/task/taskrecover.cpp | 4 | ||||
| -rw-r--r-- | src/object/task/taskshield.cpp | 2 | ||||
| -rw-r--r-- | src/object/task/taskshield.h | 4 | ||||
| -rw-r--r-- | src/object/task/taskterraform.cpp | 4 |
10 files changed, 36 insertions, 35 deletions
diff --git a/src/object/task/task.h b/src/object/task/task.h index b85fa32..97ac819 100644 --- a/src/object/task/task.h +++ b/src/object/task/task.h @@ -20,6 +20,7 @@ #include "common/misc.h"
+#include "math/old/math3d.h"
class CInstanceManager;
@@ -39,19 +40,19 @@ class CDisplayText; class CSound;
-#define TAKE_DIST 6.0f // distance to an object to pick it
-#define TAKE_DIST_OTHER 1.5f // additional distance if on friend
+const float TAKE_DIST = 6.0f; // distance to an object to pick it
+const float TAKE_DIST_OTHER = 1.5f; // additional distance if on friend
-//?#define ARM_NEUTRAL_ANGLE1 155.0f*PI/180.0f
-//?#define ARM_NEUTRAL_ANGLE2 -125.0f*PI/180.0f
-//?#define ARM_NEUTRAL_ANGLE3 -45.0f*PI/180.0f
-#define ARM_NEUTRAL_ANGLE1 110.0f*PI/180.0f
-#define ARM_NEUTRAL_ANGLE2 -130.0f*PI/180.0f
-#define ARM_NEUTRAL_ANGLE3 -50.0f*PI/180.0f
+//?const float ARM_NEUTRAL_ANGLE1 = 155.0f*PI/180.0f;
+//?const float ARM_NEUTRAL_ANGLE2 = -125.0f*PI/180.0f;
+//?const float ARM_NEUTRAL_ANGLE3 = -45.0f*PI/180.0f;
+const float ARM_NEUTRAL_ANGLE1 = 110.0f*PI/180.0f;
+const float ARM_NEUTRAL_ANGLE2 = -130.0f*PI/180.0f;
+const float ARM_NEUTRAL_ANGLE3 = -50.0f*PI/180.0f;
-#define ARM_STOCK_ANGLE1 110.0f*PI/180.0f
-#define ARM_STOCK_ANGLE2 -100.0f*PI/180.0f
-#define ARM_STOCK_ANGLE3 -70.0f*PI/180.0f
+const float ARM_STOCK_ANGLE1 = 110.0f*PI/180.0f;
+const float ARM_STOCK_ANGLE2 = -100.0f*PI/180.0f;
+const float ARM_STOCK_ANGLE3 = -70.0f*PI/180.0f;
class CTask
diff --git a/src/object/task/taskbuild.h b/src/object/task/taskbuild.h index 337edb7..1cced56 100644 --- a/src/object/task/taskbuild.h +++ b/src/object/task/taskbuild.h @@ -30,8 +30,8 @@ class CPhysics; -#define BUILDMARGIN 16.0f
-#define TBMAXLIGHT 4
+const float BUILDMARGIN = 16.0f;
+const int TBMAXLIGHT = 4;
enum TaskBuildPhase
diff --git a/src/object/task/taskfire.cpp b/src/object/task/taskfire.cpp index 02c4159..81becda 100644 --- a/src/object/task/taskfire.cpp +++ b/src/object/task/taskfire.cpp @@ -40,9 +40,9 @@ -#define ENERGY_FIRE (0.25f/2.5f) // energy consumed/shot
-#define ENERGY_FIREr (0.25f/1.5f) // energy consumed/ray
-#define ENERGY_FIREi (0.10f/2.5f) // energy consumed/organic
+const float ENERGY_FIRE = (0.25f/2.5f); // energy consumed/shot
+const float ENERGY_FIREr = (0.25f/1.5f); // energy consumed/ray
+const float ENERGY_FIREi = (0.10f/2.5f); // energy consumed/organic
// Object's constructor.
diff --git a/src/object/task/taskgoto.cpp b/src/object/task/taskgoto.cpp index 7e4d3f1..c5ffaec 100644 --- a/src/object/task/taskgoto.cpp +++ b/src/object/task/taskgoto.cpp @@ -39,9 +39,9 @@ -#define FLY_DIST_GROUND 80.0f // minimum distance to remain on the ground
-#define FLY_DEF_HEIGHT 50.0f // default flying height
-#define BM_DIM_STEP 5.0f
+const float FLY_DIST_GROUND = 80.0f; // minimum distance to remain on the ground
+const float FLY_DEF_HEIGHT = 50.0f; // default flying height
+const float BM_DIM_STEP = 5.0f;
diff --git a/src/object/task/taskgoto.h b/src/object/task/taskgoto.h index acd79b6..498bff5 100644 --- a/src/object/task/taskgoto.h +++ b/src/object/task/taskgoto.h @@ -31,7 +31,7 @@ class CObject; -#define MAXPOINTS 500
+const int MAXPOINTS = 500;
diff --git a/src/object/task/taskmanip.cpp b/src/object/task/taskmanip.cpp index 5df067c..36bc4ae 100644 --- a/src/object/task/taskmanip.cpp +++ b/src/object/task/taskmanip.cpp @@ -42,14 +42,14 @@ #include "object/task/taskmanip.h"
-//?#define MARGIN_FRONT 2.0f
-//?#define MARGIN_BACK 2.0f
-//?#define MARGIN_FRIEND 2.0f
-//?#define MARGIN_BEE 5.0f
-#define MARGIN_FRONT 4.0f //OK 1.9
-#define MARGIN_BACK 4.0f //OK 1.9
-#define MARGIN_FRIEND 4.0f //OK 1.9
-#define MARGIN_BEE 5.0f //OK 1.9
+//?const float MARGIN_FRONT = 2.0f;
+//?const float MARGIN_BACK = 2.0f;
+//?const float MARGIN_FRIEND = 2.0f;
+//?const float MARGIN_BEE = 5.0f;
+const float MARGIN_FRONT = 4.0f; //OK 1.9
+const float MARGIN_BACK = 4.0f; //OK 1.9
+const float MARGIN_FRIEND = 4.0f; //OK 1.9
+const float MARGIN_BEE = 5.0f; //OK 1.9
diff --git a/src/object/task/taskrecover.cpp b/src/object/task/taskrecover.cpp index 798540b..cb47bce 100644 --- a/src/object/task/taskrecover.cpp +++ b/src/object/task/taskrecover.cpp @@ -40,8 +40,8 @@ #include "object/task/taskrecover.h"
-#define ENERGY_RECOVER 0.25f // energy consumed by recovery
-#define RECOVER_DIST 11.8f
+const float ENERGY_RECOVER = 0.25f; // energy consumed by recovery
+const float RECOVER_DIST = 11.8f;
diff --git a/src/object/task/taskshield.cpp b/src/object/task/taskshield.cpp index 818a3a7..86e45df 100644 --- a/src/object/task/taskshield.cpp +++ b/src/object/task/taskshield.cpp @@ -41,7 +41,7 @@ #include "object/task/taskshield.h"
-#define ENERGY_TIME 20.0f // maximum duration if full battery
+const float ENERGY_TIME = 20.0f; // maximum duration if full battery
diff --git a/src/object/task/taskshield.h b/src/object/task/taskshield.h index e78466e..5917158 100644 --- a/src/object/task/taskshield.h +++ b/src/object/task/taskshield.h @@ -30,8 +30,8 @@ class CPhysics; class CObject;
-#define RADIUS_SHIELD_MIN 40.0f // minimal radius of the protected zone
-#define RADIUS_SHIELD_MAX 100.0f // maximal radius of the protected zone
+const float RADIUS_SHIELD_MIN = 40.0f; // minimum radius of the protected zone
+const float RADIUS_SHIELD_MAX = 100.0f; // maximum radius of the protected zone
enum TaskShieldPhase
diff --git a/src/object/task/taskterraform.cpp b/src/object/task/taskterraform.cpp index a3403f0..1432c3e 100644 --- a/src/object/task/taskterraform.cpp +++ b/src/object/task/taskterraform.cpp @@ -44,8 +44,8 @@ #include "object/task/taskterraform.h"
-#define ENERGY_TERRA 0.40f // energy consumed by blow
-#define ACTION_RADIUS 400.0f
+const float ENERGY_TERRA = 0.40f; // energy consumed by blow
+const float ACTION_RADIUS = 400.0f;
|