ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

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

Diff Legend

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