Fixed some warnings

[lugaru.git] / Source / Awards.cpp

diff --git a/Source/Awards.cpp b/Source/Awards.cpp
index c4eb7650330cf6bb0130170943de537812f6231b..160ec45cb2f86b56d60f3a1060ccc2902d5c6f32 100644 (file)
--- a/Source/Awards.cpp
+++ b/Source/Awards.cpp
@@ -30,6 +30,18 @@ float startbonustotal;
 float bonustime;
 float bonusnum[100];
 
+const char *bonus_names[bonus_count] = {
+#define DECLARE_BONUS(id, name, ...) name,
+#include "Bonuses.def"
+#undef DECLARE_BONUS
+};
+
+const char *award_names[award_count] = {
+#define DECLARE_AWARD(id, name) name,
+#include "Awards.def"
+#undef DECLARE_AWARD
+};
+
 static const int bonus_values[bonus_count] = {
 #define DECLARE_BONUS(id, name, value, ...) value,
 #include "Bonuses.def"
@@ -68,13 +80,13 @@ int maxalarmed;
 int award_awards(int *awards)
 {
     int numawards = 0, i;
-    if (damagetaken == 0 && player[0].bloodloss == 0) {
+    if (damagetaken == 0 && Person::players[0]->bloodloss == 0) {
         awards[numawards] = awardflawless;
         numawards++;
     }
     bool alldead = true;
-    for (i = 1; i < numplayers; i++) {
-        if (player[i].dead != 2)
+    for (i = 1; i < Person::players.size(); i++) {
+        if (Person::players[i]->dead != 2)
             alldead = 0;
     }
     if (alldead) {
@@ -82,8 +94,8 @@ int award_awards(int *awards)
         numawards++;
     }
     alldead = 1;
-    for (i = 1; i < numplayers; i++) {
-        if (player[i].dead != 1)
+    for (i = 1; i < Person::players.size(); i++) {
+        if (Person::players[i]->dead != 1)
             alldead = 0;
     }
     if (alldead) {
@@ -118,13 +130,13 @@ int award_awards(int *awards)
         awards[numawards] = awardacrobat;
         numawards++;
     }
-    if (numthrowkill == numplayers - 1) {
+    if (numthrowkill == Person::players.size() - 1) {
         awards[numawards] = awardlongrange;
         numawards++;
     }
     alldead = 1;
-    for (i = 1; i < numplayers; i++) {
-        if (player[i].dead != 2)
+    for (i = 1; i < Person::players.size(); i++) {
+        if (Person::players[i]->dead != 2)
             alldead = 0;
     }
     if (numafterkill > 0 && alldead) {
@@ -135,7 +147,7 @@ int award_awards(int *awards)
         awards[numawards] = awardaikido;
         numawards++;
     }
-    if (maxalarmed == 1 && numplayers > 2) {
+    if (maxalarmed == 1 && Person::players.size() > 2) {
         awards[numawards] = awardstrategy;
         numawards++;
     }