Index: orxonox/trunk/src/lib/graphics/graphics_engine.cc
===================================================================
--- orxonox/trunk/src/lib/graphics/graphics_engine.cc	(revision 4826)
+++ orxonox/trunk/src/lib/graphics/graphics_engine.cc	(revision 4830)
@@ -67,8 +67,44 @@
 }
 
+/**
+ * initializes the GraphicsEngine with default settings.
+ */
 int GraphicsEngine::init()
 {
-  this->initVideo(640,480,16);
-}
+  if (this->isInit)
+    return -1;
+  this->initVideo(640, 480, 16);
+  this->isInit = true;
+}
+
+/**
+ * loads the GraphicsEngine's settings from a given ini-file and section
+ * @param iniParser the iniParser to load from
+ * @param section the Section in the ini-file to load from
+ * @returns nothing usefull
+ */
+int GraphicsEngine::initFromIniFile(IniParser* iniParser)
+{
+
+  // looking if we are in fullscreen-mode
+  const char* fullscreen = iniParser->getVar(CONFIG_NAME_FULLSCREEN, CONFIG_SECTION_VIDEO, "0");
+  if (strchr(fullscreen, '1'))
+    this->fullscreenFlag = SDL_FULLSCREEN;
+
+
+
+  // looking if we are in fullscreen-mode
+  const char* textures = iniParser->getVar(CONFIG_NAME_TEXTURES, CONFIG_SECTION_VIDEO_ADVANCED, "0");
+  if (strchr(textures, '1'))
+    this->texturesEnabled = true;
+  else
+    this->texturesEnabled = false;
+
+  // searching for a usefull resolution
+  SubString resolution(iniParser->getVar(CONFIG_NAME_RESOLUTION, CONFIG_SECTION_VIDEO, "640x480"), 'x');
+  this->initVideo(atoi(resolution.getString(0)), atoi(resolution.getString(1)), 16);
+}
+
+
 
 /**
@@ -123,32 +159,4 @@
 
 /**
- * loads the GraphicsEngine's settings from a given ini-file and section
- * @param iniParser the iniParser to load from
- * @param section the Section in the ini-file to load from
- * @returns nothing usefull
- */
-int GraphicsEngine::initFromIniFile(IniParser* iniParser)
-{
-  // searching for a usefull resolution
-  SubString resolution(iniParser->getVar(CONFIG_NAME_RESOLUTION, CONFIG_SECTION_VIDEO, "640x480"), 'x');
-  this->initVideo(atoi(resolution.getString(0)), atoi(resolution.getString(1)), 16);
-
-  // looking if we are in fullscreen-mode
-  const char* fullscreen = iniParser->getVar(CONFIG_NAME_FULLSCREEN, CONFIG_SECTION_VIDEO, "0");
-  if (strchr(fullscreen, '1'))
-    this->setFullscreen(true);
-
-  // looking if we are in fullscreen-mode
-  const char* textures = iniParser->getVar(CONFIG_NAME_TEXTURES, CONFIG_SECTION_VIDEO_ADVANCED, "0");
-  if (strchr(textures, '1'))
-    this->texturesEnabled = true;
-  else
-    this->texturesEnabled = false;
-
-}
-
-
-
-/**
  * sets the Window Captions and the Name of the icon.
  * @param windowName The name of the Window
Index: orxonox/trunk/src/lib/graphics/importer/model.h
===================================================================
--- orxonox/trunk/src/lib/graphics/importer/model.h	(revision 4826)
+++ orxonox/trunk/src/lib/graphics/importer/model.h	(revision 4830)
@@ -26,6 +26,8 @@
  * \todo implement this stuff
 */
-typedef enum MODEL_TYPE {MODEL_DISPLAY_LIST,
-                         MODEL_VERTEX_ARRAY};
+typedef enum MODEL_TYPE {
+  MODEL_DISPLAY_LIST,
+  MODEL_VERTEX_ARRAY
+};
 
 
@@ -36,8 +38,10 @@
 
 //! an enumerator for VERTEX_FORMAT
-typedef enum VERTEX_FORMAT { VERTEX_ONLY = VERTEX,
-                             VERTEX_NORMAL = NORMAL,
-                             VERTEX_TEXCOORD = TEXCOORD,
-                             VERTEX_TEXCOORD_NORMAL = NORMAL | TEXCOORD };
+typedef enum VERTEX_FORMAT {
+  VERTEX_ONLY = VERTEX,
+  VERTEX_NORMAL = NORMAL,
+  VERTEX_TEXCOORD = TEXCOORD,
+  VERTEX_TEXCOORD_NORMAL = NORMAL | TEXCOORD
+};
 
 ////////////////////
Index: orxonox/trunk/src/lib/graphics/text_engine.cc
===================================================================
--- orxonox/trunk/src/lib/graphics/text_engine.cc	(revision 4826)
+++ orxonox/trunk/src/lib/graphics/text_engine.cc	(revision 4830)
@@ -254,5 +254,5 @@
       glTranslatef(pos.x, pos.y, 0);
 
-      char* tmpText = this->text;
+      const char* tmpText = this->text;
       while (*tmpText != '\0')
         {
@@ -921,9 +921,9 @@
   // drawing all the texts
   tIterator<Text>* textIterator = textList->getIterator();
-  Text* text = textIterator->nextElement();
-  while( text != NULL)
-    {
-      text->draw();
-      text = textIterator->nextElement();
+  Text* drawText = textIterator->nextElement();
+  while( drawText != NULL)
+    {
+      drawText->draw();
+      drawText = textIterator->nextElement();
     }
   delete textIterator;
