Changeset 7801 for code/trunk/src/modules

Timestamp:

Dec 22, 2010, 7:24:24 PM (14 years ago)

Author:

dafrick

Message:

Merging presentation2 branch back to trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/objects/ForceField.cc (modified) (2 diffs)
• src/modules/objects/ForceField.h (modified) (2 diffs)
• src/modules/overlays/hud/HUDBar.cc (modified) (2 diffs)
• src/modules/overlays/hud/HUDNavigation.cc (modified) (2 diffs)
• src/modules/pickup/PickupManager.cc (modified) (1 diff)
• src/modules/pickup/PickupSpawner.cc (modified) (2 diffs)
• src/modules/weapons/MuzzleFlash.cc (modified) (1 diff)

code/trunk/src/modules/objects/ForceField.cc

@@ -60 +60 @@
         this->setLength(2000);
         this->mode_ = forceFieldMode::tube;
+        
+        this->registerVariables();
     }
 
@@ -83 +85 @@
         XMLPortParam(ForceField, "mode", setMode, getMode, xmlelement, mode);
     }
+    
+    void ForceField::registerVariables()
+    {
+        registerVariable(this->velocity_, VariableDirection::ToClient);
+        registerVariable(this->radius_, VariableDirection::ToClient);
+        registerVariable(this->halfLength_, VariableDirection::ToClient);
+        registerVariable(this->mode_, VariableDirection::ToClient);
+    }
+
 
     /**

code/trunk/src/modules/objects/ForceField.h

@@ -88 +88 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates a ForceField object through XML.
+            void registerVariables(); //!< Registers the variables that should get synchronised over the network
             virtual void tick(float dt); //!< A method that is called every tick.
+            
 
             /**
@@ -141 +143 @@
             float radius_; //!< The radius of the ForceField.
             float halfLength_; //!< Half of the length of the ForceField.
-            forceFieldMode::Value mode_; //!< The mode of the ForceField.
+            int mode_; //!< The mode of the ForceField.
   };
 }

code/trunk/src/modules/overlays/hud/HUDBar.cc

@@ -85 +85 @@
         this->bar_->setMaterialName(materialname);
 
-        this->value_ = 1.0f;  // initielize with 1.0f to trigger a change when calling setValue(0.0f) on the line below
+        this->value_ = 1.0f;  // initialize with 1.0f to trigger a change when calling setValue(0.0f) on the line below
         this->setAutoColour(true);
         this->setValue(0.0f); // <--
@@ -161 +161 @@
         if (this->right2Left_)
         {
-            // backward casew
+            // backward case
             this->bar_->setPosition(0.06f + 0.88f * (1 - this->value_), 0.0f);
             this->bar_->setDimensions(0.88f * this->value_, 1.0f);

code/trunk/src/modules/overlays/hud/HUDNavigation.cc

@@ -24 +24 @@
  *   Co-authors:
  *      Reto Grieder
+ *      Oliver Scheuss
  *
  */
@@ -410 +411 @@
     }
 }
-}
+
+}

code/trunk/src/modules/pickup/PickupManager.cc

@@ -61 +61 @@
     /*static*/ const std::string PickupManager::guiName_s = "PickupInventory";
 
-    // Register static newtork functions that are used to communicate changes to pickups over the network, such that the PickupInventory can display the information about the pickups properly.
+    // Register static network functions that are used to communicate changes to pickups over the network, such that the PickupInventory can display the information about the pickups properly.
     registerStaticNetworkFunction(PickupManager::pickupChangedUsedNetwork);
     registerStaticNetworkFunction(PickupManager::pickupChangedPickedUpNetwork);

code/trunk/src/modules/pickup/PickupSpawner.cc

@@ -120 +120 @@
     PickupSpawner::~PickupSpawner()
     {
-        if(this->selfDestruct_ && this->pickup_ != NULL)
+        if(this->isInitialized() && this->selfDestruct_ && this->pickup_ != NULL)
             this->pickup_->destroy();
     }
@@ -317 +317 @@
             assert(pickup);
             assert(target);
-            assert(pickup->pickup(target));
+            bool pickedUp = pickup->pickup(target);
+            assert(pickedUp);
+            pickedUp = false; // To avoid compiler warning.
 
             this->decrementSpawnsRemaining();

code/trunk/src/modules/weapons/MuzzleFlash.cc

@@ -42 +42 @@
         this->setScale(0.1f);
 
-        this->delayTimer_.setTimer(0.1f, false, createExecutor(createFunctor(&MuzzleFlash::destroy, this)));
+        if( GameMode::isMaster() )
+          this->delayTimer_.setTimer(0.1f, false, createExecutor(createFunctor(&MuzzleFlash::destroy, this)));
     }
 }