Changeset 1858 in orxonox.OLD for orxonox/trunk/core/world.cc

Timestamp:

May 5, 2004, 7:33:27 PM (21 years ago)

Author:

patrick

Message:

orxonox/trunk/core: world draw function

File:

• orxonox/trunk/core/world.cc (modified) (4 diffs)

orxonox/trunk/core/world.cc

@@ -24 +24 @@
 
 
-
+/** 
+   \brief Create a new World
+   
+   This creates a new empty world!
+*/
 World::World () {
   lastPlayer = null;
+  lastNPC = null;
 }
 
@@ -57 +62 @@
 
 
+/** 
+   \brief Remove Player
+   \param player A reference to the new npc object
+   
+   Remove a new Player to the game.
+*/
+bool World::removePlayer(Player* player) {
+  cout << "World::removeNPC not implemented yet" << endl;
+}
+
+
+/** 
+   \brief Add Non-Player-Character
+   \param player A reference to the new npc object
+   
+   Add a new Non-Player-Character to the game. Player has to be initialised previously 
+*/
+bool World::addNPC(NPC* npc) 
+{
+  npcList* listMember = new npcList;
+  listMember->npc = npc;
+  if ( lastNPC != null ) 
+    {
+      listMember->number = lastNPC->number + 1;
+      listMember->next = lastNPC;
+    }
+  else 
+    {
+      listMember->number = 0;
+      listMember->next = null;
+    }
+  lastNPC = listMember;
+}
+
+
+/** 
+   \brief Remove Non-Player-Character
+   \param player A reference to the new npc object
+   
+   Remove a new Non-Player-Character to the game.
+*/
+bool World::removeNPC(NPC* npc) {
+  cout << "World::removeNPC not implemented yet" << endl;
+}
+
+
+
+/** 
+   \brief Draws the World and all Objects contained
+   
+   Calls the draw function of all: Objects, Players, Environement
+*/
+void World::drawWorld(void) 
+{
+  playerList* tmpPlayer = lastPlayer;
+  Player* player = tmpPlayer->player;
+  while( tmpPlayer != null ) 
+    {
+      (*tmpPlayer->player).drawPlayer();
+      tmpPlayer = tmpPlayer->next;
+    }
+  npcList* tmpNPC = lastNPC;
+  while( tmpNPC != null )
+    {
+      (*tmpNPC->npc).drawNPC();
+      tmpNPC = tmpNPC->next;
+    }
+}
+
+
+/** 
+   \brief Updates the world and all its objects
+   
+   Calculates the new state of the world. User-input and AI of
+   the enemies are accounted for.
+*/
+void World::updateWorld(void) 
+{
+  
+
+}
+
+
 
 /** 
@@ -63 +151 @@
    testing, testing, testing...
 */
-void World::testThaTest() 
+void World::testThaTest(void) 
 {
   cout << "World::testThaTest() called" << endl;
@@ -75 +163 @@
     }
 
+  /* test addNPC */
+  cout << "addNPC test..." << endl;
+  npcList* nl = lastNPC;
+  while ( nl != null )
+    {
+      cout << "npc " << nl->number << " was found" << endl;
+      nl = nl->next;
+    }
+
+  /* test drawWorld() */
+  cout << "drawWorld()..." << endl;
+  drawWorld();
+
   cout << "World::testThaTest() finished" << endl;
 }
-
-bool World::removePlayer(Player* player) {}
-
-bool World::addNPC(NPC* npc) {}
-bool World::removeNPC(NPC* npc) {}