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

Timestamp:

Mar 18, 2005, 11:52:15 AM (20 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.h (modified) (2 diffs)

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

@@ -8 +8 @@
 #define _GLMENU_IMAGESCREEN_H
 
-#include "stdincl.h"
-class Texture;
+#include "base_object.h"
+
 class Material;
 
@@ -18 +18 @@
 
  public:
-  ~GLMenuImageScreen ();
-
+  virtual ~GLMenuImageScreen ();
+  
   static GLMenuImageScreen* getInstance();