merge failure, try again.

src/kernel/version.h

@@ -1,21 +1,61 @@
+/* vi: set ts=2:
+ +-------------------+  
+ |                   |  Enno Rehling <enno@eressea.de>
+ | Eressea PBEM host |  Katja Zedel <katze@felidae.kn-bremen.de>
+ | (c) 1998 - 2007   |  Christian Schlittchen <corwin@amber.kn-bremen.de>
+ |                   |
+ +-------------------+
+
+ This program may not be used, modified or distributed 
+ without prior permission by the authors of Eressea.
+ 
+ */
+
+/* changes from->to: 72->73: struct unit::lock entfernt.
+ * 73->74: struct unit::flags eingeführt.
+ * 74->75: parteitarnung als flag.
+ * 75->76: #ifdef NEW_HP: hp
+ * 76->77: ship->damage
+ * 77->78: neue Message-Option "Orkvermehrung" (MAX_MSG +1)
+ * 78->79: showdata nicht mehr speichern
+ * 79->HEX_VERSION: hex
+ * 80->82: ATTRIB_VERSION
+ * 90: Ebenen
+ * 92: Magiegebiet-Auswahl f->magiegebiet
+ * 94: f->attribs wird gespeichert
+ * 100: NEWMAGIC, neue Message-Option "Zauber" (MAX_MSG +1)
+ * 108: Speichern von Timeouts
+ * 193: curse bekommen id aus struct unit-nummernraum
+ */
+
 /*
-Copyright (c) 1998-2014, Enno Rehling <enno@eressea.de>
-Katja Zedel <katze@felidae.kn-bremen.de
-Christian Schlittchen <corwin@amber.kn-bremen.de>
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-**/
-
+#define HEX_VERSION 81
+#define GROWTREE_VERSION 305
+#define RANDOMIZED_RESOURCES_VERSION 306
+#define NEWRACE_VERSION 307
+#define INTERIM_VERSION 309
+#define NEWSKILL_VERSION 309
+#define WATCHERS_VERSION 310
+#define OVERRIDE_VERSION 311
+*/
+#define CURSETYPE_VERSION 312   /* turn 287 */
+#define ALLIANCES_VERSION 313
+#define DBLINK_VERSION 314
+#define CURSEVIGOURISFLOAT_VERSION 315
+#define SAVEXMLNAME_VERSION 316
+#define SAVEALLIANCE_VERSION 317
+#define CLAIM_VERSION 318
+/* 319 is the HSE4 data version */
+#define BACTION_VERSION 319     /* building action gets a param string */
+#define NOLASTORDER_VERSION 320 /* do not use lastorder */
+#define SPELLNAME_VERSION 321   /* reference spells by name */
+#define TERRAIN_VERSION 322     /* terrains are a full type and saved by name */
+#define REGIONITEMS_VERSION 323 /* regions have items */
+#define ATTRIBREAD_VERSION 324  /* remove a_readint */
+#define CURSEFLAGS_VERSION 325  /* remove a_readint */
+#define UNICODE_VERSION 326     /* 2007-06-27 everything is stored as UTF8 */
+#define UID_VERSION 327         /* regions have a unique id */
+#define STORAGE_VERSION 328     /* with storage.h, some things are stored smarter (ids as base36, fractions as float) */
 #define INTPAK_VERSION 329      /* in binary, ints can get packed */
 #define NOZEROIDS_VERSION 330   /* 2008-05-16 zero is not a valid ID for anything (including factions) */
 #define NOBORDERATTRIBS_VERSION 331     /* 2008-05-17 connection::attribs has been moved to userdata */
@@ -34,7 +74,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #define SAVEGAMEID_VERSION 343 /* instead of XMLNAME, save the game.id parameter from the config */
 #define BUILDNO_VERSION 344 /* storing the build number in the save */
 #define AUTO_RACENAME_VERSION 345 /* NPC units with name==NULL will automatically get their race for a name */
-
 #define MIN_VERSION INTPAK_VERSION      /* minimal datafile we support */
 #define RELEASE_VERSION AUTO_RACENAME_VERSION /* current datafile */