X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FLevel%2FAwards.cpp;h=b5da1db17b1696532ae8af371c5d85c9cf65e616;hb=8b6e8f3ad7390309795eb35c0959264cb7924402;hp=0a561e5d7065ceb22df5276dba9ed24afdcbccb4;hpb=b84825978803615f45a9f128232e62431042aec0;p=lugaru.git diff --git a/Source/Level/Awards.cpp b/Source/Level/Awards.cpp index 0a561e5..b5da1db 100644 --- a/Source/Level/Awards.cpp +++ b/Source/Level/Awards.cpp @@ -17,9 +17,10 @@ You should have received a copy of the GNU General Public License along with Lugaru. If not, see . */ -#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; @@ -28,13 +29,13 @@ float 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,8 +47,7 @@ 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) return; @@ -75,7 +75,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) { @@ -141,7 +141,7 @@ int award_awards(int *awards) awards[numawards] = awardbrutal; numawards++; } - if (numreversals > ((float)numattacks)*.8 && numreversals > 3) { + if (numreversals > ((float)numattacks) * .8 && numreversals > 3) { awards[numawards] = awardaikido; numawards++; }