]> git.pond.sub.org Git - empserver/blobdiff - src/lib/player/player.c
Move show_first_tel() from player.c to rea.c
[empserver] / src / lib / player / player.c
index 89f63a7d0e033d2d606292ab50b297b3147546ae..4666d179ed7465ad20cc960623c775cb66471ac3 100644 (file)
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
  *  ---
  *
  *  player.c: Main command loop for a player
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 2000
+ *     Markus Armbruster, 2004-2008
+ *     Ron Koenderink, 2004-2007
  */
 
 #include <config.h>
 
-#include <errno.h>
-#include <stdio.h>
 #include "com.h"
 #include "empio.h"
 #include "empthread.h"
@@ -46,7 +46,6 @@
 #include "player.h"
 #include "proto.h"
 #include "prototypes.h"
-#include "sect.h"
 #include "tel.h"
 
 
@@ -59,29 +58,20 @@ void
 player_main(struct player *p)
 {
     struct natstr *natp;
-    int secs;
     char buf[128];
 
     p->state = PS_PLAYING;
     player = p;
-    time(&player->lasttime);
     time(&player->curup);
+    update_timeused_login(player->curup);
     show_motd();
     if (init_nats() < 0) {
        pr("Server confused, try again later\n");
        return;
     }
     natp = getnatp(player->cnum);
-    if (!gamehours(player->curup)) {
-       pr("Empire hours restriction in force\n");
-       if (natp->nat_stat != STAT_GOD)
-           return;
-    }
-    daychange(player->curup);
-    if ((player->minleft = getminleft(player->curup, m_m_p_d)) <= 0) {
-       pr("Time exceeded today\n");
+    if (!may_play_now(natp, player->curup, 0))
        return;
-    }
     if (natp->nat_stat != STAT_VIS
        && natp->nat_last_login
        && (strcmp(natp->nat_hostaddr, player->hostaddr)
@@ -97,8 +87,7 @@ player_main(struct player *p)
     strcpy(natp->nat_userid, player->userid);
     strcpy(natp->nat_hostname, player->hostname);
     strcpy(natp->nat_hostaddr, player->hostaddr);
-
-    time(&natp->nat_last_login);
+    natp->nat_last_login = player->curup;
     putnat(natp);
     journal_login();
     if (natp->nat_flags & NF_INFORM && natp->nat_tgms > 0) {
@@ -110,25 +99,16 @@ player_main(struct player *p)
        natp->nat_tgms = 0;
     }
 
-    while (status()) {
-       if (command() == 0 && !player->aborted)
-           break;
-       player->aborted = 0;
+    while (status() && command()) {
+       player->aborted = player->eof;
        empth_yield();
     }
     /* #*# I put the following line in to prevent server crash -KHS */
     natp = getnatp(player->cnum);
-    /*
-     * randomly round up to the nearest minute,
-     * charging at least 15 seconds.
-     */
     time(&natp->nat_last_logout);
-    secs = MAX(natp->nat_last_logout - player->lasttime, 15);
-    natp->nat_minused += secs / 60;
-    secs = secs % 60;
-    if (chance(secs / 60.0))
-       natp->nat_minused += 1;
     putnat(natp);
+    update_timeused(natp->nat_last_logout);
+    enforce_minimum_session_time();
     pr("Bye-bye\n");
     journal_logout();
 }
@@ -138,9 +118,16 @@ command(void)
 {
     char *redir;               /* UTF-8 */
     char scanspace[1024];
+    time_t now;
 
     if (getcommand(player->combuf) < 0)
        return 0;
+
+    now = time(NULL);
+    update_timeused(now);
+    if (!may_play_now(getnatp(player->cnum), now, 1))
+       return 0;
+
     if (parse(player->combuf, scanspace, player->argp, player->comtail,
              &player->condarg, &redir) < 0) {
        pr("See \"info Syntax\"?\n");
@@ -155,79 +142,39 @@ static int
 status(void)
 {
     struct natstr *natp;
-    int minute;
-    struct sctstr sect;
+    int old_nstat;
     char buf[128];
 
-    if (player->state == PS_SHUTDOWN)
+    if (player->eof || player->state == PS_SHUTDOWN)
        return 0;
     natp = getnatp(player->cnum);
-    if (io_error(player->iop) || io_eof(player->iop)) {
-       putnat(natp);
-       return 0;
-    }
+    if (player->dolcost > 100.0)
+       pr("That just cost you $%.2f\n", player->dolcost);
+    else if (player->dolcost < -100.0)
+       pr("You just made $%.2f\n", -player->dolcost);
     if (player->dolcost != 0.0) {
-       if (player->dolcost > 100.0)
-           pr("That just cost you $%.2f\n", player->dolcost);
-       else if (player->dolcost < -100.0)
-           pr("You just made $%.2f\n", -player->dolcost);
-       if (natp->nat_money < player->dolcost && !player->broke) {
-           player->broke = 1;
-           player->nstat &= ~MONEY;
-           pr("You are now broke; industries are on strike.\n");
-       } else if (player->broke && natp->nat_money - player->dolcost > 0) {
-           player->broke = 0;
-           player->nstat |= MONEY;
-           pr("You are no longer broke!\n");
-       }
+       /*
+        * Hackish work around for a race condition in the nightly
+        * build's regression tests: sometimes the update starts right
+        * after the force command yields, sometimes a bit later.  If
+        * it is late, we use one random number here, for the bye,
+        * and throwing off the random sequence.
+        */
        natp->nat_money -= roundavg(player->dolcost);
        player->dolcost = 0.0;
-    } else {
-       if (natp->nat_money < 0.0 && !player->broke) {
-           player->broke = 1;
-           player->nstat &= ~MONEY;
-           pr("You are now broke; industries are on strike.\n");
-       }
-       if (player->broke && natp->nat_money > 0) {
-           player->broke = 0;
-           player->nstat |= MONEY;
-           pr("You are no longer broke!\n");
-       }
     }
-    getsect(natp->nat_xcap, natp->nat_ycap, &sect);
-    if (influx(natp))
-       player->nstat &= ~CAP;
-    else
-       player->nstat |= CAP;
-    player->ncomstat = player->nstat;
-    if (player->god)
-       player->ncomstat |= CAP | MONEY;
+
+    old_nstat = player->nstat;
+    player_set_nstat(player, natp);
+    if ((old_nstat & MONEY) && !(player->nstat & MONEY))
+       pr("You are now broke; industries are on strike.\n");
+    if (!(old_nstat & MONEY) && (player->nstat & MONEY))
+       pr("You are no longer broke!\n");
+
     time(&player->curup);
-    minute = (player->curup - player->lasttime) / 60;
-    if (minute > 0) {
-       player->minleft -= minute;
-       if (player->minleft <= 0) {
-           /*
-            * countdown timer "player->minleft" has expired.
-            * either day change, or hours restriction
-            */
-           daychange(player->curup);
-           if (!gamehours(player->curup)) {
-               pr("Empire hours restriction in force\n");
-               if (natp->nat_stat != STAT_GOD) {
-                   putnat(natp);
-                   return 0;
-               }
-           }
-           player->minleft = getminleft(player->curup, m_m_p_d);
-       }
-       player->lasttime += minute * 60;
-       natp->nat_minused += minute;
-    }
-    if (natp->nat_stat == STAT_ACTIVE && natp->nat_minused > m_m_p_d) {
-       pr("Max minutes per day limit exceeded.\n");
-       player->ncomstat = VIS;
-    }
+    update_timeused(player->curup);
+    if (!may_play_now(natp, player->curup, 0))
+       return 0;
     if (player->btused) {
        natp->nat_btu -= player->btused;
        player->btused = 0;
@@ -251,17 +198,12 @@ status(void)
        natp->nat_ann = 0;
     }
     if (natp->nat_stat == STAT_ACTIVE && (player->nstat & CAP) == 0)
-       pr("You lost your capital... better designate one\n");
+       pr("You lost your capital... better designate one (see info capital)\n");
     putnat(natp);
-    if (gamedown() && !player->god) {
-       pr("gamedown\n");
-       return 0;
-    }
     return 1;
 }
 
 /*
- * actually a command; redirection and piping ignored.
  * XXX This whole mess should be redone; execute block should
  * start with "exec start", and should end with "exec end".
  * We'll wait until 1.2 I guess.
@@ -276,7 +218,6 @@ execute(void)
     char scanspace[1024];
 
     failed = 0;
-    redir = NULL;
 
     if (player->comtail[1])
        p = player->comtail[1];
@@ -287,6 +228,7 @@ execute(void)
     prexec(p);
 
     while (!failed && status()) {
+       player->nstat &= ~EXEC;
        if (recvclient(buf, sizeof(buf)) < 0)
            break;
        if (parse(buf, scanspace, player->argp, player->comtail,
@@ -294,16 +236,18 @@ execute(void)
            failed = 1;
            continue;
        }
-       if (redir == NULL)
-           pr("\nExecute : %s\n", buf);
-       if (dispatch(buf, redir) < 0)
+       pr("\nExecute : %s\n", buf);
+       if (redir) {
+           pr("Execute : redirection not supported\n");
+           failed = 1;
+       } else if (dispatch(buf, NULL) < 0)
            failed = 1;
     }
     if (failed) {
        while (recvclient(buf, sizeof(buf)) >= 0) ;
     }
-    if (redir == NULL)
-       pr("Execute : %s\n", failed ? "aborted" : "terminated");
+
+    pr("Execute : %s\n", failed ? "aborted" : "terminated");
     player->eof = 0;
     return RET_OK;
 }
@@ -311,37 +255,7 @@ execute(void)
 int
 show_motd(void)
 {
-    FILE *motd_fp;
-    struct telstr tgm;
-    char buf[MAXTELSIZE + 1];  /* UTF-8 */
-
-    if ((motd_fp = fopen(motdfil, "rb")) == NULL) {
-       if (errno == ENOENT)
-           return RET_OK;
-       else {
-           pr ("Could not open motd.\n");
-           logerror("Could not open motd (%s).\n", motdfil);
-           return RET_SYS;
-       }
-    }
-    if (fread(&tgm, sizeof(tgm), 1, motd_fp) != 1) {
-       logerror("bad header on login message (motdfil)");
-       fclose(motd_fp);
-       return RET_FAIL;
-    }
-    if (tgm.tel_length >= (long)sizeof(buf)) {
-       logerror("text length (%ld) is too long for login message (motdfil)", tgm.tel_length);
-       fclose(motd_fp);
-       return RET_FAIL;
-    }
-    if (fread(buf, tgm.tel_length, 1, motd_fp) != 1) {
-       logerror("bad length %ld on login message", tgm.tel_length);
-       fclose(motd_fp);
-       return RET_FAIL;
-    }
-    buf[tgm.tel_length] = 0;
-    uprnf(buf);
-    fclose(motd_fp);
+    show_first_tel(motdfil);
     return RET_OK;
 }