/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
* Known contributors to this file:
* David Muir Sharnoff
* Steve McClure, 1998
+ * Markus Armbruster, 2004-2013
*/
#include <config.h>
#include "commands.h"
-#include "lost.h"
#include "news.h"
#include "optlist.h"
if (!p || !*p)
return RET_SYN;
amt = atoi(p);
+ if (!check_sect_ok(§))
+ return RET_FAIL;
switch (char0) {
case 'i':
current = sect.sct_min;
current += amt;
- if (current < 0)
- current = 0;
- if (current > 100)
- current = 100;
+ current = LIMIT_TO(current, 0, 100);
if (sect.sct_own != 0)
- resnoise(§, 1, "Iron ore content",
- (int)sect.sct_min, current);
+ resnoise(§, "Iron ore content", sect.sct_min, current);
sect.sct_min = (unsigned char)current;
break;
case 'g':
current = sect.sct_gmin;
current += amt;
- if (current < 0)
- current = 0;
- if (current > 100)
- current = 100;
+ current = LIMIT_TO(current, 0, 100);
if (sect.sct_own != 0)
- resnoise(§, 1, "Gold content",
- (int)sect.sct_gmin, current);
+ resnoise(§, "Gold content", sect.sct_gmin, current);
sect.sct_gmin = (unsigned char)current;
break;
case 'o':
case 'i':
current = sect.sct_oil;
current += amt;
- if (current < 0)
- current = 0;
- if (current > 100)
- current = 100;
+ current = LIMIT_TO(current, 0, 100);
if (sect.sct_own != 0)
- resnoise(§, 1, "Oil content",
- (int)sect.sct_oil, current);
+ resnoise(§, "Oil content", sect.sct_oil, current);
sect.sct_oil = (unsigned char)current;
break;
case 'w':
case 'e':
current = sect.sct_effic;
current += amt;
- if (current < 0)
- current = 0;
- if (current > 100)
- current = 100;
+ current = LIMIT_TO(current, 0, 100);
pr("Efficiency in %s changed to %d.\n",
xyas(sect.sct_x, sect.sct_y, player->cnum), current);
sect.sct_effic = current;
case 'i':
current = sect.sct_mines;
current += amt;
- if (current < 0)
- current = 0;
- if (current > MINES_MAX)
- current = MINES_MAX;
- if (sect.sct_own != 0)
- resnoise(§, 1, "Mines", sect.sct_mines, current);
+ current = LIMIT_TO(current, 0, MINES_MAX);
+ if (sect.sct_own != 0 && sect.sct_own == sect.sct_oldown)
+ resnoise(§, "Mines", sect.sct_mines, current);
sect.sct_mines = current;
break;
case 'o':
current = sect.sct_mobil;
current += amt;
- if (current < -127)
- current = -127;
- if (current > 127)
- current = 127;
+ current = LIMIT_TO(current, -127, 127);
pr("Mobility in %s changed to %d.\n",
xyas(sect.sct_x, sect.sct_y, player->cnum), current);
sect.sct_mobil = current;
case 'a':
current = sect.sct_avail;
current += amt;
- if (current < 0)
- current = 0;
- if (current > 9999)
- current = 9999;
+ current = LIMIT_TO(current, 0, 9999);
pr("Available in %s changed to %d.\n",
xyas(sect.sct_x, sect.sct_y, player->cnum), current);
sect.sct_avail = (short)current;
case 'w':
current = sect.sct_work;
current += amt;
- if (current < 0)
- current = 0;
- if (current > 100)
- current = 100;
+ current = LIMIT_TO(current, 0, 100);
pr("Work in %s changed to %d.\n",
xyas(sect.sct_x, sect.sct_y, player->cnum), current);
sect.sct_work = (unsigned char)current;
case 'f':
current = sect.sct_fertil;
current += amt;
- if (current < 0)
- current = 0;
- if (current > 100)
- current = 100;
+ current = LIMIT_TO(current, 0, 100);
if (sect.sct_own != 0)
- resnoise(§, 1, "Fertility content",
- (int)sect.sct_fertil, current);
+ resnoise(§, "Fertility content", sect.sct_fertil, current);
sect.sct_fertil = (unsigned char)current;
break;
case 'u':
current = sect.sct_uran;
current += amt;
- if (current < 0)
- current = 0;
- if (current > 100)
- current = 100;
+ current = LIMIT_TO(current, 0, 100);
if (sect.sct_own != 0)
- resnoise(§, 1, "Uranium content",
- (int)sect.sct_uran, current);
+ resnoise(§, "Uranium content", sect.sct_uran, current);
sect.sct_uran = (unsigned char)current;
break;
default:
}
void
-resnoise(struct sctstr *sptr, int public_amt, char *name, int old,
- int new)
+resnoise(struct sctstr *sptr, char *name, int old, int new)
{
- char p[100];
-
pr("%s of %s changed from %d to %d\n",
name, xyas(sptr->sct_x, sptr->sct_y, player->cnum), old, new);
- if (public_amt)
- (void)sprintf(p, "changed from %d to %d", old, new);
- else
- (void)sprintf(p, "%s", old < new ? "increased" : "decreased");
if (sptr->sct_own)
wu(0, sptr->sct_own,
- "%s in %s was %s by an act of %s\n",
+ "%s in %s was changed from %d to %d by an act of %s\n",
name, xyas(sptr->sct_x, sptr->sct_y, sptr->sct_own),
- p, cname(player->cnum));
+ old, new, cname(player->cnum));
resbenefit(sptr->sct_own, (old < new));
}