ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/freezethaw.C
(Generate patch)

Comparing deliantra/server/server/freezethaw.C (file contents):
Revision 1.23 by root, Tue Jul 24 20:06:23 2007 UTC vs.
Revision 1.24 by root, Wed Aug 1 20:07:06 2007 UTC

252 thawer.line = p; 252 thawer.line = p;
253 253
254 return s == q ? 0 : s; 254 return s == q ? 0 : s;
255} 255}
256 256
257void
258object_thawer::parse_warn (const char *msg)
259{
260 LOG (llevWarn, "%s:%d, \"%s %s\": %s\n",
261 this->name, linenum,
262 kw_str ? kw_str : "<null>",
263 value ? value : "<null>",
264 msg);
265}
266
257bool 267bool
258object_thawer::parse_error (const char *type, const char *name, bool skip) 268object_thawer::parse_error (const char *type, const char *name, bool skip)
259{ 269{
260 if (!type) type = "file section"; 270 if (!type) type = "file section";
261 if (!name) name = "generic"; 271 if (!name) name = "generic";
276 286
277 default: 287 default:
278 LOG (llevError, "%s:%d unexpected line (%s %s) while reading %s '%s', %s.\n", 288 LOG (llevError, "%s:%d unexpected line (%s %s) while reading %s '%s', %s.\n",
279 this->name, linenum, 289 this->name, linenum,
280 kw_str ? kw_str : "<null>", 290 kw_str ? kw_str : "<null>",
281 value ? value : "<null>", 291 value ? value : "<null>",
282 type, name, 292 type, name,
283 skip ? "skipping line" : "aborting load"); 293 skip ? "skipping line" : "aborting load");
284 return skip; 294 return skip;
285 } 295 }
286} 296}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines