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])
{
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++;