X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAwards.cpp;h=ea8a610c2447937686b666b98218917f0b3448d3;hb=cd043e3f9e26c2b3406b40a354c2840941e9db7f;hp=426ad7a334fb28798f3338fdb4ba0c1a39b25aae;hpb=24004d6ab1e68faaf85ece11b566449997da5013;p=lugaru.git

diff --git a/Source/Awards.cpp b/Source/Awards.cpp
index 426ad7a..ea8a610 100644
--- a/Source/Awards.cpp
+++ b/Source/Awards.cpp
@@ -3,20 +3,18 @@ Copyright (C) 2010 - Lugaru authors
 
 This file is part of Lugaru.
 
-Lugaru is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+Lugaru is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+Lugaru is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "Awards.h"
@@ -30,6 +28,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"
@@ -67,22 +77,24 @@ int maxalarmed;
 
 int award_awards(int *awards)
 {
-    int numawards = 0, i;
-    if (damagetaken == 0 && player[0].bloodloss == 0) {
+    int numawards = 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)alldead = 0;
+    for (unsigned i = 1; i < Person::players.size(); i++) {
+        if (Person::players[i]->dead != 2)
+            alldead = 0;
     }
     if (alldead) {
         awards[numawards] = awardalldead;
         numawards++;
     }
     alldead = 1;
-    for (i = 1; i < numplayers; i++) {
-        if (player[i].dead != 1)alldead = 0;
+    for (unsigned i = 1; i < Person::players.size(); i++) {
+        if (Person::players[i]->dead != 1)
+            alldead = 0;
     }
     if (alldead) {
         awards[numawards] = awardnodead;
@@ -116,13 +128,14 @@ int award_awards(int *awards)
         awards[numawards] = awardacrobat;
         numawards++;
     }
-    if (numthrowkill == numplayers - 1) {
+    if (numthrowkill == (int(Person::players.size()) - 1)) {
         awards[numawards] = awardlongrange;
         numawards++;
     }
     alldead = 1;
-    for (i = 1; i < numplayers; i++) {
-        if (player[i].dead != 2)alldead = 0;
+    for (unsigned i = 1; i < Person::players.size(); i++) {
+        if (Person::players[i]->dead != 2)
+            alldead = 0;
     }
     if (numafterkill > 0 && alldead) {
         awards[numawards] = awardbrutal;
@@ -132,7 +145,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++;
     }