Fixed compilation with modern gcc

LibreGames · Jul 23, 2016 · 659ab31 · 659ab31
1 parent b210d3b
commit 659ab31
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 49 deletions.
diff --git a/gui/battlefield.h b/gui/battlefield.h
@@ -30,9 +30,9 @@ class BattleField {
 	void draw();
 	void spawn(UNIT_ID name,PLAYER player,float x=0);
 
-    static const float CastleW=80;
-    static const float CastleH=180;
-    static const float BaseY=600-180+155;
+    static constexpr float CastleW=80;
+    static constexpr float CastleH=180;
+    static constexpr float BaseY=600-180+155;
 
     int get_unit_count(PLAYER);
     int get_nonplant_unit_count(PLAYER);

diff --git a/units/dragon.h b/units/dragon.h
@@ -29,10 +29,10 @@ class Dragon: public Unit {
 	virtual void handle_message(const Message &mess,MessageQueue *mess_queue);
 	virtual void draw();
 
-    static const float Life=200;
-    static const float PlayerDamage=6;
-    static const float Y=180; 
-    static const float DX=1;
+    static constexpr float Life=200;
+    static constexpr float PlayerDamage=6;
+    static constexpr float Y=180;
+    static constexpr float DX=1;
 private:
 	typedef enum {FLY,CADAVER} State;
 

diff --git a/units/druid.h b/units/druid.h
@@ -28,12 +28,12 @@ class Druid: public Unit {
 	virtual void handle_message(const Message &mess,MessageQueue *mess_queue);
 	virtual void draw();
 
-    static const float X=2;
-    static const float Y=80;
+    static constexpr float X=2;
+    static constexpr float Y=80;
 private:
 	typedef enum {INIT,WAIT,SHOOTED} State;
 	State state;
-	
+
 	const Sprite *bit_druid;
 };
 

diff --git a/units/explosion.h b/units/explosion.h
@@ -28,10 +28,10 @@ class Explosion: public Unit {
 	virtual void handle_message(const Message &mess,MessageQueue *mess_queue);
 	virtual void draw();
 
-    static const float Damage=3;
-    static const float W=100;
-    static const float H=40;
-    static const int SpriteNumber=6; 
+    static constexpr float Damage=3;
+    static constexpr float W=100;
+    static constexpr float H=40;
+    static constexpr int SpriteNumber=6;
 private:
 	bool init;
 	const Sprite *bit_explosion_a;

diff --git a/units/golem.h b/units/golem.h
@@ -28,12 +28,12 @@ class Golem: public Unit {
 	virtual void handle_message(const Message &mess,MessageQueue *mess_queue);
 	virtual void draw();
 
-    static const int Life=300;
-    static const int Damage=7;
-    static const int PlayerDamage=5;
-    static const float W=74;
-    static const float H=70;
-    static const float DX=1;
+    static constexpr int Life=300;
+    static constexpr int Damage=7;
+    static constexpr int PlayerDamage=5;
+    static constexpr float W=74;
+    static constexpr float H=70;
+    static constexpr float DX=1;
 private:
 	typedef enum {STOP,WALK,FIGHT,CADAVER} State;
 

diff --git a/units/knight.h b/units/knight.h
@@ -28,12 +28,12 @@ class Knight: public Unit {
 	virtual void handle_message(const Message &mess,MessageQueue *mess_queue);
 	virtual void draw();
 
-    static const int Life=50;
-    static const int Damage=8;
-    static const int PlayerDamage=8;
-    static const float W=60;
-    static const float H=59;
-    static const float DX=4;
+    static constexpr int Life=50;
+    static constexpr int Damage=8;
+    static constexpr int PlayerDamage=8;
+    static constexpr float W=60;
+    static constexpr float H=59;
+    static constexpr float DX=4;
 private:
 	typedef enum {FIGHT,WALK,CADAVER} State;
 

diff --git a/units/plant.h b/units/plant.h
@@ -30,11 +30,11 @@ class Plant: public Unit {
 	virtual void draw();
 	static void reset_hasplant();
 
-    static const int Life=100;
-    static const int Damage=12;
-    static const float W=69;
-    static const float H=64;
-    static const float X=90;
+    static constexpr int Life=100;
+    static constexpr int Damage=12;
+    static constexpr float W=69;
+    static constexpr float H=64;
+    static constexpr float X=90;
 private:
 	typedef enum {NORMAL,FIGHT,CADAVER} State;
 

diff --git a/units/ram.h b/units/ram.h
@@ -28,12 +28,12 @@ class Ram: public Unit {
 	virtual void handle_message(const Message &mess,MessageQueue *mess_queue);
 	virtual void draw();
 
-    static const int Life=30;
-    static const int Damage=5;
-    static const int PlayerDamage=16;
-    static const float W=80;
-    static const float H=30;
-    static const float DX=1;
+    static constexpr int Life=30;
+    static constexpr int Damage=5;
+    static constexpr int PlayerDamage=16;
+    static constexpr float W=80;
+    static constexpr float H=30;
+    static constexpr float DX=1;
 private:
 	typedef enum {STOP,WALK,FIGHT,CADAVER} State;
 

diff --git a/units/soldier.h b/units/soldier.h
@@ -28,12 +28,12 @@ class Soldier: public Unit {
 	virtual void handle_message(const Message &mess,MessageQueue *mess_queue);
 	virtual void draw();
 
-    static const int Life=30;
-    static const int Damage=5;
-    static const int PlayerDamage=5;
-    static const float W=22;
-    static const float H=33;
-    static const float DX=2;
+    static constexpr int Life=30;
+    static constexpr int Damage=5;
+    static constexpr int PlayerDamage=5;
+    static constexpr float W=22;
+    static constexpr float H=33;
+    static constexpr float DX=2;
 private:
 	typedef enum {STOP,WALK,FIGHT,CADAVER} State;
 

diff --git a/units/veteran.h b/units/veteran.h
@@ -28,12 +28,12 @@ class Veteran: public Unit {
 	virtual void handle_message(const Message &mess,MessageQueue *mess_queue);
 	virtual void draw();
 
-    static const int Life=60;
-    static const int Damage=8;
-    static const int PlayerDamage=16;
-    static const float W=63;
-    static const float H=62;
-    static const float DX=1;
+    static constexpr int Life=60;
+    static constexpr int Damage=8;
+    static constexpr int PlayerDamage=16;
+    static constexpr float W=63;
+    static constexpr float H=62;
+    static constexpr float DX=1;
 private:
 	typedef enum {STOP,WALK,FIGHT,CADAVER} State;