X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects%2FWeapons.cpp;h=a6a1786736897d38e198661869c2fe09fa9d148d;hb=97573902b6b557687bd89dc92885be90f3634d50;hp=c56779dec9e2b64b96a1bd8a9bae46e1eea4611d;hpb=b84825978803615f45a9f128232e62431042aec0;p=lugaru.git

diff --git a/Source/Objects/Weapons.cpp b/Source/Objects/Weapons.cpp
index c56779d..a6a1786 100644
--- a/Source/Objects/Weapons.cpp
+++ b/Source/Objects/Weapons.cpp
@@ -20,14 +20,13 @@ You should have received a copy of the GNU General Public License
 along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/**> HEADER FILES <**/
-#include "Animation/Animation.h"
-#include "Audio/openal_wrapper.h"
-#include "Audio/Sounds.h"
-#include "Level/Awards.h"
-#include "Objects/Weapons.h"
+#include "Objects/Weapons.hpp"
 
-#include "Game.h"
+#include "Animation/Animation.hpp"
+#include "Audio/openal_wrapper.hpp"
+#include "Audio/Sounds.hpp"
+#include "Game.hpp"
+#include "Level/Awards.hpp"
 
 extern float multiplier;
 extern Terrain terrain;
@@ -101,7 +100,6 @@ void Weapon::setType(int t)
 
 void Weapon::DoStuff(int i)
 {
-    //~ cout << position.x << "," << position.y << "," << position.z << "|" << tippoint.x << "," << tippoint.y << "," << tippoint.z << endl;
     static int whichpatchx, whichpatchz, whichhit;
     static XYZ start, end, colpoint, normalrot, footvel, footpoint;
     static XYZ terrainnormal;
@@ -119,6 +117,10 @@ void Weapon::DoStuff(int i)
     static XYZ closestswordpoint;
     static float tempmult;
 
+    if (multiplier <= 0) {
+        return;
+    }
+
     if (owner != -1) {
         oldowner = owner;
     }