Changeset 5357 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Oct 10, 2005, 9:15:05 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some minor cleanup, of the mess i made with AutoMake-sh

Location:

trunk/src/world_entities/weapons

Files:

• crosshair.cc (modified) (1 diff)
• projectile.cc (modified) (1 diff)
• test_bullet.cc (modified) (1 diff)
• test_gun.cc (modified) (1 diff)
• turret.cc (modified) (1 diff)
• weapon.cc (modified) (2 diffs)

trunk/src/world_entities/weapons/crosshair.cc

@@ -14 +14 @@
 */
 
-//#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
 #include "crosshair.h"

trunk/src/world_entities/weapons/projectile.cc

@@ -15 +15 @@
    co-programmer:
 */
-
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
 #include "projectile.h"

trunk/src/world_entities/weapons/test_bullet.cc

@@ -15 +15 @@
    co-programmer:
 */
-
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
 #include "test_bullet.h"

trunk/src/world_entities/weapons/test_gun.cc

@@ -19 +19 @@
    @todo: a target to set/hit
 */
-
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
 #include "test_gun.h"

trunk/src/world_entities/weapons/turret.cc

@@ -13 +13 @@
    co-programmer:
 */
-
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
 #include "turret.h"

trunk/src/world_entities/weapons/weapon.cc

@@ -169 +169 @@
 void Weapon::prepareProjectiles(unsigned int count)
 {
-  if (this->projectileFactory != NULL)
+  if (likely(this->projectileFactory != NULL))
     projectileFactory->prepare(count);
   else
-    PRINTF(2)("unable to create %d projectile for Weapon %s\n", count, this->getName());
+    PRINTF(2)("unable to create %d projectile for Weapon %s (%s)\n", count, this->getName(), this->getClassName());
 }
 
@@ -181 +181 @@
 Projectile* Weapon::getProjectile()
 {
-  if (this->projectileFactory)
+  if (likely (this->projectileFactory != NULL))
     return dynamic_cast<Projectile*>(this->projectileFactory->resurrect());
   else
   {
-    PRINTF(2)("No projectile defined for Weapon %s cant return any\n", this->getName());
+    PRINTF(2)("No projectile defined for Weapon %s(%s) cant return any\n", this->getName(), this->getClassName());
     return NULL;
   }