Changeset 9602 in orxonox.OLD for branches

Timestamp:

Jul 29, 2006, 10:46:19 AM (18 years ago)

Author:

patrick

Message:

solved the spaceturret synch problem
@bensch: read my mail, everything is commented there. the turret should then work
@bensch2: can you then please take a look at the shell commands in ProxyControl (see mail) thx!
|

Location:

branches/proxy/src

Files:

• lib/network/proxy/proxy_control.cc (modified) (1 diff)
• world_entities/npcs/space_turret.cc (modified) (5 diffs)
• world_entities/npcs/space_turret.h (modified) (3 diffs)

branches/proxy/src/lib/network/proxy/proxy_control.cc

@@ -277 +277 @@
   if( SharedNetworkData::getInstance()->isClient())
   {
-    PRINTF(1)("I am client, got no right to force reconnection\n");
+    PRINTF(0)("I am client, got no right to force reconnection\n");
     return;
   }

branches/proxy/src/world_entities/npcs/space_turret.cc

@@ -74 +74 @@
   this->weaponHolder[0].setParent(this);
   this->weaponHolder[1].setParent(this);
+
+  this->wLeftHandle = registerVarId( new SynchronizeableString( &this->wLeft, &this->wLeft, "weapon-left" ) );
+  this->wRightHandle = registerVarId( new SynchronizeableString( &this->wRight, &this->wRight, "weapon-right" ) );
+
 }
 
@@ -98 +102 @@
   if (this->left)
   {
+    this->wLeft = element->Value();
+
     this->left->setParent(this);
     this->left->toList(this->getOMListNumber());
@@ -110 +116 @@
   if (this->right)
   {
+    this->wRight = element->Value();
+
     this->right->setParent(this);
     this->right->toList(this->getOMListNumber());
@@ -117 +125 @@
   }
 }
+
+
+/**
+ * sets the left weapon called from net sync
+ * @param wLeft the left weapon string
+ */
+void SpaceTurret::setWeaponLeft(const std::string& wLeft)
+{
+
+}
+
+/**
+ * sets the left weapon called from net sync
+ * @param wRught the right weapon string
+ */
+void SpaceTurret::setWeaponRight(const std::string& wRight)
+{}
 
 /**
@@ -198 +223 @@
 
 }
+
+
+
+/**
+ * handler for changes on registred vars
+ * @param id id's which changed
+ */
+void SpaceTurret::varChangeHandler( std::list< int > & id )
+{
+  if ( std::find( id.begin(), id.end(), this->wLeftHandle ) != id.end())
+  {
+    this->setWeaponLeft(this->wLeft);
+  }
+
+  if ( std::find( id.begin(), id.end(), this->wRightHandle ) != id.end() )
+  {
+    this->setWeaponRight(this->wRight);
+  }
+
+
+  WorldEntity::varChangeHandler( id );
+}
+

branches/proxy/src/world_entities/npcs/space_turret.h

@@ -8 +8 @@
 
 #include "npcs/npc.h"
+
+#include <string>
+#include <list>
+
 
 class Weapon;
@@ -20 +24 @@
 
   virtual void loadParams(const TiXmlElement* root);
+  virtual void varChangeHandler( std::list< int > & id );
+
+
+  void setWeaponLeft(const std::string& wLeft);
+  void setWeaponRight(const std::string& wRight);
 
   virtual void postSpawn ();
@@ -36 +45 @@
   PNode  weaponHolder[2];
   Weapon *left, *right;
+
+  std::string wLeft;
+  std::string wRight;
+  int wLeftHandle;
+  int wRightHandle;
 };