From ded3daf70d2c32e56411bcb8854a811e249cbe66 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sun, 4 Apr 2004 14:20:30 +0000
Subject: [PATCH] (gamehours): All callers ignore the value assigned to hour[].
  Remove parameter.  Remove calls without effect.  Other callers changed.

---
 include/prototypes.h    |  2 +-
 src/lib/common/hours.c  | 12 ++----------
 src/lib/player/player.c |  6 ++----
 src/server/main.c       |  2 --
 src/server/timestamp.c  |  5 ++---
 src/server/update.c     |  4 +---
 6 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/include/prototypes.h b/include/prototypes.h
index f71e0aab..803a6f6c 100644
--- a/include/prototypes.h
+++ b/include/prototypes.h
@@ -119,7 +119,7 @@ extern void filetruncate(s_char *);
 /* hap_fact.c */
 extern double hap_fact(struct natstr *, struct natstr *);
 /* hours.c */
-extern int gamehours(time_t, int *);
+extern int gamehours(time_t);
 /* land.c */
 extern int has_units(coord, coord, natid, struct lndstr *);
 extern int has_units_with_mob(coord, coord, natid);
diff --git a/src/lib/common/hours.c b/src/lib/common/hours.c
index 8430416e..35a33833 100644
--- a/src/lib/common/hours.c
+++ b/src/lib/common/hours.c
@@ -49,18 +49,16 @@
 
 /*
  * returns true if game can be played now.
- * Sets the number of minutes until the hours
- * function must be re-called.
  */
 int
-gamehours(time_t now, int *hour)
+gamehours(time_t now)
 {
     register s_char *bp;
     register struct tm *tm;
     int day;
     int curtime;
     int okday[7];
-    int tomorrow;
+    int hour[2];
 
     tm = localtime(&now);
     curtime = tm->tm_min + tm->tm_hour * 60;
@@ -83,12 +81,6 @@ gamehours(time_t now, int *hour)
 		break;
 	if (bp == 0)
 	    return 0;
-    } else {
-	hour[0] = 0;
-	hour[1] = 24 * 60;
     }
-    tomorrow = tm->tm_wday + 1;
-    if (tomorrow >= 7)
-	tomorrow = 0;
     return 1;
 }
diff --git a/src/lib/player/player.c b/src/lib/player/player.c
index c3be2b96..4961cecd 100644
--- a/src/lib/player/player.c
+++ b/src/lib/player/player.c
@@ -65,7 +65,6 @@ void
 player_main(struct player *p)
 {
     struct natstr *natp;
-    int hour[2];
     int secs;
     s_char buf[128];
 
@@ -83,7 +82,7 @@ player_main(struct player *p)
 	pr("You're not a deity!\n");
 	return;
     }
-    if (!gamehours(player->curup, hour)) {
+    if (!gamehours(player->curup)) {
 	pr("Empire hours restriction in force\n");
 	if ((natp->nat_stat & STAT_GOD) == 0)
 	    return;
@@ -190,7 +189,6 @@ status(void)
     struct natstr *natp;
     int minute;
     struct sctstr sect;
-    int hour[2];
     s_char buf[128];
 
     if (player->state == PS_SHUTDOWN)
@@ -249,7 +247,7 @@ status(void)
 	     * either day change, or hours restriction
 	     */
 	    daychange(player->curup);
-	    if (!gamehours(player->curup, hour)) {
+	    if (!gamehours(player->curup)) {
 		pr("Empire hours restriction in force\n");
 		if ((natp->nat_stat & STAT_GOD) == 0) {
 		    putnat(natp);
diff --git a/src/server/main.c b/src/server/main.c
index fbe69c52..c284532f 100644
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -91,7 +91,6 @@ int
 main(int argc, char **argv)
 {
     time_t now;
-    int hour[2];
     int flags = 0;
     int op;
     char *config_file = NULL;
@@ -207,7 +206,6 @@ main(int argc, char **argv)
     ef_init();
     init_files();
     io_init();
-    gamehours(now, hour);
 
     if (opt_MOB_ACCESS) {
 	/* This fixes up mobility upon restart */
diff --git a/src/server/timestamp.c b/src/server/timestamp.c
index ed3b7d4e..b0ee6dd1 100644
--- a/src/server/timestamp.c
+++ b/src/server/timestamp.c
@@ -49,7 +49,6 @@ mobility_check(void *unused)
     struct mob_acc_globals timestamps;
     time_t now;
     FILE *fp;
-    int hour[2];
 
     while (1) {
 	time(&now);
@@ -68,7 +67,7 @@ mobility_check(void *unused)
 	rewind(fp);
 	fwrite(&timestamps, sizeof(timestamps), 1, fp);
 	fclose(fp);
-	if (!gamehours(now, hour)) {
+	if (!gamehours(now)) {
 	    if (updating_mob == 1) {
 		update_all_mob();
 		logerror("Turning off mobility updating (gamehours).");
@@ -127,7 +126,7 @@ mobility_init(void)
     time(&now);
     logerror("Done at %s", ctime(&now));
 
-    if (now >= timestamps.starttime && gamehours(now, hour)) {
+    if (now >= timestamps.starttime && gamehours(now)) {
 	logerror("Turning on mobility updating.");
 	updating_mob = 1;
     } else {
diff --git a/src/server/update.c b/src/server/update.c
index 8a249ebd..c8a528be 100644
--- a/src/server/update.c
+++ b/src/server/update.c
@@ -50,7 +50,6 @@ void
 update_sched(void *unused)
 {
     s_char *kw;
-    int hour[2];
     int wind;
     time_t now, delta;
 
@@ -58,7 +57,6 @@ update_sched(void *unused)
     empth_create(PP_SCHED, update_wait, (50 * 1024), 0, "UpdateWait",
 		 "Waits until players idle", 0);
     time(&now);
-    (void)gamehours(now, hour);
     if (s_p_etu <= 0) {
 	logerror("bad value for s_p_etu (%d)", s_p_etu);
 	s_p_etu = 2 * 60;
@@ -78,7 +76,7 @@ update_sched(void *unused)
 	empth_sleep(update_time);
 	time(&now);
 	now += adj_update;
-	if (!gamehours(now, hour)) {
+	if (!gamehours(now)) {
 	    logerror("No update permitted (hours restriction)");
 	    continue;
 	}