home
·
contact
·
privacy
projects
/
plomrogue
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Client: Abort test_ping_pong() earlier when server known to be active.
[plomrogue]
/
src
/
server
/
run.c
diff --git
a/src/server/run.c
b/src/server/run.c
index ea8d608dd4c5003ea142ce77c7bb630ee3503064..4f93669066464c3bc5b6ea466437c98e9b5b9586 100644
(file)
--- a/
src/server/run.c
+++ b/
src/server/run.c
@@
-253,11
+253,9
@@
static void turn_over()
{
struct Thing * player = get_player();
struct Thing * thing = player;
{
struct Thing * player = get_player();
struct Thing * thing = player;
- uint16_t start_turn = world.turn;
int16_t * whitelist = build_whitelist();
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++;
if (!thing)
{
world.turn++;