/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2016, 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/>.
*
* ---
*
* ---
*
* assa.c: Hit the beaches!
- *
+ *
* Known contributors to this file:
* Ken Stevens, 1995
* Steve McClure, 1997
#include <config.h>
+#include "chance.h"
#include "combat.h"
#include "commands.h"
-#include "mission.h"
-#include "path.h"
#include "empobj.h"
#include "unit.h"
return RET_SYN;
if (!sarg_xy(p, &def->x, &def->y))
return RET_SYN;
- if (att_abort(A_ASSAULT, 0, def))
+ if (att_abort(A_ASSAULT, NULL, def))
return RET_FAIL;
/*
return RET_OK;
}
- /* Show what we're assaulting, and check treaties */
-
- if (att_show(def))
- return RET_FAIL;
+ /* Show what we're assaulting */
+ att_show(def);
/* Ask about offensive support */
if (att_abort(A_ASSAULT, off, def)) {
pr("Assault aborted\n");
att_empty_attack(A_ASSAULT, 0, def);
- return att_free_lists(&olist, 0);
+ return att_free_lists(&olist, NULL);
}
/* If we're assaulting our own sector, end here */
if (att_abort(A_ASSAULT, off, def)) {
pr("Assault aborted\n");
att_empty_attack(A_ASSAULT, 0, def);
- return att_free_lists(&olist, 0);
+ return att_free_lists(&olist, NULL);
}
/*
for (qp = olist.q_forw; qp != &olist; qp = next) {
next = qp->q_forw;
llp = (struct ulist *)qp;
- rel = getrel(getnatp(def->own), player->cnum);
+ rel = relations_with(def->own, player->cnum);
if (chance(0.10) || rel == ALLIED || !def->own) {
pr("%s made it on shore safely.\n", prland(&llp->unit.land));
llp->unit.land.lnd_x = def->x;
putland(llp->unit.land.lnd_uid, &llp->unit.land);
} else {
pr("%s was spotted", prland(&llp->unit.land));
- if (rel == HOSTILE || rel == AT_WAR || rel == SITZKRIEG ||
- rel == MOBILIZATION) {
+ if (rel <= HOSTILE) {
wu(0, def->own, "%s spy shot and killed in %s.\n",
cname(player->cnum), xyas(def->x, def->y,
def->own));
pr(" and was killed in the attempt.\n");
llp->unit.land.lnd_effic = 0;
putland(llp->unit.land.lnd_uid, &llp->unit.land);
- lnd_delete(llp, "");
+ lnd_put_one(llp);
} else {
wu(0, def->own, "%s spy spotted in %s.\n",
cname(player->cnum), xyas(def->x, def->y,