Changeset 4768 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Jul 2, 2005, 12:03:12 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ini-parser small cleanup char* → const char*

Location:

orxonox/trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (3 diffs)
• lib/graphics/graphics_engine.h (modified) (1 diff)
• orxonox.h (modified) (1 diff)

orxonox/trunk/src/lib/graphics/graphics_engine.cc

@@ -37 +37 @@
   this->maxFPS = 0;
 
-  this->fullscreen = false;
+  this->fullscreenFlag = 0;
 
   this->initVideo();
@@ -92 +92 @@
   */
     // setting up the Resolution
-  this->setResolution(550, 400, 16);
+  this->setResolution(640, 480, 16);
 
   // TO DO: Create a cool icon and use it here
@@ -146 +146 @@
 int GraphicsEngine::setResolution(int width, int height, int bpp)
 {
-  Uint32 fullscreenFlag;
   this->resolutionX = width;
   this->resolutionY = height;
   this->bitsPerPixel = bpp;
 
-  if (this->fullscreen)
+  if((this->screen = SDL_SetVideoMode(this->resolutionX, this->resolutionY, this->bitsPerPixel, this->videoFlags | SDL_FULLSCREEN)) == NULL)
+    {
+      PRINTF(1)("Could not SDL_SetVideoMode(%d, %d, %d, %d): %s\n", this->resolutionX, this->resolutionY, this->bitsPerPixel, this->videoFlags, SDL_GetError());
+      SDL_Quit();
+      //    return -1;
+    }
+}
+
+/**
+   \brief sets Fullscreen mode
+   \param fullscreen true if fullscreen, false if windowed
+*/
+void GraphicsEngine::setFullscreen(bool fullscreen)
+{
+  if (fullscreen)
     fullscreenFlag = SDL_FULLSCREEN;
   else
     fullscreenFlag = 0;
-
-  if((this->screen = SDL_SetVideoMode(this->resolutionX, this->resolutionY, this->bitsPerPixel, this->videoFlags | fullscreenFlag)) == NULL)
-    {
-      PRINTF(1)("Could not SDL_SetVideoMode(%d, %d, %d, %d): %s\n", this->resolutionX, this->resolutionY, this->bitsPerPixel, this->videoFlags, SDL_GetError());
-      SDL_Quit();
-      //    return -1;
-    }
-}
-
-/**
-   \brief sets Fullscreen mode
-   \param fullscreen true if fullscreen, false if windowed
-*/
-void GraphicsEngine::setFullscreen(bool fullscreen)
-{
-  this->fullscreen = fullscreen;
   this->setResolution(this->resolutionX, this->resolutionY, this->bitsPerPixel);
 }

orxonox/trunk/src/lib/graphics/graphics_engine.h

@@ -75 +75 @@
     int            resolutionY;     //!< the Y-resolution of the screen
     int            bitsPerPixel;    //!< the bits per pixels of the screen
-    bool           fullscreen;      //!< if we are in fullscreen mode
+    Uint32         fullscreenFlag;  //!< if we are in fullscreen mode
     Uint32         videoFlags;      //!< flags for video
     SDL_Rect**     videoModes;      //!< list of resolutions

orxonox/trunk/src/orxonox.h

@@ -17 +17 @@
 class IniParser;
 
-//! Orxonox core singleton class
+//! orxonox core singleton class
 /**
 */