[Super-tux-commit] supertux/src intro.cpp,1.26,1.27 title.cpp,1.103,1.104 worldmap.cpp,1.93,1.94

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28696/src

Modified Files:
	intro.cpp title.cpp worldmap.cpp 
Log Message:
display_text_file() now reads the background image from the file.

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- title.cpp	9 Jul 2004 18:18:11 -0000	1.103
+++ title.cpp	10 Jul 2004 14:07:03 -0000	1.104
@@ -345,7 +345,7 @@
                   update_time = st_get_ticks();
                   break;
                 case MNID_CREDITS:
-                  display_text_file("CREDITS", bkg_title, SCROLL_SPEED_CREDITS);
+                  display_text_file("CREDITS", SCROLL_SPEED_CREDITS);
                   Menu::set_current(main_menu);
                   break;
                 case MNID_QUITMAINMENU:

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- worldmap.cpp	10 Jul 2004 10:59:00 -0000	1.93
+++ worldmap.cpp	10 Jul 2004 14:07:04 -0000	1.94
@@ -381,8 +381,6 @@
 void
 WorldMap::load_map()
 {
-  std::cout << "Loading map: " << datadir + "/levels/worldmap/" + map_filename << std::endl;
-
   lisp_object_t* root_obj = lisp_read_from_file(datadir + "/levels/worldmap/" + map_filename);
   if (!root_obj)
     st_abort("Couldn't load file", datadir + "/levels/worldmap/" + map_filename);
@@ -702,10 +700,8 @@
                           sound_manager->load_music(datadir + "/music/theme.mod");
                         sound_manager->play_music(theme);
                         // Display final credits and go back to the main menu
-                        display_text_file(level->extro_filename,
-                                          "/images/background/extro.jpg", SCROLL_SPEED_MESSAGE);
-                        display_text_file("CREDITS",
-                                          "/images/background/oiltux.jpg", SCROLL_SPEED_CREDITS);
+                        display_text_file(level->extro_filename, SCROLL_SPEED_MESSAGE);
+                        display_text_file("CREDITS", SCROLL_SPEED_CREDITS);
                         quit = true;
                       }
                   }

Index: intro.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/intro.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- intro.cpp	9 Jun 2004 05:23:19 -0000	1.26
+++ intro.cpp	10 Jul 2004 14:07:03 -0000	1.27
@@ -25,6 +25,6 @@
 
 void draw_intro()
 {
-  display_text_file("intro.txt", "/images/background/arctis.jpg", SCROLL_SPEED_MESSAGE);
+  display_text_file("intro.txt", SCROLL_SPEED_MESSAGE);
 }