[colobot] 332/390: Fix non-integer expressions in #if

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch upstream/latest
in repository colobot.

commit fcd904faf7ad54ed07e34e7725294d07626e0295
Author: Piotr Dziwinski <piotrdz at gmail.com>
Date:   Mon Apr 27 18:15:29 2015 +0200

    Fix non-integer expressions in #if
---
 src/CBot/CBot.h                    | 6 +++---
 src/object/auto/autoflag.cpp       | 2 +-
 src/object/motion/motionant.cpp    | 2 +-
 src/object/motion/motionbee.cpp    | 2 +-
 src/object/motion/motionhuman.cpp  | 2 +-
 src/object/motion/motionmother.cpp | 2 +-
 src/object/motion/motionspider.cpp | 2 +-
 src/object/object.cpp              | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/CBot/CBot.h b/src/CBot/CBot.h
index 3355881..ae89416 100644
--- a/src/CBot/CBot.h
+++ b/src/CBot/CBot.h
@@ -28,8 +28,8 @@
 #include "CBotDll.h"                    // public definitions
 #include "CBotToken.h"                  // token management
 
-#define    STACKRUN    true             /// \def return execution directly on a suspended routine
-#define    STACKMEM    true             /// \def preserve memory for the execution stack
+#define    STACKRUN    1                /// \def return execution directly on a suspended routine
+#define    STACKMEM    1                /// \def preserve memory for the execution stack
 #define    MAXSTACK    990              /// \def stack size reserved
 
 #define    EOX         (reinterpret_cast<CBotStack*>(-1))   /// \def tag special condition
@@ -1516,7 +1516,7 @@ extern bool ReadType(FILE* pf, CBotTypResult& type);
 
 extern float GetNumFloat( const char* p );
 
-#if    false
+#if 0
 extern void DEBUG( const char* text, int val, CBotStack* pile );
 #endif
 
diff --git a/src/object/auto/autoflag.cpp b/src/object/auto/autoflag.cpp
index 402c87a..99a5181 100644
--- a/src/object/auto/autoflag.cpp
+++ b/src/object/auto/autoflag.cpp
@@ -27,7 +27,7 @@
 
 
 
-#define ADJUST_ANGLE    false       // true -> adjusts the angles of the members
+#define ADJUST_ANGLE 0       // 1 -> adjusts the angles of the members
 
 
 #if ADJUST_ANGLE
diff --git a/src/object/motion/motionant.cpp b/src/object/motion/motionant.cpp
index 6ca0707..ea48ed6 100644
--- a/src/object/motion/motionant.cpp
+++ b/src/object/motion/motionant.cpp
@@ -31,7 +31,7 @@
 #include <stdio.h>
 
 
-#define ADJUST_ANGLE        false       // true -> adjusts the angles of the members
+#define ADJUST_ANGLE 0                  // 1 -> adjusts the angles of the members
 const float START_TIME = 1000.0f;       // beginning of the relative time
 
 
diff --git a/src/object/motion/motionbee.cpp b/src/object/motion/motionbee.cpp
index 07e295a..089bd16 100644
--- a/src/object/motion/motionbee.cpp
+++ b/src/object/motion/motionbee.cpp
@@ -30,7 +30,7 @@
 #include <stdio.h>
 
 
-#define ADJUST_ANGLE        false       // true -> adjusts the angles of the members
+#define ADJUST_ANGLE 0	                // 1 -> adjusts the angles of the members
 const float START_TIME = 1000.0f;       // beginning of the relative time
 
 
diff --git a/src/object/motion/motionhuman.cpp b/src/object/motion/motionhuman.cpp
index 2c6005b..d49fae5 100644
--- a/src/object/motion/motionhuman.cpp
+++ b/src/object/motion/motionhuman.cpp
@@ -37,7 +37,7 @@
 
 
 
-#define ADJUST_ANGLE        false       // true -> adjusts the angles of the members
+#define ADJUST_ANGLE 0       // 1 -> adjusts the angles of the members
 const int ADJUST_ACTION = (3*3*3*3*MH_SPEC+3*3*3*MHS_SATCOM);
 
 const float START_TIME = 1000.0f;       // beginning of the relative time
diff --git a/src/object/motion/motionmother.cpp b/src/object/motion/motionmother.cpp
index 161187e..c88480f 100644
--- a/src/object/motion/motionmother.cpp
+++ b/src/object/motion/motionmother.cpp
@@ -30,7 +30,7 @@
 #include <stdio.h>
 
 
-#define ADJUST_ANGLE        false       // true -> adjusts the angles of the members
+#define ADJUST_ANGLE 0	                // 1 -> adjusts the angles of the members
 const float START_TIME = 1000.0f;       // beginning of the relative time
 
 
diff --git a/src/object/motion/motionspider.cpp b/src/object/motion/motionspider.cpp
index 082ab51..435111d 100644
--- a/src/object/motion/motionspider.cpp
+++ b/src/object/motion/motionspider.cpp
@@ -31,7 +31,7 @@
 
 
 
-#define ADJUST_ANGLE        false       // true -> adjusts the angles of the members
+#define ADJUST_ANGLE 0                  // 1 -> adjusts the angles of the members
 const float START_TIME = 1000.0f;       // beginning of the relative time
 
 
diff --git a/src/object/object.cpp b/src/object/object.cpp
index 87079a8..392c0c4 100644
--- a/src/object/object.cpp
+++ b/src/object/object.cpp
@@ -89,8 +89,8 @@
 
 
 
-#define ADJUST_ONBOARD  false       // true -> adjusts the camera ONBOARD
-#define ADJUST_ARM  false           // true -> adjusts the manipulator arm
+#define ADJUST_ONBOARD  0       // 1 -> adjusts the camera ONBOARD
+#define ADJUST_ARM  0           // 1 -> adjusts the manipulator arm
 const float VIRUS_DELAY     = 60.0f;        // duration of virus infection
 const float LOSS_SHIELD     = 0.24f;        // loss of the shield by shot
 const float LOSS_SHIELD_H   = 0.10f;        // loss of the shield for humans

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git