X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FLevel%2FAwards.cpp;h=1bb7622a217e9f93d99e3be04815de91722fa4e2;hb=380d8141271d6fa12954f6fe46e736315cffd594;hp=0a561e5d7065ceb22df5276dba9ed24afdcbccb4;hpb=b84825978803615f45a9f128232e62431042aec0;p=lugaru.git

diff --git a/Source/Level/Awards.cpp b/Source/Level/Awards.cpp
index 0a561e5..1bb7622 100644
--- a/Source/Level/Awards.cpp
+++ b/Source/Level/Awards.cpp
@@ -17,24 +17,25 @@ You should have received a copy of the GNU General Public License
 along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "Level/Awards.h"
-#include "Objects/Person.h"
-#include "Game.h"
+#include "Level/Awards.hpp"
+
+#include "Game.hpp"
+#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
@@ -46,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];
@@ -75,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) {
@@ -84,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;
@@ -93,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;
@@ -134,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++;
     }