Changeset 1902 in orxonox.OLD for orxonox/trunk

Timestamp:

May 24, 2004, 12:13:56 AM (21 years ago)

Author:

patrick

Message:

orxonox/trunk: collision npc-player added

Location:

orxonox/trunk/core

Files:

• orxonox.cc (modified) (2 diffs)
• world.cc (modified) (2 diffs)

orxonox/trunk/core/orxonox.cc

@@ -107 +107 @@
   localPlayer = new Player;
   localPlayer->setPosition(0.0, -10.0, 3.0);
+  localPlayer->setCollisionRadius(2.0);
   io = new InputOutput(world, localPlayer);
   (*world).addPlayer(localPlayer);
@@ -136 +137 @@
   /* this is very very unsafe: io could be uninit */
   io->setPlayerStep(19.2 / fps); /* set player to propper speed */
-  //localPlayer->shootLaser->setShootStep(fps/48.0); /* set shoot speed */
+  localPlayer->shootLaser->setShootStep(fps/48.0); /* set shoot speed */
   fps = 0;
   inputEnabled = true;

orxonox/trunk/core/world.cc

@@ -263 +263 @@
   /* second: check if any player hits an enemy */
 
-  /*
+  
   tmpPlayer = lastPlayer;
   while( tmpPlayer != null ) 
@@ -283 +283 @@
     }
   
-  */
+  
 
   /* third: check if any enemy shoots a player */