/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2013, 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/>.
*
* ---
*
*
* Known contributors to this file:
* Dave Pare, 1986
+ * Markus Armbruster, 2004-2012
*/
#include <config.h>
-#include "land.h"
+#include "chance.h"
#include "lost.h"
-#include "path.h"
#include "update.h"
void
sp->sct_oldown = sp->sct_own;
}
if (!civ && !mil && !sp->sct_item[I_UW]
- && !has_units(sp->sct_x, sp->sct_y, sp->sct_own, 0)) {
+ && !has_units(sp->sct_x, sp->sct_y, sp->sct_own, NULL)) {
makelost(EF_SECTOR, sp->sct_own, 0, sp->sct_x, sp->sct_y);
sp->sct_own = 0;
sp->sct_oldown = 0;
n = roundavg(etu * 0.125);
if (n == 0)
n = 1;
- n = sp->sct_loyal + (random() % n) + 1;
+ n = sp->sct_loyal + roll0(n) + 1;
if (n > 127)
n = 127;
sp->sct_loyal = n;
if (sp->sct_loyal > 65 && mil < civ / 20) {
int work_red;
- work_red = sp->sct_loyal - (50 + (random() % 15));
+ work_red = sp->sct_loyal - (50 + roll0(15));
n = sp->sct_work - work_red;
if (n < 0)
n = 0;