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.31 by root, Sat Dec 30 10:16:10 2006 UTC vs.
Revision 1.71 by root, Tue Apr 17 18:59:05 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23 */
23 24
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
26 variable. */ 27 variable. */
27 28
28
29#include <global.h> 29#include <global.h>
30#include <loader.h> 30#include <loader.h>
31#include <sproto.h> 31#include <sproto.h>
32 32
33/* Maps the MOVE_* values to names */ 33/////////////////////////////////////////////////////////////////////////////
34static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
35 34
36/* 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
37 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
38 * 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
39 * 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
… …
251 "spell_cause_rabies", /* 204 */ 250 "spell_cause_rabies", /* 204 */
252 "spell_glyph", /* 205 */ 251 "spell_glyph", /* 205 */
253 NULL 252 NULL
254}; 253};
255 254
256extern int arch_init; 255extern bool loading_arch;
257 256
258/* This function checks the object after it has been loaded (when we 257/* This function checks the object after it has been loaded (when we
259 * get the 'end' in the input stream). This function can be used to 258 * get the 'end' in the input stream). This function can be used to
260 * deal with legacy objects where fields may have changed. It can also be used 259 * deal with legacy objects where fields may have changed. It can also be used
261 * 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.
262 */ 261 */
263static void 262static void
264check_loaded_object (object *op) 263check_loaded_object (object *op)
265{ 264{
266 int ip;
267
268 /* We do some specialized handling to handle legacy cases of name_pl. 265 /* We do some specialised handling to handle legacy cases of name_pl.
269 * 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 -
270 * this isn't perfect (things won't be properly pluralized), but works to 267 * this isn't perfect (things won't be properly pluralised), but works to
271 * 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
272 * 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
273 * 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.
274 * Otherwise, what happens is that the the plural name will lose 271 * Otherwise, what happens is that the the plural name will lose
275 * information (appear as just 'hearts' and not 'goblins heart') 272 * information (appear as just 'hearts' and not 'goblins heart')
276 */ 273 */
277 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)
278 op->name_pl = NULL; 275 op->name_pl = 0;
279 276
280 if (!op->name_pl) 277 if (!op->name_pl)
281 op->name_pl = op->name; 278 op->name_pl = op->name;
282 279
283 /* objects now have a materialname. try to patch it in */ 280 /* objects now have a materialname. try to patch it in */
… …
286 if (op->map != NULL) 283 if (op->map != NULL)
287 set_materialname (op, op->map->difficulty, NULL); 284 set_materialname (op, op->map->difficulty, NULL);
288 else 285 else
289 set_materialname (op, 5, NULL); 286 set_materialname (op, 5, NULL);
290 } 287 }
288
291 /* only do these when program is first run - a bit 289 /* only do these when program is first run - a bit
292 * excessive to do this at every run - most of this is 290 * excessive to do this at every run - most of this is
293 * really just to catch any errors - program will still run, but 291 * really just to catch any errors - program will still run, but
294 * not in the ideal fashion. 292 * not in the ideal fashion.
295 */ 293 */
296 if ((op->type == WEAPON || op->type == BOW) && arch_init) 294 if ((op->type == WEAPON || op->type == BOW) && loading_arch)
297 { 295 {
298 if (!op->skill) 296 if (!op->skill)
299 {
300 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 297 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
301 }
302 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) ||
303 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 299 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
304 {
305 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);
306 }
307 } 301 }
308 302
309 /* 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
310 * really does for many objects. Need to catch any in maps 304 * really does for many objects. Need to catch any in maps
311 * that may have an old value. 305 * that may have an old value.
312 */ 306 */
313 if ((op->type == WEAPON) || 307 if (op->type == WEAPON
314 (op->type == ARMOUR) || (op->type == HELMET) || 308 || op->type == ARMOUR || op->type == HELMET
315 (op->type == SHIELD) || (op->type == RING) || 309 || op->type == SHIELD || op->type == RING
316 (op->type == BOOTS) || (op->type == GLOVES) || 310 || op->type == BOOTS || op->type == GLOVES
317 (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)
318 { 313 {
319 if (op->last_heal) 314 if (op->last_heal)
320 { 315 {
321 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 ());
322 op->gen_sp_armour = op->last_heal; 317 op->gen_sp_armour = op->last_heal;
323 op->last_heal = 0; 318 op->last_heal = 0;
324 } 319 }
325 if (editor) 320
326 ip = 0;
327 else
328 ip = calc_item_power (op, 0); 321 int ip = calc_item_power (op, 0);
322
329 /* Legacy objects from before item power was in the game */ 323 /* Legacy objects from before item power was in the game */
330 if (!op->item_power && ip) 324 if (!op->item_power && ip)
331 { 325 {
332 if (ip > 3) 326 if (ip > 3)
333 {
334 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);
335 } 328
336 op->item_power = ip; 329 op->item_power = ip;
337 } 330 }
331
338 /* Check for possibly bogus values. Has to meet both these criteria - 332 /* Check for possibly bogus values. Has to meet both these criteria -
339 * 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
340 * 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.
341 * 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,
342 * but not the second one. 336 * but not the second one.
343 */ 337 */
344 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 338 if (ip > 2 * op->item_power && ip > (op->item_power + 3))
345 {
346 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);
347 }
348
349 } 340 }
341
350 /* Old spellcasting object - need to load in the appropiate object */ 342 /* Old spellcasting object - need to load in the appropiate object */
351 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 ||
352 /* 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 */
353 ((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 && !loading_arch)
354 { 346 {
355 object *tmp;
356
357 /* 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'
358 * in that spell was stored in sp. 348 * in that spell was stored in sp.
359 */ 349 */
360 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]);
361 insert_ob_in_ob (tmp, op); 351 insert_ob_in_ob (tmp, op);
362 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 */
363 } 353 }
354
364 /* 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 */
365
366 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 && !loading_arch)
367 { 357 {
368 object *tmp;
369
370 tmp = get_archetype_by_object_name (op->slaying); 358 object *tmp = get_archetype_by_object_name (op->slaying);
371 insert_ob_in_ob (tmp, op); 359 insert_ob_in_ob (tmp, op);
372 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 */
373 /* without this, value is all screwed up */ 361 /* without this, value is all screwed up */
374 op->value = op->arch->clone.value * op->inv->value; 362 op->value = op->arch->clone.value * op->inv->value;
375 } 363 }
376 364
377 if (QUERY_FLAG (op, FLAG_MONSTER)) 365 if (QUERY_FLAG (op, FLAG_MONSTER))
378 { 366 {
379 if (op->stats.hp > op->stats.maxhp) 367 if (op->stats.hp > op->stats.maxhp)
368 {
380 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 }
381 372
382 /* The archs just need to be updated for this */ 373 /* The archs just need to be updated for this */
383 if (op->move_type == 0) 374 if (op->move_type == 0)
384 op->move_type = MOVE_WALK; 375 op->move_type = MOVE_WALK;
385 } 376 }
… …
408 { 399 {
409 op->move_type = MOVE_ALL; 400 op->move_type = MOVE_ALL;
410 op->stats.maxhp = 0; 401 op->stats.maxhp = 0;
411 } 402 }
412 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))
413 { 453 {
414 op->move_type = MOVE_WALK; 454 if (negate)
455 mt &= ~f->flags;
456 else
457 mt |= f->flags;
458
459 goto next;
415 } 460 }
416 } 461 }
417 }
418 462
463 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str);
464
465next: ;
466 }
419} 467}
420 468
421static void
422set_move (MoveType & mt, const char *str)
423{
424 if (!str)
425 {
426 mt = 0;
427 return;
428 }
429
430 if (isdigit (*str))
431 {
432 mt = atoi (str);
433 return;
434 }
435
436 mt = 0;
437
438 for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
439 {
440 if (!strcasecmp (str, "all"))
441 mt |= MOVE_ALL;
442 else
443 {
444 int i, negate = 0;
445
446 if (*str == '-')
447 {
448 negate = 1;
449 str++;
450 }
451
452 for (i = 0; move_name[i]; i++)
453 {
454 if (!strcasecmp (move_name[i], str))
455 {
456 if (negate)
457 mt &= ~(1 << i);
458 else
459 mt |= (1 << i);
460
461 break;
462 }
463 }
464
465 if (!move_name[i])
466 {
467 /* fly is a special case - covers both fly_low and
468 * fly_high - since it doesn't match to a specific
469 * single bit, have to special case it.
470 */
471 if (!strcasecmp (str, "flying"))
472 {
473 if (negate)
474 mt &= ~MOVE_FLYING;
475 else
476 mt |= MOVE_FLYING;
477 }
478 else
479 LOG (llevDebug, "common/loader.l: set_move - unknown move string '%s'\n", str);
480 }
481 }
482 }
483}
484
485#define GET_FLAG(op,flag) \ 469#define GET_FLAG(op,flag) \
486 if (thawer.get_sint32 ()) \ 470 if (f.get_sint32 ()) \
487 SET_FLAG (op, flag); \ 471 SET_FLAG (op, flag); \
488 else \ 472 else \
489 CLEAR_FLAG (op, flag) \ 473 CLEAR_FLAG (op, flag) \
490 474
491int 475bool
492parse_object (object *op, object_thawer &thawer, int map_flags) 476object::parse_kv (object_thawer &f)
493{ 477{
494 bool ismore = 0;
495 object *op_inv = op->inv; 478 object *op_inv = inv;
496 479
497 for (;;) 480 for (;;)
498 { 481 {
499 keyword kw = thawer.get_kv ();
500
501 switch (kw) 482 switch (f.kw)
502 { 483 {
503 case KW_Object: // uppercase alias
504 case KW_object:
505 thawer.get (op->name);
506
507 if (op->arch)
508 op->arch->name = op->name;
509
510 break;
511
512 case KW_uuid: 484 case KW_uuid:
513 if (const char *s = thawer.get_str ()) 485 if (const char *s = f.get_str ())
514 { 486 {
515 unsigned int version; 487 unsigned int version;
516 unsigned long long seq; 488 unsigned long long seq;
517 489
518 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) 490 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
519 { 491 {
520 op->uuid.seq = seq; 492 uuid.seq = seq;
521 break; 493 break;
522 } 494 }
523 } 495 }
524 496
525 op->uuid = gen_uuid (); 497 uuid = gen_uuid ();
526 break; 498 break;
527 499
528 case KW_oid: 500 case KW_oid:
529 thawer.get (op, thawer.get_sint32 ()); 501 f.get (this, f.get_sint32 ());
530 break; 502 break;
531 503
532 case KW_name: thawer.get (op->name); break; 504 case KW_name: f.get (name); break;
533 case KW_name_pl: thawer.get (op->name_pl); break; 505 case KW_name_pl: f.get (name_pl); break;
534 case KW_title: thawer.get (op->title); break; 506 case KW_title: f.get (title); break;
535 case KW_custom_name: thawer.get (op->custom_name); break; 507 case KW_custom_name: f.get (custom_name); break;
536 508
537 case KW_attach: thawer.get_ornull (op->attach); break; 509 case KW_attach: f.get_ornull (attach); break;
538 case KW_skill: thawer.get_ornull (op->skill); break; 510 case KW_skill: f.get_ornull (skill); break;
539 case KW_race: thawer.get_ornull (op->race); break; 511 case KW_race: f.get_ornull (race); break;
540 case KW_slaying: thawer.get_ornull (op->slaying); break; 512 case KW_slaying: f.get_ornull (slaying); break;
541 513
542 case KW_arch: 514 case KW_arch:
543 { 515 {
544 const char *str = thawer.get_str (); 516 object *tmp = object::read (f);
517 tmp->deactivate ();
545 518
546 if (op->arch)
547 { 519 {
548 /* If op->arch has been set, then this new object
549 * must be part of the inventory. So process
550 * appropriately.
551 */
552 archetype *arch = archetype::find (str);
553
554 object *tmp;
555
556 if (arch != NULL)
557 tmp = arch_to_object (arch);
558 else
559 {
560 tmp = object::create ();
561 /* record the name of the broken object */
562 tmp->name = str;
563 }
564
565 parse_object (tmp, thawer, map_flags);
566
567 if (tmp->arch)
568 {
569 // was: insert_ob_in_ob (tmp, op); 520 // was: insert_ob_in_ob (tmp, op);
570 // but manually adding it can improve map loading times a lot 521 // but manually adding it can improve map loading times a lot
571 // also, appending instead of prepending keeps the 522 // also, appending instead of prepending keeps the
572 // save ordering the same between repeated load/saves. 523 // save ordering the same between repeated load/saves.
573 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 524 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
574 CLEAR_FLAG (tmp, FLAG_REMOVED); 525 CLEAR_FLAG (tmp, FLAG_REMOVED);
575 526
576 if (!op_inv) 527 if (!op_inv)
577 { 528 {
578 op->inv = tmp;
579 tmp->above = 0;
580 }
581 else
582 {
583 while (op_inv->below)
584 op_inv = op_inv->below;
585
586 op_inv->below = tmp;
587 tmp->above = op_inv;
588 }
589
590 tmp->below = 0;
591 tmp->env = op;
592 op_inv = tmp; 529 inv = tmp;
530 tmp->above = 0;
593 } 531 }
594 else 532 else
595 { 533 {
596 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); 534 while (op_inv->below)
597 tmp->destroy (); 535 op_inv = op_inv->below;
536
537 op_inv->below = tmp;
538 tmp->above = op_inv;
598 } 539 }
540
541 tmp->below = 0;
542 tmp->env = this;
543 op_inv = tmp;
599 } 544 }
600 else
601 {
602 /* This is the actual archetype definition then */
603 op->arch = archetype::find (str);
604
605 if (op->arch)
606 op->arch->clone.copy_to (op);
607 else if (!arch_init)
608 /* record the name of the broken object */
609 op->name = str;
610 }
611 } 545 }
612 break; 546 continue;
613 547
614 case KW_other_arch: 548 case KW_other_arch:
549 other_arch =
550 loading_arch
551 ? archetype::get (f.get_str ())
615 op->other_arch = archetype::find (thawer.get_str ()); 552 : archetype::find (f.get_str ());
553
554 if (!other_arch)
555 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
616 break; 556 break;
617 557
618 case KW_animation: 558 case KW_animation:
619 { 559 {
560 CLEAR_FLAG (this, FLAG_ANIMATE);
561 animation_id = 0;
562
620 const char *str = thawer.get_str (); 563 const char *str = f.get_str ();
621
622 if (!str)
623 {
624 op->animation_id = 0;
625 CLEAR_FLAG (op, FLAG_ANIMATE);
626 }
627 else
628 {
629 op->animation_id = find_animation (str); 564 if (str && (animation_id = find_animation (str)))
630 SET_FLAG (op, FLAG_ANIMATE); 565 SET_FLAG (this, FLAG_ANIMATE);
631 }
632 } 566 }
633
634 break; 567 break;
635 568
636 case KW_last_heal: thawer.get (op->last_heal); break; 569 case KW_last_heal: f.get (last_heal); break;
637 case KW_last_sp: thawer.get (op->last_sp); break; 570 case KW_last_sp: f.get (last_sp); break;
638 case KW_last_grace: thawer.get (op->last_grace); break; 571 case KW_last_grace: f.get (last_grace); break;
639 case KW_last_eat: thawer.get (op->last_eat); break; 572 case KW_last_eat: f.get (last_eat); break;
640 case KW_speed_left: thawer.get (op->speed_left); break; 573 case KW_speed_left: f.get (speed_left); break;
641 574
642 case KW_speed: 575 case KW_speed:
643 thawer.get (op->speed); 576 f.get (speed);
644 577
645 //TODO: maybe do in check_object 578 //TODO: maybe do in check_object
646 // removed check for style maps 579 // removed check for style maps
647 if (op->speed < 0) 580 if (speed < 0)
648 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 581 speed_left = speed_left - rndm ();
649 582
650 break; 583 break;
651 584
652 case KW_slow_move: 585 case KW_slow_move:
653 op->move_slow |= MOVE_WALK; 586 move_slow |= MOVE_WALK;
654 thawer.get (op->move_slow_penalty); 587 f.get (move_slow_penalty);
655 break; 588 break;
656 589
657 case KW_face: 590 case KW_face:
658 op->face = &new_faces[FindFace (thawer.get_str (), 0)]; 591 face = face_find (f.get_str ());
659 break; 592 break;
660 593
661 case KW_x: thawer.get (op->x); break; 594 case KW_x: f.get (x); break;
662 case KW_y: thawer.get (op->y); break; 595 case KW_y: f.get (y); break;
663 596
664 case KW_Str: // uppercase alias 597 case KW_Str: // uppercase alias
665 case KW_str: thawer.get (op->stats.Str); break; 598 case KW_str: f.get (stats.Str); break;
666 case KW_Dex: // uppercase alias 599 case KW_Dex: // uppercase alias
667 case KW_dex: thawer.get (op->stats.Dex); break; 600 case KW_dex: f.get (stats.Dex); break;
668 case KW_Con: // uppercase alias 601 case KW_Con: // uppercase alias
669 case KW_con: thawer.get (op->stats.Con); break; 602 case KW_con: f.get (stats.Con); break;
670 case KW_Wis: // uppercase alias 603 case KW_Wis: // uppercase alias
671 case KW_wis: thawer.get (op->stats.Wis); break; 604 case KW_wis: f.get (stats.Wis); break;
672 case KW_Cha: // uppercase alias 605 case KW_Cha: // uppercase alias
673 case KW_cha: thawer.get (op->stats.Cha); break; 606 case KW_cha: f.get (stats.Cha); break;
674 case KW_Int: // uppercase alias 607 case KW_Int: // uppercase alias
675 case KW_int: thawer.get (op->stats.Int); break; 608 case KW_int: f.get (stats.Int); break;
676 case KW_Pow: // uppercase alias 609 case KW_Pow: // uppercase alias
677 case KW_pow: thawer.get (op->stats.Pow); break; 610 case KW_pow: f.get (stats.Pow); break;
678 611
679 case KW_hp: thawer.get (op->stats.hp); break; 612 case KW_hp: f.get (stats.hp); break;
680 case KW_maxhp: thawer.get (op->stats.maxhp); break; 613 case KW_maxhp: f.get (stats.maxhp); break;
681 case KW_sp: thawer.get (op->stats.sp); break; 614 case KW_sp: f.get (stats.sp); break;
682 case KW_maxsp: thawer.get (op->stats.maxsp); break; 615 case KW_maxsp: f.get (stats.maxsp); break;
683 case KW_grace: thawer.get (op->stats.grace); break; 616 case KW_grace: f.get (stats.grace); break;
684 case KW_maxgrace: thawer.get (op->stats.maxgrace); break; 617 case KW_maxgrace: f.get (stats.maxgrace); break;
685 618
686 case KW_exp: thawer.get (op->stats.exp); break; 619 case KW_exp: f.get (stats.exp); break;
687 case KW_perm_exp: thawer.get (op->perm_exp); break; 620 case KW_perm_exp: f.get (perm_exp); break;
688 case KW_food: thawer.get (op->stats.food); break; 621 case KW_food: f.get (stats.food); break;
689 case KW_dam: thawer.get (op->stats.dam); break; 622 case KW_dam: f.get (stats.dam); break;
690 case KW_wc: thawer.get (op->stats.wc); break; 623 case KW_wc: f.get (stats.wc); break;
691 case KW_ac: thawer.get (op->stats.ac); break; 624 case KW_ac: f.get (stats.ac); break;
692 case KW_nrof: thawer.get (op->nrof); break; 625 case KW_nrof: f.get (nrof); break;
693 case KW_level: thawer.get (op->level); break; 626 case KW_level: f.get (level); break;
694 case KW_direction: thawer.get (op->direction); break; 627 case KW_direction: f.get (direction); break;
695 case KW_type: thawer.get (op->type); break; 628 case KW_type: f.get (type); break;
696 case KW_subtype: thawer.get (op->subtype); break; 629 case KW_subtype: f.get (subtype); break;
697 case KW_value: thawer.get (op->value); break; 630 case KW_value: f.get (value); break;
698 case KW_weight: thawer.get (op->weight); break; 631 case KW_weight: f.get (weight); break;
699 case KW_carrying: thawer.get (op->carrying); break; 632 case KW_carrying: f.get (carrying); break;
700 case KW_attacktype: thawer.get (op->attacktype); break; 633 case KW_attacktype: f.get (attacktype); break;
701 case KW_path_attuned: thawer.get (op->path_attuned); break; 634 case KW_path_attuned: f.get (path_attuned); break;
702 case KW_path_repelled: thawer.get (op->path_repelled); break; 635 case KW_path_repelled: f.get (path_repelled); break;
703 case KW_path_denied: thawer.get (op->path_denied); break; 636 case KW_path_denied: f.get (path_denied); break;
704 case KW_invisible: thawer.get (op->invisible); break; 637 case KW_invisible: f.get (invisible); break;
705 case KW_magic: thawer.get (op->magic); break; 638 case KW_magic: f.get (magic); break;
706 case KW_state: thawer.get (op->state); break; 639 case KW_state: f.get (state); break;
707 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; 640 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
708 case KW_material: thawer.get (op->material); break; 641 case KW_material: f.get (materials); break; //TODO: nuke
709 case KW_materialname: thawer.get (op->materialname); break; 642 case KW_materialname: f.get (materialname); break;
710 643
711 /* These are the new values */ 644 /* These are the new values */
712 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; 645 case KW_move_block: set_move (move_block, f.get_str ()); break;
713 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; 646 case KW_move_allow: set_move (move_allow, f.get_str ()); break;
714 case KW_move_type: set_move (op->move_type, thawer.get_str ()); break; 647 case KW_move_type: set_move (move_type, f.get_str ()); break;
715 case KW_move_on: set_move (op->move_on, thawer.get_str ()); break; 648 case KW_move_on: set_move (move_on, f.get_str ()); break;
716 case KW_move_off: set_move (op->move_off, thawer.get_str ()); break; 649 case KW_move_off: set_move (move_off, f.get_str ()); break;
717 case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break; 650 case KW_move_slow: set_move (move_slow, f.get_str ()); break;
718 651
719 /* These are all legacy - any new objects should use the move_ .. values */ 652 /* These are all legacy - any new objects should use the move_ .. values */
720 case KW_no_pass: 653 case KW_no_pass:
721 { 654 {
722 if (thawer.get_sint32 ()) 655 if (f.get_sint32 ())
723 op->move_block = MOVE_ALL; 656 move_block = MOVE_ALL;
724 else 657 else
725 op->move_block = 0; 658 move_block = 0;
726 } 659 }
727 660
728 break; 661 break;
729 662
730 /* These are all legacy - any new objects should use the move_ .. values */ 663 /* These are all legacy - any new objects should use the move_ .. values */
731 case KW_walk_on: 664 case KW_walk_on:
732 { 665 {
733 if (thawer.get_sint32 ()) 666 if (f.get_sint32 ())
734 op->move_on |= MOVE_WALK; 667 move_on |= MOVE_WALK;
735 else 668 else
736 op->move_on &= ~MOVE_WALK; 669 move_on &= ~MOVE_WALK;
737 } 670 }
738 671
739 break; 672 break;
740 673
741 /* These are all legacy - any new objects should use the move_ .. values */ 674 /* These are all legacy - any new objects should use the move_ .. values */
742 case KW_walk_off: 675 case KW_walk_off:
743 { 676 {
744 if (thawer.get_sint32 ()) 677 if (f.get_sint32 ())
745 op->move_off |= MOVE_WALK; 678 move_off |= MOVE_WALK;
746 else 679 else
747 op->move_off &= ~MOVE_WALK; 680 move_off &= ~MOVE_WALK;
748 } 681 }
749 break; 682 break;
750 683
751 /* These are all legacy - any new objects should use the move_ .. values */ 684 /* These are all legacy - any new objects should use the move_ .. values */
752 case KW_fly_on: 685 case KW_fly_on:
753 { 686 {
754 if (thawer.get_sint32 ()) 687 if (f.get_sint32 ())
755 op->move_on |= MOVE_FLY_LOW; 688 move_on |= MOVE_FLY_LOW;
756 else 689 else
757 op->move_on &= ~MOVE_FLY_LOW; 690 move_on &= ~MOVE_FLY_LOW;
758 } 691 }
759 break; 692 break;
760 693
761 /* These are all legacy - any new objects should use the move_ .. values */ 694 /* These are all legacy - any new objects should use the move_ .. values */
762 case KW_fly_off: 695 case KW_fly_off:
763 { 696 {
764 if (thawer.get_sint32 ()) 697 if (f.get_sint32 ())
765 op->move_off |= MOVE_FLY_LOW; 698 move_off |= MOVE_FLY_LOW;
766 else 699 else
767 op->move_off &= ~MOVE_FLY_LOW; 700 move_off &= ~MOVE_FLY_LOW;
768 } 701 }
769 break; 702 break;
770 703
771 //TODO: remove these after converting archetypes 704 //TODO: remove these after converting archetypes
772 case KW_can_use_wand: 705 case KW_can_use_wand:
773 GET_FLAG (op, FLAG_USE_RANGE); 706 GET_FLAG (this, FLAG_USE_RANGE);
774 break; 707 break;
775 708
776 /* These are all legacy - any new objects should use the move_ .. values */ 709 /* These are all legacy - any new objects should use the move_ .. values */
777 case KW_flying: 710 case KW_flying:
778 { 711 {
779 if (thawer.get_sint32 ()) 712 if (f.get_sint32 ())
780 op->move_type |= MOVE_FLY_LOW; 713 move_type |= MOVE_FLY_LOW;
781 else 714 else
782 op->move_type &= ~MOVE_FLY_LOW; 715 move_type &= ~MOVE_FLY_LOW;
783 } 716 }
784 break; 717 break;
785 718
786 719
787 case KW_identified: 720 case KW_identified:
788 GET_FLAG (op, FLAG_IDENTIFIED); 721 GET_FLAG (this, FLAG_IDENTIFIED);
789 //TODO: move to check_object or so 722 //TODO: move to check_object or so
790 if (QUERY_FLAG (op, FLAG_IDENTIFIED)) 723 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
791 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 724 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
792 725
793 break; 726 break;
794 727
795 case KW_wiz: 728 case KW_wiz:
796 GET_FLAG (op, FLAG_WIZ); 729 GET_FLAG (this, FLAG_WIZ);
797 //TODO: move to check_object 730 //TODO: move to check_object
798 if (QUERY_FLAG (op, FLAG_WIZ)) 731 if (QUERY_FLAG (this, FLAG_WIZ))
799 { 732 {
800 SET_FLAG (op, FLAG_WAS_WIZ); 733 SET_FLAG (this, FLAG_WAS_WIZ);
801 SET_FLAG (op, FLAG_WIZPASS); 734 SET_FLAG (this, FLAG_WIZPASS);
802 SET_FLAG (op, FLAG_WIZCAST); 735 SET_FLAG (this, FLAG_WIZCAST);
803 } 736 }
804 else 737 else
805 { 738 {
806 CLEAR_FLAG (op, FLAG_WIZPASS); 739 CLEAR_FLAG (this, FLAG_WIZPASS);
807 CLEAR_FLAG (op, FLAG_WIZCAST); 740 CLEAR_FLAG (this, FLAG_WIZCAST);
808 } 741 }
809 break; 742 break;
810 743
811 case KW_friendly: 744 case KW_friendly:
812 GET_FLAG (op, FLAG_FRIENDLY); 745 if (f.get_sint32 ())
813 //TODO: move to check_object or so 746 if (type != PLAYER)
814 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
815 add_friendly_object (op); 747 add_friendly_object (this);
816 break;
817 748
749 break;
750
818 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 751 case KW_monster: GET_FLAG (this, FLAG_MONSTER); break;
819 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 752 case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break;
820 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 753 case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break;
821 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 754 case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break;
755 case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break;
822 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 756 case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break;
823 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 757 case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break;
824 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 758 case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break;
825 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 759 case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break;
826 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 760 case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break;
827 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 761 case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break;
828 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 762 case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break;
829 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 763 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
830 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; 764 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
831 case KW_alive: GET_FLAG (op, FLAG_ALIVE); break; 765 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
832 case KW_applied: GET_FLAG (op, FLAG_APPLIED); break; 766 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
833 case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break; 767 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
834 case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break; 768 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
835 case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break; 769 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
836 case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break; 770 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
837 case KW_changing: GET_FLAG (op, FLAG_CHANGING); break; 771 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
838 case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break; 772 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
839 case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break; 773 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
840 case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break; 774 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
841 case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break; 775 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
842 case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break; 776 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
843 case KW_scared: GET_FLAG (op, FLAG_SCARED); break; 777 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
844 case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break; 778 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
845 case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break; 779 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
846 case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break; 780 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
847 case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break; 781 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
848 case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break; 782 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
849 case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break; 783 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
850 case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break; 784 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
851 case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break; 785 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
852 case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break; 786 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
853 case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break; 787 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
854 case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break; 788 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
855 case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break; 789 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
856 case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break; 790 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
857 case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break; 791 case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break;
858 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; 792 case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break;
859 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break; 793 case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break;
860 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break; 794 case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break;
861 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break; 795 case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break;
862 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break; 796 case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break;
863 case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break; 797 case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break;
864 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; 798 case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break;
865 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; 799 case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break;
866 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; 800 case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break;
867 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; 801 case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break;
868 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; 802 case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break;
869 case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break; 803 case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break;
870 case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break; 804 case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
871 case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break; 805 case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break;
872 case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break; 806 case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break;
873 case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break; 807 case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break;
874 case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break; 808 case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break;
875 case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break; 809 case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break;
876 case KW_cursed: GET_FLAG (op, FLAG_CURSED); break; 810 case KW_cursed: GET_FLAG (this, FLAG_CURSED); break;
877 case KW_damned: GET_FLAG (op, FLAG_DAMNED); break; 811 case KW_damned: GET_FLAG (this, FLAG_DAMNED); break;
878 case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break; 812 case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break;
879 case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break; 813 case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break;
880 case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break; 814 case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break;
881 case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break; 815 case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break;
882 case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break; 816 case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break;
883 case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break; 817 case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break;
884 case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break; 818 case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break;
885 case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break; 819 case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break;
886 case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break; 820 case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break;
887 case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break; 821 case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break;
888 case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break; 822 case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break;
889 case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break; 823 case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break;
890 case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break; 824 case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break;
891 case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break; 825 case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break;
892 case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break; 826 case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break;
893 case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break; 827 case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break;
894 case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break; 828 case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break;
895 case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break; 829 case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break;
896 case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break; 830 case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break;
897 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 831 case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break;
898 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 832 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
899 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 833 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
900 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 834 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
901 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 835 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
836 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
902 837
903 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 838 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
904 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 839 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
905 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 840 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
906 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 841 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
907 case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break; 842 case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break;
908 case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break; 843 case KW_resist_cold: f.get (resist[ATNR_COLD]); break;
909 case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break; 844 case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break;
910 case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break; 845 case KW_resist_acid: f.get (resist[ATNR_ACID]); break;
911 case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break; 846 case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break;
912 case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break; 847 case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break;
913 case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break; 848 case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break;
914 case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break; 849 case KW_resist_poison: f.get (resist[ATNR_POISON]); break;
915 case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break; 850 case KW_resist_slow: f.get (resist[ATNR_SLOW]); break;
916 case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break; 851 case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break;
917 case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break; 852 case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break;
918 case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break; 853 case KW_resist_fear: f.get (resist[ATNR_FEAR]); break;
919 case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break; 854 case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break;
920 case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break; 855 case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break;
921 case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break; 856 case KW_resist_death: f.get (resist[ATNR_DEATH]); break;
922 case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break; 857 case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break;
923 case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break; 858 case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break;
924 case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break; 859 case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break;
925 case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break; 860 case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break;
926 case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break; 861 case KW_resist_blind: f.get (resist[ATNR_BLIND]); break;
927 case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break; 862 case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break;
928 case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break; 863 case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break;
929 case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break; 864 case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break;
930 865
931 case KW_luck: thawer.get (op->stats.luck); break; 866 case KW_luck: f.get (stats.luck); break;
932 case KW_run_away: thawer.get (op->run_away); break; 867 case KW_run_away: f.get (run_away); break;
933 case KW_pick_up: thawer.get (op->pick_up); break; 868 case KW_pick_up: f.get (pick_up); break;
934 case KW_item_power: thawer.get (op->item_power); break; 869 case KW_item_power: f.get (item_power); break;
935 case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break; 870 case KW_gen_sp_armour: f.get (gen_sp_armour); break;
936 case KW_anim_speed: thawer.get (op->anim_speed); break; 871 case KW_anim_speed: f.get (anim_speed); break;
937 case KW_container: thawer.get (op->weight_limit); break; 872 case KW_container: f.get (weight_limit); break;
938 case KW_will_apply: thawer.get (op->will_apply); break; 873 case KW_will_apply: f.get (will_apply); break;
939 case KW_attack_movement: thawer.get (op->attack_movement); break; 874 case KW_attack_movement: f.get (attack_movement); break;
940 case KW_move_state: thawer.get (op->move_status); break; 875 case KW_move_state: f.get (move_status); break;
941 case KW_expmul: thawer.get (op->expmul); break; 876 case KW_expmul: f.get (expmul); break;
942 case KW_glow_radius: thawer.get (op->glow_radius); break; 877 case KW_glow_radius: f.get (glow_radius); break;
943 case KW_weapontype: thawer.get (op->weapontype); break; 878 case KW_weapontype: f.get (weapontype); break;
944 case KW_tooltype: thawer.get (op->tooltype); break; 879 case KW_tooltype: f.get (tooltype); break;
945 case KW_casting_time: thawer.get (op->casting_time); break; 880 case KW_casting_time: f.get (casting_time); break;
946 case KW_elevation: thawer.get (op->elevation); break; 881 case KW_elevation: f.get (elevation); break;
947 case KW_smoothlevel: thawer.get (op->smoothlevel); break; 882 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
948 case KW_client_type: thawer.get (op->client_type); break; 883 case KW_client_type: f.get (client_type); break;
949 case KW_duration: thawer.get (op->duration); break; 884 case KW_duration: f.get (duration); break;
950 case KW_range: thawer.get (op->range); break; 885 case KW_range: f.get (range); break;
951 case KW_range_modifier: thawer.get (op->range_modifier); break; 886 case KW_range_modifier: f.get (range_modifier); break;
952 case KW_dam_modifier: thawer.get (op->dam_modifier); break; 887 case KW_dam_modifier: f.get (dam_modifier); break;
953 case KW_duration_modifier: thawer.get (op->duration_modifier); break; 888 case KW_duration_modifier: f.get (duration_modifier); break;
954 889
955 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 890 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
956 //TODO: parse from other include files 891 //TODO: parse from other include files
957 case KW_body_range: thawer.get (op->body_info[0]); break; 892 case KW_body_range: f.get (body_info[0]); break;
958 case KW_body_arm: thawer.get (op->body_info[1]); break; 893 case KW_body_arm: f.get (body_info[1]); break;
959 case KW_body_torso: thawer.get (op->body_info[2]); break; 894 case KW_body_torso: f.get (body_info[2]); break;
960 case KW_body_head: thawer.get (op->body_info[3]); break; 895 case KW_body_head: f.get (body_info[3]); break;
961 case KW_body_neck: thawer.get (op->body_info[4]); break; 896 case KW_body_neck: f.get (body_info[4]); break;
962 case KW_body_skill: thawer.get (op->body_info[5]); break; 897 case KW_body_skill: f.get (body_info[5]); break;
963 case KW_body_finger: thawer.get (op->body_info[6]); break; 898 case KW_body_finger: f.get (body_info[6]); break;
964 case KW_body_shoulder: thawer.get (op->body_info[7]); break; 899 case KW_body_shoulder: f.get (body_info[7]); break;
965 case KW_body_foot: thawer.get (op->body_info[8]); break; 900 case KW_body_foot: f.get (body_info[8]); break;
966 case KW_body_hand: thawer.get (op->body_info[9]); break; 901 case KW_body_hand: f.get (body_info[9]); break;
967 case KW_body_wrist: thawer.get (op->body_info[10]); break; 902 case KW_body_wrist: f.get (body_info[10]); break;
968 case KW_body_waist: thawer.get (op->body_info[11]); break; 903 case KW_body_waist: f.get (body_info[11]); break;
969 case KW_can_apply: 904 case KW_can_apply:
970 break; 905 break;
971 906
972 case KW_connected: 907 case KW_connected:
973 add_button_link (op, op->map, thawer.get_sint32 ()); 908 add_button_link (this, map, f.get_sint32 ());
974 break; 909 break;
975 910
976 case KW_randomitems: 911 case KW_randomitems:
977 op->randomitems = find_treasurelist (thawer.get_str ()); 912 if (f.get_str ())
913 {
914 randomitems =
915 loading_arch
916 ? treasurelist::get (f.get_str ())
917 : treasurelist::find (f.get_str ());
918
919 if (!randomitems)
920 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
921 }
978 break; 922 break;
979 923
980 case KW_msg: 924 case KW_msg:
981 thawer.get_ml (KW_endmsg, op->msg); 925 f.get_ml (KW_endmsg, msg);
982 //TODO: allow longer messages 926 //TODO: allow longer messages
983 if (strlen (op->msg) >= HUGE_BUF) 927 if (strlen (msg) >= HUGE_BUF)
984 { 928 {
985 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 929 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
986 op->msg = "ERROR, please report: string too long, winged.\n"; 930 msg = "ERROR, please report: string too long, winged.\n";
987 } 931 }
988 break; 932 break;
989 933
990 case KW_lore: 934 case KW_lore:
991 thawer.get_ml (KW_endlore, op->lore); 935 f.get_ml (KW_endlore, lore);
992 //TODO: allow longer messages 936 //TODO: allow longer messages
993 /* Just print a warning so we can be reasonably safe 937 /* Just print a warning so we can be reasonably safe
994 * about not overflowing the buffer. 938 * about not overflowing the buffer.
995 */ 939 */
996 if (strlen (op->lore) > (HUGE_BUF / 2)) 940 if (strlen (lore) > (HUGE_BUF / 2))
997 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 941 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
998 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 942 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
999 break; 943 break;
1000 944
1001 case KW_editable: 945 case KW_editable:
1002 case KW_editor_folder: 946 case KW_editor_folder:
1003 break; 947 break;
1004 948
1005 case KW_More: // uppercase alias
1006 case KW_more:
1007 /* We need to record that this is a multipart object,
1008 * so the calling function can glue things back together
1009 */
1010 ismore = 1;
1011 break;
1012
1013 case KW_end: 949 case KW_end:
1014 check_loaded_object (op); 950 check_loaded_object (this);
1015 951
1016 if (!arch_init) 952 if (!loading_arch)
1017 op->instantiate (); 953 instantiate ();
1018 954
1019 return ismore ? LL_MORE : LL_NORMAL; 955 f.next ();
1020
1021 case KW_EOF:
1022 return LL_EOF; 956 return true;
1023 957
1024 case KW_ERROR: 958 case KW_ERROR:
1025 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 959 set_ob_key_value (this, f.kw_str, f.value, true);
1026 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D 960 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1027 break; 961 break;
1028 962
1029 default: 963 default:
1030 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 964 if (!f.parse_error ("object", name))
965 return false;
1031 break; 966 break;
1032 } 967 }
968
969 f.next ();
1033 } 970 }
1034} 971}
1035 972
1036/* 973object *
1037 * Loads an object from the given file-pointer. 974object::read (object_thawer &f, maptile *map)
1038 * Variables will be read and parsed and patched into the object
1039 * until the string "end" is reached, or the end of the file.
1040 *
1041 * bufstat is used to determine various file attributes:
1042 * LO_REPATE (0): We are reading from the same buffer as the last call.
1043 * LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions
1044 * will also be reading from this (treasure file, artifacts.)
1045 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1046 * be reset.
1047 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1048 *
1049 */
1050int
1051load_object (object_thawer &fp, object *op, int map_flags)
1052{ 975{
1053 // cede every 500 objects loaded 976 assert (f.kw == KW_arch);
1054 {
1055 static int cede_counter = 0;
1056 977
1057 if (++cede_counter >= 500) 978 archetype *arch = archetype::find (f.get_str ());
979
980 if (!arch)
1058 { 981 {
1059 cede_counter = 0; 982 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1060 if (coroapi::nready ()) 983 arch = archetype::find ("earthwall");
1061 coroapi::cede ();
1062 } 984 }
985
986 assert (arch); //D maybe use exception handling of sorts?
987
988 f.next ();
989
990 object *op = object::create ();
991
992 op->map = map;
993 arch->clone.copy_to (op);
994 // copy_to activates, this should be fixed properly
995 op->deactivate ();
996
997 if (!op->parse_kv (f))
998 {
999 op->destroy (true);
1000 return 0;
1063 } 1001 }
1064 1002
1065 return parse_object (op, fp, map_flags); 1003 return op;
1066} 1004}
1067 1005
1068/* This takes a buffer, scans it for variables, and sets those variables 1006/* This takes a buffer, scans it for variables, and sets those variables
1069 * as appropriate in op. 1007 * as appropriate in op.
1070 * 1008 *
… …
1072 * override values and in c_wiz to mutate values. 1010 * override values and in c_wiz to mutate values.
1073 */ 1011 */
1074int 1012int
1075set_variable (object *op, char *buf) 1013set_variable (object *op, char *buf)
1076{ 1014{
1077 object_thawer thawer (buf, (AV *)0); 1015 object_thawer f (buf, (AV *)0);
1078 1016
1079 return parse_object (op, thawer, 0); 1017 f.next ();
1080} 1018 return op->parse_kv (f);
1081
1082/*
1083 * Initialises the array of variable-names. Needed before any
1084 * objects can be loaded. Called by init_library().
1085 */
1086
1087void
1088init_vars ()
1089{
1090} 1019}
1091 1020
1092/* This returns a string of the integer movement type */ 1021/* This returns a string of the integer movement type */
1093#if 0 1022#if 0
1094// unused function 1023// unused function
… …
1139 return retbuf + 1; 1068 return retbuf + 1;
1140} 1069}
1141#endif 1070#endif
1142 1071
1143// compare *op against *tmp and output differences 1072// compare *op against *tmp and output differences
1144void 1073static void
1145put (object_freezer &f, object *op, object *tmp) 1074write_diff (object_freezer &f, object *op, object *tmp)
1146{ 1075{
1147 static const keyword resist_save[NROFATTACKS] = { 1076 static const keyword resist_save[NROFATTACKS] = {
1148# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1077# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1149# include "attackinc.h" 1078# include "attackinc.h"
1150# undef def 1079# undef def
… …
1267 KW_berserk, 1196 KW_berserk,
1268 KW_neutral, 1197 KW_neutral,
1269 /* 100 */ 1198 /* 100 */
1270 KW_no_attack, 1199 KW_no_attack,
1271 KW_no_damage, 1200 KW_no_damage,
1272 KW_NULL, 1201 KW_obj_original,
1273 KW_NULL, 1202 KW_NULL,
1274 KW_activate_on_push, 1203 KW_activate_on_push,
1275 KW_activate_on_release, 1204 KW_activate_on_release,
1276 KW_is_water, 1205 KW_is_water,
1277 KW_use_content_on_gen, 1206 KW_use_content_on_gen,
1278 KW_NULL, 1207 KW_NULL,
1279 KW_is_buildable, 1208 KW_is_buildable,
1280 /* 110 */ 1209 /* 110 */
1210 KW_destroy_on_death,
1211 KW_NULL,
1281 }; 1212 };
1282 1213
1283 int i; 1214 int i;
1284 1215
1285 /* This saves the key/value lists. We do it first so that any 1216 /* This saves the key/value lists. We do it first so that any
1286 * keys that match field names will be overwritten by the loader. 1217 * keys that match field names will be overwritten by the loader.
1287 */ 1218 */
1288 for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) 1219 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1289 { 1220 {
1290 /* Find the field in the opposing member. */ 1221 /* Find the field in the opposing member. */
1291 key_value *arch_field = get_ob_key_link (tmp, my_field->key); 1222 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1292 1223
1293 /* If there's no partnering field, or it's got a different value, save our field. */ 1224 /* If there's no partnering field, or it's got a different value, save our field. */
… …
1319 f.put (KW_msg, KW_endmsg, op->msg); 1250 f.put (KW_msg, KW_endmsg, op->msg);
1320 if (op->lore != tmp->lore) 1251 if (op->lore != tmp->lore)
1321 f.put (KW_lore, KW_endlore, op->lore); 1252 f.put (KW_lore, KW_endlore, op->lore);
1322 1253
1323 CMP_OUT (other_arch); 1254 CMP_OUT (other_arch);
1324 CMP_OUT (face); 1255
1256 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
1325 1257
1326 if (op->animation_id != tmp->animation_id) 1258 if (op->animation_id != tmp->animation_id)
1327 if (op->animation_id) 1259 if (op->animation_id)
1328 { 1260 {
1329 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1261 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
… …
1377 f.put (resist_save[i], op->resist[i]); 1309 f.put (resist_save[i], op->resist[i]);
1378 1310
1379 CMP_OUT (path_attuned); 1311 CMP_OUT (path_attuned);
1380 CMP_OUT (path_repelled); 1312 CMP_OUT (path_repelled);
1381 CMP_OUT (path_denied); 1313 CMP_OUT (path_denied);
1382 CMP_OUT (material); 1314 CMP_OUT2 (material, materials);//TODO: nuke
1383 CMP_OUT (materialname); 1315 CMP_OUT (materialname);
1384 CMP_OUT (value); 1316 CMP_OUT (value);
1385 CMP_OUT (carrying); 1317 CMP_OUT (carrying);
1386 CMP_OUT (weight); 1318 CMP_OUT (weight);
1387 CMP_OUT (invisible); 1319 CMP_OUT (invisible);
… …
1437/* 1369/*
1438 * Dumps all variables in an object to a file. 1370 * Dumps all variables in an object to a file.
1439 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1371 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1440 * the only place this is not set is when saving the player. 1372 * the only place this is not set is when saving the player.
1441 */ 1373 */
1442void 1374bool
1443save_object (object_freezer &fp, object *op, int flag) 1375object::write (object_freezer &f)
1444{ 1376{
1445 /* Even if the object does have an owner, it would seem that we should 1377 /* Even if the object does have an owner, it would seem that we should
1446 * still save it. 1378 * still save it.
1447 */ 1379 */
1448 if (op->owner) 1380 if (owner)
1449 return; 1381 return true;
1450 1382
1451 /* If it is unpaid and we don't want to save those, just return. */
1452 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1453 return;
1454
1455 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype; 1383 archetype *at = arch ? (archetype *)arch : empty_archetype;
1456 1384
1457 fp.put (KW_arch, at->name); 1385 f.put (KW_arch, at->name);
1458 put (fp, op, &at->clone); 1386 write_diff (f, this, &at->clone);
1459 1387
1460 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1461
1462 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1388 for (object *tmp = inv; tmp; tmp = tmp->below)
1463 save_object (fp, tmp, flag); 1389 tmp->write (f);
1464 1390
1465 fp.put (op); 1391 f.put (this);
1466 fp.put (KW_end, 0); 1392 f.put (KW_end);
1393
1394 return true;
1467} 1395}
1468 1396
1397/////////////////////////////////////////////////////////////////////////////
1398
1399// generic resource file load,
1400// currently supports: region, treasures, archetypes
1401bool load_resource_file (const char *filename)
1402{
1403 object_thawer f (filename);
1404
1405 bool success = false;
1406 bool seen_arch = false;
1407
1408 f.next ();
1409
1410 for (;;)
1411 {
1412 switch (f.kw)
1413 {
1414 case KW_region:
1415 if (!region::read (f))
1416 goto finish;
1417 break;
1418
1419 case KW_treasure:
1420 case KW_treasureone:
1421 if (!treasurelist::read (f))
1422 goto finish;
1423 break;
1424
1425 case KW_object:
1426 seen_arch = true;
1427 if (!archetype::read (f))
1428 goto finish;
1429 break;
1430
1431 case KW_EOF:
1432 success = true;
1433 goto finish;
1434
1435 default:
1436 if (!f.parse_error ("resource file"))
1437 goto finish;
1438 }
1439 }
1440
1441finish:
1442 if (seen_arch)
1443 init_archetype_pointers ();
1444
1445 return success;
1446}
1447

Diff Legend

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