X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FPerson.cpp;h=05eeb5f7218bc9fa9bb48a02b4fbdc25dbdd59cc;hb=d5ff767196019eeb0001f921365bb1e4060eee5b;hp=76e95033ae3c344c30a281e7fda9e77324b8f37c;hpb=38615999d550e75a973ce4d5520c9ef117d65cea;p=lugaru.git

diff --git a/Source/Person.cpp b/Source/Person.cpp
index 76e9503..05eeb5f 100644
--- a/Source/Person.cpp
+++ b/Source/Person.cpp
@@ -23,10 +23,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Person.h"
 #include "openal_wrapper.h"
 #include "Animation.h"
+#include "Sounds.h"
+#include "Awards.h"
+#include "Game.h"
 
 extern float multiplier;
-extern Animation animation[animation_count];
-extern OPENAL_SAMPLE	*samp[100];
 extern int channels[100];
 extern Terrain terrain;
 extern float gravity;
@@ -52,11 +53,8 @@ extern float terraindetail;
 extern float viewdistance;
 extern float blackout;
 extern int difficulty;
-extern Weapons weapons;
 extern bool decals;
 extern float fadestart;
-extern Person player[maxplayers];
-extern int numplayers;
 extern bool freeze;
 extern bool winfreeze;
 extern float flashamount,flashr,flashg,flashb;
@@ -107,7 +105,6 @@ extern int indialogue;
 
 extern bool gamestarted;
 
-extern OPENAL_STREAM * strm[20];
 extern "C"	void PlaySoundEx(int channel, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused);
 extern "C" void PlayStreamEx(int chan, OPENAL_STREAM *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused);
 
@@ -222,7 +219,7 @@ void Person::CatchFire(){
 	vel[1]=velocity.y;
 	vel[2]=velocity.z;
 	//PlaySoundEx( firesound, samp[firesound], NULL, true);
-	PlayStreamEx( stream_firesound, strm[stream_firesound], NULL, true);
+	PlayStreamEx( stream_firesound, samp[stream_firesound], NULL, true);
 	OPENAL_3D_SetAttributes(channels[stream_firesound], gLoc, vel);
 	OPENAL_SetVolume(channels[stream_firesound], 256);
 	OPENAL_SetPaused(channels[stream_firesound], false);