Remove option SLOW_WAR

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

diff --git a/src/lib/commands/decl.c b/src/lib/commands/decl.c
index 20e1e085e4ce5d1067e714e059c6d10941533216..40190b2920ee447d43dd9d956c33f5d3d837bd3c 100644 (file)
--- a/src/lib/commands/decl.c
+++ b/src/lib/commands/decl.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -26,9 +26,9 @@
  *  ---
  *
  *  decl.c: Declare war, neutrality, alliance, hostile or friendly
- * 
+ *
  *  Known contributors to this file:
- *     
+ *
  */
 
 #include <config.h>
@@ -46,9 +46,10 @@ decl(void)
     char *p;
     char buf[1024];
 
-    if (!(p = getstarg(player->argp[1],
-                      "alliance, friendly, neutrality, hostility, or war? ",
-                      buf)))
+    p = getstarg(player->argp[1],
+                "alliance, friendly, neutrality, hostility, or war? ",
+                buf);
+    if (!p)
        return RET_SYN;
     switch (*p) {
     case 'a':
@@ -63,20 +64,6 @@ decl(void)
     case 'h':
        rel = HOSTILE;
        break;
-    case 'm':
-       if (!opt_SLOW_WAR)
-           return RET_SYN;
-       if (!player->god)
-           return RET_SYN;
-       rel = MOBILIZATION;
-       break;
-    case 's':
-       if (!opt_SLOW_WAR)
-           return RET_SYN;
-       if (!player->god)
-           return RET_SYN;
-       rel = SITZKRIEG;
-       break;
     case 'w':
        rel = AT_WAR;
        break;
@@ -85,7 +72,7 @@ decl(void)
        return RET_SYN;
     }
 
-    if (!snxtitem(&ni, EF_NATION, player->argp[2]))
+    if (!snxtitem(&ni, EF_NATION, player->argp[2], NULL))
        return RET_SYN;
     who = player->cnum;
     if (player->god) {
@@ -98,7 +85,7 @@ decl(void)
     while (nxtitem(&ni, &nat)) {
        if (nat.nat_stat == STAT_UNUSED)
            continue;
-       if (player->cnum == (natid)ni.cur)
+       if (who == (natid)ni.cur)
            continue;
        if (opt_HIDDEN) {
            if (!player->god && !getcontact(natp, ni.cur)) {