Changeset 9723 in orxonox.OLD for branches/new_class_id/src/world_entities/weapons/weapon.cc

Timestamp:

Sep 7, 2006, 10:33:06 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: safer smart-pointer

File:

• branches/new_class_id/src/world_entities/weapons/weapon.cc (modified) (2 diffs)

branches/new_class_id/src/world_entities/weapons/weapon.cc

@@ -542 +542 @@
 {
   PRINTF(4)("Reloading Weapon %s\n", this->getCName());
-  if (this->ammoContainer.get() != NULL &&
+  if (!this->ammoContainer.isNull() &&
       unlikely(this->energy + this->ammoContainer->getStoredEnergy() < this->minCharge))
   {
@@ -554 +554 @@
     this->soundSource->play(this->soundBuffers[WA_RELOAD]);
 
-  if (this->ammoContainer.get() != NULL)
+  if (!this->ammoContainer.isNull())
     this->ammoContainer->fillWeapon(this);
   else