]> git.pond.sub.org Git - empserver/commitdiff
Correct the emptime.c.patch for player.c
authorRon Koenderink <rkoenderink@yahoo.ca>
Mon, 27 Oct 2008 03:12:10 +0000 (21:12 -0600)
committerRon Koenderink <rkoenderink@yahoo.ca>
Mon, 27 Oct 2008 03:12:10 +0000 (21:12 -0600)
Broken in commit 122171b.

src/scripts/nightly/patches/All/emptime.c.patch

index 6e5778556f6ba75b271c8e17b606c9e6499998ac..1bcda0f76fe734106295f63726f09a1504ac7f86 100644 (file)
@@ -818,17 +818,17 @@ index 513382b..4b97be7 100644
 -    time(&natp->nat_last_logout);
 +    empire_time(&natp->nat_last_logout);
      secs = MAX(natp->nat_last_logout - player->lasttime, 15);
-     natp->nat_timeused += secs;
-     putnat(natp);
+     natp->nat_minused += secs / 60;
+     secs = secs % 60;
 @@ -182,7 +183,7 @@ status(void)
      if (!(old_nstat & MONEY) && (player->nstat & MONEY))
        pr("You are no longer broke!\n");
  
 -    time(&player->curup);
 +    empire_time(&player->curup);
-     second = player->curup - player->lasttime;
-     if (second > 0) {
-       player->secleft -= second;
+     minute = (player->curup - player->lasttime) / 60;
+     if (minute > 0) {
+       player->minleft -= minute;
 diff --git a/src/lib/player/recvclient.c b/src/lib/player/recvclient.c
 index ab4ef69..8934189 100644
 --- a/src/lib/player/recvclient.c