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.13 by root, Mon Sep 11 20:28:37 2006 UTC vs.
Revision 1.146 by root, Wed Nov 11 04:45:22 2009 UTC

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

Diff Legend

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