Corrected collition with bag of money
[supertux.git] / src / gameloop.c
index 5bdd201..28a9956 100644 (file)
@@ -3,11 +3,11 @@
   
   Super Tux - Game Loop!
   
-  by Bill Kendrick
+  by Bill Kendrick & Tobias Glaesser
   bill@newbreedsoftware.com
   http://www.newbreedsoftware.com/supertux/
   
-  April 11, 2000 - January 1st, 2004
+  April 11, 2000 - February 1st, 2004
  */
 
 #include <stdio.h>
@@ -42,6 +42,7 @@
 /* extern variables */
 
 extern char* soundfilenames[NUM_SOUNDS];
+st_level current_level;
 
 /* Local variables: */
 
@@ -51,14 +52,16 @@ SDL_Event event;
 SDLKey key;
 char level_subset[100];
 char str[60];
-timer_type time_left;
+float fps_fps;
+int st_gl_mode;
+unsigned int last_update_time;
+unsigned int update_time;
+int pause_menu_frame;
 
 /* Local function prototypes: */
 
 void levelintro(void);
 void initgame(void);
-void loadlevelsong(void);
-void unloadlevelsong(void);
 void loadshared(void);
 void unloadshared(void);
 void drawstatus(void);
@@ -72,13 +75,13 @@ void levelintro(void)
   clearscreen(0, 0, 0);
 
   sprintf(str, "LEVEL %d", level);
-  drawcenteredtext(str, 200, letters_red, NO_UPDATE, 1);
+  text_drawf(&blue_text, str, 0, 200, A_HMIDDLE, A_TOP, 1, NO_UPDATE);
 
   sprintf(str, "%s", current_level.name);
-  drawcenteredtext(str, 224, letters_gold, NO_UPDATE, 1);
+  text_drawf(&gold_text, str, 0, 224, A_HMIDDLE, A_TOP, 1, NO_UPDATE);
 
   sprintf(str, "TUX x %d", tux.lives);
-  drawcenteredtext(str, 256, letters_blue, NO_UPDATE, 1);
+  text_drawf(&white_text, str, 0, 256, A_HMIDDLE, A_TOP, 1, NO_UPDATE);
 
   flipscreen();
 
@@ -89,12 +92,14 @@ void levelintro(void)
 void start_timers(void)
 {
   timer_start(&time_left,current_level.time_left*1000);
+  st_pause_ticks_init();
+  update_time = st_get_ticks();
 }
 
 void activate_bad_guys(void)
 {
   int x,y;
-  
+
   /* Activate bad guys: */
 
   for (y = 0; y < 15; y++)
@@ -103,7 +108,7 @@ void activate_bad_guys(void)
         {
           if (current_level.tiles[y][x] >= '0' && current_level.tiles[y][x] <= '9')
             {
-             add_bad_guy(x * 32, y * 32, current_level.tiles[y][x] - '0');
+              add_bad_guy(x * 32, y * 32, current_level.tiles[y][x] - '0');
               current_level.tiles[y][x] = '.';
             }
         }
@@ -117,107 +122,106 @@ void game_event(void)
 {
   while (SDL_PollEvent(&event))
     {
-    switch(event.type)
-      {
-      case SDL_QUIT:        /* Quit event - quit: */
+      switch(event.type)
+        {
+        case SDL_QUIT:        /* Quit event - quit: */
           quit = 1;
           break;
-      case SDL_KEYDOWN:     /* A keypress! */
+        case SDL_KEYDOWN:     /* A keypress! */
           key = event.key.keysym.sym;
 
           /* Check for menu-events, if the menu is shown */
           if(show_menu)
-            menu_event(key);
+            menu_event(&event.key.keysym);
+
+          if(player_key_event(&tux,key,DOWN))
+            break;
 
           switch(key)
             {
             case SDLK_ESCAPE:    /* Escape: Open/Close the menu: */
               if(!game_pause)
                 {
-                  if(show_menu)
-                    show_menu = 0;
+                  if(st_gl_mode == ST_GL_TEST)
+                    quit = 1;
+                  else if(show_menu)
+                    {
+                     menu_set_current(&game_menu);
+                      show_menu = 0;
+                      st_pause_ticks_stop();
+                    }
                   else
-                    show_menu = 1;
+                    {
+                      show_menu = 1;
+                      st_pause_ticks_start();
+                    }
                 }
-               break;
-          case SDLK_RIGHT:
-              tux.input.right = DOWN;
-               break;
-          case SDLK_LEFT:
-              tux.input.left = DOWN;
-            break;
-          case SDLK_UP:
-              tux.input.up = DOWN;
-            break;
-          case SDLK_DOWN:
-              tux.input.down = DOWN;
-            break;
-          case SDLK_LCTRL:
-              tux.input.fire = DOWN;
-            break;
-           default:
-            break;
-        }
-        break;
-      case SDL_KEYUP:      /* A keyrelease! */
+              break;
+            default:
+              break;
+            }
+          break;
+        case SDL_KEYUP:      /* A keyrelease! */
           key = event.key.keysym.sym;
 
-          switch(key)
-           {
-          case SDLK_RIGHT:
-              tux.input.right = UP;
-            break;
-          case SDLK_LEFT:
-              tux.input.left = UP;
-            break;
-          case SDLK_UP:
-              tux.input.up = UP;
+          if(player_key_event(&tux,key,UP))
             break;
-          case SDLK_DOWN:
-              tux.input.down = UP;
-            break;
-          case SDLK_LCTRL:
-              tux.input.fire = UP;
-            break;
-          case SDLK_p:
+
+          switch(key)
+            {
+            case SDLK_p:
               if(!show_menu)
                 {
                   if(game_pause)
-                    game_pause = 0;
+                    {
+                      game_pause = 0;
+                      st_pause_ticks_stop();
+                    }
                   else
-                    game_pause = 1;
+                    {
+                      game_pause = 1;
+                      st_pause_ticks_start();
+                    }
                 }
-            break;
-          case SDLK_TAB:
-            if(debug_mode == YES)
-              tux.size = !tux.size;
-            break;
-          case SDLK_END:
-            if(debug_mode == YES)
-              distros += 50;
-            break;
-          case SDLK_SPACE:
-            if(debug_mode == YES)
-              next_level = 1;
-            break;
-          case SDLK_DELETE:
-            if(debug_mode == YES)
-              tux.got_coffee = 1;
-            break;
-          case SDLK_INSERT:
-            if(debug_mode == YES)
-              timer_start(&tux.invincible_timer,TUX_INVINCIBLE_TIME);
-            break;
-           default:
-            break;
-        }
-        break;
+              break;
+            case SDLK_TAB:
+              if(debug_mode == YES)
+                tux.size = !tux.size;
+              break;
+            case SDLK_END:
+              if(debug_mode == YES)
+                distros += 50;
+              break;
+            case SDLK_SPACE:
+              if(debug_mode == YES)
+                next_level = 1;
+              break;
+            case SDLK_DELETE:
+              if(debug_mode == YES)
+                tux.got_coffee = 1;
+              break;
+            case SDLK_INSERT:
+              if(debug_mode == YES)
+                timer_start(&tux.invincible_timer,TUX_INVINCIBLE_TIME);
+              break;
+            case SDLK_l:
+              if(debug_mode == YES)
+                --tux.lives;
+              break;
+            case SDLK_s:
+              if(debug_mode == YES)
+                score += 1000;
+              break;
+            default:
+              break;
+            }
+          break;
 #ifdef JOY_YES
-      case SDL_JOYAXISMOTION:
-        switch(event.jaxis.axis)
-           {
-           case JOY_X:
-             printf("X: %d\n", event.jaxis.value);
+
+        case SDL_JOYAXISMOTION:
+          switch(event.jaxis.axis)
+            {
+            case JOY_X:
               if (event.jaxis.value < -1024)
                 tux.input.left = DOWN;
               else if (event.jaxis.value > 1024)
@@ -227,8 +231,8 @@ void game_event(void)
                 tux.input.right = DOWN;
               else if (event.jaxis.value < -1024)
                 tux.input.right = UP;
-            break;
-          case JOY_Y:
+              break;
+            case JOY_Y:
               if (event.jaxis.value > 1024)
                 tux.input.down = DOWN;
               else if (event.jaxis.value < -1024)
@@ -242,18 +246,18 @@ void game_event(void)
                   else
                     menuaction = MN_UP;
                 }
-            break;
+              break;
             default:
               break;
-        }
-        break;
-      case SDL_JOYBUTTONDOWN:
+            }
+          break;
+        case SDL_JOYBUTTONDOWN:
           if (event.jbutton.button == JOY_A)
             tux.input.up = DOWN;
           else if (event.jbutton.button == JOY_B)
             tux.input.fire = DOWN;
-        break;
-      case SDL_JOYBUTTONUP:
+          break;
+        case SDL_JOYBUTTONUP:
           if (event.jbutton.button == JOY_A)
             tux.input.up = UP;
           else if (event.jbutton.button == JOY_B)
@@ -262,8 +266,8 @@ void game_event(void)
           if(show_menu)
             menuaction = MN_HIT;
           break;
-       default:
-         break;
+        default:
+          break;
 
         }
 #endif
@@ -276,14 +280,13 @@ void game_event(void)
 
 int game_action(void)
 {
-int i;
+  int i;
 
   /* (tux_dying || next_level) */
   if (tux.dying || next_level)
     {
       /* Tux either died, or reached the end of a level! */
 
-
       if (playing_music())
         halt_music();
 
@@ -293,25 +296,31 @@ int i;
           /* End of a level! */
           level++;
           next_level = 0;
-          drawresultscreen();
+          if(st_gl_mode == ST_GL_PLAY)
+            drawresultscreen();
+          player_level_begin(&tux);
         }
       else
         {
+          player_dying(&tux);
 
-       player_dying(&tux);
-       
           /* No more lives!? */
 
           if (tux.lives < 0)
             {
-              drawendscreen();
+              if(st_gl_mode == ST_GL_PLAY)
+                drawendscreen();
 
-              if (score > highscore)
-                save_hs(score);
-              unloadlevelgfx();
-              unloadlevelsong();
+              if(st_gl_mode == ST_GL_PLAY)
+                {
+                  if (score > hs_score)
+                    save_hs(score);
+                }
+              level_free_gfx();
+              level_free(&current_level);
+              level_free_song();
               unloadshared();
-             arrays_free();
+              arrays_free();
               return(0);
             } /* if (lives < 0) */
         }
@@ -320,15 +329,18 @@ int i;
 
       player_level_begin(&tux);
       set_defaults();
-      loadlevel(&current_level,"default",level);
+      level_free(&current_level);
+      if(level_load(&current_level,level_subset,level) != 0)
+        exit(1);
       arrays_free();
       arrays_init();
       activate_bad_guys();
-      unloadlevelgfx();
-      loadlevelgfx(&current_level);
-      unloadlevelsong();
-      loadlevelsong();
-      levelintro();
+      level_free_gfx();
+      level_load_gfx(&current_level);
+      level_free_song();
+      level_load_song(&current_level);
+      if(st_gl_mode == ST_GL_PLAY)
+        levelintro();
       start_timers();
     }
 
@@ -388,7 +400,7 @@ int i;
 
   for (i = 0; i < num_upgrades; i++)
     {
-       upgrade_action(&upgrades[i]);
+      upgrade_action(&upgrades[i]);
     }
 
 
@@ -396,7 +408,7 @@ int i;
 
   for (i = 0; i < num_bad_guys; i++)
     {
-       badguy_action(&bad_guys[i]);
+      badguy_action(&bad_guys[i]);
     }
 
   /* Handle all possible collisions. */
@@ -407,27 +419,36 @@ int i;
 
 /* --- GAME DRAW! --- */
 
-void game_draw()
+void game_draw(void)
 {
-  int  x, y, i;
+  int  x, y, i, s;
 
   /* Draw screen: */
 
   if (tux.dying && (frame % 4) == 0)
     clearscreen(255, 255, 255);
+  else if(timer_check(&super_bkgd_timer))
+    texture_draw(&img_super_bkgd, 0, 0, NO_UPDATE);
   else
     {
-      if (timer_check(&super_bkgd_timer))
-        texture_draw(&img_super_bkgd, 0, 0, NO_UPDATE);
+      /* Draw the real background */
+      if(current_level.bkgd_image[0] != '\0')
+        {
+          s = (int)scroll_x / 30;
+          texture_draw_part(&img_bkgd,s,0,0,0,img_bkgd.w - s, img_bkgd.h, NO_UPDATE);
+          texture_draw_part(&img_bkgd,0,0,screen->w - s ,0,s,img_bkgd.h, NO_UPDATE);
+        }
       else
-       clearscreen(current_level.bkgd_red, current_level.bkgd_green, current_level.bkgd_blue);
+        {
+          clearscreen(current_level.bkgd_red, current_level.bkgd_green, current_level.bkgd_blue);
+        }
     }
 
   /* Draw background: */
 
-  for (y = 0; y < 15; y++)
+  for (y = 0; y < 15; ++y)
     {
-      for (x = 0; x < 21; x++)
+      for (x = 0; x < 21; ++x)
         {
           drawshape(x * 32 - ((int)scroll_x % 32), y * 32,
                     current_level.tiles[(int)y][(int)x + (int)(scroll_x / 32)]);
@@ -437,49 +458,49 @@ void game_draw()
 
   /* (Bouncy bricks): */
 
-  for (i = 0; i < num_bouncy_bricks; i++)
+  for (i = 0; i < num_bouncy_bricks; ++i)
     {
-       bouncy_brick_draw(&bouncy_bricks[i]);
+      bouncy_brick_draw(&bouncy_bricks[i]);
     }
 
 
   /* (Bad guys): */
 
-  for (i = 0; i < num_bad_guys; i++)
+  for (i = 0; i < num_bad_guys; ++i)
     {
-       badguy_draw(&bad_guys[i]);
+      badguy_draw(&bad_guys[i]);
     }
 
   /* (Tux): */
-  
+
   player_draw(&tux);
 
   /* (Bullets): */
 
-  for (i = 0; i < num_bullets; i++)
+  for (i = 0; i < num_bullets; ++i)
     {
-       bullet_draw(&bullets[i]);
+      bullet_draw(&bullets[i]);
     }
 
   /* (Floating scores): */
 
-  for (i = 0; i < num_floating_scores; i++)
+  for (i = 0; i < num_floating_scores; ++i)
     {
-       floating_score_draw(&floating_scores[i]);
+      floating_score_draw(&floating_scores[i]);
     }
 
 
   /* (Upgrades): */
 
-  for (i = 0; i < num_upgrades; i++)
+  for (i = 0; i < num_upgrades; ++i)
     {
-       upgrade_draw(&upgrades[i]);
+      upgrade_draw(&upgrades[i]);
     }
 
 
   /* (Bouncy distros): */
 
-  for (i = 0; i < num_bouncy_distros; i++)
+  for (i = 0; i < num_bouncy_distros; ++i)
     {
       bouncy_distro_draw(&bouncy_distros[i]);
     }
@@ -487,19 +508,27 @@ void game_draw()
 
   /* (Broken bricks): */
 
-  for (i = 0; i < num_broken_bricks; i++)
+  for (i = 0; i < num_broken_bricks; ++i)
     {
-       broken_brick_draw(&broken_bricks[i]);
+      broken_brick_draw(&broken_bricks[i]);
     }
 
   drawstatus();
 
 
   if(game_pause)
-    drawcenteredtext("PAUSE",230,letters_red, NO_UPDATE, 1);
+    {
+      x = screen->h / 20;
+      for(i = 0; i < x; ++i)
+        {
+          fillrect(i % 2 ? (pause_menu_frame * i)%screen->w : -((pause_menu_frame * i)%screen->w) ,(i*20+pause_menu_frame)%screen->h,screen->w,10,20,20,20, rand() % 20 + 1);
+        }
+      fillrect(0,0,screen->w,screen->h,rand() % 50, rand() % 50, rand() % 50, 128);
+      text_drawf(&blue_text, "PAUSE - Press 'P' To Play", 0, 230, A_HMIDDLE, A_TOP, 1, NO_UPDATE);
+    }
 
   if(show_menu)
-    done = drawmenu();
+    menu_process_current();
 
   /* (Update it all!) */
 
@@ -510,10 +539,14 @@ void game_draw()
 
 /* --- GAME LOOP! --- */
 
-int gameloop(void)
+int gameloop(char * subset, int levelnb, int mode)
 {
+  int fps_cnt, jump, done;
+  timer_type fps_timer, frame_timer;
 
-  Uint32 last_time, now_time;
+  level = levelnb;
+  st_gl_mode = mode;
+  strcpy(level_subset,subset);
 
   /* Clear screen: */
 
@@ -523,45 +556,90 @@ int gameloop(void)
 
   /* Init the game: */
   arrays_init();
-  
-  initmenu();
-  menumenu = MENU_GAME;
+
+  menu_reset();
+  menu_set_current(&game_menu);
+
   initgame();
   loadshared();
   set_defaults();
-  
-  loadlevel(&current_level,"default",level);
-  loadlevelgfx(&current_level);
+
+  if(level_load(&current_level,level_subset,level) != 0)
+    exit(1);
+  level_load_gfx(&current_level);
   activate_bad_guys();
-  loadlevelsong();
-  highscore = load_hs();
+  level_load_song(&current_level);
+  if(st_gl_mode == ST_GL_PLAY)
+    load_hs();
 
   player_init(&tux);
-  
-  levelintro();
+
+  if(st_gl_mode == ST_GL_PLAY)
+    levelintro();
+
   start_timers();
-    
+
   /* --- MAIN GAME LOOP!!! --- */
 
+  jump = NO;
   done = 0;
   quit = 0;
   frame = 0;
   game_pause = 0;
+  timer_init(&fps_timer);
+  timer_init(&frame_timer);
+  fps_cnt = 0;
+
+    while (SDL_PollEvent(&event))
+    {}
   
   game_draw();
   do
     {
-      last_time = SDL_GetTicks();
-      frame++;
+      jump = NO;
+
+      /* Calculate the movement-factor */
+      frame_ratio = ((double)(update_time-last_update_time))/((double)FRAME_RATE);
+
+      if(!timer_check(&frame_timer))
+        {
+          timer_start(&frame_timer,25);
+          ++frame;
+        }
 
 
       /* Handle events: */
 
       tux.input.old_fire = tux.input.fire;
 
+      /*printf("%lf\n",frame_ratio);*/
+
       game_event();
 
-     
+      if(show_menu)
+        {
+          if(current_menu == &game_menu)
+            {
+              switch (menu_check(&game_menu))
+                {
+                case 0:
+                  st_pause_ticks_stop();
+                  break;
+                case 1:
+                  savegame();
+                  break;
+                case 4:
+                  done = 1;
+                  break;
+                }
+            }
+          else if(current_menu == &options_menu)
+            {
+              process_options_menu();
+            }
+        }
+
+
       /* Handle actions: */
 
       if(!game_pause && !show_menu)
@@ -574,9 +652,22 @@ int gameloop(void)
             }
         }
       else
-        SDL_Delay(50);
+        {
+          ++pause_menu_frame;
+          SDL_Delay(50);
+        }
+
+      if(tux.input.down == DOWN)
+        SDL_Delay(30);
 
       /*Draw the current scene to the screen */
+      /*If the machine running the game is too slow
+        skip the drawing of the frame (so the calculations are more precise and
+      the FPS aren't affected).*/
+      /*if( ! fps_fps < 50.0 )
+      game_draw();
+      else
+      jump = YES;*/ /*FIXME: Implement this tweak right.*/
       game_draw();
 
       /* Time stops in pause mode */
@@ -585,51 +676,71 @@ int gameloop(void)
           continue;
         }
 
-      /* Pause til next frame: */
+      /* Set the time the last update and the time of the current update */
+      last_update_time = update_time;
+      update_time = st_get_ticks();
+
+
+      /* Pause till next frame, if the machine running the game is too fast: */
+      /* FIXME: Works great for in OpenGl mode, where the CPU doesn't have to do that much. But
+                the results in SDL mode aren't perfect (thought the 100 FPS are reached), even on an AMD2500+. */
+      if(last_update_time >= update_time - 12 && jump != YES )
+        SDL_Delay(10);
+      //if((update_time - last_update_time) < 10)
+      //  SDL_Delay((11 - (update_time - last_update_time))/2);
 
-      now_time = SDL_GetTicks();
-      /*if (now_time < last_time + FPS)
-        SDL_Delay(last_time + FPS - now_time);*/
-       SDL_Delay(10);
 
 
       /* Handle time: */
 
       if (timer_check(&time_left))
         {
-             /* are we low on time ? */
-      if ((timer_get_left(&time_left) < TIME_WARNING)
-          && (current_music != HURRYUP_MUSIC))
-        {
-          current_music = HURRYUP_MUSIC;
-          /* stop the others music, prepare to play the fast music */
-          if (playing_music())
+          /* are we low on time ? */
+          if ((timer_get_left(&time_left) < TIME_WARNING)
+              && (current_music != HURRYUP_MUSIC))
             {
-              halt_music();
+              current_music = HURRYUP_MUSIC;
+              /* stop the others music, prepare to play the fast music */
+              if (playing_music())
+                {
+                  halt_music();
+                }
             }
-        }
 
         }
-       else
-       player_kill(&tux,KILL);
-       
+      else
+        player_kill(&tux,KILL);
+
 
       /* Keep playing the correct music: */
 
       if (!playing_music())
         {
-          play_current_music();
+          play_current_music();
+        }
+
+      /* Calculate frames per second */
+      if(show_fps)
+        {
+          ++fps_cnt;
+          fps_fps = (1000.0 / (float)timer_get_gone(&fps_timer)) * (float)fps_cnt;
+
+          if(!timer_check(&fps_timer))
+            {
+              timer_start(&fps_timer,1000);
+              fps_cnt = 0;
+            }
         }
 
-       
     }
   while (!done && !quit);
 
   if (playing_music())
     halt_music();
 
-  unloadlevelgfx();
-  unloadlevelsong();
+  level_free_gfx();
+  level_free(&current_level);
+  level_free_song();
   unloadshared();
   arrays_free();
 
@@ -641,44 +752,10 @@ int gameloop(void)
 
 void initgame(void)
 {
-  level = 1;
   score = 0;
   distros = 0;
 }
 
-/* Free music data for this level: */
-
-void unloadlevelsong(void)
-{
-  free_music(level_song);
-  free_music(level_song_fast);
-}
-
-/* Load music: */
-
-void loadlevelsong(void)
-{
-
-  char * song_path;
-  char * song_subtitle;
-
-  song_path = (char *) malloc(sizeof(char) * (strlen(DATA_PREFIX) +
-                              strlen(current_level.song_title) + 8));
-  sprintf(song_path, "%s/music/%s", DATA_PREFIX, current_level.song_title);
-  level_song = load_song(song_path);
-  free(song_path);
-
-  
-  song_path = (char *) malloc(sizeof(char) * (strlen(DATA_PREFIX) +
-                              strlen(current_level.song_title) + 8 + 5));
-  song_subtitle = strdup(current_level.song_title);
-  strcpy(strstr(song_subtitle, "."), "\0");
-  sprintf(song_path, "%s/music/%s-fast%s", DATA_PREFIX, song_subtitle, strstr(current_level.song_title, "."));
-  level_song_fast = load_song(song_path);
-  free(song_subtitle);
-  free(song_path);
-}
-
 /* Load graphics/sounds shared between all levels: */
 
 void loadshared(void)
@@ -690,52 +767,52 @@ void loadshared(void)
 
   texture_load(&tux_right[0],DATA_PREFIX "/images/shared/tux-right-0.png", USE_ALPHA);
   texture_load(&tux_right[1],DATA_PREFIX "/images/shared/tux-right-1.png", USE_ALPHA);
-  texture_load(&tux_right[2],DATA_PREFIX "/images/shared/tux-right-2.png", USE_ALPHA);  
+  texture_load(&tux_right[2],DATA_PREFIX "/images/shared/tux-right-2.png", USE_ALPHA);
 
   texture_load(&tux_left[0],DATA_PREFIX "/images/shared/tux-left-0.png", USE_ALPHA);
   texture_load(&tux_left[1],DATA_PREFIX "/images/shared/tux-left-1.png", USE_ALPHA);
-  texture_load(&tux_left[2],DATA_PREFIX "/images/shared/tux-left-2.png", USE_ALPHA);  
-  
-  texture_load(&firetux_right[0],DATA_PREFIX "/images/shared/firetux-right-0.png", USE_ALPHA);  
-  texture_load(&firetux_right[1],DATA_PREFIX "/images/shared/firetux-right-1.png", USE_ALPHA); 
-  texture_load(&firetux_right[2],DATA_PREFIX "/images/shared/firetux-right-2.png", USE_ALPHA); 
+  texture_load(&tux_left[2],DATA_PREFIX "/images/shared/tux-left-2.png", USE_ALPHA);
+
+  texture_load(&firetux_right[0],DATA_PREFIX "/images/shared/firetux-right-0.png", USE_ALPHA);
+  texture_load(&firetux_right[1],DATA_PREFIX "/images/shared/firetux-right-1.png", USE_ALPHA);
+  texture_load(&firetux_right[2],DATA_PREFIX "/images/shared/firetux-right-2.png", USE_ALPHA);
 
-  texture_load(&firetux_left[0],DATA_PREFIX "/images/shared/firetux-left-0.png", USE_ALPHA);  
-  texture_load(&firetux_left[1],DATA_PREFIX "/images/shared/firetux-left-1.png", USE_ALPHA); 
-  texture_load(&firetux_left[2],DATA_PREFIX "/images/shared/firetux-left-2.png", USE_ALPHA); 
+  texture_load(&firetux_left[0],DATA_PREFIX "/images/shared/firetux-left-0.png", USE_ALPHA);
+  texture_load(&firetux_left[1],DATA_PREFIX "/images/shared/firetux-left-1.png", USE_ALPHA);
+  texture_load(&firetux_left[2],DATA_PREFIX "/images/shared/firetux-left-2.png", USE_ALPHA);
 
 
   texture_load(&cape_right[0] ,DATA_PREFIX "/images/shared/cape-right-0.png",
-                             USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&cape_right[1] ,DATA_PREFIX "/images/shared/cape-right-1.png",
-                             USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&cape_left[0] ,DATA_PREFIX "/images/shared/cape-left-0.png",
-                            USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&cape_left[1] ,DATA_PREFIX "/images/shared/cape-left-1.png",
-                            USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&bigtux_right[0] ,DATA_PREFIX "/images/shared/bigtux-right-0.png",
-                               USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&bigtux_right[1] ,DATA_PREFIX "/images/shared/bigtux-right-1.png",
-                               USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&bigtux_right[2] ,DATA_PREFIX "/images/shared/bigtux-right-2.png",
-                               USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&bigtux_right_jump ,DATA_PREFIX "/images/shared/bigtux-right-jump.png", USE_ALPHA);
 
   texture_load(&bigtux_left[0] ,DATA_PREFIX "/images/shared/bigtux-left-0.png",
-                              USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&bigtux_left[1] ,DATA_PREFIX "/images/shared/bigtux-left-1.png",
-                              USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&bigtux_left[2] ,DATA_PREFIX "/images/shared/bigtux-left-2.png",
-                              USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&bigtux_left_jump ,DATA_PREFIX "/images/shared/bigtux-left-jump.png", USE_ALPHA);
 
@@ -752,24 +829,24 @@ void loadshared(void)
                USE_ALPHA);
 
   texture_load(&bigfiretux_right[0] ,DATA_PREFIX "/images/shared/bigfiretux-right-0.png",
-                                   USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&bigfiretux_right[1] ,DATA_PREFIX "/images/shared/bigfiretux-right-1.png",
-                                   USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&bigfiretux_right[2] ,DATA_PREFIX "/images/shared/bigfiretux-right-2.png",
-                                   USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&bigfiretux_right_jump ,DATA_PREFIX "/images/shared/bigfiretux-right-jump.png", USE_ALPHA);
 
   texture_load(&bigfiretux_left[0] ,DATA_PREFIX "/images/shared/bigfiretux-left-0.png",
-                                  USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&bigfiretux_left[1] ,DATA_PREFIX "/images/shared/bigfiretux-left-1.png",
-                                  USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&bigfiretux_left[2] ,DATA_PREFIX "/images/shared/bigfiretux-left-2.png",
-                                  USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&bigfiretux_left_jump ,DATA_PREFIX "/images/shared/bigfiretux-left-jump.png", USE_ALPHA);
 
@@ -787,44 +864,44 @@ void loadshared(void)
 
 
   texture_load(&ducktux_right ,DATA_PREFIX
-                             "/images/shared/ducktux-right.png",
-                             USE_ALPHA);
+               "/images/shared/ducktux-right.png",
+               USE_ALPHA);
 
   texture_load(&ducktux_left ,DATA_PREFIX
-                            "/images/shared/ducktux-left.png",
-                            USE_ALPHA);
+               "/images/shared/ducktux-left.png",
+               USE_ALPHA);
 
   texture_load(&skidtux_right ,DATA_PREFIX
-                             "/images/shared/skidtux-right.png",
-                             USE_ALPHA);
+               "/images/shared/skidtux-right.png",
+               USE_ALPHA);
 
   texture_load(&skidtux_left ,DATA_PREFIX
-                            "/images/shared/skidtux-left.png",
-                            USE_ALPHA);
+               "/images/shared/skidtux-left.png",
+               USE_ALPHA);
 
   texture_load(&duckfiretux_right ,DATA_PREFIX
-                                 "/images/shared/duckfiretux-right.png",
-                                 USE_ALPHA);
+               "/images/shared/duckfiretux-right.png",
+               USE_ALPHA);
 
   texture_load(&duckfiretux_left ,DATA_PREFIX
-                                "/images/shared/duckfiretux-left.png",
-                                USE_ALPHA);
+               "/images/shared/duckfiretux-left.png",
+               USE_ALPHA);
 
   texture_load(&skidfiretux_right ,DATA_PREFIX
-                                 "/images/shared/skidfiretux-right.png",
-                                 USE_ALPHA);
+               "/images/shared/skidfiretux-right.png",
+               USE_ALPHA);
 
   texture_load(&skidfiretux_left ,DATA_PREFIX
-                                "/images/shared/skidfiretux-left.png",
-                                USE_ALPHA);
+               "/images/shared/skidfiretux-left.png",
+               USE_ALPHA);
 
 
   /* Boxes: */
 
   texture_load(&img_box_full ,DATA_PREFIX "/images/shared/box-full.png",
-                            IGNORE_ALPHA);
+               IGNORE_ALPHA);
   texture_load(&img_box_empty ,DATA_PREFIX "/images/shared/box-empty.png",
-                             IGNORE_ALPHA);
+               IGNORE_ALPHA);
 
 
   /* Water: */
