fixed bug which caused tux to "swing" on low frame rates
[supertux.git] / src / gameloop.c
index 558e2d6..199546c 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>
 
 /* extern variables */
 
-extern char* soundfilenames[NUM_SOUNDS];
+st_level current_level;
+int game_started = NO;
 
 /* Local variables: */
 
-texture_type img_waves[3], img_water, img_pole, img_poletop, img_flag[2];
-texture_type img_cloud[2][4];
-SDL_Event event;
-SDLKey key;
-char level_subset[100];
-char str[60];
-timer_type time_left;
-float fps_fps;
+static texture_type img_waves[3], img_water, img_pole, img_poletop, img_flag[2];
+static texture_type img_cloud[2][4];
+static SDL_Event event;
+static SDLKey key;
+static char level_subset[100];
+static char str[60];
+static float fps_fps;
+static int st_gl_mode;
+static unsigned int last_update_time;
+static unsigned int update_time;
+static 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);
@@ -73,13 +74,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();
 
@@ -90,6 +91,8 @@ 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)
@@ -128,20 +131,30 @@ void game_event(void)
 
           /* 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;
 
-         if(player_keydown_event(&tux,key))
-         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;
+                    {
+                      menu_set_current(&game_menu);
+                      show_menu = 1;
+                      st_pause_ticks_start();
+                    }
                 }
               break;
             default:
@@ -150,24 +163,38 @@ void game_event(void)
           break;
         case SDL_KEYUP:      /* A keyrelease! */
           key = event.key.keysym.sym;
-         
-         if(player_keyup_event(&tux,key))
-         break;          
-         
+
+          if(player_key_event(&tux,key,UP))
+            break;
+
           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;
+                {
+                  tux.size = !tux.size;
+                  if(tux.size == BIG)
+                    {
+                      tux.base.height = 64;
+                    }
+                  else
+                    tux.base.height = 32;
+                }
               break;
             case SDLK_END:
               if(debug_mode == YES)
@@ -185,6 +212,14 @@ void game_event(void)
               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;
             }
@@ -195,7 +230,6 @@ void game_event(void)
           switch(event.jaxis.axis)
             {
             case JOY_X:
-              printf("X: %d\n", event.jaxis.value);
               if (event.jaxis.value < -1024)
                 tux.input.left = DOWN;
               else if (event.jaxis.value > 1024)
@@ -261,7 +295,6 @@ int game_action(void)
     {
       /* Tux either died, or reached the end of a level! */
 
-
       if (playing_music())
         halt_music();
 
@@ -271,24 +304,29 @@ int game_action(void)
           /* End of a level! */
           level++;
           next_level = 0;
-          drawresultscreen();
-         player_level_begin(&tux);
+          if(st_gl_mode != ST_GL_TEST)
+            drawresultscreen();
+          player_level_begin(&tux);
         }
       else
         {
-
           player_dying(&tux);
 
           /* No more lives!? */
 
           if (tux.lives < 0)
             {
-              drawendscreen();
+              if(st_gl_mode != ST_GL_TEST)
+                drawendscreen();
 
-              if (score > highscore)
-                save_hs(score);
-              unloadlevelgfx();
-              unloadlevelsong();
+              if(st_gl_mode != ST_GL_TEST)
+                {
+                  if (score > hs_score)
+                    save_hs(score);
+                }
+              level_free_gfx();
+              level_free(&current_level);
+              level_free_song();
               unloadshared();
               arrays_free();
               return(0);
@@ -299,15 +337,18 @@ int game_action(void)
 
       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_TEST)
+        levelintro();
       start_timers();
     }
 
@@ -386,20 +427,29 @@ int game_action(void)
 
 /* --- 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: */
@@ -475,10 +525,18 @@ void game_draw()
 
 
   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!) */
 
@@ -489,66 +547,126 @@ void game_draw()
 
 /* --- GAME LOOP! --- */
 
