X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fgameloop.cpp;h=251dafdcd2fa9bfa2484874073e261f158c243e8;hb=e776775f2ef6a3843cb83b39b34980d98e208f2f;hp=78b4a88e7cc94ec181ed8794c72a3ba8e2bf731d;hpb=cdb879de1ef50e2d2fb1aead922775d202ddd114;p=supertux.git

diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index 78b4a88e7..251dafdcd 100644
--- 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);
@@ -146,7 +146,7 @@ GameSession::levelintro(void)
   char str[60];
  
   if (get_level()->img_bkgd)
-    get_level()->img_bkgd->draw(0, 0);
+    get_level()->draw_bg();
   else
     drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom);
 
@@ -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())
     {
@@ -343,7 +343,11 @@ GameSession::process_events()
                         break;
                       case SDLK_DELETE:
                         if(debug_mode)
-                          tux.got_coffee = 1;
+                          tux.got_power = tux.FIRE_POWER;
+                        break;
+                      case SDLK_HOME:
+                        if(debug_mode)
+                          tux.got_power = tux.ICE_POWER;
                         break;
                       case SDLK_INSERT:
                         if(debug_mode)
@@ -441,7 +445,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 +469,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 +483,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 +533,7 @@ GameSession::process_menu()
               break;
             case MNID_ABORTLEVEL:
               st_pause_ticks_stop();
-              exit_status = LEVEL_ABORT;
+              exit_status = ES_LEVEL_ABORT;
               break;
             }
         }
@@ -560,7 +564,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);
@@ -717,7 +721,7 @@ GameSession::drawendscreen()
   char str[80];
 
   if (get_level()->img_bkgd)
-    get_level()->img_bkgd->draw(0, 0);
+    get_level()->draw_bg();
   else
     drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom);
 
@@ -741,7 +745,7 @@ GameSession::drawresultscreen(void)
   char str[80];
 
   if (get_level()->img_bkgd)
-    get_level()->img_bkgd->draw(0, 0);
+    get_level()->draw_bg();
   else
     drawgradient(get_level()->bkgd_top, get_level()->bkgd_bottom);