[ViewVC] Diff of: cvs/deliantra/server/common/material.C

Comparing deliantra/server/common/material.C (file contents):
Revision 1.10 by root, Fri Mar 26 01:04:44 2010 UTC vs.
Revision 1.13 by root, Wed Apr 28 19:49:50 2010 UTC

 //-GPL
 void
 load_materials ()
 {
-  char filename[MAX_BUF];
-  sprintf (filename, "%s/materials", settings.datadir);
-  LOG (llevDebug, "Reading material type data from %s...\n", filename);
   //TODO: somehow free old materials, or update them in-place
+  // currently we effectively leak them.
   material_null.next = 0; materialt = &material_null;
-  object_thawer thawer (filename);
+  object_thawer thawer (settings.datadir, "materials");
   if (!thawer)
     {
-      LOG (llevError, "Cannot open %s for reading\n", filename);
+      LOG (llevError, "Cannot open %s for reading\n", thawer.name);
       goto done;
     }
   while (thawer.kw != KW_name)
     {
           case KW_EOF:
             goto done;
           default:
-            if (!thawer.parse_error ("materials file", "materials"))
+            if (!thawer.parse_error ("materials file"))
               goto done;
             break;
         }
       thawer.next ();

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines