Don't redefine strlcat()/strlcpy() on Mac OS X.

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

diff --git a/src/switches.cpp b/src/switches.cpp
index 1ce0119c6535a1961307334a26910a50732ae268..2545f8b240d18fbdf7fb5ba3ebba498e5ace61cb 100644 (file)
--- a/src/switches.cpp
+++ b/src/switches.cpp
@@ -85,7 +85,7 @@ void checkSwitchContact(Entity *ent)
                                {
                                        if ((swt->type == SWT_NORMAL) || (swt->type == SWT_WATERLEVEL))
                                        {
-                                               audio.playSound(SND_SWITCH1, CH_TOUCH);
+                                               audio.playSound(SND_SWITCH1, CH_TOUCH, swt->x);
                                                swt->activated = !swt->activated;
                                                activateTrigger(swt->linkName, swt->activateMessage, swt->activated);
                                                swt->health = 1;
@@ -93,20 +93,20 @@ void checkSwitchContact(Entity *ent)
                                        }
                                        else if (swt->type == SWT_TOGGLE)
                                        {
-                                               audio.playSound(SND_SWITCH1, CH_TOUCH);
+                                               audio.playSound(SND_SWITCH1, CH_TOUCH, swt->x);
                                                activateTrigger(swt->linkName, swt->activateMessage, !swt->activated);
                                                swt->activated = !swt->activated;
                                        }
                                        else if (swt->type == SWT_PRESSURE)
                                        {
-                                               audio.playSound(SND_SWITCH1, CH_TOUCH);
+                                               audio.playSound(SND_SWITCH1, CH_TOUCH, swt->x);
                                                swt->activated = true;
                                                activateTrigger(swt->linkName, swt->activateMessage, true);
                                                swt->health = 2;
                                        }
                                        else if ((swt->type == SWT_TIMED) || (swt->type == SWT_RESET))
                                        {
-                                               audio.playSound(SND_SWITCH1, CH_TOUCH);
+                                               audio.playSound(SND_SWITCH1, CH_TOUCH, swt->x);
                                                activateTrigger(swt->linkName, swt->activateMessage, true);
                                                swt->activated = !swt->activated;
                                                swt->health = 240;