X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAwards.cpp;h=726eaec8d1d9cdbb5696bb818b014e39b40d1c12;hb=8afdcba610cded0e54b85069ba051268b29669a6;hp=5fe1f7bda4feb9dedd5712ff8e036990134d9f09;hpb=14d27ff7369d8892e08b520309c90ece4ab883a7;p=lugaru.git

diff --git a/Source/Awards.cpp b/Source/Awards.cpp
index 5fe1f7b..726eaec 100644
--- a/Source/Awards.cpp
+++ b/Source/Awards.cpp
@@ -23,6 +23,30 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Person.h"
 #include "Game.h"
 
+int bonus;
+float bonusvalue;
+float bonustotal;
+float startbonustotal;
+float bonustime;
+float bonusnum[100];
+
+static const int bonus_values[bonus_count] = {
+#define DECLARE_BONUS(id, name, value, ...) value,
+#include "Bonuses.def"
+#undef DECLARE_BONUS
+};
+
+void
+award_bonus(int playerid, int bonusid, int alt_value)
+{
+  if (playerid != 0)
+    return;
+  bonus = bonusid;
+  bonustime = 0;
+  bonusvalue = alt_value ? alt_value : bonus_values[bonusid];
+}
+
+// FIXME: make these per-player
 float damagetaken;
 int numfalls;
 int numflipfail;
@@ -80,7 +104,7 @@ int award_awards(int *awards)
     awards[numawards]=awardknifefighter;
     numawards++;
   }
-  if(numattacks==numunarmedattack&&numthrowkill==0&&weapons.numweapons>0){
+  if(numattacks==numunarmedattack&&numthrowkill==0&&weapons.size()>0){
     awards[numawards]=awardkungfu;
     numawards++;
   }