--- deliantra/server/common/exp.C	2010/04/11 00:34:05	1.29
+++ deliantra/server/common/exp.C	2010/04/15 04:56:46	1.30
@@ -25,7 +25,7 @@
 #include <stdio.h>
 #include <global.h>
 
-sint64 *levels;
+sint64 levels[MAXNUMLEVELS];
 
 static float exp_att_mult[NROFATTACKS + 2] = {
   0.0,                          /* AT_PHYSICAL  */
@@ -136,6 +136,26 @@
   return exp;
 }
 
+//TODO: binary search...
+int
+exp_to_level (sint64 exp)
+{
+  for (int i = 1; i <= settings.max_level; i++)
+    if (levels [i] > exp)
+      return i - 1;
+
+  return settings.max_level;
+}
+
+sint64
+level_to_min_exp (int level)
+{
+  if (level <= 0)
+    return 0;
+  else
+    return levels [min (level, settings.max_level)];
+}
+
 /* This loads the experience table from the exp_table
  * file.  This tends to exit on any errors, since it
  * populates the table as it goes along, so if there
@@ -148,85 +168,58 @@
   char buf[MAX_BUF], *cp;
   int lastlevel = 0, comp;
   sint64 lastexp = -1, tmpexp;
-  FILE *fp;
 
   sprintf (buf, "%s/exp_table", settings.confdir);
 
-  if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
+  object_thawer thawer (buf);
+
+  if (!thawer)
     {
+      LOG (llevError, "unable to parse experience table file");
       return;
     }
-  while (fgets (buf, MAX_BUF - 1, fp) != NULL)
+
+  if (thawer.kw != KW_max_level)
     {
-      if (buf[0] == '#')
-        continue;
+      thawer.parse_error ("experience table file", "max_level");
+      return;
+    }
 
-      /* eliminate newline */
-      if ((cp = strrchr (buf, '\n')) != NULL)
-        *cp = '\0';
-
-      /* Skip over empty lines */
-      if (buf[0] == 0)
-        continue;
-      cp = buf;
-      while (isspace (*cp) && *cp != 0)
-        cp++;
-      if (!strncasecmp (cp, "max_level", 9))
+  thawer.get (settings.max_level);
+
+  sint64 newlevels [MAXNUMLEVELS];
+
+  while (thawer.next_line ())
+    {
+      thawer.get (tmpexp);
+
+      /* Do some sanity checking - if value is bogus, just exit because
+       * the table otherwise is probably in an inconsistent state
+       */
+      if (tmpexp <= lastexp)
         {
-          if (settings.max_level)
-            {
-              LOG (llevDebug, "Got more than one max_level value from exp_table file?\n");
-              free (levels);
-            }
-          settings.max_level = atoi (cp + 9);
-          if (!settings.max_level)
-            {
-              LOG (llevDebug, "Got invalid max_level from exp_table file? %s\n", buf);
-            }
-          else
-            {
-              levels = (sint64 *) calloc (settings.max_level + 1, sizeof (sint64));
-            }
+          LOG (llevError, "Experience for level %d is lower than previous level (%" PRId64 " <= %" PRId64 ")\n", lastlevel + 1, tmpexp, lastexp);
+          return;
         }
-      while (isdigit (*cp) && *cp != 0)
+
+      lastlevel++;
+
+      if (lastlevel > settings.max_level)
         {
-          if (!settings.max_level)
-            {
-              LOG (llevError, "max_level is not set in exp_table file.  Did you remember to update it?\n");
-              exit (1);
-            }
-
-          tmpexp = atoll (cp);
-          /* Do some sanity checking - if value is bogus, just exit because
-           * the table otherwise is probably in an inconsistent state
-           */
-          if (tmpexp <= lastexp)
-            {
-              LOG (llevError, "Experience for level %d is lower than previous level (%" PRId64 " <= %" PRId64 ")\n", lastlevel + 1, tmpexp, lastexp);
-              exit (1);
-            }
-          lastlevel++;
-          if (lastlevel > settings.max_level)
-            {
-              LOG (llevError, "Too many levels specified in table (%d > %d)\n", lastlevel, settings.max_level);
-              exit (1);
-            }
-          levels[lastlevel] = tmpexp;
-          lastexp = tmpexp;
-          /* First, skip over the number we just processed. Then skip over
-           * any spaces, commas, etc.
-           */
-          while (isdigit (*cp) && *cp != 0)
-            cp++;
-          while (!isdigit (*cp) && *cp != 0)
-            cp++;
+          LOG (llevError, "Too many levels specified in table (%d > %d)\n", lastlevel, settings.max_level);
+          exit (1);
         }
+
+      newlevels [lastlevel] = tmpexp;
+      lastexp = tmpexp;
     }
-  close_and_delete (fp, comp);
+
   if (lastlevel != settings.max_level && lastlevel != 0)
     {
       LOG (llevError, "Warning: exp_table does not have %d entries (%d)\n", settings.max_level, lastlevel);
-      exit (1);
+      return;
     }
+
+  memcpy (levels, newlevels, sizeof (levels));
 }