/*
* 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-2017, 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:
* Steve McClure, 1997
- * Markus Armbruster, 2008
+ * Markus Armbruster, 2008-2016
*/
#include <config.h>
-#include "file.h"
#include "lost.h"
#include "misc.h"
#include "optlist.h"
-static int findlost(short, natid, short, coord, coord, int);
+static int findlost(int, natid, int, coord, coord, int);
/*
- * Record item ID of type TYPE changed owner from EXOWN to OWN at X, Y.
+ * Record item @id of @type changed owner from @exown to @own at @x,@y.
*/
void
lost_and_found(int type, natid exown, natid own, int id, coord x, coord y)
}
void
-makelost(short type, natid owner, short id, coord x, coord y)
+makelost(int type, natid owner, int id, coord x, coord y)
{
struct loststr lost;
int n;
+ if (CANT_HAPPEN(!owner))
+ return;
n = findlost(type, owner, id, x, y, 1);
ef_blank(EF_LOST, n, &lost);
lost.lost_type = type;
}
void
-makenotlost(short type, natid owner, short id, coord x, coord y)
+makenotlost(int type, natid owner, int id, coord x, coord y)
{
struct loststr lost;
int n;
+ if (CANT_HAPPEN(!owner))
+ return;
n = findlost(type, owner, id, x, y, 0);
if (n < 0)
return;
/*
* Find a suitable slot in the lost file.
- * If a record for TYPE, OWNER, ID, X, Y exists, return its index.
- * Else if FREE is non-zero, return the index of an unused record.
+ * If a record for @type, @owner, @id, @x, @y exists, return its index.
+ * Else if @free is non-zero, return the index of an unused record.
* Else return -1.
*/
static int
-findlost(short type, natid owner, short id, coord x, coord y, int free)
+findlost(int type, natid owner, int id, coord x, coord y, int free)
{
struct loststr lost;
int n;
if (lost.lost_owner == owner && type == lost.lost_type) {
if (type == EF_SECTOR && lost.lost_x == x && lost.lost_y == y)
return n;
- else if (lost.lost_id == id)
+ if (type != EF_SECTOR && lost.lost_id == id)
return n;
}
}