/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2014, 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:
* Dave Pare, 1986
+ * Markus Armbruster, 2004-2013
*/
#include <config.h>
+#include "chance.h"
#include "lost.h"
#include "update.h"
n = roundavg(etu * 0.125);
if (n == 0)
n = 1;
- n = sp->sct_loyal + (random() % n) + 1;
+ n = sp->sct_loyal + roll(n);
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 - (49 + roll(15));
n = sp->sct_work - work_red;
if (n < 0)
n = 0;
n -= roundavg(etu * 0.25);
else
n += roundavg(etu * 0.125);
- if (n < 0)
- n = 0;
- else if (n > 127)
- n = 127;
- sp->sct_loyal = n;
+ sp->sct_loyal = LIMIT_TO(n, 0, 127);
if (sp->sct_loyal == 0) {
if (sp->sct_oldown != sp->sct_own) {
wu(0, sp->sct_own,