Update copyright notice

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

diff --git a/src/lib/subs/check.c b/src/lib/subs/check.c
index dfffad82b5d28dc94d461c1a4b949ca79d3ef3cc..25e2493abaaf75bcfff29f7b2411d18d4f9d9514 100644 (file)
--- a/src/lib/subs/check.c
+++ b/src/lib/subs/check.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Steve McClure, 1998
- *     Markus Armbruster, 2004-2012
+ *     Markus Armbruster, 2004-2014
  */
 
 #include <config.h>
@@ -36,29 +36,19 @@
 #include <ctype.h>
 #include "commodity.h"
 #include "empobj.h"
-#include "file.h"
 #include "player.h"
 #include "prototypes.h"
 #include "xy.h"
 
-/* Note that timestamps make things tricky.  And, we don't
- * really care about the timestamp, we just care about the rest
- * of the structure.  So, we make a copy, and zero the timestamps
- * in both copies, and then compare. */
-
 static int
 obj_changed(struct empobj *obj)
 {
-    union empobj_storage old, tobj;
-    size_t sz;
+    union empobj_storage old;
 
     if (!get_empobj(obj->ef_type, obj->uid, &old))
        return 0;
-    sz = empfile[obj->ef_type].size;
-    memcpy(&tobj, obj, sz);
-    old.gen.timestamp = tobj.gen.timestamp = 0;
-    old.gen.generation = tobj.gen.generation = 0;
-    if (memcmp(&tobj, &old, sz))
+    if (!ef_typedstr_eq((struct ef_typedstr *)&old,
+                       (struct ef_typedstr *)obj))
        return 1;
     ef_mark_fresh(obj->ef_type, obj);
     return 0;