- fixed some enums

SVN-Revision: 1133

diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index 78b4a88..e2c44b9 100644 (file)
--- a/src/gameloop.cpp
+++ b/src/gameloop.cpp
@@ -76,7 +76,7 @@ void
 GameSession::restart_level()
 {
   game_pause   = false;
-  exit_status  = NONE;
+  exit_status  = ES_NONE;
   end_sequence = NO_ENDSEQUENCE;
 
   fps_timer.init(true);
@@ -183,7 +183,7 @@ GameSession::on_escape_press()
 
   if(st_gl_mode == ST_GL_TEST)
     {
-      exit_status = LEVEL_ABORT;
+      exit_status = ES_LEVEL_ABORT;
     }
   else if (!Menu::current())
     {
@@ -441,7 +441,7 @@ GameSession::check_end_conditions()
     }
   else if(end_sequence && !endsequence_timer.check())
     {
-      exit_status = LEVEL_FINISHED;
+      exit_status = ES_LEVEL_FINISHED;
       return;
     }
   else if(end_sequence == ENDSEQUENCE_RUNNING && endtile && endtile->data >= 1)
@@ -465,7 +465,7 @@ GameSession::check_end_conditions()
           if(st_gl_mode != ST_GL_TEST)
             drawendscreen();
           
-          exit_status = GAME_OVER;
+          exit_status = ES_GAME_OVER;
         }
       else
         { // Still has lives, so reset Tux to the levelstart
@@ -479,7 +479,7 @@ GameSession::check_end_conditions()
 void
 GameSession::action(double frame_ratio)
 {
-  if (exit_status == NONE)
+  if (exit_status == ES_NONE)
     {
       // Update Tux and the World
       world->action(frame_ratio);
@@ -529,7 +529,7 @@ GameSession::process_menu()
               break;
             case MNID_ABORTLEVEL:
               st_pause_ticks_stop();
-              exit_status = LEVEL_ABORT;
+              exit_status = ES_LEVEL_ABORT;
               break;
             }
         }
@@ -560,7 +560,7 @@ GameSession::run()
 
   draw();
 
-  while (exit_status == NONE)
+  while (exit_status == ES_NONE)
     {
       /* Calculate the movement-factor */
       double frame_ratio = ((double)(update_time-last_update_time))/((double)FRAME_RATE);

diff --git a/src/gameloop.h b/src/gameloop.h
index 6c95140..42f3385 100644 (file)
--- a/src/gameloop.h
+++ b/src/gameloop.h
@@ -73,7 +73,7 @@ class GameSession
   std::string subset;
 
  public:
-  enum ExitStatus { NONE, LEVEL_FINISHED, GAME_OVER, LEVEL_ABORT };
+  enum ExitStatus { ES_NONE, ES_LEVEL_FINISHED, ES_GAME_OVER, ES_LEVEL_ABORT };
  private:
   ExitStatus exit_status;
  public:

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 990fce2..30d9882 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -36,18 +36,18 @@ Direction reverse_dir(Direction direction)
 {
   switch(direction)
     {
-    case WEST:
-      return EAST;
-    case EAST:
-      return WEST;
-    case NORTH:
-      return SOUTH;
-    case SOUTH:
-      return NORTH;
-    case NONE:
-      return NONE;
+    case D_WEST:
+      return D_EAST;
+    case D_EAST:
+      return D_WEST;
+    case D_NORTH:
+      return D_SOUTH;
+    case D_SOUTH:
+      return D_NORTH;
+    case D_NONE:
+      return D_NONE;
     }
-  return NONE;
+  return D_NONE;
 }
 
 std::string
@@ -55,13 +55,13 @@ direction_to_string(Direction direction)
 {
   switch(direction)
     {
-    case WEST:
+    case D_WEST:
       return "west";
-    case EAST:
+    case D_EAST:
       return "east";
-    case NORTH:
+    case D_NORTH:
       return "north";
-    case SOUTH:
+    case D_SOUTH:
       return "south";
     default:
       return "none";
@@ -72,15 +72,15 @@ Direction
 string_to_direction(const std::string& directory)
 {
   if (directory == "west")
-    return WEST;
+    return D_WEST;
   else if (directory == "east")
-    return EAST;
+    return D_EAST;
   else if (directory == "north")
-    return NORTH;
+    return D_NORTH;
   else if (directory == "south")
-    return SOUTH;
+    return D_SOUTH;
   else
-    return NONE;
+    return D_NONE;
 }
 
 TileManager::TileManager()
@@ -173,8 +173,8 @@ Tux::Tux(WorldMap* worldmap_)
   moving = false;
   tile_pos.x = 4;
   tile_pos.y = 5;
-  direction = NONE;
-  input_direction = NONE;
+  direction = D_NONE;
+  input_direction = D_NONE;
 }
 
 Tux::~Tux()
@@ -214,19 +214,19 @@ Tux::get_pos()
 
   switch(direction)
     {
-    case WEST:
+    case D_WEST:
       x -= offset - 32;
       break;
-    case EAST:
+    case D_EAST:
       x += offset - 32;
       break;
-    case NORTH:
+    case D_NORTH:
       y -= offset - 32;
       break;
-    case SOUTH:
+    case D_SOUTH:
       y += offset - 32;
       break;
-    case NONE:
+    case D_NONE:
       break;
     }
   
@@ -237,7 +237,7 @@ void
 Tux::stop()
 {
   offset = 0;
-  direction = NONE;
+  direction = D_NONE;
   moving = false;
 }
 
@@ -246,7 +246,7 @@ Tux::update(float delta)
 {
   if (!moving)
     {
-      if (input_direction != NONE)
+      if (input_direction != D_NONE)
         { 
           WorldMap::Level* level = worldmap->at_level();
 
@@ -288,18 +288,18 @@ Tux::update(float delta)
               if (worldmap->at(tile_pos)->auto_walk)
                 { // Turn to a new direction
                   Tile* tile = worldmap->at(tile_pos);
-                  Direction dir = NONE;
+                  Direction dir = D_NONE;
                   
-                  if (tile->north && back_direction != NORTH)
-                    dir = NORTH;
-                  else if (tile->south && back_direction != SOUTH)
-                    dir = SOUTH;
-                  else if (tile->east && back_direction != EAST)
-                    dir = EAST;
-                  else if (tile->west && back_direction != WEST)
-                    dir = WEST;
-
-                  if (dir != NONE)
+                  if (tile->north && back_direction != D_NORTH)
+                    dir = D_NORTH;
+                  else if (tile->south && back_direction != D_SOUTH)
+                    dir = D_SOUTH;
+                  else if (tile->east && back_direction != D_EAST)
+                    dir = D_EAST;
+                  else if (tile->west && back_direction != D_WEST)
+                    dir = D_WEST;
+
+                  if (dir != D_NONE)
                     {
                       direction = dir;
                       back_direction = reverse_dir(direction);
@@ -352,7 +352,7 @@ WorldMap::WorldMap()
   leveldot_green = new Surface(datadir +  "/images/worldmap/leveldot_green.png", USE_ALPHA);
   leveldot_red = new Surface(datadir +  "/images/worldmap/leveldot_red.png", USE_ALPHA);
 
-  input_direction = NONE;
+  input_direction = D_NONE;
   enter_level = false;
 
   name = "<no file>";
@@ -493,7 +493,7 @@ void
 WorldMap::get_input()
 {
   enter_level = false;
-  input_direction = NONE;
+  input_direction = D_NONE;
    
   SDL_Event event;
   while (SDL_PollEvent(&event))
@@ -529,16 +529,16 @@ WorldMap::get_input()
               if (event.jaxis.axis == joystick_keymap.x_axis)
                 {
                   if (event.jaxis.value < -joystick_keymap.dead_zone)
-                    input_direction = WEST;
+                    input_direction = D_WEST;
                   else if (event.jaxis.value > joystick_keymap.dead_zone)
-                    input_direction = EAST;
+                    input_direction = D_EAST;
                 }
               else if (event.jaxis.axis == joystick_keymap.y_axis)
                 {
                   if (event.jaxis.value > joystick_keymap.dead_zone)
-                    input_direction = SOUTH;
+                    input_direction = D_SOUTH;
                   else if (event.jaxis.value < -joystick_keymap.dead_zone)
-                    input_direction = NORTH;
+                    input_direction = D_NORTH;
                 }
               break;
 
@@ -560,13 +560,13 @@ WorldMap::get_input()
       Uint8 *keystate = SDL_GetKeyState(NULL);
   
       if (keystate[SDLK_LEFT])
-        input_direction = WEST;
+        input_direction = D_WEST;
       else if (keystate[SDLK_RIGHT])
-        input_direction = EAST;
+        input_direction = D_EAST;
       else if (keystate[SDLK_UP])
-        input_direction = NORTH;
+        input_direction = D_NORTH;
       else if (keystate[SDLK_DOWN])
-        input_direction = SOUTH;
+        input_direction = D_SOUTH;
     }
 }
 
@@ -575,19 +575,19 @@ WorldMap::get_next_tile(Point pos, Direction direction)
 {
   switch(direction)
     {
-    case WEST:
+    case D_WEST:
       pos.x -= 1;
       break;
-    case EAST:
+    case D_EAST:
       pos.x += 1;
       break;
-    case NORTH:
+    case D_NORTH:
       pos.y -= 1;
       break;
-    case SOUTH:
+    case D_SOUTH:
       pos.y += 1;
       break;
-    case NONE:
+    case D_NONE:
       break;
     }
   return pos;
@@ -607,19 +607,19 @@ WorldMap::path_ok(Direction direction, Point old_pos, Point* new_pos)
     { // Check if we the tile allows us to go to new_pos
       switch(direction)
         {
-        case WEST:
+        case D_WEST:
           return (at(old_pos)->west && at(*new_pos)->east);
 
-        case EAST:
+        case D_EAST:
           return (at(old_pos)->east && at(*new_pos)->west);
 
-        case NORTH:
+        case D_NORTH:
           return (at(old_pos)->north && at(*new_pos)->south);
 
-        case SOUTH:
+        case D_SOUTH:
           return (at(old_pos)->south && at(*new_pos)->north);
 
-        case NONE:
+        case D_NONE:
           assert(!"path_ok() can't work if direction is NONE");
         }
       return false;
@@ -643,7 +643,7 @@ WorldMap::update(float delta)
 
               switch (session.run())
                 {
-                case GameSession::LEVEL_FINISHED:
+                case GameSession::ES_LEVEL_FINISHED:
                   {
                     bool old_level_state = level->solved;
                     level->solved = true;
@@ -658,20 +658,20 @@ WorldMap::update(float delta)
                     if (old_level_state != level->solved)
                       { // Try to detect the next direction to which we should walk
                         // FIXME: Mostly a hack
-                        Direction dir = NONE;
+                        Direction dir = D_NONE;
                     
                         Tile* tile = at(tux->get_tile_pos());
 
-                        if (tile->north && tux->back_direction != NORTH)
-                          dir = NORTH;
-                        else if (tile->south && tux->back_direction != SOUTH)
-                          dir = SOUTH;
-                        else if (tile->east && tux->back_direction != EAST)
-                          dir = EAST;
-                        else if (tile->west && tux->back_direction != WEST)
-                          dir = WEST;
+                        if (tile->north && tux->back_direction != D_NORTH)
+                          dir = D_NORTH;
+                        else if (tile->south && tux->back_direction != D_SOUTH)
+                          dir = D_SOUTH;
+                        else if (tile->east && tux->back_direction != D_EAST)
+                          dir = D_EAST;
+                        else if (tile->west && tux->back_direction != D_WEST)
+                          dir = D_WEST;
 
-                        if (dir != NONE)
+                        if (dir != D_NONE)
                           {
                             tux->set_direction(dir);
                             //tux->update(delta);
@@ -695,7 +695,7 @@ WorldMap::update(float delta)
                   }
 
                   break;
-                case GameSession::LEVEL_ABORT:
+                case GameSession::ES_LEVEL_ABORT:
                   // Reseting the player_status might be a worthy
                   // consideration, but I don't think we need it
                   // 'cause only the bad players will use it to
@@ -704,11 +704,11 @@ WorldMap::update(float delta)
                   // then stop playing the game all together since it
                   // is to hard)
                   break;
-                case GameSession::GAME_OVER:
+                case GameSession::ES_GAME_OVER:
                   quit = true;
                   player_status.reset();
                   break;
-                case GameSession::NONE:
+                case GameSession::ES_NONE:
                   // Should never be reached 
                   break;
                 }

diff --git a/src/worldmap.h b/src/worldmap.h
index a4898fb..48e57d8 100644 (file)
--- a/src/worldmap.h
+++ b/src/worldmap.h
@@ -81,7 +81,7 @@ public:
   Tile* get(int i);
 };
 
-enum Direction { NONE, WEST, EAST, NORTH, SOUTH };
+enum Direction { D_NONE, D_WEST, D_EAST, D_NORTH, D_SOUTH };
 
 std::string direction_to_string(Direction d);
 Direction   string_to_direction(const std::string& d);