--- deliantra/server/common/init.C	2009/11/07 18:30:05	1.51
+++ deliantra/server/common/init.C	2010/04/28 19:49:50	1.58
@@ -1,9 +1,9 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
  * 
  * Deliantra is free software: you can redistribute it and/or modify it under
  * the terms of the Affero GNU General Public License as published by the
@@ -74,7 +74,7 @@
   DATADIR,
   LOCALDIR,
   PLAYERDIR, MAPDIR, ARCHETYPES, REGIONS, TREASURES,
-  UNIQUE_DIR, TEMPLATE_DIR,
+  UNIQUE_DIR, "",
   TMPDIR,
   PK_LUCK_PENALTY,
   STAT_LOSS_ON_DEATH,
@@ -137,7 +137,7 @@
  * overwrite these if specified.
  */
 void
-init_environ (void)
+init_environ ()
 {
   const char *cp;
 
@@ -160,26 +160,26 @@
  * Might use environment-variables as default for some of them.
  */
 void
-init_globals (void)
+init_globals ()
 {
   if (settings.logfilename[0] == 0)
-    set_logfd (-1);
+    log_setfd (-1);
   else 
     {
       int logfd = open (settings.logfilename, O_CREAT|O_WRONLY|O_APPEND, 0666);
 
       if (logfd >= 0)
-        set_logfd (logfd);
+        log_setfd (logfd);
       else
         {
-          set_logfd (-1);
+          log_setfd (-1);
           LOG (llevError, "Unable to open %s as the logfile - will use stderr instead", settings.logfilename);
         }
     }
 }
 
 void
-init_dynamic (void)
+init_dynamic ()
 {
   first_map_ext_path = "/start/HallsOfSelection";
   first_map_path = "/HallOfSelection";
@@ -193,103 +193,64 @@
 //attackmess_t attack_mess[NROFATTACKMESS][MAXATTACKMESS];
 
 void
-init_attackmess (void)
+init_attackmess ()
 {
-  char buf[MAX_BUF];
-  char filename[MAX_BUF];
-  char *cp, *p;
-  FILE *fp;
-  static int has_been_done = 0;
-  int msgnum, level, comp;
-  int mode = 0, total = 0;
-
-  if (has_been_done)
-    return;
-  else
-    has_been_done = 1;
-
-  sprintf (filename, "%s/attackmess", settings.datadir);
-  LOG (llevDebug, "Reading attack messages from %s...\n", filename);
-  if ((fp = open_and_uncompress (filename, 0, &comp)) == NULL)
+  object_thawer thawer (settings.datadir, "attackmess");
+
+  if (!thawer)
     {
-      LOG (llevError, "Can't open %s.\n", filename);
+      LOG (llevError, "Can't open %s.\n", thawer.name);
       return;
     }
 
-  level = 0;
-  while (fgets (buf, MAX_BUF, fp) != NULL)
+  int msgnum = -1;
+  int total = 0;
+
+  while (thawer.kw)
     {
-      if (*buf == '#')
-        continue;
+      if (thawer.kw != KW_type)
+        if (!thawer.parse_error ("attackmess file"))
+          break;
 
-      if ((cp = strchr (buf, '\n')) != NULL)
-        *cp = '\0';
+      thawer.get (msgnum);
+      thawer.next ();
 
-      cp = buf;
-      while (*cp == ' ')        /* Skip blanks */
-        cp++;
+      int level = 0;
 
-      if (strncmp (cp, "TYPE:", 5) == 0)
+      while (thawer.kw == KW_hp)
         {
-          p = strtok (buf, ":");
-          p = strtok (NULL, ":");
-
-          if (mode == 1)
-            {
-              attack_mess[msgnum][level].level = -1;
-              attack_mess[msgnum][level].buf1 = NULL;
-              attack_mess[msgnum][level].buf2 = NULL;
-              attack_mess[msgnum][level].buf3 = NULL;
-            }
-
-          level = 0;
-          msgnum = atoi (p);
-          mode = 1;
-        }
-      else if (mode == 1)
-        {
-          p = strtok (buf, "=");
-          attack_mess[msgnum][level].level = atoi (buf);
-          p = strtok (NULL, "=");
-
-          if (p != NULL)
-            attack_mess[msgnum][level].buf1 = strdup (p);
+          // our old friend, dog-slow sscanf
+          int hp;
+          char buf1[1024];
+          char buf2[1024];
+          char buf3[1024];
+
+          if (4 != sscanf (thawer.value_nn, "%d %1023[^|]|%1023[^|]|%1023[^|]",
+                           &hp, buf1, buf2, buf3))
+            thawer.parse_error ("attackmess file");
           else
-            attack_mess[msgnum][level].buf1 = strdup ("");
+            {
+              if (*buf2 == '-')
+                *buf2 = 0; // sscanf can't parse empty fields, so use "-" as marker
 
-          mode = 2;
-        }
-      else if (mode == 2)
-        {
-          p = strtok (buf, "=");
-          attack_mess[msgnum][level].level = atoi (buf);
-          p = strtok (NULL, "=");
+              attack_mess[msgnum][level].level = hp;
+              attack_mess[msgnum][level].buf1  = strdup (buf1);
+              attack_mess[msgnum][level].buf2  = strdup (buf2);
+              attack_mess[msgnum][level].buf3  = strdup (buf3);
 
-          if (p != NULL)
-            attack_mess[msgnum][level].buf2 = strdup (p);
-          else
-            attack_mess[msgnum][level].buf2 = strdup ("");
+              ++level;
+              ++total;
+            }
 
-          mode = 3;
+          thawer.next ();
         }
-      else if (mode == 3)
-        {
-          p = strtok (buf, "=");
-          attack_mess[msgnum][level].level = atoi (buf);
-          p = strtok (NULL, "=");
-
-          if (p != NULL)
-            attack_mess[msgnum][level].buf3 = strdup (p);
-          else
-            attack_mess[msgnum][level].buf3 = strdup ("");
 
-          mode = 1;
-          level++;
-          total++;
-        }
+      attack_mess[msgnum][level].level = -1;
+      attack_mess[msgnum][level].buf1  = 0;
+      attack_mess[msgnum][level].buf2  = 0;
+      attack_mess[msgnum][level].buf3  = 0;
     }
 
   LOG (llevDebug, "got %d messages in %d categories.\n", total, msgnum + 1);
-  close_and_delete (fp, comp);
 }