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

Diff Legend

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