X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAwards.cpp;h=95fd129c40e034c845d92cc424ca86895ea76b9a;hb=5310d6ffd89fd8b981b273b332a232b70b4ce7ad;hp=c4eb7650330cf6bb0130170943de537812f6231b;hpb=87ff660bf58766ab705a749e72e04154ccf5a737;p=lugaru.git

diff --git a/Source/Awards.cpp b/Source/Awards.cpp
index c4eb765..95fd129 100644
--- a/Source/Awards.cpp
+++ b/Source/Awards.cpp
@@ -68,13 +68,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 +82,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 +118,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 +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++;
     }