Changeset 1482

Timestamp:

May 29, 2008, 11:38:07 AM (16 years ago)

Author:

scheusso

Message:

rotatingprojectiles are now synchronisable 'cough cough' @x3n

Location:

code/branches/network

Files:

• bin/run-script (modified) (1 diff)
• src/orxonox/objects/RotatingProjectile.cc (modified) (1 diff)
• src/orxonox/objects/RotatingProjectile.h (modified) (2 diffs)

code/branches/network/bin/run-script

@@ -8 +8 @@
 fi
 
-if [[ ! -f orge.cfg ]] ; then
+if [[ -ne orge.cfg ]] ; then
         cp ogre.cfg-init ogre.cfg
 fi

code/branches/network/src/orxonox/objects/RotatingProjectile.cc

@@ -43 +43 @@
         this->time_ = 0;
 
-        if (this->owner_)
+        if (/*this->owner_*/true)
         {
             this->rotatingBillboard1_.setBillboardSet("Examples/Flare", ColourValue(1.0, 0.0, 0.0), 1);

code/branches/network/src/orxonox/objects/RotatingProjectile.h

@@ -8 +8 @@
 namespace orxonox
 {
-    class _OrxonoxExport RotatingProjectile : public Projectile
+    class _OrxonoxExport RotatingProjectile : public Projectile/*, public network::Synchronisable*/
     {
         public:
@@ -15 +15 @@
             void setConfigValues();
             virtual void tick(float dt);
+            virtual bool create(){return Projectile::create();}
 
         private: