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.61 by root, Sat Feb 17 01:58:54 2007 UTC vs.
Revision 1.119 by elmex, Mon Sep 1 22:29:17 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 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.
21 * 20 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
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 23
29#include <global.h> 24#include <global.h>
30#include <loader.h> 25#include <loader.h>
31#include <sproto.h> 26#include <sproto.h>
32 27
33///////////////////////////////////////////////////////////////////////////// 28/////////////////////////////////////////////////////////////////////////////
34 29
35/* Maps the MOVE_* values to names */ 30extern archetype *loading_arch;
36static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
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{
260 if (type >= NUM_TYPES)
261 {
262 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ());
263 type = 0;
264 }
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
268 /* We do some specialised handling to handle legacy cases of name_pl. 316 /* We do some specialised handling to handle legacy cases of name_pl.
269 * 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 -
270 * this isn't perfect (things won't be properly pluralised), but works to 318 * this isn't perfect (things won't be properly pluralised), but works to
271 * 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
272 * 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
273 * 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.
274 * Otherwise, what happens is that the the plural name will lose 322 * Otherwise, what happens is that the the plural name will lose
275 * information (appear as just 'hearts' and not 'goblins heart') 323 * information (appear as just 'hearts' and not 'goblins heart')
276 */ 324 */
277 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)
278 op->name_pl = 0; 326 name_pl = 0;
279 327
280 if (!op->name_pl) 328 if (!name_pl)
281 op->name_pl = op->name; 329 name_pl = name;
282 330
283 /* objects now have a materialname. try to patch it in */ 331 /* objects now have a materialname. try to patch it in */
284 if (!(op->is_weapon () && op->level > 0)) 332 if (!(is_weapon () && level > 0))
285 { 333 set_materialname (this, map ? map->difficulty : 5, 0);
286 if (op->map != NULL)
287 set_materialname (op, op->map->difficulty, NULL);
288 else
289 set_materialname (op, 5, NULL);
290 }
291 334
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 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 343 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ());
301 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) ||
302 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 345 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2))
303 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);
304 } 347 }
305 348
306 /* 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
307 * really does for many objects. Need to catch any in maps 350 * really does for many objects. Need to catch any in maps
308 * that may have an old value. 351 * that may have an old value.
309 */ 352 */
310 if (op->type == WEAPON 353 if (type == WEAPON
311 || op->type == ARMOUR || op->type == HELMET 354 || type == ARMOUR || type == HELMET
312 || op->type == SHIELD || op->type == RING 355 || type == SHIELD || type == RING
313 || op->type == BOOTS || op->type == GLOVES 356 || type == BOOTS || type == GLOVES
314 || op->type == AMULET || op->type == GIRDLE 357 || type == AMULET || type == GIRDLE
315 || op->type == BRACERS || op->type == CLOAK) 358 || type == BRACERS || type == CLOAK)
316 { 359 {
317 if (op->last_heal) 360 if (last_heal)
318 { 361 {
319 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 ());
320 op->gen_sp_armour = op->last_heal; 363 gen_sp_armour = last_heal;
321 op->last_heal = 0; 364 last_heal = 0;
322 } 365 }
323 366
324 int ip = calc_item_power (op, 0); 367 int ip = calc_item_power (this, 0);
325 368
326 /* Legacy objects from before item power was in the game */ 369 /* Legacy objects from before item power was in the game */
327 if (!op->item_power && ip) 370 if (!item_power && ip)
328 { 371 {
329 if (ip > 3) 372 if (ip > 3)
330 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);
331 374
332 op->item_power = ip; 375 item_power = ip;
333 } 376 }
334 377
335 /* Check for possibly bogus values. Has to meet both these criteria - 378 /* Check for possibly bogus values. Has to meet both these criteria -
336 * 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
337 * 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.
338 * 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,
339 * but not the second one. 382 * but not the second one.
340 */ 383 */
384#if 0 //TODO
341 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 385 if (ip > 2 * item_power && ip > (item_power + 3))
342 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);
387#endif
343 } 388 }
344 389
345 /* Old spellcasting object - need to load in the appropiate object */ 390 /* Old spellcasting object - need to load in the appropiate object */
346 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || 391 if ((type == ROD
392 || type == WAND
393 || type == SCROLL
394 || type == HORN
395 || type == FIREWALL
347 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 396 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
348 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) 397 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
398 && !inv
399 && !loading_arch
400 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
349 { 401 {
350 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 402 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
351 * in that spell was stored in sp. 403 * in that spell was stored in sp.
352 */ 404 */
405 LOG (llevError, "old spellcasting object found: %s", debug_desc ());
353 object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); 406 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
354 insert_ob_in_ob (tmp, op); 407 insert_ob_in_ob (tmp, this);
355 op->randomitems = NULL; /* So another spell isn't created for this object */ 408 randomitems = 0;
356 } 409 }
357 410
358 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 411 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
359 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) 412 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
360 { 413 {
414 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
361 object *tmp = get_archetype_by_object_name (op->slaying); 415 object *tmp = get_archetype_by_object_name (slaying);
362 insert_ob_in_ob (tmp, op); 416 insert_ob_in_ob (tmp, this);
363 op->randomitems = NULL; /* So another spell isn't created for this object */ 417 randomitems = 0; /* So another spell isn't created for this object */
364 /* without this, value is all screwed up */ 418 /* without this, value is all screwed up */
365 op->value = op->arch->clone.value * op->inv->value; 419 value = arch->value * inv->value;
366 } 420 }
367 421
368 if (QUERY_FLAG (op, FLAG_MONSTER)) 422 if (QUERY_FLAG (this, FLAG_MONSTER))
369 { 423 {
370 if (op->stats.hp > op->stats.maxhp) 424 if (stats.hp > stats.maxhp)
371 { 425 {
372 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 426 LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
373 op->stats.maxhp = op->stats.hp; 427 stats.maxhp = stats.hp;
374 } 428 }
375 429
376 /* The archs just need to be updated for this */ 430 /* The archs just need to be updated for this */
377 if (op->move_type == 0) 431 if (move_type == 0)
378 op->move_type = MOVE_WALK; 432 move_type = MOVE_WALK;
379 } 433 }
380 434
381 if ((QUERY_FLAG (op, FLAG_GENERATOR) && QUERY_FLAG (op, FLAG_CONTENT_ON_GEN)) || op->type == CREATOR || op->type == CONVERTER) 435 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
382 {
383 /* Object will duplicate it's content as part of the 436 /* Object will duplicate it's content as part of the
384 * generation process. To do this, we must flag inventory 437 * generation process. To do this, we must flag inventory
385 * so it remains unevaluated concerning the randomitems and 438 * so it remains unevaluated concerning the randomitems and
386 * the living (a demonlord shouldn't cast from inside generator!) 439 * the living (a demonlord shouldn't cast from inside generator!)
387 */ 440 */
441 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
388 flag_inv (op, FLAG_IS_A_TEMPLATE); 442 flag_inv (this, FLAG_IS_A_TEMPLATE);
389 }
390 443
391 /* Handle player movers. We use move_type for player movers 444 /* Handle player movers. We use move_type for player movers
392 * because they operate on their own time (move_on 445 * because they operate on their own time (move_on
393 * would potentially cause them to be triggered when someone steps 446 * would potentially cause them to be triggered when someone steps
394 * on them). If move_type is set, presume person knows what they 447 * on them). If move_type is set, presume person knows what they
395 * are doing, otherwise, set move_type based on maxhp value. 448 * are doing, otherwise, set move_type based on maxhp value.
396 */ 449 */
397 if (op->type == PLAYERMOVER) 450 if (type == PLAYERMOVER)
398 { 451 {
399 if (!op->move_type) 452 if (!move_type)
400 { 453 {
401 if (op->stats.maxhp) 454 if (stats.maxhp)
402 { 455 {
403 op->move_type = MOVE_ALL; 456 move_type = MOVE_ALL;
404 op->stats.maxhp = 0; 457 stats.maxhp = 0;
405 } 458 }
406 else 459 else
407 op->move_type = MOVE_WALK; 460 move_type = MOVE_WALK;
408 } 461 }
409 } 462 }
410
411} 463}
412 464
413static void 465static void
414set_move (MoveType & mt, const char *str) 466set_move (MoveType &mt, const char *str)
415{ 467{
468 static const struct flagstr {
469 const char *name;
470 MoveType flags;
471 } move_flags[] = {
472 { "walk" , MOVE_WALK },
473 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
474 { "fly_low" , MOVE_FLY_LOW },
475 { "fly_high", MOVE_FLY_HIGH },
476 { "swim" , MOVE_SWIM },
477 { "boat" , MOVE_BOAT },
478 { "ship" , MOVE_SHIP },
479 { "all" , MOVE_ALL },
480 };
481
416 if (!str) 482 if (!str)
417 { 483 {
418 mt = 0; 484 mt = 0;
419 return; 485 return;
420 } 486 }
… …
427 493
428 mt = 0; 494 mt = 0;
429 495
430 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 496 for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
431 { 497 {
432 if (!strcasecmp (str, "all")) 498 bool negate = 0;
433 mt |= MOVE_ALL; 499
434 else 500 if (*str == '-')
435 { 501 {
436 int i, negate = 0; 502 negate = 1;
503 str++;
504 }
437 505
438 if (*str == '-') 506 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f)
507 {
508 if (!strcmp (f->name, str))
439 { 509 {
440 negate = 1;
441 str++;
442 }
443
444 for (i = 0; move_name[i]; i++)
445 {
446 if (!strcasecmp (move_name[i], str))
447 {
448 if (negate) 510 if (negate)
449 mt &= ~(1 << i); 511 mt &= ~f->flags;
450 else
451 mt |= (1 << i);
452
453 break;
454 }
455 }
456
457 if (!move_name[i])
458 {
459 /* fly is a special case - covers both fly_low and
460 * fly_high - since it doesn't match to a specific
461 * single bit, have to special case it.
462 */
463 if (!strcasecmp (str, "flying"))
464 {
465 if (negate)
466 mt &= ~MOVE_FLYING;
467 else
468 mt |= MOVE_FLYING;
469 }
470 else 512 else
471 LOG (llevDebug, "common/loader.l: set_move - unknown move string '%s'\n", str); 513 mt |= f->flags;
514
515 goto next;
472 } 516 }
473 } 517 }
518
519 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
520
521next: ;
474 } 522 }
475} 523}
476 524
477#define GET_FLAG(op,flag) \ 525#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
478 if (f.get_sint32 ()) \
479 SET_FLAG (op, flag); \
480 else \
481 CLEAR_FLAG (op, flag) \
482 526
483bool 527bool
484object::parse_kv (object_thawer &f) 528object::parse_kv (object_thawer &f)
485{ 529{
486 assert (f.kw == KW_object || f.kw == KW_arch);
487
488 if (f.kw == KW_object)
489 f.get (name); // preset name from object name
490
491 f.next ();
492
493 object *op_inv = inv; 530 object *op_inv = inv;
531 key_value *last_kv = key_values;
494 532
495 for (;;) 533 for (;;)
496 { 534 {
497 switch (f.kw) 535 switch (f.kw)
498 { 536 {
499 case KW_uuid: 537 case KW_uuid:
500 if (const char *s = f.get_str ()) 538 if (const char *s = f.get_str ())
501 { 539 if (!uuid.parse (s))
502 unsigned int version;
503 unsigned long long seq;
504
505 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
506 { 540 {
507 uuid.seq = seq; 541 f.parse_warn ("unparseable uuid");
508 break; 542 uuid = UUID::gen ();
509 } 543 }
510 }
511
512 uuid = gen_uuid ();
513 break; 544 break;
514 545
515 case KW_oid: 546 case KW_oid:
516 f.get (this, f.get_sint32 ()); 547 f.get (this, f.get_sint32 ());
517 break; 548 break;
… …
523 554
524 case KW_attach: f.get_ornull (attach); break; 555 case KW_attach: f.get_ornull (attach); break;
525 case KW_skill: f.get_ornull (skill); break; 556 case KW_skill: f.get_ornull (skill); break;
526 case KW_race: f.get_ornull (race); break; 557 case KW_race: f.get_ornull (race); break;
527 case KW_slaying: f.get_ornull (slaying); break; 558 case KW_slaying: f.get_ornull (slaying); break;
559 case KW_tag: f.get_ornull (tag); break;
528 560
529 case KW_arch: 561 case KW_arch:
530 { 562 {
531 object *tmp = object::read (f); 563 object *tmp = object::read (f);
532 tmp->deactivate (); 564 tmp->deactivate ();
… …
534 { 566 {
535 // was: insert_ob_in_ob (tmp, op); 567 // was: insert_ob_in_ob (tmp, op);
536 // but manually adding it can improve map loading times a lot 568 // but manually adding it can improve map loading times a lot
537 // also, appending instead of prepending keeps the 569 // also, appending instead of prepending keeps the
538 // save ordering the same between repeated load/saves. 570 // save ordering the same between repeated load/saves.
571 // and finally we do not want any funny effects
539 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 572 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
540 CLEAR_FLAG (tmp, FLAG_REMOVED); 573 CLEAR_FLAG (tmp, FLAG_REMOVED);
541 574
542 if (!op_inv) 575 if (!op_inv)
543 { 576 {
… …
559 } 592 }
560 } 593 }
561 continue; 594 continue;
562 595
563 case KW_other_arch: 596 case KW_other_arch:
597 if (loading_arch == this)
598 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
599 else
600 {
564 other_arch = archetype::find (f.get_str ()); 601 other_arch = archetype::find (f.get_str ());
602
603 if (!other_arch)
604 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
605 }
606 break;
607
608 case KW_owner:
609 f.delayed_deref (this, owner, f.get_str ());
565 break; 610 break;
566 611
567 case KW_animation: 612 case KW_animation:
568 { 613 {
569 CLEAR_FLAG (this, FLAG_ANIMATE); 614 CLEAR_FLAG (this, FLAG_ANIMATE);
570 animation_id = 0; 615 animation_id = 0;
571 616
572 const char *str = f.get_str (); 617 const char *str = f.get_str ();
573 if (str && (animation_id = find_animation (str))) 618 if (str && (animation_id = find_animation (str)))
574 SET_FLAG (this, FLAG_ANIMATE); 619 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
575 } 620 }
576 break; 621 break;
577 622
578 case KW_last_heal: f.get (last_heal); break; 623 case KW_last_heal: f.get (last_heal); break;
579 case KW_last_sp: f.get (last_sp); break; 624 case KW_last_sp: f.get (last_sp); break;
… …
595 move_slow |= MOVE_WALK; 640 move_slow |= MOVE_WALK;
596 f.get (move_slow_penalty); 641 f.get (move_slow_penalty);
597 break; 642 break;
598 643
599 case KW_face: 644 case KW_face:
600 face = &new_faces[FindFace (f.get_str (), 0)]; 645 face = face_find (f.get_str ());
646 break;
647
648 case KW_sound:
649 sound = sound_find (f.get_str ());
650 if (!sound)
651 f.parse_warn ("sound not found");
652 break;
653
654 case KW_sound_destroy:
655 sound_destroy = sound_find (f.get_str ());
656 if (!sound_destroy)
657 f.parse_warn ("sound not found");
601 break; 658 break;
602 659
603 case KW_x: f.get (x); break; 660 case KW_x: f.get (x); break;
604 case KW_y: f.get (y); break; 661 case KW_y: f.get (y); break;
605 662
… …
732 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 789 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
733 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 790 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
734 791
735 break; 792 break;
736 793
737 case KW_wiz:
738 GET_FLAG (this, FLAG_WIZ);
739 //TODO: move to check_object
740 if (QUERY_FLAG (this, FLAG_WIZ))
741 {
742 SET_FLAG (this, FLAG_WAS_WIZ);
743 SET_FLAG (this, FLAG_WIZPASS);
744 SET_FLAG (this, FLAG_WIZCAST);
745 }
746 else
747 {
748 CLEAR_FLAG (this, FLAG_WIZPASS);
749 CLEAR_FLAG (this, FLAG_WIZCAST);
750 }
751 break;
752
753 case KW_friendly: 794 case KW_friendly:
754 if (f.get_sint32 ()) 795 if (f.get_bool ())
755 if (type != PLAYER) 796 if (type != PLAYER)
756 add_friendly_object (this); 797 add_friendly_object (this);
757 798
758 break; 799 break;
759 800
… …
772 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 813 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
773 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 814 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
774 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 815 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
775 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 816 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
776 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 817 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
818 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
777 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 819 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
778 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 820 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
779 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 821 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
780 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 822 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
781 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 823 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
788 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 830 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
789 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 831 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
790 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 832 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
791 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 833 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
792 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 834 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
793 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
794 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; 835 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
795 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 836 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
796 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 837 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
797 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 838 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
798 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 839 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
… …
841 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break; 882 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
842 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break; 883 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
843 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 884 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
844 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 885 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
845 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 886 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
887 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
888 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
846 889
847 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 890 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
848 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 891 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
849 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 892 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
850 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 893 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
885 case KW_expmul: f.get (expmul); break; 928 case KW_expmul: f.get (expmul); break;
886 case KW_glow_radius: f.get (glow_radius); break; 929 case KW_glow_radius: f.get (glow_radius); break;
887 case KW_weapontype: f.get (weapontype); break; 930 case KW_weapontype: f.get (weapontype); break;
888 case KW_tooltype: f.get (tooltype); break; 931 case KW_tooltype: f.get (tooltype); break;
889 case KW_casting_time: f.get (casting_time); break; 932 case KW_casting_time: f.get (casting_time); break;
933
934 // elevation is deprecated
890 case KW_elevation: f.get (elevation); break; 935 case KW_elevation: break;
936
891 case KW_smoothlevel: f.get (smoothlevel); break; 937 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
892 case KW_client_type: f.get (client_type); break; 938 case KW_client_type: f.get (client_type); break;
893 case KW_duration: f.get (duration); break; 939 case KW_duration: f.get (duration); break;
894 case KW_range: f.get (range); break; 940 case KW_range: f.get (range); break;
895 case KW_range_modifier: f.get (range_modifier); break; 941 case KW_range_modifier: f.get (range_modifier); break;
896 case KW_dam_modifier: f.get (dam_modifier); break; 942 case KW_dam_modifier: f.get (dam_modifier); break;
897 case KW_duration_modifier: f.get (duration_modifier); break; 943 case KW_duration_modifier: f.get (duration_modifier); break;
898 944
899 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 945 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
900 //TODO: parse from other include files 946 //TODO: parse from other include files
901 case KW_body_range: f.get (body_info[0]); break; 947 case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
902 case KW_body_arm: f.get (body_info[1]); break; 948 case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
903 case KW_body_torso: f.get (body_info[2]); break; 949 case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
904 case KW_body_head: f.get (body_info[3]); break; 950 case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
905 case KW_body_neck: f.get (body_info[4]); break; 951 case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
906 case KW_body_skill: f.get (body_info[5]); break; 952 case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
907 case KW_body_finger: f.get (body_info[6]); break; 953 case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
908 case KW_body_shoulder: f.get (body_info[7]); break; 954 case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
909 case KW_body_foot: f.get (body_info[8]); break; 955 case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
910 case KW_body_hand: f.get (body_info[9]); break; 956 case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
911 case KW_body_wrist: f.get (body_info[10]); break; 957 case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break;
912 case KW_body_waist: f.get (body_info[11]); break; 958 case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break;
959 case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break;
960 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
913 case KW_can_apply: 961 case KW_can_apply:
914 break; 962 break;
915 963
916 case KW_connected: 964 case KW_connected:
917 add_button_link (this, map, f.get_sint32 ()); 965 add_button_link (this, map, f.get_sint32 ());
918 break; 966 break;
919 967
920 case KW_randomitems: 968 case KW_randomitems:
921 randomitems = find_treasurelist (f.get_str ()); 969 if (f.get_str ())
970 {
971 randomitems =
972 loading_arch
973 ? treasurelist::get (f.get_str ())
974 : treasurelist::find (f.get_str ());
975
922 //if (!randomitems) 976 if (!randomitems)
923 // LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 977 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
978 }
979 else
980 randomitems = 0;
924 break; 981 break;
925 982
926 case KW_msg: 983 case KW_msg:
927 f.get_ml (KW_endmsg, msg); 984 f.get_ml (KW_endmsg, msg);
928 //TODO: allow longer messages
929 if (strlen (msg) >= HUGE_BUF)
930 {
931 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
932 msg = "ERROR, please report: string too long, winged.\n";
933 }
934 break; 985 break;
935 986
936 case KW_lore: 987 case KW_lore:
937 f.get_ml (KW_endlore, lore); 988 f.get_ml (KW_endlore, lore);
938 //TODO: allow longer messages
939 /* Just print a warning so we can be reasonably safe
940 * about not overflowing the buffer.
941 */
942 if (strlen (lore) > (HUGE_BUF / 2))
943 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
944 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
945 break; 989 break;
946 990
947 case KW_editable: 991 case KW_editable:
948 case KW_editor_folder: 992 case KW_editor_folder:
949 break; 993 break;
950 994
951 case KW_end: 995 case KW_end:
952 check_loaded_object (this);
953
954 if (!arch_init) 996 if (!loading_arch)
955 instantiate (); 997 instantiate ();
956 998
957 f.next (); 999 f.next ();
958 return true; 1000 return true;
959 1001
960 case KW_ERROR: 1002 case KW_ERROR:
961 set_ob_key_value (this, f.kw_str, f.value, true); 1003 // append as key value pair (do not use kv_set as it prepends)
1004 // we also do not even try to find old values, duplicate keys stay duplicate
1005 {
1006 key_value *kv = new key_value;
1007
1008 kv->next = 0;
1009 kv->key = shstr (f.kw_str);
1010 kv->value = shstr (f.value);
1011
1012 if (!last_kv)
1013 key_values = last_kv = kv;
1014 else
1015 {
1016 while (last_kv->next)
1017 last_kv = last_kv->next;
1018
1019 last_kv->next = kv;
1020 last_kv = kv;
1021 }
1022 }
962 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1023 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
963 break; 1024 break;
964 1025
965 default: 1026 default:
966 if (!f.parse_error ("object", name)) 1027 if (!f.parse_error ("object", name))
… …
985 arch = archetype::find ("earthwall"); 1046 arch = archetype::find ("earthwall");
986 } 1047 }
987 1048
988 assert (arch); //D maybe use exception handling of sorts? 1049 assert (arch); //D maybe use exception handling of sorts?
989 1050
990 object *op = object::create (); 1051 f.next ();
991 1052
1053 object *op = arch->instance ();
992 op->map = map; 1054 op->map = map;
993 op->arch = arch;
994 arch->clone.copy_to (op);
995 // copy_to activates, this should be fixed properly 1055 // instance() activates, this should be fixed properly
996 op->deactivate (); 1056 op->deactivate ();
997 1057
998 if (!op->parse_kv (f)) 1058 if (!op->parse_kv (f))
999 { 1059 {
1000 delete op; 1060 op->destroy (true);
1001 return 0; 1061 return 0;
1002 } 1062 }
1003 1063
1064 op->post_load_check ();
1004 return op; 1065 return op;
1005} 1066}
1006 1067
1007/* This takes a buffer, scans it for variables, and sets those variables 1068/* This takes a buffer, scans it for variables, and sets those variables
1008 * as appropriate in op. 1069 * as appropriate in op.
… …
1084 * the 15'th element of this array should match that name. 1145 * the 15'th element of this array should match that name.
1085 * If an entry is NULL, that is a flag not to loaded/saved. 1146 * If an entry is NULL, that is a flag not to loaded/saved.
1086 */ 1147 */
1087 static const keyword flag_names [NUM_FLAGS] = { 1148 static const keyword flag_names [NUM_FLAGS] = {
1088 KW_alive, 1149 KW_alive,
1089 KW_wiz,
1090 KW_NULL, 1150 KW_NULL,
1091 KW_NULL, 1151 KW_NULL,
1092 KW_was_wiz, 1152 KW_NULL,
1153 KW_NULL,
1093 KW_applied, 1154 KW_applied,
1094 KW_unpaid, 1155 KW_unpaid,
1095 KW_can_use_shield, 1156 KW_can_use_shield,
1096 KW_no_pick, 1157 KW_no_pick,
1097 KW_NULL, // walk_on 1158 KW_NULL, // walk_on
… …
1103 KW_monster, 1164 KW_monster,
1104 KW_friendly, 1165 KW_friendly,
1105 KW_generator, 1166 KW_generator,
1106 KW_is_thrown, 1167 KW_is_thrown,
1107 KW_auto_apply, 1168 KW_auto_apply,
1108 KW_NULL, // was KW_treasure 1169 KW_treasure_env,
1109 KW_player_sold, 1170 KW_player_sold,
1110 /* 20 */ 1171 /* 20 */
1111 KW_see_invisible, 1172 KW_see_invisible,
1112 KW_can_roll, 1173 KW_can_roll,
1113 KW_overlay_floor, 1174 KW_overlay_floor,
… …
1174 KW_can_use_skill, 1235 KW_can_use_skill,
1175 KW_been_applied, 1236 KW_been_applied,
1176 /* 80 */ 1237 /* 80 */
1177 KW_has_ready_scroll, 1238 KW_has_ready_scroll,
1178 KW_can_use_rod, 1239 KW_can_use_rod,
1179 KW_NULL, 1240 KW_precious,
1180 KW_can_use_horn, 1241 KW_can_use_horn,
1181 KW_make_invisible, 1242 KW_make_invisible,
1182 KW_inv_locked, 1243 KW_inv_locked,
1183 KW_is_wooded, 1244 KW_is_wooded,
1184 KW_is_hilly, 1245 KW_is_hilly,
… …
1209 /* 110 */ 1270 /* 110 */
1210 KW_destroy_on_death, 1271 KW_destroy_on_death,
1211 KW_NULL, 1272 KW_NULL,
1212 }; 1273 };
1213 1274
1214 int i;
1215
1216 /* This saves the key/value lists. We do it first so that any 1275 /* This saves the key/value lists. We do it first so that any
1217 * keys that match field names will be overwritten by the loader. 1276 * keys that match field names will be overwritten by the loader.
1218 */ 1277 */
1219 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1278 for (key_value *kv = op->key_values; kv; kv = kv->next)
1220 { 1279 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1221 /* Find the field in the opposing member. */ 1280 f.put (kv->key, kv->value);
1222 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1223
1224 /* If there's no partnering field, or it's got a different value, save our field. */
1225 if (!arch_field || my_field->value != arch_field->value)
1226 f.put (my_field->key, my_field->value);
1227 }
1228 1281
1229 /* We don't need to worry about the arch's extra fields - they 1282 /* We don't need to worry about the arch's extra fields - they
1230 * will get taken care of the copy_to method. 1283 * will get taken care of the copy_to method.
1231 */ 1284 */
1232 1285
1233 { 1286 f.put (KW_uuid, op->uuid.c_str ());
1234 char uids[64];
1235 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
1236 f.put (KW_uuid, (const char *)uids);
1237 }
1238 1287
1239#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1288#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1240#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1289#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1290
1291 if (object *owner = op->owner)
1292 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1241 1293
1242 CMP_OUT (name); 1294 CMP_OUT (name);
1243 CMP_OUT (name_pl); 1295 CMP_OUT (name_pl);
1244 CMP_OUT (custom_name); 1296 CMP_OUT (custom_name);
1245 CMP_OUT (title); 1297 CMP_OUT (title);
1246 CMP_OUT (race); 1298 CMP_OUT (race);
1299 CMP_OUT (skill);
1247 CMP_OUT (slaying); 1300 CMP_OUT (slaying);
1248 1301 CMP_OUT (tag);
1249 if (op->msg != tmp->msg)
1250 f.put (KW_msg, KW_endmsg, op->msg);
1251 if (op->lore != tmp->lore)
1252 f.put (KW_lore, KW_endlore, op->lore);
1253
1254 CMP_OUT (other_arch); 1302 CMP_OUT (other_arch);
1255 CMP_OUT (face); 1303
1304 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1305 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1306
1307 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1308 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1309 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1256 1310
1257 if (op->animation_id != tmp->animation_id) 1311 if (op->animation_id != tmp->animation_id)
1258 if (op->animation_id) 1312 if (op->animation_id)
1313 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1314 else
1259 { 1315 {
1260 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1316 f.put (KW_animation, (const char *)0);
1261 1317 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1262 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1263 f.put (KW_is_animated, (sint32) 0);
1264 } 1318 }
1265 else
1266 f.put (KW_animation, (const char *) 0);
1267 1319
1268 CMP_OUT2 (str, stats.Str); 1320 CMP_OUT2 (str, stats.Str);
1269 CMP_OUT2 (dex, stats.Dex); 1321 CMP_OUT2 (dex, stats.Dex);
1270 CMP_OUT2 (con, stats.Con); 1322 CMP_OUT2 (con, stats.Con);
1271 CMP_OUT2 (wis, stats.Wis); 1323 CMP_OUT2 (wis, stats.Wis);
… …
1301 CMP_OUT (direction); 1353 CMP_OUT (direction);
1302 CMP_OUT (type); 1354 CMP_OUT (type);
1303 CMP_OUT (subtype); 1355 CMP_OUT (subtype);
1304 CMP_OUT (attacktype); 1356 CMP_OUT (attacktype);
1305 1357
1306 for (i = 0; i < NROFATTACKS; i++) 1358 for (int i = 0; i < NROFATTACKS; i++)
1307 if (op->resist[i] != tmp->resist[i]) 1359 if (expect_false (op->resist[i] != tmp->resist[i]))
1308 f.put (resist_save[i], op->resist[i]); 1360 f.put (resist_save[i], op->resist[i]);
1309 1361
1310 CMP_OUT (path_attuned); 1362 CMP_OUT (path_attuned);
1311 CMP_OUT (path_repelled); 1363 CMP_OUT (path_repelled);
1312 CMP_OUT (path_denied); 1364 CMP_OUT (path_denied);
… …
1322 CMP_OUT (last_sp); 1374 CMP_OUT (last_sp);
1323 CMP_OUT (last_grace); 1375 CMP_OUT (last_grace);
1324 CMP_OUT (last_eat); 1376 CMP_OUT (last_eat);
1325 CMP_OUT (glow_radius); 1377 CMP_OUT (glow_radius);
1326 1378
1327 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1379 if (op->flag [FLAG_IS_LINKED])
1380 if (int i = get_button_value (op))
1328 f.put (KW_connected, i); 1381 f.put (KW_connected, i);
1329 1382
1330 CMP_OUT (randomitems); 1383 CMP_OUT (randomitems);
1331 CMP_OUT2 (container, weight_limit); 1384 CMP_OUT2 (container, weight_limit);
1332 1385
1333 CMP_OUT (run_away); 1386 CMP_OUT (run_away);
1334 CMP_OUT (pick_up); 1387 CMP_OUT (pick_up);
1335 CMP_OUT (will_apply); 1388 CMP_OUT (will_apply);
1336 CMP_OUT (smoothlevel); 1389 CMP_OUT (smoothlevel);
1337 CMP_OUT (weapontype); 1390 CMP_OUT (weapontype);
1338 CMP_OUT (tooltype); 1391 CMP_OUT (tooltype);
1339 CMP_OUT (elevation);
1340 CMP_OUT (client_type); 1392 CMP_OUT (client_type);
1341 CMP_OUT (item_power); 1393 CMP_OUT (item_power);
1342 CMP_OUT (duration); 1394 CMP_OUT (duration);
1343 CMP_OUT (range); 1395 CMP_OUT (range);
1344 CMP_OUT (range_modifier); 1396 CMP_OUT (range_modifier);
… …
1353 CMP_OUT (move_off); 1405 CMP_OUT (move_off);
1354 CMP_OUT (move_slow); 1406 CMP_OUT (move_slow);
1355 CMP_OUT (move_slow_penalty); 1407 CMP_OUT (move_slow_penalty);
1356 1408
1357 if (op->flag != tmp->flag) 1409 if (op->flag != tmp->flag)
1358 for (i = 0; i <= NUM_FLAGS; i++) 1410 for (int i = 0; i <= NUM_FLAGS; i++)
1359 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1411 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1360 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1412 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1361 1413
1362 /* Save body locations */ 1414 // save body locations
1363 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1415 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1364 if (op->body_info[i] != tmp->body_info[i]) 1416 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1365 f.put (body_locations[i].save_name, op->body_info[i]); 1417 f.put (body_locations[i].save_name, op->slot[i].info);
1366} 1418}
1367 1419
1368/* 1420/*
1369 * Dumps all variables in an object to a file. 1421 * Dumps all variables in an object to a file.
1370 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1422 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1371 * the only place this is not set is when saving the player. 1423 * the only place this is not set is when saving the player.
1372 */ 1424 */
1373bool 1425bool
1374object::write (object_freezer &f) 1426object::write (object_freezer &f)
1375{ 1427{
1376 /* Even if the object does have an owner, it would seem that we should 1428 archetype *at = arch ? arch : archetype::empty;
1377 * still save it.
1378 */
1379 if (owner)
1380 return true;
1381 1429
1382 archetype *at = arch ? (archetype *)arch : empty_archetype;
1383
1384 f.put (KW_arch, at->name); 1430 f.put (KW_arch, at->archname);
1385 write_diff (f, this, &at->clone); 1431 write_diff (f, this, at);
1386 1432
1387 for (object *tmp = inv; tmp; tmp = tmp->below) 1433 for (object *tmp = inv; tmp; tmp = tmp->below)
1388 tmp->write (f); 1434 tmp->write (f);
1389 1435
1390 f.put (this); 1436 f.put (this);
… …
1393 return true; 1439 return true;
1394} 1440}
1395 1441
1396///////////////////////////////////////////////////////////////////////////// 1442/////////////////////////////////////////////////////////////////////////////
1397 1443
1444// generic resource file load,
1445// currently supports: region, treasures, archetypes
1446bool
1398bool load_resource_file (const char *filename) 1447load_resource_file_ (const char *filename)
1399{ 1448{
1400 object_thawer f (filename); 1449 object_thawer f (filename);
1401
1402 f.next ();
1403 1450
1404 for (;;) 1451 for (;;)
1405 { 1452 {
1406 switch (f.kw) 1453 switch (f.kw)
1407 { 1454 {
1408 case KW_region: 1455 case KW_region:
1409 if (!region::read (f)) 1456 if (!region::read (f))
1410 return false; 1457 return false;
1411 break; 1458 break;
1412 1459
1460 case KW_treasure:
1461 case KW_treasureone:
1462 if (!treasurelist::read (f))
1463 return false;
1464 break;
1465
1466 case KW_object:
1467 if (!archetype::read (f))
1468 return false;
1469 break;
1470
1413 case KW_EOF: 1471 case KW_EOF:
1414 return true; 1472 return true;
1415 1473
1416 default: 1474 default:
1417 if (!f.parse_error ("resource file")) 1475 if (!f.parse_error ("resource file"))
1418 return false; 1476 return false;
1477
1478 f.next ();
1479 break;
1419 } 1480 }
1420
1421 f.next ();
1422 } 1481 }
1423} 1482}
1424 1483

Diff Legend

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