Changeset 7531 for code/trunk/src/modules

Timestamp:

Oct 12, 2010, 8:33:58 PM (14 years ago)

Author:

dafrick

Message:

Fixing bug, that caused segfault in pickups with multiplayer.

File:

• code/trunk/src/modules/pickup/PickupManager.cc (modified) (1 diff)

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

@@ -404 +404 @@
         if(GameMode::isStandalone() || Host::getPlayerID() == clientId)
         {
-            PickupManager::pickupChangedPickedUpNetwork(index, pickup->isUsable(), this->representations_[pickup->getPickupIdentifier()]->getObjectID(), pickedUp);
-        }
-        else
-        {
-            callStaticNetworkFunction(PickupManager::pickupChangedPickedUpNetwork, clientId, index, pickup->isUsable(), this->representations_[pickup->getPickupIdentifier()]->getObjectID(), pickedUp);
+            if(this->representations_.find(pickup->getPickupIdentifier()) == this->representations_.end())
+                PickupManager::pickupChangedPickedUpNetwork(index, pickup->isUsable(), this->defaultRepresentation_->getObjectID(), pickedUp);
+            else
+                PickupManager::pickupChangedPickedUpNetwork(index, pickup->isUsable(), this->representations_[pickup->getPickupIdentifier()]->getObjectID(), pickedUp);
+        }
+        else
+        {
+            if(this->representations_.find(pickup->getPickupIdentifier()) == this->representations_.end())
+            {
+                callStaticNetworkFunction(PickupManager::pickupChangedPickedUpNetwork, clientId, index, pickup->isUsable(), this->defaultRepresentation_->getObjectID(), pickedUp);
+            }
+            else
+            {
+                callStaticNetworkFunction(PickupManager::pickupChangedPickedUpNetwork, clientId, index, pickup->isUsable(), this->representations_[pickup->getPickupIdentifier()]->getObjectID(), pickedUp);
+            }
         }