Changeset 1418

Timestamp:

May 25, 2008, 1:40:11 PM (17 years ago)

Author:

scheusso

Message:

copied old keybindings to new def_keybindings and made some changes in synchronisable (now set the classid in create)

Location:

code/branches/network/src

Files:

• network/Synchronisable.cc (modified) (1 diff)
• network/Synchronisable.h (modified) (1 diff)
• orxonox/objects/Ambient.cc (modified) (1 diff)
• orxonox/objects/Projectile.cc (modified) (1 diff)
• orxonox/objects/Skybox.cc (modified) (1 diff)
• orxonox/objects/WorldEntity.h (modified) (1 diff)
• orxonox/objects/weapon/AmmunitionDump.h (modified) (1 diff)
• orxonox/objects/weapon/BulletManager.h (modified) (1 diff)

code/branches/network/src/network/Synchronisable.cc

@@ -66 +66 @@
 
   Synchronisable::~Synchronisable(){
+  }
+  
+  bool Synchronisable::create(){
+    this->classID = this->getIdentifier()->getNetworkID();
+    return true;
   }
   

code/branches/network/src/network/Synchronisable.h

@@ -89 +89 @@
     bool getBacksync();
     virtual void registerAllVariables()=0;
-    virtual bool create()=0;
+    virtual bool create();
     static void setClient(bool b);
   protected:

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

@@ -66 +66 @@
     bool Ambient::create(){
       GraphicsEngine::getSingleton().getSceneManager()->setAmbientLight(ambientLight_);
-      return true;
+      return Synchronisable::create();
     }
     

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

@@ -63 +63 @@
 
         this->destroyTimer_.setTimer(this->lifetime_, false, this, createExecutor(createFunctor(&Projectile::destroyObject)));
-        this->classID = this->getIdentifier()->getNetworkID(); // TODO: remove this hack
 //        COUT(3) << this->classID << std::endl;
     }

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

@@ -90 +90 @@
     bool Skybox::create(){
       this->setSkybox(skyboxSrc_);
-      return true;
+      return Synchronisable::create();
     }
     

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

@@ -53 +53 @@
             virtual void loadParams(TiXmlElement* xmlElem);
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            inline bool create(){ return true; }
+            inline bool create(){ return Synchronisable::create(); }
 
             void attachWorldEntity(WorldEntity* entity);

code/branches/network/src/orxonox/objects/weapon/AmmunitionDump.h

@@ -60 +60 @@
 
   protected:
-    inline bool create() { return true; }
+    inline bool create() { return Synchronisable::create(); }
     void registerAllVariables();
 

code/branches/network/src/orxonox/objects/weapon/BulletManager.h

@@ -60 +60 @@
 
   protected:
-    inline bool create() { return true; }
+    inline bool create() { return Synchronisable::create(); }
     void registerAllVariables();