X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Flib%2Fsubs%2Frej.c;h=77faac4b650e282bedf5ab8a08e057539b017c28;hp=c3f2079fab9574bf0d8720cb0eac5fd3c4d3f86b;hb=439f111f9859393a787ce33694e0758ca8a090de;hpb=a94ae5f8c1f99bf972175318fc3f09dbcf995fcc diff --git a/src/lib/subs/rej.c b/src/lib/subs/rej.c index c3f2079fa..77faac4b6 100644 --- a/src/lib/subs/rej.c +++ b/src/lib/subs/rej.c @@ -53,7 +53,6 @@ setrel(natid us, natid them, int rel) int n_up = 0; int n_down = 0; char *addendum = NULL; - int theirrel; if (rel < AT_WAR) rel = AT_WAR; @@ -84,34 +83,6 @@ setrel(natid us, natid them, int rel) n_up = N_UP_HOSTILE; n_down = N_DOWN_HOSTILE; } else if (rel < HOSTILE) { - if (opt_SLOW_WAR) { - struct natstr *natp2; - double cost; - - if (!player->god) { - natp2 = themnp; - theirrel = getrel(natp2, us); - if (theirrel <= MOBILIZATION) { - rel = theirrel; - cost = 0; - } else if (us == player->cnum && !update_running) { - if (mynp->nat_money < War_Cost) { - mpr(us, "You don't have the money!\n"); - return RET_FAIL; - } - rel = MOBILIZATION; - cost = War_Cost; - } else { /* nreport is forcing us to decl war */ - return RET_FAIL; - } - if (rel >= oldrel) { - if (us == player->cnum && !update_running) - mpr(us, "No change required for that!\n"); - return RET_FAIL; - } - player->dolcost += cost; - } - } addendum = "Declaration made (give 'em hell)."; n_down = N_DECL_WAR; }