empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Inline gamedown() into only user may_play_now() and simplify

Browse source
This commit is contained in:
Markus Armbruster 2009-02-08 13:20:57 +01:00
parent e8926559d1
commit b404216dbe
1 changed files with 9 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/lib/player/empdis.c
View file

@ -177,24 +177,6 @@ disable_coms(void)
free(tmp); free(tmp);
} }
/*
* returns true if down
*/
static int
gamedown(int suppress_deity_message)
{
if (!game_play_disabled())
return 0;
if (player->god) {
if (!suppress_deity_message)
pr("The game is down\n");
return 0;
}
show_first_tel(downfil);
pr("\nThe game is down\n");
return 1;
}
static int static int
seconds_since_midnight(time_t time) seconds_since_midnight(time_t time)
{ {
@ -262,8 +244,15 @@ may_play_now(struct natstr *natp, time_t now,
return 0; return 0;
} }
if (gamedown(suppress_deity_message)) if (game_play_disabled()) {
if (natp->nat_stat != STAT_GOD) {
show_first_tel(downfil);
pr("\nThe game is down\n");
return 0; return 0;
}
if (!suppress_deity_message)
pr("The game is down\n");
}
if ((natp->nat_stat != STAT_GOD && natp->nat_stat != STAT_VIS) if ((natp->nat_stat != STAT_GOD && natp->nat_stat != STAT_VIS)
&& natp->nat_timeused > m_m_p_d * 60) { && natp->nat_timeused > m_m_p_d * 60) {