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.17 by root, Thu Sep 14 22:33:59 2006 UTC vs.
Revision 1.157 by root, Thu Apr 29 12:24: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 (©) 2005,2006,2007,2008,2009,2010 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 <newserver.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 }
268 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 }
317
269 /* We do some specialized 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 pluralized), 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 (!(IS_WEAPON (op) && 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 if (editor) 375
327 ip = 0;
328 else
329 ip = calc_item_power (op, 0); 376 int ip = calc_item_power (this, 0);
377
330 /* Legacy objects from before item power was in the game */ 378 /* Legacy objects from before item power was in the game */
331 if (!op->item_power && ip) 379 if (!item_power && ip)
332 { 380 {
333 if (ip > 3) 381 if (ip > 3)
334 {
335 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);
336 } 383
337 op->item_power = ip; 384 item_power = ip;
338 } 385 }
386
339 /* Check for possibly bogus values. Has to meet both these criteria - 387 /* Check for possibly bogus values. Has to meet both these criteria -
340 * 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
341 * 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.
342 * 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,
343 * but not the second one. 391 * but not the second one.
344 */ 392 */
393#if 0 //TODO
345 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 394 if (ip > 2 * item_power && ip > (item_power + 3))
346 {
347 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);
348 } 396#endif
349
350 } 397 }
398
351 /* Old spellcasting object - need to load in the appropiate object */ 399 /* old style spellcasting object (pretty common) - need to load in the appropriate object */
352 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
353 /* 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 */
354 ((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
355 { 412 {
356 object *tmp; 413 // TODO: fix firewall object on map
357
358 /* 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'
359 * in that spell was stored in sp. 415 * in that spell was stored in sp.
360 */ 416 */
417 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
361 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]);
362 insert_ob_in_ob (tmp, op); 419 insert_ob_in_ob (tmp, this);
363 op->randomitems = NULL; /* So another spell isn't created for this object */ 420 randomitems = 0;
364 } 421 }
422
365 /* 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 */
366
367 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) 424 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
368 { 425 {
369 object *tmp; 426 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
370
371 tmp = get_archetype_by_object_name (op->slaying); 427 object *tmp = get_archetype_by_object_name (slaying);
372 insert_ob_in_ob (tmp, op); 428 insert_ob_in_ob (tmp, this);
373 op->randomitems = NULL; /* So another spell isn't created for this object */ 429 randomitems = 0; /* So another spell isn't created for this object */
374 /* without this, value is all screwed up */ 430 /* without this, value is all screwed up */
375 op->value = op->arch->clone.value * op->inv->value; 431 value = arch->value * inv->value;
376 }
377
378 if (QUERY_FLAG (op, FLAG_MONSTER))
379 { 432 }
433
434 if (this->flag [FLAG_MONSTER])
435 {
380 if (op->stats.hp > op->stats.maxhp) 436 if (stats.hp > stats.maxhp)
437 {
381 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 }
382 441
383 /* The archs just need to be updated for this */ 442 /* The archs just need to be updated for this */
384 if (op->move_type == 0) 443 if (move_type == 0)
385 op->move_type = MOVE_WALK; 444 move_type = MOVE_WALK;
386 }
387
388 if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER)
389 { 445 }
446
447 if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER)
390 /* Object will duplicate it's content as part of the 448 /* Object will duplicate it's content as part of the
391 * generation process. To do this, we must flag inventory 449 * generation process. To do this, we must flag inventory
392 * so it remains unevaluated concerning the randomitems and 450 * so it remains unevaluated concerning the randomitems and
393 * the living (a demonlord shouldn't cast from inside generator!) 451 * the living (a demonlord shouldn't cast from inside generator!)
394 */ 452 */
453 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
395 flag_inv (op, FLAG_IS_A_TEMPLATE); 454 flag_inv (this, FLAG_IS_A_TEMPLATE);
396 }
397 455
398 /* Handle player movers. We use move_type for player movers 456 /* Handle player movers. We use move_type for player movers
399 * because they operate on their own time (move_on 457 * because they operate on their own time (move_on
400 * would potentially cause them to be triggered when someone steps 458 * would potentially cause them to be triggered when someone steps
401 * 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
402 * are doing, otherwise, set move_type based on maxhp value. 460 * are doing, otherwise, set move_type based on maxhp value.
403 */ 461 */
404 if (op->type == PLAYERMOVER) 462 if (type == PLAYERMOVER)
405 { 463 {
406 if (!op->move_type) 464 if (!move_type)
407 { 465 {
408 if (op->stats.maxhp) 466 if (stats.maxhp)
409 { 467 {
410 op->move_type = MOVE_ALL; 468 move_type = MOVE_ALL;
411 op->stats.maxhp = 0; 469 stats.maxhp = 0;
412 } 470 }
413 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 + sizeof (move_flags) / sizeof (move_flags [0]); ++f)
528 {
529 if (!strcmp (f->name, str))
414 { 530 {
415 op->move_type = MOVE_WALK; 531 if (negate)
532 mt &= ~f->flags;
533 else
534 mt |= f->flags;
535
536 goto next;
416 } 537 }
417 } 538 }
418 }
419 539
540 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
541
542next: ;
543 }
420} 544}
421 545
422static void 546//-GPL
423set_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)
424{ 552{
425 if (!str) 553 object *op_inv = inv;
426 { 554 key_value *last_kv = key_values;
427 mt = 0; 555
428 return; 556 for (;;)
429 } 557 {
430 558 switch (f.kw)
431 if (isdigit (*str))
432 {
433 mt = atoi (str);
434 return;
435 }
436
437 mt = 0;
438
439 for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
440 {
441 if (!strcasecmp (str, "all"))
442 mt |= MOVE_ALL;
443 else
444 { 559 {
445 int i, negate = 0;
446
447 if (*str == '-')
448 {
449 negate = 1;
450 str++;
451 }
452
453 for (i = 0; move_name[i]; i++)
454 {
455 if (!strcasecmp (move_name[i], str))
456 {
457 if (negate)
458 mt &= ~(1 << i);
459 else
460 mt |= (1 << i);
461
462 break;
463 }
464 }
465
466 if (!move_name[i])
467 {
468 /* fly is a special case - covers both fly_low and
469 * fly_high - since it doesn't match to a specific
470 * single bit, have to special case it.
471 */
472 if (!strcasecmp (str, "flying"))
473 {
474 if (negate)
475 mt &= ~MOVE_FLYING;
476 else
477 mt |= MOVE_FLYING;
478 }
479 else
480 LOG (llevDebug, "common/loader.l: set_move - unknown move string '%s'\n", str);
481 }
482 }
483 }
484}
485
486#define GET_FLAG(op,flag) \
487 if (thawer.get_sint32 ()) \
488 SET_FLAG (op, flag); \
489 else \
490 CLEAR_FLAG (op, flag) \
491
492int
493parse_object (object *op, object_thawer & thawer, int map_flags)
494{
495 bool ismore = 0;
496 object *op_inv = op->inv;
497
498 for (;;)
499 {
500 keyword kw = thawer.get_kv ();
501
502 switch (kw)
503 {
504 case KW_Object: // uppercase alias
505 case KW_object:
506 thawer.get (op->name);
507
508 if (op->arch != NULL)
509 op->arch->name = op->name;
510
511 break;
512
513 case KW_uuid: 560 case KW_uuid:
514 if (const char *s = thawer.get_str ()) 561 if (!uuid.parse (f.get_str ()))
515 { 562 {
516 unsigned int version; 563 f.parse_warn ("unparseable uuid");
517 unsigned long long seq; 564 uuid = UUID::gen ();
565 }
566 break;
518 567
519 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)
520 { 597 {
598 inv = tmp;
521 op->uuid.seq = seq; 599 tmp->above = 0;
522 break;
523 } 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;
524 } 613 }
525
526 op->uuid = gen_uuid ();
527 break;
528
529 case KW_oid:
530 thawer.get (op, thawer.get_sint32 ());
531 break;
532
533 case KW_name:
534 thawer.get (op->name);
535 break;
536 case KW_name_pl:
537 thawer.get (op->name_pl);
538 break;
539 case KW_title:
540 thawer.get (op->title);
541 break;
542 case KW_custom_name:
543 thawer.get (op->custom_name);
544 break;
545 case KW_attach:
546 thawer.get_ornull (op->attach);
547 break;
548 case KW_skill:
549 thawer.get_ornull (op->skill);
550 break;
551 case KW_race:
552 thawer.get_ornull (op->race);
553 break;
554 case KW_slaying:
555 thawer.get_ornull (op->slaying);
556 break;
557
558 case KW_arch:
559 {
560 const char *str = thawer.get_str ();
561
562 if (op->arch)
563 {
564 /* If op->arch has been set, then this new object
565 * must be part of the inventory. So process
566 * appropriately.
567 */
568 archetype *arch = archetype::find (str);
569
570 object *tmp;
571
572 if (arch != NULL)
573 tmp = arch_to_object (arch);
574 else
575 {
576 tmp = get_object ();
577 /* record the name of the broken object */
578 tmp->name = str;
579 }
580
581 parse_object (tmp, thawer, map_flags);
582
583 if (tmp->arch)
584 {
585 // was: insert_ob_in_ob (tmp, op);
586 // but manually adding it can improve map loading times a lot
587 // also, appending instead of prepending keeps the
588 // save ordering the same between repeated load/saves.
589 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
590 CLEAR_FLAG (tmp, FLAG_REMOVED);
591
592 if (!op_inv)
593 {
594 op->inv = tmp;
595 tmp->above = 0;
596 }
597 else
598 {
599 while (op_inv->below)
600 op_inv = op_inv->below;
601
602 op_inv->below = tmp;
603 tmp->above = op_inv;
604 }
605
606 tmp->below = 0;
607 tmp->env = op;
608 op_inv = tmp;
609 }
610 else
611 {
612 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
613 free_object (tmp);
614 }
615 }
616 else 614 else
617 { 615 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
618 /* This is the actual archetype definition then */
619 op->arch = archetype::find (str);
620 616
621 if (op->arch != NULL) 617 continue;
622 copy_object (&op->arch->clone, op);
623 else if (!arch_init)
624 /* record the name of the broken object */
625 op->name = str;
626 }
627 }
628 break;
629 618
630 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 {
631 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 ());
632 break; 633 break;
633 634
634 case KW_animation: 635 case KW_animation:
635 { 636 {
636 const char *str = thawer.get_str (); 637 this->clr_flag (FLAG_ANIMATE);
637
638 if (!str)
639 {
640 op->animation_id = 0; 638 animation_id = 0;
641 CLEAR_FLAG (op, FLAG_ANIMATE); 639
642 } 640 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
643 else 641 this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
644 {
645 op->animation_id = find_animation (str);
646 SET_FLAG (op, FLAG_ANIMATE);
647 }
648 } 642 }
649
650 break; 643 break;
651 644
645 case KW_last_heal: f.get (last_heal); break;
646 case KW_last_sp: f.get (last_sp); break;
647 case KW_last_grace: f.get (last_grace); break;
648 case KW_last_eat: f.get (last_eat); break;
652 case KW_last_heal: 649 case KW_sl:
653 thawer.get (op->last_heal); 650 case KW_speed_left: f.get (speed_left); break;
654 break;
655 case KW_last_sp:
656 thawer.get (op->last_sp);
657 break;
658 case KW_last_grace:
659 thawer.get (op->last_grace);
660 break;
661 case KW_last_eat:
662 thawer.get (op->last_eat);
663 break;
664 case KW_speed_left:
665 thawer.get (op->speed_left);
666 break;
667 651
668 case KW_speed: 652 case KW_speed:
669 thawer.get (op->speed); 653 f.get (speed);
670 654
671 //TODO: maybe do in check_object 655 //TODO: maybe do in check_object
672 if (!(map_flags & MAP_STYLE)) 656 // removed check for style maps
657 if (speed < 0)
658 speed_left = speed_left - rndm ();
659
660 break;
661
662 case KW_slow_move:
663 move_slow |= MOVE_WALK;
664 f.get (move_slow_penalty);
665 break;
666
667 case KW_face:
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 { 673 {
674 sound = sound_find (f.get_str ());
674 if (op->speed < 0) 675 if (!sound)
675 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 676 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
676
677 update_ob_speed (op);
678 } 677 }
679
680 break; 678 else
681 679 sound = 0;
682 case KW_slow_move:
683 op->move_slow |= MOVE_WALK;
684 thawer.get (op->move_slow_penalty);
685 break; 680 break;
686 681
687 case KW_face:
688 op->face = &new_faces[FindFace (thawer.get_str (), 0)];
689 break;
690
691 case KW_x:
692 thawer.get (op->x);
693 break;
694 case KW_y: 682 case KW_sound_destroy:
695 thawer.get (op->y); 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 }
696 break; 689 else
690 sound_destroy = 0;
691 break;
692
693 case KW_x: f.get (x); break;
694 case KW_y: f.get (y); break;
695
697 case KW_Str: // uppercase alias 696 case KW_Str: // uppercase alias
698 case KW_str: 697 case KW_str: f.get (stats.Str); break;
699 thawer.get (op->stats.Str);
700 break;
701 case KW_Dex: // uppercase alias 698 case KW_Dex: // uppercase alias
702 case KW_dex: 699 case KW_dex: f.get (stats.Dex); break;
703 thawer.get (op->stats.Dex);
704 break;
705 case KW_Con: // uppercase alias 700 case KW_Con: // uppercase alias
706 case KW_con: 701 case KW_con: f.get (stats.Con); break;
707 thawer.get (op->stats.Con);
708 break;
709 case KW_Wis: // uppercase alias 702 case KW_Wis: // uppercase alias
710 case KW_wis: 703 case KW_wis: f.get (stats.Wis); break;
711 thawer.get (op->stats.Wis);
712 break;
713 case KW_Cha: // uppercase alias 704 case KW_Cha: // uppercase alias
714 case KW_cha: 705 case KW_cha: f.get (stats.Cha); break;
715 thawer.get (op->stats.Cha);
716 break;
717 case KW_Int: // uppercase alias 706 case KW_Int: // uppercase alias
718 case KW_int: 707 case KW_int: f.get (stats.Int); break;
719 thawer.get (op->stats.Int);
720 break;
721 case KW_Pow: // uppercase alias 708 case KW_Pow: // uppercase alias
722 case KW_pow: 709 case KW_pow: f.get (stats.Pow); break;
723 thawer.get (op->stats.Pow);
724 break;
725 case KW_hp:
726 thawer.get (op->stats.hp);
727 break;
728 case KW_maxhp:
729 thawer.get (op->stats.maxhp);
730 break;
731 case KW_sp:
732 thawer.get (op->stats.sp);
733 break;
734 case KW_maxsp:
735 thawer.get (op->stats.maxsp);
736 break;
737 case KW_grace:
738 thawer.get (op->stats.grace);
739 break;
740 case KW_maxgrace:
741 thawer.get (op->stats.maxgrace);
742 break;
743 710
744 case KW_exp: 711 case KW_hp: f.get (stats.hp); break;
745 thawer.get (op->stats.exp); 712 case KW_maxhp: f.get (stats.maxhp); break;
746 break; 713 case KW_sp: f.get (stats.sp); break;
747 case KW_perm_exp: 714 case KW_maxsp: f.get (stats.maxsp); break;
748 thawer.get (op->perm_exp); 715 case KW_grace: f.get (stats.grace); break;
749 break; 716 case KW_maxgrace: f.get (stats.maxgrace); break;
750 case KW_food: 717
751 thawer.get (op->stats.food); 718 case KW_exp: f.get (stats.exp); break;
752 break; 719 case KW_perm_exp: f.get (perm_exp); break;
753 case KW_dam: 720 case KW_food: f.get (stats.food); break;
754 thawer.get (op->stats.dam); 721 case KW_dam: f.get (stats.dam); break;
755 break; 722 case KW_wc: f.get (stats.wc); break;
756 case KW_wc: 723 case KW_ac: f.get (stats.ac); break;
757 thawer.get (op->stats.wc); 724 case KW_nrof: f.get (nrof); break;
758 break; 725 case KW_level: f.get (level); break;
759 case KW_ac: 726 case KW_direction: f.get (direction); break;
760 thawer.get (op->stats.ac); 727 case KW_type: f.get (type); break;
761 break; 728 case KW_subtype: f.get (subtype); break;
762 case KW_nrof: 729 case KW_value: f.get (value); break;
763 thawer.get (op->nrof); 730 case KW_weight: f.get (weight); break;
764 break; 731 case KW_carrying: f.get (carrying); break;
765 case KW_level: 732 case KW_attacktype: f.get (attacktype); break;
766 thawer.get (op->level); 733 case KW_path_attuned: f.get (path_attuned); break;
767 break; 734 case KW_path_repelled: f.get (path_repelled); break;
768 case KW_direction: 735 case KW_path_denied: f.get (path_denied); break;
769 thawer.get (op->direction); 736 case KW_invisible: f.get (invisible); break;
770 break; 737 case KW_magic: f.get (magic); break;
771 case KW_type: 738 case KW_state: f.get (state); break;
772 thawer.get (op->type); 739 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
773 break; 740 case KW_material: f.get (materials); break; //TODO: nuke
774 case KW_subtype: 741 case KW_materialname: f.get (material); break;
775 thawer.get (op->subtype);
776 break;
777 case KW_value:
778 thawer.get (op->value);
779 break;
780 case KW_weight:
781 thawer.get (op->weight);
782 break;
783 case KW_carrying:
784 thawer.get (op->carrying);
785 break;
786 case KW_attacktype:
787 thawer.get (op->attacktype);
788 break;
789 case KW_path_attuned:
790 thawer.get (op->path_attuned);
791 break;
792 case KW_path_repelled:
793 thawer.get (op->path_repelled);
794 break;
795 case KW_path_denied:
796 thawer.get (op->path_denied);
797 break;
798 case KW_invisible:
799 thawer.get (op->invisible);
800 break;
801 case KW_magic:
802 thawer.get (op->magic);
803 break;
804 case KW_state:
805 thawer.get (op->state);
806 break;
807 case KW_move_slow_penalty:
808 thawer.get (op->move_slow_penalty);
809 break;
810 case KW_material:
811 thawer.get (op->material);
812 break;
813 case KW_materialname:
814 thawer.get (op->materialname);
815 break;
816 742
817 /* These are the new values */ 743 /* These are the new values */
818 case KW_move_block: 744 case KW_move_block: set_move (move_block, f); break;
819 set_move (op->move_block, thawer.get_str ()); 745 case KW_move_allow: set_move (move_allow, f); break;
820 break; 746 case KW_move_type: set_move (move_type , f); break;
821 case KW_move_allow: 747 case KW_move_on: set_move (move_on , f); break;
822 set_move (op->move_allow, thawer.get_str ()); 748 case KW_move_off: set_move (move_off , f); break;
823 break; 749 case KW_move_slow: set_move (move_slow , f); break;
824 case KW_move_type:
825 set_move (op->move_type, thawer.get_str ());
826 break;
827 case KW_move_on:
828 set_move (op->move_on, thawer.get_str ());
829 break;
830 case KW_move_off:
831 set_move (op->move_off, thawer.get_str ());
832 break;
833 case KW_move_slow:
834 set_move (op->move_slow, thawer.get_str ());
835 break;
836 750
837 /* 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 */
838 case KW_no_pass: 752 case KW_no_pass:
839 { 753 {
840 if (thawer.get_sint32 ()) 754 if (f.get_sint32 ())
841 op->move_block = MOVE_ALL; 755 move_block = MOVE_ALL;
842 else 756 else
843 op->move_block = 0; 757 move_block = 0;
844 } 758 }
845 759
846 break; 760 break;
847 761
848 /* 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 */
849 case KW_walk_on: 763 case KW_walk_on:
850 { 764 {
851 if (thawer.get_sint32 ()) 765 if (f.get_sint32 ())
852 op->move_on |= MOVE_WALK; 766 move_on |= MOVE_WALK;
853 else 767 else
854 op->move_on &= ~MOVE_WALK; 768 move_on &= ~MOVE_WALK;
855 } 769 }
856 770
857 break; 771 break;
858 772
859 /* 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 */
860 case KW_walk_off: 774 case KW_walk_off:
861 { 775 {
862 if (thawer.get_sint32 ()) 776 if (f.get_sint32 ())
863 op->move_off |= MOVE_WALK; 777 move_off |= MOVE_WALK;
864 else 778 else
865 op->move_off &= ~MOVE_WALK; 779 move_off &= ~MOVE_WALK;
866 } 780 }
867 break; 781 break;
868 782
869 /* 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 */
870 case KW_fly_on: 784 case KW_fly_on:
871 { 785 {
872 if (thawer.get_sint32 ()) 786 if (f.get_sint32 ())
873 op->move_on |= MOVE_FLY_LOW; 787 move_on |= MOVE_FLY_LOW;
874 else 788 else
875 op->move_on &= ~MOVE_FLY_LOW; 789 move_on &= ~MOVE_FLY_LOW;
876 } 790 }
877 break; 791 break;
878 792
879 /* 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 */
880 case KW_fly_off: 794 case KW_fly_off:
881 { 795 {
882 if (thawer.get_sint32 ()) 796 if (f.get_sint32 ())
883 op->move_off |= MOVE_FLY_LOW; 797 move_off |= MOVE_FLY_LOW;
884 else 798 else
885 op->move_off &= ~MOVE_FLY_LOW; 799 move_off &= ~MOVE_FLY_LOW;
886 } 800 }
887 break; 801 break;
888 802
889 //TODO: remove these after converting archetypes 803 //TODO: remove these after converting archetypes
890 case KW_can_use_wand: 804 case KW_can_use_wand:
891 GET_FLAG (op, FLAG_USE_RANGE); 805 GET_FLAG (this, FLAG_USE_RANGE);
892 break; 806 break;
893 807
894 /* 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 */
895 case KW_flying: 809 case KW_flying:
896 { 810 {
897 if (thawer.get_sint32 ()) 811 if (f.get_sint32 ())
898 op->move_type |= MOVE_FLY_LOW; 812 move_type |= MOVE_FLY_LOW;
899 else 813 else
900 op->move_type &= ~MOVE_FLY_LOW; 814 move_type &= ~MOVE_FLY_LOW;
901 } 815 }
902 break; 816 break;
903 817
904 818
905 case KW_identified: 819 case KW_identified:
906 GET_FLAG (op, FLAG_IDENTIFIED); 820 GET_FLAG (this, FLAG_IDENTIFIED);
907 //TODO: move to check_object or so 821 //TODO: move to check_object or so
908 if (QUERY_FLAG (op, FLAG_IDENTIFIED)) 822 if (this->flag [FLAG_IDENTIFIED])
909 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 823 this->clr_flag (FLAG_KNOWN_MAGICAL);
910 824
911 break; 825 break;
912 826
913 case KW_wiz: 827 case KW_friendly:
914 GET_FLAG (op, FLAG_WIZ); 828 if (f.get_bool ())
915 //TODO: move to check_object 829 if (type != PLAYER)
916 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 ())
917 { 1007 {
918 SET_FLAG (op, FLAG_WAS_WIZ); 1008 randomitems =
919 SET_FLAG (op, FLAG_WIZPASS); 1009 loading_arch
920 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 }
921 } 1018 }
922 else 1019 else
923 { 1020 randomitems = 0;
924 CLEAR_FLAG (op, FLAG_WIZPASS);
925 CLEAR_FLAG (op, FLAG_WIZCAST);
926 }
927 break;
928
929 case KW_friendly:
930 GET_FLAG (op, FLAG_FRIENDLY);
931 //TODO: move to check_object or so
932 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
933 add_friendly_object (op);
934 break;
935
936 case KW_monster:
937 GET_FLAG (op, FLAG_MONSTER);
938 break;
939 case KW_neutral:
940 GET_FLAG (op, FLAG_NEUTRAL);
941 break;
942 case KW_no_attack:
943 GET_FLAG (op, FLAG_NO_ATTACK);
944 break;
945 case KW_no_damage:
946 GET_FLAG (op, FLAG_NO_DAMAGE);
947 break;
948 case KW_generator:
949 GET_FLAG (op, FLAG_GENERATOR);
950 break;
951 case KW_use_content_on_gen:
952 GET_FLAG (op, FLAG_CONTENT_ON_GEN);
953 break;
954 case KW_is_thrown:
955 GET_FLAG (op, FLAG_IS_THROWN);
956 break;
957 case KW_auto_apply:
958 GET_FLAG (op, FLAG_AUTO_APPLY);
959 break;
960 case KW_treasure:
961 GET_FLAG (op, FLAG_TREASURE);
962 break;
963 case KW_see_invisible:
964 GET_FLAG (op, FLAG_SEE_INVISIBLE);
965 break;
966 case KW_can_roll:
967 GET_FLAG (op, FLAG_CAN_ROLL);
968 break;
969 case KW_overlay_floor:
970 GET_FLAG (op, FLAG_OVERLAY_FLOOR);
971 break;
972 case KW_is_turnable:
973 GET_FLAG (op, FLAG_IS_TURNABLE);
974 break;
975 case KW_is_used_up:
976 GET_FLAG (op, FLAG_IS_USED_UP);
977 break;
978 case KW_alive:
979 GET_FLAG (op, FLAG_ALIVE);
980 break;
981 case KW_applied:
982 GET_FLAG (op, FLAG_APPLIED);
983 break;
984 case KW_unpaid:
985 GET_FLAG (op, FLAG_UNPAID);
986 break;
987 case KW_is_animated:
988 GET_FLAG (op, FLAG_ANIMATE);
989 break;
990 case KW_no_pick:
991 GET_FLAG (op, FLAG_NO_PICK);
992 break;
993 case KW_reflecting:
994 GET_FLAG (op, FLAG_REFLECTING);
995 break;
996 case KW_changing:
997 GET_FLAG (op, FLAG_CHANGING);
998 break;
999 case KW_splitting:
1000 GET_FLAG (op, FLAG_SPLITTING);
1001 break;
1002 case KW_hitback:
1003 GET_FLAG (op, FLAG_HITBACK);
1004 break;
1005 case KW_startequip:
1006 GET_FLAG (op, FLAG_STARTEQUIP);
1007 break;
1008 case KW_blocksview:
1009 GET_FLAG (op, FLAG_BLOCKSVIEW);
1010 break;
1011 case KW_undead:
1012 GET_FLAG (op, FLAG_UNDEAD);
1013 break;
1014 case KW_scared:
1015 GET_FLAG (op, FLAG_SCARED);
1016 break;
1017 case KW_unaggressive:
1018 GET_FLAG (op, FLAG_UNAGGRESSIVE);
1019 break;
1020 case KW_reflect_missile:
1021 GET_FLAG (op, FLAG_REFL_MISSILE);
1022 break;
1023 case KW_reflect_spell:
1024 GET_FLAG (op, FLAG_REFL_SPELL);
1025 break;
1026 case KW_no_magic:
1027 GET_FLAG (op, FLAG_NO_MAGIC);
1028 break;
1029 case KW_no_drop:
1030 GET_FLAG (op, FLAG_NO_DROP);
1031 break;
1032 case KW_random_movement:
1033 GET_FLAG (op, FLAG_RANDOM_MOVE);
1034 break;
1035 case KW_was_wiz:
1036 GET_FLAG (op, FLAG_WAS_WIZ);
1037 break;
1038 case KW_no_fix_player:
1039 GET_FLAG (op, FLAG_NO_FIX_PLAYER);
1040 break;
1041 case KW_is_lightable:
1042 GET_FLAG (op, FLAG_IS_LIGHTABLE);
1043 break;
1044 case KW_tear_down:
1045 GET_FLAG (op, FLAG_TEAR_DOWN);
1046 break;
1047 case KW_can_use_shield:
1048 GET_FLAG (op, FLAG_USE_SHIELD);
1049 break;
1050 case KW_can_cast_spell:
1051 GET_FLAG (op, FLAG_CAST_SPELL);
1052 break;
1053 case KW_can_use_scroll:
1054 GET_FLAG (op, FLAG_USE_SCROLL);
1055 break;
1056 case KW_can_use_range:
1057 GET_FLAG (op, FLAG_USE_RANGE);
1058 break;
1059 case KW_can_use_bow:
1060 GET_FLAG (op, FLAG_USE_BOW);
1061 break;
1062 case KW_can_use_armour:
1063 GET_FLAG (op, FLAG_USE_ARMOUR);
1064 break;
1065 case KW_can_use_weapon:
1066 GET_FLAG (op, FLAG_USE_WEAPON);
1067 break;
1068 case KW_can_use_ring:
1069 GET_FLAG (op, FLAG_USE_RING);
1070 break;
1071 case KW_has_ready_bow:
1072 GET_FLAG (op, FLAG_READY_BOW);
1073 break;
1074 case KW_xrays:
1075 GET_FLAG (op, FLAG_XRAYS);
1076 break;
1077 case KW_is_floor:
1078 GET_FLAG (op, FLAG_IS_FLOOR);
1079 break;
1080 case KW_lifesave:
1081 GET_FLAG (op, FLAG_LIFESAVE);
1082 break;
1083 case KW_no_strength:
1084 GET_FLAG (op, FLAG_NO_STRENGTH);
1085 break;
1086 case KW_sleep:
1087 GET_FLAG (op, FLAG_SLEEP);
1088 break;
1089 case KW_stand_still:
1090 GET_FLAG (op, FLAG_STAND_STILL);
1091 break;
1092 case KW_random_move:
1093 GET_FLAG (op, FLAG_RANDOM_MOVE);
1094 break;
1095 case KW_only_attack:
1096 GET_FLAG (op, FLAG_ONLY_ATTACK);
1097 break;
1098 case KW_activate_on_push:
1099 GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH);
1100 break;
1101 case KW_activate_on_release:
1102 GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE);
1103 break;
1104 case KW_confused:
1105 GET_FLAG (op, FLAG_CONFUSED);
1106 break;
1107 case KW_stealth:
1108 GET_FLAG (op, FLAG_STEALTH);
1109 break;
1110 case KW_cursed:
1111 GET_FLAG (op, FLAG_CURSED);
1112 break;
1113 case KW_damned:
1114 GET_FLAG (op, FLAG_DAMNED);
1115 break;
1116 case KW_see_anywhere:
1117 GET_FLAG (op, FLAG_SEE_ANYWHERE);
1118 break;
1119 case KW_known_magical:
1120 GET_FLAG (op, FLAG_KNOWN_MAGICAL);
1121 break;
1122 case KW_known_cursed:
1123 GET_FLAG (op, FLAG_KNOWN_CURSED);
1124 break;
1125 case KW_can_use_skill:
1126 GET_FLAG (op, FLAG_CAN_USE_SKILL);
1127 break;
1128 case KW_been_applied:
1129 GET_FLAG (op, FLAG_BEEN_APPLIED);
1130 break;
1131 case KW_has_ready_scroll:
1132 GET_FLAG (op, FLAG_READY_SCROLL);
1133 break;
1134 case KW_can_use_rod:
1135 GET_FLAG (op, FLAG_USE_ROD);
1136 break;
1137 case KW_can_use_horn:
1138 GET_FLAG (op, FLAG_USE_HORN);
1139 break;
1140 case KW_unique:
1141 GET_FLAG (op, FLAG_UNIQUE);
1142 break;
1143 case KW_make_invisible:
1144 GET_FLAG (op, FLAG_MAKE_INVIS);
1145 break;
1146 case KW_inv_locked:
1147 GET_FLAG (op, FLAG_INV_LOCKED);
1148 break;
1149 case KW_is_wooded:
1150 GET_FLAG (op, FLAG_IS_WOODED);
1151 break;
1152 case KW_is_hilly:
1153 GET_FLAG (op, FLAG_IS_HILLY);
1154 break;
1155 case KW_is_water:
1156 GET_FLAG (op, FLAG_IS_WATER);
1157 break;
1158 case KW_has_ready_skill:
1159 GET_FLAG (op, FLAG_READY_SKILL);
1160 break;
1161 case KW_has_ready_weapon:
1162 GET_FLAG (op, FLAG_READY_WEAPON);
1163 break;
1164 case KW_no_skill_ident:
1165 GET_FLAG (op, FLAG_NO_SKILL_IDENT);
1166 break;
1167 case KW_is_blind:
1168 GET_FLAG (op, FLAG_BLIND);
1169 break;
1170 case KW_can_see_in_dark:
1171 GET_FLAG (op, FLAG_SEE_IN_DARK);
1172 break;
1173 case KW_is_cauldron:
1174 GET_FLAG (op, FLAG_IS_CAULDRON);
1175 break;
1176 case KW_no_steal:
1177 GET_FLAG (op, FLAG_NO_STEAL);
1178 break;
1179 case KW_one_hit:
1180 GET_FLAG (op, FLAG_ONE_HIT);
1181 break;
1182 case KW_berserk:
1183 GET_FLAG (op, FLAG_BERSERK);
1184 break;
1185 case KW_is_buildable:
1186 GET_FLAG (op, FLAG_IS_BUILDABLE);
1187 break;
1188
1189 case KW_armour:
1190 thawer.get (op->resist[ATNR_PHYSICAL]);
1191 break;
1192 case KW_resist_physical:
1193 thawer.get (op->resist[ATNR_PHYSICAL]);
1194 break;
1195 case KW_resist_magic:
1196 thawer.get (op->resist[ATNR_MAGIC]);
1197 break;
1198 case KW_resist_fire:
1199 thawer.get (op->resist[ATNR_FIRE]);
1200 break;
1201 case KW_resist_electricity:
1202 thawer.get (op->resist[ATNR_ELECTRICITY]);
1203 break;
1204 case KW_resist_cold:
1205 thawer.get (op->resist[ATNR_COLD]);
1206 break;
1207 case KW_resist_confusion:
1208 thawer.get (op->resist[ATNR_CONFUSION]);
1209 break;
1210 case KW_resist_acid:
1211 thawer.get (op->resist[ATNR_ACID]);
1212 break;
1213 case KW_resist_drain:
1214 thawer.get (op->resist[ATNR_DRAIN]);
1215 break;
1216 case KW_resist_weaponmagic:
1217 thawer.get (op->resist[ATNR_WEAPONMAGIC]);
1218 break;
1219 case KW_resist_ghosthit:
1220 thawer.get (op->resist[ATNR_GHOSTHIT]);
1221 break;
1222 case KW_resist_poison:
1223 thawer.get (op->resist[ATNR_POISON]);
1224 break;
1225 case KW_resist_slow:
1226 thawer.get (op->resist[ATNR_SLOW]);
1227 break;
1228 case KW_resist_paralyze:
1229 thawer.get (op->resist[ATNR_PARALYZE]);
1230 break;
1231 case KW_resist_turn_undead:
1232 thawer.get (op->resist[ATNR_TURN_UNDEAD]);
1233 break;
1234 case KW_resist_fear:
1235 thawer.get (op->resist[ATNR_FEAR]);
1236 break;
1237 case KW_resist_cancellation:
1238 thawer.get (op->resist[ATNR_CANCELLATION]);
1239 break;
1240 case KW_resist_deplete:
1241 thawer.get (op->resist[ATNR_DEPLETE]);
1242 break;
1243 case KW_resist_death:
1244 thawer.get (op->resist[ATNR_DEATH]);
1245 break;
1246 case KW_resist_chaos:
1247 thawer.get (op->resist[ATNR_CHAOS]);
1248 break;
1249 case KW_resist_counterspell:
1250 thawer.get (op->resist[ATNR_COUNTERSPELL]);
1251 break;
1252 case KW_resist_godpower:
1253 thawer.get (op->resist[ATNR_GODPOWER]);
1254 break;
1255 case KW_resist_holyword:
1256 thawer.get (op->resist[ATNR_HOLYWORD]);
1257 break;
1258 case KW_resist_blind:
1259 thawer.get (op->resist[ATNR_BLIND]);
1260 break;
1261 case KW_resist_internal:
1262 thawer.get (op->resist[ATNR_INTERNAL]);
1263 break;
1264 case KW_resist_life_stealing:
1265 thawer.get (op->resist[ATNR_LIFE_STEALING]);
1266 break;
1267 case KW_resist_disease:
1268 thawer.get (op->resist[ATNR_DISEASE]);
1269 break;
1270
1271 case KW_luck:
1272 thawer.get (op->stats.luck);
1273 break;
1274 case KW_run_away:
1275 thawer.get (op->run_away);
1276 break;
1277 case KW_pick_up:
1278 thawer.get (op->pick_up);
1279 break;
1280 case KW_item_power:
1281 thawer.get (op->item_power);
1282 break;
1283 case KW_gen_sp_armour:
1284 thawer.get (op->gen_sp_armour);
1285 break;
1286 case KW_anim_speed:
1287 thawer.get (op->anim_speed);
1288 break;
1289 case KW_container:
1290 thawer.get (op->weight_limit);
1291 break;
1292 case KW_will_apply:
1293 thawer.get (op->will_apply);
1294 break;
1295 case KW_attack_movement:
1296 thawer.get (op->attack_movement);
1297 break;
1298 case KW_move_state:
1299 thawer.get (op->move_status);
1300 break;
1301 case KW_expmul:
1302 thawer.get (op->expmul);
1303 break;
1304 case KW_glow_radius:
1305 thawer.get (op->glow_radius);
1306 break;
1307 case KW_weapontype:
1308 thawer.get (op->weapontype);
1309 break;
1310 case KW_tooltype:
1311 thawer.get (op->tooltype);
1312 break;
1313 case KW_casting_time:
1314 thawer.get (op->casting_time);
1315 break;
1316 case KW_elevation:
1317 thawer.get (op->elevation);
1318 break;
1319 case KW_smoothlevel:
1320 thawer.get (op->smoothlevel);
1321 break;
1322 case KW_client_type:
1323 thawer.get (op->client_type);
1324 break;
1325 case KW_duration:
1326 thawer.get (op->duration);
1327 break;
1328 case KW_range:
1329 thawer.get (op->range);
1330 break;
1331 case KW_range_modifier:
1332 thawer.get (op->range_modifier);
1333 break;
1334 case KW_dam_modifier:
1335 thawer.get (op->dam_modifier);
1336 break;
1337 case KW_duration_modifier:
1338 thawer.get (op->duration_modifier);
1339 break;
1340
1341 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
1342 //TODO: parse from other include files
1343 case KW_body_range:
1344 thawer.get (op->body_info[0]);
1345 break;
1346 case KW_body_arm:
1347 thawer.get (op->body_info[1]);
1348 break;
1349 case KW_body_torso:
1350 thawer.get (op->body_info[2]);
1351 break;
1352 case KW_body_head:
1353 thawer.get (op->body_info[3]);
1354 break;
1355 case KW_body_neck:
1356 thawer.get (op->body_info[4]);
1357 break;
1358 case KW_body_skill:
1359 thawer.get (op->body_info[5]);
1360 break;
1361 case KW_body_finger:
1362 thawer.get (op->body_info[6]);
1363 break;
1364 case KW_body_shoulder:
1365 thawer.get (op->body_info[7]);
1366 break;
1367 case KW_body_foot:
1368 thawer.get (op->body_info[8]);
1369 break;
1370 case KW_body_hand:
1371 thawer.get (op->body_info[9]);
1372 break;
1373 case KW_body_wrist:
1374 thawer.get (op->body_info[10]);
1375 break;
1376 case KW_body_waist:
1377 thawer.get (op->body_info[11]);
1378 break;
1379 case KW_can_apply:
1380 break;
1381
1382 case KW_connected:
1383 add_button_link (op, op->map, thawer.get_sint32 ());
1384 break;
1385
1386 case KW_randomitems:
1387 op->randomitems = find_treasurelist (thawer.get_str ());
1388 break; 1021 break;
1389 1022
1390 case KW_msg: 1023 case KW_msg:
1024 f.get_ml (KW_endmsg, msg);
1025 break;
1026
1027 case KW_lore:
1028 f.get_ml (KW_endlore, lore);
1029 break;
1030
1031 case KW_editable:
1032 case KW_editor_folder:
1033 break;
1034
1035 case KW_end:
1036 if (!loading_arch)
1037 instantiate ();
1038
1039 f.next ();
1040 return true;
1041
1042 case KW_ERROR:
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
1391 { 1045 {
1392 thawer.get_ml (KW_endmsg, op->msg); 1046 key_value *kv = new key_value;
1393 //TODO: allow longer messages 1047
1394 if (strlen (op->msg) >= HUGE_BUF) 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
1395 { 1055 {
1396 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 1056 while (last_kv->next)
1397 op->msg = "ERROR, please report: string too long, winged.\n"; 1057 last_kv = last_kv->next;
1058
1059 last_kv->next = kv;
1060 last_kv = kv;
1398 } 1061 }
1399 } 1062 }
1400 break; 1063 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1401
1402 case KW_lore:
1403 {
1404 shstr msgbuf;
1405
1406 thawer.get_ml (KW_endlore, op->lore);
1407 //TODO: allow longer messages
1408 /* Just print a warning so we can be reasonably safe
1409 * about not overflowing the buffer.
1410 */
1411 if (strlen (op->lore) > (HUGE_BUF / 2))
1412 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1413 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1414 }
1415 break;
1416
1417 case KW_editable:
1418 case KW_editor_folder:
1419 break;
1420
1421 case KW_More: // uppercase alias
1422 case KW_more:
1423 /* We need to record that this is a multipart object,
1424 * so the calling function can glue things back together
1425 */
1426 ismore = 1;
1427 break;
1428
1429 case KW_end:
1430 check_loaded_object (op);
1431
1432 if (!arch_init)
1433 op->instantiate ();
1434
1435 return ismore ? LL_MORE : LL_NORMAL;
1436
1437 case KW_EOF:
1438 return LL_EOF;
1439
1440 case KW_ERROR:
1441 set_ob_key_value (op, thawer.line, thawer.last_value, true);
1442 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D
1443
1444 //TODO: skip line, ugly, factor parsing better
1445 if (thawer.last_value)
1446 thawer.line = thawer.last_value;
1447
1448 thawer.line += strlen (thawer.line) + 1;
1449
1450 break; 1064 break;
1451 1065
1452 default: 1066 default:
1453 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;
1454 break; 1069 break;
1455 } 1070 }
1071
1072 f.next ();
1456 } 1073 }
1457} 1074}
1458 1075
1459/* 1076object *
1460 * Loads an object from the given file-pointer. 1077object::read (object_thawer &f, maptile *map)
1461 * Variables will be read and parsed and patched into the object
1462 * until the string "end" is reached, or the end of the file.
1463 *
1464 * bufstat is used to determine various file attributes:
1465 * LO_REPATE (0): We are reading from the same buffer as the last call.
1466 * LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions
1467 * will also be reading from this (treasure file, artifacts.)
1468 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1469 * be reset.
1470 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1471 *
1472 */
1473
1474int
1475load_object (object_thawer & fp, object *op, int map_flags)
1476{ 1078{
1477 return parse_object (op, fp, map_flags); 1079 assert (f.kw == KW_arch);
1080
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;
1478} 1106}
1479
1480 1107
1481/* 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
1482 * as appropriate in op. 1109 * as appropriate in op.
1483 * 1110 *
1484 * This function appears to be used in only 2 places - in crossedit to 1111 * This function appears to be used in only 2 places - in crossedit to
1485 * override values and in c_wiz to mutate values. 1112 * override values and in c_wiz to mutate values.
1486 */ 1113 */
1487int 1114int
1488set_variable (object *op, char *buf) 1115set_variable (object *op, char *buf)
1489{ 1116{
1490 return 0; 1117 object_thawer f (buf, (AV *)0);
1491#if 0
1492 int retval;
1493 object_thawer thawer (0);
1494 1118
1495 strcpy (msgbuf, ""); 1119 return op->parse_kv (f);
1496 strcpy (lorebuf, "");
1497 retval = parse_object (op, thawer, 0);
1498 yy_switch_to_buffer (yycurbuf);
1499 yy_delete_buffer (yybufstate);
1500 yy_pop_state ();
1501 return retval;
1502#endif
1503} 1120}
1504 1121
1505/* This array equates the FLAG_ values with the V_ values. Use -1 to 1122// compare *op against *arch and output differences
1506 * put gaps in the array that should not be processed. 1123static void
1507 * The order matches the order of the define values in 'define.h'. 1124write_diff (object_freezer &f, object *op, object *arch)
1508 */
1509
1510/* This is a list of pointers that correspond to the FLAG_.. values.
1511 * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
1512 * the 15'th element of this array should match that name.
1513 * If an entry is NULL, that is a flag not to loaded/saved.
1514 */
1515static const char *const flag_names[NUM_FLAGS + 1] = {
1516 "alive", "wiz", NULL, NULL, "was_wiz", "applied", "unpaid",
1517 "can_use_shield", "no_pick", NULL /* walk_on */ , NULL /* no_pass */ , /* 10 */
1518 "is_animated", NULL /* slow_move */ ,
1519 NULL /* flying */ , "monster", "friendly", "generator",
1520 "is_thrown", "auto_apply", "treasure", "player sold", /* 20 */
1521 "see_invisible", "can_roll", "overlay_floor",
1522 "is_turnable", NULL /* walk_off */ , NULL /* fly_on */ ,
1523 NULL /*fly_off */ , "is_used_up", "identified", "reflecting", /* 30 */
1524 "changing", "splitting", "hitback", "startequip",
1525 "blocksview", "undead", "scared", "unaggressive",
1526 "reflect_missile", "reflect_spell", /* 40 */
1527 "no_magic", "no_fix_player", "is_lightable", "tear_down",
1528 "run_away", NULL /*pass_thru */ , NULL /*can_pass_thru */ ,
1529 "pick_up", "unique", "no_drop", /* 50 */
1530 NULL /* wizcast */ , "can_cast_spell", "can_use_scroll", "can_use_range",
1531 "can_use_bow", "can_use_armour", "can_use_weapon",
1532 "can_use_ring", "has_ready_range", "has_ready_bow", /* 60 */
1533 "xrays", NULL, "is_floor", "lifesave", "no_strength", "sleep",
1534 "stand_still", "random_move", "only_attack", "confused", /* 70 */
1535 "stealth", NULL, NULL, "cursed", "damned",
1536 "see_anywhere", "known_magical", "known_cursed",
1537 "can_use_skill", "been_applied", /* 80 */
1538 "has_ready_scroll", "can_use_rod", NULL,
1539 "can_use_horn", "make_invisible", "inv_locked", "is_wooded",
1540 "is_hilly", "has_ready_skill", "has_ready_weapon", /* 90 */
1541 "no_skill_ident", "is_blind", "can_see_in_dark", "is_cauldron",
1542 "is_dust", "no_steal", "one_hit", NULL, "berserk", "neutral", /* 100 */
1543 "no_attack", "no_damage", NULL, NULL, "activate_on_push",
1544 "activate_on_release", "is_water", "use_content_on_gen", NULL, "is_buildable", /* 110 */
1545 NULL
1546};
1547
1548
1549/*
1550 * Initialises the array of variable-names. Needed before any
1551 * objects can be loaded. Called by init_library().
1552 */
1553
1554void
1555init_vars ()
1556{ 1125{
1557} 1126 static const keyword resist_save[NROFATTACKS] = {
1127# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1128# include "attackinc.h"
1129# undef def
1130 };
1558 1131
1559/* This returns a string of the integer movement type */ 1132 /* This is a list of keywords that correspond to the FLAG_.. values.
1560#if 0 1133 * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
1561// unused function 1134 * the 15'th element of this array should match that name.
1562static char * 1135 * If an entry is NULL, that is a flag not to loaded/saved.
1563get_string_move_type (MoveType mt)
1564{
1565 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1566 int i, all_count = 0, count;
1567
1568 strcpy (retbuf, "");
1569 strcpy (retbuf_all, " all");
1570
1571 /* Quick check, and probably fairly common */
1572 if (mt == MOVE_ALL)
1573 return retbuf_all + 1;
1574 if (mt == 0)
1575 {
1576 strcpy (retbuf, "0");
1577 return retbuf;
1578 }
1579
1580 /* We basically slide the bits down. Why look at MOVE_ALL?
1581 * because we may want to return a string like 'all -swim',
1582 * and if we just looked at mt, we couldn't get that.
1583 */ 1136 */
1584 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++) 1137 static const keyword flag_names [NUM_FLAGS] = {
1138 KW_alive,
1139 KW_NULL,
1140 KW_NULL,
1141 KW_NULL,
1142 KW_NULL,
1143 KW_applied,
1144 KW_unpaid,
1145 KW_can_use_shield,
1146 KW_no_pick,
1147 KW_NULL, // walk_on
1148 /* 10 */
1149 KW_NULL, // no_pass
1150 KW_is_animated,
1151 KW_NULL, // slow_move
1152 KW_NULL, // flying
1153 KW_monster,
1154 KW_friendly,
1155 KW_generator,
1156 KW_is_thrown,
1157 KW_auto_apply,
1158 KW_treasure_env,
1159 /* 20 */
1160 KW_player_sold,
1161 KW_see_invisible,
1162 KW_can_roll,
1163 KW_overlay_floor,
1164 KW_is_turnable,
1165 KW_NULL, // walk_off
1166 KW_NULL, // fly_on
1167 KW_NULL, // fly_off
1168 KW_is_used_up,
1169 KW_identified,
1170 /* 30 */
1171 KW_reflecting,
1172 KW_changing,
1173 KW_splitting,
1174 KW_hitback,
1175 KW_startequip,
1176 KW_blocksview,
1177 KW_undead,
1178 KW_scared,
1179 KW_unaggressive,
1180 KW_reflect_missile,
1181 /* 40 */
1182 KW_reflect_spell,
1183 KW_no_magic,
1184 KW_NULL,
1185 KW_is_lightable,
1186 KW_tear_down,
1187 KW_run_away,
1188 KW_NULL, // pass_thru
1189 KW_NULL, // an_pass_thru
1190 KW_pick_up,
1191 KW_unique,
1192 /* 50 */
1193 KW_no_drop,
1194 KW_NULL, // wizcast
1195 KW_can_cast_spell,
1196 KW_can_use_scroll,
1197 KW_can_use_range,
1198 KW_can_use_bow,
1199 KW_can_use_armour,
1200 KW_can_use_weapon,
1201 KW_can_use_ring,
1202 KW_has_ready_range,
1203 /* 60 */
1204 KW_has_ready_bow,
1205 KW_xrays,
1206 KW_NULL,
1207 KW_is_floor,
1208 KW_lifesave,
1209 KW_no_strength,
1210 KW_sleep,
1211 KW_stand_still,
1212 KW_random_move,
1213 KW_only_attack,
1214 /* 70 */
1215 KW_confused,
1216 KW_stealth,
1217 KW_NULL,
1218 KW_NULL,
1219 KW_cursed,
1220 KW_damned,
1221 KW_see_anywhere,
1222 KW_known_magical,
1223 KW_known_cursed,
1224 KW_can_use_skill,
1225 /* 80 */
1226 KW_been_applied,
1227 KW_has_ready_scroll,
1228 KW_can_use_rod,
1229 KW_precious,
1230 KW_can_use_horn,
1231 KW_make_invisible,
1232 KW_inv_locked,
1233 KW_is_wooded,
1234 KW_is_hilly,
1235 KW_has_ready_skill,
1236 /* 90 */
1237 KW_has_ready_weapon,
1238 KW_no_skill_ident,
1239 KW_is_blind,
1240 KW_can_see_in_dark,
1241 KW_is_cauldron,
1242 KW_NULL,
1243 KW_no_steal,
1244 KW_one_hit,
1245 KW_NULL,
1246 KW_berserk,
1247 /* 100 */
1248 KW_neutral,
1249 KW_no_attack,
1250 KW_no_damage,
1251 KW_obj_original,
1252 KW_random_speed,
1253 KW_activate_on_push,
1254 KW_activate_on_release,
1255 KW_is_water,
1256 KW_use_content_on_gen,
1257 KW_NULL,
1258 /* 110 */
1259 KW_is_buildable,
1260 KW_destroy_on_death,
1261 KW_NULL,
1262 };
1263
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
1585 { 1267 {
1586 if (mt & (1 << count)) 1268 flagmask ()
1587 {
1588 strcat (retbuf, " ");
1589 strcat (retbuf, move_name[count]);
1590 }
1591 else
1592 {
1593 strcat (retbuf_all, " -");
1594 strcat (retbuf_all, move_name[count]);
1595 all_count++;
1596 }
1597 } 1269 {
1598 /* Basically, if there is a single negation, return it, eg 1270 for (int i = 0; i < NUM_FLAGS; i++)
1599 * 'all -swim'. But more than that, just return the 1271 if (flag_names [i])
1600 * enumerated values. It doesn't make sense to return 1272 set (i);
1601 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim' 1273 }
1602 */ 1274 } flagmask;
1603 if (all_count <= 1)
1604 return retbuf_all + 1;
1605 else
1606 return retbuf + 1;
1607}
1608#endif
1609
1610// compare *op against *tmp and output differences
1611void
1612put (object_freezer &f, object *op, object *tmp)
1613{
1614 int i;
1615 1275
1616 /* 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
1617 * keys that match field names will be overwritten by the loader. 1277 * keys that match field names will be overwritten by the loader.
1618 */ 1278 */
1619 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)
1620 { 1280 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1621 /* Find the field in the opposing member. */ 1281 f.put (kv->key, kv->value);
1622 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1623 1282
1624 /* If there's no partnering field, or it's got a different value, save our field. */ 1283 if (op->uuid)
1625 if (arch_field == NULL || my_field->value != arch_field->value)
1626 f.put (my_field->key, my_field->value);
1627 } 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;
1628 1288
1629 /* We don't need to worry about the arch's extra fields - they 1289 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1630 * will get taken care of the copy_object function. 1290 ptr += sizeof ("uuid ") - 1;
1631 */ 1291 ptr = op->uuid.append (ptr);
1292 *ptr++ = '\n';
1632 1293
1633 { 1294 f.alloc (ptr - cur);
1634 char uids[64];
1635 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1636 f.put (KW_uuid, (const char *)uids);
1637 } 1295 }
1638 1296
1639#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)
1640#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);
1641 1306
1642 CMP_OUT (name); 1307 CMP_OUT (name);
1643 CMP_OUT (name_pl); 1308 CMP_OUT (name_pl);
1644 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
1645 CMP_OUT (title); 1329 CMP_OUT (title);
1646 CMP_OUT (race); 1330 CMP_OUT (race);
1647 CMP_OUT (slaying); 1331 CMP_OUT (slaying);
1332 CMP_OUT (skill);
1648 1333
1649 if (op->msg != tmp->msg) 1334 CMP_OUT (tag);
1650 f.put (KW_msg, KW_endmsg, op->msg); 1335 CMP_OUT (custom_name);
1651 if (op->lore != tmp->lore) 1336
1652 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
1653 1342
1654 CMP_OUT (other_arch); 1343 CMP_OUT (other_arch);
1655 CMP_OUT (face);
1656 1344
1657 if (!op->face || !op->face->name) 1345 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1658 printf ("ERRFACE<%s,%s, face %p,%p, fname%s>\n", &tmp->name, &op->name, tmp->face, op->face, op->face ? &op->face->name : "<noface>"); //D 1346 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1659 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
1660 if (op->animation_id != tmp->animation_id) 1352 if (op->animation_id != arch->animation_id)
1661 if (op->animation_id) 1353 if (op->has_anim ())
1354 f.put (KW(animation), op->anim ().name);
1355 else
1662 { 1356 {
1663 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1357 f.put (KW(animation));
1664 1358 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1665 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1666 f.put (KW_is_animated, (sint32) 0);
1667 } 1359 }
1668 else
1669 f.put (KW_animation, (const char *) 0);
1670 1360
1671 CMP_OUT2 (str, stats.Str); 1361 CMP_OUT2 (str, stats.Str);
1672 CMP_OUT2 (dex, stats.Dex); 1362 CMP_OUT2 (dex, stats.Dex);
1673 CMP_OUT2 (con, stats.Con); 1363 CMP_OUT2 (con, stats.Con);
1674 CMP_OUT2 (wis, stats.Wis); 1364 CMP_OUT2 (wis, stats.Wis);
… …
1683 CMP_OUT2 (grace, stats.grace); 1373 CMP_OUT2 (grace, stats.grace);
1684 CMP_OUT2 (maxgrace, stats.maxgrace); 1374 CMP_OUT2 (maxgrace, stats.maxgrace);
1685 CMP_OUT2 (exp, stats.exp); 1375 CMP_OUT2 (exp, stats.exp);
1686 1376
1687 CMP_OUT (perm_exp); 1377 CMP_OUT (perm_exp);
1688 CMP_OUT (expmul); 1378 //CMP_OUT (expmul);
1689 1379
1690 CMP_OUT2 (food, stats.food); 1380 CMP_OUT2 (food, stats.food);
1691 CMP_OUT2 (dam, stats.dam); 1381 CMP_OUT2 (dam, stats.dam);
1692 CMP_OUT2 (luck, stats.luck); 1382 CMP_OUT2 (luck, stats.luck);
1693 CMP_OUT2 (wc, stats.wc); 1383 CMP_OUT2 (wc, stats.wc);
1694 CMP_OUT2 (ac, stats.ac); 1384 CMP_OUT2 (ac, stats.ac);
1695 1385
1696 CMP_OUT (x);
1697 CMP_OUT (y);
1698 CMP_OUT (speed);
1699 CMP_OUT (speed_left);
1700 CMP_OUT2 (move_state, move_status); 1386 CMP_OUT2 (move_state, move_status);
1701 CMP_OUT (attack_movement); 1387 CMP_OUT (attack_movement);
1702 CMP_OUT (nrof); 1388 CMP_OUT (nrof);
1703 CMP_OUT (level); 1389 CMP_OUT (level);
1704 CMP_OUT (direction);
1705 CMP_OUT (type);
1706 CMP_OUT (subtype);
1707 CMP_OUT (attacktype); 1390 CMP_OUT (attacktype);
1708 1391
1392 // using memcmp here seems to be a loss - is gcc vectorising?
1709 for (i = 0; i < NROFATTACKS; i++) 1393 for (int i = 0; i < NROFATTACKS; i++)
1710 if (op->resist[i] != tmp->resist[i]) 1394 if (expect_false (op->resist[i] != arch->resist[i]))
1711 f.put (resist_save[i], op->resist[i]); 1395 f.put (resist_save[i], op->resist[i]);
1712 1396
1713 CMP_OUT (path_attuned); 1397 CMP_OUT (path_attuned);
1714 CMP_OUT (path_repelled); 1398 CMP_OUT (path_repelled);
1715 CMP_OUT (path_denied); 1399 CMP_OUT (path_denied);
1716 CMP_OUT (material); 1400
1717 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
1718 CMP_OUT (value); 1405 CMP_OUT (value);
1719 CMP_OUT (carrying); 1406 CMP_OUT (carrying);
1720 CMP_OUT (weight); 1407 CMP_OUT (weight);
1721 CMP_OUT (invisible); 1408 CMP_OUT (invisible);
1722 CMP_OUT (state); 1409 CMP_OUT (state);
… …
1725 CMP_OUT (last_sp); 1412 CMP_OUT (last_sp);
1726 CMP_OUT (last_grace); 1413 CMP_OUT (last_grace);
1727 CMP_OUT (last_eat); 1414 CMP_OUT (last_eat);
1728 CMP_OUT (glow_radius); 1415 CMP_OUT (glow_radius);
1729 1416
1730 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 ()))
1731 f.put (KW_connected, i); 1419 f.put (KW(connected), ol->id);
1732 1420
1733 CMP_OUT (randomitems); 1421 CMP_OUT (randomitems);
1422
1734 CMP_OUT2 (container, weight_limit); 1423 CMP_OUT2 (container, weight_limit);
1735 1424
1736 CMP_OUT (run_away); 1425 CMP_OUT (run_away);
1737 CMP_OUT (pick_up); 1426 CMP_OUT (pick_up);
1738 CMP_OUT (will_apply); 1427 CMP_OUT (will_apply);
1739 CMP_OUT (smoothlevel); 1428 CMP_OUT (smoothlevel);
1740 CMP_OUT (weapontype); 1429 CMP_OUT (weapontype);
1741 CMP_OUT (tooltype);
1742 CMP_OUT (elevation);
1743 CMP_OUT (client_type); 1430 CMP_OUT (client_type);
1744 CMP_OUT (item_power); 1431 CMP_OUT (item_power);
1745 CMP_OUT (duration); 1432 CMP_OUT (duration);
1746 CMP_OUT (range); 1433 CMP_OUT (range);
1747 CMP_OUT (range_modifier); 1434 CMP_OUT (range_modifier);
… …
1755 CMP_OUT (move_on); 1442 CMP_OUT (move_on);
1756 CMP_OUT (move_off); 1443 CMP_OUT (move_off);
1757 CMP_OUT (move_slow); 1444 CMP_OUT (move_slow);
1758 CMP_OUT (move_slow_penalty); 1445 CMP_OUT (move_slow_penalty);
1759 1446
1760 if (!COMPARE_FLAGS (op, tmp)) 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 ()))
1761 for (i = 0; i <= NUM_FLAGS; i++) 1457 for (int i = 0; i < NUM_FLAGS; i++)
1762 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1458 if (expect_false (diff [i]))
1763 f.put (flag_names[i], QUERY_FLAG (op, 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
1764 1465
1765 /* Save body locations */ 1466 // save body locations. gcc's memcmp does an abysmal job when used
1766 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1467 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1767 if (op->body_info[i] != tmp->body_info[i]) 1468 if (expect_false (op->slot[i].info != arch->slot[i].info))
1768 f.put (body_locations[i].save_name, op->body_info[i]); 1469 f.put (body_locations[i].save_name, op->slot[i].info);
1769} 1470}
1770 1471
1771/* 1472/*
1772 * Dumps all variables in an object to a file. 1473 * Dumps all variables in an object to a file.
1773 * 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,
1774 * 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.
1775 * If bit 1 of flag is set, don't remove the object after save. As of now,
1776 * all of the callers are setting this.
1777 */ 1476 */
1778 1477bool
1779void 1478object::write (object_freezer &f)
1780save_object (object_freezer & fp, object *op, int flag)
1781{ 1479{
1782 archetype *at; 1480 if (expect_false (is_arch ()))
1783 object *tmp, *old; 1481 {
1784 1482 f.put (KW(object), arch->archname);
1785 /* Even if the object does have an owner, it would seem that we should 1483 write_diff (f, this, archetype::empty);
1786 * still save it. 1484 }
1787 */
1788 if (op->owner)
1789 return;
1790
1791 /* If it is unpaid and we don't want to save those, just return. */
1792 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID)))
1793 return;
1794
1795 if ((at = op->arch) == NULL)
1796 at = empty_archetype;
1797
1798 fp.put (KW_arch, at->name);
1799
1800 put (fp, op, &at->clone);
1801
1802 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1803
1804 old = NULL;
1805
1806 if (flag & 2)
1807 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
1808 save_object (fp, tmp, flag);
1809 else 1485 else
1810 /* Slightly different logic because tmp/op will be removed by
1811 * the save_object we call. So we just keep looking at op->inv
1812 * until there is nothing left. In theory, the variable old
1813 * should not be needed, as recursive loops shouldn't happen.
1814 */
1815 while ((tmp = op->inv) != NULL)
1816 { 1486 {
1817 if (old == tmp) 1487 f.put (KW(arch), arch->archname);
1818 { 1488 write_diff (f, this, arch);
1819 LOG (llevError, " Recursive loop in inventory\n");
1820 break;
1821 }
1822
1823 save_object (fp, tmp, flag);
1824 old = tmp;
1825 } 1489 }
1826 1490
1827 if (!(flag & 2)) 1491 for (object *tmp = inv; tmp; tmp = tmp->below)
1828 { 1492 tmp->write (f);
1829 remove_ob (op);
1830 free_object (op);
1831 }
1832 1493
1833 fp.put (op); 1494 f.put (this);
1834 fprintf (fp, "end\n"); 1495 f.put (KW(end));
1496
1497 return true;
1835} 1498}
1836 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 switch (f.kw)
1512 {
1513 case KW_region:
1514 if (!region::read (f))
1515 return false;
1516 break;
1517
1518 case KW_treasure:
1519 case KW_treasureone:
1520 if (!treasurelist::read (f))
1521 return false;
1522 break;
1523
1524 case KW_object:
1525 if (!archetype::read (f))
1526 return false;
1527 break;
1528
1529 case KW_EOF:
1530 return true;
1531
1532 default:
1533 if (!f.parse_error ("resource file"))
1534 return false;
1535
1536 f.next ();
1537 break;
1538 }
1539 }
1540}
1541

Diff Legend

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