/*
* 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-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/>.
*
* ---
*
#include "combat.h"
#include "commands.h"
-#include "land.h"
-#include "mission.h"
#include "path.h"
#include "ship.h"
int last, n;
char *p;
char buf[1024];
- int rel;
att_combat_init(def, EF_SECTOR);
/*
return RET_SYN;
if (!sarg_xy(p, &def->x, &def->y))
return RET_SYN;
- if (att_abort(A_ATTACK, 0, def))
+ if (att_abort(A_ATTACK, NULL, def))
return RET_FAIL;
/* Show what we're attacking, and check treaties */
/* Ask about offensive support */
att_ask_support(2, &fort_sup, &ship_sup, &land_sup, &plane_sup);
- if (att_abort(A_ATTACK, 0, def)) {
+ if (att_abort(A_ATTACK, NULL, def)) {
att_empty_attack(A_ATTACK, 0, def);
return RET_OK;
}
newx = def->x + diroff[n + 1][0];
newy = def->y + diroff[n + 1][1];
getsect(newx, newy, §); /* incase cross world boundary */
- rel = getrel(getnatp(sect.sct_own), player->cnum);
- if (!player->owner && rel != ALLIED)
+ if (!player->owner
+ && relations_with(sect.sct_own, player->cnum) != ALLIED)
continue;
att_combat_init(&off[++last], EF_SECTOR);
off[last].x = sect.sct_x;
if (att_abort(A_ATTACK, off, def)) {
pr("Attack aborted\n");
att_empty_attack(A_ATTACK, 0, def);
- return att_free_lists(&olist, 0);
+ return att_free_lists(&olist, NULL);
}
ototal = att_get_offense(A_ATTACK, off, &olist, def);
if (att_abort(A_ATTACK, off, def)) {
pr("Attack aborted\n");
att_empty_attack(A_ATTACK, 0, def);
- return att_free_lists(&olist, 0);
+ return att_free_lists(&olist, NULL);
}
/*