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

Diff Legend

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