Fix trailing whitespace

[empserver] / src / lib / commands / forc.c

diff --git a/src/lib/commands/forc.c b/src/lib/commands/forc.c
index 9b916f92dd1b62251860608292d8a4dfbc3b6022..deff2565631cb3ca0bbc6047e6f6b5ebf7d898e1 100644 (file)
--- a/src/lib/commands/forc.c
+++ b/src/lib/commands/forc.c
@@ -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-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,26 +26,21 @@
  *  ---
  *
  *  force.c: Force an update to occur (deity)
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1994
+ *     Markus Armbruster, 2007
  */
 
 #include <config.h>
 
 #include "commands.h"
-#include "empthread.h"
+#include "game.h"
 #include "server.h"
 
 int
 force(void)
 {
-    static int seconds;
-
-    if (update_pending) {
-       pr("Update is pending\n");
-       return RET_FAIL;
-    }
     if (shutdown_pending) {
        pr("Shutdown is pending\n");
        return RET_FAIL;
@@ -54,12 +49,7 @@ force(void)
        pr("Updates are disabled\n");
        return RET_FAIL;
     }
-    seconds = onearg(player->argp[1], "Time until update [in seconds]? ");
-    if (seconds < 0)
+    if (update_trigger() < 0)
        return RET_FAIL;
-
-    pr("Scheduling update in %d second(s)\n", seconds);
-    empth_create(PP_SCHED, update_force, (50 * 1024), 0, "forceUpdate",
-       "Schedules an update", &seconds);
     return RET_OK;
 }