/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * 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.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
* expl.c: Take over unoccupied sectors
- *
+ *
* Known contributors to this file:
* Jeff Wallace, 1989
*/
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
+#include <config.h>
+
+#include "commands.h"
+#include "game.h"
#include "item.h"
-#include "file.h"
-#include "deity.h"
-#include "nat.h"
+#include "map.h"
#include "optlist.h"
-#include "commands.h"
+#include "plague.h"
-static int explore_map(s_char *what, coord curx, coord cury, s_char *arg);
-
-extern int etu_per_update;
-extern int sect_mob_neg_factor;
+static int explore_map(coord curx, coord cury, char *arg);
int
explore(void)
{
- register int amount;
+ int amount;
struct sctstr sect;
struct sctstr endsect;
struct sctstr start;
double weight;
int mcost, dam;
int infected;
- int vtype;
+ i_type vtype;
int amt_src;
int amt_dst;
struct ichrstr *ip;
int own, mob;
int justtook;
coord x, y;
- s_char *p;
+ char *p;
int n;
int left;
- s_char buf[1024];
- s_char prompt[128];
+ char buf[1024];
+ char prompt[128];
- if ((ip =
- whatitem(player->argp[1], "explore with what? (civ/mil) ")) == 0)
+ if (!(ip = whatitem(player->argp[1], "explore with what? (civ/mil) ")))
return RET_SYN;
- vtype = ip->i_vtype;
- if ((vtype != V_CIVIL) && (vtype != V_MILIT)) {
+ vtype = ip->i_uid;
+ if ((vtype != I_CIVIL) && (vtype != I_MILIT)) {
pr("You can only explore with civs and mil.\n");
return RET_FAIL;
}
pr("Not yours\n");
return RET_FAIL;
}
- infected = getvar(V_PSTAGE, (s_char *)§, EF_SECTOR) == PLG_INFECT;
- if ((amt_src = getvar(vtype, (s_char *)§, EF_SECTOR)) <= 0) {
+ infected = sect.sct_pstage == PLG_INFECT;
+ if ((amt_src = sect.sct_item[vtype]) <= 0) {
pr("No %s in %s\n", ip->i_name,
xyas(sect.sct_x, sect.sct_y, player->cnum));
return RET_SYN;
}
own = sect.sct_own;
- mob = (int)sect.sct_mobil;
- if (vtype == V_CIVIL && sect.sct_oldown != own) {
+ mob = sect.sct_mobil;
+ if (vtype == I_CIVIL && sect.sct_oldown != own) {
pr("You can't explore with conquered populace!\n");
return RET_SYN;
}
xyas(sect.sct_x, sect.sct_y, player->cnum));
return RET_SYN;
}
- if (vtype == V_CIVIL) {
- work = sect.sct_work;
- if (work != 100)
- pr("Warning: civil unrest\n");
- loyal = sect.sct_loyal;
- } else if (vtype == V_MILIT) {
- work = 100;
- loyal = 0;
- }
+
+ /* only used when moving civs; but prevent spurious compiler warnings */
+ work = sect.sct_work;
+ loyal = sect.sct_loyal;
+ if (vtype == I_CIVIL && work != 100)
+ pr("Warning: civil unrest\n");
+
sprintf(prompt, "Number of %s to explore with? (max %d) ",
ip->i_name, amt_src);
amount = onearg(player->argp[3], prompt);
+ if (amount <= 0)
+ return RET_SYN;
if (!check_sect_ok(§))
return RET_FAIL;
if (amount > amt_src) {
if (!check_sect_ok(§))
return RET_FAIL;
- if (amount <= 0)
- return RET_SYN;
- weight = amount * ip->i_lbs;
+ weight = (double)amount * ip->i_lbs;
/* remove commodities from source sector */
getsect(x, y, &start);
- amt_src = getvar(vtype, (s_char *)&start, EF_SECTOR);
+ amt_src = start.sct_item[vtype];
amt_src -= amount;
if (amt_src < 0) {
pr("%s in %s are gone!\n", ip->i_name,
xyas(start.sct_x, start.sct_y, player->cnum));
return RET_OK;
}
- putvar(vtype, amt_src, (s_char *)&start, EF_SECTOR);
+ start.sct_item[vtype] = amt_src;
start.sct_flags |= MOVE_IN_PROGRESS;
putsect(&start);
/*
* Now parse the path and return ending sector.
*/
dam = 1;
- mcost = move_ground((s_char *)ip, §, &endsect,
- (double)sect.sct_mobil, weight, player->argp[4],
+ mcost = move_ground(§, &endsect, weight, player->argp[4],
explore_map, 1, &dam);
if (dam) {
left = effdamage(amount, dam);
if (left < amount) {
if (left) {
- pr("%d of the %s you were exploring with were destroyed!\nOnly %d %s made it to %s\n", amount - left, ip->i_name, left, ip->i_name, xyas(endsect.sct_x, endsect.sct_y, player->cnum));
+ pr("%d of the %s you were exploring with were destroyed!\n"
+ "Only %d %s made it to %s\n",
+ amount - left, ip->i_name, left, ip->i_name,
+ xyas(endsect.sct_x, endsect.sct_y, player->cnum));
} else {
- pr("All of the %s you were exploring with were destroyed!\n", ip->i_name);
+ pr("All of the %s you were exploring with were destroyed!\n",
+ ip->i_name);
}
amount = left;
}
if (mcost < 0) {
pr("\nExplore aborted");
getsect(start.sct_x, start.sct_y, §);
- sect.sct_mobil = (u_char)mob;
+ sect.sct_mobil = mob;
} else {
/* Charge mobility */
getsect(sect.sct_x, sect.sct_y, §);
n = sect.sct_mobil - mcost;
if (n < 0)
n = 0;
- sect.sct_mobil = (u_char)n;
+ sect.sct_mobil = n;
pr(", %d mob left in %s", sect.sct_mobil,
xyas(sect.sct_x, sect.sct_y, player->cnum));
putsect(§);
* Check for a multitude of problems
*/
getsect(endsect.sct_x, endsect.sct_y, &chksect);
- if (chksect.sct_type == '.') {
+ if (amount <= 0) {
+ getsect(start.sct_x, start.sct_y, &start);
+ sect.sct_flags &= ~MOVE_IN_PROGRESS;
+ putsect(§);
+ return RET_FAIL;
+ }
+ if (chksect.sct_type == SCT_WATER) {
pr("Bridge disappeared!\n");
getsect(start.sct_x, start.sct_y, &start);
start.sct_flags &= ~MOVE_IN_PROGRESS;
if (!player->god && chksect.sct_own && chksect.sct_own != player->cnum
&& chksect.sct_type != SCT_SANCT) {
pr("Somebody beat you there!\n");
- /* Send them xback home */
+ /* Send them back home */
getsect(start.sct_x, start.sct_y, §);
if (sect.sct_own != own) {
pr("Someone captured the sector you started from!\n");
}
if (!player->god && !player->owner && sect.sct_type != SCT_SANCT) {
- (void)takeover(§, player->cnum);
+ takeover(§, player->cnum);
justtook = 1;
sect.sct_oldown = own;
- sect.sct_work = work;
- sect.sct_loyal = loyal;
+ sect.sct_work = 100;
+ sect.sct_loyal = 0;
}
- if (vtype == V_CIVIL && sect.sct_oldown != player->cnum) {
+ if (vtype == I_CIVIL && sect.sct_oldown != player->cnum) {
pr("Your civilians don't want to stay!\n");
getsect(start.sct_x, start.sct_y, §);
if (sect.sct_own != own) {
return RET_FAIL;
}
}
- getsect(start.sct_x, start.sct_y, &start);
- start.sct_flags &= ~MOVE_IN_PROGRESS;
- putsect(&start);
- amt_dst = getvar(vtype, (s_char *)§, EF_SECTOR);
- if (32767 - amt_dst < amount) {
- amount = 32767 - amt_dst;
+ amt_dst = sect.sct_item[vtype];
+ if (amount > ITEM_MAX - amt_dst) {
+ amount = ITEM_MAX - amt_dst;
pr("Only %d can be left there.\n", amount);
if (amount <= 0)
getsect(start.sct_x, start.sct_y, §);
}
- if (putvar(vtype, amount + amt_dst, (s_char *)§, EF_SECTOR) < 0) {
- pr("No more room in %s.\n",
- xyas(sect.sct_x, sect.sct_y, player->cnum));
- return RET_OK;
- }
+ sect.sct_item[vtype] = amount + amt_dst;
/*
* Now add commodities to destination sector,
* along with plague that came along for the ride.
pr("Sector %s is now yours.\n",
xyas(sect.sct_x, sect.sct_y, player->cnum));
if (opt_MOB_ACCESS) {
- time(§.sct_access);
+ game_tick_to_now(§.sct_access);
sect.sct_mobil = -(etu_per_update / sect_mob_neg_factor);
} else {
sect.sct_mobil = 0;
}
}
- if (infected && getvar(V_PSTAGE, (s_char *)§, EF_SECTOR) == 0)
- putvar(V_PSTAGE, PLG_EXPOSED, (s_char *)§, EF_SECTOR);
- if (vtype == V_CIVIL) {
- if (opt_NEW_WORK) {
- sect.sct_loyal = ((amt_dst * sect.sct_loyal) +
- (amount * loyal)) / (amt_dst + amount);
- sect.sct_work = ((amt_dst * sect.sct_work) +
- (amount * work)) / (amt_dst + amount);
- } else { /* ! NEW_WORK */
-
- /* It only takes one bad apple... */
- if (sect.sct_loyal < loyal)
- sect.sct_loyal = loyal;
- if (sect.sct_work > work)
- sect.sct_work = work;
- } /* end NEW_WORK */
+ if (infected && sect.sct_pstage == PLG_HEALTHY)
+ sect.sct_pstage = PLG_EXPOSED;
+ if (vtype == I_CIVIL) {
+ sect.sct_loyal
+ = (amt_dst * sect.sct_loyal + amount * loyal) / (amt_dst + amount);
+ sect.sct_work
+ = (amt_dst * sect.sct_work + amount * work) / (amt_dst + amount);
}
putsect(§);
+ getsect(start.sct_x, start.sct_y, &start);
+ start.sct_flags &= ~MOVE_IN_PROGRESS;
+ putsect(&start);
return RET_OK;
}
/*ARGSUSED*/
static int
-explore_map(s_char *what, coord curx, coord cury, s_char *arg)
+explore_map(coord curx, coord cury, char *arg)
{
struct nstr_sect ns;
- struct natstr *np;
struct sctstr sect;
- coord rel_x, rel_y;
- s_char range[128];
- s_char view[7];
+ char view[7];
int i;
int changed = 0;
- np = getnatp(player->cnum);
- rel_x = xrel(np, curx);
- rel_y = yrel(np, cury);
- sprintf(range, "%d:%d,%d:%d", rel_x - 2, rel_x + 2, rel_y - 1,
- rel_y + 1);
- if (!snxtsct(&ns, range))
- return RET_FAIL;
+ snxtsct_dist(&ns, curx, cury, 1);
i = 0;
while (i < 7 && nxtsct(&ns, §)) {
+ /* Nasty: this relies on the iteration order */
view[i] = dchr[sect.sct_type].d_mnem;
switch (sect.sct_type) {
case SCT_WATER:
projects / empserver / blobdiff