License upgrade to GPL version 3 or later

[empserver] / src / lib / subs / lostsub.c

diff --git a/src/lib/subs/lostsub.c b/src/lib/subs/lostsub.c
index 07ae55448a06a93aed36239143694db1c2f9fde5..0b794b26d2eb1177e7d20218575dbe1b038f0977 100644 (file)
--- a/src/lib/subs/lostsub.c
+++ b/src/lib/subs/lostsub.c
@@ -1,11 +1,11 @@
 /*
  *  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-2011, 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,
@@ -14,8 +14,7 @@
  *  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/>.
  *
  *  ---
  *
@@ -26,20 +25,37 @@
  *  ---
  *
  *  lostsub.c: Subroutines for lost items
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1997
+ *     Markus Armbruster, 2008
  */
 
 #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.
+ */
 void
-makelost(short type, natid owner, short id, coord x, coord y)
+lost_and_found(int type, natid exown, natid own, int id, coord x, coord y)
+{
+    if (exown == own)
+       return;
+    if (exown)
+       makelost(type, exown, id, x, y);
+    if (own)
+       makenotlost(type, own, id, x, y);
+}
+
+void
+makelost(int type, natid owner, int id, coord x, coord y)
 {
     struct loststr lost;
     int n;
@@ -51,12 +67,11 @@ makelost(short type, natid owner, short id, coord x, coord y)
     lost.lost_id = id;
     lost.lost_x = x;
     lost.lost_y = y;
-    time(&lost.lost_timestamp);
     putlost(n, &lost);
 }
 
 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;
@@ -66,7 +81,6 @@ makenotlost(short type, natid owner, short id, coord x, coord y)
        return;
     getlost(n, &lost);
     lost.lost_owner = 0;
-    lost.lost_timestamp = 0;
     putlost(n, &lost);
 }
 
@@ -78,7 +92,7 @@ makenotlost(short type, natid owner, short id, coord x, coord y)
  * 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;
@@ -105,3 +119,20 @@ findlost(short type, natid owner, short id, coord x, coord y, int free)
 
     return -1;
 }
+
+void
+delete_old_lostitems(void)
+{
+    time_t expiry_time = time(NULL) - hours(lost_keep_hours);
+    struct loststr lost;
+    int i;
+
+    for (i = 0; getlost(i, &lost); i++) {
+       if (!lost.lost_owner)
+           continue;
+       if (lost.lost_timestamp >= expiry_time)
+           continue;
+       lost.lost_owner = 0;
+       putlost(i, &lost);
+    }
+}