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.71 by root, Tue Apr 17 18:59:05 2007 UTC vs.
Revision 1.117 by elmex, Sun Jun 15 20:29:56 2008 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (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/////////////////////////////////////////////////////////////////////////////
29
30extern archetype *loading_arch;
34 31
35/* 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
36 * spell object conversion to the new object. It was not practical 33 * spell object conversion to the new object. It was not practical
37 * 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
38 * 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
… …
168 "spell_magic_drain", /* 122 */ 165 "spell_magic_drain", /* 122 */
169 "spell_counterspell", /* 123 */ 166 "spell_counterspell", /* 123 */
170 "spell_disarm", /* 124 */ 167 "spell_disarm", /* 124 */
171 "spell_cure_confusion", /* 125 */ 168 "spell_cure_confusion", /* 125 */
172 "spell_restoration", /* 126 */ 169 "spell_restoration", /* 126 */
173 "was summon evil monster", /* 127 *//* Not implenented as nothing used it */ 170 "spell_summon_devil", /* 127 *//* Not implenented as nothing used it */
174 "spell_counterwall", /* 128 */ 171 "spell_counterwall", /* 128 */
175 "spell_cause_light_wounds", /* 129 */ 172 "spell_cause_light_wounds", /* 129 */
176 "spell_cause_medium_wounds", /* 130 */ 173 "spell_cause_medium_wounds", /* 130 */
177 "spell_cause_heavy_wounds", /* 131 */ 174 "spell_cause_heavy_wounds", /* 131 */
178 "spell_charm_monsters", /* 132 */ 175 "spell_charm_monsters", /* 132 */
… …
250 "spell_cause_rabies", /* 204 */ 247 "spell_cause_rabies", /* 204 */
251 "spell_glyph", /* 205 */ 248 "spell_glyph", /* 205 */
252 NULL 249 NULL
253}; 250};
254 251
255extern bool loading_arch;
256
257/* 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
258 * 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
259 * 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
260 * 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.
261 */ 256 */
262static void 257void
263check_loaded_object (object *op) 258object::post_load_check ()
264{ 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
265 /* 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.
266 * 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 -
267 * 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
268 * 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
269 * 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
270 * 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.
271 * Otherwise, what happens is that the the plural name will lose 322 * Otherwise, what happens is that the the plural name will lose
272 * information (appear as just 'hearts' and not 'goblins heart') 323 * information (appear as just 'hearts' and not 'goblins heart')
273 */ 324 */
274 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)
275 op->name_pl = 0; 326 name_pl = 0;
276 327
277 if (!op->name_pl) 328 if (!name_pl)
278 op->name_pl = op->name; 329 name_pl = name;
279 330
280 /* objects now have a materialname. try to patch it in */ 331 /* objects now have a materialname. try to patch it in */
281 if (!(op->is_weapon () && op->level > 0)) 332 if (!(is_weapon () && level > 0))
282 { 333 set_materialname (this, map ? map->difficulty : 5, 0);
283 if (op->map != NULL)
284 set_materialname (op, op->map->difficulty, NULL);
285 else
286 set_materialname (op, 5, NULL);
287 }
288 334
289 /* only do these when program is first run - a bit 335 /* only do these when program is first run - a bit
290 * excessive to do this at every run - most of this is 336 * excessive to do this at every run - most of this is
291 * really just to catch any errors - program will still run, but 337 * really just to catch any errors - program will still run, but
292 * not in the ideal fashion. 338 * not in the ideal fashion.
293 */ 339 */
294 if ((op->type == WEAPON || op->type == BOW) && loading_arch) 340 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
295 { 341 {
296 if (!op->skill) 342 if (!skill)
297 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 343 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ());
298 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) ||
299 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 345 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2))
300 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);
301 } 347 }
302 348
303 /* 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
304 * really does for many objects. Need to catch any in maps 350 * really does for many objects. Need to catch any in maps
305 * that may have an old value. 351 * that may have an old value.
306 */ 352 */
307 if (op->type == WEAPON 353 if (type == WEAPON
308 || op->type == ARMOUR || op->type == HELMET 354 || type == ARMOUR || type == HELMET
309 || op->type == SHIELD || op->type == RING 355 || type == SHIELD || type == RING
310 || op->type == BOOTS || op->type == GLOVES 356 || type == BOOTS || type == GLOVES
311 || op->type == AMULET || op->type == GIRDLE 357 || type == AMULET || type == GIRDLE
312 || op->type == BRACERS || op->type == CLOAK) 358 || type == BRACERS || type == CLOAK)
313 { 359 {
314 if (op->last_heal) 360 if (last_heal)
315 { 361 {
316 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 ());
317 op->gen_sp_armour = op->last_heal; 363 gen_sp_armour = last_heal;
318 op->last_heal = 0; 364 last_heal = 0;
319 } 365 }
320 366
321 int ip = calc_item_power (op, 0); 367 int ip = calc_item_power (this, 0);
322 368
323 /* Legacy objects from before item power was in the game */ 369 /* Legacy objects from before item power was in the game */
324 if (!op->item_power && ip) 370 if (!item_power && ip)
325 { 371 {
326 if (ip > 3) 372 if (ip > 3)
327 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);
328 374
329 op->item_power = ip; 375 item_power = ip;
330 } 376 }
331 377
332 /* Check for possibly bogus values. Has to meet both these criteria - 378 /* Check for possibly bogus values. Has to meet both these criteria -
333 * 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
334 * 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.
335 * 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,
336 * but not the second one. 382 * but not the second one.
337 */ 383 */
384#if 0 //TODO
338 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 385 if (ip > 2 * item_power && ip > (item_power + 3))
339 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
340 } 388 }
341 389
342 /* Old spellcasting object - need to load in the appropiate object */ 390 /* Old spellcasting object - need to load in the appropiate object */
343 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 ||
344 /* 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 */
345 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !loading_arch) 393 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch)
346 { 394 {
347 /* 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'
348 * in that spell was stored in sp. 396 * in that spell was stored in sp.
349 */ 397 */
398 LOG (llevError, "old spellcasting object found: %s", debug_desc ());
350 object *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]);
351 insert_ob_in_ob (tmp, op); 400 insert_ob_in_ob (tmp, this);
352 op->randomitems = NULL; /* So another spell isn't created for this object */ 401 randomitems = NULL; /* So another spell isn't created for this object */
353 } 402 }
354 403
355 /* 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 */
356 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !loading_arch) 405 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
357 { 406 {
407 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
358 object *tmp = get_archetype_by_object_name (op->slaying); 408 object *tmp = get_archetype_by_object_name (slaying);
359 insert_ob_in_ob (tmp, op); 409 insert_ob_in_ob (tmp, this);
360 op->randomitems = NULL; /* So another spell isn't created for this object */ 410 randomitems = 0; /* So another spell isn't created for this object */
361 /* without this, value is all screwed up */ 411 /* without this, value is all screwed up */
362 op->value = op->arch->clone.value * op->inv->value; 412 value = arch->value * inv->value;
363 } 413 }
364 414
365 if (QUERY_FLAG (op, FLAG_MONSTER)) 415 if (QUERY_FLAG (this, FLAG_MONSTER))
366 { 416 {
367 if (op->stats.hp > op->stats.maxhp) 417 if (stats.hp > stats.maxhp)
368 { 418 {
369 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);
370 op->stats.maxhp = op->stats.hp; 420 stats.maxhp = stats.hp;
371 } 421 }
372 422
373 /* The archs just need to be updated for this */ 423 /* The archs just need to be updated for this */
374 if (op->move_type == 0) 424 if (move_type == 0)
375 op->move_type = MOVE_WALK; 425 move_type = MOVE_WALK;
376 } 426 }
377 427
378 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)
379 {
380 /* Object will duplicate it's content as part of the 429 /* Object will duplicate it's content as part of the
381 * generation process. To do this, we must flag inventory 430 * generation process. To do this, we must flag inventory
382 * so it remains unevaluated concerning the randomitems and 431 * so it remains unevaluated concerning the randomitems and
383 * the living (a demonlord shouldn't cast from inside generator!) 432 * the living (a demonlord shouldn't cast from inside generator!)
384 */ 433 */
434 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
385 flag_inv (op, FLAG_IS_A_TEMPLATE); 435 flag_inv (this, FLAG_IS_A_TEMPLATE);
386 }
387 436
388 /* Handle player movers. We use move_type for player movers 437 /* Handle player movers. We use move_type for player movers
389 * because they operate on their own time (move_on 438 * because they operate on their own time (move_on
390 * would potentially cause them to be triggered when someone steps 439 * would potentially cause them to be triggered when someone steps
391 * 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
392 * are doing, otherwise, set move_type based on maxhp value. 441 * are doing, otherwise, set move_type based on maxhp value.
393 */ 442 */
394 if (op->type == PLAYERMOVER) 443 if (type == PLAYERMOVER)
395 { 444 {
396 if (!op->move_type) 445 if (!move_type)
397 { 446 {
398 if (op->stats.maxhp) 447 if (stats.maxhp)
399 { 448 {
400 op->move_type = MOVE_ALL; 449 move_type = MOVE_ALL;
401 op->stats.maxhp = 0; 450 stats.maxhp = 0;
402 } 451 }
403 else 452 else
404 op->move_type = MOVE_WALK; 453 move_type = MOVE_WALK;
405 } 454 }
406 } 455 }
407
408} 456}
409 457
410static void 458static void
411set_move (MoveType &mt, const char *str) 459set_move (MoveType &mt, const char *str)
412{ 460{
… …
418 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH }, 466 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
419 { "fly_low" , MOVE_FLY_LOW }, 467 { "fly_low" , MOVE_FLY_LOW },
420 { "fly_high", MOVE_FLY_HIGH }, 468 { "fly_high", MOVE_FLY_HIGH },
421 { "swim" , MOVE_SWIM }, 469 { "swim" , MOVE_SWIM },
422 { "boat" , MOVE_BOAT }, 470 { "boat" , MOVE_BOAT },
471 { "ship" , MOVE_SHIP },
423 { "all" , MOVE_ALL }, 472 { "all" , MOVE_ALL },
424 }; 473 };
425 474
426 if (!str) 475 if (!str)
427 { 476 {
… …
458 507
459 goto next; 508 goto next;
460 } 509 }
461 } 510 }
462 511
463 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 512 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
464 513
465next: ; 514next: ;
466 } 515 }
467} 516}
468 517
469#define GET_FLAG(op,flag) \ 518#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
470 if (f.get_sint32 ()) \
471 SET_FLAG (op, flag); \
472 else \
473 CLEAR_FLAG (op, flag) \
474 519
475bool 520bool
476object::parse_kv (object_thawer &f) 521object::parse_kv (object_thawer &f)
477{ 522{
478 object *op_inv = inv; 523 object *op_inv = inv;
524 key_value *last_kv = key_values;
479 525
480 for (;;) 526 for (;;)
481 { 527 {
482 switch (f.kw) 528 switch (f.kw)
483 { 529 {
484 case KW_uuid: 530 case KW_uuid:
485 if (const char *s = f.get_str ()) 531 if (const char *s = f.get_str ())
486 { 532 if (!uuid.parse (s))
487 unsigned int version;
488 unsigned long long seq;
489
490 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
491 { 533 {
492 uuid.seq = seq; 534 f.parse_warn ("unparseable uuid");
493 break; 535 uuid = UUID::gen ();
494 } 536 }
495 }
496
497 uuid = gen_uuid ();
498 break; 537 break;
499 538
500 case KW_oid: 539 case KW_oid:
501 f.get (this, f.get_sint32 ()); 540 f.get (this, f.get_sint32 ());
502 break; 541 break;
… …
508 547
509 case KW_attach: f.get_ornull (attach); break; 548 case KW_attach: f.get_ornull (attach); break;
510 case KW_skill: f.get_ornull (skill); break; 549 case KW_skill: f.get_ornull (skill); break;
511 case KW_race: f.get_ornull (race); break; 550 case KW_race: f.get_ornull (race); break;
512 case KW_slaying: f.get_ornull (slaying); break; 551 case KW_slaying: f.get_ornull (slaying); break;
552 case KW_tag: f.get_ornull (tag); break;
513 553
514 case KW_arch: 554 case KW_arch:
515 { 555 {
516 object *tmp = object::read (f); 556 object *tmp = object::read (f);
517 tmp->deactivate (); 557 tmp->deactivate ();
… …
519 { 559 {
520 // was: insert_ob_in_ob (tmp, op); 560 // was: insert_ob_in_ob (tmp, op);
521 // but manually adding it can improve map loading times a lot 561 // but manually adding it can improve map loading times a lot
522 // also, appending instead of prepending keeps the 562 // also, appending instead of prepending keeps the
523 // save ordering the same between repeated load/saves. 563 // save ordering the same between repeated load/saves.
564 // and finally we do not want any funny effects
524 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 565 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
525 CLEAR_FLAG (tmp, FLAG_REMOVED); 566 CLEAR_FLAG (tmp, FLAG_REMOVED);
526 567
527 if (!op_inv) 568 if (!op_inv)
528 { 569 {
… …
544 } 585 }
545 } 586 }
546 continue; 587 continue;
547 588
548 case KW_other_arch: 589 case KW_other_arch:
549 other_arch =
550 loading_arch 590 if (loading_arch == this)
551 ? archetype::get (f.get_str ()) 591 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
592 else
593 {
552 : archetype::find (f.get_str ()); 594 other_arch = archetype::find (f.get_str ());
553 595
554 if (!other_arch) 596 if (!other_arch)
555 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()); 597 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
598 }
599 break;
600
601 case KW_owner:
602 f.delayed_deref (this, owner, f.get_str ());
556 break; 603 break;
557 604
558 case KW_animation: 605 case KW_animation:
559 { 606 {
560 CLEAR_FLAG (this, FLAG_ANIMATE); 607 CLEAR_FLAG (this, FLAG_ANIMATE);
561 animation_id = 0; 608 animation_id = 0;
562 609
563 const char *str = f.get_str (); 610 const char *str = f.get_str ();
564 if (str && (animation_id = find_animation (str))) 611 if (str && (animation_id = find_animation (str)))
565 SET_FLAG (this, FLAG_ANIMATE); 612 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
566 } 613 }
567 break; 614 break;
568 615
569 case KW_last_heal: f.get (last_heal); break; 616 case KW_last_heal: f.get (last_heal); break;
570 case KW_last_sp: f.get (last_sp); break; 617 case KW_last_sp: f.get (last_sp); break;
… …
587 f.get (move_slow_penalty); 634 f.get (move_slow_penalty);
588 break; 635 break;
589 636
590 case KW_face: 637 case KW_face:
591 face = face_find (f.get_str ()); 638 face = face_find (f.get_str ());
639 break;
640
641 case KW_sound:
642 sound = sound_find (f.get_str ());
643 if (!sound)
644 f.parse_warn ("sound not found");
645 break;
646
647 case KW_sound_destroy:
648 sound_destroy = sound_find (f.get_str ());
649 if (!sound_destroy)
650 f.parse_warn ("sound not found");
592 break; 651 break;
593 652
594 case KW_x: f.get (x); break; 653 case KW_x: f.get (x); break;
595 case KW_y: f.get (y); break; 654 case KW_y: f.get (y); break;
596 655
… …
723 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 782 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
724 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 783 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
725 784
726 break; 785 break;
727 786
728 case KW_wiz:
729 GET_FLAG (this, FLAG_WIZ);
730 //TODO: move to check_object
731 if (QUERY_FLAG (this, FLAG_WIZ))
732 {
733 SET_FLAG (this, FLAG_WAS_WIZ);
734 SET_FLAG (this, FLAG_WIZPASS);
735 SET_FLAG (this, FLAG_WIZCAST);
736 }
737 else
738 {
739 CLEAR_FLAG (this, FLAG_WIZPASS);
740 CLEAR_FLAG (this, FLAG_WIZCAST);
741 }
742 break;
743
744 case KW_friendly: 787 case KW_friendly:
745 if (f.get_sint32 ()) 788 if (f.get_bool ())
746 if (type != PLAYER) 789 if (type != PLAYER)
747 add_friendly_object (this); 790 add_friendly_object (this);
748 791
749 break; 792 break;
750 793
… …
763 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; 806 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
764 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; 807 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
765 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; 808 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
766 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; 809 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
767 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; 810 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
811 case KW_player_sold: GET_FLAG (this, FLAG_PLAYER_SOLD); break;
768 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; 812 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
769 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; 813 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
770 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; 814 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
771 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 815 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
772 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 816 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
… …
779 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 823 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
780 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 824 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
781 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 825 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
782 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 826 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
783 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 827 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
784 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
785 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; 828 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
786 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 829 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
787 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 830 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
788 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 831 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
789 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 832 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
… …
832 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break; 875 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
833 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break; 876 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
834 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 877 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
835 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 878 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
836 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 879 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
880 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
881 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
837 882
838 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 883 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
839 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 884 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
840 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 885 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
841 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 886 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
876 case KW_expmul: f.get (expmul); break; 921 case KW_expmul: f.get (expmul); break;
877 case KW_glow_radius: f.get (glow_radius); break; 922 case KW_glow_radius: f.get (glow_radius); break;
878 case KW_weapontype: f.get (weapontype); break; 923 case KW_weapontype: f.get (weapontype); break;
879 case KW_tooltype: f.get (tooltype); break; 924 case KW_tooltype: f.get (tooltype); break;
880 case KW_casting_time: f.get (casting_time); break; 925 case KW_casting_time: f.get (casting_time); break;
926
927 // elevation is deprecated
881 case KW_elevation: f.get (elevation); break; 928 case KW_elevation: break;
929
882 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 930 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
883 case KW_client_type: f.get (client_type); break; 931 case KW_client_type: f.get (client_type); break;
884 case KW_duration: f.get (duration); break; 932 case KW_duration: f.get (duration); break;
885 case KW_range: f.get (range); break; 933 case KW_range: f.get (range); break;
886 case KW_range_modifier: f.get (range_modifier); break; 934 case KW_range_modifier: f.get (range_modifier); break;
887 case KW_dam_modifier: f.get (dam_modifier); break; 935 case KW_dam_modifier: f.get (dam_modifier); break;
888 case KW_duration_modifier: f.get (duration_modifier); break; 936 case KW_duration_modifier: f.get (duration_modifier); break;
889 937
890 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 938 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
891 //TODO: parse from other include files 939 //TODO: parse from other include files
892 case KW_body_range: f.get (body_info[0]); break; 940 case KW_body_range: slot[body_range] .info = f.get_sint32 (); break;
893 case KW_body_arm: f.get (body_info[1]); break; 941 case KW_body_shield: slot[body_shield] .info = f.get_sint32 (); break;
894 case KW_body_torso: f.get (body_info[2]); break; 942 case KW_body_combat: slot[body_combat] .info = f.get_sint32 (); break;
895 case KW_body_head: f.get (body_info[3]); break; 943 case KW_body_arm: slot[body_arm] .info = f.get_sint32 (); break;
896 case KW_body_neck: f.get (body_info[4]); break; 944 case KW_body_torso: slot[body_torso] .info = f.get_sint32 (); break;
897 case KW_body_skill: f.get (body_info[5]); break; 945 case KW_body_head: slot[body_head] .info = f.get_sint32 (); break;
898 case KW_body_finger: f.get (body_info[6]); break; 946 case KW_body_neck: slot[body_neck] .info = f.get_sint32 (); break;
899 case KW_body_shoulder: f.get (body_info[7]); break; 947 case KW_body_skill: slot[body_skill] .info = f.get_sint32 (); break;
900 case KW_body_foot: f.get (body_info[8]); break; 948 case KW_body_finger: slot[body_finger] .info = f.get_sint32 (); break;
901 case KW_body_hand: f.get (body_info[9]); break; 949 case KW_body_shoulder: slot[body_shoulder].info = f.get_sint32 (); break;
902 case KW_body_wrist: f.get (body_info[10]); break; 950 case KW_body_foot: slot[body_foot] .info = f.get_sint32 (); break;
903 case KW_body_waist: f.get (body_info[11]); break; 951 case KW_body_hand: slot[body_hand] .info = f.get_sint32 (); break;
952 case KW_body_wrist: slot[body_wrist] .info = f.get_sint32 (); break;
953 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
904 case KW_can_apply: 954 case KW_can_apply:
905 break; 955 break;
906 956
907 case KW_connected: 957 case KW_connected:
908 add_button_link (this, map, f.get_sint32 ()); 958 add_button_link (this, map, f.get_sint32 ());
… …
917 : treasurelist::find (f.get_str ()); 967 : treasurelist::find (f.get_str ());
918 968
919 if (!randomitems) 969 if (!randomitems)
920 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 970 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
921 } 971 }
972 else
973 randomitems = 0;
922 break; 974 break;
923 975
924 case KW_msg: 976 case KW_msg:
925 f.get_ml (KW_endmsg, msg); 977 f.get_ml (KW_endmsg, msg);
926 //TODO: allow longer messages
927 if (strlen (msg) >= HUGE_BUF)
928 {
929 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
930 msg = "ERROR, please report: string too long, winged.\n";
931 }
932 break; 978 break;
933 979
934 case KW_lore: 980 case KW_lore:
935 f.get_ml (KW_endlore, lore); 981 f.get_ml (KW_endlore, lore);
936 //TODO: allow longer messages
937 /* Just print a warning so we can be reasonably safe
938 * about not overflowing the buffer.
939 */
940 if (strlen (lore) > (HUGE_BUF / 2))
941 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
942 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
943 break; 982 break;
944 983
945 case KW_editable: 984 case KW_editable:
946 case KW_editor_folder: 985 case KW_editor_folder:
947 break; 986 break;
948 987
949 case KW_end: 988 case KW_end:
950 check_loaded_object (this);
951
952 if (!loading_arch) 989 if (!loading_arch)
953 instantiate (); 990 instantiate ();
954 991
955 f.next (); 992 f.next ();
956 return true; 993 return true;
957 994
958 case KW_ERROR: 995 case KW_ERROR:
959 set_ob_key_value (this, f.kw_str, f.value, true); 996 // append as key value pair (do not use kv_set as it prepends)
997 // we also do not even try to find old values, duplicate keys stay duplicate
998 {
999 key_value *kv = new key_value;
1000
1001 kv->next = 0;
1002 kv->key = shstr (f.kw_str);
1003 kv->value = shstr (f.value);
1004
1005 if (!last_kv)
1006 key_values = last_kv = kv;
1007 else
1008 {
1009 while (last_kv->next)
1010 last_kv = last_kv->next;
1011
1012 last_kv->next = kv;
1013 last_kv = kv;
1014 }
1015 }
960 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1016 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
961 break; 1017 break;
962 1018
963 default: 1019 default:
964 if (!f.parse_error ("object", name)) 1020 if (!f.parse_error ("object", name))
… …
985 1041
986 assert (arch); //D maybe use exception handling of sorts? 1042 assert (arch); //D maybe use exception handling of sorts?
987 1043
988 f.next (); 1044 f.next ();
989 1045
990 object *op = object::create (); 1046 object *op = arch->instance ();
991
992 op->map = map; 1047 op->map = map;
993 arch->clone.copy_to (op);
994 // copy_to activates, this should be fixed properly 1048 // instance() activates, this should be fixed properly
995 op->deactivate (); 1049 op->deactivate ();
996 1050
997 if (!op->parse_kv (f)) 1051 if (!op->parse_kv (f))
998 { 1052 {
999 op->destroy (true); 1053 op->destroy (true);
1000 return 0; 1054 return 0;
1001 } 1055 }
1002 1056
1057 op->post_load_check ();
1003 return op; 1058 return op;
1004} 1059}
1005 1060
1006/* This takes a buffer, scans it for variables, and sets those variables 1061/* This takes a buffer, scans it for variables, and sets those variables
1007 * as appropriate in op. 1062 * as appropriate in op.
… …
1012int 1067int
1013set_variable (object *op, char *buf) 1068set_variable (object *op, char *buf)
1014{ 1069{
1015 object_thawer f (buf, (AV *)0); 1070 object_thawer f (buf, (AV *)0);
1016 1071
1017 f.next ();
1018 return op->parse_kv (f); 1072 return op->parse_kv (f);
1019} 1073}
1020 1074
1021/* This returns a string of the integer movement type */ 1075/* This returns a string of the integer movement type */
1022#if 0 1076#if 0
… …
1084 * the 15'th element of this array should match that name. 1138 * 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. 1139 * If an entry is NULL, that is a flag not to loaded/saved.
1086 */ 1140 */
1087 static const keyword flag_names [NUM_FLAGS] = { 1141 static const keyword flag_names [NUM_FLAGS] = {
1088 KW_alive, 1142 KW_alive,
1089 KW_wiz,
1090 KW_NULL, 1143 KW_NULL,
1091 KW_NULL, 1144 KW_NULL,
1092 KW_was_wiz, 1145 KW_NULL,
1146 KW_NULL,
1093 KW_applied, 1147 KW_applied,
1094 KW_unpaid, 1148 KW_unpaid,
1095 KW_can_use_shield, 1149 KW_can_use_shield,
1096 KW_no_pick, 1150 KW_no_pick,
1097 KW_NULL, // walk_on 1151 KW_NULL, // walk_on
… …
1103 KW_monster, 1157 KW_monster,
1104 KW_friendly, 1158 KW_friendly,
1105 KW_generator, 1159 KW_generator,
1106 KW_is_thrown, 1160 KW_is_thrown,
1107 KW_auto_apply, 1161 KW_auto_apply,
1108 KW_NULL, // was KW_treasure 1162 KW_treasure_env,
1109 KW_player_sold, 1163 KW_player_sold,
1110 /* 20 */ 1164 /* 20 */
1111 KW_see_invisible, 1165 KW_see_invisible,
1112 KW_can_roll, 1166 KW_can_roll,
1113 KW_overlay_floor, 1167 KW_overlay_floor,
… …
1174 KW_can_use_skill, 1228 KW_can_use_skill,
1175 KW_been_applied, 1229 KW_been_applied,
1176 /* 80 */ 1230 /* 80 */
1177 KW_has_ready_scroll, 1231 KW_has_ready_scroll,
1178 KW_can_use_rod, 1232 KW_can_use_rod,
1179 KW_NULL, 1233 KW_precious,
1180 KW_can_use_horn, 1234 KW_can_use_horn,
1181 KW_make_invisible, 1235 KW_make_invisible,
1182 KW_inv_locked, 1236 KW_inv_locked,
1183 KW_is_wooded, 1237 KW_is_wooded,
1184 KW_is_hilly, 1238 KW_is_hilly,
… …
1209 /* 110 */ 1263 /* 110 */
1210 KW_destroy_on_death, 1264 KW_destroy_on_death,
1211 KW_NULL, 1265 KW_NULL,
1212 }; 1266 };
1213 1267
1214 int i;
1215
1216 /* This saves the key/value lists. We do it first so that any 1268 /* This saves the key/value lists. We do it first so that any
1217 * keys that match field names will be overwritten by the loader. 1269 * keys that match field names will be overwritten by the loader.
1218 */ 1270 */
1219 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1271 for (key_value *kv = op->key_values; kv; kv = kv->next)
1220 { 1272 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1221 /* Find the field in the opposing member. */ 1273 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 1274
1229 /* We don't need to worry about the arch's extra fields - they 1275 /* We don't need to worry about the arch's extra fields - they
1230 * will get taken care of the copy_to method. 1276 * will get taken care of the copy_to method.
1231 */ 1277 */
1232 1278
1233 { 1279 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 1280
1239#define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) 1281#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1240#define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) 1282#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1283
1284 if (object *owner = op->owner)
1285 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1241 1286
1242 CMP_OUT (name); 1287 CMP_OUT (name);
1243 CMP_OUT (name_pl); 1288 CMP_OUT (name_pl);
1244 CMP_OUT (custom_name); 1289 CMP_OUT (custom_name);
1245 CMP_OUT (title); 1290 CMP_OUT (title);
1246 CMP_OUT (race); 1291 CMP_OUT (race);
1292 CMP_OUT (skill);
1247 CMP_OUT (slaying); 1293 CMP_OUT (slaying);
1248 1294 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); 1295 CMP_OUT (other_arch);
1255 1296
1297 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1298 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore);
1299
1256 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0); 1300 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1301 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1302 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1257 1303
1258 if (op->animation_id != tmp->animation_id) 1304 if (op->animation_id != tmp->animation_id)
1259 if (op->animation_id) 1305 if (op->animation_id)
1306 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1307 else
1260 { 1308 {
1261 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1309 f.put (KW_animation, (const char *)0);
1262 1310 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1263 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1264 f.put (KW_is_animated, (sint32) 0);
1265 } 1311 }
1266 else
1267 f.put (KW_animation, (const char *) 0);
1268 1312
1269 CMP_OUT2 (str, stats.Str); 1313 CMP_OUT2 (str, stats.Str);
1270 CMP_OUT2 (dex, stats.Dex); 1314 CMP_OUT2 (dex, stats.Dex);
1271 CMP_OUT2 (con, stats.Con); 1315 CMP_OUT2 (con, stats.Con);
1272 CMP_OUT2 (wis, stats.Wis); 1316 CMP_OUT2 (wis, stats.Wis);
… …
1302 CMP_OUT (direction); 1346 CMP_OUT (direction);
1303 CMP_OUT (type); 1347 CMP_OUT (type);
1304 CMP_OUT (subtype); 1348 CMP_OUT (subtype);
1305 CMP_OUT (attacktype); 1349 CMP_OUT (attacktype);
1306 1350
1307 for (i = 0; i < NROFATTACKS; i++) 1351 for (int i = 0; i < NROFATTACKS; i++)
1308 if (op->resist[i] != tmp->resist[i]) 1352 if (expect_false (op->resist[i] != tmp->resist[i]))
1309 f.put (resist_save[i], op->resist[i]); 1353 f.put (resist_save[i], op->resist[i]);
1310 1354
1311 CMP_OUT (path_attuned); 1355 CMP_OUT (path_attuned);
1312 CMP_OUT (path_repelled); 1356 CMP_OUT (path_repelled);
1313 CMP_OUT (path_denied); 1357 CMP_OUT (path_denied);
… …
1323 CMP_OUT (last_sp); 1367 CMP_OUT (last_sp);
1324 CMP_OUT (last_grace); 1368 CMP_OUT (last_grace);
1325 CMP_OUT (last_eat); 1369 CMP_OUT (last_eat);
1326 CMP_OUT (glow_radius); 1370 CMP_OUT (glow_radius);
1327 1371
1328 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1372 if (op->flag [FLAG_IS_LINKED])
1373 if (int i = get_button_value (op))
1329 f.put (KW_connected, i); 1374 f.put (KW_connected, i);
1330 1375
1331 CMP_OUT (randomitems); 1376 CMP_OUT (randomitems);
1332 CMP_OUT2 (container, weight_limit); 1377 CMP_OUT2 (container, weight_limit);
1333 1378
1334 CMP_OUT (run_away); 1379 CMP_OUT (run_away);
1335 CMP_OUT (pick_up); 1380 CMP_OUT (pick_up);
1336 CMP_OUT (will_apply); 1381 CMP_OUT (will_apply);
1337 CMP_OUT (smoothlevel); 1382 CMP_OUT (smoothlevel);
1338 CMP_OUT (weapontype); 1383 CMP_OUT (weapontype);
1339 CMP_OUT (tooltype); 1384 CMP_OUT (tooltype);
1340 CMP_OUT (elevation);
1341 CMP_OUT (client_type); 1385 CMP_OUT (client_type);
1342 CMP_OUT (item_power); 1386 CMP_OUT (item_power);
1343 CMP_OUT (duration); 1387 CMP_OUT (duration);
1344 CMP_OUT (range); 1388 CMP_OUT (range);
1345 CMP_OUT (range_modifier); 1389 CMP_OUT (range_modifier);
… …
1354 CMP_OUT (move_off); 1398 CMP_OUT (move_off);
1355 CMP_OUT (move_slow); 1399 CMP_OUT (move_slow);
1356 CMP_OUT (move_slow_penalty); 1400 CMP_OUT (move_slow_penalty);
1357 1401
1358 if (op->flag != tmp->flag) 1402 if (op->flag != tmp->flag)
1359 for (i = 0; i <= NUM_FLAGS; i++) 1403 for (int i = 0; i <= NUM_FLAGS; i++)
1360 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1404 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1361 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1405 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1362 1406
1363 /* Save body locations */ 1407 // save body locations
1364 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1408 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1365 if (op->body_info[i] != tmp->body_info[i]) 1409 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1366 f.put (body_locations[i].save_name, op->body_info[i]); 1410 f.put (body_locations[i].save_name, op->slot[i].info);
1367} 1411}
1368 1412
1369/* 1413/*
1370 * Dumps all variables in an object to a file. 1414 * Dumps all variables in an object to a file.
1371 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1415 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1372 * the only place this is not set is when saving the player. 1416 * the only place this is not set is when saving the player.
1373 */ 1417 */
1374bool 1418bool
1375object::write (object_freezer &f) 1419object::write (object_freezer &f)
1376{ 1420{
1377 /* Even if the object does have an owner, it would seem that we should 1421 archetype *at = arch ? arch : archetype::empty;
1378 * still save it.
1379 */
1380 if (owner)
1381 return true;
1382 1422
1383 archetype *at = arch ? (archetype *)arch : empty_archetype;
1384
1385 f.put (KW_arch, at->name); 1423 f.put (KW_arch, at->archname);
1386 write_diff (f, this, &at->clone); 1424 write_diff (f, this, at);
1387 1425
1388 for (object *tmp = inv; tmp; tmp = tmp->below) 1426 for (object *tmp = inv; tmp; tmp = tmp->below)
1389 tmp->write (f); 1427 tmp->write (f);
1390 1428
1391 f.put (this); 1429 f.put (this);
… …
1396 1434
1397///////////////////////////////////////////////////////////////////////////// 1435/////////////////////////////////////////////////////////////////////////////
1398 1436
1399// generic resource file load, 1437// generic resource file load,
1400// currently supports: region, treasures, archetypes 1438// currently supports: region, treasures, archetypes
1439bool
1401bool load_resource_file (const char *filename) 1440load_resource_file_ (const char *filename)
1402{ 1441{
1403 object_thawer f (filename); 1442 object_thawer f (filename);
1404
1405 bool success = false;
1406 bool seen_arch = false;
1407
1408 f.next ();
1409 1443
1410 for (;;) 1444 for (;;)
1411 { 1445 {
1412 switch (f.kw) 1446 switch (f.kw)
1413 { 1447 {
1414 case KW_region: 1448 case KW_region:
1415 if (!region::read (f)) 1449 if (!region::read (f))
1416 goto finish; 1450 return false;
1417 break; 1451 break;
1418 1452
1419 case KW_treasure: 1453 case KW_treasure:
1420 case KW_treasureone: 1454 case KW_treasureone:
1421 if (!treasurelist::read (f)) 1455 if (!treasurelist::read (f))
1422 goto finish; 1456 return false;
1423 break; 1457 break;
1424 1458
1425 case KW_object: 1459 case KW_object:
1426 seen_arch = true;
1427 if (!archetype::read (f)) 1460 if (!archetype::read (f))
1428 goto finish; 1461 return false;
1429 break; 1462 break;
1430 1463
1431 case KW_EOF: 1464 case KW_EOF:
1432 success = true; 1465 return true;
1433 goto finish;
1434 1466
1435 default: 1467 default:
1436 if (!f.parse_error ("resource file")) 1468 if (!f.parse_error ("resource file"))
1437 goto finish; 1469 return false;
1470
1471 f.next ();
1472 break;
1438 } 1473 }
1439 } 1474 }
1440
1441finish:
1442 if (seen_arch)
1443 init_archetype_pointers ();
1444
1445 return success;
1446} 1475}
1447 1476

Diff Legend

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