Client: Minor variable renaming.

[plomrogue] / src / server / run.c

diff --git a/src/server/run.c b/src/server/run.c
index 708bd961ba89dd62847aa35f0f5711c5ef010319..4f93669066464c3bc5b6ea466437c98e9b5b9586 100644 (file)
--- a/src/server/run.c
+++ b/src/server/run.c
@@ -236,7 +236,7 @@ static int16_t * build_whitelist()
 
 static uint8_t thing_in_whitelist(uint8_t id, int16_t * whitelist)
 {
-    int16_t i;
+    uint16_t i;
     for (i = 0; -1 < whitelist[i]; i++)
     {
         if ((int16_t) id == whitelist[i])
@@ -253,11 +253,9 @@ static void turn_over()
 {
     struct Thing * player = get_player();
     struct Thing * thing = player;
-    uint16_t start_turn = world.turn;
     int16_t * whitelist = build_whitelist();
-    while (    0 < player->lifepoints
-           || (0 == player->lifepoints && start_turn == world.turn))
-    {             /* TODO: check meaning and refactorability of 2nd condition */
+    while (0 < player->lifepoints)
+    {
         if (!thing)
         {
             world.turn++;