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.108 by elmex, Sun Apr 13 13:32:48 2008 UTC vs.
Revision 1.146 by root, Wed Nov 11 04:45:22 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying
26 variable. */
27
28#include <global.h> 25#include <global.h>
29#include <loader.h> 26#include <loader.h>
30#include <sproto.h> 27#include <sproto.h>
31 28
32///////////////////////////////////////////////////////////////////////////// 29/////////////////////////////////////////////////////////////////////////////
33 30
34extern archetype *loading_arch; 31extern archetype *loading_arch;
32
33//+GPL
35 34
36/* This table is only necessary to convert objects that existed before the 35/* This table is only necessary to convert objects that existed before the
37 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
38 * to go through every mapping looking for every potion, rod, wand, etc 37 * to go through every mapping looking for every potion, rod, wand, etc
39 * that had a sp set and update to the new value. So this maps the 38 * that had a sp set and update to the new value. So this maps the
… …
261void 260void
262object::post_load_check () 261object::post_load_check ()
263{ 262{
264 if (type >= NUM_TYPES) 263 if (type >= NUM_TYPES)
265 { 264 {
266 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); 265 LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ());
267 type = 0; 266 type = 0;
268 } 267 }
269 268
270 switch (type) 269 switch (type)
271 { 270 {
… …
273 case WAND: 272 case WAND:
274 case ROD: 273 case ROD:
275 case HORN: 274 case HORN:
276 if (slot [body_range].info != -1) 275 if (slot [body_range].info != -1)
277 { 276 {
278 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); 277 LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
279 slot [body_range].info = -1; 278 slot [body_range].info = -1;
280 } 279 }
281 break; 280 break;
282 281
283 case WEAPON: 282 case WEAPON:
284 if (slot [body_combat].info != -1) 283 if (slot [body_combat].info != -1)
285 { 284 {
286 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); 285 LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
287 slot [body_combat].info = -1; 286 slot [body_combat].info = -1;
288 } 287 }
289 break; 288 break;
290 289
291 case SHIELD: 290 case SHIELD:
292 if (slot [body_shield].info != -1) 291 if (slot [body_shield].info != -1)
293 { 292 {
294 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); 293 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
295 slot [body_shield].info = -1; 294 slot [body_shield].info = -1;
296 } 295 }
297 break; 296 break;
298 297
299 case PLAYER: 298 case PLAYER:
300 if (slot [body_shield].info != 1) 299 if (slot [body_shield].info != 1)
301 { 300 {
302 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 301 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
303 slot [body_shield].info = 1; 302 slot [body_shield].info = 1;
304 } 303 }
305 304
306 if (slot [body_combat].info != 1) 305 if (slot [body_combat].info != 1)
307 { 306 {
308 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); 307 LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
309 slot [body_combat].info = 1; 308 slot [body_combat].info = 1;
310 } 309 }
311 310
312 if (slot [body_range].info != 1) 311 if (slot [body_range].info != 1)
313 { 312 {
314 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); 313 LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
315 slot [body_range].info = 1; 314 slot [body_range].info = 1;
316 } 315 }
317 break; 316 break;
318 } 317 }
319 318
… …
331 330
332 if (!name_pl) 331 if (!name_pl)
333 name_pl = name; 332 name_pl = name;
334 333
335 /* objects now have a materialname. try to patch it in */ 334 /* objects now have a materialname. try to patch it in */
336 if (!(is_weapon () && level > 0)) 335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
337 set_materialname (this, map ? map->difficulty : 5, 0); 336 select_material (this, map ? map->difficulty : 5);
338 337
339 /* only do these when program is first run - a bit 338 /* only do these when program is first run - a bit
340 * excessive to do this at every run - most of this is 339 * excessive to do this at every run - most of this is
341 * really just to catch any errors - program will still run, but 340 * really just to catch any errors - program will still run, but
342 * not in the ideal fashion. 341 * not in the ideal fashion.
343 */ 342 */
344 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) 343 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
345 { 344 {
346 if (!skill) 345 if (!skill)
347 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); 346 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
348 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || 347 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
349 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 348 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
350 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); 349 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
351 } 350 }
352 351
353 /* We changed last_heal to gen_sp_armour, which is what it 352 /* We changed last_heal to gen_sp_armour, which is what it
354 * really does for many objects. Need to catch any in maps 353 * really does for many objects. Need to catch any in maps
355 * that may have an old value. 354 * that may have an old value.
… …
361 || type == AMULET || type == GIRDLE 360 || type == AMULET || type == GIRDLE
362 || type == BRACERS || type == CLOAK) 361 || type == BRACERS || type == CLOAK)
363 { 362 {
364 if (last_heal) 363 if (last_heal)
365 { 364 {
366 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); 365 LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
367 gen_sp_armour = last_heal; 366 gen_sp_armour = last_heal;
368 last_heal = 0; 367 last_heal = 0;
369 } 368 }
370 369
371 int ip = calc_item_power (this, 0); 370 int ip = calc_item_power (this, 0);
372 371
373 /* Legacy objects from before item power was in the game */ 372 /* Legacy objects from before item power was in the game */
374 if (!item_power && ip) 373 if (!item_power && ip)
375 { 374 {
376 if (ip > 3) 375 if (ip > 3)
377 LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); 376 LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip);
378 377
379 item_power = ip; 378 item_power = ip;
380 } 379 }
381 380
382 /* Check for possibly bogus values. Has to meet both these criteria - 381 /* Check for possibly bogus values. Has to meet both these criteria -
… …
389 if (ip > 2 * item_power && ip > (item_power + 3)) 388 if (ip > 2 * item_power && ip > (item_power + 3))
390 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 389 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
391#endif 390#endif
392 } 391 }
393 392
394 /* Old spellcasting object - need to load in the appropiate object */ 393 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
395 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 394 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
395 if ((type == ROD
396 || type == WAND
397 || type == SCROLL
398 || type == HORN
399 || type == FIREWALL
396 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 400 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 401 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
402 && !inv
403 && !loading_arch
404 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
405 // TODO: at least one watchout-comments is redundant - investigate/remove
398 { 406 {
407 // TODO: fix firewall object on map
399 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' 408 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
400 * in that spell was stored in sp. 409 * in that spell was stored in sp.
401 */ 410 */
411 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
402 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 412 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
403 insert_ob_in_ob (tmp, this); 413 insert_ob_in_ob (tmp, this);
404 randomitems = NULL; /* So another spell isn't created for this object */ 414 randomitems = 0;
405 } 415 }
406 416
407 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 417 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
408 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 418 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
409 { 419 {
420 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
410 object *tmp = get_archetype_by_object_name (slaying); 421 object *tmp = get_archetype_by_object_name (slaying);
411 insert_ob_in_ob (tmp, this); 422 insert_ob_in_ob (tmp, this);
412 randomitems = NULL; /* So another spell isn't created for this object */ 423 randomitems = 0; /* So another spell isn't created for this object */
413 /* without this, value is all screwed up */ 424 /* without this, value is all screwed up */
414 value = arch->value * inv->value; 425 value = arch->value * inv->value;
415 } 426 }
416 427
417 if (QUERY_FLAG (this, FLAG_MONSTER)) 428 if (QUERY_FLAG (this, FLAG_MONSTER))
418 { 429 {
419 if (stats.hp > stats.maxhp) 430 if (stats.hp > stats.maxhp)
420 { 431 {
421 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 432 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
422 stats.maxhp = stats.hp; 433 stats.maxhp = stats.hp;
423 } 434 }
424 435
425 /* The archs just need to be updated for this */ 436 /* The archs just need to be updated for this */
426 if (move_type == 0) 437 if (move_type == 0)
427 move_type = MOVE_WALK; 438 move_type = MOVE_WALK;
428 } 439 }
429 440
430 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 441 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER)
431 {
432 /* Object will duplicate it's content as part of the 442 /* Object will duplicate it's content as part of the
433 * generation process. To do this, we must flag inventory 443 * generation process. To do this, we must flag inventory
434 * so it remains unevaluated concerning the randomitems and 444 * so it remains unevaluated concerning the randomitems and
435 * the living (a demonlord shouldn't cast from inside generator!) 445 * the living (a demonlord shouldn't cast from inside generator!)
436 */ 446 */
447 /* ??? this *should* be done elsewhere, e.g. after map loading etc. */
437 flag_inv (this, FLAG_IS_A_TEMPLATE); 448 flag_inv (this, FLAG_IS_A_TEMPLATE);
438 }
439 449
440 /* Handle player movers. We use move_type for player movers 450 /* Handle player movers. We use move_type for player movers
441 * because they operate on their own time (move_on 451 * because they operate on their own time (move_on
442 * would potentially cause them to be triggered when someone steps 452 * would potentially cause them to be triggered when someone steps
443 * on them). If move_type is set, presume person knows what they 453 * on them). If move_type is set, presume person knows what they
444 * are doing, otherwise, set move_type based on maxhp value. 454 * are doing, otherwise, set move_type based on maxhp value.
445 */ 455 */
446 if (type == PLAYERMOVER) 456 if (type == PLAYERMOVER)
447 { 457 {
448 if (!move_type) 458 if (!move_type)
… …
453 stats.maxhp = 0; 463 stats.maxhp = 0;
454 } 464 }
455 else 465 else
456 move_type = MOVE_WALK; 466 move_type = MOVE_WALK;
457 } 467 }
468 }
469
470 // if the object has an animation, try to provide a default face
471 if (has_anim ())
472 {
473 const animation &anim_ob = anim ();
474
475 if (anim_speed)
476 // if this item is time-animated, force the last frame
477 animate_object (this, 0);
478 else if (flag [FLAG_MONSTER])
479 // if it is a monster, set appropriate facing
480 animate_object (this, direction);
458 } 481 }
459} 482}
460 483
461static void 484static void
462set_move (MoveType &mt, const char *str) 485set_move (MoveType &mt, const char *str)
… …
510 533
511 goto next; 534 goto next;
512 } 535 }
513 } 536 }
514 537
515 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str); 538 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
516 539
517next: ; 540next: ;
518 } 541 }
519} 542}
543
544//-GPL
520 545
521#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () 546#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
522 547
523bool 548bool
524object::parse_kv (object_thawer &f) 549object::parse_kv (object_thawer &f)
525{ 550{
526 object *op_inv = inv; 551 object *op_inv = inv;
552 key_value *last_kv = key_values;
527 553
528 for (;;) 554 for (;;)
529 { 555 {
530 switch (f.kw) 556 switch (f.kw)
531 { 557 {
… …
552 case KW_race: f.get_ornull (race); break; 578 case KW_race: f.get_ornull (race); break;
553 case KW_slaying: f.get_ornull (slaying); break; 579 case KW_slaying: f.get_ornull (slaying); break;
554 case KW_tag: f.get_ornull (tag); break; 580 case KW_tag: f.get_ornull (tag); break;
555 581
556 case KW_arch: 582 case KW_arch:
557 {
558 object *tmp = object::read (f); 583 if (object *tmp = object::read (f))
559 tmp->deactivate ();
560
561 { 584 {
585 tmp->deactivate ();
586
562 // was: insert_ob_in_ob (tmp, op); 587 // was: insert_ob_in_ob (tmp, op);
563 // but manually adding it can improve map loading times a lot 588 // but manually adding it can improve map loading times a lot
564 // also, appending instead of prepending keeps the 589 // also, appending instead of prepending keeps the
565 // save ordering the same between repeated load/saves. 590 // save ordering the same between repeated load/saves.
566 // and finally we do not want any funny effects 591 // and finally we do not want any funny effects
… …
583 608
584 tmp->below = 0; 609 tmp->below = 0;
585 tmp->env = this; 610 tmp->env = this;
586 op_inv = tmp; 611 op_inv = tmp;
587 } 612 }
588 } 613 else
614 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
615
589 continue; 616 continue;
590 617
591 case KW_other_arch: 618 case KW_other_arch:
592 other_arch =
593 loading_arch 619 if (loading_arch == this)
594 ? archetype::get (f.get_str ()) 620 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
621 else
622 {
595 : archetype::find (f.get_str ()); 623 other_arch = archetype::find (f.get_str ());
596 624
597 if (!other_arch) 625 if (!other_arch)
598 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ())); 626 f.parse_warn (format ("%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ()));
627 }
599 break; 628 break;
600 629
601 case KW_owner: 630 case KW_owner:
602 f.delayed_deref (this, owner, f.get_str ()); 631 f.delayed_deref (this, owner, f.get_str ());
603 break; 632 break;
… …
607 CLEAR_FLAG (this, FLAG_ANIMATE); 636 CLEAR_FLAG (this, FLAG_ANIMATE);
608 animation_id = 0; 637 animation_id = 0;
609 638
610 const char *str = f.get_str (); 639 const char *str = f.get_str ();
611 if (str && (animation_id = find_animation (str))) 640 if (str && (animation_id = find_animation (str)))
612 SET_FLAG (this, FLAG_ANIMATE); 641 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
613 } 642 }
614 break; 643 break;
615 644
616 case KW_last_heal: f.get (last_heal); break; 645 case KW_last_heal: f.get (last_heal); break;
617 case KW_last_sp: f.get (last_sp); break; 646 case KW_last_sp: f.get (last_sp); break;
… …
696 case KW_invisible: f.get (invisible); break; 725 case KW_invisible: f.get (invisible); break;
697 case KW_magic: f.get (magic); break; 726 case KW_magic: f.get (magic); break;
698 case KW_state: f.get (state); break; 727 case KW_state: f.get (state); break;
699 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 728 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
700 case KW_material: f.get (materials); break; //TODO: nuke 729 case KW_material: f.get (materials); break; //TODO: nuke
701 case KW_materialname: f.get (materialname); break; 730
731 case KW_materialname:
732 {
733 shstr sh;
734 f.get (sh);
735 material = name_to_material (sh);
736 }
737 break;
702 738
703 /* These are the new values */ 739 /* These are the new values */
704 case KW_move_block: set_move (move_block, f.get_str ()); break; 740 case KW_move_block: set_move (move_block, f.get_str ()); break;
705 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 741 case KW_move_allow: set_move (move_allow, f.get_str ()); break;
706 case KW_move_type: set_move (move_type, f.get_str ()); break; 742 case KW_move_type: set_move (move_type, f.get_str ()); break;
… …
823 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 859 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
824 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 860 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
825 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 861 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
826 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 862 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
827 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 863 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
828 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
829 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 864 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
830 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 865 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
831 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 866 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
832 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 867 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
833 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; 868 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
… …
916 case KW_anim_speed: f.get (anim_speed); break; 951 case KW_anim_speed: f.get (anim_speed); break;
917 case KW_container: f.get (weight_limit); break; 952 case KW_container: f.get (weight_limit); break;
918 case KW_will_apply: f.get (will_apply); break; 953 case KW_will_apply: f.get (will_apply); break;
919 case KW_attack_movement: f.get (attack_movement); break; 954 case KW_attack_movement: f.get (attack_movement); break;
920 case KW_move_state: f.get (move_status); break; 955 case KW_move_state: f.get (move_status); break;
921 case KW_expmul: f.get (expmul); break; 956 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
922 case KW_glow_radius: f.get (glow_radius); break; 957 case KW_glow_radius: f.get (glow_radius); break;
923 case KW_weapontype: f.get (weapontype); break; 958 case KW_weapontype: f.get (weapontype); break;
924 case KW_tooltype: f.get (tooltype); break;
925 case KW_casting_time: f.get (casting_time); break; 959 case KW_casting_time: f.get (casting_time); break;
960
961 // elevation is deprecated
926 case KW_elevation: f.get (elevation); break; 962 case KW_elevation: break;
963
927 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 964 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
928 case KW_client_type: f.get (client_type); break; 965 case KW_client_type: f.get (client_type); break;
929 case KW_duration: f.get (duration); break; 966 case KW_duration: f.get (duration); break;
930 case KW_range: f.get (range); break; 967 case KW_range: f.get (range); break;
931 case KW_range_modifier: f.get (range_modifier); break; 968 case KW_range_modifier: f.get (range_modifier); break;
… …
950 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 987 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
951 case KW_can_apply: 988 case KW_can_apply:
952 break; 989 break;
953 990
954 case KW_connected: 991 case KW_connected:
955 add_button_link (this, map, f.get_sint32 ()); 992 {
993 shstr connected;
994
995 f.get (connected);
996 add_link (map, connected);
997 }
956 break; 998 break;
957 999
958 case KW_randomitems: 1000 case KW_randomitems:
959 if (f.get_str ()) 1001 if (f.get_str ())
960 { 1002 {
… …
962 loading_arch 1004 loading_arch
963 ? treasurelist::get (f.get_str ()) 1005 ? treasurelist::get (f.get_str ())
964 : treasurelist::find (f.get_str ()); 1006 : treasurelist::find (f.get_str ());
965 1007
966 if (!randomitems) 1008 if (!randomitems)
1009 {
967 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1010 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1011 randomitems = treasurelist::get (shstr_none); // avoid crashes
1012 }
968 } 1013 }
969 else 1014 else
970 randomitems = 0; 1015 randomitems = 0;
971 break; 1016 break;
972 1017
… …
988 1033
989 f.next (); 1034 f.next ();
990 return true; 1035 return true;
991 1036
992 case KW_ERROR: 1037 case KW_ERROR:
993 set_ob_key_value (this, f.kw_str, f.value, true); 1038 // append as key value pair (do not use kv_set as it prepends)
1039 // we also do not even try to find old values, duplicate keys stay duplicate
1040 {
1041 key_value *kv = new key_value;
1042
1043 kv->next = 0;
1044 kv->key = shstr (f.kw_str);
1045 kv->value = shstr (f.value);
1046
1047 if (!last_kv)
1048 key_values = last_kv = kv;
1049 else
1050 {
1051 while (last_kv->next)
1052 last_kv = last_kv->next;
1053
1054 last_kv->next = kv;
1055 last_kv = kv;
1056 }
1057 }
994 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1058 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
995 break; 1059 break;
996 1060
997 default: 1061 default:
998 if (!f.parse_error ("object", name)) 1062 if (!f.parse_error ("object", name))
… …
1012 archetype *arch = archetype::find (f.get_str ()); 1076 archetype *arch = archetype::find (f.get_str ());
1013 1077
1014 if (!arch) 1078 if (!arch)
1015 { 1079 {
1016 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1080 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1017 arch = archetype::find ("earthwall"); 1081 arch = archetype::find (shstr_earthwall);
1018 } 1082 }
1019 1083
1020 assert (arch); //D maybe use exception handling of sorts? 1084 assert (arch); //D maybe use exception handling of sorts?
1021 1085
1022 f.next (); 1086 f.next ();
1023 1087
1024 object *op = object::create (); 1088 object *op = arch->instance ();
1025
1026 op->map = map; 1089 op->map = map;
1027 arch->copy_to (op);
1028 // copy_to activates, this should be fixed properly 1090 // instance() activates, this should be fixed properly
1029 op->deactivate (); 1091 op->deactivate ();
1030 1092
1031 if (!op->parse_kv (f)) 1093 if (!op->parse_kv (f))
1032 { 1094 {
1033 op->destroy (true); 1095 op->destroy ();
1034 return 0; 1096 return 0;
1035 } 1097 }
1036 1098
1037 op->post_load_check (); 1099 op->post_load_check ();
1038 return op; 1100 return op;
… …
1050 object_thawer f (buf, (AV *)0); 1112 object_thawer f (buf, (AV *)0);
1051 1113
1052 return op->parse_kv (f); 1114 return op->parse_kv (f);
1053} 1115}
1054 1116
1055/* This returns a string of the integer movement type */
1056#if 0
1057// unused function
1058static char *
1059get_string_move_type (MoveType mt)
1060{
1061 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1062 int i, all_count = 0, count;
1063
1064 strcpy (retbuf, "");
1065 strcpy (retbuf_all, " all");
1066
1067 /* Quick check, and probably fairly common */
1068 if (mt == MOVE_ALL)
1069 return retbuf_all + 1;
1070 if (mt == 0)
1071 {
1072 strcpy (retbuf, "0");
1073 return retbuf;
1074 }
1075
1076 /* We basically slide the bits down. Why look at MOVE_ALL?
1077 * because we may want to return a string like 'all -swim',
1078 * and if we just looked at mt, we couldn't get that.
1079 */
1080 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1081 {
1082 if (mt & (1 << count))
1083 {
1084 strcat (retbuf, " ");
1085 strcat (retbuf, move_name[count]);
1086 }
1087 else
1088 {
1089 strcat (retbuf_all, " -");
1090 strcat (retbuf_all, move_name[count]);
1091 all_count++;
1092 }
1093 }
1094 /* Basically, if there is a single negation, return it, eg
1095 * 'all -swim'. But more than that, just return the
1096 * enumerated values. It doesn't make sense to return
1097 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1098 */
1099 if (all_count <= 1)
1100 return retbuf_all + 1;
1101 else
1102 return retbuf + 1;
1103}
1104#endif
1105
1106// compare *op against *tmp and output differences 1117// compare *op against *arch and output differences
1107static void 1118static void
1108write_diff (object_freezer &f, object *op, object *tmp) 1119write_diff (object_freezer &f, object *op, object *arch)
1109{ 1120{
1110 static const keyword resist_save[NROFATTACKS] = { 1121 static const keyword resist_save[NROFATTACKS] = {
1111# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1122# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1112# include "attackinc.h" 1123# include "attackinc.h"
1113# undef def 1124# undef def
… …
1127 KW_applied, 1138 KW_applied,
1128 KW_unpaid, 1139 KW_unpaid,
1129 KW_can_use_shield, 1140 KW_can_use_shield,
1130 KW_no_pick, 1141 KW_no_pick,
1131 KW_NULL, // walk_on 1142 KW_NULL, // walk_on
1143 /* 10 */
1132 KW_NULL, // no_pass 1144 KW_NULL, // no_pass
1133 /* 10 */
1134 KW_is_animated, 1145 KW_is_animated,
1135 KW_NULL, // slow_move 1146 KW_NULL, // slow_move
1136 KW_NULL, // flying 1147 KW_NULL, // flying
1137 KW_monster, 1148 KW_monster,
1138 KW_friendly, 1149 KW_friendly,
1139 KW_generator, 1150 KW_generator,
1140 KW_is_thrown, 1151 KW_is_thrown,
1141 KW_auto_apply, 1152 KW_auto_apply,
1142 KW_treasure_env, 1153 KW_treasure_env,
1154 /* 20 */
1143 KW_player_sold, 1155 KW_player_sold,
1144 /* 20 */
1145 KW_see_invisible, 1156 KW_see_invisible,
1146 KW_can_roll, 1157 KW_can_roll,
1147 KW_overlay_floor, 1158 KW_overlay_floor,
1148 KW_is_turnable, 1159 KW_is_turnable,
1149 KW_NULL, // walk_off 1160 KW_NULL, // walk_off
1150 KW_NULL, // fly_on 1161 KW_NULL, // fly_on
1151 KW_NULL, // fly_off 1162 KW_NULL, // fly_off
1152 KW_is_used_up, 1163 KW_is_used_up,
1153 KW_identified, 1164 KW_identified,
1165 /* 30 */
1154 KW_reflecting, 1166 KW_reflecting,
1155 /* 30 */
1156 KW_changing, 1167 KW_changing,
1157 KW_splitting, 1168 KW_splitting,
1158 KW_hitback, 1169 KW_hitback,
1159 KW_startequip, 1170 KW_startequip,
1160 KW_blocksview, 1171 KW_blocksview,
1161 KW_undead, 1172 KW_undead,
1162 KW_scared, 1173 KW_scared,
1163 KW_unaggressive, 1174 KW_unaggressive,
1164 KW_reflect_missile, 1175 KW_reflect_missile,
1176 /* 40 */
1165 KW_reflect_spell, 1177 KW_reflect_spell,
1166 /* 40 */
1167 KW_no_magic, 1178 KW_no_magic,
1168 KW_no_fix_player, 1179 KW_NULL,
1169 KW_is_lightable, 1180 KW_is_lightable,
1170 KW_tear_down, 1181 KW_tear_down,
1171 KW_run_away, 1182 KW_run_away,
1172 KW_NULL, // pass_thru 1183 KW_NULL, // pass_thru
1173 KW_NULL, // an_pass_thru 1184 KW_NULL, // an_pass_thru
1174 KW_pick_up, 1185 KW_pick_up,
1175 KW_unique, 1186 KW_unique,
1187 /* 50 */
1176 KW_no_drop, 1188 KW_no_drop,
1177 /* 50 */
1178 KW_NULL, // wizcast 1189 KW_NULL, // wizcast
1179 KW_can_cast_spell, 1190 KW_can_cast_spell,
1180 KW_can_use_scroll, 1191 KW_can_use_scroll,
1181 KW_can_use_range, 1192 KW_can_use_range,
1182 KW_can_use_bow, 1193 KW_can_use_bow,
1183 KW_can_use_armour, 1194 KW_can_use_armour,
1184 KW_can_use_weapon, 1195 KW_can_use_weapon,
1185 KW_can_use_ring, 1196 KW_can_use_ring,
1186 KW_has_ready_range, 1197 KW_has_ready_range,
1198 /* 60 */
1187 KW_has_ready_bow, 1199 KW_has_ready_bow,
1188 /* 60 */
1189 KW_xrays, 1200 KW_xrays,
1190 KW_NULL, 1201 KW_NULL,
1191 KW_is_floor, 1202 KW_is_floor,
1192 KW_lifesave, 1203 KW_lifesave,
1193 KW_no_strength, 1204 KW_no_strength,
1194 KW_sleep, 1205 KW_sleep,
1195 KW_stand_still, 1206 KW_stand_still,
1196 KW_random_move, 1207 KW_random_move,
1197 KW_only_attack, 1208 KW_only_attack,
1209 /* 70 */
1198 KW_confused, 1210 KW_confused,
1199 /* 70 */
1200 KW_stealth, 1211 KW_stealth,
1201 KW_NULL, 1212 KW_NULL,
1202 KW_NULL, 1213 KW_NULL,
1203 KW_cursed, 1214 KW_cursed,
1204 KW_damned, 1215 KW_damned,
1205 KW_see_anywhere, 1216 KW_see_anywhere,
1206 KW_known_magical, 1217 KW_known_magical,
1207 KW_known_cursed, 1218 KW_known_cursed,
1208 KW_can_use_skill, 1219 KW_can_use_skill,
1220 /* 80 */
1209 KW_been_applied, 1221 KW_been_applied,
1210 /* 80 */
1211 KW_has_ready_scroll, 1222 KW_has_ready_scroll,
1212 KW_can_use_rod, 1223 KW_can_use_rod,
1213 KW_precious, 1224 KW_precious,
1214 KW_can_use_horn, 1225 KW_can_use_horn,
1215 KW_make_invisible, 1226 KW_make_invisible,
1216 KW_inv_locked, 1227 KW_inv_locked,
1217 KW_is_wooded, 1228 KW_is_wooded,
1218 KW_is_hilly, 1229 KW_is_hilly,
1219 KW_has_ready_skill, 1230 KW_has_ready_skill,
1231 /* 90 */
1220 KW_has_ready_weapon, 1232 KW_has_ready_weapon,
1221 /* 90 */
1222 KW_no_skill_ident, 1233 KW_no_skill_ident,
1223 KW_is_blind, 1234 KW_is_blind,
1224 KW_can_see_in_dark, 1235 KW_can_see_in_dark,
1225 KW_is_cauldron, 1236 KW_is_cauldron,
1226 KW_NULL, 1237 KW_NULL,
1227 KW_no_steal, 1238 KW_no_steal,
1228 KW_one_hit, 1239 KW_one_hit,
1229 KW_NULL, 1240 KW_NULL,
1230 KW_berserk, 1241 KW_berserk,
1242 /* 100 */
1231 KW_neutral, 1243 KW_neutral,
1232 /* 100 */
1233 KW_no_attack, 1244 KW_no_attack,
1234 KW_no_damage, 1245 KW_no_damage,
1235 KW_obj_original, 1246 KW_obj_original,
1236 KW_NULL, 1247 KW_NULL,
1237 KW_activate_on_push, 1248 KW_activate_on_push,
1238 KW_activate_on_release, 1249 KW_activate_on_release,
1239 KW_is_water, 1250 KW_is_water,
1240 KW_use_content_on_gen, 1251 KW_use_content_on_gen,
1241 KW_NULL, 1252 KW_NULL,
1253 /* 110 */
1242 KW_is_buildable, 1254 KW_is_buildable,
1243 /* 110 */
1244 KW_destroy_on_death, 1255 KW_destroy_on_death,
1245 KW_NULL, 1256 KW_NULL,
1246 }; 1257 };
1247 1258
1248 int i; 1259 // obj_original is the only commonly differing flag between archetype
1260 // and object, so special-case it here to be able to skip the loop
1261 static const struct flagmask : object::flags_t
1262 {
1263 flagmask ()
1264 {
1265 for (int i = 0; i < NUM_FLAGS; i++)
1266 if (flag_names [i])
1267 set (i);
1268 }
1269 } flagmask;
1249 1270
1250 /* This saves the key/value lists. We do it first so that any 1271 /* This saves the key/value lists. We do it first so that any
1251 * keys that match field names will be overwritten by the loader. 1272 * keys that match field names will be overwritten by the loader.
1252 */ 1273 */
1253 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1274 for (key_value *kv = op->key_values; kv; kv = kv->next)
1254 { 1275 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1255 /* Find the field in the opposing member. */ 1276 f.put (kv->key, kv->value);
1256 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1257 1277
1258 /* If there's no partnering field, or it's got a different value, save our field. */ 1278 if (op->uuid)
1259 if (!arch_field || my_field->value != arch_field->value)
1260 f.put (my_field->key, my_field->value);
1261 } 1279 {
1280 // highly optimised - this is often 25% of all data written
1281 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1282 char *ptr = cur;
1262 1283
1263 /* We don't need to worry about the arch's extra fields - they 1284 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1264 * will get taken care of the copy_to method. 1285 ptr += sizeof ("uuid ") - 1;
1265 */ 1286 ptr = op->uuid.append (ptr);
1287 *ptr++ = '\n';
1266 1288
1267 f.put (KW_uuid, op->uuid.c_str ()); 1289 f.alloc (ptr - cur);
1290 }
1268 1291
1269#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1292#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW_ ## v, op->v)
1270#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1293#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v)
1271 1294
1272 if (object *owner = op->owner) 1295 CMP_OUT (x);
1273 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1296 CMP_OUT (y);
1297
1298 CMP_OUT (type);
1299 CMP_OUT (subtype);
1300 CMP_OUT (direction);
1274 1301
1275 CMP_OUT (name); 1302 CMP_OUT (name);
1276 CMP_OUT (name_pl); 1303 CMP_OUT (name_pl);
1277 CMP_OUT (custom_name); 1304
1305 CMP_OUT (speed);
1306 CMP_OUT (speed_left);
1307
1278 CMP_OUT (title); 1308 CMP_OUT (title);
1279 CMP_OUT (race); 1309 CMP_OUT (race);
1280 CMP_OUT (slaying); 1310 CMP_OUT (slaying);
1311 CMP_OUT (skill);
1312
1281 CMP_OUT (tag); 1313 CMP_OUT (tag);
1314 CMP_OUT (custom_name);
1315
1316 if (object *owner = op->owner)
1317 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1318
1319 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1320
1282 CMP_OUT (other_arch); 1321 CMP_OUT (other_arch);
1283 1322
1284 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1323 if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1285 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1324 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore);
1286 1325
1287 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1326 if (op->face != arch->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1288 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1327 if (op->sound != arch->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1289 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1328 if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1290 1329
1291 if (op->animation_id != tmp->animation_id) 1330 if (op->animation_id != arch->animation_id)
1292 if (op->animation_id) 1331 if (op->has_anim ())
1332 f.put (KW_animation, op->anim ().name);
1333 else
1293 { 1334 {
1294 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1335 f.put (KW_animation, (const char *)0);
1295 1336 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1296 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1297 f.put (KW_is_animated, (sint32)0);
1298 } 1337 }
1299 else
1300 f.put (KW_animation, (const char *)0);
1301 1338
1302 CMP_OUT2 (str, stats.Str); 1339 CMP_OUT2 (str, stats.Str);
1303 CMP_OUT2 (dex, stats.Dex); 1340 CMP_OUT2 (dex, stats.Dex);
1304 CMP_OUT2 (con, stats.Con); 1341 CMP_OUT2 (con, stats.Con);
1305 CMP_OUT2 (wis, stats.Wis); 1342 CMP_OUT2 (wis, stats.Wis);
… …
1314 CMP_OUT2 (grace, stats.grace); 1351 CMP_OUT2 (grace, stats.grace);
1315 CMP_OUT2 (maxgrace, stats.maxgrace); 1352 CMP_OUT2 (maxgrace, stats.maxgrace);
1316 CMP_OUT2 (exp, stats.exp); 1353 CMP_OUT2 (exp, stats.exp);
1317 1354
1318 CMP_OUT (perm_exp); 1355 CMP_OUT (perm_exp);
1319 CMP_OUT (expmul); 1356 //CMP_OUT (expmul);
1320 1357
1321 CMP_OUT2 (food, stats.food); 1358 CMP_OUT2 (food, stats.food);
1322 CMP_OUT2 (dam, stats.dam); 1359 CMP_OUT2 (dam, stats.dam);
1323 CMP_OUT2 (luck, stats.luck); 1360 CMP_OUT2 (luck, stats.luck);
1324 CMP_OUT2 (wc, stats.wc); 1361 CMP_OUT2 (wc, stats.wc);
1325 CMP_OUT2 (ac, stats.ac); 1362 CMP_OUT2 (ac, stats.ac);
1326 1363
1327 CMP_OUT (x);
1328 CMP_OUT (y);
1329 CMP_OUT (speed);
1330 CMP_OUT (speed_left);
1331 CMP_OUT2 (move_state, move_status); 1364 CMP_OUT2 (move_state, move_status);
1332 CMP_OUT (attack_movement); 1365 CMP_OUT (attack_movement);
1333 CMP_OUT (nrof); 1366 CMP_OUT (nrof);
1334 CMP_OUT (level); 1367 CMP_OUT (level);
1335 CMP_OUT (direction);
1336 CMP_OUT (type);
1337 CMP_OUT (subtype);
1338 CMP_OUT (attacktype); 1368 CMP_OUT (attacktype);
1339 1369
1370 // using memcmp here seems to be a loss - is gcc vectorising?
1340 for (i = 0; i < NROFATTACKS; i++) 1371 for (int i = 0; i < NROFATTACKS; i++)
1341 if (expect_false (op->resist[i] != tmp->resist[i])) 1372 if (expect_false (op->resist[i] != arch->resist[i]))
1342 f.put (resist_save[i], op->resist[i]); 1373 f.put (resist_save[i], op->resist[i]);
1343 1374
1344 CMP_OUT (path_attuned); 1375 CMP_OUT (path_attuned);
1345 CMP_OUT (path_repelled); 1376 CMP_OUT (path_repelled);
1346 CMP_OUT (path_denied); 1377 CMP_OUT (path_denied);
1378
1347 CMP_OUT2 (material, materials);//TODO: nuke 1379 CMP_OUT2 (material, materials);//TODO: nuke
1348 CMP_OUT (materialname); 1380 if (op->material != arch->material)
1381 f.put (KW_materialname, op->material->name);
1382
1349 CMP_OUT (value); 1383 CMP_OUT (value);
1350 CMP_OUT (carrying); 1384 CMP_OUT (carrying);
1351 CMP_OUT (weight); 1385 CMP_OUT (weight);
1352 CMP_OUT (invisible); 1386 CMP_OUT (invisible);
1353 CMP_OUT (state); 1387 CMP_OUT (state);
… …
1356 CMP_OUT (last_sp); 1390 CMP_OUT (last_sp);
1357 CMP_OUT (last_grace); 1391 CMP_OUT (last_grace);
1358 CMP_OUT (last_eat); 1392 CMP_OUT (last_eat);
1359 CMP_OUT (glow_radius); 1393 CMP_OUT (glow_radius);
1360 1394
1361 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1395 if (op->flag [FLAG_IS_LINKED])
1396 if (auto (ol, op->find_link ()))
1362 f.put (KW_connected, i); 1397 f.put (KW_connected, ol->id);
1363 1398
1364 CMP_OUT (randomitems); 1399 CMP_OUT (randomitems);
1365 CMP_OUT2 (container, weight_limit); 1400 CMP_OUT2 (container, weight_limit);
1366 1401
1367 CMP_OUT (run_away); 1402 CMP_OUT (run_away);
1368 CMP_OUT (pick_up); 1403 CMP_OUT (pick_up);
1369 CMP_OUT (will_apply); 1404 CMP_OUT (will_apply);
1370 CMP_OUT (smoothlevel); 1405 CMP_OUT (smoothlevel);
1371 CMP_OUT (weapontype); 1406 CMP_OUT (weapontype);
1372 CMP_OUT (tooltype);
1373 CMP_OUT (elevation);
1374 CMP_OUT (client_type); 1407 CMP_OUT (client_type);
1375 CMP_OUT (item_power); 1408 CMP_OUT (item_power);
1376 CMP_OUT (duration); 1409 CMP_OUT (duration);
1377 CMP_OUT (range); 1410 CMP_OUT (range);
1378 CMP_OUT (range_modifier); 1411 CMP_OUT (range_modifier);
… …
1386 CMP_OUT (move_on); 1419 CMP_OUT (move_on);
1387 CMP_OUT (move_off); 1420 CMP_OUT (move_off);
1388 CMP_OUT (move_slow); 1421 CMP_OUT (move_slow);
1389 CMP_OUT (move_slow_penalty); 1422 CMP_OUT (move_slow_penalty);
1390 1423
1391 if (op->flag != tmp->flag) 1424 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1425
1426 if (diff [FLAG_OBJ_ORIGINAL])
1427 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0");
1428
1429 diff.reset (FLAG_OBJ_ORIGINAL);
1430
1431 // quickly test whether any other flags differ
1432 if (expect_true (diff.any ()))
1392 for (i = 0; i <= NUM_FLAGS; i++) 1433 for (int i = 0; i < NUM_FLAGS; i++)
1393 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1434 if (expect_false (diff [i]))
1394 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1435 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1395 1436
1396 // save body locations 1437 // save body locations. gcc's memcmp does an abysmal job when used
1397 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1438 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1398 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1439 if (expect_false (op->slot[i].info != arch->slot[i].info))
1399 f.put (body_locations[i].save_name, op->slot[i].info); 1440 f.put (body_locations[i].save_name, op->slot[i].info);
1400} 1441}
1401 1442
1402/* 1443/*
1403 * Dumps all variables in an object to a file. 1444 * Dumps all variables in an object to a file.
… …
1405 * the only place this is not set is when saving the player. 1446 * the only place this is not set is when saving the player.
1406 */ 1447 */
1407bool 1448bool
1408object::write (object_freezer &f) 1449object::write (object_freezer &f)
1409{ 1450{
1410 archetype *at = arch ? (archetype *)arch : empty_archetype; 1451 if (is_arch ())
1411 1452 {
1453 f.put (KW_object, arch->archname);
1454 write_diff (f, this, archetype::empty);
1455 }
1456 else
1457 {
1412 f.put (KW_arch, at->archname); 1458 f.put (KW_arch, arch->archname);
1413 write_diff (f, this, at); 1459 write_diff (f, this, arch);
1460 }
1414 1461
1415 for (object *tmp = inv; tmp; tmp = tmp->below) 1462 for (object *tmp = inv; tmp; tmp = tmp->below)
1416 tmp->write (f); 1463 tmp->write (f);
1417 1464
1418 f.put (this); 1465 f.put (this);
… …
1423 1470
1424///////////////////////////////////////////////////////////////////////////// 1471/////////////////////////////////////////////////////////////////////////////
1425 1472
1426// generic resource file load, 1473// generic resource file load,
1427// currently supports: region, treasures, archetypes 1474// currently supports: region, treasures, archetypes
1475bool
1428bool load_resource_file (const char *filename) 1476load_resource_file_ (const char *filename)
1429{ 1477{
1430 object_thawer f (filename); 1478 object_thawer f (filename);
1431
1432 bool success = false;
1433 bool seen_arch = false;
1434 1479
1435 for (;;) 1480 for (;;)
1436 { 1481 {
1437 switch (f.kw) 1482 switch (f.kw)
1438 { 1483 {
1439 case KW_region: 1484 case KW_region:
1440 if (!region::read (f)) 1485 if (!region::read (f))
1441 goto finish; 1486 return false;
1442 break; 1487 break;
1443 1488
1444 case KW_treasure: 1489 case KW_treasure:
1445 case KW_treasureone: 1490 case KW_treasureone:
1446 if (!treasurelist::read (f)) 1491 if (!treasurelist::read (f))
1447 goto finish; 1492 return false;
1448 break; 1493 break;
1449 1494
1450 case KW_object: 1495 case KW_object:
1451 seen_arch = true;
1452 if (!archetype::read (f)) 1496 if (!archetype::read (f))
1453 goto finish; 1497 return false;
1454 break; 1498 break;
1455 1499
1456 case KW_EOF: 1500 case KW_EOF:
1457 success = true; 1501 return true;
1458 goto finish;
1459 1502
1460 default: 1503 default:
1461 if (!f.parse_error ("resource file")) 1504 if (!f.parse_error ("resource file"))
1462 goto finish; 1505 return false;
1463 1506
1464 f.next (); 1507 f.next ();
1465 break; 1508 break;
1466 } 1509 }
1467 } 1510 }
1468
1469finish:
1470 if (seen_arch)
1471 init_archetype_pointers ();
1472
1473 return success;
1474} 1511}
1475 1512

Diff Legend

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