@@ -833,56 +910,56 @@ void loadshared(void)
   texture_load(&img_water ,DATA_PREFIX "/images/shared/water.png", IGNORE_ALPHA);
 
   texture_load(&img_waves[0] ,DATA_PREFIX "/images/shared/waves-0.png",
-                            USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&img_waves[1] ,DATA_PREFIX "/images/shared/waves-1.png",
-                            USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&img_waves[2] ,DATA_PREFIX "/images/shared/waves-2.png",
-                            USE_ALPHA);
+               USE_ALPHA);
 
 
   /* Pole: */
 
   texture_load(&img_pole ,DATA_PREFIX "/images/shared/pole.png", USE_ALPHA);
   texture_load(&img_poletop ,DATA_PREFIX "/images/shared/poletop.png",
-                           USE_ALPHA);
+               USE_ALPHA);
 
 
   /* Flag: */
 
   texture_load(&img_flag[0] ,DATA_PREFIX "/images/shared/flag-0.png",
-                           USE_ALPHA);
+               USE_ALPHA);
   texture_load(&img_flag[1] ,DATA_PREFIX "/images/shared/flag-1.png",
-                           USE_ALPHA);
+               USE_ALPHA);
 
 
   /* Cloud: */
 
   texture_load(&img_cloud[0][0] ,DATA_PREFIX "/images/shared/cloud-00.png",
-                               USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&img_cloud[0][1] ,DATA_PREFIX "/images/shared/cloud-01.png",
-                               USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&img_cloud[0][2] ,DATA_PREFIX "/images/shared/cloud-02.png",
-                               USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&img_cloud[0][3] ,DATA_PREFIX "/images/shared/cloud-03.png",
-                               USE_ALPHA);
+               USE_ALPHA);
 
 
   texture_load(&img_cloud[1][0] ,DATA_PREFIX "/images/shared/cloud-10.png",
-                               USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&img_cloud[1][1] ,DATA_PREFIX "/images/shared/cloud-11.png",
-                               USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&img_cloud[1][2] ,DATA_PREFIX "/images/shared/cloud-12.png",
-                               USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&img_cloud[1][3] ,DATA_PREFIX "/images/shared/cloud-13.png",
-                               USE_ALPHA);
+               USE_ALPHA);
 
 
   /* Bad guys: */
