X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FAwards.cpp;h=9243cf4051cbe9ae87c9085e009bdbf58cd46ae4;hb=8e94b0e0f79e8fc55ace5699ffe039462d9e155d;hp=160ec45cb2f86b56d60f3a1060ccc2902d5c6f32;hpb=31801560f92e99939f40ee49d9c279324db044bb;p=lugaru.git diff --git a/Source/Awards.cpp b/Source/Awards.cpp index 160ec45..9243cf4 100644 --- a/Source/Awards.cpp +++ b/Source/Awards.cpp @@ -79,13 +79,13 @@ int maxalarmed; int award_awards(int *awards) { - int numawards = 0, i; + int numawards = 0; if (damagetaken == 0 && Person::players[0]->bloodloss == 0) { awards[numawards] = awardflawless; numawards++; } bool alldead = true; - for (i = 1; i < Person::players.size(); i++) { + for (unsigned i = 1; i < Person::players.size(); i++) { if (Person::players[i]->dead != 2) alldead = 0; } @@ -94,7 +94,7 @@ int award_awards(int *awards) numawards++; } alldead = 1; - for (i = 1; i < Person::players.size(); i++) { + for (unsigned i = 1; i < Person::players.size(); i++) { if (Person::players[i]->dead != 1) alldead = 0; } @@ -130,12 +130,12 @@ int award_awards(int *awards) awards[numawards] = awardacrobat; numawards++; } - if (numthrowkill == Person::players.size() - 1) { + if (numthrowkill == (int(Person::players.size()) - 1)) { awards[numawards] = awardlongrange; numawards++; } alldead = 1; - for (i = 1; i < Person::players.size(); i++) { + for (unsigned i = 1; i < Person::players.size(); i++) { if (Person::players[i]->dead != 2) alldead = 0; }