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.49 by root, Fri Jan 19 17:54:15 2007 UTC vs.
Revision 1.149 by root, Mon Nov 16 22:31:13 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying
27 variable. */
28
29 24
30#include <global.h> 25#include <global.h>
31#include <loader.h> 26#include <loader.h>
32#include <sproto.h> 27#include <sproto.h>
33 28
34// future resource loader base class 29/////////////////////////////////////////////////////////////////////////////
35struct loader_base
36{
37 virtual archetype *get_arch (const char *name);
38 virtual void put_arch (archetype *arch);
39 30
40 virtual object *get_object (const char *name); 31extern archetype *loading_arch;
41 virtual void put_object (object *op);
42 32
43 virtual player *get_player (); 33//+GPL
44 virtual void put_player (player *pl);
45
46 virtual region *get_region ();
47 virtual void put_region (region *region);
48
49 virtual facetile *get_face (const char *name);
50 virtual void put_face (facetile *face);
51
52 virtual treasurelist *get_treasure (const char *name, bool one = false);
53 virtual void put_treasure (treasurelist *treasure);
54
55 virtual animation *get_animation (const char *name);
56 virtual void put_animation (animation *anim);
57};
58
59// future generic resource loader
60// handles generic stuff valid in most files, such as
61// animations, treasures, faces and so on
62struct loader_generic : loader_base
63{
64 virtual region *get_region ();
65 virtual void put_region (region *region);
66
67 virtual facetile *get_face (const char *name);
68 virtual void put_face (facetile *face);
69
70 virtual treasurelist *get_treasure (const char *name, bool one = false);
71 virtual void put_treasure (treasurelist *treasure);
72
73 virtual animation *get_animation (const char *name);
74 virtual void put_animation (animation *anim);
75};
76
77/* Maps the MOVE_* values to names */
78static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
79 34
80/* This table is only necessary to convert objects that existed before the 35/* This table is only necessary to convert objects that existed before the
81 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
82 * to go through every mapping looking for every potion, rod, wand, etc 37 * to go through every mapping looking for every potion, rod, wand, etc
83 * that had a sp set and update to the new value. So this maps the 38 * that had a sp set and update to the new value. So this maps the
… …
213 "spell_magic_drain", /* 122 */ 168 "spell_magic_drain", /* 122 */
214 "spell_counterspell", /* 123 */ 169 "spell_counterspell", /* 123 */
215 "spell_disarm", /* 124 */ 170 "spell_disarm", /* 124 */
216 "spell_cure_confusion", /* 125 */ 171 "spell_cure_confusion", /* 125 */
217 "spell_restoration", /* 126 */ 172 "spell_restoration", /* 126 */
218 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 173 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
219 "spell_counterwall", /* 128 */ 174 "spell_counterwall", /* 128 */
220 "spell_cause_light_wounds", /* 129 */ 175 "spell_cause_light_wounds", /* 129 */
221 "spell_cause_medium_wounds", /* 130 */ 176 "spell_cause_medium_wounds", /* 130 */
222 "spell_cause_heavy_wounds", /* 131 */ 177 "spell_cause_heavy_wounds", /* 131 */
223 "spell_charm_monsters", /* 132 */ 178 "spell_charm_monsters", /* 132 */
… …
295 "spell_cause_rabies", /* 204 */ 250 "spell_cause_rabies", /* 204 */
296 "spell_glyph", /* 205 */ 251 "spell_glyph", /* 205 */
297 NULL 252 NULL
298}; 253};
299 254
300extern int arch_init;
301
302/* This function checks the object after it has been loaded (when we 255/* This function checks the object after it has been loaded (when we
303 * get the 'end' in the input stream). This function can be used to 256 * get the 'end' in the input stream). This function can be used to
304 * deal with legacy objects where fields may have changed. It can also be used 257 * deal with legacy objects where fields may have changed. It can also be used
305 * to check for objects to make sure there are no common errors. 258 * to check for objects to make sure there are no common errors.
306 */ 259 */
307static void 260void
308check_loaded_object (object *op) 261object::post_load_check ()
309{ 262{
310 int ip; 263 if (type >= NUM_TYPES)
264 {
265 LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ());
266 type = 0;
267 }
268
269 switch (type)
270 {
271 case BOW:
272 case WAND:
273 case ROD:
274 case HORN:
275 if (slot [body_range].info != -1)
276 {
277 LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
278 slot [body_range].info = -1;
279 }
280 break;
281
282 case WEAPON:
283 if (slot [body_combat].info != -1)
284 {
285 LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
286 slot [body_combat].info = -1;
287 }
288 break;
289
290 case SHIELD:
291 if (slot [body_shield].info != -1)
292 {
293 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
294 slot [body_shield].info = -1;
295 }
296 break;
297
298 case PLAYER:
299 if (slot [body_shield].info != 1)
300 {
301 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
302 slot [body_shield].info = 1;
303 }
304
305 if (slot [body_combat].info != 1)
306 {
307 LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
308 slot [body_combat].info = 1;
309 }
310
311 if (slot [body_range].info != 1)
312 {
313 LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
314 slot [body_range].info = 1;
315 }
316 break;
317 }
311 318
312 /* We do some specialised handling to handle legacy cases of name_pl. 319 /* We do some specialised handling to handle legacy cases of name_pl.
313 * If the object doesn't have a name_pl, we just use the object name - 320 * If the object doesn't have a name_pl, we just use the object name -
314 * this isn't perfect (things won't be properly pluralised), but works to 321 * this isn't perfect (things won't be properly pluralised), but works to
315 * that degree (5 heart is still quite understandable). But the case we 322 * that degree (5 heart is still quite understandable). But the case we
316 * also have to catch is if this object is not using the normal name for 323 * also have to catch is if this object is not using the normal name for
317 * the object. In that case, we also want to use the loaded name. 324 * the object. In that case, we also want to use the loaded name.
318 * Otherwise, what happens is that the the plural name will lose 325 * Otherwise, what happens is that the the plural name will lose
319 * information (appear as just 'hearts' and not 'goblins heart') 326 * information (appear as just 'hearts' and not 'goblins heart')
320 */ 327 */
321 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) 328 if (arch && name != arch->object::name && name_pl == arch->object::name_pl)
322 op->name_pl = NULL; 329 name_pl = 0;
323 330
324 if (!op->name_pl) 331 if (!name_pl)
325 op->name_pl = op->name; 332 name_pl = name;
326 333
327 /* objects now have a materialname. try to patch it in */ 334 /* objects now have a materialname. try to patch it in */
328 if (!(op->is_weapon () && op->level > 0)) 335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
329 { 336 select_material (this, map ? map->difficulty : 5);
330 if (op->map != NULL) 337
331 set_materialname (op, op->map->difficulty, NULL);
332 else
333 set_materialname (op, 5, NULL);
334 }
335 /* only do these when program is first run - a bit 338 /* only do these when program is first run - a bit
336 * excessive to do this at every run - most of this is 339 * excessive to do this at every run - most of this is
337 * really just to catch any errors - program will still run, but 340 * really just to catch any errors - program will still run, but
338 * not in the ideal fashion. 341 * not in the ideal fashion.
339 */ 342 */
340 if ((op->type == WEAPON || op->type == BOW) && arch_init) 343 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
341 { 344 {
342 if (!op->skill) 345 if (!skill)
343 {
344 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 346 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
345 } 347 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
346 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || 348 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
347 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
348 {
349 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); 349 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
350 }
351 } 350 }
352 351
353 /* We changed last_heal to gen_sp_armour, which is what it 352 /* We changed last_heal to gen_sp_armour, which is what it
354 * really does for many objects. Need to catch any in maps 353 * really does for many objects. Need to catch any in maps
355 * that may have an old value. 354 * that may have an old value.
356 */ 355 */
357 if ((op->type == WEAPON) || 356 if (type == WEAPON
358 (op->type == ARMOUR) || (op->type == HELMET) || 357 || type == ARMOUR || type == HELMET
359 (op->type == SHIELD) || (op->type == RING) || 358 || type == SHIELD || type == RING
360 (op->type == BOOTS) || (op->type == GLOVES) || 359 || type == BOOTS || type == GLOVES
361 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) 360 || type == AMULET || type == GIRDLE
361 || type == BRACERS || type == CLOAK)
362 { 362 {
363 if (op->last_heal) 363 if (last_heal)
364 { 364 {
365 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 365 LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
366 op->gen_sp_armour = op->last_heal; 366 gen_sp_armour = last_heal;
367 op->last_heal = 0; 367 last_heal = 0;
368 } 368 }
369 369
370 ip = calc_item_power (op, 0); 370 int ip = calc_item_power (this, 0);
371
371 /* Legacy objects from before item power was in the game */ 372 /* Legacy objects from before item power was in the game */
372 if (!op->item_power && ip) 373 if (!item_power && ip)
373 { 374 {
374 if (ip > 3) 375 if (ip > 3)
375 {
376 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); 376 LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip);
377 } 377
378 op->item_power = ip; 378 item_power = ip;
379 } 379 }
380
380 /* Check for possibly bogus values. Has to meet both these criteria - 381 /* Check for possibly bogus values. Has to meet both these criteria -
381 * something that has item_power 1 is probably just fine if our calculated 382 * something that has item_power 1 is probably just fine if our calculated
382 * value is 1 or 2 - these values are small enough that hard to be precise. 383 * value is 1 or 2 - these values are small enough that hard to be precise.
383 * similarly, it item_power is 0, the first check will always pass, 384 * similarly, it item_power is 0, the first check will always pass,
384 * but not the second one. 385 * but not the second one.
385 */ 386 */
387#if 0 //TODO
386 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 388 if (ip > 2 * item_power && ip > (item_power + 3))
387 {
388 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); 389 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
389 } 390#endif
390
391 } 391 }
392
392 /* Old spellcasting object - need to load in the appropiate object */ 393 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
393 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || 394 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
395 if ((type == ROD
396 || type == WAND
397 || type == SCROLL
398 || type == HORN
399 || type == FIREWALL
394 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 400 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
395 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) 401 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
402 && !inv
403 && !loading_arch
404 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
405 // TODO: at least one watchout-comments is redundant - investigate/remove
396 { 406 {
397 object *tmp; 407 // TODO: fix firewall object on map
398
399 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 408 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
400 * in that spell was stored in sp. 409 * in that spell was stored in sp.
401 */ 410 */
411 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
402 tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); 412 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
403 insert_ob_in_ob (tmp, op); 413 insert_ob_in_ob (tmp, this);
404 op->randomitems = NULL; /* So another spell isn't created for this object */ 414 randomitems = 0;
405 } 415 }
416
406 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 417 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
407
408 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) 418 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
409 { 419 {
410 object *tmp; 420 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
411
412 tmp = get_archetype_by_object_name (op->slaying); 421 object *tmp = get_archetype_by_object_name (slaying);
413 insert_ob_in_ob (tmp, op); 422 insert_ob_in_ob (tmp, this);
414 op->randomitems = NULL; /* So another spell isn't created for this object */ 423 randomitems = 0; /* So another spell isn't created for this object */
415 /* without this, value is all screwed up */ 424 /* without this, value is all screwed up */
416 op->value = op->arch->clone.value * op->inv->value; 425 value = arch->value * inv->value;
417 } 426 }
418 427
419 if (QUERY_FLAG (op, FLAG_MONSTER)) 428 if (QUERY_FLAG (this, FLAG_MONSTER))
420 { 429 {
421 if (op->stats.hp > op->stats.maxhp) 430 if (stats.hp > stats.maxhp)
422 { 431 {
423 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 432 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
424 op->stats.maxhp = op->stats.hp; 433 stats.maxhp = stats.hp;
425 } 434 }
426 435
427 /* The archs just need to be updated for this */ 436 /* The archs just need to be updated for this */
428 if (op->move_type == 0) 437 if (move_type == 0)
429 op->move_type = MOVE_WALK; 438 move_type = MOVE_WALK;
430 } 439 }
431 440
432 if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER) 441 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
433 {
434 /* Object will duplicate it's content as part of the 442 /* Object will duplicate it's content as part of the
435 * generation process. To do this, we must flag inventory 443 * generation process. To do this, we must flag inventory
436 * so it remains unevaluated concerning the randomitems and 444 * so it remains unevaluated concerning the randomitems and
437 * the living (a demonlord shouldn't cast from inside generator!) 445 * the living (a demonlord shouldn't cast from inside generator!)
438 */ 446 */
447 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
439 flag_inv (op, FLAG_IS_A_TEMPLATE); 448 flag_inv (this, FLAG_IS_A_TEMPLATE);
440 }
441 449
442 /* Handle player movers. We use move_type for player movers 450 /* Handle player movers. We use move_type for player movers
443 * because they operate on their own time (move_on 451 * because they operate on their own time (move_on
444 * would potentially cause them to be triggered when someone steps 452 * would potentially cause them to be triggered when someone steps
445 * on them). If move_type is set, presume person knows what they 453 * on them). If move_type is set, presume person knows what they
446 * are doing, otherwise, set move_type based on maxhp value. 454 * are doing, otherwise, set move_type based on maxhp value.
447 */ 455 */
448 if (op->type == PLAYERMOVER) 456 if (type == PLAYERMOVER)
449 { 457 {
450 if (!op->move_type) 458 if (!move_type)
451 { 459 {
452 if (op->stats.maxhp) 460 if (stats.maxhp)
453 { 461 {
454 op->move_type = MOVE_ALL; 462 move_type = MOVE_ALL;
455 op->stats.maxhp = 0; 463 stats.maxhp = 0;
456 } 464 }
457 else 465 else
466 move_type = MOVE_WALK;
467 }
468 }
469
470 // if the object has an animation, try to provide a default face
471 if (has_anim ())
472 {
473 const animation &anim_ob = anim ();
474
475 if (anim_speed)
476 // if this item is time-animated, force the last frame
477 animate_object (this, 0);
478 else if (flag [FLAG_MONSTER])
479 // if it is a monster, set appropriate facing
480 animate_object (this, direction);
481 }
482}
483
484static void
485set_move (MoveType &mt, object_thawer &f)
486{
487 static const struct flagstr {
488 const char *name;
489 MoveType flags;
490 } move_flags[] = {
491 { "walk" , MOVE_WALK },
492 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
493 { "fly_low" , MOVE_FLY_LOW },
494 { "fly_high", MOVE_FLY_HIGH },
495 { "swim" , MOVE_SWIM },
496 { "boat" , MOVE_BOAT },
497 { "ship" , MOVE_SHIP },
498 { "all" , MOVE_ALL },
499 };
500
501 const char *str = f.get_str ();
502
503 if (!*str || isdigit (*str))
504 {
505 mt = atoi (str);
506 return;
507 }
508
509 mt = 0;
510
511 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
512 {
513 bool negate = 0;
514
515 if (*str == '-')
516 {
517 negate = 1;
518 str++;
519 }
520
521 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f)
522 {
523 if (!strcmp (f->name, str))
458 { 524 {
459 op->move_type = MOVE_WALK; 525 if (negate)
526 mt &= ~f->flags;
527 else
528 mt |= f->flags;
529
530 goto next;
460 } 531 }
461 } 532 }
462 }
463 533
534 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
535
536next: ;
537 }
464} 538}
465 539
466static void 540//-GPL
467set_move (MoveType & mt, const char *str) 541
542#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
543
544bool
545object::parse_kv (object_thawer &f)
468{ 546{
469 if (!str) 547 object *op_inv = inv;
470 { 548 key_value *last_kv = key_values;
471 mt = 0; 549
472 return; 550 for (;;)
473 } 551 {
474 552 switch (f.kw)
475 if (isdigit (*str))
476 {
477 mt = atoi (str);
478 return;
479 }
480
481 mt = 0;
482
483 for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
484 {
485 if (!strcasecmp (str, "all"))
486 mt |= MOVE_ALL;
487 else
488 { 553 {
489 int i, negate = 0;
490
491 if (*str == '-')
492 {
493 negate = 1;
494 str++;
495 }
496
497 for (i = 0; move_name[i]; i++)
498 {
499 if (!strcasecmp (move_name[i], str))
500 {
501 if (negate)
502 mt &= ~(1 << i);
503 else
504 mt |= (1 << i);
505
506 break;
507 }
508 }
509
510 if (!move_name[i])
511 {
512 /* fly is a special case - covers both fly_low and
513 * fly_high - since it doesn't match to a specific
514 * single bit, have to special case it.
515 */
516 if (!strcasecmp (str, "flying"))
517 {
518 if (negate)
519 mt &= ~MOVE_FLYING;
520 else
521 mt |= MOVE_FLYING;
522 }
523 else
524 LOG (llevDebug, "common/loader.l: set_move - unknown move string '%s'\n", str);
525 }
526 }
527 }
528}
529
530#define GET_FLAG(op,flag) \
531 if (thawer.get_sint32 ()) \
532 SET_FLAG (op, flag); \
533 else \
534 CLEAR_FLAG (op, flag) \
535
536int
537parse_object (object *op, object_thawer &thawer, int map_flags)
538{
539 bool ismore = 0;
540 object *op_inv = op->inv;
541
542 for (;;)
543 {
544 keyword kw = thawer.get_kv ();
545
546 switch (kw)
547 {
548 case KW_Object: // uppercase alias
549 case KW_object:
550 thawer.get (op->name);
551
552 if (op->arch)
553 op->arch->name = op->name;
554
555 break;
556
557 case KW_uuid: 554 case KW_uuid:
558 if (const char *s = thawer.get_str ()) 555 if (!uuid.parse (f.get_str ()))
559 { 556 {
560 unsigned int version; 557 f.parse_warn ("unparseable uuid");
561 unsigned long long seq; 558 uuid = UUID::gen ();
559 }
560 break;
562 561
563 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) 562 case KW_oid:
563 f.get (this, f.get_sint32 ());
564 break;
565
566 case KW_name: f.get (name); break;
567 case KW_name_pl: f.get (name_pl); break;
568 case KW_title: f.get (title); break;
569 case KW_custom_name: f.get (custom_name); break;
570
571 case KW_attach: f.get_ornull (attach); break;
572 case KW_skill: f.get_ornull (skill); break;
573 case KW_race: f.get_ornull (race); break;
574 case KW_slaying: f.get_ornull (slaying); break;
575 case KW_tag: f.get_ornull (tag); break;
576
577 case KW_arch:
578 if (object *tmp = object::read (f))
579 {
580 tmp->deactivate ();
581
582 // was: insert_ob_in_ob (tmp, op);
583 // but manually adding it can improve map loading times a lot
584 // also, appending instead of prepending keeps the
585 // save ordering the same between repeated load/saves.
586 // and finally we do not want any funny effects
587 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
588 CLEAR_FLAG (tmp, FLAG_REMOVED);
589
590 if (!op_inv)
564 { 591 {
592 inv = tmp;
565 op->uuid.seq = seq; 593 tmp->above = 0;
566 break;
567 } 594 }
595 else
596 {
597 while (op_inv->below)
598 op_inv = op_inv->below;
599
600 op_inv->below = tmp;
601 tmp->above = op_inv;
602 }
603
604 tmp->below = 0;
605 tmp->env = this;
606 op_inv = tmp;
568 } 607 }
569
570 op->uuid = gen_uuid ();
571 break;
572
573 case KW_oid:
574 thawer.get (op, thawer.get_sint32 ());
575 break;
576
577 case KW_name: thawer.get (op->name); break;
578 case KW_name_pl: thawer.get (op->name_pl); break;
579 case KW_title: thawer.get (op->title); break;
580 case KW_custom_name: thawer.get (op->custom_name); break;
581
582 case KW_attach: thawer.get_ornull (op->attach); break;
583 case KW_skill: thawer.get_ornull (op->skill); break;
584 case KW_race: thawer.get_ornull (op->race); break;
585 case KW_slaying: thawer.get_ornull (op->slaying); break;
586
587 case KW_arch:
588 {
589 const char *str = thawer.get_str ();
590
591 if (op->arch)
592 {
593 /* If op->arch has been set, then this new object
594 * must be part of the inventory. So process
595 * appropriately.
596 */
597 archetype *arch = archetype::find (str);
598
599 object *tmp;
600
601 if (arch)
602 tmp = arch_to_object (arch);
603 else
604 {
605 tmp = object::create ();
606 /* record the name of the broken object */
607 tmp->name = str;
608 }
609
610 // decativate the object we, as we are still going
611 // to read the speed value. Objects should be activated
612 // when the map, object or player is completly loaded.
613 tmp->deactivate ();
614
615 parse_object (tmp, thawer, map_flags);
616
617 if (tmp->arch)
618 {
619 // was: insert_ob_in_ob (tmp, op);
620 // but manually adding it can improve map loading times a lot
621 // also, appending instead of prepending keeps the
622 // save ordering the same between repeated load/saves.
623 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
624 CLEAR_FLAG (tmp, FLAG_REMOVED);
625
626 if (!op_inv)
627 {
628 op->inv = tmp;
629 tmp->above = 0;
630 }
631 else
632 {
633 while (op_inv->below)
634 op_inv = op_inv->below;
635
636 op_inv->below = tmp;
637 tmp->above = op_inv;
638 }
639
640 tmp->below = 0;
641 tmp->env = op;
642 op_inv = tmp;
643 }
644 else
645 {
646 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
647 tmp->destroy ();
648 }
649 }
650 else 608 else
651 { 609 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
652 /* This is the actual archetype definition then */
653 op->arch = archetype::find (str);
654 610
655 if (op->arch) 611 continue;
656 {
657 op->arch->clone.copy_to (op);
658 // copy_to activates, this should be fixed properly
659 op->deactivate ();
660 }
661 else if (!arch_init)
662 /* record the name of the broken object */
663 op->name = str;
664 }
665 }
666 break;
667 612
668 case KW_other_arch: 613 case KW_other_arch:
614 if (loading_arch == this)
615 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
616 else
617 {
669 op->other_arch = archetype::find (thawer.get_str ()); 618 other_arch = archetype::find (f.get_str ());
619
620 if (!other_arch)
621 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
622 }
623 break;
624
625 case KW_owner:
626 f.delayed_deref (this, owner, f.get_str ());
670 break; 627 break;
671 628
672 case KW_animation: 629 case KW_animation:
673 { 630 {
674 const char *str = thawer.get_str ();
675
676 if (!str)
677 {
678 op->animation_id = 0;
679 CLEAR_FLAG (op, FLAG_ANIMATE); 631 CLEAR_FLAG (this, FLAG_ANIMATE);
680 } 632 animation_id = 0;
633
681 else if ((op->animation_id = find_animation (str))) 634 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
682 SET_FLAG (op, FLAG_ANIMATE); 635 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
683 } 636 }
684
685 break; 637 break;
686 638
687 case KW_last_heal: thawer.get (op->last_heal); break; 639 case KW_last_heal: f.get (last_heal); break;
688 case KW_last_sp: thawer.get (op->last_sp); break; 640 case KW_last_sp: f.get (last_sp); break;
689 case KW_last_grace: thawer.get (op->last_grace); break; 641 case KW_last_grace: f.get (last_grace); break;
690 case KW_last_eat: thawer.get (op->last_eat); break; 642 case KW_last_eat: f.get (last_eat); break;
691 case KW_speed_left: thawer.get (op->speed_left); break; 643 case KW_speed_left: f.get (speed_left); break;
692 644
693 case KW_speed: 645 case KW_speed:
694 thawer.get (op->speed); 646 f.get (speed);
695 647
696 //TODO: maybe do in check_object 648 //TODO: maybe do in check_object
697 // removed check for style maps 649 // removed check for style maps
698 if (op->speed < 0) 650 if (speed < 0)
699 op->speed_left = op->speed_left - rndm (); 651 speed_left = speed_left - rndm ();
700 652
701 break; 653 break;
702 654
703 case KW_slow_move: 655 case KW_slow_move:
704 op->move_slow |= MOVE_WALK; 656 move_slow |= MOVE_WALK;
705 thawer.get (op->move_slow_penalty); 657 f.get (move_slow_penalty);
706 break; 658 break;
707 659
708 case KW_face: 660 case KW_face:
709 op->face = &new_faces[FindFace (thawer.get_str (), 0)]; 661 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
662 break;
663
664 case KW_sound:
665 if (f.has_value ())
666 {
667 sound = sound_find (f.get_str ());
668 if (!sound)
669 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
670 }
710 break; 671 else
672 sound = 0;
673 break;
711 674
675 case KW_sound_destroy:
676 if (f.has_value ())
677 {
678 sound_destroy = sound_find (f.get_str ());
679 if (!sound_destroy)
680 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
681 }
682 else
683 sound_destroy = 0;
684 break;
685
712 case KW_x: thawer.get (op->x); break; 686 case KW_x: f.get (x); break;
713 case KW_y: thawer.get (op->y); break; 687 case KW_y: f.get (y); break;
714 688
715 case KW_Str: // uppercase alias 689 case KW_Str: // uppercase alias
716 case KW_str: thawer.get (op->stats.Str); break; 690 case KW_str: f.get (stats.Str); break;
717 case KW_Dex: // uppercase alias 691 case KW_Dex: // uppercase alias
718 case KW_dex: thawer.get (op->stats.Dex); break; 692 case KW_dex: f.get (stats.Dex); break;
719 case KW_Con: // uppercase alias 693 case KW_Con: // uppercase alias
720 case KW_con: thawer.get (op->stats.Con); break; 694 case KW_con: f.get (stats.Con); break;
721 case KW_Wis: // uppercase alias 695 case KW_Wis: // uppercase alias
722 case KW_wis: thawer.get (op->stats.Wis); break; 696 case KW_wis: f.get (stats.Wis); break;
723 case KW_Cha: // uppercase alias 697 case KW_Cha: // uppercase alias
724 case KW_cha: thawer.get (op->stats.Cha); break; 698 case KW_cha: f.get (stats.Cha); break;
725 case KW_Int: // uppercase alias 699 case KW_Int: // uppercase alias
726 case KW_int: thawer.get (op->stats.Int); break; 700 case KW_int: f.get (stats.Int); break;
727 case KW_Pow: // uppercase alias 701 case KW_Pow: // uppercase alias
728 case KW_pow: thawer.get (op->stats.Pow); break; 702 case KW_pow: f.get (stats.Pow); break;
729 703
730 case KW_hp: thawer.get (op->stats.hp); break; 704 case KW_hp: f.get (stats.hp); break;
731 case KW_maxhp: thawer.get (op->stats.maxhp); break; 705 case KW_maxhp: f.get (stats.maxhp); break;
732 case KW_sp: thawer.get (op->stats.sp); break; 706 case KW_sp: f.get (stats.sp); break;
733 case KW_maxsp: thawer.get (op->stats.maxsp); break; 707 case KW_maxsp: f.get (stats.maxsp); break;
734 case KW_grace: thawer.get (op->stats.grace); break; 708 case KW_grace: f.get (stats.grace); break;
735 case KW_maxgrace: thawer.get (op->stats.maxgrace); break; 709 case KW_maxgrace: f.get (stats.maxgrace); break;
736 710
737 case KW_exp: thawer.get (op->stats.exp); break; 711 case KW_exp: f.get (stats.exp); break;
738 case KW_perm_exp: thawer.get (op->perm_exp); break; 712 case KW_perm_exp: f.get (perm_exp); break;
739 case KW_food: thawer.get (op->stats.food); break; 713 case KW_food: f.get (stats.food); break;
740 case KW_dam: thawer.get (op->stats.dam); break; 714 case KW_dam: f.get (stats.dam); break;
741 case KW_wc: thawer.get (op->stats.wc); break; 715 case KW_wc: f.get (stats.wc); break;
742 case KW_ac: thawer.get (op->stats.ac); break; 716 case KW_ac: f.get (stats.ac); break;
743 case KW_nrof: thawer.get (op->nrof); break; 717 case KW_nrof: f.get (nrof); break;
744 case KW_level: thawer.get (op->level); break; 718 case KW_level: f.get (level); break;
745 case KW_direction: thawer.get (op->direction); break; 719 case KW_direction: f.get (direction); break;
746 case KW_type: thawer.get (op->type); break; 720 case KW_type: f.get (type); break;
747 case KW_subtype: thawer.get (op->subtype); break; 721 case KW_subtype: f.get (subtype); break;
748 case KW_value: thawer.get (op->value); break; 722 case KW_value: f.get (value); break;
749 case KW_weight: thawer.get (op->weight); break; 723 case KW_weight: f.get (weight); break;
750 case KW_carrying: thawer.get (op->carrying); break; 724 case KW_carrying: f.get (carrying); break;
751 case KW_attacktype: thawer.get (op->attacktype); break; 725 case KW_attacktype: f.get (attacktype); break;
752 case KW_path_attuned: thawer.get (op->path_attuned); break; 726 case KW_path_attuned: f.get (path_attuned); break;
753 case KW_path_repelled: thawer.get (op->path_repelled); break; 727 case KW_path_repelled: f.get (path_repelled); break;
754 case KW_path_denied: thawer.get (op->path_denied); break; 728 case KW_path_denied: f.get (path_denied); break;
755 case KW_invisible: thawer.get (op->invisible); break; 729 case KW_invisible: f.get (invisible); break;
756 case KW_magic: thawer.get (op->magic); break; 730 case KW_magic: f.get (magic); break;
757 case KW_state: thawer.get (op->state); break; 731 case KW_state: f.get (state); break;
758 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; 732 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
759 case KW_material: thawer.get (op->material); break; 733 case KW_material: f.get (materials); break; //TODO: nuke
760 case KW_materialname: thawer.get (op->materialname); break; 734
735 case KW_materialname:
736 {
737 shstr sh;
738 f.get (sh);
739 material = name_to_material (sh);
740 }
741 break;
761 742
762 /* These are the new values */ 743 /* These are the new values */
763 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; 744 case KW_move_block: set_move (move_block, f); break;
764 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; 745 case KW_move_allow: set_move (move_allow, f); break;
765 case KW_move_type: set_move (op->move_type, thawer.get_str ()); break; 746 case KW_move_type: set_move (move_type , f); break;
766 case KW_move_on: set_move (op->move_on, thawer.get_str ()); break; 747 case KW_move_on: set_move (move_on , f); break;
767 case KW_move_off: set_move (op->move_off, thawer.get_str ()); break; 748 case KW_move_off: set_move (move_off , f); break;
768 case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break; 749 case KW_move_slow: set_move (move_slow , f); break;
769 750
770 /* These are all legacy - any new objects should use the move_ .. values */ 751 /* These are all legacy - any new objects should use the move_ .. values */
771 case KW_no_pass: 752 case KW_no_pass:
772 { 753 {
773 if (thawer.get_sint32 ()) 754 if (f.get_sint32 ())
774 op->move_block = MOVE_ALL; 755 move_block = MOVE_ALL;
775 else 756 else
776 op->move_block = 0; 757 move_block = 0;
777 } 758 }
778 759
779 break; 760 break;
780 761
781 /* These are all legacy - any new objects should use the move_ .. values */ 762 /* These are all legacy - any new objects should use the move_ .. values */
782 case KW_walk_on: 763 case KW_walk_on:
783 { 764 {
784 if (thawer.get_sint32 ()) 765 if (f.get_sint32 ())
785 op->move_on |= MOVE_WALK; 766 move_on |= MOVE_WALK;
786 else 767 else
787 op->move_on &= ~MOVE_WALK; 768 move_on &= ~MOVE_WALK;
788 } 769 }
789 770
790 break; 771 break;
791 772
792 /* These are all legacy - any new objects should use the move_ .. values */ 773 /* These are all legacy - any new objects should use the move_ .. values */
793 case KW_walk_off: 774 case KW_walk_off:
794 { 775 {
795 if (thawer.get_sint32 ()) 776 if (f.get_sint32 ())
796 op->move_off |= MOVE_WALK; 777 move_off |= MOVE_WALK;
797 else 778 else
798 op->move_off &= ~MOVE_WALK; 779 move_off &= ~MOVE_WALK;
799 } 780 }
800 break; 781 break;
801 782
802 /* These are all legacy - any new objects should use the move_ .. values */ 783 /* These are all legacy - any new objects should use the move_ .. values */
803 case KW_fly_on: 784 case KW_fly_on:
804 { 785 {
805 if (thawer.get_sint32 ()) 786 if (f.get_sint32 ())
806 op->move_on |= MOVE_FLY_LOW; 787 move_on |= MOVE_FLY_LOW;
807 else 788 else
808 op->move_on &= ~MOVE_FLY_LOW; 789 move_on &= ~MOVE_FLY_LOW;
809 } 790 }
810 break; 791 break;
811 792
812 /* These are all legacy - any new objects should use the move_ .. values */ 793 /* These are all legacy - any new objects should use the move_ .. values */
813 case KW_fly_off: 794 case KW_fly_off:
814 { 795 {
815 if (thawer.get_sint32 ()) 796 if (f.get_sint32 ())
816 op->move_off |= MOVE_FLY_LOW; 797 move_off |= MOVE_FLY_LOW;
817 else 798 else
818 op->move_off &= ~MOVE_FLY_LOW; 799 move_off &= ~MOVE_FLY_LOW;
819 } 800 }
820 break; 801 break;
821 802
822 //TODO: remove these after converting archetypes 803 //TODO: remove these after converting archetypes
823 case KW_can_use_wand: 804 case KW_can_use_wand:
824 GET_FLAG (op, FLAG_USE_RANGE); 805 GET_FLAG (this, FLAG_USE_RANGE);
825 break; 806 break;
826 807
827 /* These are all legacy - any new objects should use the move_ .. values */ 808 /* These are all legacy - any new objects should use the move_ .. values */
828 case KW_flying: 809 case KW_flying:
829 { 810 {
830 if (thawer.get_sint32 ()) 811 if (f.get_sint32 ())
831 op->move_type |= MOVE_FLY_LOW; 812 move_type |= MOVE_FLY_LOW;
832 else 813 else
833 op->move_type &= ~MOVE_FLY_LOW; 814 move_type &= ~MOVE_FLY_LOW;
834 } 815 }
835 break; 816 break;
836 817
837 818
838 case KW_identified: 819 case KW_identified:
839 GET_FLAG (op, FLAG_IDENTIFIED); 820 GET_FLAG (this, FLAG_IDENTIFIED);
840 //TODO: move to check_object or so 821 //TODO: move to check_object or so
841 if (QUERY_FLAG (op, FLAG_IDENTIFIED)) 822 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
842 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 823 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
843 824
844 break; 825 break;
845 826
846 case KW_wiz: 827 case KW_friendly:
847 GET_FLAG (op, FLAG_WIZ); 828 if (f.get_bool ())
848 //TODO: move to check_object 829 if (type != PLAYER)
849 if (QUERY_FLAG (op, FLAG_WIZ)) 830 add_friendly_object (this);
831
832 break;
833
834 case KW_monster: GET_FLAG (this, FLAG_MONSTER); break;
835 case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break;
836 case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break;
837 case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break;
838 case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break;
839 case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break;
840 case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break;
841 case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break;
842 case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break;
843 case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break;
844 case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break;
845 case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break;
846 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
847 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
848 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
849 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
850 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
851 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
852 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
853 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
854 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
855 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
856 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
857 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
858 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
859 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
860 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
861 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
862 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
863 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
864 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
865 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
866 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
867 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
868 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
869 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
870 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
871 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
872 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
873 case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break;
874 case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break;
875 case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break;
876 case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break;
877 case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break;
878 case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break;
879 case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break;
880 case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break;
881 case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break;
882 case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break;
883 case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break;
884 case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break;
885 case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break;
886 case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
887 case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break;
888 case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break;
889 case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break;
890 case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break;
891 case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break;
892 case KW_cursed: GET_FLAG (this, FLAG_CURSED); break;
893 case KW_damned: GET_FLAG (this, FLAG_DAMNED); break;
894 case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break;
895 case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break;
896 case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break;
897 case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break;
898 case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break;
899 case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break;
900 case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break;
901 case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break;
902 case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break;
903 case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break;
904 case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break;
905 case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break;
906 case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break;
907 case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break;
908 case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break;
909 case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break;
910 case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break;
911 case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break;
912 case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break;
913 case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break;
914 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
915 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
916 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
917 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
918 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
919 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
920 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
921
922 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
923 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
924 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
925 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
926 case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break;
927 case KW_resist_cold: f.get (resist[ATNR_COLD]); break;
928 case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break;
929 case KW_resist_acid: f.get (resist[ATNR_ACID]); break;
930 case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break;
931 case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break;
932 case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break;
933 case KW_resist_poison: f.get (resist[ATNR_POISON]); break;
934 case KW_resist_slow: f.get (resist[ATNR_SLOW]); break;
935 case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break;
936 case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break;
937 case KW_resist_fear: f.get (resist[ATNR_FEAR]); break;
938 case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break;
939 case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break;
940 case KW_resist_death: f.get (resist[ATNR_DEATH]); break;
941 case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break;
942 case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break;
943 case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break;
944 case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break;
945 case KW_resist_blind: f.get (resist[ATNR_BLIND]); break;
946 case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break;
947 case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break;
948 case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break;
949
950 case KW_luck: f.get (stats.luck); break;
951 case KW_run_away: f.get (run_away); break;
952 case KW_pick_up: f.get (pick_up); break;
953 case KW_item_power: f.get (item_power); break;
954 case KW_gen_sp_armour: f.get (gen_sp_armour); break;
955 case KW_anim_speed: f.get (anim_speed); break;
956 case KW_container: f.get (weight_limit); break;
957 case KW_will_apply: f.get (will_apply); break;
958 case KW_attack_movement: f.get (attack_movement); break;
959 case KW_move_state: f.get (move_status); break;
960 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
961 case KW_glow_radius: f.get (glow_radius); break;
962 case KW_weapontype: f.get (weapontype); break;
963 case KW_casting_time: f.get (casting_time); break;
964
965 // elevation is deprecated
966 case KW_elevation: break;
967
968 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
969 case KW_client_type: f.get (client_type); break;
970 case KW_duration: f.get (duration); break;
971 case KW_range: f.get (range); break;
972 case KW_range_modifier: f.get (range_modifier); break;
973 case KW_dam_modifier: f.get (dam_modifier); break;
974 case KW_duration_modifier: f.get (duration_modifier); break;
975
976 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
977 //TODO: parse from other include files
978 case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
979 case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
980 case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
981 case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
982 case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
983 case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
984 case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
985 case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
986 case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
987 case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
988 case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break;
989 case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break;
990 case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break;
991 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
992 case KW_can_apply:
993 break;
994
995 case KW_connected:
996 {
997 shstr connected;
998
999 f.get (connected);
1000 add_link (map, connected);
1001 }
1002 break;
1003
1004 case KW_randomitems:
1005 if (f.has_value ())
850 { 1006 {
851 SET_FLAG (op, FLAG_WAS_WIZ); 1007 randomitems =
852 SET_FLAG (op, FLAG_WIZPASS); 1008 loading_arch
853 SET_FLAG (op, FLAG_WIZCAST); 1009 ? treasurelist::get (f.get_str ())
1010 : treasurelist::find (f.get_str ());
1011
1012 if (!randomitems)
1013 {
1014 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1015 randomitems = treasurelist::get (shstr_none); // avoid crashes
1016 }
854 } 1017 }
855 else 1018 else
856 { 1019 randomitems = 0;
857 CLEAR_FLAG (op, FLAG_WIZPASS);
858 CLEAR_FLAG (op, FLAG_WIZCAST);
859 }
860 break;
861
862 case KW_friendly:
863 if (thawer.get_sint32 ())
864 if (op->type != PLAYER)
865 add_friendly_object (op);
866
867 break;
868
869 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
870 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
871 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
872 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
873 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
874 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
875 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
876 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
877 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
878 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
879 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
880 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
881 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
882 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
883 case KW_alive: GET_FLAG (op, FLAG_ALIVE); break;
884 case KW_applied: GET_FLAG (op, FLAG_APPLIED); break;
885 case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break;
886 case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break;
887 case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break;
888 case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break;
889 case KW_changing: GET_FLAG (op, FLAG_CHANGING); break;
890 case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break;
891 case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break;
892 case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break;
893 case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break;
894 case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break;
895 case KW_scared: GET_FLAG (op, FLAG_SCARED); break;
896 case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break;
897 case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break;
898 case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break;
899 case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break;
900 case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break;
901 case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break;
902 case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break;
903 case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break;
904 case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break;
905 case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break;
906 case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break;
907 case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break;
908 case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break;
909 case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break;
910 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break;
911 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break;
912 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break;
913 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break;
914 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break;
915 case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break;
916 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break;
917 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break;
918 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break;
919 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break;
920 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break;
921 case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break;
922 case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break;
923 case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break;
924 case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break;
925 case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break;
926 case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break;
927 case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break;
928 case KW_cursed: GET_FLAG (op, FLAG_CURSED); break;
929 case KW_damned: GET_FLAG (op, FLAG_DAMNED); break;
930 case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break;
931 case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break;
932 case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break;
933 case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break;
934 case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break;
935 case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break;
936 case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break;
937 case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break;
938 case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break;
939 case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break;
940 case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break;
941 case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break;
942 case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break;
943 case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break;
944 case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break;
945 case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break;
946 case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break;
947 case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break;
948 case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break;
949 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
950 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
951 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
952 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
953 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
954 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
955
956 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
957 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
958 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
959 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
960 case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break;
961 case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break;
962 case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break;
963 case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break;
964 case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break;
965 case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break;
966 case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break;
967 case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break;
968 case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break;
969 case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break;
970 case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break;
971 case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break;
972 case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break;
973 case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break;
974 case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break;
975 case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break;
976 case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break;
977 case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break;
978 case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break;
979 case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break;
980 case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break;
981 case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break;
982 case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break;
983
984 case KW_luck: thawer.get (op->stats.luck); break;
985 case KW_run_away: thawer.get (op->run_away); break;
986 case KW_pick_up: thawer.get (op->pick_up); break;
987 case KW_item_power: thawer.get (op->item_power); break;
988 case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break;
989 case KW_anim_speed: thawer.get (op->anim_speed); break;
990 case KW_container: thawer.get (op->weight_limit); break;
991 case KW_will_apply: thawer.get (op->will_apply); break;
992 case KW_attack_movement: thawer.get (op->attack_movement); break;
993 case KW_move_state: thawer.get (op->move_status); break;
994 case KW_expmul: thawer.get (op->expmul); break;
995 case KW_glow_radius: thawer.get (op->glow_radius); break;
996 case KW_weapontype: thawer.get (op->weapontype); break;
997 case KW_tooltype: thawer.get (op->tooltype); break;
998 case KW_casting_time: thawer.get (op->casting_time); break;
999 case KW_elevation: thawer.get (op->elevation); break;
1000 case KW_smoothlevel: thawer.get (op->smoothlevel); break;
1001 case KW_client_type: thawer.get (op->client_type); break;
1002 case KW_duration: thawer.get (op->duration); break;
1003 case KW_range: thawer.get (op->range); break;
1004 case KW_range_modifier: thawer.get (op->range_modifier); break;
1005 case KW_dam_modifier: thawer.get (op->dam_modifier); break;
1006 case KW_duration_modifier: thawer.get (op->duration_modifier); break;
1007
1008 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
1009 //TODO: parse from other include files
1010 case KW_body_range: thawer.get (op->body_info[0]); break;
1011 case KW_body_arm: thawer.get (op->body_info[1]); break;
1012 case KW_body_torso: thawer.get (op->body_info[2]); break;
1013 case KW_body_head: thawer.get (op->body_info[3]); break;
1014 case KW_body_neck: thawer.get (op->body_info[4]); break;
1015 case KW_body_skill: thawer.get (op->body_info[5]); break;
1016 case KW_body_finger: thawer.get (op->body_info[6]); break;
1017 case KW_body_shoulder: thawer.get (op->body_info[7]); break;
1018 case KW_body_foot: thawer.get (op->body_info[8]); break;
1019 case KW_body_hand: thawer.get (op->body_info[9]); break;
1020 case KW_body_wrist: thawer.get (op->body_info[10]); break;
1021 case KW_body_waist: thawer.get (op->body_info[11]); break;
1022 case KW_can_apply:
1023 break;
1024
1025 case KW_connected:
1026 add_button_link (op, op->map, thawer.get_sint32 ());
1027 break;
1028
1029 case KW_randomitems:
1030 op->randomitems = find_treasurelist (thawer.get_str ());
1031 break; 1020 break;
1032 1021
1033 case KW_msg: 1022 case KW_msg:
1034 thawer.get_ml (KW_endmsg, op->msg); 1023 f.get_ml (KW_endmsg, msg);
1035 //TODO: allow longer messages
1036 if (strlen (op->msg) >= HUGE_BUF)
1037 {
1038 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
1039 op->msg = "ERROR, please report: string too long, winged.\n";
1040 }
1041 break; 1024 break;
1042 1025
1043 case KW_lore: 1026 case KW_lore:
1044 thawer.get_ml (KW_endlore, op->lore); 1027 f.get_ml (KW_endlore, lore);
1045 //TODO: allow longer messages
1046 /* Just print a warning so we can be reasonably safe
1047 * about not overflowing the buffer.
1048 */
1049 if (strlen (op->lore) > (HUGE_BUF / 2))
1050 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1051 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1052 break; 1028 break;
1053 1029
1054 case KW_editable: 1030 case KW_editable:
1055 case KW_editor_folder: 1031 case KW_editor_folder:
1056 break; 1032 break;
1057 1033
1058 case KW_More: // uppercase alias
1059 case KW_more:
1060 /* We need to record that this is a multipart object,
1061 * so the calling function can glue things back together
1062 */
1063 ismore = 1;
1064 break;
1065
1066 case KW_end: 1034 case KW_end:
1067 check_loaded_object (op);
1068
1069 if (!arch_init) 1035 if (!loading_arch)
1070 op->instantiate (); 1036 instantiate ();
1071 1037
1072 return ismore ? LL_MORE : LL_NORMAL; 1038 f.next ();
1073
1074 case KW_EOF:
1075 return LL_EOF; 1039 return true;
1076 1040
1077 case KW_ERROR: 1041 case KW_ERROR:
1078 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 1042 // append as key value pair (do not use kv_set as it prepends)
1043 // we also do not even try to find old values, duplicate keys stay duplicate
1044 {
1045 key_value *kv = new key_value;
1046
1047 kv->next = 0;
1048 kv->key = shstr (f.kw_str);
1049 kv->value = shstr (f.value);
1050
1051 if (!last_kv)
1052 key_values = last_kv = kv;
1053 else
1054 {
1055 while (last_kv->next)
1056 last_kv = last_kv->next;
1057
1058 last_kv->next = kv;
1059 last_kv = kv;
1060 }
1061 }
1079 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D 1062 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1080 break; 1063 break;
1081 1064
1082 default: 1065 default:
1083 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1066 if (!f.parse_error ("object", name))
1067 return false;
1084 break; 1068 break;
1085 } 1069 }
1070
1071 f.next ();
1086 } 1072 }
1087} 1073}
1088 1074
1089/* 1075object *
1090 * Loads an object from the given file-pointer. 1076object::read (object_thawer &f, maptile *map)
1091 * Variables will be read and parsed and patched into the object
1092 * until the string "end" is reached, or the end of the file.
1093 *
1094 * bufstat is used to determine various file attributes:
1095 * LO_REPATE (0): We are reading from the same buffer as the last call.
1096 * LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions
1097 * will also be reading from this (treasure file, artifacts.)
1098 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1099 * be reset.
1100 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1101 *
1102 */
1103int
1104load_object (object_thawer &fp, object *op, int map_flags)
1105{ 1077{
1106 coroapi::cede_every (1000); // cede once in a while 1078 assert (f.kw == KW_arch);
1107 1079
1108 return parse_object (op, fp, map_flags); 1080 archetype *arch = archetype::find (f.get_str ());
1081
1082 if (!arch)
1083 {
1084 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1085 arch = archetype::find (shstr_earthwall);
1086 }
1087
1088 assert (arch); //D maybe use exception handling of sorts?
1089
1090 f.next ();
1091
1092 object *op = arch->instance ();
1093 op->map = map;
1094 // instance() activates, this should be fixed properly
1095 op->deactivate ();
1096
1097 if (!op->parse_kv (f))
1098 {
1099 op->destroy ();
1100 return 0;
1101 }
1102
1103 op->post_load_check ();
1104 return op;
1109} 1105}
1110 1106
1111/* This takes a buffer, scans it for variables, and sets those variables 1107/* This takes a buffer, scans it for variables, and sets those variables
1112 * as appropriate in op. 1108 * as appropriate in op.
1113 * 1109 *
… …
1115 * override values and in c_wiz to mutate values. 1111 * override values and in c_wiz to mutate values.
1116 */ 1112 */
1117int 1113int
1118set_variable (object *op, char *buf) 1114set_variable (object *op, char *buf)
1119{ 1115{
1120 object_thawer thawer (buf, (AV *)0); 1116 object_thawer f (buf, (AV *)0);
1121 1117
1122 return parse_object (op, thawer, 0); 1118 return op->parse_kv (f);
1123} 1119}
1124 1120
1125/*
1126 * Initialises the array of variable-names. Needed before any
1127 * objects can be loaded. Called by init_library().
1128 */
1129
1130void
1131init_vars ()
1132{
1133}
1134
1135/* This returns a string of the integer movement type */
1136#if 0
1137// unused function
1138static char *
1139get_string_move_type (MoveType mt)
1140{
1141 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1142 int i, all_count = 0, count;
1143
1144 strcpy (retbuf, "");
1145 strcpy (retbuf_all, " all");
1146
1147 /* Quick check, and probably fairly common */
1148 if (mt == MOVE_ALL)
1149 return retbuf_all + 1;
1150 if (mt == 0)
1151 {
1152 strcpy (retbuf, "0");
1153 return retbuf;
1154 }
1155
1156 /* We basically slide the bits down. Why look at MOVE_ALL?
1157 * because we may want to return a string like 'all -swim',
1158 * and if we just looked at mt, we couldn't get that.
1159 */
1160 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1161 {
1162 if (mt & (1 << count))
1163 {
1164 strcat (retbuf, " ");
1165 strcat (retbuf, move_name[count]);
1166 }
1167 else
1168 {
1169 strcat (retbuf_all, " -");
1170 strcat (retbuf_all, move_name[count]);
1171 all_count++;
1172 }
1173 }
1174 /* Basically, if there is a single negation, return it, eg
1175 * 'all -swim'. But more than that, just return the
1176 * enumerated values. It doesn't make sense to return
1177 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1178 */
1179 if (all_count <= 1)
1180 return retbuf_all + 1;
1181 else
1182 return retbuf + 1;
1183}
1184#endif
1185
1186// compare *op against *tmp and output differences 1121// compare *op against *arch and output differences
1187void 1122static void
1188put (object_freezer &f, object *op, object *tmp) 1123write_diff (object_freezer &f, object *op, object *arch)
1189{ 1124{
1190 static const keyword resist_save[NROFATTACKS] = { 1125 static const keyword resist_save[NROFATTACKS] = {
1191# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1126# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1192# include "attackinc.h" 1127# include "attackinc.h"
1193# undef def 1128# undef def
… …
1198 * the 15'th element of this array should match that name. 1133 * the 15'th element of this array should match that name.
1199 * If an entry is NULL, that is a flag not to loaded/saved. 1134 * If an entry is NULL, that is a flag not to loaded/saved.
1200 */ 1135 */
1201 static const keyword flag_names [NUM_FLAGS] = { 1136 static const keyword flag_names [NUM_FLAGS] = {
1202 KW_alive, 1137 KW_alive,
1203 KW_wiz,
1204 KW_NULL, 1138 KW_NULL,
1205 KW_NULL, 1139 KW_NULL,
1206 KW_was_wiz, 1140 KW_NULL,
1141 KW_NULL,
1207 KW_applied, 1142 KW_applied,
1208 KW_unpaid, 1143 KW_unpaid,
1209 KW_can_use_shield, 1144 KW_can_use_shield,
1210 KW_no_pick, 1145 KW_no_pick,
1211 KW_NULL, // walk_on 1146 KW_NULL, // walk_on
1147 /* 10 */
1212 KW_NULL, // no_pass 1148 KW_NULL, // no_pass
1213 /* 10 */
1214 KW_is_animated, 1149 KW_is_animated,
1215 KW_NULL, // slow_move 1150 KW_NULL, // slow_move
1216 KW_NULL, // flying 1151 KW_NULL, // flying
1217 KW_monster, 1152 KW_monster,
1218 KW_friendly, 1153 KW_friendly,
1219 KW_generator, 1154 KW_generator,
1220 KW_is_thrown, 1155 KW_is_thrown,
1221 KW_auto_apply, 1156 KW_auto_apply,
1222 KW_NULL, // was KW_treasure 1157 KW_treasure_env,
1158 /* 20 */
1223 KW_player_sold, 1159 KW_player_sold,
1224 /* 20 */
1225 KW_see_invisible, 1160 KW_see_invisible,
1226 KW_can_roll, 1161 KW_can_roll,
1227 KW_overlay_floor, 1162 KW_overlay_floor,
1228 KW_is_turnable, 1163 KW_is_turnable,
1229 KW_NULL, // walk_off 1164 KW_NULL, // walk_off
1230 KW_NULL, // fly_on 1165 KW_NULL, // fly_on
1231 KW_NULL, // fly_off 1166 KW_NULL, // fly_off
1232 KW_is_used_up, 1167 KW_is_used_up,
1233 KW_identified, 1168 KW_identified,
1169 /* 30 */
1234 KW_reflecting, 1170 KW_reflecting,
1235 /* 30 */
1236 KW_changing, 1171 KW_changing,
1237 KW_splitting, 1172 KW_splitting,
1238 KW_hitback, 1173 KW_hitback,
1239 KW_startequip, 1174 KW_startequip,
1240 KW_blocksview, 1175 KW_blocksview,
1241 KW_undead, 1176 KW_undead,
1242 KW_scared, 1177 KW_scared,
1243 KW_unaggressive, 1178 KW_unaggressive,
1244 KW_reflect_missile, 1179 KW_reflect_missile,
1180 /* 40 */
1245 KW_reflect_spell, 1181 KW_reflect_spell,
1246 /* 40 */
1247 KW_no_magic, 1182 KW_no_magic,
1248 KW_no_fix_player, 1183 KW_NULL,
1249 KW_is_lightable, 1184 KW_is_lightable,
1250 KW_tear_down, 1185 KW_tear_down,
1251 KW_run_away, 1186 KW_run_away,
1252 KW_NULL, // pass_thru 1187 KW_NULL, // pass_thru
1253 KW_NULL, // an_pass_thru 1188 KW_NULL, // an_pass_thru
1254 KW_pick_up, 1189 KW_pick_up,
1255 KW_unique, 1190 KW_unique,
1191 /* 50 */
1256 KW_no_drop, 1192 KW_no_drop,
1257 /* 50 */
1258 KW_NULL, // wizcast 1193 KW_NULL, // wizcast
1259 KW_can_cast_spell, 1194 KW_can_cast_spell,
1260 KW_can_use_scroll, 1195 KW_can_use_scroll,
1261 KW_can_use_range, 1196 KW_can_use_range,
1262 KW_can_use_bow, 1197 KW_can_use_bow,
1263 KW_can_use_armour, 1198 KW_can_use_armour,
1264 KW_can_use_weapon, 1199 KW_can_use_weapon,
1265 KW_can_use_ring, 1200 KW_can_use_ring,
1266 KW_has_ready_range, 1201 KW_has_ready_range,
1202 /* 60 */
1267 KW_has_ready_bow, 1203 KW_has_ready_bow,
1268 /* 60 */
1269 KW_xrays, 1204 KW_xrays,
1270 KW_NULL, 1205 KW_NULL,
1271 KW_is_floor, 1206 KW_is_floor,
1272 KW_lifesave, 1207 KW_lifesave,
1273 KW_no_strength, 1208 KW_no_strength,
1274 KW_sleep, 1209 KW_sleep,
1275 KW_stand_still, 1210 KW_stand_still,
1276 KW_random_move, 1211 KW_random_move,
1277 KW_only_attack, 1212 KW_only_attack,
1213 /* 70 */
1278 KW_confused, 1214 KW_confused,
1279 /* 70 */
1280 KW_stealth, 1215 KW_stealth,
1281 KW_NULL, 1216 KW_NULL,
1282 KW_NULL, 1217 KW_NULL,
1283 KW_cursed, 1218 KW_cursed,
1284 KW_damned, 1219 KW_damned,
1285 KW_see_anywhere, 1220 KW_see_anywhere,
1286 KW_known_magical, 1221 KW_known_magical,
1287 KW_known_cursed, 1222 KW_known_cursed,
1288 KW_can_use_skill, 1223 KW_can_use_skill,
1224 /* 80 */
1289 KW_been_applied, 1225 KW_been_applied,
1290 /* 80 */
1291 KW_has_ready_scroll, 1226 KW_has_ready_scroll,
1292 KW_can_use_rod, 1227 KW_can_use_rod,
1293 KW_NULL, 1228 KW_precious,
1294 KW_can_use_horn, 1229 KW_can_use_horn,
1295 KW_make_invisible, 1230 KW_make_invisible,
1296 KW_inv_locked, 1231 KW_inv_locked,
1297 KW_is_wooded, 1232 KW_is_wooded,
1298 KW_is_hilly, 1233 KW_is_hilly,
1299 KW_has_ready_skill, 1234 KW_has_ready_skill,
1235 /* 90 */
1300 KW_has_ready_weapon, 1236 KW_has_ready_weapon,
1301 /* 90 */
1302 KW_no_skill_ident, 1237 KW_no_skill_ident,
1303 KW_is_blind, 1238 KW_is_blind,
1304 KW_can_see_in_dark, 1239 KW_can_see_in_dark,
1305 KW_is_cauldron, 1240 KW_is_cauldron,
1306 KW_NULL, 1241 KW_NULL,
1307 KW_no_steal, 1242 KW_no_steal,
1308 KW_one_hit, 1243 KW_one_hit,
1309 KW_NULL, 1244 KW_NULL,
1310 KW_berserk, 1245 KW_berserk,
1246 /* 100 */
1311 KW_neutral, 1247 KW_neutral,
1312 /* 100 */
1313 KW_no_attack, 1248 KW_no_attack,
1314 KW_no_damage, 1249 KW_no_damage,
1315 KW_obj_original, 1250 KW_obj_original,
1316 KW_NULL, 1251 KW_NULL,
1317 KW_activate_on_push, 1252 KW_activate_on_push,
1318 KW_activate_on_release, 1253 KW_activate_on_release,
1319 KW_is_water, 1254 KW_is_water,
1320 KW_use_content_on_gen, 1255 KW_use_content_on_gen,
1321 KW_NULL, 1256 KW_NULL,
1257 /* 110 */
1322 KW_is_buildable, 1258 KW_is_buildable,
1323 /* 110 */
1324 KW_destroy_on_death, 1259 KW_destroy_on_death,
1325 KW_NULL, 1260 KW_NULL,
1326 }; 1261 };
1327 1262
1328 int i; 1263 // obj_original is the only commonly differing flag between archetype
1264 // and object, so special-case it here to be able to skip the loop
1265 static const struct flagmask : object::flags_t
1266 {
1267 flagmask ()
1268 {
1269 for (int i = 0; i < NUM_FLAGS; i++)
1270 if (flag_names [i])
1271 set (i);
1272 }
1273 } flagmask;
1329 1274
1330 /* This saves the key/value lists. We do it first so that any 1275 /* This saves the key/value lists. We do it first so that any
1331 * keys that match field names will be overwritten by the loader. 1276 * keys that match field names will be overwritten by the loader.
1332 */ 1277 */
1333 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1278 for (key_value *kv = op->key_values; kv; kv = kv->next)
1334 { 1279 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1335 /* Find the field in the opposing member. */ 1280 f.put (kv->key, kv->value);
1336 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1337 1281
1338 /* If there's no partnering field, or it's got a different value, save our field. */ 1282 if (op->uuid)
1339 if (!arch_field || my_field->value != arch_field->value)
1340 f.put (my_field->key, my_field->value);
1341 } 1283 {
1284 // highly optimised - this is often 25% of all data written
1285 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1286 char *ptr = cur;
1342 1287
1343 /* We don't need to worry about the arch's extra fields - they 1288 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1344 * will get taken care of the copy_to method. 1289 ptr += sizeof ("uuid ") - 1;
1345 */ 1290 ptr = op->uuid.append (ptr);
1291 *ptr++ = '\n';
1346 1292
1347 { 1293 f.alloc (ptr - cur);
1348 char uids[64];
1349 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1350 f.put (KW_uuid, (const char *)uids);
1351 } 1294 }
1352 1295
1353#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1296#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v)
1354#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1297#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v)
1298
1299 CMP_OUT (x);
1300 CMP_OUT (y);
1301
1302 CMP_OUT (type);
1303 CMP_OUT (subtype);
1304 CMP_OUT (direction);
1355 1305
1356 CMP_OUT (name); 1306 CMP_OUT (name);
1357 CMP_OUT (name_pl); 1307 CMP_OUT (name_pl);
1358 CMP_OUT (custom_name); 1308
1309 CMP_OUT (speed);
1310
1311 // speed_left is a major time-burner, and has good locality, so
1312 // we use a simple lookup-cache to avoid the very slow printf.
1313 if (op->speed_left != arch->speed_left)
1314 {
1315 static double last_speed_left = 0.;
1316 static char last_speed_left_str [256] = "speed_left 0\n";
1317 static int last_speed_left_len = sizeof ("speed_left 0\n") - 1;
1318
1319 if (last_speed_left != op->speed_left)
1320 {
1321 last_speed_left = op->speed_left;
1322 last_speed_left_len = sizeof ("speed_left ") - 1
1323 + sprintf (last_speed_left_str + sizeof ("speed_left ") - 1, "%.7g\n", last_speed_left);
1324 }
1325
1326 f.add (last_speed_left_str, last_speed_left_len);
1327 }
1328
1359 CMP_OUT (title); 1329 CMP_OUT (title);
1360 CMP_OUT (race); 1330 CMP_OUT (race);
1361 CMP_OUT (slaying); 1331 CMP_OUT (slaying);
1332 CMP_OUT (skill);
1362 1333
1363 if (op->msg != tmp->msg) 1334 CMP_OUT (tag);
1364 f.put (KW_msg, KW_endmsg, op->msg); 1335 CMP_OUT (custom_name);
1365 if (op->lore != tmp->lore) 1336
1366 f.put (KW_lore, KW_endlore, op->lore); 1337 if (object *owner = op->owner)
1338 f.put (KW(owner), static_cast<const char *>(owner->ref ()));
1339
1340 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1367 1341
1368 CMP_OUT (other_arch); 1342 CMP_OUT (other_arch);
1369 CMP_OUT (face);
1370 1343
1344 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1345 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1346
1347 if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0);
1348 if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0);
1349 if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0);
1350
1371 if (op->animation_id != tmp->animation_id) 1351 if (op->animation_id != arch->animation_id)
1372 if (op->animation_id) 1352 if (op->has_anim ())
1353 f.put (KW(animation), op->anim ().name);
1354 else
1373 { 1355 {
1374 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1356 f.put (KW(animation));
1375 1357 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1376 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1377 f.put (KW_is_animated, (sint32) 0);
1378 } 1358 }
1379 else
1380 f.put (KW_animation, (const char *) 0);
1381 1359
1382 CMP_OUT2 (str, stats.Str); 1360 CMP_OUT2 (str, stats.Str);
1383 CMP_OUT2 (dex, stats.Dex); 1361 CMP_OUT2 (dex, stats.Dex);
1384 CMP_OUT2 (con, stats.Con); 1362 CMP_OUT2 (con, stats.Con);
1385 CMP_OUT2 (wis, stats.Wis); 1363 CMP_OUT2 (wis, stats.Wis);
… …
1394 CMP_OUT2 (grace, stats.grace); 1372 CMP_OUT2 (grace, stats.grace);
1395 CMP_OUT2 (maxgrace, stats.maxgrace); 1373 CMP_OUT2 (maxgrace, stats.maxgrace);
1396 CMP_OUT2 (exp, stats.exp); 1374 CMP_OUT2 (exp, stats.exp);
1397 1375
1398 CMP_OUT (perm_exp); 1376 CMP_OUT (perm_exp);
1399 CMP_OUT (expmul); 1377 //CMP_OUT (expmul);
1400 1378
1401 CMP_OUT2 (food, stats.food); 1379 CMP_OUT2 (food, stats.food);
1402 CMP_OUT2 (dam, stats.dam); 1380 CMP_OUT2 (dam, stats.dam);
1403 CMP_OUT2 (luck, stats.luck); 1381 CMP_OUT2 (luck, stats.luck);
1404 CMP_OUT2 (wc, stats.wc); 1382 CMP_OUT2 (wc, stats.wc);
1405 CMP_OUT2 (ac, stats.ac); 1383 CMP_OUT2 (ac, stats.ac);
1406 1384
1407 CMP_OUT (x);
1408 CMP_OUT (y);
1409 CMP_OUT (speed);
1410 CMP_OUT (speed_left);
1411 CMP_OUT2 (move_state, move_status); 1385 CMP_OUT2 (move_state, move_status);
1412 CMP_OUT (attack_movement); 1386 CMP_OUT (attack_movement);
1413 CMP_OUT (nrof); 1387 CMP_OUT (nrof);
1414 CMP_OUT (level); 1388 CMP_OUT (level);
1415 CMP_OUT (direction);
1416 CMP_OUT (type);
1417 CMP_OUT (subtype);
1418 CMP_OUT (attacktype); 1389 CMP_OUT (attacktype);
1419 1390
1391 // using memcmp here seems to be a loss - is gcc vectorising?
1420 for (i = 0; i < NROFATTACKS; i++) 1392 for (int i = 0; i < NROFATTACKS; i++)
1421 if (op->resist[i] != tmp->resist[i]) 1393 if (expect_false (op->resist[i] != arch->resist[i]))
1422 f.put (resist_save[i], op->resist[i]); 1394 f.put (resist_save[i], op->resist[i]);
1423 1395
1424 CMP_OUT (path_attuned); 1396 CMP_OUT (path_attuned);
1425 CMP_OUT (path_repelled); 1397 CMP_OUT (path_repelled);
1426 CMP_OUT (path_denied); 1398 CMP_OUT (path_denied);
1427 CMP_OUT (material); 1399
1428 CMP_OUT (materialname); 1400 CMP_OUT2 (material, materials);//TODO: nuke
1401 if (op->material != arch->material)
1402 f.put (KW(materialname), op->material->name);
1403
1429 CMP_OUT (value); 1404 CMP_OUT (value);
1430 CMP_OUT (carrying); 1405 CMP_OUT (carrying);
1431 CMP_OUT (weight); 1406 CMP_OUT (weight);
1432 CMP_OUT (invisible); 1407 CMP_OUT (invisible);
1433 CMP_OUT (state); 1408 CMP_OUT (state);
… …
1436 CMP_OUT (last_sp); 1411 CMP_OUT (last_sp);
1437 CMP_OUT (last_grace); 1412 CMP_OUT (last_grace);
1438 CMP_OUT (last_eat); 1413 CMP_OUT (last_eat);
1439 CMP_OUT (glow_radius); 1414 CMP_OUT (glow_radius);
1440 1415
1441 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1416 if (op->flag [FLAG_IS_LINKED])
1417 if (auto (ol, op->find_link ()))
1442 f.put (KW_connected, i); 1418 f.put (KW(connected), ol->id);
1443 1419
1444 CMP_OUT (randomitems); 1420 CMP_OUT (randomitems);
1445 CMP_OUT2 (container, weight_limit); 1421 CMP_OUT2 (container, weight_limit);
1446 1422
1447 CMP_OUT (run_away); 1423 CMP_OUT (run_away);
1448 CMP_OUT (pick_up); 1424 CMP_OUT (pick_up);
1449 CMP_OUT (will_apply); 1425 CMP_OUT (will_apply);
1450 CMP_OUT (smoothlevel); 1426 CMP_OUT (smoothlevel);
1451 CMP_OUT (weapontype); 1427 CMP_OUT (weapontype);
1452 CMP_OUT (tooltype);
1453 CMP_OUT (elevation);
1454 CMP_OUT (client_type); 1428 CMP_OUT (client_type);
1455 CMP_OUT (item_power); 1429 CMP_OUT (item_power);
1456 CMP_OUT (duration); 1430 CMP_OUT (duration);
1457 CMP_OUT (range); 1431 CMP_OUT (range);
1458 CMP_OUT (range_modifier); 1432 CMP_OUT (range_modifier);
… …
1466 CMP_OUT (move_on); 1440 CMP_OUT (move_on);
1467 CMP_OUT (move_off); 1441 CMP_OUT (move_off);
1468 CMP_OUT (move_slow); 1442 CMP_OUT (move_slow);
1469 CMP_OUT (move_slow_penalty); 1443 CMP_OUT (move_slow_penalty);
1470 1444
1471 if (op->flag != tmp->flag) 1445 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1446
1447 if (diff [FLAG_OBJ_ORIGINAL])
1448 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1449
1450 diff.reset (FLAG_OBJ_ORIGINAL);
1451
1452 // quickly test whether any other flags differ
1453 if (expect_true (diff.any ()))
1472 for (i = 0; i <= NUM_FLAGS; i++) 1454 for (int i = 0; i < NUM_FLAGS; i++)
1473 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1455 if (expect_false (diff [i]))
1474 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1456 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1475 1457
1476 /* Save body locations */ 1458 // save body locations. gcc's memcmp does an abysmal job when used
1477 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1459 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1478 if (op->body_info[i] != tmp->body_info[i]) 1460 if (expect_false (op->slot[i].info != arch->slot[i].info))
1479 f.put (body_locations[i].save_name, op->body_info[i]); 1461 f.put (body_locations[i].save_name, op->slot[i].info);
1480} 1462}
1481 1463
1482/* 1464/*
1483 * Dumps all variables in an object to a file. 1465 * Dumps all variables in an object to a file.
1484 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1466 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1485 * the only place this is not set is when saving the player. 1467 * the only place this is not set is when saving the player.
1486 */ 1468 */
1487void 1469bool
1488save_object (object_freezer &fp, object *op, int flag) 1470object::write (object_freezer &f)
1489{ 1471{
1490 /* Even if the object does have an owner, it would seem that we should 1472 if (expect_false (is_arch ()))
1491 * still save it. 1473 {
1492 */ 1474 f.put (KW(object), arch->archname);
1493 if (op->owner) 1475 write_diff (f, this, archetype::empty);
1494 return; 1476 }
1495 1477 else
1496 /* If it is unpaid and we don't want to save those, just return. */ 1478 {
1497 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1498 return;
1499
1500 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1501
1502 fp.put (KW_arch, at->name); 1479 f.put (KW(arch), arch->archname);
1503 put (fp, op, &at->clone); 1480 write_diff (f, this, arch);
1481 }
1504 1482
1505 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1506
1507 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1483 for (object *tmp = inv; tmp; tmp = tmp->below)
1508 save_object (fp, tmp, flag); 1484 tmp->write (f);
1509 1485
1510 fp.put (op); 1486 f.put (this);
1511 fp.put (KW_end); 1487 f.put (KW(end));
1488
1489 return true;
1512} 1490}
1513 1491
1492/////////////////////////////////////////////////////////////////////////////
1493
1494// generic resource file load,
1495// currently supports: region, treasures, archetypes
1496bool
1497load_resource_file_ (const char *filename)
1498{
1499 object_thawer f (filename);
1500
1501 for (;;)
1502 {
1503 switch (f.kw)
1504 {
1505 case KW_region:
1506 if (!region::read (f))
1507 return false;
1508 break;
1509
1510 case KW_treasure:
1511 case KW_treasureone:
1512 if (!treasurelist::read (f))
1513 return false;
1514 break;
1515
1516 case KW_object:
1517 if (!archetype::read (f))
1518 return false;
1519 break;
1520
1521 case KW_EOF:
1522 return true;
1523
1524 default:
1525 if (!f.parse_error ("resource file"))
1526 return false;
1527
1528 f.next ();
1529 break;
1530 }
1531 }
1532}
1533

Diff Legend

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