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.18 by root, Fri Sep 15 00:31:36 2006 UTC vs.
Revision 1.117 by elmex, Sun Jun 15 20:29:56 2008 UTC

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

Diff Legend

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