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

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

diff --git a/src/droidBoss.cpp b/src/droidBoss.cpp
index da6b9fb680e6ad8949b18fe7cfab59b552ec29e0..923fdb52a0b75c591c878645caeb955c68b68613 100644 (file)
--- a/src/droidBoss.cpp
+++ b/src/droidBoss.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
@@ -129,7 +130,7 @@ void droidBossChangeFrequency()
                        break;
        }
        
-       audio.playSound(SND_BOSSCUSTOM1, CH_AMBIANCE);
+       audio.playSound(SND_BOSSCUSTOM1, CH_AMBIANCE, self->x);
 }
 
 void droidBossDie()
@@ -182,7 +183,7 @@ void droidBossReact()
        if ((Math::prand() % 10) == 0)
        {
                Math::addBit(&self->flags, ENT_IMMUNE);
-               audio.playSound(SND_BOSSCUSTOM2, CH_SPAWN);
+               audio.playSound(SND_BOSSCUSTOM2, CH_SPAWN, self->x);
                self->custom = 5;
                self->think = &droidGoCrazy;
                self->setActionFinished(2);
@@ -397,8 +398,8 @@ void droidBossInit()
                Math::addBit(&map.boss[i]->flags, ENT_FLIES);
        }
        
-       audio.loadSound(SND_BOSSCUSTOM1, "sound/droidChangeFreq.wav");
-       audio.loadSound(SND_BOSSCUSTOM2, "sound/droidFreakOut.wav");
+       audio.loadSound(SND_BOSSCUSTOM1, "sound/droidChangeFreq");
+       audio.loadSound(SND_BOSSCUSTOM2, "sound/droidFreakOut");
        
        debug(("droidBossInit: Done\n"));
 }