Changeset 7493 for code/trunk/src/modules/pickup/PickupSpawner.cc

Timestamp:

Sep 27, 2010, 7:53:30 PM (14 years ago)

Author:

dafrick

Message:

Fixing small bug in Script (regarding number of executions).
Fixed bug in WorldEntity, that caused the visibility and activity to be synchronized incorrectly (since bVisibleMem and bActiveMem are not synchronized).
Some small changed in documentation.
Started "synchronizing" pickups. Seems to work (except GUI), but haven't done any extensive testing yet.

File:

• code/trunk/src/modules/pickup/PickupSpawner.cc (modified) (8 diffs)

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

@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
+#include "core/GameMode.h"
 #include "core/Template.h"
 #include "core/XMLPort.h"
@@ -94 +95 @@
             PickupRepresentation* representation = PickupManager::getInstance().getRepresentation(this->pickup_->getPickupIdentifier());
             this->attach(representation->getSpawnerRepresentation(this));
+            this->setActive(true); //TODO: Needed?
         }
     }
@@ -146 +148 @@
         {
             PickupRepresentation* representation = PickupManager::getInstance().getRepresentation(this->pickup_->getPickupIdentifier());
-            representation->setVisible(this->isActive());
             this->attach(representation->getSpawnerRepresentation(this));
-            this->setActive(true);
+            this->setActive(true); //TODO: Needed?
         }
     }
@@ -160 +161 @@
         SUPER(PickupSpawner, changedActivity);
 
-        this->setVisible(this->isActive());
+        if(GameMode::isMaster())
+            this->setVisible(this->isActive());
     }
 
@@ -169 +171 @@
         Time since last tick.
     */
-    //TODO: Replace with collisions.
+    //TODO: Replace with collisions?
     void PickupSpawner::tick(float dt)
     {
         SUPER(PickupSpawner, tick, dt);
 
-        //! If the PickupSpawner is active.
-        if (this->isActive())
+        // If the PickupSpawner is active.
+        if(GameMode::isMaster() && this->isActive())
         {
             SmartPtr<PickupSpawner> temp = this; //Create a smart pointer to keep the PickupSpawner alive until we iterated through all Pawns (in case a Pawn takes the last pickup)
 
-            //! Iterate trough all Pawns.
+            // Iterate trough all Pawns.
             for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
             {
                 Vector3 distance = it->getWorldPosition() - this->getWorldPosition();
                 PickupCarrier* carrier = dynamic_cast<PickupCarrier*>(*it);
-                //! If a Pawn, that fits the target-range of the item spawned by this Pickup, is in trigger-distance.
+                // If a Pawn, that fits the target-range of the item spawned by this Pickup, is in trigger-distance.
                 if (distance.length() < this->triggerDistance_ && carrier != NULL && carrier->isTarget(this->pickup_))
                 {
@@ -214 +216 @@
     {
         if(this->spawnsRemaining_ != INF)
-        {
             this->spawnsRemaining_--;
-        }
+
         if(this->spawnsRemaining_ != 0 && this->respawnTime_ > 0)
         {
@@ -283 +284 @@
     void PickupSpawner::trigger(Pawn* pawn)
     {
-        if (this->isActive()) //!< Checks whether PickupSpawner is active.
+        if(this->isActive()) // Checks whether PickupSpawner is active.
         {
             COUT(4) << "PickupSpawner (&" << this << ") triggered and active." << std::endl;
@@ -303 +304 @@
             Pickupable* pickup = this->getPickup();
 
-            if(target != NULL && pickup != NULL)
-            {
-                if(pickup->pickup(target))
-                    this->decrementSpawnsRemaining();
-                else
-                {
-                    this->selfDestruct_ = true;
-                    pickup->destroy();
-                }
-            }
-            else
-            {
-                if(target == NULL)
-                    COUT(1) << "PickupSpawner (&" << this << "): Pickupable has no target." << std::endl;
-
-                if(pickup == NULL)
-                    COUT(1) << "PickupSpawner (&" << this << "): getPickup produced an error, no Pickupable created." << std::endl;
-                else
-                {
-                    this->selfDestruct_ = true;
-                    pickup->destroy();
-                }
-            }
+            assert(pickup);
+            assert(target);
+            assert(pickup->pickup(target));
+
+            this->decrementSpawnsRemaining();
         }
     }