[Super-tux-commit] supertux/src misc.cpp,1.2,1.3 misc.h,1.1,1.2 supertux.cpp,1.26,1.27

[Tobias G. <to...@us...>]

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

Modified Files:
	misc.cpp misc.h supertux.cpp 
Log Message:
SuperTux lib became a bit more independend of SupeTux.

Index: misc.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/misc.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- misc.cpp	21 Jul 2004 16:51:53 -0000	1.2
+++ misc.cpp	24 Jul 2004 11:50:09 -0000	1.3
@@ -46,7 +46,7 @@
       if(use_gl != options_menu->isToggled(MNID_OPENGL))
         {
           use_gl = !use_gl;
-          st_video_setup();
+          st_video_setup(screen->w,screen->h);
         }
 #else
       options_menu->get_item_by_id(MNID_OPENGL).toggled = false;
@@ -56,7 +56,7 @@
       if(use_fullscreen != options_menu->isToggled(MNID_FULLSCREEN))
         {
           use_fullscreen = !use_fullscreen;
-          st_video_setup();
+          st_video_setup(screen->w,screen->h);
         }
       break;
     case MNID_SOUND:

Index: misc.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/misc.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- misc.h	20 Jul 2004 17:59:37 -0000	1.1
+++ misc.h	24 Jul 2004 11:50:09 -0000	1.2
@@ -43,7 +43,12 @@
   MNID_MUSIC,
   MNID_SHOWFPS
   };
-  
+
+/* Screen proprities: */
+/* Don't use this to test for the actual screen sizes. Use screen->w/h instead! */
+#define SCREEN_W 800
+#define SCREEN_H 600
+    
 /* Handle changes made to global settings in the options menu. */
 void process_options_menu(void);
 

Index: supertux.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/supertux.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- supertux.cpp	20 Jul 2004 18:04:48 -0000	1.26
+++ supertux.cpp	24 Jul 2004 11:50:09 -0000	1.27
@@ -51,12 +51,14 @@
     bindtextdomain(PACKAGE, LOCALEDIR);
     textdomain(PACKAGE);
     bind_textdomain_codeset(PACKAGE, "ISO-8859-1");
-      
+    
+    st_info_setup(PACKAGE_NAME,PACKAGE,PACKAGE_VERSION);  
+    
     st_directory_setup();
     parseargs(argc, argv);
 
     st_audio_setup();
-    st_video_setup();
+    st_video_setup(SCREEN_W,SCREEN_H);
     st_joystick_setup();
     st_general_setup();
     st_menu();