More type conversion warning cleanup; some minor refactoring in the phase bar while I was cleaning up the warnings.

2010-10-28 06:57:34 +00:00
parent 98627d96ba
commit fadd36c0c4
6 changed files with 68 additions and 67 deletions
--- a/projects/mtg/include/AIStats.h
+++ b/projects/mtg/include/AIStats.h
@@ -5,8 +5,8 @@
 #define STATS_CREATURE_MULTIPLIER 10

 //floats
-#define STATS_AURA_MULTIPLIER 0.9
-#define STATS_LORD_MULTIPLIER 0.5
+#define STATS_AURA_MULTIPLIER 0.9f
+#define STATS_LORD_MULTIPLIER 0.5f

 #include <list>
 #include <string>
--- a/projects/mtg/include/GuiPhaseBar.h
+++ b/projects/mtg/include/GuiPhaseBar.h
@@ -7,10 +7,6 @@

 class GuiPhaseBar : public GuiLayer
 {
-  static const unsigned Width = 28;
-  static const unsigned Height = Width;
-  static const unsigned Phases = 12;
-
 protected:
  Phase* phase;
  float angle;