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.33 by root, Sun Dec 31 17:17:22 2006 UTC vs.
Revision 1.78 by root, Mon May 7 06:01:47 2007 UTC

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

Diff Legend

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