fix tiles being 1 pixel off their correct position

[supertux.git] / src / title.cpp

diff --git a/src/title.cpp b/src/title.cpp
index 3841e3e..9ef6a6d 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -36,10 +36,10 @@
 #include "defines.h"
 #include "globals.h"
 #include "title.h"
-#include "screen.h"
+#include "screen/screen.h"
+#include "screen/texture.h"
 #include "high_scores.h"
 #include "menu.h"
-#include "texture.h"
 #include "timer.h"
 #include "setup.h"
 #include "level.h"
@@ -52,7 +52,6 @@
 #include "resources.h"
 
 static Surface* bkg_title;
-static Surface* bkg_credits;
 static Surface* logo;
 static Surface* img_choose_subset;
 
@@ -118,8 +117,6 @@ void check_contrib_menu()
           
               current_contrib_subset = subset.name;
 
-              std::cout << "Updating the contrib subset menu..." << subset.levels << std::endl;
-      
               contrib_subset_menu->clear();
 
               contrib_subset_menu->additem(MN_LABEL, subset.title, 0,0);
@@ -127,7 +124,7 @@ void check_contrib_menu()
               for (int i = 1; i <= subset.levels; ++i)
                 {
                   Level level;
-                  level.load(subset.name, i);
+                  level.load(subset.name, i, 0);
                   contrib_subset_menu->additem(MN_ACTION, level.name, 0, 0, i);
                 }
               contrib_subset_menu->additem(MN_HL,"",0,0);      
@@ -157,13 +154,6 @@ void check_contrib_subset_menu()
     }  
 }
 
-void draw_background()
-{
-  /* Draw the title background: */
-
-  bkg_title->draw_bg();
-}
-
 void draw_demo(GameSession* session, double frame_ratio)
 {
   World* world  = session->get_world();
@@ -193,7 +183,6 @@ void draw_demo(GameSession* session, double frame_ratio)
   if(plevel->width * 32 - 320 < tux->base.x)
     {
       tux->level_begin();
-      scroll_x = 0;
     }
 
   tux->can_jump = true;
@@ -223,25 +212,19 @@ void title(void)
 
   GameSession session(datadir + "/levels/misc/menu.stl", 0, ST_GL_DEMO_GAME);
 
-  clearscreen(0, 0, 0);
-  updatescreen();
-
   /* Load images: */
-  bkg_title = new Surface(datadir + "/images/title/background.jpg", IGNORE_ALPHA);
-  bkg_credits = new Surface(datadir + "/images/background/oiltux.jpg", IGNORE_ALPHA);
+  bkg_title = new Surface(datadir + "/images/background/arctis.jpg", IGNORE_ALPHA);
   logo = new Surface(datadir + "/images/title/logo.png", USE_ALPHA);
   img_choose_subset = new Surface(datadir + "/images/status/choose-level-subset.png", USE_ALPHA);
 
   /* --- Main title loop: --- */
   frame = 0;
 
-  /* Draw the title background: */
-  bkg_title->draw_bg();
-
   update_time = st_get_ticks();
   random_timer.start(rand() % 2000 + 2000);
 
   Menu::set_current(main_menu);
+  DrawingContext& context = World::current()->context;
   while (Menu::current())
     {
       // if we spent to much time on a menu entry
@@ -269,22 +252,26 @@ void title(void)
 
       /* Draw the background: */
       draw_demo(&session, frame_ratio);
-      
+     
+      context.push_transform();
+      context.set_translation(Vector(0, 0));
       if (Menu::current() == main_menu)
-        logo->draw(screen->w/2 - logo->w/2, 30);
+        context.draw_surface(logo, Vector(screen->w/2 - logo->w/2, 30),
+            LAYER_FOREGROUND1+1);
 
-      white_small_text->draw(" SuperTux " VERSION "\n"
-                             "Copyright (c) 2003 SuperTux Devel Team\n"
-                             "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
-                             "are welcome to redistribute it under certain conditions; see the file COPYING\n"
-                             "for details.\n",
-                             0, 420, 0);
+      context.draw_text(white_small_text,
+          " SuperTux " VERSION "\n"
+          "Copyright (c) 2003 SuperTux Devel Team\n"
+          "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
+          "are welcome to redistribute it under certain conditions; see the file COPYING\n"
+          "for details.\n", Vector(0, screen->h - 70), LAYER_FOREGROUND1);
+      context.pop_transform();
 
       /* Don't draw menu, if quit is true */
       Menu* menu = Menu::current();
       if(menu)
         {
-          menu->draw();
+          menu->draw(context);
           menu->action();
         
           if(menu == main_menu)
@@ -301,11 +288,12 @@ void title(void)
                   generate_contrib_menu();
                   break;
                 case MNID_LEVELEDITOR:
-                  leveleditor();
+                  // TODO
+                  //leveleditor();
                   Menu::set_current(main_menu);
                   break;
                 case MNID_CREDITS:
-                  display_text_file("CREDITS", bkg_credits, SCROLL_SPEED_CREDITS);
+                  display_text_file("CREDITS", bkg_title, SCROLL_SPEED_CREDITS);
                   Menu::set_current(main_menu);
                   break;
                 case MNID_QUITMAINMENU:
@@ -325,8 +313,6 @@ void title(void)
                 char str[1024];
                 sprintf(str,"Are you sure you want to delete slot %d?", slot);
                 
-                draw_background();
-
                 if(confirm_dialog(str))
                   {
                   sprintf(str,"%s/slot%d.stsg", st_save_dir, slot);
@@ -341,8 +327,6 @@ void title(void)
               else if (process_load_game_menu())
                 {
                   // FIXME: shouldn't be needed if GameSession doesn't relay on global variables
-                  // reset tux
-                  scroll_x = 0;
                   //titletux.level_begin();
                   update_time = st_get_ticks();
                 }
@@ -357,9 +341,9 @@ void title(void)
             }
         }
 
-      mouse_cursor->draw();
-      
-      flipscreen();
+      mouse_cursor->draw(context);
+     
+      context.do_drawing();
 
       /* Set the time of the last update and the time of the current update */
       last_update_time = update_time;
@@ -373,7 +357,6 @@ void title(void)
 
   free_contrib_menu();
   delete bkg_title;
-  delete bkg_credits;
   delete logo;
   delete img_choose_subset;
 }