(gamehours): All callers ignore the value assigned to hour[]. Remove

parameter.  Remove calls without effect.  Other callers changed.

diff --git a/include/prototypes.h b/include/prototypes.h
index f71e0aab7ad50cf2440de434f90cc5b8346781a6..803a6f6c2efe7bd69b803f3ea4c9c3be6ff92ba2 100644 (file)
--- 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 8430416e66154489cdae436fbdd966ee7f48b67e..35a33833f6379fe89ad9c9abf75b4fec0ec4f916 100644 (file)
--- 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 c3be2b967d0e368c7af9c456850ebeec7b80a888..4961cecdda71b8cd48abeb251ea0b229a4fa73cd 100644 (file)
--- 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 fbe69c522834bf4bb446ce10ee625288b6de46e5..c284532f3842725e386746bb253ba6964701c50b 100644 (file)
--- 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 ed3b7d4e0c7fd3bd4957959c866601866fa27505..b0ee6dd1efa8e65fc7f8190289bdb726f47b2035 100644 (file)
--- 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 8a249ebdfdc42990ffdd58f3a13d21703b949fd4..c8a528bef40653fb152e609696078d076fe62ff7 100644 (file)
--- 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;
        }