Changeset 3174 in orxonox.OLD

Timestamp:

Dec 15, 2004, 1:45:10 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: SDL_Init - fix. it's better that way

File:

• orxonox/trunk/src/orxonox.cc (modified) (3 diffs)

orxonox/trunk/src/orxonox.cc

@@ -97 +97 @@
   
   get_config_file (argc, argv);
-  
-  // initialize SDL
-  printf("> Initializing SDL\n");
-  if( SDL_Init (SDL_INIT_EVERYTHING) == -1)
-    {
-      printf ("Could not SDL_Init(): %s\n", SDL_GetError());
-      return -1;
-    }
-  
+  SDL_Init (SDL_INIT_TIMER);
   // initialize everything
-  printf("> Initializing video\n");
   if( init_video () == -1) return -1;
-  printf("> Initializing sound\n");
   if( init_sound () == -1) return -1;
   printf("> Initializing input\n");
@@ -128 +118 @@
 int Orxonox::init_video () 
 {
+  printf("> Initializing video\n");
+  if (SDL_Init (SDL_INIT_VIDEO) == -1)
+    {
+      printf ("could not initialize SDL Video\n");
+      return -1;
+    }
   // Set video mode
   // TO DO: parse arguments for settings
@@ -185 +181 @@
 int Orxonox::init_sound () 
 {
+  printf("> Initializing sound\n");
+  // SDL_Init (SDL_INIT_AUDIO);
   printf("Not yet implemented\n");
   return 0;