/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2008, 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.
*
* ---
*
* Ken Stevens, 1995
*/
-#include <math.h>
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "sect.h"
-#include "path.h"
-#include "news.h"
-#include "treaty.h"
-#include "nat.h"
-#include "xy.h"
-#include "land.h"
-#include "nsc.h"
-#include "mission.h"
-#include "ship.h"
+#include <config.h>
+
#include "combat.h"
#include "commands.h"
+#include "land.h"
+#include "path.h"
+#include "ship.h"
static double units_in_sector(struct combat *def);
static void stre_hdr(void);
else
pr("%7s", "");
- r_total = att_reacting_units(def, 0, 0, &dummy, 9999999);
+ if (def->sct_type != SCT_MOUNT)
+ r_total = att_reacting_units(def, 0, 0, &dummy, 9999999);
+ else
+ r_total = 0.0;
def->own = 0;
eff = att_combat_eff(def);
if (sect.sct_own == sect.sct_oldown || player->god) {
pr("%7d", sect.sct_mines);
else
pr("%7s", "");
- eff *= (1.0 + min(sect.sct_mines, 20) * 0.02);
+ eff *= (1.0 + MIN(sect.sct_mines, 20) * 0.02);
} else {
pr("%7s", "?");
}
else
pr(" %9s", "");
pr("%9d\n", (int)((dtotal + def->mil + r_total) * eff));
+ /*
+ * This command is quite compute intensive. Yield the
+ * processor after every sector, to keep the game responsive
+ * for other players.
+ */
+ empth_yield();
}
if (!nsect) {
if (player->argp[1])
struct lndstr land;
snxtitem_xy(&ni, EF_LAND, def->x, def->y);
- while (nxtitem(&ni, (s_char *)&land)) {
+ while (nxtitem(&ni, &land)) {
if (land.lnd_own == 0)
continue;
if (land.lnd_own != def->own)