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

Comparing deliantra/server/server/freezethaw.C (file contents):
Revision 1.38 by root, Thu Apr 15 04:56:47 2010 UTC vs.
Revision 1.39 by root, Thu Apr 15 06:05:52 2010 UTC

 }
 #endif
 static const char thawer_eof[] = "\n\n\n\0\0\0";
+bool object_thawer::errors_are_fatal = true;
 object_thawer::object_thawer (const char *path)
 : name (strdup (path))
 {
   av      = 0;
   text    = 0;
   resolve_delayed_derefs (false);
   free ((void *)name);
 }
+static void
+error_out ()
+{
+  if (object_thawer::errors_are_fatal)
+    {
+      LOG (llevError, "(parse errors at this time are fatal, exiting)");
+      exit (1);
+    }
+}
 void
 object_thawer::parse_warn (const char *msg)
 {
   LOG (llevWarn, "%s:%d, \"%s %s\": %s\n",
        this->name, linenum,
   switch (kw)
     {
       case KW_EOF:
         LOG (llevError, "%s:%d end of file while reading %s '%s', aborting load.\n",
              this->name, linenum, type, name);
+        error_out ();
         return false;
       case KW_ERROR:
         LOG (llevError, "%s:%d error while reading %s '%s', at '%s', aborting load.\n",
              this->name, linenum,
              type, name,
              kw_str ? kw_str : "<file load>");
+        error_out ();
         return false;
       default:
         LOG (llevError, "%s:%d unexpected line (%s %s) while reading %s '%s', %s.\n",
              this->name, linenum,
              kw_str ? kw_str : "<null>",
              value  ? value  : "<null>",
              type, name,
              skip ? "skipping line" : "aborting load");
+        error_out ();
         return skip;
     }
 }
 void

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