From 2df3f002e172670239455d0e8703ae2cdc77e839 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sun, 4 Apr 2004 14:07:51 +0000 Subject: [PATCH] (getminleft): Parameter hours unused since the previous rev., remove. Change parameter mpd from int * to int, because its only use is *mpd as r-value. Callers changed. --- include/prototypes.h | 2 +- src/lib/player/empdis.c | 7 ++----- src/lib/player/player.c | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/include/prototypes.h b/include/prototypes.h index 59b25bc2f..f71e0aab7 100644 --- a/include/prototypes.h +++ b/include/prototypes.h @@ -254,7 +254,7 @@ extern void init_player_commands(void); extern void log_last_commands(void); extern int gamedown(void); extern void daychange(time_t); -extern int getminleft(time_t, int *, int *); +extern int getminleft(time_t, int); /* more in commands.h */ /* empmod.c */ /* init_nats.c */ diff --git a/src/lib/player/empdis.c b/src/lib/player/empdis.c index 902237abf..8aa35f887 100644 --- a/src/lib/player/empdis.c +++ b/src/lib/player/empdis.c @@ -199,19 +199,16 @@ daychange(time_t now) } int -getminleft(time_t now, int *hour, int *mpd) +getminleft(time_t now, int mpd) { - s_char *bp; struct tm *tm; int nminleft; - int curtime; struct natstr *natp; int n; tm = localtime(&now); - curtime = tm->tm_min + tm->tm_hour * 60; natp = getnatp(player->cnum); - nminleft = *mpd - natp->nat_minused; + nminleft = mpd - natp->nat_minused; n = 60 * 24 - (tm->tm_min + tm->tm_hour * 60); if (n < nminleft) nminleft = n; diff --git a/src/lib/player/player.c b/src/lib/player/player.c index 03ab445ab..c3be2b967 100644 --- a/src/lib/player/player.c +++ b/src/lib/player/player.c @@ -89,7 +89,7 @@ player_main(struct player *p) return; } daychange(player->curup); - if ((player->minleft = getminleft(player->curup, hour, &m_m_p_d)) <= 0) { + if ((player->minleft = getminleft(player->curup, m_m_p_d)) <= 0) { pr("Time exceeded today\n"); return; } @@ -256,7 +256,7 @@ status(void) return 0; } } - player->minleft = getminleft(player->curup, hour, &m_m_p_d); + player->minleft = getminleft(player->curup, m_m_p_d); } player->lasttime += minute * 60; natp->nat_minused += minute; -- 2.43.0