Changeset 6822 in orxonox.OLD for trunk/src/world_entities/space_ships

Timestamp:

Jan 29, 2006, 1:57:03 AM (19 years ago)

Author:

bensch

Message:

trunk: ParticleEmitters now splitted into SubClasses.
Also fixed a little Boeg in the ClassID

File:

• trunk/src/world_entities/space_ships/space_ship.cc (modified) (8 diffs)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -28 +28 @@
 #include "weapons/cannon.h"
 
-#include "particle_emitter.h"
+#include "dot_emitter.h"
 #include "sprite_particles.h"
 
@@ -205 +205 @@
   dynamic_cast<Element2D*>(this->getWeaponManager()->getFixedTarget())->setVisibility( false);
 
-  this->burstEmitter = new ParticleEmitter(Vector(1,0,0), .01, 200, 0.0);
+  this->burstEmitter = new DotEmitter(Vector(1,0,0), .01, 200, 0.0);
   this->burstEmitter->setParent(this);
   this->burstEmitter->setRelCoor(-1, .5, 0);
@@ -531 +531 @@
 
   byte b;
-  
+
   while ( SYNCHELP_READ_REMAINING()>0 )
   {
     SYNCHELP_READ_BYTE( b, NWT_SS_B );
-    
+
     if ( b == DATA_state )
     {
@@ -544 +544 @@
       continue;
     }
-    
+
     if ( b == DATA_flags )
     {
@@ -559 +559 @@
       bRollL = (flags & MASK_bRollL) != 0;
       bRollR = (flags & MASK_bRollR) != 0;
-      
+
       continue;
     }
-    
+
     if ( b == DATA_mouse )
     {
@@ -569 +569 @@
       SYNCHELP_READ_FLOAT( mouseDir.v.y, NWT_SS_MOUSEDIRY );
       SYNCHELP_READ_FLOAT( mouseDir.v.z, NWT_SS_MOUSEDIRZ );
-      
+
       continue;
     }
-    
+
     if ( b == DATA_sync )
     {
       if ( this->getOwner() != this->getHostID() )
         SYNCHELP_READ_FKT( PNode::writeSync, NWT_SS_PN_SYNC );
-      
+
       continue;
     }
-    
+
     if ( b == DATA_velocity )
     {
@@ -588 +588 @@
     }
   }
-  
+
   return SYNCHELP_READ_N;
 }
@@ -621 +621 @@
 
   *reciever = 0;
-  
+
   if ( this->getOwner() == this->getHostID() && PNode::needsReadSync() )
   {