Changeset 7810 in orxonox.OLD for trunk/src/util

Timestamp:

May 24, 2006, 3:57:04 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the Weather effects back here

Location:

trunk/src/util

Files:

• multiplayer_team_deathmatch.cc (modified) (2 diffs)
• multiplayer_team_deathmatch.h (modified) (2 diffs)

trunk/src/util/multiplayer_team_deathmatch.cc

@@ -20 +20 @@
 #include "util/loading/factory.h"
 
-#include "render2D/billboard.h"
+#include "render2D/image_plane.h"
 #include "state.h"
 #include "class_list.h"
@@ -53 +53 @@
   this->timeout = 0.0f;
 
-  this->deathScreen = new Billboard();
+  this->deathScreen = new ImagePlane();
   this->deathScreen->setSize(State::getResX()/4.0, State::getResY()/4.0);
   this->deathScreen->setAbsCoor2D(State::getResX()/2.0f, State::getResY()/2.0f);

trunk/src/util/multiplayer_team_deathmatch.h

@@ -16 +16 @@
 class ObjectManager;
 class Player;
-class Billboard;
+class ImagePlane;
 
 
@@ -52 +52 @@
     int                teamBKills;                 //!< kills of team B
 
-    Billboard*         deathScreen;                //!< the death screen
+    ImagePlane*         deathScreen;                //!< the death screen
 };