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.48 by root, Fri Jan 19 17:50:10 2007 UTC vs.
Revision 1.67 by root, Sun Mar 18 03:05:39 2007 UTC

… …
24 24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 27 variable. */
28 28
29
30#include <global.h> 29#include <global.h>
31#include <loader.h> 30#include <loader.h>
32#include <sproto.h> 31#include <sproto.h>
33 32
34// future resource loader base class 33/////////////////////////////////////////////////////////////////////////////
35struct loader_base
36{
37 virtual archetype *get_arch (const char *name);
38 virtual void put_arch (archetype *arch);
39
40 virtual object *get_object (const char *name);
41 virtual void put_object (object *op);
42
43 virtual player *get_player ();
44 virtual void put_player (player *pl);
45
46 virtual region *get_region ();
47 virtual void put_region (region *region);
48
49 virtual facetile *get_face (const char *name);
50 virtual void put_face (facetile *face);
51
52 virtual treasurelist *get_treasure (const char *name, bool one = false);
53 virtual void put_treasure (treasurelist *treasure);
54
55 virtual animation *get_animation (const char *name);
56 virtual void put_animation (animation *anim);
57};
58
59// future generic resource loader
60// handles generic stuff valid in most files, such as
61// animations, treasures, faces and so on
62struct loader_generic : loader_base
63{
64 virtual region *get_region ();
65 virtual void put_region (region *region);
66
67 virtual facetile *get_face (const char *name);
68 virtual void put_face (facetile *face);
69
70 virtual treasurelist *get_treasure (const char *name, bool one = false);
71 virtual void put_treasure (treasurelist *treasure);
72
73 virtual animation *get_animation (const char *name);
74 virtual void put_animation (animation *anim);
75};
76
77/* Maps the MOVE_* values to names */
78static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
79 34
80/* This table is only necessary to convert objects that existed before the 35/* This table is only necessary to convert objects that existed before the
81 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
82 * to go through every mapping looking for every potion, rod, wand, etc 37 * to go through every mapping looking for every potion, rod, wand, etc
83 * that had a sp set and update to the new value. So this maps the 38 * that had a sp set and update to the new value. So this maps the
… …
305 * to check for objects to make sure there are no common errors. 260 * to check for objects to make sure there are no common errors.
306 */ 261 */
307static void 262static void
308check_loaded_object (object *op) 263check_loaded_object (object *op)
309{ 264{
310 int ip;
311
312 /* We do some specialised handling to handle legacy cases of name_pl. 265 /* We do some specialised handling to handle legacy cases of name_pl.
313 * If the object doesn't have a name_pl, we just use the object name - 266 * If the object doesn't have a name_pl, we just use the object name -
314 * this isn't perfect (things won't be properly pluralised), but works to 267 * this isn't perfect (things won't be properly pluralised), but works to
315 * that degree (5 heart is still quite understandable). But the case we 268 * that degree (5 heart is still quite understandable). But the case we
316 * also have to catch is if this object is not using the normal name for 269 * also have to catch is if this object is not using the normal name for
317 * the object. In that case, we also want to use the loaded name. 270 * the object. In that case, we also want to use the loaded name.
318 * Otherwise, what happens is that the the plural name will lose 271 * Otherwise, what happens is that the the plural name will lose
319 * information (appear as just 'hearts' and not 'goblins heart') 272 * information (appear as just 'hearts' and not 'goblins heart')
320 */ 273 */
321 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) 274 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl)
322 op->name_pl = NULL; 275 op->name_pl = 0;
323 276
324 if (!op->name_pl) 277 if (!op->name_pl)
325 op->name_pl = op->name; 278 op->name_pl = op->name;
326 279
327 /* objects now have a materialname. try to patch it in */ 280 /* objects now have a materialname. try to patch it in */
… …
330 if (op->map != NULL) 283 if (op->map != NULL)
331 set_materialname (op, op->map->difficulty, NULL); 284 set_materialname (op, op->map->difficulty, NULL);
332 else 285 else
333 set_materialname (op, 5, NULL); 286 set_materialname (op, 5, NULL);
334 } 287 }
288
335 /* only do these when program is first run - a bit 289 /* only do these when program is first run - a bit
336 * excessive to do this at every run - most of this is 290 * excessive to do this at every run - most of this is
337 * really just to catch any errors - program will still run, but 291 * really just to catch any errors - program will still run, but
338 * not in the ideal fashion. 292 * not in the ideal fashion.
339 */ 293 */
340 if ((op->type == WEAPON || op->type == BOW) && arch_init) 294 if ((op->type == WEAPON || op->type == BOW) && arch_init)
341 { 295 {
342 if (!op->skill) 296 if (!op->skill)
343 {
344 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 297 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
345 }
346 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || 298 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) ||
347 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 299 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
348 {
349 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); 300 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill);
350 }
351 } 301 }
352 302
353 /* We changed last_heal to gen_sp_armour, which is what it 303 /* We changed last_heal to gen_sp_armour, which is what it
354 * really does for many objects. Need to catch any in maps 304 * really does for many objects. Need to catch any in maps
355 * that may have an old value. 305 * that may have an old value.
356 */ 306 */
357 if ((op->type == WEAPON) || 307 if (op->type == WEAPON
358 (op->type == ARMOUR) || (op->type == HELMET) || 308 || op->type == ARMOUR || op->type == HELMET
359 (op->type == SHIELD) || (op->type == RING) || 309 || op->type == SHIELD || op->type == RING
360 (op->type == BOOTS) || (op->type == GLOVES) || 310 || op->type == BOOTS || op->type == GLOVES
361 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) 311 || op->type == AMULET || op->type == GIRDLE
312 || op->type == BRACERS || op->type == CLOAK)
362 { 313 {
363 if (op->last_heal) 314 if (op->last_heal)
364 { 315 {
365 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 316 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());
366 op->gen_sp_armour = op->last_heal; 317 op->gen_sp_armour = op->last_heal;
367 op->last_heal = 0; 318 op->last_heal = 0;
368 } 319 }
369 320
370 ip = calc_item_power (op, 0); 321 int ip = calc_item_power (op, 0);
322
371 /* Legacy objects from before item power was in the game */ 323 /* Legacy objects from before item power was in the game */
372 if (!op->item_power && ip) 324 if (!op->item_power && ip)
373 { 325 {
374 if (ip > 3) 326 if (ip > 3)
375 {
376 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); 327 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip);
377 } 328
378 op->item_power = ip; 329 op->item_power = ip;
379 } 330 }
331
380 /* Check for possibly bogus values. Has to meet both these criteria - 332 /* Check for possibly bogus values. Has to meet both these criteria -
381 * something that has item_power 1 is probably just fine if our calculated 333 * something that has item_power 1 is probably just fine if our calculated
382 * value is 1 or 2 - these values are small enough that hard to be precise. 334 * value is 1 or 2 - these values are small enough that hard to be precise.
383 * similarly, it item_power is 0, the first check will always pass, 335 * similarly, it item_power is 0, the first check will always pass,
384 * but not the second one. 336 * but not the second one.
385 */ 337 */
386 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 338 if (ip > 2 * op->item_power && ip > (op->item_power + 3))
387 {
388 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); 339 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power);
389 }
390
391 } 340 }
341
392 /* Old spellcasting object - need to load in the appropiate object */ 342 /* Old spellcasting object - need to load in the appropiate object */
393 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || 343 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL ||
394 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 344 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
395 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) 345 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init)
396 { 346 {
397 object *tmp;
398
399 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 347 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'
400 * in that spell was stored in sp. 348 * in that spell was stored in sp.
401 */ 349 */
402 tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); 350 object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]);
403 insert_ob_in_ob (tmp, op); 351 insert_ob_in_ob (tmp, op);
404 op->randomitems = NULL; /* So another spell isn't created for this object */ 352 op->randomitems = NULL; /* So another spell isn't created for this object */
405 } 353 }
354
406 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 355 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
407
408 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) 356 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init)
409 { 357 {
410 object *tmp;
411
412 tmp = get_archetype_by_object_name (op->slaying); 358 object *tmp = get_archetype_by_object_name (op->slaying);
413 insert_ob_in_ob (tmp, op); 359 insert_ob_in_ob (tmp, op);
414 op->randomitems = NULL; /* So another spell isn't created for this object */ 360 op->randomitems = NULL; /* So another spell isn't created for this object */
415 /* without this, value is all screwed up */ 361 /* without this, value is all screwed up */
416 op->value = op->arch->clone.value * op->inv->value; 362 op->value = op->arch->clone.value * op->inv->value;
417 } 363 }
418 364
419 if (QUERY_FLAG (op, FLAG_MONSTER)) 365 if (QUERY_FLAG (op, FLAG_MONSTER))
420 { 366 {
421 if (op->stats.hp > op->stats.maxhp) 367 if (op->stats.hp > op->stats.maxhp)
368 {
422 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 369 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);
370 op->stats.maxhp = op->stats.hp;
371 }
423 372
424 /* The archs just need to be updated for this */ 373 /* The archs just need to be updated for this */
425 if (op->move_type == 0) 374 if (op->move_type == 0)
426 op->move_type = MOVE_WALK; 375 op->move_type = MOVE_WALK;
427 } 376 }
… …
450 { 399 {
451 op->move_type = MOVE_ALL; 400 op->move_type = MOVE_ALL;
452 op->stats.maxhp = 0; 401 op->stats.maxhp = 0;
453 } 402 }
454 else 403 else
404 op->move_type = MOVE_WALK;
405 }
406 }
407
408}
409
410static void
411set_move (MoveType &mt, const char *str)
412{
413 static const struct flagstr {
414 const char *name;
415 MoveType flags;
416 } move_flags[] = {
417 { "walk" , MOVE_WALK },
418 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
419 { "fly_low" , MOVE_FLY_LOW },
420 { "fly_high", MOVE_FLY_HIGH },
421 { "swim" , MOVE_SWIM },
422 { "boat" , MOVE_BOAT },
423 { "all" , MOVE_ALL },
424 };
425
426 if (!str)
427 {
428 mt = 0;
429 return;
430 }
431
432 if (isdigit (*str))
433 {
434 mt = atoi (str);
435 return;
436 }
437
438 mt = 0;
439
440 for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
441 {
442 bool negate = 0;
443
444 if (*str == '-')
445 {
446 negate = 1;
447 str++;
448 }
449
450 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f)
451 {
452 if (!strcmp (f->name, str))
455 { 453 {
456 op->move_type = MOVE_WALK; 454 if (negate)
455 mt &= ~f->flags;
456 else
457 mt |= f->flags;
458
459 goto next;
457 } 460 }
458 } 461 }
459 }
460 462
463 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str);
464
465next: ;
466 }
461} 467}
462 468
463static void
464set_move (MoveType & mt, const char *str)
465{
466 if (!str)
467 {
468 mt = 0;
469 return;
470 }
471
472 if (isdigit (*str))
473 {
474 mt = atoi (str);
475 return;
476 }
477
478 mt = 0;
479
480 for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
481 {
482 if (!strcasecmp (str, "all"))
483 mt |= MOVE_ALL;
484 else
485 {
486 int i, negate = 0;
487
488 if (*str == '-')
489 {
490 negate = 1;
491 str++;
492 }
493
494 for (i = 0; move_name[i]; i++)
495 {
496 if (!strcasecmp (move_name[i], str))
497 {
498 if (negate)
499 mt &= ~(1 << i);
500 else
501 mt |= (1 << i);
502
503 break;
504 }
505 }
506
507 if (!move_name[i])
508 {
509 /* fly is a special case - covers both fly_low and
510 * fly_high - since it doesn't match to a specific
511 * single bit, have to special case it.
512 */
513 if (!strcasecmp (str, "flying"))
514 {
515 if (negate)
516 mt &= ~MOVE_FLYING;
517 else
518 mt |= MOVE_FLYING;
519 }
520 else
521 LOG (llevDebug, "common/loader.l: set_move - unknown move string '%s'\n", str);
522 }
523 }
524 }
525}
526
527#define GET_FLAG(op,flag) \ 469#define GET_FLAG(op,flag) \
528 if (thawer.get_sint32 ()) \ 470 if (f.get_sint32 ()) \
529 SET_FLAG (op, flag); \ 471 SET_FLAG (op, flag); \
530 else \ 472 else \
531 CLEAR_FLAG (op, flag) \ 473 CLEAR_FLAG (op, flag) \
532 474
533int 475bool
534parse_object (object *op, object_thawer &thawer, int map_flags) 476object::parse_kv (object_thawer &f)
535{ 477{
536 bool ismore = 0; 478 assert (f.kw == KW_object || f.kw == KW_arch);
479
480 if (f.kw == KW_object)
481 f.get (name); // preset name from object name
482
483 f.next ();
484
537 object *op_inv = op->inv; 485 object *op_inv = inv;
538 486
539 for (;;) 487 for (;;)
540 { 488 {
541 keyword kw = thawer.get_kv ();
542
543 switch (kw) 489 switch (f.kw)
544 { 490 {
545 case KW_Object: // uppercase alias
546 case KW_object:
547 thawer.get (op->name);
548
549 if (op->arch)
550 op->arch->name = op->name;
551
552 break;
553
554 case KW_uuid: 491 case KW_uuid:
555 if (const char *s = thawer.get_str ()) 492 if (const char *s = f.get_str ())
556 { 493 {
557 unsigned int version; 494 unsigned int version;
558 unsigned long long seq; 495 unsigned long long seq;
559 496
560 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) 497 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
561 { 498 {
562 op->uuid.seq = seq; 499 uuid.seq = seq;
563 break; 500 break;
564 } 501 }
565 } 502 }
566 503
567 op->uuid = gen_uuid (); 504 uuid = gen_uuid ();
568 break; 505 break;
569 506
570 case KW_oid: 507 case KW_oid:
571 thawer.get (op, thawer.get_sint32 ()); 508 f.get (this, f.get_sint32 ());
572 break; 509 break;
573 510
574 case KW_name: thawer.get (op->name); break; 511 case KW_name: f.get (name); break;
575 case KW_name_pl: thawer.get (op->name_pl); break; 512 case KW_name_pl: f.get (name_pl); break;
576 case KW_title: thawer.get (op->title); break; 513 case KW_title: f.get (title); break;
577 case KW_custom_name: thawer.get (op->custom_name); break; 514 case KW_custom_name: f.get (custom_name); break;
578 515
579 case KW_attach: thawer.get_ornull (op->attach); break; 516 case KW_attach: f.get_ornull (attach); break;
580 case KW_skill: thawer.get_ornull (op->skill); break; 517 case KW_skill: f.get_ornull (skill); break;
581 case KW_race: thawer.get_ornull (op->race); break; 518 case KW_race: f.get_ornull (race); break;
582 case KW_slaying: thawer.get_ornull (op->slaying); break; 519 case KW_slaying: f.get_ornull (slaying); break;
583 520
584 case KW_arch: 521 case KW_arch:
585 { 522 {
586 const char *str = thawer.get_str ();
587
588 if (op->arch)
589 {
590 /* If op->arch has been set, then this new object
591 * must be part of the inventory. So process
592 * appropriately.
593 */
594 archetype *arch = archetype::find (str);
595
596 object *tmp;
597
598 if (arch)
599 tmp = arch_to_object (arch);
600 else
601 {
602 tmp = object::create (); 523 object *tmp = object::read (f);
603 /* record the name of the broken object */
604 tmp->name = str;
605 }
606
607 // decativate the object we, as we are still going
608 // to read the speed value. Objects should be activated
609 // when the map, object or player is completly loaded.
610 tmp->deactivate (); 524 tmp->deactivate ();
611 525
612 parse_object (tmp, thawer, map_flags);
613
614 if (tmp->arch)
615 { 526 {
616 // was: insert_ob_in_ob (tmp, op); 527 // was: insert_ob_in_ob (tmp, op);
617 // but manually adding it can improve map loading times a lot 528 // but manually adding it can improve map loading times a lot
618 // also, appending instead of prepending keeps the 529 // also, appending instead of prepending keeps the
619 // save ordering the same between repeated load/saves. 530 // save ordering the same between repeated load/saves.
620 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 531 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
621 CLEAR_FLAG (tmp, FLAG_REMOVED); 532 CLEAR_FLAG (tmp, FLAG_REMOVED);
622 533
623 if (!op_inv) 534 if (!op_inv)
624 { 535 {
625 op->inv = tmp;
626 tmp->above = 0;
627 }
628 else
629 {
630 while (op_inv->below)
631 op_inv = op_inv->below;
632
633 op_inv->below = tmp;
634 tmp->above = op_inv;
635 }
636
637 tmp->below = 0;
638 tmp->env = op;
639 op_inv = tmp; 536 inv = tmp;
537 tmp->above = 0;
640 } 538 }
641 else 539 else
642 { 540 {
643 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); 541 while (op_inv->below)
644 tmp->destroy (); 542 op_inv = op_inv->below;
543
544 op_inv->below = tmp;
545 tmp->above = op_inv;
645 } 546 }
547
548 tmp->below = 0;
549 tmp->env = this;
550 op_inv = tmp;
646 } 551 }
647 else
648 {
649 /* This is the actual archetype definition then */
650 op->arch = archetype::find (str);
651
652 if (op->arch)
653 {
654 op->arch->clone.copy_to (op);
655 // copy_to activates, this should be fixed properly
656 op->deactivate ();
657 }
658 else if (!arch_init)
659 /* record the name of the broken object */
660 op->name = str;
661 }
662 } 552 }
663 break; 553 continue;
664 554
665 case KW_other_arch: 555 case KW_other_arch:
666 op->other_arch = archetype::find (thawer.get_str ()); 556 other_arch = archetype::find (f.get_str ());
667 break; 557 break;
668 558
669 case KW_animation: 559 case KW_animation:
670 { 560 {
561 CLEAR_FLAG (this, FLAG_ANIMATE);
562 animation_id = 0;
563
671 const char *str = thawer.get_str (); 564 const char *str = f.get_str ();
672
673 if (!str)
674 {
675 op->animation_id = 0;
676 CLEAR_FLAG (op, FLAG_ANIMATE);
677 }
678 else if ((op->animation_id = find_animation (str))) 565 if (str && (animation_id = find_animation (str)))
679 SET_FLAG (op, FLAG_ANIMATE); 566 SET_FLAG (this, FLAG_ANIMATE);
680 } 567 }
681
682 break; 568 break;
683 569
684 case KW_last_heal: thawer.get (op->last_heal); break; 570 case KW_last_heal: f.get (last_heal); break;
685 case KW_last_sp: thawer.get (op->last_sp); break; 571 case KW_last_sp: f.get (last_sp); break;
686 case KW_last_grace: thawer.get (op->last_grace); break; 572 case KW_last_grace: f.get (last_grace); break;
687 case KW_last_eat: thawer.get (op->last_eat); break; 573 case KW_last_eat: f.get (last_eat); break;
688 case KW_speed_left: thawer.get (op->speed_left); break; 574 case KW_speed_left: f.get (speed_left); break;
689 575
690 case KW_speed: 576 case KW_speed:
691 thawer.get (op->speed); 577 f.get (speed);
692 578
693 //TODO: maybe do in check_object 579 //TODO: maybe do in check_object
694 // removed check for style maps 580 // removed check for style maps
695 if (op->speed < 0) 581 if (speed < 0)
696 op->speed_left = op->speed_left - rndm (); 582 speed_left = speed_left - rndm ();
697 583
698 break; 584 break;
699 585
700 case KW_slow_move: 586 case KW_slow_move:
701 op->move_slow |= MOVE_WALK; 587 move_slow |= MOVE_WALK;
702 thawer.get (op->move_slow_penalty); 588 f.get (move_slow_penalty);
703 break; 589 break;
704 590
705 case KW_face: 591 case KW_face:
706 op->face = &new_faces[FindFace (thawer.get_str (), 0)]; 592 face = face_find (f.get_str ());
707 break; 593 break;
708 594
709 case KW_x: thawer.get (op->x); break; 595 case KW_x: f.get (x); break;
710 case KW_y: thawer.get (op->y); break; 596 case KW_y: f.get (y); break;
711 597
712 case KW_Str: // uppercase alias 598 case KW_Str: // uppercase alias
713 case KW_str: thawer.get (op->stats.Str); break; 599 case KW_str: f.get (stats.Str); break;
714 case KW_Dex: // uppercase alias 600 case KW_Dex: // uppercase alias
715 case KW_dex: thawer.get (op->stats.Dex); break; 601 case KW_dex: f.get (stats.Dex); break;
716 case KW_Con: // uppercase alias 602 case KW_Con: // uppercase alias
717 case KW_con: thawer.get (op->stats.Con); break; 603 case KW_con: f.get (stats.Con); break;
718 case KW_Wis: // uppercase alias 604 case KW_Wis: // uppercase alias
719 case KW_wis: thawer.get (op->stats.Wis); break; 605 case KW_wis: f.get (stats.Wis); break;
720 case KW_Cha: // uppercase alias 606 case KW_Cha: // uppercase alias
721 case KW_cha: thawer.get (op->stats.Cha); break; 607 case KW_cha: f.get (stats.Cha); break;
722 case KW_Int: // uppercase alias 608 case KW_Int: // uppercase alias
723 case KW_int: thawer.get (op->stats.Int); break; 609 case KW_int: f.get (stats.Int); break;
724 case KW_Pow: // uppercase alias 610 case KW_Pow: // uppercase alias
725 case KW_pow: thawer.get (op->stats.Pow); break; 611 case KW_pow: f.get (stats.Pow); break;
726 612
727 case KW_hp: thawer.get (op->stats.hp); break; 613 case KW_hp: f.get (stats.hp); break;
728 case KW_maxhp: thawer.get (op->stats.maxhp); break; 614 case KW_maxhp: f.get (stats.maxhp); break;
729 case KW_sp: thawer.get (op->stats.sp); break; 615 case KW_sp: f.get (stats.sp); break;
730 case KW_maxsp: thawer.get (op->stats.maxsp); break; 616 case KW_maxsp: f.get (stats.maxsp); break;
731 case KW_grace: thawer.get (op->stats.grace); break; 617 case KW_grace: f.get (stats.grace); break;
732 case KW_maxgrace: thawer.get (op->stats.maxgrace); break; 618 case KW_maxgrace: f.get (stats.maxgrace); break;
733 619
734 case KW_exp: thawer.get (op->stats.exp); break; 620 case KW_exp: f.get (stats.exp); break;
735 case KW_perm_exp: thawer.get (op->perm_exp); break; 621 case KW_perm_exp: f.get (perm_exp); break;
736 case KW_food: thawer.get (op->stats.food); break; 622 case KW_food: f.get (stats.food); break;
737 case KW_dam: thawer.get (op->stats.dam); break; 623 case KW_dam: f.get (stats.dam); break;
738 case KW_wc: thawer.get (op->stats.wc); break; 624 case KW_wc: f.get (stats.wc); break;
739 case KW_ac: thawer.get (op->stats.ac); break; 625 case KW_ac: f.get (stats.ac); break;
740 case KW_nrof: thawer.get (op->nrof); break; 626 case KW_nrof: f.get (nrof); break;
741 case KW_level: thawer.get (op->level); break; 627 case KW_level: f.get (level); break;
742 case KW_direction: thawer.get (op->direction); break; 628 case KW_direction: f.get (direction); break;
743 case KW_type: thawer.get (op->type); break; 629 case KW_type: f.get (type); break;
744 case KW_subtype: thawer.get (op->subtype); break; 630 case KW_subtype: f.get (subtype); break;
745 case KW_value: thawer.get (op->value); break; 631 case KW_value: f.get (value); break;
746 case KW_weight: thawer.get (op->weight); break; 632 case KW_weight: f.get (weight); break;
747 case KW_carrying: thawer.get (op->carrying); break; 633 case KW_carrying: f.get (carrying); break;
748 case KW_attacktype: thawer.get (op->attacktype); break; 634 case KW_attacktype: f.get (attacktype); break;
749 case KW_path_attuned: thawer.get (op->path_attuned); break; 635 case KW_path_attuned: f.get (path_attuned); break;
750 case KW_path_repelled: thawer.get (op->path_repelled); break; 636 case KW_path_repelled: f.get (path_repelled); break;
751 case KW_path_denied: thawer.get (op->path_denied); break; 637 case KW_path_denied: f.get (path_denied); break;
752 case KW_invisible: thawer.get (op->invisible); break; 638 case KW_invisible: f.get (invisible); break;
753 case KW_magic: thawer.get (op->magic); break; 639 case KW_magic: f.get (magic); break;
754 case KW_state: thawer.get (op->state); break; 640 case KW_state: f.get (state); break;
755 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; 641 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
756 case KW_material: thawer.get (op->material); break; 642 case KW_material: f.get (materials); break; //TODO: nuke
757 case KW_materialname: thawer.get (op->materialname); break; 643 case KW_materialname: f.get (materialname); break;
758 644
759 /* These are the new values */ 645 /* These are the new values */
760 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; 646 case KW_move_block: set_move (move_block, f.get_str ()); break;
761 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; 647 case KW_move_allow: set_move (move_allow, f.get_str ()); break;
762 case KW_move_type: set_move (op->move_type, thawer.get_str ()); break; 648 case KW_move_type: set_move (move_type, f.get_str ()); break;
763 case KW_move_on: set_move (op->move_on, thawer.get_str ()); break; 649 case KW_move_on: set_move (move_on, f.get_str ()); break;
764 case KW_move_off: set_move (op->move_off, thawer.get_str ()); break; 650 case KW_move_off: set_move (move_off, f.get_str ()); break;
765 case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break; 651 case KW_move_slow: set_move (move_slow, f.get_str ()); break;
766 652
767 /* These are all legacy - any new objects should use the move_ .. values */ 653 /* These are all legacy - any new objects should use the move_ .. values */
768 case KW_no_pass: 654 case KW_no_pass:
769 { 655 {
770 if (thawer.get_sint32 ()) 656 if (f.get_sint32 ())
771 op->move_block = MOVE_ALL; 657 move_block = MOVE_ALL;
772 else 658 else
773 op->move_block = 0; 659 move_block = 0;
774 } 660 }
775 661
776 break; 662 break;
777 663
778 /* These are all legacy - any new objects should use the move_ .. values */ 664 /* These are all legacy - any new objects should use the move_ .. values */
779 case KW_walk_on: 665 case KW_walk_on:
780 { 666 {
781 if (thawer.get_sint32 ()) 667 if (f.get_sint32 ())
782 op->move_on |= MOVE_WALK; 668 move_on |= MOVE_WALK;
783 else 669 else
784 op->move_on &= ~MOVE_WALK; 670 move_on &= ~MOVE_WALK;
785 } 671 }
786 672
787 break; 673 break;
788 674
789 /* These are all legacy - any new objects should use the move_ .. values */ 675 /* These are all legacy - any new objects should use the move_ .. values */
790 case KW_walk_off: 676 case KW_walk_off:
791 { 677 {
792 if (thawer.get_sint32 ()) 678 if (f.get_sint32 ())
793 op->move_off |= MOVE_WALK; 679 move_off |= MOVE_WALK;
794 else 680 else
795 op->move_off &= ~MOVE_WALK; 681 move_off &= ~MOVE_WALK;
796 } 682 }
797 break; 683 break;
798 684
799 /* These are all legacy - any new objects should use the move_ .. values */ 685 /* These are all legacy - any new objects should use the move_ .. values */
800 case KW_fly_on: 686 case KW_fly_on:
801 { 687 {
802 if (thawer.get_sint32 ()) 688 if (f.get_sint32 ())
803 op->move_on |= MOVE_FLY_LOW; 689 move_on |= MOVE_FLY_LOW;
804 else 690 else
805 op->move_on &= ~MOVE_FLY_LOW; 691 move_on &= ~MOVE_FLY_LOW;
806 } 692 }
807 break; 693 break;
808 694
809 /* These are all legacy - any new objects should use the move_ .. values */ 695 /* These are all legacy - any new objects should use the move_ .. values */
810 case KW_fly_off: 696 case KW_fly_off:
811 { 697 {
812 if (thawer.get_sint32 ()) 698 if (f.get_sint32 ())
813 op->move_off |= MOVE_FLY_LOW; 699 move_off |= MOVE_FLY_LOW;
814 else 700 else
815 op->move_off &= ~MOVE_FLY_LOW; 701 move_off &= ~MOVE_FLY_LOW;
816 } 702 }
817 break; 703 break;
818 704
819 //TODO: remove these after converting archetypes 705 //TODO: remove these after converting archetypes
820 case KW_can_use_wand: 706 case KW_can_use_wand:
821 GET_FLAG (op, FLAG_USE_RANGE); 707 GET_FLAG (this, FLAG_USE_RANGE);
822 break; 708 break;
823 709
824 /* These are all legacy - any new objects should use the move_ .. values */ 710 /* These are all legacy - any new objects should use the move_ .. values */
825 case KW_flying: 711 case KW_flying:
826 { 712 {
827 if (thawer.get_sint32 ()) 713 if (f.get_sint32 ())
828 op->move_type |= MOVE_FLY_LOW; 714 move_type |= MOVE_FLY_LOW;
829 else 715 else
830 op->move_type &= ~MOVE_FLY_LOW; 716 move_type &= ~MOVE_FLY_LOW;
831 } 717 }
832 break; 718 break;
833 719
834 720
835 case KW_identified: 721 case KW_identified:
836 GET_FLAG (op, FLAG_IDENTIFIED); 722 GET_FLAG (this, FLAG_IDENTIFIED);
837 //TODO: move to check_object or so 723 //TODO: move to check_object or so
838 if (QUERY_FLAG (op, FLAG_IDENTIFIED)) 724 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
839 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 725 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
840 726
841 break; 727 break;
842 728
843 case KW_wiz: 729 case KW_wiz:
844 GET_FLAG (op, FLAG_WIZ); 730 GET_FLAG (this, FLAG_WIZ);
845 //TODO: move to check_object 731 //TODO: move to check_object
846 if (QUERY_FLAG (op, FLAG_WIZ)) 732 if (QUERY_FLAG (this, FLAG_WIZ))
847 { 733 {
848 SET_FLAG (op, FLAG_WAS_WIZ); 734 SET_FLAG (this, FLAG_WAS_WIZ);
849 SET_FLAG (op, FLAG_WIZPASS); 735 SET_FLAG (this, FLAG_WIZPASS);
850 SET_FLAG (op, FLAG_WIZCAST); 736 SET_FLAG (this, FLAG_WIZCAST);
851 } 737 }
852 else 738 else
853 { 739 {
854 CLEAR_FLAG (op, FLAG_WIZPASS); 740 CLEAR_FLAG (this, FLAG_WIZPASS);
855 CLEAR_FLAG (op, FLAG_WIZCAST); 741 CLEAR_FLAG (this, FLAG_WIZCAST);
856 } 742 }
857 break; 743 break;
858 744
859 case KW_friendly: 745 case KW_friendly:
860 if (thawer.get_sint32 ()) 746 if (f.get_sint32 ())
861 if (op->type != PLAYER) 747 if (type != PLAYER)
862 add_friendly_object (op); 748 add_friendly_object (this);
863 749
864 break; 750 break;
865 751
866 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 752 case KW_monster: GET_FLAG (this, FLAG_MONSTER); break;
867 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 753 case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break;
868 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 754 case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break;
869 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 755 case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break;
870 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break; 756 case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break;
871 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 757 case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break;
872 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 758 case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break;
873 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 759 case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break;
874 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 760 case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break;
875 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 761 case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break;
876 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 762 case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break;
877 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 763 case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break;
878 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 764 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
879 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; 765 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
880 case KW_alive: GET_FLAG (op, FLAG_ALIVE); break; 766 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
881 case KW_applied: GET_FLAG (op, FLAG_APPLIED); break; 767 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
882 case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break; 768 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
883 case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break; 769 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
884 case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break; 770 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
885 case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break; 771 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
886 case KW_changing: GET_FLAG (op, FLAG_CHANGING); break; 772 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
887 case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break; 773 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
888 case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break; 774 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
889 case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break; 775 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
890 case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break; 776 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
891 case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break; 777 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
892 case KW_scared: GET_FLAG (op, FLAG_SCARED); break; 778 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
893 case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break; 779 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
894 case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break; 780 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
895 case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break; 781 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
896 case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break; 782 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
897 case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break; 783 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
898 case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break; 784 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
899 case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break; 785 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
900 case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break; 786 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
901 case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break; 787 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
902 case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break; 788 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
903 case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break; 789 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
904 case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break; 790 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
905 case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break; 791 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
906 case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break; 792 case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break;
907 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; 793 case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break;
908 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break; 794 case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break;
909 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break; 795 case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break;
910 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break; 796 case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break;
911 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break; 797 case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break;
912 case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break; 798 case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break;
913 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; 799 case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break;
914 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; 800 case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break;
915 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; 801 case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break;
916 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; 802 case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break;
917 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; 803 case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break;
918 case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break; 804 case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break;
919 case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break; 805 case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
920 case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break; 806 case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break;
921 case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break; 807 case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break;
922 case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break; 808 case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break;
923 case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break; 809 case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break;
924 case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break; 810 case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break;
925 case KW_cursed: GET_FLAG (op, FLAG_CURSED); break; 811 case KW_cursed: GET_FLAG (this, FLAG_CURSED); break;
926 case KW_damned: GET_FLAG (op, FLAG_DAMNED); break; 812 case KW_damned: GET_FLAG (this, FLAG_DAMNED); break;
927 case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break; 813 case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break;
928 case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break; 814 case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break;
929 case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break; 815 case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break;
930 case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break; 816 case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break;
931 case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break; 817 case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break;
932 case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break; 818 case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break;
933 case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break; 819 case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break;
934 case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break; 820 case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break;
935 case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break; 821 case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break;
936 case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break; 822 case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break;
937 case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break; 823 case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break;
938 case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break; 824 case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break;
939 case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break; 825 case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break;
940 case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break; 826 case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break;
941 case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break; 827 case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break;
942 case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break; 828 case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break;
943 case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break; 829 case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break;
944 case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break; 830 case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break;
945 case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break; 831 case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break;
946 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 832 case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break;
947 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 833 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
948 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 834 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
949 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 835 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
950 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 836 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
951 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break; 837 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
952 838
953 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 839 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
954 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 840 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
955 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 841 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
956 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 842 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
957 case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break; 843 case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break;
958 case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break; 844 case KW_resist_cold: f.get (resist[ATNR_COLD]); break;
959 case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break; 845 case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break;
960 case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break; 846 case KW_resist_acid: f.get (resist[ATNR_ACID]); break;
961 case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break; 847 case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break;
962 case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break; 848 case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break;
963 case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break; 849 case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break;
964 case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break; 850 case KW_resist_poison: f.get (resist[ATNR_POISON]); break;
965 case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break; 851 case KW_resist_slow: f.get (resist[ATNR_SLOW]); break;
966 case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break; 852 case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break;
967 case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break; 853 case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break;
968 case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break; 854 case KW_resist_fear: f.get (resist[ATNR_FEAR]); break;
969 case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break; 855 case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break;
970 case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break; 856 case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break;
971 case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break; 857 case KW_resist_death: f.get (resist[ATNR_DEATH]); break;
972 case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break; 858 case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break;
973 case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break; 859 case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break;
974 case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break; 860 case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break;
975 case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break; 861 case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break;
976 case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break; 862 case KW_resist_blind: f.get (resist[ATNR_BLIND]); break;
977 case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break; 863 case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break;
978 case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break; 864 case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break;
979 case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break; 865 case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break;
980 866
981 case KW_luck: thawer.get (op->stats.luck); break; 867 case KW_luck: f.get (stats.luck); break;
982 case KW_run_away: thawer.get (op->run_away); break; 868 case KW_run_away: f.get (run_away); break;
983 case KW_pick_up: thawer.get (op->pick_up); break; 869 case KW_pick_up: f.get (pick_up); break;
984 case KW_item_power: thawer.get (op->item_power); break; 870 case KW_item_power: f.get (item_power); break;
985 case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break; 871 case KW_gen_sp_armour: f.get (gen_sp_armour); break;
986 case KW_anim_speed: thawer.get (op->anim_speed); break; 872 case KW_anim_speed: f.get (anim_speed); break;
987 case KW_container: thawer.get (op->weight_limit); break; 873 case KW_container: f.get (weight_limit); break;
988 case KW_will_apply: thawer.get (op->will_apply); break; 874 case KW_will_apply: f.get (will_apply); break;
989 case KW_attack_movement: thawer.get (op->attack_movement); break; 875 case KW_attack_movement: f.get (attack_movement); break;
990 case KW_move_state: thawer.get (op->move_status); break; 876 case KW_move_state: f.get (move_status); break;
991 case KW_expmul: thawer.get (op->expmul); break; 877 case KW_expmul: f.get (expmul); break;
992 case KW_glow_radius: thawer.get (op->glow_radius); break; 878 case KW_glow_radius: f.get (glow_radius); break;
993 case KW_weapontype: thawer.get (op->weapontype); break; 879 case KW_weapontype: f.get (weapontype); break;
994 case KW_tooltype: thawer.get (op->tooltype); break; 880 case KW_tooltype: f.get (tooltype); break;
995 case KW_casting_time: thawer.get (op->casting_time); break; 881 case KW_casting_time: f.get (casting_time); break;
996 case KW_elevation: thawer.get (op->elevation); break; 882 case KW_elevation: f.get (elevation); break;
997 case KW_smoothlevel: thawer.get (op->smoothlevel); break; 883 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
998 case KW_client_type: thawer.get (op->client_type); break; 884 case KW_client_type: f.get (client_type); break;
999 case KW_duration: thawer.get (op->duration); break; 885 case KW_duration: f.get (duration); break;
1000 case KW_range: thawer.get (op->range); break; 886 case KW_range: f.get (range); break;
1001 case KW_range_modifier: thawer.get (op->range_modifier); break; 887 case KW_range_modifier: f.get (range_modifier); break;
1002 case KW_dam_modifier: thawer.get (op->dam_modifier); break; 888 case KW_dam_modifier: f.get (dam_modifier); break;
1003 case KW_duration_modifier: thawer.get (op->duration_modifier); break; 889 case KW_duration_modifier: f.get (duration_modifier); break;
1004 890
1005 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 891 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
1006 //TODO: parse from other include files 892 //TODO: parse from other include files
1007 case KW_body_range: thawer.get (op->body_info[0]); break; 893 case KW_body_range: f.get (body_info[0]); break;
1008 case KW_body_arm: thawer.get (op->body_info[1]); break; 894 case KW_body_arm: f.get (body_info[1]); break;
1009 case KW_body_torso: thawer.get (op->body_info[2]); break; 895 case KW_body_torso: f.get (body_info[2]); break;
1010 case KW_body_head: thawer.get (op->body_info[3]); break; 896 case KW_body_head: f.get (body_info[3]); break;
1011 case KW_body_neck: thawer.get (op->body_info[4]); break; 897 case KW_body_neck: f.get (body_info[4]); break;
1012 case KW_body_skill: thawer.get (op->body_info[5]); break; 898 case KW_body_skill: f.get (body_info[5]); break;
1013 case KW_body_finger: thawer.get (op->body_info[6]); break; 899 case KW_body_finger: f.get (body_info[6]); break;
1014 case KW_body_shoulder: thawer.get (op->body_info[7]); break; 900 case KW_body_shoulder: f.get (body_info[7]); break;
1015 case KW_body_foot: thawer.get (op->body_info[8]); break; 901 case KW_body_foot: f.get (body_info[8]); break;
1016 case KW_body_hand: thawer.get (op->body_info[9]); break; 902 case KW_body_hand: f.get (body_info[9]); break;
1017 case KW_body_wrist: thawer.get (op->body_info[10]); break; 903 case KW_body_wrist: f.get (body_info[10]); break;
1018 case KW_body_waist: thawer.get (op->body_info[11]); break; 904 case KW_body_waist: f.get (body_info[11]); break;
1019 case KW_can_apply: 905 case KW_can_apply:
1020 break; 906 break;
1021 907
1022 case KW_connected: 908 case KW_connected:
1023 add_button_link (op, op->map, thawer.get_sint32 ()); 909 add_button_link (this, map, f.get_sint32 ());
1024 break; 910 break;
1025 911
1026 case KW_randomitems: 912 case KW_randomitems:
1027 op->randomitems = find_treasurelist (thawer.get_str ()); 913 randomitems = find_treasurelist (f.get_str ());
914 //if (!randomitems)
915 // LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1028 break; 916 break;
1029 917
1030 case KW_msg: 918 case KW_msg:
1031 thawer.get_ml (KW_endmsg, op->msg); 919 f.get_ml (KW_endmsg, msg);
1032 //TODO: allow longer messages 920 //TODO: allow longer messages
1033 if (strlen (op->msg) >= HUGE_BUF) 921 if (strlen (msg) >= HUGE_BUF)
1034 { 922 {
1035 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 923 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
1036 op->msg = "ERROR, please report: string too long, winged.\n"; 924 msg = "ERROR, please report: string too long, winged.\n";
1037 } 925 }
1038 break; 926 break;
1039 927
1040 case KW_lore: 928 case KW_lore:
1041 thawer.get_ml (KW_endlore, op->lore); 929 f.get_ml (KW_endlore, lore);
1042 //TODO: allow longer messages 930 //TODO: allow longer messages
1043 /* Just print a warning so we can be reasonably safe 931 /* Just print a warning so we can be reasonably safe
1044 * about not overflowing the buffer. 932 * about not overflowing the buffer.
1045 */ 933 */
1046 if (strlen (op->lore) > (HUGE_BUF / 2)) 934 if (strlen (lore) > (HUGE_BUF / 2))
1047 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 935 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1048 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 936 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
1049 break; 937 break;
1050 938
1051 case KW_editable: 939 case KW_editable:
1052 case KW_editor_folder: 940 case KW_editor_folder:
1053 break; 941 break;
1054 942
1055 case KW_More: // uppercase alias
1056 case KW_more:
1057 /* We need to record that this is a multipart object,
1058 * so the calling function can glue things back together
1059 */
1060 ismore = 1;
1061 break;
1062
1063 case KW_end: 943 case KW_end:
1064 check_loaded_object (op); 944 check_loaded_object (this);
1065 945
1066 if (!arch_init) 946 if (!arch_init)
1067 op->instantiate (); 947 instantiate ();
1068 948
1069 return ismore ? LL_MORE : LL_NORMAL; 949 f.next ();
1070
1071 case KW_EOF:
1072 return LL_EOF; 950 return true;
1073 951
1074 case KW_ERROR: 952 case KW_ERROR:
1075 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 953 set_ob_key_value (this, f.kw_str, f.value, true);
1076 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D 954 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1077 break; 955 break;
1078 956
1079 default: 957 default:
1080 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 958 if (!f.parse_error ("object", name))
959 return false;
1081 break; 960 break;
1082 } 961 }
962
963 f.next ();
1083 } 964 }
1084} 965}
1085 966
1086/* 967object *
1087 * Loads an object from the given file-pointer. 968object::read (object_thawer &f, maptile *map)
1088 * Variables will be read and parsed and patched into the object
1089 * until the string "end" is reached, or the end of the file.
1090 *
1091 * bufstat is used to determine various file attributes:
1092 * LO_REPATE (0): We are reading from the same buffer as the last call.
1093 * LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions
1094 * will also be reading from this (treasure file, artifacts.)
1095 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1096 * be reset.
1097 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1098 *
1099 */
1100int
1101load_object (object_thawer &fp, object *op, int map_flags)
1102{ 969{
1103 coroapi::cede_every (1000); // cede once in a while 970 assert (f.kw == KW_arch);
1104 971
1105 return parse_object (op, fp, map_flags); 972 archetype *arch = archetype::find (f.get_str ());
973
974 if (!arch)
975 {
976 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
977 arch = archetype::find ("earthwall");
978 }
979
980 assert (arch); //D maybe use exception handling of sorts?
981
982 object *op = object::create ();
983
984 op->map = map;
985 op->arch = arch;
986 arch->clone.copy_to (op);
987 // copy_to activates, this should be fixed properly
988 op->deactivate ();
989
990 if (!op->parse_kv (f))
991 {
992 delete op;
993 return 0;
994 }
995
996 return op;
1106} 997}
1107 998
1108/* This takes a buffer, scans it for variables, and sets those variables 999/* This takes a buffer, scans it for variables, and sets those variables
1109 * as appropriate in op. 1000 * as appropriate in op.
1110 * 1001 *
… …
1112 * override values and in c_wiz to mutate values. 1003 * override values and in c_wiz to mutate values.
1113 */ 1004 */
1114int 1005int
1115set_variable (object *op, char *buf) 1006set_variable (object *op, char *buf)
1116{ 1007{
1117 object_thawer thawer (buf, (AV *)0); 1008 object_thawer f (buf, (AV *)0);
1118 1009
1119 return parse_object (op, thawer, 0); 1010 f.kw = KW_arch; // special hack so that parse_kv skips
1120} 1011 return op->parse_kv (f);
1121
1122/*
1123 * Initialises the array of variable-names. Needed before any
1124 * objects can be loaded. Called by init_library().
1125 */
1126
1127void
1128init_vars ()
1129{
1130} 1012}
1131 1013
1132/* This returns a string of the integer movement type */ 1014/* This returns a string of the integer movement type */
1133#if 0 1015#if 0
1134// unused function 1016// unused function
… …
1179 return retbuf + 1; 1061 return retbuf + 1;
1180} 1062}
1181#endif 1063#endif
1182 1064
1183// compare *op against *tmp and output differences 1065// compare *op against *tmp and output differences
1184void 1066static void
1185put (object_freezer &f, object *op, object *tmp) 1067write_diff (object_freezer &f, object *op, object *tmp)
1186{ 1068{
1187 static const keyword resist_save[NROFATTACKS] = { 1069 static const keyword resist_save[NROFATTACKS] = {
1188# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1070# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1189# include "attackinc.h" 1071# include "attackinc.h"
1190# undef def 1072# undef def
… …
1361 f.put (KW_msg, KW_endmsg, op->msg); 1243 f.put (KW_msg, KW_endmsg, op->msg);
1362 if (op->lore != tmp->lore) 1244 if (op->lore != tmp->lore)
1363 f.put (KW_lore, KW_endlore, op->lore); 1245 f.put (KW_lore, KW_endlore, op->lore);
1364 1246
1365 CMP_OUT (other_arch); 1247 CMP_OUT (other_arch);
1366 CMP_OUT (face); 1248
1249 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
1367 1250
1368 if (op->animation_id != tmp->animation_id) 1251 if (op->animation_id != tmp->animation_id)
1369 if (op->animation_id) 1252 if (op->animation_id)
1370 { 1253 {
1371 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1254 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
… …
1419 f.put (resist_save[i], op->resist[i]); 1302 f.put (resist_save[i], op->resist[i]);
1420 1303
1421 CMP_OUT (path_attuned); 1304 CMP_OUT (path_attuned);
1422 CMP_OUT (path_repelled); 1305 CMP_OUT (path_repelled);
1423 CMP_OUT (path_denied); 1306 CMP_OUT (path_denied);
1424 CMP_OUT (material); 1307 CMP_OUT2 (material, materials);//TODO: nuke
1425 CMP_OUT (materialname); 1308 CMP_OUT (materialname);
1426 CMP_OUT (value); 1309 CMP_OUT (value);
1427 CMP_OUT (carrying); 1310 CMP_OUT (carrying);
1428 CMP_OUT (weight); 1311 CMP_OUT (weight);
1429 CMP_OUT (invisible); 1312 CMP_OUT (invisible);
… …
1479/* 1362/*
1480 * Dumps all variables in an object to a file. 1363 * Dumps all variables in an object to a file.
1481 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1364 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1482 * the only place this is not set is when saving the player. 1365 * the only place this is not set is when saving the player.
1483 */ 1366 */
1484void 1367bool
1485save_object (object_freezer &fp, object *op, int flag) 1368object::write (object_freezer &f)
1486{ 1369{
1487 /* Even if the object does have an owner, it would seem that we should 1370 /* Even if the object does have an owner, it would seem that we should
1488 * still save it. 1371 * still save it.
1489 */ 1372 */
1490 if (op->owner) 1373 if (owner)
1491 return; 1374 return true;
1492 1375
1493 /* If it is unpaid and we don't want to save those, just return. */
1494 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1495 return;
1496
1497 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype; 1376 archetype *at = arch ? (archetype *)arch : empty_archetype;
1498 1377
1499 fp.put (KW_arch, at->name); 1378 f.put (KW_arch, at->name);
1500 put (fp, op, &at->clone); 1379 write_diff (f, this, &at->clone);
1501 1380
1502 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1503
1504 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1381 for (object *tmp = inv; tmp; tmp = tmp->below)
1505 save_object (fp, tmp, flag); 1382 tmp->write (f);
1506 1383
1507 fp.put (op); 1384 f.put (this);
1508 fp.put (KW_end); 1385 f.put (KW_end);
1386
1387 return true;
1509} 1388}
1510 1389
1390/////////////////////////////////////////////////////////////////////////////
1391
1392bool load_resource_file (const char *filename)
1393{
1394 object_thawer f (filename);
1395
1396 f.next ();
1397
1398 for (;;)
1399 {
1400 switch (f.kw)
1401 {
1402 case KW_region:
1403 if (!region::read (f))
1404 return false;
1405 break;
1406
1407 case KW_EOF:
1408 return true;
1409
1410 default:
1411 if (!f.parse_error ("resource file"))
1412 return false;
1413 }
1414
1415 f.next ();
1416 }
1417}
1418

Diff Legend

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