Changeset 1855 in orxonox.OLD for orxonox/trunk/core

Timestamp:

May 5, 2004, 9:34:21 AM (21 years ago)

Author:

patrick

Message:

/orxonox/trunk/core/ modifications on world and docs

Location:

orxonox/trunk/core

Files:

• data_tank.cc (modified) (1 diff)
• npc.cc (modified) (1 diff)
• npc.h (modified) (1 diff)
• orxonox.cc (modified) (1 diff)
• proto_class.cc (modified) (1 diff)
• stdincl.h (added)
• world.cc (modified) (3 diffs)
• world.h (modified) (2 diffs)

orxonox/trunk/core/data_tank.cc

@@ -9 +9 @@
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
+
+   Copyright by: Patrick Boenzli
+   Fixes by:
 */
 

orxonox/trunk/core/npc.cc

@@ -10 +10 @@
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
+
+   ### File Specific:
+   main-programmer: Patrick Boenzli
+   co-programmer:
 */
 

orxonox/trunk/core/npc.h

@@ -10 +10 @@
   ~NPC ();
 
+  int npcType;
+
 };
 

orxonox/trunk/core/orxonox.cc

@@ -18 +18 @@
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
 
+
+   ### File Specific:
+   main-programmer: Patrick Boenzli
+   co-programmer:
 */
 

orxonox/trunk/core/proto_class.cc

@@ -10 +10 @@
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
+
+   ### File Specific:
+   main-programmer: ...
+   co-programmer: ...
 */
 

orxonox/trunk/core/world.cc

@@ -10 +10 @@
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
+
+   ### File Specific:
+   main-programmer: Patrick Boenzli
+   co-programmer:
 */
 
@@ -19 +23 @@
 
 World::World () {
-  
+  lastPlayer = null;
+  lastPlayer->nextPlayer = null;
 }
-
 
 
@@ -27 +31 @@
 
 
+/** 
+   \brief Add Player
+   \param player A reference to the new player object
+   
+   Add a new Player to the game. Player has to be initialised previously 
+*/
+bool World::addPlayer(Player* player) 
+{
+  playerList* listMember = new playerList;
+  listMember->nextPlayer = lastPlayer;
+  listMember->player = player;
+  listMember->playerNr = lastPlayer->playerNr + 1;
+  lastPlayer = listMember;
+}
+
+
+
+/** 
+   \brief Routine for testing purposes.
+   
+   testing, testing, testing...
+*/
+boot World::testRouting() 
+{
+
+}
+
+bool World::removePlayer(Player* player) {}
+
+bool World::addNPC(NPC* npc) {}
+bool World::removeNPC(NPC* npc) {}

orxonox/trunk/core/world.h

@@ -2 +2 @@
 #include "npc.h"
 #include "player.h"
+#include "stdincl.h"
 
 #ifndef WORLD_H
@@ -13 +14 @@
   ~World ();
 
+  /* for easier use: map the first two player here */
   Player *player1;
+  Player *player2;
 
-  struct player_list {
-    player_list* next_player;
+  /* a list of all players */
+  struct playerList {
+    playerList* nextPlayer;
     Player* player;
+    int playerNr;
   };
+  playerList* lastPlayer;
 
-  struct npc_list {
-    npc_list* next_npc;
+  /* a list of all non-player-characters */
+  struct npcList {
+    npcList* nextNPC;
     NPC* npc;
   };
+  npcList* firstNPC;
+
+  bool addPlayer(Player* player);
+  bool removePlayer(Player* player);
+
+  bool addNPC(NPC* npc);
+  bool removeNPC(NPC* npc);
+
+
+
 
 };