@@ -890,87 +967,87 @@ void loadshared(void)
   /* (BSOD) */
 
   texture_load(&img_bsod_left[0] ,DATA_PREFIX
-                                "/images/shared/bsod-left-0.png",
-                                USE_ALPHA);
+               "/images/shared/bsod-left-0.png",
+               USE_ALPHA);
 
   texture_load(&img_bsod_left[1] ,DATA_PREFIX
-                                "/images/shared/bsod-left-1.png",
-                                USE_ALPHA);
+               "/images/shared/bsod-left-1.png",
+               USE_ALPHA);
 
   texture_load(&img_bsod_left[2] ,DATA_PREFIX
-                                "/images/shared/bsod-left-2.png",
-                                USE_ALPHA);
+               "/images/shared/bsod-left-2.png",
+               USE_ALPHA);
 
   texture_load(&img_bsod_left[3] ,DATA_PREFIX
-                                "/images/shared/bsod-left-3.png",
-                                USE_ALPHA);
+               "/images/shared/bsod-left-3.png",
+               USE_ALPHA);
 
   texture_load(&img_bsod_right[0] ,DATA_PREFIX
-                                 "/images/shared/bsod-right-0.png",
-                                 USE_ALPHA);
+               "/images/shared/bsod-right-0.png",
+               USE_ALPHA);
 
   texture_load(&img_bsod_right[1] ,DATA_PREFIX
-                                 "/images/shared/bsod-right-1.png",
-                                 USE_ALPHA);
+               "/images/shared/bsod-right-1.png",
+               USE_ALPHA);
 
   texture_load(&img_bsod_right[2] ,DATA_PREFIX
-                                 "/images/shared/bsod-right-2.png",
-                                 USE_ALPHA);
+               "/images/shared/bsod-right-2.png",
+               USE_ALPHA);
 
   texture_load(&img_bsod_right[3] ,DATA_PREFIX
-                                 "/images/shared/bsod-right-3.png",
-                                 USE_ALPHA);
+               "/images/shared/bsod-right-3.png",
+               USE_ALPHA);
 
   texture_load(&img_bsod_squished_left ,DATA_PREFIX
-                                      "/images/shared/bsod-squished-left.png",
-                                      USE_ALPHA);
+               "/images/shared/bsod-squished-left.png",
+               USE_ALPHA);
 
   texture_load(&img_bsod_squished_right ,DATA_PREFIX
-                                       "/images/shared/bsod-squished-right.png",
-                                       USE_ALPHA);
+               "/images/shared/bsod-squished-right.png",
+               USE_ALPHA);
 
   texture_load(&img_bsod_falling_left ,DATA_PREFIX
-                                     "/images/shared/bsod-falling-left.png",
-                                     USE_ALPHA);
+               "/images/shared/bsod-falling-left.png",
+               USE_ALPHA);
 
   texture_load(&img_bsod_falling_right ,DATA_PREFIX
-                                      "/images/shared/bsod-falling-right.png",
-                                      USE_ALPHA);
+               "/images/shared/bsod-falling-right.png",
+               USE_ALPHA);
 
 
   /* (Laptop) */
 
   texture_load(&img_laptop_left[0] ,DATA_PREFIX
-                                  "/images/shared/laptop-left-0.png",
-                                  USE_ALPHA);
+               "/images/shared/laptop-left-0.png",
+               USE_ALPHA);
 
   texture_load(&img_laptop_left[1] ,DATA_PREFIX
-                                  "/images/shared/laptop-left-1.png",
-                                  USE_ALPHA);
+               "/images/shared/laptop-left-1.png",
+               USE_ALPHA);
 
   texture_load(&img_laptop_left[2] ,DATA_PREFIX
-                                  "/images/shared/laptop-left-2.png",
-                                  USE_ALPHA);
+               "/images/shared/laptop-left-2.png",
+               USE_ALPHA);
 
   texture_load(&img_laptop_right[0] ,DATA_PREFIX
-                                   "/images/shared/laptop-right-0.png",
-                                   USE_ALPHA);
+               "/images/shared/laptop-right-0.png",
+               USE_ALPHA);
 
   texture_load(&img_laptop_right[1] ,DATA_PREFIX
-                                   "/images/shared/laptop-right-1.png",
-                                   USE_ALPHA);
+               "/images/shared/laptop-right-1.png",
+               USE_ALPHA);
 
   texture_load(&img_laptop_right[2] ,DATA_PREFIX
-                                   "/images/shared/laptop-right-2.png",
-                                   USE_ALPHA);
+               "/images/shared/laptop-right-2.png",
+               USE_ALPHA);
 
   texture_load(&img_laptop_flat_left ,DATA_PREFIX
-                                    "/images/shared/laptop-flat-left.png",
-                                    USE_ALPHA);
+               "/images/shared/laptop-flat-left.png",
+               USE_ALPHA);
 
   texture_load(&img_laptop_flat_right ,DATA_PREFIX
-                                     "/images/shared/laptop-flat-right.png",
-                                     USE_ALPHA);
+               "/images/shared/laptop-flat-right.png",
+               USE_ALPHA);
 
   texture_load(&img_laptop_falling_left ,DATA_PREFIX
                "/images/shared/laptop-falling-left.png",
@@ -984,20 +1061,20 @@ void loadshared(void)
   /* (Money) */
 
   texture_load(&img_money_left[0] ,DATA_PREFIX
-                                 "/images/shared/bag-left-0.png",
-                                 USE_ALPHA);
+               "/images/shared/bag-left-0.png",
+               USE_ALPHA);
 
   texture_load(&img_money_left[1] ,DATA_PREFIX
-                                 "/images/shared/bag-left-1.png",
-                                 USE_ALPHA);
+               "/images/shared/bag-left-1.png",
+               USE_ALPHA);
 
   texture_load(&img_money_right[0] ,DATA_PREFIX
-                                  "/images/shared/bag-right-0.png",
-                                  USE_ALPHA);
+               "/images/shared/bag-right-0.png",
+               USE_ALPHA);
 
   texture_load(&img_money_right[1] ,DATA_PREFIX
-                                  "/images/shared/bag-right-1.png",
-                                  USE_ALPHA);
+               "/images/shared/bag-right-1.png",
+               USE_ALPHA);
 
 
 
@@ -1012,29 +1089,29 @@ void loadshared(void)
   texture_load(&img_bullet ,DATA_PREFIX "/images/shared/bullet.png", USE_ALPHA);
 
   texture_load(&img_red_glow ,DATA_PREFIX "/images/shared/red-glow.png",
-                            USE_ALPHA);
+               USE_ALPHA);
 
 
 
   /* Distros: */
 
   texture_load(&img_distro[0] ,DATA_PREFIX "/images/shared/distro-0.png",
-                             USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&img_distro[1] ,DATA_PREFIX "/images/shared/distro-1.png",
-                             USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&img_distro[2] ,DATA_PREFIX "/images/shared/distro-2.png",
-                             USE_ALPHA);
+               USE_ALPHA);
 
   texture_load(&img_distro[3] ,DATA_PREFIX "/images/shared/distro-3.png",
-                             USE_ALPHA);
+               USE_ALPHA);
 
 
   /* Tux life: */
 
   texture_load(&tux_life ,DATA_PREFIX "/images/shared/tux-life.png",
-                        USE_ALPHA);
+               USE_ALPHA);
 
   /* Herring: */
 
@@ -1045,7 +1122,7 @@ void loadshared(void)
   /* Super background: */
 
   texture_load(&img_super_bkgd ,DATA_PREFIX "/images/shared/super-bkgd.png",
-                              IGNORE_ALPHA);
+               IGNORE_ALPHA);
 
 
   /* Sound effects: */
@@ -1186,9 +1263,9 @@ void drawshape(float x, float y, unsigned char c)
   else if (c >= 'c' && c <= 'f')
     texture_draw(&img_cloud[1][c - 'c'], x, y, NO_UPDATE);
   else if (c >= 'G' && c <= 'J')
-    texture_draw(&img_bkgd[0][c - 'G'], x, y, NO_UPDATE);
+    texture_draw(&img_bkgd_tile[0][c - 'G'], x, y, NO_UPDATE);
   else if (c >= 'g' && c <= 'j')
-    texture_draw(&img_bkgd[1][c - 'g'], x, y, NO_UPDATE);
+    texture_draw(&img_bkgd_tile[1][c - 'g'], x, y, NO_UPDATE);
   else if (c == '#')
     texture_draw(&img_solid[0], x, y, NO_UPDATE);
   else if (c == '[')
@@ -1199,7 +1276,7 @@ void drawshape(float x, float y, unsigned char c)
     texture_draw(&img_solid[3], x, y, NO_UPDATE);
   else if (c == '$')
     {
-      
+
       z = (frame / 2) % 6;
 
       if (z < 4)
@@ -1223,7 +1300,7 @@ void drawshape(float x, float y, unsigned char c)
 
       /* Mark this as the end position of the level! */
 
-      endpos = x;
+      endpos = (int)x;
     }
   else if (c == '\\')
     {
@@ -1248,17 +1325,37 @@ unsigned char shape(float x, float y)
   xx = ((int)x / 32);
 
   if (yy >= 0 && yy < 15 && xx >= 0 && xx <= current_level.width)
-  {
-    c = current_level.tiles[yy][xx];
+    {
+      c = current_level.tiles[yy][xx];
     }
   else
     c = '.';
-    
+
   return(c);
 }
 
 /* Is is ground? */
 
+
+int issolid(float x, float y)
+{
+  if (isbrick(x, y) ||
+      isice(x, y) ||
+      (shape(x, y) == '[') ||
+      (shape(x, y) == '=') ||
+      (shape(x, y) == ']') ||
+      (shape(x, y) == 'A') ||
+      (shape(x, y) == 'B') ||
+      (shape(x, y) == '!') ||
+      (shape(x, y) == 'a'))
+    {
+      return YES;
+    }
+
+  return NO;
+}
+
+/*
 int issolid(float x, float y)
 {
   if (isbrick(x, y) ||
@@ -1284,7 +1381,7 @@ int issolid(float x, float y)
     }
 
   return NO;
-}
+}*/
 
 
 /* Is it a brick? */
@@ -1397,6 +1494,9 @@ void tryemptybox(float x, float y)
     {
       if (shape(x, y) == 'A')
         {
+       
+       DEBUG_MSG("Here I am");
+       
           /* Box with a distro! */
 
           add_bouncy_distro(((x + 1) / 32) * 32,
@@ -1509,28 +1609,42 @@ void trybumpbadguy(float x, float y)
 /* (Status): */
 void drawstatus(void)
 {
-int i;
+  int i;
 
   sprintf(str, "%d", score);
-  drawtext("SCORE", 0, 0, letters_blue, NO_UPDATE, 1);
-  drawtext(str, 96, 0, letters_gold, NO_UPDATE, 1);
+  text_draw(&white_text, "SCORE", 0, 0, 1, NO_UPDATE);
+  text_draw(&gold_text, str, 96, 0, 1, NO_UPDATE);
 
-  sprintf(str, "%d", highscore);
-  drawtext("HIGH", 0, 20, letters_blue, NO_UPDATE, 1);
-  drawtext(str, 96, 20, letters_gold, NO_UPDATE, 1);
+  if(st_gl_mode == ST_GL_PLAY)
+    {
+      sprintf(str, "%d", hs_score);
+      text_draw(&white_text, "HIGH", 0, 20, 1, NO_UPDATE);
+      text_draw(&gold_text, str, 96, 20, 1, NO_UPDATE);
+    }
+  else if(st_gl_mode == ST_GL_TEST)
+    {
+      text_draw(&white_text,"Press ESC To Return",0,20,1, NO_UPDATE);
+    }
 
   if (timer_get_left(&time_left) > TIME_WARNING || (frame % 10) < 5)
     {
       sprintf(str, "%d", timer_get_left(&time_left) / 1000 );
-      drawtext("TIME", 224, 0, letters_blue, NO_UPDATE, 1);
-      drawtext(str, 304, 0, letters_gold, NO_UPDATE, 1);
+      text_draw(&white_text, "TIME", 224, 0, 1, NO_UPDATE);
+      text_draw(&gold_text, str, 304, 0, 1, NO_UPDATE);
     }
 
   sprintf(str, "%d", distros);
-  drawtext("DISTROS", screen->h, 0, letters_blue, NO_UPDATE, 1);
-  drawtext(str, 608, 0, letters_gold, NO_UPDATE, 1);
+  text_draw(&white_text, "DISTROS", screen->h, 0, 1, NO_UPDATE);
+  text_draw(&gold_text, str, 608, 0, 1, NO_UPDATE);
 
-  drawtext("LIVES", screen->h, 20, letters_blue, NO_UPDATE, 1);
+  text_draw(&white_text, "LIVES", screen->h, 20, 1, NO_UPDATE);
+
+  if(show_fps)
+    {
+      sprintf(str, "%2.1f", fps_fps);
+      text_draw(&white_text, "FPS", screen->h, 40, 1, NO_UPDATE);
+      text_draw(&gold_text, str, screen->h + 60, 40, 1, NO_UPDATE);
+    }
 
   for(i=0; i < tux.lives; ++i)
     {
@@ -1545,13 +1659,13 @@ void drawendscreen(void)
 
   clearscreen(0, 0, 0);
 
-  drawcenteredtext("GAMEOVER", 200, letters_red, NO_UPDATE, 1);
+  text_drawf(&blue_text, "GAMEOVER", 0, 200, A_HMIDDLE, A_TOP, 1, NO_UPDATE);
 
   sprintf(str, "SCORE: %d", score);
-  drawcenteredtext(str, 224, letters_gold, NO_UPDATE, 1);
+  text_drawf(&gold_text, str, 0, 224, A_HMIDDLE, A_TOP, 1, NO_UPDATE);
 
   sprintf(str, "DISTROS: %d", distros);
-  drawcenteredtext(str, 256, letters_blue, NO_UPDATE, 1);
+  text_drawf(&gold_text, str, 0, 256, A_HMIDDLE, A_TOP, 1, NO_UPDATE);
 
   flipscreen();
   SDL_Delay(2000);
@@ -1563,13 +1677,13 @@ void drawresultscreen(void)
 
   clearscreen(0, 0, 0);
 
-  drawcenteredtext("Result:", 200, letters_red, NO_UPDATE, 1);
+  text_drawf(&blue_text, "Result:", 0, 200, A_HMIDDLE, A_TOP, 1, NO_UPDATE);
 
   sprintf(str, "SCORE: %d", score);
-  drawcenteredtext(str, 224, letters_gold, NO_UPDATE, 1);
+  text_drawf(&gold_text, str, 0, 224, A_HMIDDLE, A_TOP, 1, NO_UPDATE);
 
   sprintf(str, "DISTROS: %d", distros);
-  drawcenteredtext(str, 256, letters_blue, NO_UPDATE, 1);
+  text_drawf(&gold_text, str, 0, 256, A_HMIDDLE, A_TOP, 1, NO_UPDATE);
 
   flipscreen();
   SDL_Delay(2000);
@@ -1629,16 +1743,18 @@ void loadgame(char* filename)
     }
   else
     {
-    player_level_begin(&tux);
+      player_level_begin(&tux);
       set_defaults();
-      loadlevel(&current_level,"default",level);
+      level_free(&current_level);
+      if(level_load(&current_level,level_subset,level) != 0)
+        exit(1);
       arrays_free();
       arrays_init();
       activate_bad_guys();
-      unloadlevelgfx();
-      loadlevelgfx(&current_level);
-      unloadlevelsong();
-      loadlevelsong();
+      level_free_gfx();
+      level_load_gfx(&current_level);
+      level_free_song();
+      level_load_song(&current_level);
       levelintro();
       start_timers();