/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire 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
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
* ---
*
* powe.c: Do a power report
- *
+ *
* Known contributors to this file:
* Dave Pare
* Ken Stevens, 1995
* Steve McClure, 1998-2000
- * Markus Armbruster, 2006
+ * Markus Armbruster, 2004-2013
+ * Ron Koenderink, 2005-2008
*/
#include <config.h>
if (player->argp[i]) {
if (player->argp[i][0] == 'c') {
- snxtitem(&ni, EF_NATION, player->argp[i + 1]);
+ if (!snxtitem(&ni, EF_NATION, player->argp[i + 1], NULL))
+ return RET_SYN;
while (nxtitem(&ni, &nat)) {
- if (nat.nat_stat != STAT_ACTIVE)
+ if (nat.nat_stat == STAT_UNUSED)
+ continue;
+ if (!player->god && nat.nat_stat != STAT_ACTIVE)
continue;
targets[nat.nat_cnum] = 1;
}
pow->p_power += pow->p_sects
* (pow->p_effic / pow->p_sects / 100.0)
* 10.0;
- pow->p_power *= MAX(1.0, natp->nat_level[NAT_TLEV] / 500.0);
+ pow->p_power *= MAX(1.0, natp->nat_level[NAT_TLEV]) / 500.0;
/* ack. add this vec to the "world power" element */
f_pt2 = &powbuf[0].p_sects;
f_ptr = &pow->p_sects;
return;
for (i = 0; i < MAXNOC; i++)
putpower(i, &powbuf[i]);
+#ifdef _WIN32
/*
- * At least some versions of Windows fail to update st_mtime on
- * write(), the st_mtime is not until the file is written to the
- * disk. Bad, because `power' displays that time.
- * Force a sync to ensure the st_time is correct.
+ * At least some versions of Windows fail to update mtime on
+ * write(), they delay it until the write actually hits the disk.
+ * Bad, because `power' displays that time. Force it.
*/
- fsync(empfile[EF_POWER].fd);
+ _commit(empfile[EF_POWER].fd);
+#endif
}
static int
return -1;
if (p1->p_power < p2->p_power)
return 1;
- return 0;
+ return p1->p_nation - p2->p_nation;
}
static void