Changeset 7690 in orxonox.OLD for branches/water/src/story_entities

Timestamp:

May 18, 2006, 3:31:04 PM (18 years ago)

Author:

patrick

Message:

water: some bugs fixed

Location:

branches/water/src/story_entities

Files:

• game_world.cc (modified) (4 diffs)
• game_world.h (modified) (1 diff)

branches/water/src/story_entities/game_world.cc

@@ -33 +33 @@
 #include "terrain.h"
 #include "playable.h"
-#include "mapped_water.h"
+#include "environments/mapped_water.h"
 
 #include "light.h"
@@ -445 +445 @@
   // clear buffer
   glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-  // draw world
-  //   this->draw();
 
   // render the reflection texture
@@ -479 +477 @@
   MappedWater* mw;
 
-  if( reflectedWaters = ClassList::getList(CL_MAPPED_WATER) != NULL)
+  if( (reflectedWaters = ClassList::getList(CL_MAPPED_WATER)) != NULL)
   {
     std::list<BaseObject*>::const_iterator it;
@@ -536 +534 @@
 
 /**
- * @brief runs through all entities calling their draw() methods
- */
-void GameWorld::draw ()
-{
-
-}
-
-/**
  *  shows the loading screen
  */

branches/water/src/story_entities/game_world.h

@@ -74 +74 @@
     virtual void renderPassRefraction();
     virtual void renderPassAll();
-    virtual void draw();
+
 
     virtual void display();