From: LMH <lmh.0013@gmail.com>
Date: Mon, 28 Oct 2013 01:52:04 +0000 (-1000)
Subject: Tweak to allow MinGW to compile, issues #26 & 27
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;ds=sidebyside;h=7669b5949a713ed83ba1c1ec0a22ec9138c25bd7;p=supertux.git

Tweak to allow MinGW to compile, issues #26 & 27
---

diff --git a/src/badguy/livefire.cpp b/src/badguy/livefire.cpp
index 9fb56a734..cc5011c1f 100644
--- a/src/badguy/livefire.cpp
+++ b/src/badguy/livefire.cpp
@@ -23,16 +23,13 @@
 #include "supertux/object_factory.hpp"
 #include "supertux/sector.hpp"
 
-static const float WALKSPEED = 80;
-static const float MAXDROPHEIGHT = 20;
-
 LiveFire::LiveFire(const Reader& reader) :
   WalkingBadguy(reader, "images/creatures/livefire/livefire.sprite", "left", "right"),
   lightsprite(sprite_manager->create("images/objects/lightmap_light/lightmap_light-medium.sprite")),
   state(STATE_WALKING)  
 {
-  walk_speed = WALKSPEED;
-  max_drop_height = MAXDROPHEIGHT;
+  walk_speed = 80;
+  max_drop_height = 20;
   lightsprite->set_blend(Blend(GL_SRC_ALPHA, GL_ONE));
   lightsprite->set_color(Color(1.0f, 0.9f, 0.8f));
   death_sound = "sounds/fall.wav";
diff --git a/src/badguy/sspiky.cpp b/src/badguy/sspiky.cpp
index a386184df..cea68ddeb 100644
--- a/src/badguy/sspiky.cpp
+++ b/src/badguy/sspiky.cpp
@@ -20,12 +20,10 @@
 #include "sprite/sprite.hpp"
 #include "supertux/object_factory.hpp"
 
-static const float WALKSPEED = 80;
-
 SSpiky::SSpiky(const Reader& reader)
   : WalkingBadguy(reader, "images/creatures/spiky/sleepingspiky.sprite", "left", "right"), state(SSPIKY_SLEEPING)
 {
-  walk_speed = WALKSPEED;
+  walk_speed = 80;
   max_drop_height = 600;
 }