-int gameloop(void)
+int gameloop(char * subset, int levelnb, int mode)
 {
-
-  /*Uint32 last_time, now_time*/
-  int fps_cnt;
+  int fps_cnt, jump, done;
   timer_type fps_timer, frame_timer;
+  timer_init(&fps_timer, YES);
+  timer_init(&frame_timer, YES);
+  
+  game_started = YES;
 
-  /* Clear screen: */
+  st_gl_mode = mode;
+  level = levelnb;
+  strcpy(level_subset,subset);
 
-  clearscreen(0, 0, 0);
-  updatescreen();
+  if(st_gl_mode != ST_GL_LOAD_GAME)
+    {
+      /* Init the game: */
+      arrays_init();
+      set_defaults();
 
+      if(level_load(&current_level,level_subset,level) != 0)
+        exit(1);
+      level_load_gfx(&current_level);
+      activate_bad_guys();
+      level_load_song(&current_level);
 
-  /* Init the game: */
-  arrays_init();
+    }
+    
+  player_init(&tux);
+
+  if(st_gl_mode != ST_GL_TEST)
+    load_hs();
 
-  initmenu();
-  menumenu = MENU_GAME;
-  initgame();
   loadshared();
-  set_defaults();
 
-  loadlevel(&current_level,"default",level);
-  loadlevelgfx(&current_level);
-  activate_bad_guys();
-  loadlevelsong();
-  highscore = load_hs();
+  if(st_gl_mode == ST_GL_PLAY)
+    levelintro();
 
-  player_init(&tux);
 
-  levelintro();
+    timer_init(&time_left,YES);
   start_timers();
 
+  if(st_gl_mode == ST_GL_LOAD_GAME)
+    loadgame(levelnb);
+
+
   /* --- MAIN GAME LOOP!!! --- */
 
+  jump = NO;
   done = 0;
   quit = 0;
   frame = 0;
   game_pause = 0;
-  timer_init(&fps_timer);
-  timer_init(&frame_timer);
+  timer_init(&fps_timer,YES);
+  timer_init(&frame_timer,YES);
   fps_cnt = 0;
 
+  /* Clear screen: */
+
+  clearscreen(0, 0, 0);
+  updatescreen();
+
+  while (SDL_PollEvent(&event))
+  {}
+
   game_draw();
   do
     {
-      /*last_time = SDL_GetTicks();*/
+      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;
-      }
+        {
+          timer_start(&frame_timer,25);
+          ++frame;
+        }
 
 
       /* Handle events: */
 
       tux.input.old_fire = tux.input.fire;
-
+      
       game_event();
 
+      if(show_menu)
+        {
+          if(current_menu == &game_menu)
+            {
+              switch (menu_check(&game_menu))
+                {
+                case 2:
+                  st_pause_ticks_stop();
+                  break;
+                case 3:
+                  update_load_save_game_menu(&save_game_menu, NO);
+                  break;
+                case 4:
+                  update_load_save_game_menu(&load_game_menu, YES);
+                  break;
+                case 7:
+                  st_pause_ticks_stop();
+                  done = 1;
+                  break;
+                }
+            }
+          else if(current_menu == &options_menu)
+            {
+              process_options_menu();
+            }
+          else if(current_menu == &save_game_menu )
+            {
+              process_save_load_game_menu(YES);
+            }
+          else if(current_menu == &load_game_menu )
+            {
+              process_save_load_game_menu(NO);
+            }
+        }
+
 
       /* Handle actions: */
 
@@ -562,9 +680,22 @@ int gameloop(void)
             }
         }
       else
-        SDL_Delay(50);
+        {
+          ++pause_menu_frame;
+          SDL_Delay(50);
+        }
+
+      if(tux.input.down == DOWN)
+        SDL_Delay(45);
 
       /*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 */
@@ -573,15 +704,19 @@ 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);*/
-       /*printf("%d",timer_get_left(&frame_timer));*/
-      /*SDL_Delay(timer_get_left(&frame_timer) );*/
-       SDL_Delay(10);      
-      
 
 
       /* Handle time: */
@@ -615,8 +750,8 @@ int gameloop(void)
       /* Calculate frames per second */
       if(show_fps)
         {
-          fps_fps = ((float)1000 / (float)timer_get_gone(&fps_timer)) * (float)fps_cnt;
           ++fps_cnt;
+          fps_fps = (1000.0 / (float)timer_get_gone(&fps_timer)) * (float)fps_cnt;
 
           if(!timer_check(&fps_timer))
             {
@@ -631,56 +766,17 @@ int gameloop(void)
   if (playing_music())
     halt_music();
 
-  unloadlevelgfx();
-  unloadlevelsong();
+  level_free_gfx();
+  level_free(&current_level);
+  level_free_song();
   unloadshared();
   arrays_free();
 
-  return(quit);
-}
-
-
-/* Initialize the game stuff: */
+  game_started = NO;
 
-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);
+  return(quit);
 }
 
-/* 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: */
 
