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.48 by root, Fri Jan 19 17:50:10 2007 UTC vs.
Revision 1.142 by root, Mon Nov 9 17:39:05 2009 UTC

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

Diff Legend

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