Changeset 9869 in orxonox.OLD for trunk/src/world_entities/spectator.cc

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

File:

• trunk/src/world_entities/spectator.cc (modified) (4 diffs)

trunk/src/world_entities/spectator.cc

@@ -22 +22 @@
 #include "shared_network_data.h"
 
-CREATE_FACTORY(Spectator, CL_SPECTATOR);
-
-
-
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(Spectator, CL_SPECTATOR);
+CREATE_FACTORY(Spectator);
 
 
@@ -58 +57 @@
 {
 //  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
-  this->setClassID(CL_SPECTATOR, "Spectator");
+  this->registerObject(this, Spectator::_objectList);
 
   this->getWeaponManager().changeWeaponConfig(1);
@@ -89 +88 @@
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
 
- 
+
   registerVar( new SynchronizeableBool( &bLeft, &bLeft, "bLeft", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableBool( &bRight, &bRight, "bRight", PERMISSION_OWNER ) );
@@ -161 +160 @@
 {
   Playable::tick( time );
-  
+
   if( ( xMouse != 0 || yMouse != 0 ) && this->getOwner() == SharedNetworkData::getInstance()->getHostID() )
   {
     xMouse *= time / 10;
     yMouse *= time / 10;
-    
+
     angleX -= xMouse;
     angleY -= yMouse;
-    
+
     if ( angleY > 2.05 )
       angleY = 2.05;
-    
+
     if ( angleY < -1.15 )
       angleY = -1.15;
-    
+
     this->mouseDir = Quaternion( angleX, Vector( 0, 1, 0 ) ) * Quaternion( angleY, Vector( 0, 0, 1 ) );
-    
+
     xMouse = yMouse = 0;
   }
-  
+
   this->setAbsDir( this->mouseDir );
-  
+
   Vector velocity;
-  
+
   if ( this->bForward )
   {
     velocity += this->getAbsDirX();
   }
-  
+
   if ( this->bBackward )
   {
     velocity -= this->getAbsDirX();
   }
-  
+
   if ( this->bRight )
   {
     velocity += this->getAbsDirZ();
   }
-  
+
   if ( this->bLeft )
   {
     velocity -= this->getAbsDirZ();
   }
-  
+
   velocity *= 100;
-  
+
   this->shiftCoor( velocity*time );
 }