Changeset 5955 in orxonox.OLD for branches/powerups/src/lib/graphics/graphics_engine.cc

Timestamp:

Dec 7, 2005, 1:05:10 PM (19 years ago)

Author:

bensch

Message:

branches/powerups: merged the trunk to branches/powerup
merged with commandsvn merge ../trunk/ powerups/ -r5848:HEAD
conflicts resolved in favor of the trunk

File:

• branches/powerups/src/lib/graphics/graphics_engine.cc (modified) (3 diffs)

branches/powerups/src/lib/graphics/graphics_engine.cc

@@ -26 +26 @@
 #include "debug.h"
 
-#include "ini_parser.h"
+#include "parser/ini_parser/ini_parser.h"
 #include "substring.h"
 #include "text.h"
 
 #include "globals.h"
+#include "texture.h"
 
 #ifdef __WIN32__
  #include "class_list.h"
- #include "texture.h"
  #include "list.h"
  #include "model.h"
@@ -131 +131 @@
   const char* textures = iniParser->getVar(CONFIG_NAME_TEXTURES, CONFIG_SECTION_VIDEO_ADVANCED, "0");
   if (strchr(textures, '1') || !strcasecmp(textures, "true"))
-    this->texturesEnabled = true;
+    Texture::setTextureEnableState( true);
   else
-    this->texturesEnabled = false;
+    Texture::setTextureEnableState(false);
 
   // searching for a usefull resolution
@@ -365 +365 @@
 
 /**
- * if Textures should be enabled
-*/
-bool GraphicsEngine::texturesEnabled = true;
-
-/**
  *
  * @param show if The mouse-cursor should be visible