X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FWeapons.cpp;h=ff41d8b26c5799298393bbc9bdc00141c34d1b5b;hb=bef7cd3a2b0217e63ef0b3b6832b22abbfe05bd1;hp=cd35a47ad2b65d1060755a48d2cc7174b8cfc71b;hpb=4692ec6888b3a2eb166fd1693cb583d2c53e346c;p=lugaru.git

diff --git a/Source/Weapons.cpp b/Source/Weapons.cpp
index cd35a47..ff41d8b 100644
--- a/Source/Weapons.cpp
+++ b/Source/Weapons.cpp
@@ -23,9 +23,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Weapons.h"
 #include "openal_wrapper.h"
 #include "Animation.h"
+#include "Sounds.h"
+#include "Game.h"
+#include "Awards.h"
 
 extern float multiplier;
-extern OPENAL_SAMPLE	*samp[100];
 extern int channels[100];
 extern Terrain terrain;
 extern float gravity;
@@ -49,13 +51,7 @@ extern float terraindetail;
 extern float viewdistance;
 extern float blackout;
 extern int difficulty;
-extern Person player[maxplayers];
-extern int numplayers;
 extern bool freeze;
-extern int bonus;
-extern float bonusvalue;
-extern float bonustotal;
-extern float bonustime;
 extern int tutoriallevel;
 extern int numthrowkill;
 extern "C"	void PlaySoundEx(int channel, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused);
@@ -279,16 +275,10 @@ void	Weapons::DoStuff(){
 									OPENAL_SetVolume(channels[fleshstabsound], 128);
 									OPENAL_SetPaused(channels[fleshstabsound], false);
 
-									if(animation[player[0].targetanimation].height==highheight){
-										bonus=ninja;
-										bonustime=0;
-										bonusvalue=60;
-									}
-									else{
-										bonus=Bullseyebonus;
-										bonustime=0;
-										bonusvalue=30;
-									}
+									if(animation[player[0].targetanimation].height==highheight)
+									  award_bonus(0, ninja);
+									else
+									  award_bonus(0, Bullseyebonus);
 								}
 							}
 							else missed[i]=1;