Changeset 9221 in orxonox.OLD for branches

Timestamp:

Jul 5, 2006, 1:07:57 PM (18 years ago)

Author:

snellen

Message:

update

Location:

branches/presentation/src/world_entities

Files:

• creatures/fps_player.cc (modified) (2 diffs)
• playable.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (2 diffs)

branches/presentation/src/world_entities/creatures/fps_player.cc

@@ -86 +86 @@
 {
   this->setClassID(CL_FPS_PLAYER, "FPSPlayer");
-
 
   this->bLeft = false;
@@ -268 +267 @@
   if( this->bJump)
   {
-    printf("mechanic2:walkTo( %f, mtheight, %f)\n",this->getAbsCoorX(),this->getAbsCoorZ());
+    printf("fleemechanic:runTo( %f, mtheight, %f)\n",this->getAbsCoorX(),this->getAbsCoorZ());
   }
 

branches/presentation/src/world_entities/playable.h

@@ -92 +92 @@
   
   inline bool beFire(){ return this->bFire; }
+  inline void fire(bool bF){ this->bFire = bF;}
 
 protected:

branches/presentation/src/world_entities/space_ships/space_ship.cc

@@ -58 +58 @@
 CREATE_SCRIPTABLE_CLASS(SpaceShip, CL_SPACE_SHIP,
                         addMethod("hasPlayer", ExecutorLua0ret<Playable,bool>(&Playable::hasPlayer))
+                        ->addMethod("fire", ExecutorLua1<Playable, bool>(&Playable::fire))
                         ->addMethod("loadModel", ExecutorLua2<WorldEntity,const std::string& ,float>(&WorldEntity::loadModel2))
                         ->addMethod("setName", ExecutorLua1<BaseObject,const std::string&>(&BaseObject::setName))
@@ -354 +355 @@
 //     return;
 
-  // spaceship controlled movement
+  // spaceship controlled movement fire(bool bF){ this->bFire = bF;}
   //if (this->getOwner() == this->getHostID())
     this->calculateVelocity(time);