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.24 by root, Mon Dec 18 02:35:00 2006 UTC vs.
Revision 1.70 by root, Tue Apr 17 18:40:31 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 */
284 if (!(IS_WEAPON (op) && op->level > 0)) 281 if (!(op->is_weapon () && op->level > 0))
285 { 282 {
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; 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
495 object *op_inv = op->inv; 485 object *op_inv = inv;
496 486
497 for (;;) 487 for (;;)
498 { 488 {
499 keyword kw = thawer.get_kv ();
500
501 switch (kw) 489 switch (f.kw)
502 { 490 {
503 case KW_Object: // uppercase alias
504 case KW_object:
505 thawer.get (op->name);
506
507 if (op->arch != NULL)
508 op->arch->name = op->name;
509
510 break;
511
512 case KW_uuid: 491 case KW_uuid:
513 if (const char *s = thawer.get_str ()) 492 if (const char *s = f.get_str ())
514 { 493 {
515 unsigned int version; 494 unsigned int version;
516 unsigned long long seq; 495 unsigned long long seq;
517 496
518 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) 497 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
519 { 498 {
520 op->uuid.seq = seq; 499 uuid.seq = seq;
521 break; 500 break;
522 } 501 }
523 } 502 }
524 503
525 op->uuid = gen_uuid (); 504 uuid = gen_uuid ();
526 break; 505 break;
527 506
528 case KW_oid: 507 case KW_oid:
529 thawer.get (op, thawer.get_sint32 ()); 508 f.get (this, f.get_sint32 ());
530 break; 509 break;
531 510
532 case KW_name: thawer.get (op->name); break; 511 case KW_name: f.get (name); break;
533 case KW_name_pl: thawer.get (op->name_pl); break; 512 case KW_name_pl: f.get (name_pl); break;
534 case KW_title: thawer.get (op->title); break; 513 case KW_title: f.get (title); break;
535 case KW_custom_name: thawer.get (op->custom_name); break; 514 case KW_custom_name: f.get (custom_name); break;
536 515
537 case KW_attach: thawer.get_ornull (op->attach); break; 516 case KW_attach: f.get_ornull (attach); break;
538 case KW_skill: thawer.get_ornull (op->skill); break; 517 case KW_skill: f.get_ornull (skill); break;
539 case KW_race: thawer.get_ornull (op->race); break; 518 case KW_race: f.get_ornull (race); break;
540 case KW_slaying: thawer.get_ornull (op->slaying); break; 519 case KW_slaying: f.get_ornull (slaying); break;
541 520
542 case KW_arch: 521 case KW_arch:
543 { 522 {
544 const char *str = thawer.get_str (); 523 object *tmp = object::read (f);
524 tmp->deactivate ();
545 525
546 if (op->arch)
547 { 526 {
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); 527 // was: insert_ob_in_ob (tmp, op);
570 // but manually adding it can improve map loading times a lot 528 // but manually adding it can improve map loading times a lot
571 // also, appending instead of prepending keeps the 529 // also, appending instead of prepending keeps the
572 // save ordering the same between repeated load/saves. 530 // save ordering the same between repeated load/saves.
573 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 531 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
574 CLEAR_FLAG (tmp, FLAG_REMOVED); 532 CLEAR_FLAG (tmp, FLAG_REMOVED);
575 533
576 if (!op_inv) 534 if (!op_inv)
577 { 535 {
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; 536 inv = tmp;
537 tmp->above = 0;
593 } 538 }
594 else 539 else
595 { 540 {
596 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); 541 while (op_inv->below)
597 tmp->destroy (); 542 op_inv = op_inv->below;
543
544 op_inv->below = tmp;
545 tmp->above = op_inv;
598 } 546 }
547
548 tmp->below = 0;
549 tmp->env = this;
550 op_inv = tmp;
599 } 551 }
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 } 552 }
612 break; 553 continue;
613 554
614 case KW_other_arch: 555 case KW_other_arch:
556 other_arch =
557 loading_arch
558 ? archetype::get (f.get_str ())
615 op->other_arch = archetype::find (thawer.get_str ()); 559 : archetype::find (f.get_str ());
560
561 if (!other_arch)
562 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
616 break; 563 break;
617 564
618 case KW_animation: 565 case KW_animation:
619 { 566 {
567 CLEAR_FLAG (this, FLAG_ANIMATE);
568 animation_id = 0;
569
620 const char *str = thawer.get_str (); 570 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); 571 if (str && (animation_id = find_animation (str)))
630 SET_FLAG (op, FLAG_ANIMATE); 572 SET_FLAG (this, FLAG_ANIMATE);
631 }
632 } 573 }
633
634 break; 574 break;
635 575
636 case KW_last_heal: thawer.get (op->last_heal); break; 576 case KW_last_heal: f.get (last_heal); break;
637 case KW_last_sp: thawer.get (op->last_sp); break; 577 case KW_last_sp: f.get (last_sp); break;
638 case KW_last_grace: thawer.get (op->last_grace); break; 578 case KW_last_grace: f.get (last_grace); break;
639 case KW_last_eat: thawer.get (op->last_eat); break; 579 case KW_last_eat: f.get (last_eat); break;
640 case KW_speed_left: thawer.get (op->speed_left); break; 580 case KW_speed_left: f.get (speed_left); break;
641 581
642 case KW_speed: 582 case KW_speed:
643 thawer.get (op->speed); 583 f.get (speed);
644 584
645 //TODO: maybe do in check_object 585 //TODO: maybe do in check_object
646 if (!(map_flags & MAP_STYLE)) 586 // removed check for style maps
647 {
648 if (op->speed < 0) 587 if (speed < 0)
649 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 588 speed_left = speed_left - rndm ();
650
651 update_ob_speed (op);
652 }
653 589
654 break; 590 break;
655 591
656 case KW_slow_move: 592 case KW_slow_move:
657 op->move_slow |= MOVE_WALK; 593 move_slow |= MOVE_WALK;
658 thawer.get (op->move_slow_penalty); 594 f.get (move_slow_penalty);
659 break; 595 break;
660 596
661 case KW_face: 597 case KW_face:
662 op->face = &new_faces[FindFace (thawer.get_str (), 0)]; 598 face = face_find (f.get_str ());
663 break; 599 break;
664 600
665 case KW_x: thawer.get (op->x); break; 601 case KW_x: f.get (x); break;
666 case KW_y: thawer.get (op->y); break; 602 case KW_y: f.get (y); break;
667 603
668 case KW_Str: // uppercase alias 604 case KW_Str: // uppercase alias
669 case KW_str: thawer.get (op->stats.Str); break; 605 case KW_str: f.get (stats.Str); break;
670 case KW_Dex: // uppercase alias 606 case KW_Dex: // uppercase alias
671 case KW_dex: thawer.get (op->stats.Dex); break; 607 case KW_dex: f.get (stats.Dex); break;
672 case KW_Con: // uppercase alias 608 case KW_Con: // uppercase alias
673 case KW_con: thawer.get (op->stats.Con); break; 609 case KW_con: f.get (stats.Con); break;
674 case KW_Wis: // uppercase alias 610 case KW_Wis: // uppercase alias
675 case KW_wis: thawer.get (op->stats.Wis); break; 611 case KW_wis: f.get (stats.Wis); break;
676 case KW_Cha: // uppercase alias 612 case KW_Cha: // uppercase alias
677 case KW_cha: thawer.get (op->stats.Cha); break; 613 case KW_cha: f.get (stats.Cha); break;
678 case KW_Int: // uppercase alias 614 case KW_Int: // uppercase alias
679 case KW_int: thawer.get (op->stats.Int); break; 615 case KW_int: f.get (stats.Int); break;
680 case KW_Pow: // uppercase alias 616 case KW_Pow: // uppercase alias
681 case KW_pow: thawer.get (op->stats.Pow); break; 617 case KW_pow: f.get (stats.Pow); break;
682 618
683 case KW_hp: thawer.get (op->stats.hp); break; 619 case KW_hp: f.get (stats.hp); break;
684 case KW_maxhp: thawer.get (op->stats.maxhp); break; 620 case KW_maxhp: f.get (stats.maxhp); break;
685 case KW_sp: thawer.get (op->stats.sp); break; 621 case KW_sp: f.get (stats.sp); break;
686 case KW_maxsp: thawer.get (op->stats.maxsp); break; 622 case KW_maxsp: f.get (stats.maxsp); break;
687 case KW_grace: thawer.get (op->stats.grace); break; 623 case KW_grace: f.get (stats.grace); break;
688 case KW_maxgrace: thawer.get (op->stats.maxgrace); break; 624 case KW_maxgrace: f.get (stats.maxgrace); break;
689 625
690 case KW_exp: thawer.get (op->stats.exp); break; 626 case KW_exp: f.get (stats.exp); break;
691 case KW_perm_exp: thawer.get (op->perm_exp); break; 627 case KW_perm_exp: f.get (perm_exp); break;
692 case KW_food: thawer.get (op->stats.food); break; 628 case KW_food: f.get (stats.food); break;
693 case KW_dam: thawer.get (op->stats.dam); break; 629 case KW_dam: f.get (stats.dam); break;
694 case KW_wc: thawer.get (op->stats.wc); break; 630 case KW_wc: f.get (stats.wc); break;
695 case KW_ac: thawer.get (op->stats.ac); break; 631 case KW_ac: f.get (stats.ac); break;
696 case KW_nrof: thawer.get (op->nrof); break; 632 case KW_nrof: f.get (nrof); break;
697 case KW_level: thawer.get (op->level); break; 633 case KW_level: f.get (level); break;
698 case KW_direction: thawer.get (op->direction); break; 634 case KW_direction: f.get (direction); break;
699 case KW_type: thawer.get (op->type); break; 635 case KW_type: f.get (type); break;
700 case KW_subtype: thawer.get (op->subtype); break; 636 case KW_subtype: f.get (subtype); break;
701 case KW_value: thawer.get (op->value); break; 637 case KW_value: f.get (value); break;
702 case KW_weight: thawer.get (op->weight); break; 638 case KW_weight: f.get (weight); break;
703 case KW_carrying: thawer.get (op->carrying); break; 639 case KW_carrying: f.get (carrying); break;
704 case KW_attacktype: thawer.get (op->attacktype); break; 640 case KW_attacktype: f.get (attacktype); break;
705 case KW_path_attuned: thawer.get (op->path_attuned); break; 641 case KW_path_attuned: f.get (path_attuned); break;
706 case KW_path_repelled: thawer.get (op->path_repelled); break; 642 case KW_path_repelled: f.get (path_repelled); break;
707 case KW_path_denied: thawer.get (op->path_denied); break; 643 case KW_path_denied: f.get (path_denied); break;
708 case KW_invisible: thawer.get (op->invisible); break; 644 case KW_invisible: f.get (invisible); break;
709 case KW_magic: thawer.get (op->magic); break; 645 case KW_magic: f.get (magic); break;
710 case KW_state: thawer.get (op->state); break; 646 case KW_state: f.get (state); break;
711 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; 647 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
712 case KW_material: thawer.get (op->material); break; 648 case KW_material: f.get (materials); break; //TODO: nuke
713 case KW_materialname: thawer.get (op->materialname); break; 649 case KW_materialname: f.get (materialname); break;
714 650
715 /* These are the new values */ 651 /* These are the new values */
716 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; 652 case KW_move_block: set_move (move_block, f.get_str ()); break;
717 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; 653 case KW_move_allow: set_move (move_allow, f.get_str ()); break;
718 case KW_move_type: set_move (op->move_type, thawer.get_str ()); break; 654 case KW_move_type: set_move (move_type, f.get_str ()); break;
719 case KW_move_on: set_move (op->move_on, thawer.get_str ()); break; 655 case KW_move_on: set_move (move_on, f.get_str ()); break;
720 case KW_move_off: set_move (op->move_off, thawer.get_str ()); break; 656 case KW_move_off: set_move (move_off, f.get_str ()); break;
721 case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break; 657 case KW_move_slow: set_move (move_slow, f.get_str ()); break;
722 658
723 /* These are all legacy - any new objects should use the move_ .. values */ 659 /* These are all legacy - any new objects should use the move_ .. values */
724 case KW_no_pass: 660 case KW_no_pass:
725 { 661 {
726 if (thawer.get_sint32 ()) 662 if (f.get_sint32 ())
727 op->move_block = MOVE_ALL; 663 move_block = MOVE_ALL;
728 else 664 else
729 op->move_block = 0; 665 move_block = 0;
730 } 666 }
731 667
732 break; 668 break;
733 669
734 /* These are all legacy - any new objects should use the move_ .. values */ 670 /* These are all legacy - any new objects should use the move_ .. values */
735 case KW_walk_on: 671 case KW_walk_on:
736 { 672 {
737 if (thawer.get_sint32 ()) 673 if (f.get_sint32 ())
738 op->move_on |= MOVE_WALK; 674 move_on |= MOVE_WALK;
739 else 675 else
740 op->move_on &= ~MOVE_WALK; 676 move_on &= ~MOVE_WALK;
741 } 677 }
742 678
743 break; 679 break;
744 680
745 /* These are all legacy - any new objects should use the move_ .. values */ 681 /* These are all legacy - any new objects should use the move_ .. values */
746 case KW_walk_off: 682 case KW_walk_off:
747 { 683 {
748 if (thawer.get_sint32 ()) 684 if (f.get_sint32 ())
749 op->move_off |= MOVE_WALK; 685 move_off |= MOVE_WALK;
750 else 686 else
751 op->move_off &= ~MOVE_WALK; 687 move_off &= ~MOVE_WALK;
752 } 688 }
753 break; 689 break;
754 690
755 /* These are all legacy - any new objects should use the move_ .. values */ 691 /* These are all legacy - any new objects should use the move_ .. values */
756 case KW_fly_on: 692 case KW_fly_on:
757 { 693 {
758 if (thawer.get_sint32 ()) 694 if (f.get_sint32 ())
759 op->move_on |= MOVE_FLY_LOW; 695 move_on |= MOVE_FLY_LOW;
760 else 696 else
761 op->move_on &= ~MOVE_FLY_LOW; 697 move_on &= ~MOVE_FLY_LOW;
762 } 698 }
763 break; 699 break;
764 700
765 /* These are all legacy - any new objects should use the move_ .. values */ 701 /* These are all legacy - any new objects should use the move_ .. values */
766 case KW_fly_off: 702 case KW_fly_off:
767 { 703 {
768 if (thawer.get_sint32 ()) 704 if (f.get_sint32 ())
769 op->move_off |= MOVE_FLY_LOW; 705 move_off |= MOVE_FLY_LOW;
770 else 706 else
771 op->move_off &= ~MOVE_FLY_LOW; 707 move_off &= ~MOVE_FLY_LOW;
772 } 708 }
773 break; 709 break;
774 710
775 //TODO: remove these after converting archetypes 711 //TODO: remove these after converting archetypes
776 case KW_can_use_wand: 712 case KW_can_use_wand:
777 GET_FLAG (op, FLAG_USE_RANGE); 713 GET_FLAG (this, FLAG_USE_RANGE);
778 break; 714 break;
779 715
780 /* These are all legacy - any new objects should use the move_ .. values */ 716 /* These are all legacy - any new objects should use the move_ .. values */
781 case KW_flying: 717 case KW_flying:
782 { 718 {
783 if (thawer.get_sint32 ()) 719 if (f.get_sint32 ())
784 op->move_type |= MOVE_FLY_LOW; 720 move_type |= MOVE_FLY_LOW;
785 else 721 else
786 op->move_type &= ~MOVE_FLY_LOW; 722 move_type &= ~MOVE_FLY_LOW;
787 } 723 }
788 break; 724 break;
789 725
790 726
791 case KW_identified: 727 case KW_identified:
792 GET_FLAG (op, FLAG_IDENTIFIED); 728 GET_FLAG (this, FLAG_IDENTIFIED);
793 //TODO: move to check_object or so 729 //TODO: move to check_object or so
794 if (QUERY_FLAG (op, FLAG_IDENTIFIED)) 730 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
795 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 731 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
796 732
797 break; 733 break;
798 734
799 case KW_wiz: 735 case KW_wiz:
800 GET_FLAG (op, FLAG_WIZ); 736 GET_FLAG (this, FLAG_WIZ);
801 //TODO: move to check_object 737 //TODO: move to check_object
802 if (QUERY_FLAG (op, FLAG_WIZ)) 738 if (QUERY_FLAG (this, FLAG_WIZ))
803 { 739 {
804 SET_FLAG (op, FLAG_WAS_WIZ); 740 SET_FLAG (this, FLAG_WAS_WIZ);
805 SET_FLAG (op, FLAG_WIZPASS); 741 SET_FLAG (this, FLAG_WIZPASS);
806 SET_FLAG (op, FLAG_WIZCAST); 742 SET_FLAG (this, FLAG_WIZCAST);
807 } 743 }
808 else 744 else
809 { 745 {
810 CLEAR_FLAG (op, FLAG_WIZPASS); 746 CLEAR_FLAG (this, FLAG_WIZPASS);
811 CLEAR_FLAG (op, FLAG_WIZCAST); 747 CLEAR_FLAG (this, FLAG_WIZCAST);
812 } 748 }
813 break; 749 break;
814 750
815 case KW_friendly: 751 case KW_friendly:
816 GET_FLAG (op, FLAG_FRIENDLY); 752 if (f.get_sint32 ())
817 //TODO: move to check_object or so 753 if (type != PLAYER)
818 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
819 add_friendly_object (op); 754 add_friendly_object (this);
820 break;
821 755
756 break;
757
822 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 758 case KW_monster: GET_FLAG (this, FLAG_MONSTER); break;
823 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 759 case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break;
824 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 760 case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break;
825 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 761 case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break;
762 case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break;
826 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 763 case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break;
827 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 764 case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break;
828 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 765 case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break;
829 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 766 case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break;
830 case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break;
831 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 767 case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break;
832 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 768 case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break;
833 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 769 case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break;
834 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 770 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
835 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; 771 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
836 case KW_alive: GET_FLAG (op, FLAG_ALIVE); break; 772 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
837 case KW_applied: GET_FLAG (op, FLAG_APPLIED); break; 773 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
838 case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break; 774 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
839 case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break; 775 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
840 case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break; 776 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
841 case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break; 777 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
842 case KW_changing: GET_FLAG (op, FLAG_CHANGING); break; 778 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
843 case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break; 779 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
844 case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break; 780 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
845 case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break; 781 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
846 case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break; 782 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
847 case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break; 783 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
848 case KW_scared: GET_FLAG (op, FLAG_SCARED); break; 784 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
849 case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break; 785 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
850 case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break; 786 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
851 case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break; 787 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
852 case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break; 788 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
853 case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break; 789 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
854 case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break; 790 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
855 case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break; 791 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
856 case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break; 792 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
857 case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break; 793 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
858 case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break; 794 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
859 case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break; 795 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
860 case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break; 796 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
861 case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break; 797 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
862 case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break; 798 case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break;
863 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; 799 case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break;
864 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break; 800 case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break;
865 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break; 801 case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break;
866 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break; 802 case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break;
867 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break; 803 case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break;
868 case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break; 804 case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break;
869 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; 805 case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break;
870 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; 806 case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break;
871 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; 807 case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break;
872 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; 808 case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break;
873 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; 809 case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break;
874 case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break; 810 case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break;
875 case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break; 811 case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
876 case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break; 812 case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break;
877 case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break; 813 case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break;
878 case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break; 814 case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break;
879 case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break; 815 case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break;
880 case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break; 816 case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break;
881 case KW_cursed: GET_FLAG (op, FLAG_CURSED); break; 817 case KW_cursed: GET_FLAG (this, FLAG_CURSED); break;
882 case KW_damned: GET_FLAG (op, FLAG_DAMNED); break; 818 case KW_damned: GET_FLAG (this, FLAG_DAMNED); break;
883 case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break; 819 case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break;
884 case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break; 820 case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break;
885 case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break; 821 case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break;
886 case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break; 822 case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break;
887 case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break; 823 case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break;
888 case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break; 824 case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break;
889 case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break; 825 case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break;
890 case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break; 826 case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break;
891 case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break; 827 case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break;
892 case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break; 828 case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break;
893 case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break; 829 case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break;
894 case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break; 830 case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break;
895 case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break; 831 case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break;
896 case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break; 832 case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break;
897 case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break; 833 case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break;
898 case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break; 834 case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break;
899 case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break; 835 case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break;
900 case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break; 836 case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break;
901 case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break; 837 case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break;
902 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 838 case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break;
903 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 839 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
904 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 840 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
905 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 841 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
906 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 842 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
843 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
907 844
908 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 845 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
909 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 846 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
910 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 847 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
911 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 848 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
912 case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break; 849 case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break;
913 case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break; 850 case KW_resist_cold: f.get (resist[ATNR_COLD]); break;
914 case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break; 851 case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break;
915 case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break; 852 case KW_resist_acid: f.get (resist[ATNR_ACID]); break;
916 case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break; 853 case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break;
917 case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break; 854 case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break;
918 case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break; 855 case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break;
919 case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break; 856 case KW_resist_poison: f.get (resist[ATNR_POISON]); break;
920 case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break; 857 case KW_resist_slow: f.get (resist[ATNR_SLOW]); break;
921 case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break; 858 case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break;
922 case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break; 859 case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break;
923 case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break; 860 case KW_resist_fear: f.get (resist[ATNR_FEAR]); break;
924 case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break; 861 case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break;
925 case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break; 862 case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break;
926 case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break; 863 case KW_resist_death: f.get (resist[ATNR_DEATH]); break;
927 case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break; 864 case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break;
928 case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break; 865 case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break;
929 case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break; 866 case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break;
930 case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break; 867 case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break;
931 case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break; 868 case KW_resist_blind: f.get (resist[ATNR_BLIND]); break;
932 case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break; 869 case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break;
933 case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break; 870 case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break;
934 case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break; 871 case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break;
935 872
936 case KW_luck: thawer.get (op->stats.luck); break; 873 case KW_luck: f.get (stats.luck); break;
937 case KW_run_away: thawer.get (op->run_away); break; 874 case KW_run_away: f.get (run_away); break;
938 case KW_pick_up: thawer.get (op->pick_up); break; 875 case KW_pick_up: f.get (pick_up); break;
939 case KW_item_power: thawer.get (op->item_power); break; 876 case KW_item_power: f.get (item_power); break;
940 case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break; 877 case KW_gen_sp_armour: f.get (gen_sp_armour); break;
941 case KW_anim_speed: thawer.get (op->anim_speed); break; 878 case KW_anim_speed: f.get (anim_speed); break;
942 case KW_container: thawer.get (op->weight_limit); break; 879 case KW_container: f.get (weight_limit); break;
943 case KW_will_apply: thawer.get (op->will_apply); break; 880 case KW_will_apply: f.get (will_apply); break;
944 case KW_attack_movement: thawer.get (op->attack_movement); break; 881 case KW_attack_movement: f.get (attack_movement); break;
945 case KW_move_state: thawer.get (op->move_status); break; 882 case KW_move_state: f.get (move_status); break;
946 case KW_expmul: thawer.get (op->expmul); break; 883 case KW_expmul: f.get (expmul); break;
947 case KW_glow_radius: thawer.get (op->glow_radius); break; 884 case KW_glow_radius: f.get (glow_radius); break;
948 case KW_weapontype: thawer.get (op->weapontype); break; 885 case KW_weapontype: f.get (weapontype); break;
949 case KW_tooltype: thawer.get (op->tooltype); break; 886 case KW_tooltype: f.get (tooltype); break;
950 case KW_casting_time: thawer.get (op->casting_time); break; 887 case KW_casting_time: f.get (casting_time); break;
951 case KW_elevation: thawer.get (op->elevation); break; 888 case KW_elevation: f.get (elevation); break;
952 case KW_smoothlevel: thawer.get (op->smoothlevel); break; 889 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
953 case KW_client_type: thawer.get (op->client_type); break; 890 case KW_client_type: f.get (client_type); break;
954 case KW_duration: thawer.get (op->duration); break; 891 case KW_duration: f.get (duration); break;
955 case KW_range: thawer.get (op->range); break; 892 case KW_range: f.get (range); break;
956 case KW_range_modifier: thawer.get (op->range_modifier); break; 893 case KW_range_modifier: f.get (range_modifier); break;
957 case KW_dam_modifier: thawer.get (op->dam_modifier); break; 894 case KW_dam_modifier: f.get (dam_modifier); break;
958 case KW_duration_modifier: thawer.get (op->duration_modifier); break; 895 case KW_duration_modifier: f.get (duration_modifier); break;
959 896
960 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 897 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
961 //TODO: parse from other include files 898 //TODO: parse from other include files
962 case KW_body_range: thawer.get (op->body_info[0]); break; 899 case KW_body_range: f.get (body_info[0]); break;
963 case KW_body_arm: thawer.get (op->body_info[1]); break; 900 case KW_body_arm: f.get (body_info[1]); break;
964 case KW_body_torso: thawer.get (op->body_info[2]); break; 901 case KW_body_torso: f.get (body_info[2]); break;
965 case KW_body_head: thawer.get (op->body_info[3]); break; 902 case KW_body_head: f.get (body_info[3]); break;
966 case KW_body_neck: thawer.get (op->body_info[4]); break; 903 case KW_body_neck: f.get (body_info[4]); break;
967 case KW_body_skill: thawer.get (op->body_info[5]); break; 904 case KW_body_skill: f.get (body_info[5]); break;
968 case KW_body_finger: thawer.get (op->body_info[6]); break; 905 case KW_body_finger: f.get (body_info[6]); break;
969 case KW_body_shoulder: thawer.get (op->body_info[7]); break; 906 case KW_body_shoulder: f.get (body_info[7]); break;
970 case KW_body_foot: thawer.get (op->body_info[8]); break; 907 case KW_body_foot: f.get (body_info[8]); break;
971 case KW_body_hand: thawer.get (op->body_info[9]); break; 908 case KW_body_hand: f.get (body_info[9]); break;
972 case KW_body_wrist: thawer.get (op->body_info[10]); break; 909 case KW_body_wrist: f.get (body_info[10]); break;
973 case KW_body_waist: thawer.get (op->body_info[11]); break; 910 case KW_body_waist: f.get (body_info[11]); break;
974 case KW_can_apply: 911 case KW_can_apply:
975 break; 912 break;
976 913
977 case KW_connected: 914 case KW_connected:
978 add_button_link (op, op->map, thawer.get_sint32 ()); 915 add_button_link (this, map, f.get_sint32 ());
979 break; 916 break;
980 917
981 case KW_randomitems: 918 case KW_randomitems:
982 op->randomitems = find_treasurelist (thawer.get_str ()); 919 if (f.get_str ())
920 {
921 randomitems =
922 loading_arch
923 ? treasurelist::get (f.get_str ())
924 : treasurelist::find (f.get_str ());
925
926 if (!randomitems)
927 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
928 }
983 break; 929 break;
984 930
985 case KW_msg: 931 case KW_msg:
986 {
987 thawer.get_ml (KW_endmsg, op->msg); 932 f.get_ml (KW_endmsg, msg);
988 //TODO: allow longer messages 933 //TODO: allow longer messages
989 if (strlen (op->msg) >= HUGE_BUF) 934 if (strlen (msg) >= HUGE_BUF)
990 { 935 {
991 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 936 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
992 op->msg = "ERROR, please report: string too long, winged.\n"; 937 msg = "ERROR, please report: string too long, winged.\n";
993 } 938 }
994 }
995 break; 939 break;
996 940
997 case KW_lore: 941 case KW_lore:
998 {
999 shstr msgbuf;
1000
1001 thawer.get_ml (KW_endlore, op->lore); 942 f.get_ml (KW_endlore, lore);
1002 //TODO: allow longer messages 943 //TODO: allow longer messages
1003 /* Just print a warning so we can be reasonably safe 944 /* Just print a warning so we can be reasonably safe
1004 * about not overflowing the buffer. 945 * about not overflowing the buffer.
1005 */ 946 */
1006 if (strlen (op->lore) > (HUGE_BUF / 2)) 947 if (strlen (lore) > (HUGE_BUF / 2))
1007 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 948 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1008 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 949 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
1009 }
1010 break; 950 break;
1011 951
1012 case KW_editable: 952 case KW_editable:
1013 case KW_editor_folder: 953 case KW_editor_folder:
1014 break; 954 break;
1015 955
1016 case KW_More: // uppercase alias
1017 case KW_more:
1018 /* We need to record that this is a multipart object,
1019 * so the calling function can glue things back together
1020 */
1021 ismore = 1;
1022 break;
1023
1024 case KW_end: 956 case KW_end:
1025 check_loaded_object (op); 957 check_loaded_object (this);
1026 958
1027 if (!arch_init) 959 if (!loading_arch)
1028 op->instantiate (); 960 instantiate ();
1029 961
1030 return ismore ? LL_MORE : LL_NORMAL; 962 f.next ();
1031
1032 case KW_EOF:
1033 return LL_EOF; 963 return true;
1034 964
1035 case KW_ERROR: 965 case KW_ERROR:
1036 set_ob_key_value (op, thawer.line, thawer.last_value, true); 966 set_ob_key_value (this, f.kw_str, f.value, true);
1037 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 967 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1038
1039 //TODO: skip line, ugly, factor parsing better
1040 if (thawer.last_value)
1041 thawer.line = thawer.last_value;
1042
1043 thawer.line += strlen (thawer.line) + 1;
1044
1045 break; 968 break;
1046 969
1047 default: 970 default:
1048 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 971 if (!f.parse_error ("object", name))
972 return false;
1049 break; 973 break;
1050 } 974 }
975
976 f.next ();
1051 } 977 }
1052} 978}
1053 979
1054/* 980object *
1055 * Loads an object from the given file-pointer. 981object::read (object_thawer &f, maptile *map)
1056 * Variables will be read and parsed and patched into the object
1057 * until the string "end" is reached, or the end of the file.
1058 *
1059 * bufstat is used to determine various file attributes:
1060 * LO_REPATE (0): We are reading from the same buffer as the last call.
1061 * LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions
1062 * will also be reading from this (treasure file, artifacts.)
1063 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1064 * be reset.
1065 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1066 *
1067 */
1068
1069int
1070load_object (object_thawer & fp, object *op, int map_flags)
1071{ 982{
1072 return parse_object (op, fp, map_flags); 983 assert (f.kw == KW_arch);
984
985 archetype *arch = archetype::find (f.get_str ());
986
987 if (!arch)
988 {
989 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
990 arch = archetype::find ("earthwall");
991 }
992
993 assert (arch); //D maybe use exception handling of sorts?
994
995 object *op = object::create ();
996
997 op->map = map;
998 arch->clone.copy_to (op);
999 // copy_to activates, this should be fixed properly
1000 op->deactivate ();
1001
1002 if (!op->parse_kv (f))
1003 {
1004 op->destroy (true);
1005 return 0;
1006 }
1007
1008 return op;
1073} 1009}
1074
1075 1010
1076/* This takes a buffer, scans it for variables, and sets those variables 1011/* This takes a buffer, scans it for variables, and sets those variables
1077 * as appropriate in op. 1012 * as appropriate in op.
1078 * 1013 *
1079 * This function appears to be used in only 2 places - in crossedit to 1014 * This function appears to be used in only 2 places - in crossedit to
1080 * override values and in c_wiz to mutate values. 1015 * override values and in c_wiz to mutate values.
1081 */ 1016 */
1082int 1017int
1083set_variable (object *op, char *buf) 1018set_variable (object *op, char *buf)
1084{ 1019{
1085 object_thawer thawer (buf, (AV *)0); 1020 object_thawer f (buf, (AV *)0);
1086 1021
1087 return parse_object (op, thawer, 0); 1022 f.kw = KW_arch; // special hack so that parse_kv skips
1088} 1023 return op->parse_kv (f);
1089
1090/*
1091 * Initialises the array of variable-names. Needed before any
1092 * objects can be loaded. Called by init_library().
1093 */
1094
1095void
1096init_vars ()
1097{
1098} 1024}
1099 1025
1100/* This returns a string of the integer movement type */ 1026/* This returns a string of the integer movement type */
1101#if 0 1027#if 0
1102// unused function 1028// unused function
… …
1147 return retbuf + 1; 1073 return retbuf + 1;
1148} 1074}
1149#endif 1075#endif
1150 1076
1151// compare *op against *tmp and output differences 1077// compare *op against *tmp and output differences
1152void 1078static void
1153put (object_freezer &f, object *op, object *tmp) 1079write_diff (object_freezer &f, object *op, object *tmp)
1154{ 1080{
1155 static const keyword resist_save[NROFATTACKS] = { 1081 static const keyword resist_save[NROFATTACKS] = {
1156# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1082# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1157# include "attackinc.h" 1083# include "attackinc.h"
1158# undef def 1084# undef def
… …
1182 KW_monster, 1108 KW_monster,
1183 KW_friendly, 1109 KW_friendly,
1184 KW_generator, 1110 KW_generator,
1185 KW_is_thrown, 1111 KW_is_thrown,
1186 KW_auto_apply, 1112 KW_auto_apply,
1187 KW_treasure, 1113 KW_NULL, // was KW_treasure
1188 KW_player_sold, 1114 KW_player_sold,
1189 /* 20 */ 1115 /* 20 */
1190 KW_see_invisible, 1116 KW_see_invisible,
1191 KW_can_roll, 1117 KW_can_roll,
1192 KW_overlay_floor, 1118 KW_overlay_floor,
… …
1275 KW_berserk, 1201 KW_berserk,
1276 KW_neutral, 1202 KW_neutral,
1277 /* 100 */ 1203 /* 100 */
1278 KW_no_attack, 1204 KW_no_attack,
1279 KW_no_damage, 1205 KW_no_damage,
1280 KW_NULL, 1206 KW_obj_original,
1281 KW_NULL, 1207 KW_NULL,
1282 KW_activate_on_push, 1208 KW_activate_on_push,
1283 KW_activate_on_release, 1209 KW_activate_on_release,
1284 KW_is_water, 1210 KW_is_water,
1285 KW_use_content_on_gen, 1211 KW_use_content_on_gen,
1286 KW_NULL, 1212 KW_NULL,
1287 KW_is_buildable, 1213 KW_is_buildable,
1288 /* 110 */ 1214 /* 110 */
1215 KW_destroy_on_death,
1216 KW_NULL,
1289 }; 1217 };
1290 1218
1291 int i; 1219 int i;
1292 1220
1293 /* This saves the key/value lists. We do it first so that any 1221 /* This saves the key/value lists. We do it first so that any
1294 * keys that match field names will be overwritten by the loader. 1222 * keys that match field names will be overwritten by the loader.
1295 */ 1223 */
1296 for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) 1224 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1297 { 1225 {
1298 /* Find the field in the opposing member. */ 1226 /* Find the field in the opposing member. */
1299 key_value *arch_field = get_ob_key_link (tmp, my_field->key); 1227 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1300 1228
1301 /* If there's no partnering field, or it's got a different value, save our field. */ 1229 /* If there's no partnering field, or it's got a different value, save our field. */
… …
1327 f.put (KW_msg, KW_endmsg, op->msg); 1255 f.put (KW_msg, KW_endmsg, op->msg);
1328 if (op->lore != tmp->lore) 1256 if (op->lore != tmp->lore)
1329 f.put (KW_lore, KW_endlore, op->lore); 1257 f.put (KW_lore, KW_endlore, op->lore);
1330 1258
1331 CMP_OUT (other_arch); 1259 CMP_OUT (other_arch);
1332 CMP_OUT (face); 1260
1261 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
1333 1262
1334 if (op->animation_id != tmp->animation_id) 1263 if (op->animation_id != tmp->animation_id)
1335 if (op->animation_id) 1264 if (op->animation_id)
1336 { 1265 {
1337 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1266 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
… …
1385 f.put (resist_save[i], op->resist[i]); 1314 f.put (resist_save[i], op->resist[i]);
1386 1315
1387 CMP_OUT (path_attuned); 1316 CMP_OUT (path_attuned);
1388 CMP_OUT (path_repelled); 1317 CMP_OUT (path_repelled);
1389 CMP_OUT (path_denied); 1318 CMP_OUT (path_denied);
1390 CMP_OUT (material); 1319 CMP_OUT2 (material, materials);//TODO: nuke
1391 CMP_OUT (materialname); 1320 CMP_OUT (materialname);
1392 CMP_OUT (value); 1321 CMP_OUT (value);
1393 CMP_OUT (carrying); 1322 CMP_OUT (carrying);
1394 CMP_OUT (weight); 1323 CMP_OUT (weight);
1395 CMP_OUT (invisible); 1324 CMP_OUT (invisible);
… …
1429 CMP_OUT (move_on); 1358 CMP_OUT (move_on);
1430 CMP_OUT (move_off); 1359 CMP_OUT (move_off);
1431 CMP_OUT (move_slow); 1360 CMP_OUT (move_slow);
1432 CMP_OUT (move_slow_penalty); 1361 CMP_OUT (move_slow_penalty);
1433 1362
1434 if (op->flags != tmp->flags) 1363 if (op->flag != tmp->flag)
1435 for (i = 0; i <= NUM_FLAGS; i++) 1364 for (i = 0; i <= NUM_FLAGS; i++)
1436 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1365 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1437 f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); 1366 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1438 1367
1439 /* Save body locations */ 1368 /* Save body locations */
1440 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1369 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1441 if (op->body_info[i] != tmp->body_info[i]) 1370 if (op->body_info[i] != tmp->body_info[i])
1442 f.put (body_locations[i].save_name, op->body_info[i]); 1371 f.put (body_locations[i].save_name, op->body_info[i]);
… …
1444 1373
1445/* 1374/*
1446 * Dumps all variables in an object to a file. 1375 * Dumps all variables in an object to a file.
1447 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1376 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1448 * the only place this is not set is when saving the player. 1377 * the only place this is not set is when saving the player.
1449 * If bit 1 of flag is set, don't remove the object after save. As of now,
1450 * all of the callers are setting this.
1451 */ 1378 */
1452 1379bool
1453void 1380object::write (object_freezer &f)
1454save_object (object_freezer & fp, object *op, int flag)
1455{ 1381{
1456 archetype *at;
1457 object *tmp, *old;
1458
1459 /* Even if the object does have an owner, it would seem that we should 1382 /* Even if the object does have an owner, it would seem that we should
1460 * still save it. 1383 * still save it.
1461 */ 1384 */
1462 if (op->owner) 1385 if (owner)
1463 return; 1386 return true;
1464 1387
1465 /* If it is unpaid and we don't want to save those, just return. */ 1388 archetype *at = arch ? (archetype *)arch : empty_archetype;
1466 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID)))
1467 return;
1468 1389
1469 if ((at = op->arch) == NULL)
1470 at = empty_archetype;
1471
1472 fp.put (KW_arch, at->name); 1390 f.put (KW_arch, at->name);
1391 write_diff (f, this, &at->clone);
1473 1392
1474 put (fp, op, &at->clone);
1475
1476 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1477
1478 old = NULL;
1479
1480 if (flag & 2)
1481 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1393 for (object *tmp = inv; tmp; tmp = tmp->below)
1482 save_object (fp, tmp, flag); 1394 tmp->write (f);
1483 else
1484 /* Slightly different logic because tmp/op will be removed by
1485 * the save_object we call. So we just keep looking at op->inv
1486 * until there is nothing left. In theory, the variable old
1487 * should not be needed, as recursive loops shouldn't happen.
1488 */
1489 while ((tmp = op->inv) != NULL)
1490 {
1491 if (old == tmp)
1492 {
1493 LOG (llevError, " Recursive loop in inventory\n");
1494 break;
1495 }
1496 1395
1497 save_object (fp, tmp, flag);
1498 old = tmp;
1499 }
1500
1501 if (!(flag & 2))
1502 op->destroy ();
1503
1504 fp.put (op); 1396 f.put (this);
1505 fprintf (fp, "end\n"); 1397 f.put (KW_end);
1398
1399 return true;
1506} 1400}
1507 1401
1402/////////////////////////////////////////////////////////////////////////////
1403
1404// generic resource file load,
1405// currently supports: region, treasures, archetypes
1406bool load_resource_file (const char *filename)
1407{
1408 object_thawer f (filename);
1409
1410 bool success = false;
1411 bool seen_arch = false;
1412
1413 f.next ();
1414
1415 for (;;)
1416 {
1417 switch (f.kw)
1418 {
1419 case KW_region:
1420 if (!region::read (f))
1421 goto finish;
1422 break;
1423
1424 case KW_treasure:
1425 case KW_treasureone:
1426 if (!treasurelist::read (f))
1427 goto finish;
1428 break;
1429
1430 case KW_object:
1431 seen_arch = true;
1432 if (!archetype::read (f))
1433 goto finish;
1434 break;
1435
1436 case KW_EOF:
1437 success = true;
1438 goto finish;
1439
1440 default:
1441 if (!f.parse_error ("resource file"))
1442 goto finish;
1443 }
1444 }
1445
1446finish:
1447 if (seen_arch)
1448 init_archetype_pointers ();
1449
1450 return success;
1451}
1452

Diff Legend

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