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

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.80 by root, Sat May 12 16:06:41 2007 UTC vs.
Revision 1.134 by root, Mon Oct 12 14:00:57 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying
27 variable. */
28 24
29#include <global.h> 25#include <global.h>
30#include <loader.h> 26#include <loader.h>
31#include <sproto.h> 27#include <sproto.h>
32 28
33///////////////////////////////////////////////////////////////////////////// 29/////////////////////////////////////////////////////////////////////////////
30
31extern archetype *loading_arch;
34 32
35/* This table is only necessary to convert objects that existed before the 33/* This table is only necessary to convert objects that existed before the
36 * spell object conversion to the new object. It was not practical 34 * spell object conversion to the new object. It was not practical
37 * to go through every mapping looking for every potion, rod, wand, etc 35 * to go through every mapping looking for every potion, rod, wand, etc
38 * that had a sp set and update to the new value. So this maps the 36 * that had a sp set and update to the new value. So this maps the
… …
168 "spell_magic_drain", /* 122 */ 166 "spell_magic_drain", /* 122 */
169 "spell_counterspell", /* 123 */ 167 "spell_counterspell", /* 123 */
170 "spell_disarm", /* 124 */ 168 "spell_disarm", /* 124 */
171 "spell_cure_confusion", /* 125 */ 169 "spell_cure_confusion", /* 125 */
172 "spell_restoration", /* 126 */ 170 "spell_restoration", /* 126 */
173 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 171 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
174 "spell_counterwall", /* 128 */ 172 "spell_counterwall", /* 128 */
175 "spell_cause_light_wounds", /* 129 */ 173 "spell_cause_light_wounds", /* 129 */
176 "spell_cause_medium_wounds", /* 130 */ 174 "spell_cause_medium_wounds", /* 130 */
177 "spell_cause_heavy_wounds", /* 131 */ 175 "spell_cause_heavy_wounds", /* 131 */
178 "spell_charm_monsters", /* 132 */ 176 "spell_charm_monsters", /* 132 */
… …
250 "spell_cause_rabies", /* 204 */ 248 "spell_cause_rabies", /* 204 */
251 "spell_glyph", /* 205 */ 249 "spell_glyph", /* 205 */
252 NULL 250 NULL
253}; 251};
254 252
255extern bool loading_arch;
256
257/* This function checks the object after it has been loaded (when we 253/* This function checks the object after it has been loaded (when we
258 * get the 'end' in the input stream). This function can be used to 254 * get the 'end' in the input stream). This function can be used to
259 * deal with legacy objects where fields may have changed. It can also be used 255 * deal with legacy objects where fields may have changed. It can also be used
260 * to check for objects to make sure there are no common errors. 256 * to check for objects to make sure there are no common errors.
261 */ 257 */
262void 258void
263object::post_load_check () 259object::post_load_check ()
264{ 260{
261 if (type >= NUM_TYPES)
262 {
263 LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ());
264 type = 0;
265 }
266
265 switch (type) 267 switch (type)
266 { 268 {
267 case BOW: 269 case BOW:
268 case WAND: 270 case WAND:
269 case ROD: 271 case ROD:
270 case HORN: 272 case HORN:
271 case SKILL_TOOL:
272 if (slot [body_range].info != -1) 273 if (slot [body_range].info != -1)
273 { 274 {
274 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); 275 LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
275 slot [body_range].info = -1; 276 slot [body_range].info = -1;
276 } 277 }
277 break; 278 break;
278 279
279 case WEAPON: 280 case WEAPON:
280 if (slot [body_combat].info != -1) 281 if (slot [body_combat].info != -1)
281 { 282 {
282 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); 283 LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
283 slot [body_combat].info = -1; 284 slot [body_combat].info = -1;
284 } 285 }
285 break; 286 break;
286 287
287 case SHIELD: 288 case SHIELD:
288 if (slot [body_shield].info != -1) 289 if (slot [body_shield].info != -1)
289 { 290 {
290 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); 291 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
291 slot [body_shield].info = -1; 292 slot [body_shield].info = -1;
292 } 293 }
293 break; 294 break;
294 295
295 case PLAYER: 296 case PLAYER:
296 if (slot [body_shield].info != 1) 297 if (slot [body_shield].info != 1)
297 { 298 {
298 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 299 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
299 slot [body_shield].info = 1; 300 slot [body_shield].info = 1;
300 } 301 }
301 302
302 if (slot [body_combat].info != 1) 303 if (slot [body_combat].info != 1)
303 { 304 {
304 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); 305 LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
305 slot [body_combat].info = 1; 306 slot [body_combat].info = 1;
306 } 307 }
307 308
308 if (slot [body_range].info != 1) 309 if (slot [body_range].info != 1)
309 { 310 {
310 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); 311 LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
311 slot [body_range].info = 1; 312 slot [body_range].info = 1;
312 } 313 }
313 break; 314 break;
314 } 315 }
315 316
… …
320 * also have to catch is if this object is not using the normal name for 321 * also have to catch is if this object is not using the normal name for
321 * the object. In that case, we also want to use the loaded name. 322 * the object. In that case, we also want to use the loaded name.
322 * Otherwise, what happens is that the the plural name will lose 323 * Otherwise, what happens is that the the plural name will lose
323 * information (appear as just 'hearts' and not 'goblins heart') 324 * information (appear as just 'hearts' and not 'goblins heart')
324 */ 325 */
325 if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl) 326 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
326 name_pl = 0; 327 name_pl = 0;
327 328
328 if (!name_pl) 329 if (!name_pl)
329 name_pl = name; 330 name_pl = name;
330 331
… …
338 * not in the ideal fashion. 339 * not in the ideal fashion.
339 */ 340 */
340 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) 341 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
341 { 342 {
342 if (!skill) 343 if (!skill)
343 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); 344 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
344 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || 345 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
345 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 346 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
346 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); 347 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
347 } 348 }
348 349
349 /* We changed last_heal to gen_sp_armour, which is what it 350 /* We changed last_heal to gen_sp_armour, which is what it
350 * really does for many objects. Need to catch any in maps 351 * really does for many objects. Need to catch any in maps
351 * that may have an old value. 352 * that may have an old value.
… …
357 || type == AMULET || type == GIRDLE 358 || type == AMULET || type == GIRDLE
358 || type == BRACERS || type == CLOAK) 359 || type == BRACERS || type == CLOAK)
359 { 360 {
360 if (last_heal) 361 if (last_heal)
361 { 362 {
362 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); 363 LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
363 gen_sp_armour = last_heal; 364 gen_sp_armour = last_heal;
364 last_heal = 0; 365 last_heal = 0;
365 } 366 }
366 367
367 int ip = calc_item_power (this, 0); 368 int ip = calc_item_power (this, 0);
368 369
369 /* Legacy objects from before item power was in the game */ 370 /* Legacy objects from before item power was in the game */
370 if (!item_power && ip) 371 if (!item_power && ip)
371 { 372 {
372 if (ip > 3) 373 if (ip > 3)
373 LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); 374 LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip);
374 375
375 item_power = ip; 376 item_power = ip;
376 } 377 }
377 378
378 /* Check for possibly bogus values. Has to meet both these criteria - 379 /* Check for possibly bogus values. Has to meet both these criteria -
379 * something that has item_power 1 is probably just fine if our calculated 380 * something that has item_power 1 is probably just fine if our calculated
380 * value is 1 or 2 - these values are small enough that hard to be precise. 381 * value is 1 or 2 - these values are small enough that hard to be precise.
381 * similarly, it item_power is 0, the first check will always pass, 382 * similarly, it item_power is 0, the first check will always pass,
382 * but not the second one. 383 * but not the second one.
383 */ 384 */
385#if 0 //TODO
384 if (ip > 2 * item_power && ip > (item_power + 3)) 386 if (ip > 2 * item_power && ip > (item_power + 3))
385 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 387 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
388#endif
386 } 389 }
387 390
388 /* Old spellcasting object - need to load in the appropiate object */ 391 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
389 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 392 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
393 if ((type == ROD
394 || type == WAND
395 || type == SCROLL
396 || type == HORN
397 || type == FIREWALL
390 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 398 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
391 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 399 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
400 && !inv
401 && !loading_arch
402 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
403 // TODO: at least one watchout-comments is redundant - investigate/remove
392 { 404 {
405 // TODO: fix firewall object on map
393 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 406 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
394 * in that spell was stored in sp. 407 * in that spell was stored in sp.
395 */ 408 */
409 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
396 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 410 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
397 insert_ob_in_ob (tmp, this); 411 insert_ob_in_ob (tmp, this);
398 randomitems = NULL; /* So another spell isn't created for this object */ 412 randomitems = 0;
399 } 413 }
400 414
401 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 415 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
402 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 416 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
403 { 417 {
418 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
404 object *tmp = get_archetype_by_object_name (slaying); 419 object *tmp = get_archetype_by_object_name (slaying);
405 insert_ob_in_ob (tmp, this); 420 insert_ob_in_ob (tmp, this);
406 randomitems = NULL; /* So another spell isn't created for this object */ 421 randomitems = 0; /* So another spell isn't created for this object */
407 /* without this, value is all screwed up */ 422 /* without this, value is all screwed up */
408 value = arch->clone.value * inv->value; 423 value = arch->value * inv->value;
409 } 424 }
410 425
411 if (QUERY_FLAG (this, FLAG_MONSTER)) 426 if (QUERY_FLAG (this, FLAG_MONSTER))
412 { 427 {
413 if (stats.hp > stats.maxhp) 428 if (stats.hp > stats.maxhp)
414 { 429 {
415 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 430 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
416 stats.maxhp = stats.hp; 431 stats.maxhp = stats.hp;
417 } 432 }
418 433
419 /* The archs just need to be updated for this */ 434 /* The archs just need to be updated for this */
420 if (move_type == 0) 435 if (move_type == 0)
421 move_type = MOVE_WALK; 436 move_type = MOVE_WALK;
422 } 437 }
423 438
424 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 439 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
425 {
426 /* Object will duplicate it's content as part of the 440 /* Object will duplicate it's content as part of the
427 * generation process. To do this, we must flag inventory 441 * generation process. To do this, we must flag inventory
428 * so it remains unevaluated concerning the randomitems and 442 * so it remains unevaluated concerning the randomitems and
429 * the living (a demonlord shouldn't cast from inside generator!) 443 * the living (a demonlord shouldn't cast from inside generator!)
430 */ 444 */
445 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
431 flag_inv (this, FLAG_IS_A_TEMPLATE); 446 flag_inv (this, FLAG_IS_A_TEMPLATE);
432 }
433 447
434 /* Handle player movers. We use move_type for player movers 448 /* Handle player movers. We use move_type for player movers
435 * because they operate on their own time (move_on 449 * because they operate on their own time (move_on
436 * would potentially cause them to be triggered when someone steps 450 * would potentially cause them to be triggered when someone steps
437 * on them). If move_type is set, presume person knows what they 451 * on them). If move_type is set, presume person knows what they
438 * are doing, otherwise, set move_type based on maxhp value. 452 * are doing, otherwise, set move_type based on maxhp value.
439 */ 453 */
440 if (type == PLAYERMOVER) 454 if (type == PLAYERMOVER)
441 { 455 {
442 if (!move_type) 456 if (!move_type)
… …
447 stats.maxhp = 0; 461 stats.maxhp = 0;
448 } 462 }
449 else 463 else
450 move_type = MOVE_WALK; 464 move_type = MOVE_WALK;
451 } 465 }
466 }
467
468 // if the object has an animation, try to provide a default face
469 if (has_anim ())
470 {
471 const animation &anim_ob = anim ();
472
473 if (anim_speed)
474 // if this item is time-animated, force the last frame
475 animate_object (this, 0);
476 else if (flag [FLAG_MONSTER])
477 // if it is a monster, set appropriate facing
478 animate_object (this, direction);
452 } 479 }
453} 480}
454 481
455static void 482static void
456set_move (MoveType &mt, const char *str) 483set_move (MoveType &mt, const char *str)
… …
504 531
505 goto next; 532 goto next;
506 } 533 }
507 } 534 }
508 535
509 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 536 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
510 537
511next: ; 538next: ;
512 } 539 }
513} 540}
514 541
515#define GET_FLAG(op,flag) \ 542#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
516 if (f.get_sint32 ()) \
517 SET_FLAG (op, flag); \
518 else \
519 CLEAR_FLAG (op, flag) \
520 543
521bool 544bool
522object::parse_kv (object_thawer &f) 545object::parse_kv (object_thawer &f)
523{ 546{
524 object *op_inv = inv; 547 object *op_inv = inv;
548 key_value *last_kv = key_values;
525 549
526 for (;;) 550 for (;;)
527 { 551 {
528 switch (f.kw) 552 switch (f.kw)
529 { 553 {
530 case KW_uuid: 554 case KW_uuid:
531 if (const char *s = f.get_str ()) 555 if (const char *s = f.get_str ())
532 { 556 if (!uuid.parse (s))
533 unsigned int version;
534 unsigned long long seq;
535
536 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
537 { 557 {
538 uuid.seq = seq; 558 f.parse_warn ("unparseable uuid");
539 break; 559 uuid = UUID::gen ();
540 } 560 }
541 }
542
543 uuid = gen_uuid ();
544 break; 561 break;
545 562
546 case KW_oid: 563 case KW_oid:
547 f.get (this, f.get_sint32 ()); 564 f.get (this, f.get_sint32 ());
548 break; 565 break;
… …
554 571
555 case KW_attach: f.get_ornull (attach); break; 572 case KW_attach: f.get_ornull (attach); break;
556 case KW_skill: f.get_ornull (skill); break; 573 case KW_skill: f.get_ornull (skill); break;
557 case KW_race: f.get_ornull (race); break; 574 case KW_race: f.get_ornull (race); break;
558 case KW_slaying: f.get_ornull (slaying); break; 575 case KW_slaying: f.get_ornull (slaying); break;
576 case KW_tag: f.get_ornull (tag); break;
559 577
560 case KW_arch: 578 case KW_arch:
561 {
562 object *tmp = object::read (f); 579 if (object *tmp = object::read (f))
563 tmp->deactivate ();
564
565 { 580 {
581 tmp->deactivate ();
582
566 // was: insert_ob_in_ob (tmp, op); 583 // was: insert_ob_in_ob (tmp, op);
567 // but manually adding it can improve map loading times a lot 584 // but manually adding it can improve map loading times a lot
568 // also, appending instead of prepending keeps the 585 // also, appending instead of prepending keeps the
569 // save ordering the same between repeated load/saves. 586 // save ordering the same between repeated load/saves.
587 // and finally we do not want any funny effects
570 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 588 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
571 CLEAR_FLAG (tmp, FLAG_REMOVED); 589 CLEAR_FLAG (tmp, FLAG_REMOVED);
572 590
573 if (!op_inv) 591 if (!op_inv)
574 { 592 {
… …
586 604
587 tmp->below = 0; 605 tmp->below = 0;
588 tmp->env = this; 606 tmp->env = this;
589 op_inv = tmp; 607 op_inv = tmp;
590 } 608 }
591 } 609 else
610 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
611
592 continue; 612 continue;
593 613
594 case KW_other_arch: 614 case KW_other_arch:
595 other_arch =
596 loading_arch 615 if (loading_arch == this)
597 ? archetype::get (f.get_str ()) 616 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
617 else
618 {
598 : archetype::find (f.get_str ()); 619 other_arch = archetype::find (f.get_str ());
599 620
600 if (!other_arch) 621 if (!other_arch)
601 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 622 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
623 }
624 break;
625
626 case KW_owner:
627 f.delayed_deref (this, owner, f.get_str ());
602 break; 628 break;
603 629
604 case KW_animation: 630 case KW_animation:
605 { 631 {
606 CLEAR_FLAG (this, FLAG_ANIMATE); 632 CLEAR_FLAG (this, FLAG_ANIMATE);
607 animation_id = 0; 633 animation_id = 0;
608 634
609 const char *str = f.get_str (); 635 const char *str = f.get_str ();
610 if (str && (animation_id = find_animation (str))) 636 if (str && (animation_id = find_animation (str)))
611 SET_FLAG (this, FLAG_ANIMATE); 637 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
612 } 638 }
613 break; 639 break;
614 640
615 case KW_last_heal: f.get (last_heal); break; 641 case KW_last_heal: f.get (last_heal); break;
616 case KW_last_sp: f.get (last_sp); break; 642 case KW_last_sp: f.get (last_sp); break;
… …
633 f.get (move_slow_penalty); 659 f.get (move_slow_penalty);
634 break; 660 break;
635 661
636 case KW_face: 662 case KW_face:
637 face = face_find (f.get_str ()); 663 face = face_find (f.get_str ());
664 break;
665
666 case KW_sound:
667 sound = sound_find (f.get_str ());
668 if (!sound)
669 f.parse_warn ("sound not found");
670 break;
671
672 case KW_sound_destroy:
673 sound_destroy = sound_find (f.get_str ());
674 if (!sound_destroy)
675 f.parse_warn ("sound not found");
638 break; 676 break;
639 677
640 case KW_x: f.get (x); break; 678 case KW_x: f.get (x); break;
641 case KW_y: f.get (y); break; 679 case KW_y: f.get (y); break;
642 680
… …
769 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 807 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
770 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 808 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
771 809
772 break; 810 break;
773 811
774 case KW_wiz:
775 GET_FLAG (this, FLAG_WIZ);
776 //TODO: move to check_object
777 if (QUERY_FLAG (this, FLAG_WIZ))
778 {
779 SET_FLAG (this, FLAG_WAS_WIZ);
780 SET_FLAG (this, FLAG_WIZPASS);
781 SET_FLAG (this, FLAG_WIZCAST);
782 }
783 else
784 {
785 CLEAR_FLAG (this, FLAG_WIZPASS);
786 CLEAR_FLAG (this, FLAG_WIZCAST);
787 }
788 break;
789
790 case KW_friendly: 812 case KW_friendly:
791 if (f.get_sint32 ()) 813 if (f.get_bool ())
792 if (type != PLAYER) 814 if (type != PLAYER)
793 add_friendly_object (this); 815 add_friendly_object (this);
794 816
795 break; 817 break;
796 818
… …
809 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 831 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
810 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 832 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
811 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 833 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
812 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 834 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
813 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 835 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
836 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
814 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 837 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
815 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 838 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
816 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 839 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
817 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 840 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
818 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 841 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
825 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 848 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
826 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 849 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
827 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 850 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
828 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 851 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
829 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 852 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
830 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
831 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; 853 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
832 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 854 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
833 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 855 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
834 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 856 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
835 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 857 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
… …
919 case KW_anim_speed: f.get (anim_speed); break; 941 case KW_anim_speed: f.get (anim_speed); break;
920 case KW_container: f.get (weight_limit); break; 942 case KW_container: f.get (weight_limit); break;
921 case KW_will_apply: f.get (will_apply); break; 943 case KW_will_apply: f.get (will_apply); break;
922 case KW_attack_movement: f.get (attack_movement); break; 944 case KW_attack_movement: f.get (attack_movement); break;
923 case KW_move_state: f.get (move_status); break; 945 case KW_move_state: f.get (move_status); break;
924 case KW_expmul: f.get (expmul); break; 946 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
925 case KW_glow_radius: f.get (glow_radius); break; 947 case KW_glow_radius: f.get (glow_radius); break;
926 case KW_weapontype: f.get (weapontype); break; 948 case KW_weapontype: f.get (weapontype); break;
927 case KW_tooltype: f.get (tooltype); break;
928 case KW_casting_time: f.get (casting_time); break; 949 case KW_casting_time: f.get (casting_time); break;
950
951 // elevation is deprecated
929 case KW_elevation: f.get (elevation); break; 952 case KW_elevation: break;
953
930 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 954 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
931 case KW_client_type: f.get (client_type); break; 955 case KW_client_type: f.get (client_type); break;
932 case KW_duration: f.get (duration); break; 956 case KW_duration: f.get (duration); break;
933 case KW_range: f.get (range); break; 957 case KW_range: f.get (range); break;
934 case KW_range_modifier: f.get (range_modifier); break; 958 case KW_range_modifier: f.get (range_modifier); break;
… …
953 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 977 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
954 case KW_can_apply: 978 case KW_can_apply:
955 break; 979 break;
956 980
957 case KW_connected: 981 case KW_connected:
958 add_button_link (this, map, f.get_sint32 ()); 982 {
983 shstr connected;
984
985 f.get (connected);
986 add_link (map, connected);
987 }
959 break; 988 break;
960 989
961 case KW_randomitems: 990 case KW_randomitems:
962 if (f.get_str ()) 991 if (f.get_str ())
963 { 992 {
… …
973 randomitems = 0; 1002 randomitems = 0;
974 break; 1003 break;
975 1004
976 case KW_msg: 1005 case KW_msg:
977 f.get_ml (KW_endmsg, msg); 1006 f.get_ml (KW_endmsg, msg);
978 //TODO: allow longer messages
979 if (strlen (msg) >= HUGE_BUF)
980 {
981 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
982 msg = "ERROR, please report: string too long, winged.\n";
983 }
984 break; 1007 break;
985 1008
986 case KW_lore: 1009 case KW_lore:
987 f.get_ml (KW_endlore, lore); 1010 f.get_ml (KW_endlore, lore);
988 //TODO: allow longer messages
989 /* Just print a warning so we can be reasonably safe
990 * about not overflowing the buffer.
991 */
992 if (strlen (lore) > (HUGE_BUF / 2))
993 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
994 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
995 break; 1011 break;
996 1012
997 case KW_editable: 1013 case KW_editable:
998 case KW_editor_folder: 1014 case KW_editor_folder:
999 break; 1015 break;
… …
1004 1020
1005 f.next (); 1021 f.next ();
1006 return true; 1022 return true;
1007 1023
1008 case KW_ERROR: 1024 case KW_ERROR:
1009 set_ob_key_value (this, f.kw_str, f.value, true); 1025 // append as key value pair (do not use kv_set as it prepends)
1026 // we also do not even try to find old values, duplicate keys stay duplicate
1027 {
1028 key_value *kv = new key_value;
1029
1030 kv->next = 0;
1031 kv->key = shstr (f.kw_str);
1032 kv->value = shstr (f.value);
1033
1034 if (!last_kv)
1035 key_values = last_kv = kv;
1036 else
1037 {
1038 while (last_kv->next)
1039 last_kv = last_kv->next;
1040
1041 last_kv->next = kv;
1042 last_kv = kv;
1043 }
1044 }
1010 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1045 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1011 break; 1046 break;
1012 1047
1013 default: 1048 default:
1014 if (!f.parse_error ("object", name)) 1049 if (!f.parse_error ("object", name))
… …
1035 1070
1036 assert (arch); //D maybe use exception handling of sorts? 1071 assert (arch); //D maybe use exception handling of sorts?
1037 1072
1038 f.next (); 1073 f.next ();
1039 1074
1040 object *op = object::create (); 1075 object *op = arch->instance ();
1041
1042 op->map = map; 1076 op->map = map;
1043 arch->clone.copy_to (op);
1044 // copy_to activates, this should be fixed properly 1077 // instance() activates, this should be fixed properly
1045 op->deactivate (); 1078 op->deactivate ();
1046 1079
1047 if (!op->parse_kv (f)) 1080 if (!op->parse_kv (f))
1048 { 1081 {
1049 op->destroy (true); 1082 op->destroy ();
1050 return 0; 1083 return 0;
1051 } 1084 }
1052 1085
1053 op->post_load_check (); 1086 op->post_load_check ();
1054 return op; 1087 return op;
… …
1063int 1096int
1064set_variable (object *op, char *buf) 1097set_variable (object *op, char *buf)
1065{ 1098{
1066 object_thawer f (buf, (AV *)0); 1099 object_thawer f (buf, (AV *)0);
1067 1100
1068 f.next ();
1069 return op->parse_kv (f); 1101 return op->parse_kv (f);
1070} 1102}
1071 1103
1072/* This returns a string of the integer movement type */ 1104/* This returns a string of the integer movement type */
1073#if 0 1105#if 0
… …
1135 * the 15'th element of this array should match that name. 1167 * the 15'th element of this array should match that name.
1136 * If an entry is NULL, that is a flag not to loaded/saved. 1168 * If an entry is NULL, that is a flag not to loaded/saved.
1137 */ 1169 */
1138 static const keyword flag_names [NUM_FLAGS] = { 1170 static const keyword flag_names [NUM_FLAGS] = {
1139 KW_alive, 1171 KW_alive,
1140 KW_wiz,
1141 KW_NULL, 1172 KW_NULL,
1142 KW_NULL, 1173 KW_NULL,
1143 KW_was_wiz, 1174 KW_NULL,
1175 KW_NULL,
1144 KW_applied, 1176 KW_applied,
1145 KW_unpaid, 1177 KW_unpaid,
1146 KW_can_use_shield, 1178 KW_can_use_shield,
1147 KW_no_pick, 1179 KW_no_pick,
1148 KW_NULL, // walk_on 1180 KW_NULL, // walk_on
… …
1260 /* 110 */ 1292 /* 110 */
1261 KW_destroy_on_death, 1293 KW_destroy_on_death,
1262 KW_NULL, 1294 KW_NULL,
1263 }; 1295 };
1264 1296
1265 int i;
1266
1267 /* This saves the key/value lists. We do it first so that any 1297 /* This saves the key/value lists. We do it first so that any
1268 * keys that match field names will be overwritten by the loader. 1298 * keys that match field names will be overwritten by the loader.
1269 */ 1299 */
1270 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1300 for (key_value *kv = op->key_values; kv; kv = kv->next)
1271 { 1301 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1272 /* Find the field in the opposing member. */ 1302 f.put (kv->key, kv->value);
1273 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1274
1275 /* If there's no partnering field, or it's got a different value, save our field. */
1276 if (!arch_field || my_field->value != arch_field->value)
1277 f.put (my_field->key, my_field->value);
1278 }
1279 1303
1280 /* We don't need to worry about the arch's extra fields - they 1304 /* We don't need to worry about the arch's extra fields - they
1281 * will get taken care of the copy_to method. 1305 * will get taken care of the copy_to method.
1282 */ 1306 */
1283 1307
1284 { 1308 if (op->uuid)
1285 char uids[64]; 1309 f.put (KW_uuid, op->uuid.c_str ());
1286 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1287 f.put (KW_uuid, (const char *)uids);
1288 }
1289 1310
1290#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1311#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1291#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1312#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1313
1314 if (object *owner = op->owner)
1315 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1292 1316
1293 CMP_OUT (name); 1317 CMP_OUT (name);
1294 CMP_OUT (name_pl); 1318 CMP_OUT (name_pl);
1295 CMP_OUT (custom_name); 1319 CMP_OUT (custom_name);
1296 CMP_OUT (title); 1320 CMP_OUT (title);
1297 CMP_OUT (race); 1321 CMP_OUT (race);
1322 CMP_OUT (skill);
1298 CMP_OUT (slaying); 1323 CMP_OUT (slaying);
1299 1324 CMP_OUT (tag);
1300 if (op->msg != tmp->msg)
1301 f.put (KW_msg, KW_endmsg, op->msg);
1302 if (op->lore != tmp->lore)
1303 f.put (KW_lore, KW_endlore, op->lore);
1304
1305 CMP_OUT (other_arch); 1325 CMP_OUT (other_arch);
1306 1326
1327 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1328 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1329
1307 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1330 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1331 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1332 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1308 1333
1309 if (op->animation_id != tmp->animation_id) 1334 if (op->animation_id != tmp->animation_id)
1310 if (op->animation_id) 1335 if (op->has_anim ())
1336 f.put (KW_animation, op->anim ().name);
1337 else
1311 { 1338 {
1312 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1339 f.put (KW_animation, (const char *)0);
1313 1340 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1314 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1315 f.put (KW_is_animated, (sint32) 0);
1316 } 1341 }
1317 else
1318 f.put (KW_animation, (const char *) 0);
1319 1342
1320 CMP_OUT2 (str, stats.Str); 1343 CMP_OUT2 (str, stats.Str);
1321 CMP_OUT2 (dex, stats.Dex); 1344 CMP_OUT2 (dex, stats.Dex);
1322 CMP_OUT2 (con, stats.Con); 1345 CMP_OUT2 (con, stats.Con);
1323 CMP_OUT2 (wis, stats.Wis); 1346 CMP_OUT2 (wis, stats.Wis);
… …
1353 CMP_OUT (direction); 1376 CMP_OUT (direction);
1354 CMP_OUT (type); 1377 CMP_OUT (type);
1355 CMP_OUT (subtype); 1378 CMP_OUT (subtype);
1356 CMP_OUT (attacktype); 1379 CMP_OUT (attacktype);
1357 1380
1358 for (i = 0; i < NROFATTACKS; i++) 1381 for (int i = 0; i < NROFATTACKS; i++)
1359 if (op->resist[i] != tmp->resist[i]) 1382 if (expect_false (op->resist[i] != tmp->resist[i]))
1360 f.put (resist_save[i], op->resist[i]); 1383 f.put (resist_save[i], op->resist[i]);
1361 1384
1362 CMP_OUT (path_attuned); 1385 CMP_OUT (path_attuned);
1363 CMP_OUT (path_repelled); 1386 CMP_OUT (path_repelled);
1364 CMP_OUT (path_denied); 1387 CMP_OUT (path_denied);
… …
1374 CMP_OUT (last_sp); 1397 CMP_OUT (last_sp);
1375 CMP_OUT (last_grace); 1398 CMP_OUT (last_grace);
1376 CMP_OUT (last_eat); 1399 CMP_OUT (last_eat);
1377 CMP_OUT (glow_radius); 1400 CMP_OUT (glow_radius);
1378 1401
1379 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1402 if (op->flag [FLAG_IS_LINKED])
1403 if (auto (ol, op->find_link ()))
1380 f.put (KW_connected, i); 1404 f.put (KW_connected, ol->id);
1381 1405
1382 CMP_OUT (randomitems); 1406 CMP_OUT (randomitems);
1383 CMP_OUT2 (container, weight_limit); 1407 CMP_OUT2 (container, weight_limit);
1384 1408
1385 CMP_OUT (run_away); 1409 CMP_OUT (run_away);
1386 CMP_OUT (pick_up); 1410 CMP_OUT (pick_up);
1387 CMP_OUT (will_apply); 1411 CMP_OUT (will_apply);
1388 CMP_OUT (smoothlevel); 1412 CMP_OUT (smoothlevel);
1389 CMP_OUT (weapontype); 1413 CMP_OUT (weapontype);
1390 CMP_OUT (tooltype);
1391 CMP_OUT (elevation);
1392 CMP_OUT (client_type); 1414 CMP_OUT (client_type);
1393 CMP_OUT (item_power); 1415 CMP_OUT (item_power);
1394 CMP_OUT (duration); 1416 CMP_OUT (duration);
1395 CMP_OUT (range); 1417 CMP_OUT (range);
1396 CMP_OUT (range_modifier); 1418 CMP_OUT (range_modifier);
… …
1405 CMP_OUT (move_off); 1427 CMP_OUT (move_off);
1406 CMP_OUT (move_slow); 1428 CMP_OUT (move_slow);
1407 CMP_OUT (move_slow_penalty); 1429 CMP_OUT (move_slow_penalty);
1408 1430
1409 if (op->flag != tmp->flag) 1431 if (op->flag != tmp->flag)
1410 for (i = 0; i <= NUM_FLAGS; i++) 1432 for (int i = 0; i <= NUM_FLAGS; i++)
1411 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1433 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1412 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1434 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1413 1435
1414 // save body locations 1436 // save body locations
1415 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1437 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1416 if (op->slot[i].info != tmp->slot[i].info) 1438 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1417 f.put (body_locations[i].save_name, op->slot[i].info); 1439 f.put (body_locations[i].save_name, op->slot[i].info);
1418} 1440}
1419 1441
1420/* 1442/*
1421 * Dumps all variables in an object to a file. 1443 * Dumps all variables in an object to a file.
… …
1423 * the only place this is not set is when saving the player. 1445 * the only place this is not set is when saving the player.
1424 */ 1446 */
1425bool 1447bool
1426object::write (object_freezer &f) 1448object::write (object_freezer &f)
1427{ 1449{
1428 /* Even if the object does have an owner, it would seem that we should 1450 if (is_arch ())
1429 * still save it. 1451 {
1430 */ 1452 f.put (KW_object, arch->archname);
1431 if (owner) 1453 write_diff (f, this, archetype::empty);
1432 return true; 1454 }
1433 1455 else
1434 archetype *at = arch ? (archetype *)arch : empty_archetype; 1456 {
1435
1436 f.put (KW_arch, at->name); 1457 f.put (KW_arch, arch->archname);
1437 write_diff (f, this, &at->clone); 1458 write_diff (f, this, arch);
1459 }
1438 1460
1439 for (object *tmp = inv; tmp; tmp = tmp->below) 1461 for (object *tmp = inv; tmp; tmp = tmp->below)
1440 tmp->write (f); 1462 tmp->write (f);
1441 1463
1442 f.put (this); 1464 f.put (this);
… …
1447 1469
1448///////////////////////////////////////////////////////////////////////////// 1470/////////////////////////////////////////////////////////////////////////////
1449 1471
1450// generic resource file load, 1472// generic resource file load,
1451// currently supports: region, treasures, archetypes 1473// currently supports: region, treasures, archetypes
1474bool
1452bool load_resource_file (const char *filename) 1475load_resource_file_ (const char *filename)
1453{ 1476{
1454 object_thawer f (filename); 1477 object_thawer f (filename);
1455
1456 bool success = false;
1457 bool seen_arch = false;
1458
1459 f.next ();
1460 1478
1461 for (;;) 1479 for (;;)
1462 { 1480 {
1463 switch (f.kw) 1481 switch (f.kw)
1464 { 1482 {
1465 case KW_region: 1483 case KW_region:
1466 if (!region::read (f)) 1484 if (!region::read (f))
1467 goto finish; 1485 return false;
1468 break; 1486 break;
1469 1487
1470 case KW_treasure: 1488 case KW_treasure:
1471 case KW_treasureone: 1489 case KW_treasureone:
1472 if (!treasurelist::read (f)) 1490 if (!treasurelist::read (f))
1473 goto finish; 1491 return false;
1474 break; 1492 break;
1475 1493
1476 case KW_object: 1494 case KW_object:
1477 seen_arch = true;
1478 if (!archetype::read (f)) 1495 if (!archetype::read (f))
1479 goto finish; 1496 return false;
1480 break; 1497 break;
1481 1498
1482 case KW_EOF: 1499 case KW_EOF:
1483 success = true; 1500 return true;
1484 goto finish;
1485 1501
1486 default: 1502 default:
1487 if (!f.parse_error ("resource file")) 1503 if (!f.parse_error ("resource file"))
1488 goto finish; 1504 return false;
1489 1505
1490 f.next (); 1506 f.next ();
1491 break; 1507 break;
1492 } 1508 }
1493 } 1509 }
1494
1495finish:
1496 if (seen_arch)
1497 init_archetype_pointers ();
1498
1499 return success;
1500} 1510}
1501 1511

Diff Legend

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