@@ -1065,7 +1161,7 @@ void loadshared(void)
 
   /* Herring song */
   herring_song_path = (char *) malloc(sizeof(char) * (strlen(DATA_PREFIX) +
-                                      strlen("SALCON.MOD") + 8)); /* FIXME: We need a real herring_song! Thats a fake.:) */
+                                      strlen("SALCON.MOD") + 8));
 
   sprintf(herring_song_path, "%s/music/%s", DATA_PREFIX, "SALCON.MOD");
 
@@ -1189,9 +1285,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 == '[')
@@ -1226,7 +1322,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 == '\\')
     {
@@ -1262,6 +1358,26 @@ unsigned char shape(float x, float y)
 
 /* 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) ||
@@ -1285,9 +1401,9 @@ int issolid(float x, float y)
     {
       return YES;
     }
-
   return NO;
-}
+}*/
 
 
 /* Is it a brick? */
@@ -1343,7 +1459,7 @@ void trybreakbrick(float x, float y)
         {
           /* Get a distro from it: */
 
-          add_bouncy_distro(((x + 1) / 32) * 32,
+          add_bouncy_distro(((int)(x + 1) / 32) * 32,
                             (int)(y / 32) * 32);
 
           if (counting_distros == NO)
@@ -1369,7 +1485,7 @@ void trybreakbrick(float x, float y)
 
       /* Replace it with broken bits: */
 
-      add_broken_brick(((x + 1) / 32) * 32,
+      add_broken_brick(((int)(x + 1) / 32) * 32,
                        (int)(y / 32) * 32);
 
 
@@ -1400,9 +1516,10 @@ void tryemptybox(float x, float y)
     {
       if (shape(x, y) == 'A')
         {
+
           /* Box with a distro! */
 
-          add_bouncy_distro(((x + 1) / 32) * 32,
+          add_bouncy_distro(((int)(x + 1) / 32) * 32,
                             (int)(y / 32) * 32 - 32);
 
           play_sound(sounds[SND_DISTRO], SOUND_CENTER_SPEAKER);
@@ -1417,7 +1534,7 @@ void tryemptybox(float x, float y)
             {
               /* Tux is small, add mints! */
 
-              add_upgrade(((x + 1) / 32) * 32,
+              add_upgrade((int)((x + 1) / 32) * 32,
                           (int)(y / 32) * 32 - 32,
                           UPGRADE_MINTS);
             }
@@ -1425,7 +1542,7 @@ void tryemptybox(float x, float y)
             {
               /* Tux is big, add coffee: */
 
-              add_upgrade(((x + 1) / 32) * 32,
+              add_upgrade((int)((x + 1) / 32) * 32,
                           (int)(y / 32) * 32 - 32,
                           UPGRADE_COFFEE);
             }
@@ -1436,7 +1553,7 @@ void tryemptybox(float x, float y)
         {
           /* Add a golden herring */
 
-          add_upgrade(((x + 1) / 32) * 32,
+          add_upgrade((int)((x + 1) / 32) * 32,
                       (int)(y / 32) * 32 - 32,
                       UPGRADE_HERRING);
         }
@@ -1459,7 +1576,7 @@ void trygrabdistro(float x, float y, int bounciness)
 
       if (bounciness == BOUNCE)
         {
-          add_bouncy_distro(((x + 1) / 32) * 32,
+          add_bouncy_distro(((int)(x + 1) / 32) * 32,
                             (int)(y / 32) * 32);
         }
 
@@ -1515,33 +1632,38 @@ void drawstatus(void)
   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_TEST)
+    {
+      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
+    {
+      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)
     {
-      drawtext("FPS", screen->h, 40, letters_blue, NO_UPDATE, 1);
-      sprintf(str, "%f", fps_fps);
-      if(use_gl) /* FIXME: We need this check as text doesn't work in OpenGl mode. */
-        printf("%f\n",fps_fps);
-      drawtext(str, screen->h + 60, 40, letters_gold, NO_UPDATE, 1);
+      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)
@@ -1557,13 +1679,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);
@@ -1575,93 +1697,139 @@ 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);
 }
 
-void savegame(void)
+void savegame(int slot)
 {
-  char savefile[300];
-  time_t current_time = time(NULL);
-  struct tm* time_struct;
+  char savefile[1024];
   FILE* fi;
+  unsigned int ui;
 
-  time_struct = localtime(&current_time);
-  sprintf(savefile,"%s/%d-%d-%d-%d.save",st_save_dir,time_struct->tm_year+1900,time_struct->tm_mon,time_struct->tm_mday,time_struct->tm_hour);
-  printf("%s",savefile);
-
+  sprintf(savefile,"%s/slot%d.save",st_save_dir,slot);
 
   fi = fopen(savefile, "wb");
 
   if (fi == NULL)
     {
-      fprintf(stderr, "Warning: I could not open the high score file ");
+      fprintf(stderr, "Warning: I could not open the slot file ");
 
     }
   else
     {
-      fwrite(&level,4,1,fi);
-      fwrite(&score,4,1,fi);
-      fwrite(&distros,4,1,fi);
-      fwrite(&tux.base.x,4,1,fi);
-      fwrite(&tux.base.y,4,1,fi);
-      fwrite(&scroll_x,4,1,fi);
-      fwrite(&current_level.time_left,4,1,fi);
+      fputs(level_subset, fi);
+      fputs("\n", fi);
+      fwrite(&level,sizeof(int),1,fi);
+      fwrite(&score,sizeof(int),1,fi);
+      fwrite(&distros,sizeof(int),1,fi);
+      fwrite(&tux,sizeof(player_type),1,fi);
+      fwrite(&scroll_x,sizeof(float),1,fi);
+      fwrite(&time_left,sizeof(float),1,fi);
+      ui = st_get_ticks();
+      fwrite(&ui,sizeof(int),1,fi);
     }
   fclose(fi);
 
 }
 
-void loadgame(char* filename)
+void loadgame(int slot)
 {
-  char savefile[300];
+  char savefile[1024];
+  char str[100];
   FILE* fi;
-  time_t current_time = time(NULL);
-  struct tm* time_struct;
-
-  time_struct = localtime(&current_time);
-  sprintf(savefile,"%s/%d-%d-%d-%d.save",st_save_dir,time_struct->tm_year+1900,time_struct->tm_mon,time_struct->tm_mday,time_struct->tm_hour);
-  printf("%s",savefile);
+  unsigned int ui;
 
+  sprintf(savefile,"%s/slot%d.save",st_save_dir,slot);
 
   fi = fopen(savefile, "rb");
 
   if (fi == NULL)
     {
-      fprintf(stderr, "Warning: I could not open the high score file ");
+      fprintf(stderr, "Warning: I could not open the slot file ");
 
     }
   else
     {
-      player_level_begin(&tux);
+
+
+      fgets(str, 100, fi);
+      strcpy(level_subset, str);
+      level_subset[strlen(level_subset)-1] = '\0';
+      fread(&level,sizeof(int),1,fi);
+
       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();
+      timer_start(&time_left,current_level.time_left*1000);
+      update_time = st_get_ticks();
+
+      fread(&score,sizeof(int),1,fi);
+      fread(&distros,sizeof(int),1,fi);
+      fread(&tux,sizeof(player_type),1,fi);
+      fread(&scroll_x,sizeof(float),1,fi);
+      fread(&time_left,sizeof(float),1,fi);
+      fread(&ui,sizeof(int),1,fi);
+      time_left.time += st_get_ticks() - ui;
+      tux.invincible_timer.time += st_get_ticks() - ui;
+      tux.skidding_timer.time += st_get_ticks() - ui;
+      tux.safe_timer.time += st_get_ticks() - ui;
+      tux.vphysic.start_time += st_get_ticks() - ui;
+      tux.hphysic.start_time += st_get_ticks() - ui;
+      tux.vphysic.start_time += st_get_ticks() - ui;
+      fclose(fi);
+    }
+
+}
+
+void slotinfo(char **pinfo, int slot)
+{
+  FILE* fi;
+  char slotfile[1024];
+  char tmp[200];
+  char str[5];
+  int slot_level;
+  sprintf(slotfile,"%s/slot%d.save",st_save_dir,slot);
+
+  fi = fopen(slotfile, "rb");
 
-      fread(&level,4,1,fi);
-      fread(&score,4,1,fi);
-      fread(&distros,4,1,fi);
-      fread(&tux.base.x,4,1,fi);
-      fread(&tux.base.y,4,1,fi);
-      fread(&scroll_x,4,1,fi);
-      fread(&current_level.time_left,4,1,fi);
+  sprintf(tmp,"Slot %d - ",slot);
+
+  if (fi == NULL)
+    {
+      strcat(tmp,"Free");
+    }
+  else
+    {
+      fgets(str, 100, fi);
+      str[strlen(str)-1] = '\0';
+      strcat(tmp, str);
+      strcat(tmp, " / Level:");
+      fread(&slot_level,sizeof(int),1,fi);
+      sprintf(str,"%d",slot_level);
+      strcat(tmp,str);
       fclose(fi);
     }
 
+  *pinfo = (char*) malloc(sizeof(char) * (strlen(tmp)+1));
+  strcpy(*pinfo,tmp);
+
 }
+