X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=05e9fd8312e6bdc328573f96b149c11f934f4740;hb=c84fb27b1b242249929b90c2b50f2c92c6a0556d;hp=5670dc3bc5eb12430461b8e4ef8c86b13adcfb0a;hpb=f4685cb5e78e8e8056448d1de1bb75edb9a4fb1b;p=lugaru.git

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index 5670dc3..05e9fd8 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -33,6 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Settings.h"
 #include "Input.h"
 #include "Animation.h"
+#include "Awards.h"
 
 using namespace std;
 
@@ -70,9 +71,6 @@ extern float blackout;
 extern bool cellophane;
 extern bool musictoggle;
 extern int difficulty;
-extern Weapons weapons;
-extern Person player[maxplayers];
-extern int numplayers;
 extern int bloodtoggle;
 extern bool invertmouse;
 extern float windvar;
@@ -114,14 +112,7 @@ extern bool decals;
 extern bool vblsync;
 extern bool immediate;
 extern bool velocityblur;
-extern int bonus;
-extern int oldbonus;
-extern float bonusvalue;
-extern float bonustotal;
-extern float bonustime;
-extern float startbonustotal;
 extern float tintr,tintg,tintb;
-extern float bonusnum[100];
 extern bool skyboxtexture;
 extern float skyboxr;
 extern float skyboxg;
@@ -143,7 +134,6 @@ extern bool reversaltrain;
 extern bool canattack;
 extern bool cananger;
 extern float damagedealt;
-extern float damagetaken;
 extern int maptype;
 extern int editoractive;
 extern int editorpathtype;
@@ -168,23 +158,6 @@ extern int hostile;
 extern bool stillloading;
 extern bool winfreeze;
 
-extern int numfalls;
-extern int numflipfail;
-extern int numseen;
-extern int numstaffattack;
-extern int numswordattack;
-extern int numknifeattack;
-extern int numunarmedattack;
-extern int numescaped;
-extern int numflipped;
-extern int numwallflipped;
-extern int numthrowkill;
-extern int numafterkill;
-extern int numreversals;
-extern int numattacks;
-extern int maxalarmed;
-extern int numresponded;
-
 extern int numdialogues;
 extern int numdialogueboxes[max_dialogues];
 extern int dialoguetype[max_dialogues];
@@ -2767,7 +2740,7 @@ void	Game::Tick()
 				mainmenu=9;
 			}
 		}
-		if(mainmenu==9){
+		else if(mainmenu==9){
 			if(Input::Button()&&!oldbutton&&selected<numchallengelevels&&selected>=0&&selected<=accountactive->getProgress()){
 				fireSound();
 
@@ -5742,16 +5715,12 @@ void	Game::Tick()
 
 																												player[i].RagDoll(0);
 																												if(player[i].damage>player[i].damagetolerance-findLengthfast(&rotatetarget)/4&&!player[i].dead){
-																													bonus=aimbonus;
-																													bonustime=0;
-																													bonusvalue=150;
+																												  award_bonus(0, aimbonus);
 																												}
 																												player[i].DoDamage(findLengthfast(&rotatetarget)/4);
 																												player[k].RagDoll(0);
 																												if(player[k].damage>player[k].damagetolerance-findLengthfast(&rotatetarget)/4&&!player[k].dead){
-																													bonus=aimbonus;
-																													bonustime=0;
-																													bonusvalue=150;
+																												  award_bonus(0, aimbonus); // Huh, again?
 																												}
 																												player[k].DoDamage(findLengthfast(&rotatetarget)/4);
 
@@ -5817,11 +5786,7 @@ void	Game::Tick()
 																														player[i].DoDamage(20);
 																														player[i].RagDoll(0);
 																														player[k].lastcollide=1;
-																														if(k==0){
-																															bonus=AboveBonus;
-																															bonustime=0;
-																															bonusvalue=50;
-																														}
+																														award_bonus(k, AboveBonus);
 																													}
 																													if(i==0&&k!=0&&player[i].targetanimation==jumpdownanim&&!player[k].isCrouch()&&player[k].targetanimation!=rollanim&&!player[i].skeleton.oldfree&&!player[i].skeleton.free&&player[i].lastcollide<=0&&player[i].velocity.y<-10){
 																														player[k].velocity=player[i].velocity;
@@ -5831,11 +5796,7 @@ void	Game::Tick()
 																														player[k].DoDamage(20);
 																														player[k].RagDoll(0);
 																														player[i].lastcollide=1;
-																														if(i==0){
-																															bonus=AboveBonus;
-																															bonustime=0;
-																															bonusvalue=50;
-																														}
+																														award_bonus(i, AboveBonus);
 																													}
 																												}
 																											}