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

Diff Legend

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