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.81 by root, Mon May 14 21:32:26 2007 UTC vs.
Revision 1.175 by root, Mon Oct 29 23:55:52 2012 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,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 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 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 17 *
18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
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 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
29#include <global.h> 25#include <global.h>
30#include <loader.h>
31#include <sproto.h> 26#include <sproto.h>
32 27
33///////////////////////////////////////////////////////////////////////////// 28/////////////////////////////////////////////////////////////////////////////
29
30extern archetype *loading_arch;
31
32//+GPL
34 33
35/* This table is only necessary to convert objects that existed before the 34/* This table is only necessary to convert objects that existed before the
36 * spell object conversion to the new object. It was not practical 35 * spell object conversion to the new object. It was not practical
37 * to go through every mapping looking for every potion, rod, wand, etc 36 * 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 37 * that had a sp set and update to the new value. So this maps the
… …
168 "spell_magic_drain", /* 122 */ 167 "spell_magic_drain", /* 122 */
169 "spell_counterspell", /* 123 */ 168 "spell_counterspell", /* 123 */
170 "spell_disarm", /* 124 */ 169 "spell_disarm", /* 124 */
171 "spell_cure_confusion", /* 125 */ 170 "spell_cure_confusion", /* 125 */
172 "spell_restoration", /* 126 */ 171 "spell_restoration", /* 126 */
173 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 172 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
174 "spell_counterwall", /* 128 */ 173 "spell_counterwall", /* 128 */
175 "spell_cause_light_wounds", /* 129 */ 174 "spell_cause_light_wounds", /* 129 */
176 "spell_cause_medium_wounds", /* 130 */ 175 "spell_cause_medium_wounds", /* 130 */
177 "spell_cause_heavy_wounds", /* 131 */ 176 "spell_cause_heavy_wounds", /* 131 */
178 "spell_charm_monsters", /* 132 */ 177 "spell_charm_monsters", /* 132 */
… …
250 "spell_cause_rabies", /* 204 */ 249 "spell_cause_rabies", /* 204 */
251 "spell_glyph", /* 205 */ 250 "spell_glyph", /* 205 */
252 NULL 251 NULL
253}; 252};
254 253
255extern bool loading_arch;
256
257/* This function checks the object after it has been loaded (when we 254/* 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 255 * 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 256 * 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. 257 * to check for objects to make sure there are no common errors.
261 */ 258 */
262void 259void
263object::post_load_check () 260object::post_load_check ()
264{ 261{
262 if (type >= NUM_TYPES)
263 {
264 LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ());
265 type = 0;
266 }
267
265 switch (type) 268 switch (type)
266 { 269 {
270 case RANGED:
267 case BOW: 271 case BOW:
268 case WAND: 272 case WAND:
269 case ROD: 273 case ROD:
270 case HORN: 274 case HORN:
271 if (slot [body_range].info != -1) 275 if (slot [body_range].info != -1)
272 { 276 {
273 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); 277 LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
274 slot [body_range].info = -1; 278 slot [body_range].info = -1;
275 } 279 }
276 break; 280 break;
277 281
278 case WEAPON: 282 case WEAPON:
279 if (slot [body_combat].info != -1) 283 if (slot [body_combat].info != -1)
280 { 284 {
281 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); 285 LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
282 slot [body_combat].info = -1; 286 slot [body_combat].info = -1;
283 } 287 }
284 break; 288 break;
285 289
286 case SHIELD: 290 case SHIELD:
287 if (slot [body_shield].info != -1) 291 if (slot [body_shield].info != -1)
288 { 292 {
289 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); 293 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
290 slot [body_shield].info = -1; 294 slot [body_shield].info = -1;
291 } 295 }
292 break; 296 break;
293 297
294 case PLAYER: 298 case PLAYER:
295 if (slot [body_shield].info != 1) 299 if (slot [body_shield].info != 1)
296 { 300 {
297 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 301 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
298 slot [body_shield].info = 1; 302 slot [body_shield].info = 1;
299 } 303 }
300 304
301 if (slot [body_combat].info != 1) 305 if (slot [body_combat].info != 1)
302 { 306 {
303 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); 307 LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
304 slot [body_combat].info = 1; 308 slot [body_combat].info = 1;
305 } 309 }
306 310
307 if (slot [body_range].info != 1) 311 if (slot [body_range].info != 1)
308 { 312 {
309 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); 313 LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
310 slot [body_range].info = 1; 314 slot [body_range].info = 1;
311 } 315 }
312 break; 316 break;
313 } 317 }
314 318
… …
319 * also have to catch is if this object is not using the normal name for 323 * also have to catch is if this object is not using the normal name for
320 * the object. In that case, we also want to use the loaded name. 324 * the object. In that case, we also want to use the loaded name.
321 * Otherwise, what happens is that the the plural name will lose 325 * Otherwise, what happens is that the the plural name will lose
322 * information (appear as just 'hearts' and not 'goblins heart') 326 * information (appear as just 'hearts' and not 'goblins heart')
323 */ 327 */
324 if (arch && name != arch->clone.name && name_pl == arch->clone.name_pl) 328 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
325 name_pl = 0; 329 name_pl = 0;
326 330
327 if (!name_pl) 331 if (!name_pl)
328 name_pl = name; 332 name_pl = name;
329 333
330 /* objects now have a materialname. try to patch it in */ 334 /* objects now have a materialname. try to patch it in */
331 if (!(is_weapon () && level > 0)) 335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
332 set_materialname (this, map ? map->difficulty : 5, 0); 336 select_material (this, map ? map->difficulty : 5);
337
338 if (speed < 0.)
339 {
340 flag [FLAG_RANDOM_SPEED] = true;
341 speed = -speed;
342 // speed_left will be randomised in instantiate () and copy_to ()
343 }
333 344
334 /* only do these when program is first run - a bit 345 /* only do these when program is first run - a bit
335 * excessive to do this at every run - most of this is 346 * excessive to do this at every run - most of this is
336 * really just to catch any errors - program will still run, but 347 * really just to catch any errors - program will still run, but
337 * not in the ideal fashion. 348 * not in the ideal fashion.
338 */ 349 */
339 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) 350 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
340 { 351 {
341 if (!skill) 352 if (!skill)
342 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); 353 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
343 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || 354 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
344 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 355 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
345 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); 356 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
346 } 357 }
347 358
348 /* We changed last_heal to gen_sp_armour, which is what it 359 /* We changed last_heal to gen_sp_armour, which is what it
349 * really does for many objects. Need to catch any in maps 360 * really does for many objects. Need to catch any in maps
350 * that may have an old value. 361 * that may have an old value.
… …
356 || type == AMULET || type == GIRDLE 367 || type == AMULET || type == GIRDLE
357 || type == BRACERS || type == CLOAK) 368 || type == BRACERS || type == CLOAK)
358 { 369 {
359 if (last_heal) 370 if (last_heal)
360 { 371 {
361 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); 372 LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
362 gen_sp_armour = last_heal; 373 gen_sp_armour = last_heal;
363 last_heal = 0; 374 last_heal = 0;
364 } 375 }
365 376
366 int ip = calc_item_power (this, 0); 377 int ip = calc_item_power (this, 0);
367 378
368 /* Legacy objects from before item power was in the game */ 379 /* Legacy objects from before item power was in the game */
369 if (!item_power && ip) 380 if (!item_power && ip)
370 { 381 {
371 if (ip > 3) 382 if (ip > 3)
372 LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); 383 LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip);
373 384
374 item_power = ip; 385 item_power = ip;
375 } 386 }
376 387
377 /* Check for possibly bogus values. Has to meet both these criteria - 388 /* Check for possibly bogus values. Has to meet both these criteria -
378 * something that has item_power 1 is probably just fine if our calculated 389 * something that has item_power 1 is probably just fine if our calculated
379 * value is 1 or 2 - these values are small enough that hard to be precise. 390 * value is 1 or 2 - these values are small enough that hard to be precise.
380 * similarly, it item_power is 0, the first check will always pass, 391 * similarly, it item_power is 0, the first check will always pass,
381 * but not the second one. 392 * but not the second one.
382 */ 393 */
394#if 0 //TODO
383 if (ip > 2 * item_power && ip > (item_power + 3)) 395 if (ip > 2 * item_power && ip > (item_power + 3))
384 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 396 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
397#endif
385 } 398 }
386 399
387 /* Old spellcasting object - need to load in the appropiate object */ 400 /* old style spellcasting object (pretty common) - need to load in the appropriate object */
388 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 401 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
402 if ((type == ROD
403 || type == WAND
404 || type == SCROLL
405 || type == HORN
406 || type == FIREWALL
389 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 407 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
390 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 408 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
409 && !inv
410 && !loading_arch
411 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
412 // TODO: at least one watchout-comments is redundant - investigate/remove
391 { 413 {
414 // TODO: fix firewall object on map
392 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 415 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
393 * in that spell was stored in sp. 416 * in that spell was stored in sp.
394 */ 417 */
418 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
395 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 419 object *tmp = archetype::get (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
396 insert_ob_in_ob (tmp, this); 420 insert_ob_in_ob (tmp, this);
397 randomitems = NULL; /* So another spell isn't created for this object */ 421 randomitems = 0;
398 } 422 }
399 423
400 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 424 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
401 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 425 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
402 { 426 {
427 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
403 object *tmp = get_archetype_by_object_name (slaying); 428 object *tmp = get_archetype_by_object_name (slaying);
404 insert_ob_in_ob (tmp, this); 429 insert_ob_in_ob (tmp, this);
405 randomitems = NULL; /* So another spell isn't created for this object */ 430 randomitems = 0; /* So another spell isn't created for this object */
406 /* without this, value is all screwed up */ 431 /* without this, value is all screwed up */
407 value = arch->clone.value * inv->value; 432 value = arch->value * inv->value;
408 } 433 }
409 434
410 if (QUERY_FLAG (this, FLAG_MONSTER)) 435 if (this->flag [FLAG_MONSTER])
411 { 436 {
412 if (stats.hp > stats.maxhp) 437 if (stats.hp > stats.maxhp)
413 { 438 {
414 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 439 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
415 stats.maxhp = stats.hp; 440 stats.maxhp = stats.hp;
416 } 441 }
417 442
418 /* The archs just need to be updated for this */ 443 /* The archs just need to be updated for this */
419 if (move_type == 0) 444 if (move_type == 0)
420 move_type = MOVE_WALK; 445 move_type = MOVE_WALK;
421 } 446 }
422 447
423 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 448 if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER)
424 {
425 /* Object will duplicate it's content as part of the 449 /* Object will duplicate it's content as part of the
426 * generation process. To do this, we must flag inventory 450 * generation process. To do this, we must flag inventory
427 * so it remains unevaluated concerning the randomitems and 451 * so it remains unevaluated concerning the randomitems and
428 * the living (a demonlord shouldn't cast from inside generator!) 452 * the living (a demonlord shouldn't cast from inside generator!)
429 */ 453 */
454 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
430 flag_inv (this, FLAG_IS_A_TEMPLATE); 455 flag_inv (this, FLAG_IS_A_TEMPLATE);
431 }
432 456
433 /* Handle player movers. We use move_type for player movers 457 /* Handle player movers. We use move_type for player movers
434 * because they operate on their own time (move_on 458 * because they operate on their own time (move_on
435 * would potentially cause them to be triggered when someone steps 459 * would potentially cause them to be triggered when someone steps
436 * on them). If move_type is set, presume person knows what they 460 * on them). If move_type is set, presume person knows what they
437 * are doing, otherwise, set move_type based on maxhp value. 461 * are doing, otherwise, set move_type based on maxhp value.
438 */ 462 */
439 if (type == PLAYERMOVER) 463 if (type == PLAYERMOVER)
440 { 464 {
441 if (!move_type) 465 if (!move_type)
… …
447 } 471 }
448 else 472 else
449 move_type = MOVE_WALK; 473 move_type = MOVE_WALK;
450 } 474 }
451 } 475 }
476
477 // if the object has an animation, try to provide a default face
478 if (has_anim ())
479 {
480 if (anim_speed)
481 // if this item is time-animated, force the last frame
482 animate_object (this, 0);
483 else if (flag [FLAG_MONSTER])
484 // if it is a monster, set appropriate facing
485 animate_object (this, direction);
486 }
452} 487}
453 488
454static void 489static void
455set_move (MoveType &mt, const char *str) 490set_move (MoveType &mt, object_thawer &f)
456{ 491{
457 static const struct flagstr { 492 static const struct flagstr {
458 const char *name; 493 const char *name;
459 MoveType flags; 494 MoveType flags;
460 } move_flags[] = { 495 } move_flags[] = {
… …
466 { "boat" , MOVE_BOAT }, 501 { "boat" , MOVE_BOAT },
467 { "ship" , MOVE_SHIP }, 502 { "ship" , MOVE_SHIP },
468 { "all" , MOVE_ALL }, 503 { "all" , MOVE_ALL },
469 }; 504 };
470 505
471 if (!str) 506 const char *str = f.get_str ();
472 {
473 mt = 0;
474 return;
475 }
476 507
477 if (isdigit (*str)) 508 if (!*str || isdigit (*str))
478 { 509 {
479 mt = atoi (str); 510 mt = atoi (str);
480 return; 511 return;
481 } 512 }
482 513
483 mt = 0; 514 mt = 0;
484 515
485 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 516 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
486 { 517 {
487 bool negate = 0; 518 bool negate = 0;
488 519
489 if (*str == '-') 520 if (*str == '-')
490 { 521 {
491 negate = 1; 522 negate = 1;
492 str++; 523 str++;
493 } 524 }
494 525
495 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) 526 for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f)
496 { 527 {
497 if (!strcmp (f->name, str)) 528 if (!strcmp (f->name, str))
498 { 529 {
499 if (negate) 530 if (negate)
500 mt &= ~f->flags; 531 mt &= ~f->flags;
… …
503 534
504 goto next; 535 goto next;
505 } 536 }
506 } 537 }
507 538
508 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 539 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
509 540
510next: ; 541next: ;
511 } 542 }
512} 543}
513 544
514#define GET_FLAG(op,flag) \ 545//-GPL
515 if (f.get_sint32 ()) \ 546
516 SET_FLAG (op, flag); \ 547#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
517 else \
518 CLEAR_FLAG (op, flag) \
519 548
520bool 549bool
521object::parse_kv (object_thawer &f) 550object::parse_kv (object_thawer &f)
522{ 551{
523 object *op_inv = inv; 552 object *op_inv = inv;
… …
525 for (;;) 554 for (;;)
526 { 555 {
527 switch (f.kw) 556 switch (f.kw)
528 { 557 {
529 case KW_uuid: 558 case KW_uuid:
530 if (const char *s = f.get_str ()) 559 if (!uuid.parse (f.get_str ()))
531 { 560 {
532 unsigned int version; 561 f.parse_warn ("unparseable uuid");
533 unsigned long long seq; 562 uuid = UUID::gen ();
534
535 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
536 {
537 uuid.seq = seq;
538 break;
539 }
540 } 563 }
541
542 uuid = gen_uuid ();
543 break; 564 break;
544 565
545 case KW_oid: 566 case KW_oid:
546 f.get (this, f.get_sint32 ()); 567 f.get (this, f.get_sint32 ());
547 break; 568 break;
… …
553 574
554 case KW_attach: f.get_ornull (attach); break; 575 case KW_attach: f.get_ornull (attach); break;
555 case KW_skill: f.get_ornull (skill); break; 576 case KW_skill: f.get_ornull (skill); break;
556 case KW_race: f.get_ornull (race); break; 577 case KW_race: f.get_ornull (race); break;
557 case KW_slaying: f.get_ornull (slaying); break; 578 case KW_slaying: f.get_ornull (slaying); break;
579 case KW_tag: f.get_ornull (tag); break;
558 580
559 case KW_arch: 581 case KW_arch:
560 {
561 object *tmp = object::read (f); 582 if (object *tmp = object::read (f))
562 tmp->deactivate ();
563
564 { 583 {
584 tmp->deactivate ();
585
565 // was: insert_ob_in_ob (tmp, op); 586 // was: insert_ob_in_ob (tmp, op);
566 // but manually adding it can improve map loading times a lot 587 // but manually adding it can improve map loading times a lot
567 // also, appending instead of prepending keeps the 588 // also, appending instead of prepending keeps the
568 // save ordering the same between repeated load/saves. 589 // save ordering the same between repeated load/saves.
569 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 590 // and finally we do not want any funny effects
570 CLEAR_FLAG (tmp, FLAG_REMOVED); 591 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
592 tmp->clr_flag (FLAG_REMOVED);
571 593
572 if (!op_inv) 594 if (!op_inv)
573 { 595 {
574 inv = tmp; 596 inv = tmp;
575 tmp->above = 0; 597 tmp->above = 0;
… …
585 607
586 tmp->below = 0; 608 tmp->below = 0;
587 tmp->env = this; 609 tmp->env = this;
588 op_inv = tmp; 610 op_inv = tmp;
589 } 611 }
590 } 612 else
613 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
614
591 continue; 615 continue;
592 616
593 case KW_other_arch: 617 case KW_other_arch:
594 other_arch =
595 loading_arch 618 if (loading_arch == this)
596 ? archetype::get (f.get_str ()) 619 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
620 else
621 {
597 : archetype::find (f.get_str ()); 622 other_arch = archetype::find (f.get_str ());
598 623
599 if (!other_arch) 624 if (!other_arch)
600 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 625 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
626 }
627 break;
628
629 case KW_owner:
630 f.delayed_deref (this, owner, f.get_str ());
601 break; 631 break;
602 632
603 case KW_animation: 633 case KW_animation:
604 { 634 {
605 CLEAR_FLAG (this, FLAG_ANIMATE); 635 this->clr_flag (FLAG_ANIMATE);
606 animation_id = 0; 636 animation_id = 0;
607 637
608 const char *str = f.get_str ();
609 if (str && (animation_id = find_animation (str))) 638 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
610 SET_FLAG (this, FLAG_ANIMATE); 639 this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
611 } 640 }
612 break; 641 break;
613 642
614 case KW_last_heal: f.get (last_heal); break; 643 case KW_last_heal: f.get (last_heal); break;
615 case KW_last_sp: f.get (last_sp); break; 644 case KW_last_sp: f.get (last_sp); break;
616 case KW_last_grace: f.get (last_grace); break; 645 case KW_last_grace: f.get (last_grace); break;
617 case KW_last_eat: f.get (last_eat); break; 646 case KW_last_eat: f.get (last_eat); break;
647 case KW_sl:
618 case KW_speed_left: f.get (speed_left); break; 648 case KW_speed_left: f.get (speed_left); break;
619 649
620 case KW_speed: 650 case KW_speed:
621 f.get (speed); 651 f.get (speed);
622 652
… …
631 move_slow |= MOVE_WALK; 661 move_slow |= MOVE_WALK;
632 f.get (move_slow_penalty); 662 f.get (move_slow_penalty);
633 break; 663 break;
634 664
635 case KW_face: 665 case KW_face:
666 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
667 break;
668
669 case KW_sound:
670 if (f.has_value ())
671 {
636 face = face_find (f.get_str ()); 672 sound = sound_find (f.get_str ());
673 if (!sound)
674 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
675 }
676 else
677 sound = 0;
678 break;
679
680 case KW_sound_destroy:
681 if (f.has_value ())
682 {
683 sound_destroy = sound_find (f.get_str ());
684 if (!sound_destroy)
685 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
686 }
687 else
688 sound_destroy = 0;
637 break; 689 break;
638 690
639 case KW_x: f.get (x); break; 691 case KW_x: f.get (x); break;
640 case KW_y: f.get (y); break; 692 case KW_y: f.get (y); break;
641 693
… …
682 case KW_invisible: f.get (invisible); break; 734 case KW_invisible: f.get (invisible); break;
683 case KW_magic: f.get (magic); break; 735 case KW_magic: f.get (magic); break;
684 case KW_state: f.get (state); break; 736 case KW_state: f.get (state); break;
685 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 737 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
686 case KW_material: f.get (materials); break; //TODO: nuke 738 case KW_material: f.get (materials); break; //TODO: nuke
687 case KW_materialname: f.get (materialname); break; 739 case KW_materialname: f.get (material); break;
688 740
689 /* These are the new values */ 741 /* These are the new values */
690 case KW_move_block: set_move (move_block, f.get_str ()); break; 742 case KW_move_block: set_move (move_block, f); break;
691 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 743 case KW_move_allow: set_move (move_allow, f); break;
692 case KW_move_type: set_move (move_type, f.get_str ()); break; 744 case KW_move_type: set_move (move_type , f); break;
693 case KW_move_on: set_move (move_on, f.get_str ()); break; 745 case KW_move_on: set_move (move_on , f); break;
694 case KW_move_off: set_move (move_off, f.get_str ()); break; 746 case KW_move_off: set_move (move_off , f); break;
695 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 747 case KW_move_slow: set_move (move_slow , f); break;
696
697 /* These are all legacy - any new objects should use the move_ .. values */
698 case KW_no_pass:
699 {
700 if (f.get_sint32 ())
701 move_block = MOVE_ALL;
702 else
703 move_block = 0;
704 }
705
706 break;
707
708 /* These are all legacy - any new objects should use the move_ .. values */
709 case KW_walk_on:
710 {
711 if (f.get_sint32 ())
712 move_on |= MOVE_WALK;
713 else
714 move_on &= ~MOVE_WALK;
715 }
716
717 break;
718
719 /* These are all legacy - any new objects should use the move_ .. values */
720 case KW_walk_off:
721 {
722 if (f.get_sint32 ())
723 move_off |= MOVE_WALK;
724 else
725 move_off &= ~MOVE_WALK;
726 }
727 break;
728
729 /* These are all legacy - any new objects should use the move_ .. values */
730 case KW_fly_on:
731 {
732 if (f.get_sint32 ())
733 move_on |= MOVE_FLY_LOW;
734 else
735 move_on &= ~MOVE_FLY_LOW;
736 }
737 break;
738
739 /* These are all legacy - any new objects should use the move_ .. values */
740 case KW_fly_off:
741 {
742 if (f.get_sint32 ())
743 move_off |= MOVE_FLY_LOW;
744 else
745 move_off &= ~MOVE_FLY_LOW;
746 }
747 break;
748 748
749 //TODO: remove these after converting archetypes 749 //TODO: remove these after converting archetypes
750 case KW_can_use_wand: 750 case KW_can_use_wand:
751 GET_FLAG (this, FLAG_USE_RANGE); 751 GET_FLAG (this, FLAG_USE_RANGE);
752 break; 752 break;
753 753
754 /* These are all legacy - any new objects should use the move_ .. values */
755 case KW_flying:
756 {
757 if (f.get_sint32 ())
758 move_type |= MOVE_FLY_LOW;
759 else
760 move_type &= ~MOVE_FLY_LOW;
761 }
762 break;
763
764
765 case KW_identified: 754 case KW_identified:
766 GET_FLAG (this, FLAG_IDENTIFIED); 755 GET_FLAG (this, FLAG_IDENTIFIED);
767 //TODO: move to check_object or so 756 //TODO: move to check_object or so
768 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 757 if (this->flag [FLAG_IDENTIFIED])
769 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 758 this->clr_flag (FLAG_KNOWN_MAGICAL);
770 759
771 break;
772
773 case KW_wiz:
774 GET_FLAG (this, FLAG_WIZ);
775 //TODO: move to check_object
776 if (QUERY_FLAG (this, FLAG_WIZ))
777 {
778 SET_FLAG (this, FLAG_WAS_WIZ);
779 SET_FLAG (this, FLAG_WIZPASS);
780 SET_FLAG (this, FLAG_WIZCAST);
781 }
782 else
783 {
784 CLEAR_FLAG (this, FLAG_WIZPASS);
785 CLEAR_FLAG (this, FLAG_WIZCAST);
786 }
787 break; 760 break;
788 761
789 case KW_friendly: 762 case KW_friendly:
790 if (f.get_sint32 ()) 763 if (f.get_bool ())
791 if (type != PLAYER) 764 if (type != PLAYER)
792 add_friendly_object (this); 765 add_friendly_object (this);
793 766
794 break; 767 break;
795 768
… …
808 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 781 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
809 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 782 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
810 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 783 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
811 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 784 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
812 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 785 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
786 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
813 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 787 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
814 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 788 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
815 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 789 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
816 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 790 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
817 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 791 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
818 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; 792 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
819 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; 793 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
820 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; 794 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
795 case KW_is_transparent_floor: GET_FLAG (this, FLAG_IS_TRANSPARENT_FLOOR); break;
821 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; 796 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
822 case KW_scared: GET_FLAG (this, FLAG_SCARED); break; 797 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
823 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; 798 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
824 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 799 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
825 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 800 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
826 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 801 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
827 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 802 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
828 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 803 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
829 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
830 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
831 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 804 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
832 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 805 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
833 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 806 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
834 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 807 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
835 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; 808 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
… …
879 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 852 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
880 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 853 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
881 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 854 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
882 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 855 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
883 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 856 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
857 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
858 case KW_is_quad: GET_FLAG (this, FLAG_IS_QUAD); break;
884 859
885 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 860 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
886 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 861 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
887 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 862 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
888 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 863 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
918 case KW_anim_speed: f.get (anim_speed); break; 893 case KW_anim_speed: f.get (anim_speed); break;
919 case KW_container: f.get (weight_limit); break; 894 case KW_container: f.get (weight_limit); break;
920 case KW_will_apply: f.get (will_apply); break; 895 case KW_will_apply: f.get (will_apply); break;
921 case KW_attack_movement: f.get (attack_movement); break; 896 case KW_attack_movement: f.get (attack_movement); break;
922 case KW_move_state: f.get (move_status); break; 897 case KW_move_state: f.get (move_status); break;
923 case KW_expmul: f.get (expmul); break; 898 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
924 case KW_glow_radius: f.get (glow_radius); break; 899 case KW_glow_radius: f.get (glow_radius); break;
925 case KW_weapontype: f.get (weapontype); break; 900 case KW_weapontype: f.get (weapontype); break;
926 case KW_tooltype: f.get (tooltype); break;
927 case KW_casting_time: f.get (casting_time); break; 901 case KW_casting_time: f.get (casting_time); break;
902
903 // elevation is deprecated
928 case KW_elevation: f.get (elevation); break; 904 case KW_elevation: break;
905
929 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 906 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
930 case KW_client_type: f.get (client_type); break; 907 case KW_client_type: f.get (client_type); break;
931 case KW_duration: f.get (duration); break; 908 case KW_duration: f.get (duration); break;
932 case KW_range: f.get (range); break; 909 case KW_range: f.get (range); break;
933 case KW_range_modifier: f.get (range_modifier); break; 910 case KW_range_modifier: f.get (range_modifier); break;
… …
952 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 929 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
953 case KW_can_apply: 930 case KW_can_apply:
954 break; 931 break;
955 932
956 case KW_connected: 933 case KW_connected:
957 add_button_link (this, map, f.get_sint32 ()); 934 {
935 shstr connected;
936
937 f.get (connected);
938 add_link (map, connected);
939 }
958 break; 940 break;
959 941
960 case KW_randomitems: 942 case KW_randomitems:
961 if (f.get_str ()) 943 if (f.has_value ())
962 { 944 {
963 randomitems = 945 randomitems =
964 loading_arch 946 loading_arch
965 ? treasurelist::get (f.get_str ()) 947 ? treasurelist::get (f.get_str ())
966 : treasurelist::find (f.get_str ()); 948 : treasurelist::find (f.get_str ());
967 949
968 if (!randomitems) 950 if (!randomitems)
951 {
969 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 952 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
953 randomitems = treasurelist::get (shstr_none); // avoid crashes
954 }
970 } 955 }
971 else 956 else
972 randomitems = 0; 957 randomitems = 0;
973 break; 958 break;
974 959
975 case KW_msg: 960 case KW_msg:
976 f.get_ml (KW_endmsg, msg); 961 f.get_ml (KW_endmsg, msg);
977 //TODO: allow longer messages
978 if (strlen (msg) >= HUGE_BUF)
979 {
980 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
981 msg = "ERROR, please report: string too long, winged.\n";
982 }
983 break; 962 break;
984 963
985 case KW_lore: 964 case KW_lore:
986 f.get_ml (KW_endlore, lore); 965 f.get_ml (KW_endlore, lore);
987 //TODO: allow longer messages
988 /* Just print a warning so we can be reasonably safe
989 * about not overflowing the buffer.
990 */
991 if (strlen (lore) > (HUGE_BUF / 2))
992 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
993 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
994 break; 966 break;
995 967
996 case KW_editable: 968 case KW_editable:
997 case KW_editor_folder: 969 case KW_editor_folder:
998 break; 970 break;
… …
1003 975
1004 f.next (); 976 f.next ();
1005 return true; 977 return true;
1006 978
1007 case KW_ERROR: 979 case KW_ERROR:
1008 set_ob_key_value (this, f.kw_str, f.value, true); 980 // we do not even try to find old values, duplicate keys stay duplicate
1009 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 981 // the list gets reversed after loading
982 kv.add (shstr (f.kw_str), shstr (f.value));
1010 break; 983 break;
1011 984
1012 default: 985 default:
1013 if (!f.parse_error ("object", name)) 986 if (!f.parse_error ("object", name))
1014 return false; 987 return false;
… …
1026 999
1027 archetype *arch = archetype::find (f.get_str ()); 1000 archetype *arch = archetype::find (f.get_str ());
1028 1001
1029 if (!arch) 1002 if (!arch)
1030 { 1003 {
1031 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1004 LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ());
1032 arch = archetype::find ("earthwall"); 1005 arch = archetype::find (shstr_earthwall);
1033 } 1006 }
1034 1007
1035 assert (arch); //D maybe use exception handling of sorts? 1008 assert (arch); //D maybe use exception handling of sorts?
1036 1009
1037 f.next (); 1010 f.next ();
1038 1011
1039 object *op = object::create (); 1012 object *op = arch->instance ();
1040
1041 op->map = map; 1013 op->map = map;
1042 arch->clone.copy_to (op);
1043 // copy_to activates, this should be fixed properly 1014 // instance() activates, this should be fixed properly
1044 op->deactivate (); 1015 op->deactivate ();
1045 1016
1046 if (!op->parse_kv (f)) 1017 if (!op->parse_kv (f))
1047 { 1018 {
1048 op->destroy (true); 1019 op->destroy ();
1049 return 0; 1020 return 0;
1050 } 1021 }
1022
1023 // the loader reverses the ordering of kv-pairs, so we reverse it again after loading
1024 // that greatly simplifies the loading code.
1025 op->kv.reverse ();
1051 1026
1052 op->post_load_check (); 1027 op->post_load_check ();
1053 return op; 1028 return op;
1054} 1029}
1055 1030
… …
1060 * override values and in c_wiz to mutate values. 1035 * override values and in c_wiz to mutate values.
1061 */ 1036 */
1062int 1037int
1063set_variable (object *op, char *buf) 1038set_variable (object *op, char *buf)
1064{ 1039{
1065 object_thawer f (buf, (AV *)0); 1040 object_thawer f (format ("%s\nend", buf), (AV *)0);
1066 1041
1067 f.next ();
1068 return op->parse_kv (f); 1042 return op->parse_kv (f);
1069} 1043}
1070 1044
1071/* This returns a string of the integer movement type */
1072#if 0
1073// unused function
1074static char *
1075get_string_move_type (MoveType mt)
1076{
1077 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1078 int i, all_count = 0, count;
1079
1080 strcpy (retbuf, "");
1081 strcpy (retbuf_all, " all");
1082
1083 /* Quick check, and probably fairly common */
1084 if (mt == MOVE_ALL)
1085 return retbuf_all + 1;
1086 if (mt == 0)
1087 {
1088 strcpy (retbuf, "0");
1089 return retbuf;
1090 }
1091
1092 /* We basically slide the bits down. Why look at MOVE_ALL?
1093 * because we may want to return a string like 'all -swim',
1094 * and if we just looked at mt, we couldn't get that.
1095 */
1096 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1097 {
1098 if (mt & (1 << count))
1099 {
1100 strcat (retbuf, " ");
1101 strcat (retbuf, move_name[count]);
1102 }
1103 else
1104 {
1105 strcat (retbuf_all, " -");
1106 strcat (retbuf_all, move_name[count]);
1107 all_count++;
1108 }
1109 }
1110 /* Basically, if there is a single negation, return it, eg
1111 * 'all -swim'. But more than that, just return the
1112 * enumerated values. It doesn't make sense to return
1113 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1114 */
1115 if (all_count <= 1)
1116 return retbuf_all + 1;
1117 else
1118 return retbuf + 1;
1119}
1120#endif
1121
1122// compare *op against *tmp and output differences 1045// compare *op against *arch and output differences
1123static void 1046static void
1124write_diff (object_freezer &f, object *op, object *tmp) 1047write_diff (object_freezer &f, object *op, object *arch)
1125{ 1048{
1126 static const keyword resist_save[NROFATTACKS] = { 1049 static const keyword resist_save[NROFATTACKS] = {
1127# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1050# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1128# include "attackinc.h" 1051# include "attackinc.h"
1129# undef def 1052# undef def
… …
1134 * the 15'th element of this array should match that name. 1057 * the 15'th element of this array should match that name.
1135 * If an entry is NULL, that is a flag not to loaded/saved. 1058 * If an entry is NULL, that is a flag not to loaded/saved.
1136 */ 1059 */
1137 static const keyword flag_names [NUM_FLAGS] = { 1060 static const keyword flag_names [NUM_FLAGS] = {
1138 KW_alive, 1061 KW_alive,
1139 KW_wiz,
1140 KW_NULL, 1062 KW_NULL,
1141 KW_NULL, 1063 KW_NULL,
1142 KW_was_wiz, 1064 KW_NULL,
1065 KW_NULL,
1143 KW_applied, 1066 KW_applied,
1144 KW_unpaid, 1067 KW_unpaid,
1145 KW_can_use_shield, 1068 KW_can_use_shield,
1146 KW_no_pick, 1069 KW_no_pick,
1147 KW_NULL, // walk_on 1070 KW_is_transparent_floor,
1071 /* 10 */
1148 KW_NULL, // no_pass 1072 KW_NULL, // no_pass
1149 /* 10 */
1150 KW_is_animated, 1073 KW_is_animated,
1151 KW_NULL, // slow_move 1074 KW_NULL, // slow_move
1152 KW_NULL, // flying 1075 KW_NULL, // flying
1153 KW_monster, 1076 KW_monster,
1154 KW_friendly, 1077 KW_friendly,
1155 KW_generator, 1078 KW_generator,
1156 KW_is_thrown, 1079 KW_is_thrown,
1157 KW_auto_apply, 1080 KW_auto_apply,
1158 KW_treasure_env, 1081 KW_treasure_env,
1082 /* 20 */
1159 KW_player_sold, 1083 KW_player_sold,
1160 /* 20 */
1161 KW_see_invisible, 1084 KW_see_invisible,
1162 KW_can_roll, 1085 KW_can_roll,
1163 KW_overlay_floor, 1086 KW_overlay_floor,
1164 KW_is_turnable, 1087 KW_is_turnable,
1165 KW_NULL, // walk_off 1088 KW_NULL, // walk_off
1166 KW_NULL, // fly_on 1089 KW_NULL, // fly_on
1167 KW_NULL, // fly_off 1090 KW_NULL, // fly_off
1168 KW_is_used_up, 1091 KW_is_used_up,
1169 KW_identified, 1092 KW_identified,
1093 /* 30 */
1170 KW_reflecting, 1094 KW_reflecting,
1171 /* 30 */
1172 KW_changing, 1095 KW_changing,
1173 KW_splitting, 1096 KW_splitting,
1174 KW_hitback, 1097 KW_hitback,
1175 KW_startequip, 1098 KW_startequip,
1176 KW_blocksview, 1099 KW_blocksview,
1177 KW_undead, 1100 KW_undead,
1178 KW_scared, 1101 KW_scared,
1179 KW_unaggressive, 1102 KW_unaggressive,
1180 KW_reflect_missile, 1103 KW_reflect_missile,
1104 /* 40 */
1181 KW_reflect_spell, 1105 KW_reflect_spell,
1182 /* 40 */
1183 KW_no_magic, 1106 KW_no_magic,
1184 KW_no_fix_player, 1107 KW_NULL,
1185 KW_is_lightable, 1108 KW_is_lightable,
1186 KW_tear_down, 1109 KW_tear_down,
1187 KW_run_away, 1110 KW_run_away,
1188 KW_NULL, // pass_thru 1111 KW_NULL, // pass_thru
1189 KW_NULL, // an_pass_thru 1112 KW_NULL, // an_pass_thru
1190 KW_pick_up, 1113 KW_pick_up,
1191 KW_unique, 1114 KW_unique,
1115 /* 50 */
1192 KW_no_drop, 1116 KW_no_drop,
1193 /* 50 */
1194 KW_NULL, // wizcast 1117 KW_NULL, // wizcast
1195 KW_can_cast_spell, 1118 KW_can_cast_spell,
1196 KW_can_use_scroll, 1119 KW_can_use_scroll,
1197 KW_can_use_range, 1120 KW_can_use_range,
1198 KW_can_use_bow, 1121 KW_can_use_bow,
1199 KW_can_use_armour, 1122 KW_can_use_armour,
1200 KW_can_use_weapon, 1123 KW_can_use_weapon,
1201 KW_can_use_ring, 1124 KW_can_use_ring,
1202 KW_has_ready_range, 1125 KW_has_ready_range,
1126 /* 60 */
1203 KW_has_ready_bow, 1127 KW_has_ready_bow,
1204 /* 60 */
1205 KW_xrays, 1128 KW_xrays,
1206 KW_NULL, 1129 KW_NULL,
1207 KW_is_floor, 1130 KW_is_floor,
1208 KW_lifesave, 1131 KW_lifesave,
1209 KW_no_strength, 1132 KW_no_strength,
1210 KW_sleep, 1133 KW_sleep,
1211 KW_stand_still, 1134 KW_stand_still,
1212 KW_random_move, 1135 KW_random_move,
1213 KW_only_attack, 1136 KW_only_attack,
1137 /* 70 */
1214 KW_confused, 1138 KW_confused,
1215 /* 70 */
1216 KW_stealth, 1139 KW_stealth,
1217 KW_NULL, 1140 KW_NULL,
1218 KW_NULL, 1141 KW_NULL,
1219 KW_cursed, 1142 KW_cursed,
1220 KW_damned, 1143 KW_damned,
1221 KW_see_anywhere, 1144 KW_see_anywhere,
1222 KW_known_magical, 1145 KW_known_magical,
1223 KW_known_cursed, 1146 KW_known_cursed,
1224 KW_can_use_skill, 1147 KW_can_use_skill,
1148 /* 80 */
1225 KW_been_applied, 1149 KW_been_applied,
1226 /* 80 */
1227 KW_has_ready_scroll, 1150 KW_has_ready_scroll,
1228 KW_can_use_rod, 1151 KW_can_use_rod,
1229 KW_precious, 1152 KW_precious,
1230 KW_can_use_horn, 1153 KW_can_use_horn,
1231 KW_make_invisible, 1154 KW_make_invisible,
1232 KW_inv_locked, 1155 KW_inv_locked,
1233 KW_is_wooded, 1156 KW_is_wooded,
1234 KW_is_hilly, 1157 KW_is_hilly,
1235 KW_has_ready_skill, 1158 KW_has_ready_skill,
1159 /* 90 */
1236 KW_has_ready_weapon, 1160 KW_has_ready_weapon,
1237 /* 90 */
1238 KW_no_skill_ident, 1161 KW_no_skill_ident,
1239 KW_is_blind, 1162 KW_is_blind,
1240 KW_can_see_in_dark, 1163 KW_can_see_in_dark,
1241 KW_is_cauldron, 1164 KW_is_cauldron,
1242 KW_NULL, 1165 KW_NULL,
1243 KW_no_steal, 1166 KW_no_steal,
1244 KW_one_hit, 1167 KW_one_hit,
1245 KW_NULL, 1168 KW_NULL,
1246 KW_berserk, 1169 KW_berserk,
1170 /* 100 */
1247 KW_neutral, 1171 KW_neutral,
1248 /* 100 */
1249 KW_no_attack, 1172 KW_no_attack,
1250 KW_no_damage, 1173 KW_no_damage,
1251 KW_obj_original, 1174 KW_obj_original,
1252 KW_NULL, 1175 KW_random_speed,
1253 KW_activate_on_push, 1176 KW_activate_on_push,
1254 KW_activate_on_release, 1177 KW_activate_on_release,
1255 KW_is_water, 1178 KW_is_water,
1256 KW_use_content_on_gen, 1179 KW_use_content_on_gen,
1257 KW_NULL, 1180 KW_NULL,
1181 /* 110 */
1258 KW_is_buildable, 1182 KW_is_buildable,
1259 /* 110 */
1260 KW_destroy_on_death, 1183 KW_destroy_on_death,
1261 KW_NULL, 1184 KW_NULL,
1262 }; 1185 };
1263 1186
1264 int i; 1187 // obj_original is the only commonly differing flag between archetype
1188 // and object, so special-case it here to be able to skip the loop
1189 static const struct flagmask : object::flags_t
1190 {
1191 flagmask ()
1192 {
1193 for (int i = 0; i < NUM_FLAGS; i++)
1194 if (flag_names [i])
1195 set (i);
1196 }
1197 } flagmask;
1265 1198
1266 /* This saves the key/value lists. We do it first so that any 1199 /* This saves the key/value lists. We do it first so that any
1267 * keys that match field names will be overwritten by the loader. 1200 * keys that match field names will be overwritten by the loader.
1268 */ 1201 */
1269 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1202 for (key_value *kv = op->kv.first; kv; kv = kv->next)
1270 { 1203 if (arch->kv.empty () || arch->kv [kv->key] != kv->value)
1271 /* Find the field in the opposing member. */ 1204 f.put (kv->key, kv->value);
1272 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1273 1205
1274 /* If there's no partnering field, or it's got a different value, save our field. */ 1206 if (op->uuid)
1275 if (!arch_field || my_field->value != arch_field->value)
1276 f.put (my_field->key, my_field->value);
1277 } 1207 {
1208 // highly optimised - this is often 25% of all data written
1209 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1210 char *ptr = cur;
1278 1211
1279 /* We don't need to worry about the arch's extra fields - they 1212 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1280 * will get taken care of the copy_to method. 1213 ptr += sizeof ("uuid ") - 1;
1281 */ 1214 ptr = op->uuid.append (ptr);
1215 *ptr++ = '\n';
1282 1216
1283 { 1217 f.alloc (ptr - cur);
1284 char uids[64];
1285 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1286 f.put (KW_uuid, (const char *)uids);
1287 } 1218 }
1288 1219
1289#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1220#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v)
1290#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1221#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v)
1222
1223 CMP_OUT (x);
1224 CMP_OUT (y);
1225
1226 CMP_OUT (type);
1227 CMP_OUT (subtype);
1228 CMP_OUT (direction);
1291 1229
1292 CMP_OUT (name); 1230 CMP_OUT (name);
1293 CMP_OUT (name_pl); 1231 CMP_OUT (name_pl);
1294 CMP_OUT (custom_name); 1232 CMP_OUT (speed);
1233
1234 // speed_left is a major time-burner, and has good locality, so
1235 // we use a simple lookup-cache to avoid the very slow printf.
1236 if (op->speed_left != arch->speed_left)
1237 {
1238 static double last_speed_left = 0.;
1239 static char last_speed_left_str [256] = "sl 0\n";
1240 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1241
1242 if (last_speed_left != op->speed_left)
1243 {
1244 last_speed_left = op->speed_left;
1245 last_speed_left_len = sizeof ("sl ") - 1
1246 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1247 }
1248
1249 f.add (last_speed_left_str, last_speed_left_len);
1250 }
1251
1295 CMP_OUT (title); 1252 CMP_OUT (title);
1296 CMP_OUT (race); 1253 CMP_OUT (race);
1297 CMP_OUT (slaying); 1254 CMP_OUT (slaying);
1255 CMP_OUT (skill);
1298 1256
1299 if (op->msg != tmp->msg) 1257 CMP_OUT (tag);
1300 f.put (KW_msg, KW_endmsg, op->msg); 1258 CMP_OUT (custom_name);
1301 if (op->lore != tmp->lore) 1259
1302 f.put (KW_lore, KW_endlore, op->lore); 1260 if (object *owner = op->owner)
1261 if (const char *ref = owner->ref ())
1262 f.put (KW(owner), ref);
1263
1264 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1303 1265
1304 CMP_OUT (other_arch); 1266 CMP_OUT (other_arch);
1305 1267
1306 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1268 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1269 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1307 1270
1271 if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0);
1272 if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0);
1273 if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0);
1274
1308 if (op->animation_id != tmp->animation_id) 1275 if (op->animation_id != arch->animation_id)
1309 if (op->animation_id) 1276 if (op->has_anim ())
1277 f.put (KW(animation), op->anim ().name);
1278 else
1310 { 1279 {
1311 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1280 f.put (KW(animation));
1312 1281 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1313 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1314 f.put (KW_is_animated, (sint32) 0);
1315 } 1282 }
1316 else
1317 f.put (KW_animation, (const char *) 0);
1318 1283
1319 CMP_OUT2 (str, stats.Str); 1284 CMP_OUT2 (str, stats.Str);
1320 CMP_OUT2 (dex, stats.Dex); 1285 CMP_OUT2 (dex, stats.Dex);
1321 CMP_OUT2 (con, stats.Con); 1286 CMP_OUT2 (con, stats.Con);
1322 CMP_OUT2 (wis, stats.Wis); 1287 CMP_OUT2 (wis, stats.Wis);
… …
1331 CMP_OUT2 (grace, stats.grace); 1296 CMP_OUT2 (grace, stats.grace);
1332 CMP_OUT2 (maxgrace, stats.maxgrace); 1297 CMP_OUT2 (maxgrace, stats.maxgrace);
1333 CMP_OUT2 (exp, stats.exp); 1298 CMP_OUT2 (exp, stats.exp);
1334 1299
1335 CMP_OUT (perm_exp); 1300 CMP_OUT (perm_exp);
1336 CMP_OUT (expmul); 1301 //CMP_OUT (expmul);
1337 1302
1338 CMP_OUT2 (food, stats.food); 1303 CMP_OUT2 (food, stats.food);
1339 CMP_OUT2 (dam, stats.dam); 1304 CMP_OUT2 (dam, stats.dam);
1340 CMP_OUT2 (luck, stats.luck); 1305 CMP_OUT2 (luck, stats.luck);
1341 CMP_OUT2 (wc, stats.wc); 1306 CMP_OUT2 (wc, stats.wc);
1342 CMP_OUT2 (ac, stats.ac); 1307 CMP_OUT2 (ac, stats.ac);
1343 1308
1344 CMP_OUT (x);
1345 CMP_OUT (y);
1346 CMP_OUT (speed);
1347 CMP_OUT (speed_left);
1348 CMP_OUT2 (move_state, move_status); 1309 CMP_OUT2 (move_state, move_status);
1349 CMP_OUT (attack_movement); 1310 CMP_OUT (attack_movement);
1350 CMP_OUT (nrof); 1311 CMP_OUT (nrof);
1351 CMP_OUT (level); 1312 CMP_OUT (level);
1352 CMP_OUT (direction);
1353 CMP_OUT (type);
1354 CMP_OUT (subtype);
1355 CMP_OUT (attacktype); 1313 CMP_OUT (attacktype);
1356 1314
1315 // using memcmp here seems to be a loss - is gcc vectorising?
1357 for (i = 0; i < NROFATTACKS; i++) 1316 for (int i = 0; i < NROFATTACKS; i++)
1358 if (op->resist[i] != tmp->resist[i]) 1317 if (expect_false (op->resist[i] != arch->resist[i]))
1359 f.put (resist_save[i], op->resist[i]); 1318 f.put (resist_save[i], op->resist[i]);
1360 1319
1361 CMP_OUT (path_attuned); 1320 CMP_OUT (path_attuned);
1362 CMP_OUT (path_repelled); 1321 CMP_OUT (path_repelled);
1363 CMP_OUT (path_denied); 1322 CMP_OUT (path_denied);
1323
1364 CMP_OUT2 (material, materials);//TODO: nuke 1324 CMP_OUT2 (material, materials);//TODO: nuke
1365 CMP_OUT (materialname); 1325 if (op->material != arch->material)
1326 f.put (KW(materialname), op->material->name);
1327
1366 CMP_OUT (value); 1328 CMP_OUT (value);
1367 CMP_OUT (carrying); 1329 CMP_OUT (carrying);
1368 CMP_OUT (weight); 1330 CMP_OUT (weight);
1369 CMP_OUT (invisible); 1331 CMP_OUT (invisible);
1370 CMP_OUT (state); 1332 CMP_OUT (state);
… …
1373 CMP_OUT (last_sp); 1335 CMP_OUT (last_sp);
1374 CMP_OUT (last_grace); 1336 CMP_OUT (last_grace);
1375 CMP_OUT (last_eat); 1337 CMP_OUT (last_eat);
1376 CMP_OUT (glow_radius); 1338 CMP_OUT (glow_radius);
1377 1339
1378 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1340 if (op->flag [FLAG_IS_LINKED])
1341 if (auto (ol, op->find_link ()))
1379 f.put (KW_connected, i); 1342 f.put (KW(connected), ol->id);
1380 1343
1381 CMP_OUT (randomitems); 1344 CMP_OUT (randomitems);
1345
1382 CMP_OUT2 (container, weight_limit); 1346 CMP_OUT2 (container, weight_limit);
1383 1347
1384 CMP_OUT (run_away); 1348 CMP_OUT (run_away);
1385 CMP_OUT (pick_up); 1349 CMP_OUT (pick_up);
1386 CMP_OUT (will_apply); 1350 CMP_OUT (will_apply);
1387 CMP_OUT (smoothlevel); 1351 CMP_OUT (smoothlevel);
1388 CMP_OUT (weapontype); 1352 CMP_OUT (weapontype);
1389 CMP_OUT (tooltype);
1390 CMP_OUT (elevation);
1391 CMP_OUT (client_type); 1353 CMP_OUT (client_type);
1392 CMP_OUT (item_power); 1354 CMP_OUT (item_power);
1393 CMP_OUT (duration); 1355 CMP_OUT (duration);
1394 CMP_OUT (range); 1356 CMP_OUT (range);
1395 CMP_OUT (range_modifier); 1357 CMP_OUT (range_modifier);
… …
1403 CMP_OUT (move_on); 1365 CMP_OUT (move_on);
1404 CMP_OUT (move_off); 1366 CMP_OUT (move_off);
1405 CMP_OUT (move_slow); 1367 CMP_OUT (move_slow);
1406 CMP_OUT (move_slow_penalty); 1368 CMP_OUT (move_slow_penalty);
1407 1369
1408 if (op->flag != tmp->flag) 1370 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1371
1372#if stdcpp // we need gcc, sorry
1373 if (diff [FLAG_OBJ_ORIGINAL])
1374 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1375
1376 diff.reset (FLAG_OBJ_ORIGINAL);
1377
1378 // quickly test whether any other flags differ
1379 if (expect_true (diff.any ()))
1409 for (i = 0; i <= NUM_FLAGS; i++) 1380 for (int i = 0; i < NUM_FLAGS; i++)
1410 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1381 if (expect_false (diff [i]))
1411 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1382 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1383#else
1384 // use sgi extensions
1385 for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i))
1386 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1387#endif
1412 1388
1413 // save body locations 1389 // save body locations. gcc's memcmp does an abysmal job when used
1414 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1390 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1415 if (op->slot[i].info != tmp->slot[i].info) 1391 if (expect_false (op->slot[i].info != arch->slot[i].info))
1416 f.put (body_locations[i].save_name, op->slot[i].info); 1392 f.put (body_locations[i].kw, op->slot[i].info);
1417} 1393}
1418 1394
1419/* 1395/*
1420 * Dumps all variables in an object to a file. 1396 * Dumps all variables in an object to a file.
1421 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1397 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1422 * the only place this is not set is when saving the player. 1398 * the only place this is not set is when saving the player.
1423 */ 1399 */
1424bool 1400bool
1425object::write (object_freezer &f) 1401object::write (object_freezer &f)
1426{ 1402{
1427 /* Even if the object does have an owner, it would seem that we should 1403 if (expect_false (is_arch ()))
1428 * still save it. 1404 {
1429 */ 1405 f.put (KW(object), arch->archname);
1430 if (owner) 1406 write_diff (f, this, archetype::empty);
1431 return true; 1407 }
1432 1408 else
1433 archetype *at = arch ? (archetype *)arch : empty_archetype; 1409 {
1434
1435 f.put (KW_arch, at->name); 1410 f.put (KW(arch), arch->archname);
1436 write_diff (f, this, &at->clone); 1411 write_diff (f, this, arch);
1412 }
1437 1413
1438 for (object *tmp = inv; tmp; tmp = tmp->below) 1414 for (object *tmp = inv; tmp; tmp = tmp->below)
1439 tmp->write (f); 1415 tmp->write (f);
1440 1416
1441 f.put (this); 1417 f.put (this);
1442 f.put (KW_end); 1418 f.put (KW(end));
1443 1419
1444 return true; 1420 return true;
1445} 1421}
1446 1422
1447///////////////////////////////////////////////////////////////////////////// 1423/////////////////////////////////////////////////////////////////////////////
1448 1424
1449// generic resource file load, 1425// generic resource file load,
1450// currently supports: region, treasures, archetypes 1426// currently supports: region, treasures, archetypes
1427bool
1451bool load_resource_file (const char *filename) 1428load_resource_file_ (const char *filename)
1452{ 1429{
1453 object_thawer f (filename); 1430 object_thawer f (filename);
1454 1431
1455 bool success = false;
1456 bool seen_arch = false;
1457
1458 f.next ();
1459
1460 for (;;) 1432 for (;;)
1461 { 1433 {
1434 coroapi::cede_to_tick ();
1435
1462 switch (f.kw) 1436 switch (f.kw)
1463 { 1437 {
1464 case KW_region: 1438 case KW_region:
1465 if (!region::read (f)) 1439 if (!region::read (f))
1466 goto finish; 1440 return false;
1467 break; 1441 break;
1468 1442
1469 case KW_treasure: 1443 case KW_treasure:
1470 case KW_treasureone: 1444 case KW_treasureone:
1471 if (!treasurelist::read (f)) 1445 if (!treasurelist::read (f))
1472 goto finish; 1446 return false;
1473 break; 1447 break;
1474 1448
1475 case KW_object: 1449 case KW_object:
1476 seen_arch = true;
1477 if (!archetype::read (f)) 1450 if (!archetype::read (f))
1478 goto finish; 1451 return false;
1479 break; 1452 break;
1480 1453
1481 case KW_EOF: 1454 case KW_EOF:
1482 success = true; 1455 return true;
1483 goto finish;
1484 1456
1485 default: 1457 default:
1486 if (!f.parse_error ("resource file")) 1458 if (!f.parse_error ("resource file"))
1487 goto finish; 1459 return false;
1488 1460
1489 f.next (); 1461 f.next ();
1490 break; 1462 break;
1491 } 1463 }
1492 } 1464 }
1493
1494finish:
1495 if (seen_arch)
1496 init_archetype_pointers ();
1497
1498 return success;
1499} 1465}
1500 1466

Diff Legend

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