Weapon clean up.

[lugaru.git] / Source / Awards.cpp

diff --git a/Source/Awards.cpp b/Source/Awards.cpp
index be967c538f2e4b703a1e3c073f852dd84edf0010..726eaec8d1d9cdbb5696bb818b014e39b40d1c12 100644 (file)
--- a/Source/Awards.cpp
+++ b/Source/Awards.cpp
@@ -30,6 +30,21 @@ 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;
@@ -89,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++;
   }