Added .gitignore to ignore certain files + fixed access rights on Makefile* as

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

diff --git a/src/traps.cpp b/src/traps.cpp
old mode 100755 (executable)
new mode 100644 (file)
index 7f2a55b..33e0dd8
--- a/src/traps.cpp
+++ b/src/traps.cpp
@@ -1,5 +1,6 @@
 /*
-Copyright (C) 2004 Parallel Realities
+Copyright (C) 2004-2011 Parallel Realities
+Copyright (C) 2011-2015 Perpendicular Dimensions
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -218,24 +219,24 @@ void doTraps()
                                switch (trap->type)
                                {
                                        case TRAP_TYPE_MINE:
-                                               audio.playSound(SND_ROCKET, CH_SPAWN);
+                                               audio.playSound(SND_ROCKET, CH_SPAWN, trap->x);
                                                break;
                                        case TRAP_TYPE_SPIKE:
-                                               audio.playSound(SND_ROCKET, CH_SPAWN);
+                                               audio.playSound(SND_ROCKET, CH_SPAWN, trap->x);
                                                break;
                                        case TRAP_TYPE_SWING:
-                                               audio.playSound(SND_THROW, CH_SPAWN);
+                                               audio.playSound(SND_THROW, CH_SPAWN, trap->x);
                                                break;
                                        case TRAP_TYPE_BARRIER:
                                                if ((absX <= 640) && (absY <= 480))
                                                {
-                                                       audio.playSound(SND_ELECTRICITY1 + Math::prand() % 3, CH_SPAWN);
+                                                       audio.playSound(SND_ELECTRICITY1 + Math::prand() % 3, CH_SPAWN, trap->x);
                                                }
                                                break;
                                        case TRAP_TYPE_FLAME:
                                                if ((absX <= 640) && (absY <= 480))
                                                {
-                                                       audio.playSound(SND_FIRECRACKLE, CH_SPAWN);
+                                                       audio.playSound(SND_FIRECRACKLE, CH_SPAWN, trap->x);
                                                }
                                                break;
                                }