empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(mult, player_coms): Command `mult' is disabled since 4.0.0 ('96), and

Browse source 
its code is obviously not in working order.  Remove.
(minmult, maxmult, configkeys): Unused configuration parameters,
remove.
(tradedesc): Remove code related to mult that had no effect.
(multread, commread, commwrite, commamt, commset, multset, commprice):
Dangerous, because code bypasses ef_read() & friends, remove.
(diss): Commodity cleanup uses the above, remove.  Command is disabled
and unlikely to work anyway.
This commit is contained in:
Markus Armbruster 2004-03-01 09:04:02 +00:00
parent 30cb9e2a83
commit 0c19d70c74
13 changed files with 4 additions and 356 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/lib/commands/Makefile
View file

@ -42,7 +42,7 @@ OBJS = acce.o add.o anti.o arm.o army.o assa.o atta.o bdes.o best.o boar.o \
expl.o fina.o flash.o flee.o fly.o foll.o forc.o fort.o fuel.o give.o \
grin.o hard.o head.o hidd.o improve.o info.o land.o laun.o lboard.o \
ldump.o ledg.o leve.o load.o look.o lost.o lstat.o lten.o map.o \
marc.o mark.o mfir.o mine.o miss.o mobq.o mobu.o mora.o move.o mult.o \
marc.o mark.o mfir.o mine.o miss.o mobq.o mobu.o mora.o move.o \
name.o nati.o navi.o ndump.o new.o newe.o news.o nuke.o offe.o offs.o \
orde.o orig.o para.o path.o payo.o pboa.o pdump.o plan.o play.o \
powe.o prod.o pstat.o rada.o rang.o rea.o real.o reco.o reje.o rela.o \
@ -64,7 +64,7 @@ NTOBJS = acce.obj add.obj anti.obj arm.obj army.obj assa.obj atta.obj \
land.obj laun.obj lboard.obj ldump.obj ledg.obj leve.obj load.obj \
look.obj lost.obj lstat.obj lten.obj map.obj marc.obj mark.obj \
mfir.obj mine.obj miss.obj mobq.obj mobu.obj mora.obj move.obj \
mult.obj name.obj nati.obj navi.obj ndump.obj new.obj newe.obj \
name.obj nati.obj navi.obj ndump.obj new.obj newe.obj \
news.obj nuke.obj offe.obj offs.obj orde.obj orig.obj para.obj \
path.obj payo.obj pboa.obj pdump.obj plan.obj play.obj powe.obj \
prod.obj pstat.obj rada.obj rang.obj rea.obj real.obj reco.obj \

7
src/lib/commands/diss.c
View file

@ -236,13 +236,6 @@ diss(void)
loan.l_status = LS_FREE;
putloan(ni.cur, &loan);
}
/* clean up commodity and trade for this nation. */
commread();
for (n = 1; n < I_MAX + 1; n++) {
val = commamt(player->cnum, n, &dummy);
commset(player->cnum, n, -val);
}
commwrite();
snxtitem_all(&ni, EF_TRADE);
while (nxtitem(&ni, (s_char *)&trade)) {
if (trade.trd_unitid >= 0 && trade.trd_owner == player->cnum) {

114
src/lib/commands/mult.c
View file

@ -1,114 +0,0 @@
/*
* Empire - A multi-player, client/server Internet based war game.
* Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
* ---
*
* See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
* related information and legal notices. It is expected that any future
* projects/authors will amend these files as needed.
*
* ---
*
* mult.c: Set per-nation list of price multipliers
*
* Known contributors to this file:
* Dave Pare, 1986
*/
#include "misc.h"
#include "player.h"
#include "var.h"
#include "nat.h"
#include "file.h"
#include "xy.h"
#include "nsc.h"
#include "commands.h"
#include "optlist.h"
#include <math.h> /* bailey@math-cs.kent.edu */
static void multsingle(natid us, natid them, struct natstr *natp);
int
mult(void)
{
struct nstr_item ni;
struct natstr nat;
int nats;
if (!opt_MARKET) {
pr("The market is disabled.\n");
return RET_FAIL;
}
pr("The mult command is no longer used.\n");
if (!snxtitem(&ni, EF_NATION, player->argp[1]))
return RET_SYN;
if (commread() < 0) {
pr("Unable to read commodity file; get help!\n");
return RET_SYS;
}
nats = 0;
while (!player->aborted && nxtitem(&ni, (s_char *)&nat)) {
if ((nat.nat_stat & STAT_NORM) == 0)
continue;
multsingle(player->cnum, (natid)ni.cur, &nat);
nats++;
}
pr("%d nation multipliers changed\n", nats);
return RET_OK;
}
/*
* Set the multipler for a single country.
*/
static void
multsingle(natid us, natid them, struct natstr *natp)
{
double price;
s_char *p;
s_char prompt[128];
s_char buf[1024];
sprintf(prompt, "%s (%7.3f) : ", natp->nat_cnam, multread(us, them));
p = getstarg(player->argp[2], prompt, buf);
if (p == 0 || *p == 0)
return;
if ((price = atof(p)) == 0.0)
return;
#if defined(HUGE)
if ((price == HUGE) || (price > 1000000.0)) /* Inf causes overflow. */
#else
if (price > 1000000.0)
#endif
price = 1000000.0; /* bailey@math-cs.kent.edu */
/*
* no free lunches!
*/
if (price <= minmult)
price = minmult;
if (price >= maxmult)
price = maxmult;
if (commread() < 0) {
pr("Unable to re-read commodity file; get help!\n");
return;
}
multset(them, price);
if (commwrite() < 0) {
pr("Unable to write out commodity file; get help!\n");
}
}