Update copyrights.

[quix0rs-blobwars.git] / src / enemies.cpp

diff --git a/src/enemies.cpp b/src/enemies.cpp
index 1e59f832cc118919568ce386c2a37696611272a2..f19d08ad12295974e3f18ca19eafc7b8d85ef9e8 100644 (file)
--- a/src/enemies.cpp
+++ b/src/enemies.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (C) 2004 Parallel Realities
+Copyright (C) 2004-2010 Parallel Realities
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -377,8 +377,6 @@ void enemyBulletCollisions(Entity *bullet)
 
                if ((bullet->owner == &player) || (bullet->owner == &engine.world) || (bullet->flags & ENT_BOSS))
                {
-                       snprintf(comboString, sizeof comboString, "Combo-%s", bullet->name);
-
                        if (Collision::collision(enemy, bullet))
                        {
                                if (bullet->id != WP_LASER)
@@ -458,6 +456,7 @@ void enemyBulletCollisions(Entity *bullet)
                                                                checkCombo();
                                                        }
                                                        
+                                                       snprintf(comboString, sizeof comboString, "Combo-%s", bullet->name);
                                                        checkObjectives(comboString, false);
                                                        checkObjectives("Enemy", false);
                                                        checkObjectives(enemy->name, false);
@@ -505,6 +504,7 @@ void enemyBulletCollisions(Entity *bullet)
                                        {
                                                if (player.currentWeapon != &weapon[WP_LASER])
                                                {
+                                                       snprintf(comboString, sizeof comboString, "Combo-%s", bullet->name);
                                                        checkCombo();
                                                        checkObjectives(comboString, false);
                                                }