Removed numplayers (using Person::players.size() instead)

[lugaru.git] / Source / Awards.cpp

diff --git a/Source/Awards.cpp b/Source/Awards.cpp
index 959c69907f34d8caa05e8747a7c90ab4bf140f95..95fd129c40e034c845d92cc424ca86895ea76b9a 100644 (file)
--- a/Source/Awards.cpp
+++ b/Source/Awards.cpp
@@ -73,7 +73,7 @@ int award_awards(int *awards)
         numawards++;
     }
     bool alldead = true;
-    for (i = 1; i < numplayers; i++) {
+    for (i = 1; i < Person::players.size(); i++) {
         if (Person::players[i]->dead != 2)
             alldead = 0;
     }
@@ -82,7 +82,7 @@ int award_awards(int *awards)
         numawards++;
     }
     alldead = 1;
-    for (i = 1; i < numplayers; i++) {
+    for (i = 1; i < Person::players.size(); i++) {
         if (Person::players[i]->dead != 1)
             alldead = 0;
     }
@@ -118,12 +118,12 @@ 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++) {
+    for (i = 1; i < Person::players.size(); i++) {
         if (Person::players[i]->dead != 2)
             alldead = 0;
     }
@@ -135,7 +135,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++;
     }