Fixes #40 Scores are now integers

[lugaru.git] / Source / Level / Awards.cpp

diff --git a/Source/Level/Awards.cpp b/Source/Level/Awards.cpp
index 933f518879d5b4c8d3b0567274f025690376944c..1bb7622a217e9f93d99e3be04815de91722fa4e2 100644 (file)
--- a/Source/Level/Awards.cpp
+++ b/Source/Level/Awards.cpp
@@ -23,19 +23,19 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Objects/Person.hpp"
 
 int bonus;
-float bonusvalue;
-float bonustotal;
-float startbonustotal;
+int bonusvalue;
+int bonustotal;
+int startbonustotal;
 float bonustime;
 float bonusnum[100];
 
-const char *bonus_names[bonus_count] = {
+const char* bonus_names[bonus_count] = {
 #define DECLARE_BONUS(id, name, ...) name,
 #include "Bonuses.def"
 #undef DECLARE_BONUS
 };
 
-const char *award_names[award_count] = {
+const char* award_names[award_count] = {
 #define DECLARE_AWARD(id, name) name,
 #include "Awards.def"
 #undef DECLARE_AWARD
@@ -47,11 +47,11 @@ static const int bonus_values[bonus_count] = {
 #undef DECLARE_BONUS
 };
 
-void
-award_bonus(int playerid, int bonusid, int alt_value)
+void award_bonus(int playerid, int bonusid, int alt_value)
 {
-    if (playerid != 0)
+    if (playerid != 0) {
         return;
+    }
     bonus = bonusid;
     bonustime = 0;
     bonusvalue = alt_value ? alt_value : bonus_values[bonusid];
@@ -76,7 +76,7 @@ int numreversals;
 int numattacks;
 int maxalarmed;
 
-int award_awards(int *awards)
+int award_awards(int* awards)
 {
     int numawards = 0;
     if (damagetaken == 0 && Person::players[0]->bloodloss == 0) {
@@ -85,8 +85,9 @@ int award_awards(int *awards)
     }
     bool alldead = true;
     for (unsigned i = 1; i < Person::players.size(); i++) {
-        if (Person::players[i]->dead != 2)
+        if (Person::players[i]->dead != 2) {
             alldead = 0;
+        }
     }
     if (alldead) {
         awards[numawards] = awardalldead;
@@ -94,8 +95,9 @@ int award_awards(int *awards)
     }
     alldead = 1;
     for (unsigned i = 1; i < Person::players.size(); i++) {
-        if (Person::players[i]->dead != 1)
+        if (Person::players[i]->dead != 1) {
             alldead = 0;
+        }
     }
     if (alldead) {
         awards[numawards] = awardnodead;
@@ -135,14 +137,15 @@ int award_awards(int *awards)
     }
     alldead = 1;
     for (unsigned i = 1; i < Person::players.size(); i++) {
-        if (Person::players[i]->dead != 2)
+        if (Person::players[i]->dead != 2) {
             alldead = 0;
+        }
     }
     if (numafterkill > 0 && alldead) {
         awards[numawards] = awardbrutal;
         numawards++;
     }
-    if (numreversals > ((float)numattacks)*.8 && numreversals > 3) {
+    if (numreversals > ((float)numattacks) * .8 && numreversals > 3) {
         awards[numawards] = awardaikido;
         numawards++;
     }