Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src/glmenu/glmenu_imagescreen.cc

Timestamp:

Mar 18, 2005, 11:52:15 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

File:

• orxonox/branches/levelloader/src/glmenu/glmenu_imagescreen.cc (modified) (6 diffs)

orxonox/branches/levelloader/src/glmenu/glmenu_imagescreen.cc

@@ -19 +19 @@
 #include "glmenu_imagescreen.h"
 
+#include "stdincl.h"
 #include "material.h"
 
@@ -27 +28 @@
 GLMenuImageScreen* GLMenuImageScreen::getInstance()
 {
-  if( singletonRef == NULL)
+  if(!singletonRef)
     singletonRef = new GLMenuImageScreen ();
   return singletonRef;
@@ -45 +46 @@
 /**
    \brief standard deconstructor
-
    \todo this deconstructor is not jet implemented - do it
 */
@@ -53 +53 @@
     delete backMat;
 }
-
 
 /**
@@ -171 +170 @@
   glDisable(GL_LIGHTING);
 
-  backMat->select();
   glBegin(GL_QUADS);
   glColor3f(0.96, 0.84, 0.34);
@@ -210 +208 @@
   glEnd();
 
-  glEnable(GL_TEXTURE_2D);
+  backMat->select();
   glBegin(GL_QUADS);
   glTexCoord2i(0, 0); glVertex2i(offsetX, offsetY);