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.41 by root, Sun Jan 7 23:10:42 2007 UTC vs.
Revision 1.160 by root, Thu May 6 22:58:03 2010 UTC

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

Diff Legend

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