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.112 by root, Tue Apr 29 15:19:30 2008 UTC vs.
Revision 1.136 by root, Wed Nov 4 00:02:48 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,2008 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#include <global.h> 25#include <global.h>
… …
257void 258void
258object::post_load_check () 259object::post_load_check ()
259{ 260{
260 if (type >= NUM_TYPES) 261 if (type >= NUM_TYPES)
261 { 262 {
262 LOG (llevError, "%s: type out of range, resetting to 0.\n", debug_desc ()); 263 LOG (llevError, "ITEMBUG: %s: type out of range, resetting to 0.\n", debug_desc ());
263 type = 0; 264 type = 0;
264 } 265 }
265 266
266 switch (type) 267 switch (type)
267 { 268 {
… …
269 case WAND: 270 case WAND:
270 case ROD: 271 case ROD:
271 case HORN: 272 case HORN:
272 if (slot [body_range].info != -1) 273 if (slot [body_range].info != -1)
273 { 274 {
274 LOG (llevError, "%s: body_range %d != -1\n", debug_desc (), slot [body_range].info); 275 LOG (llevError, "ITEMBUG: %s: body_range %d != -1\n", debug_desc (), slot [body_range].info);
275 slot [body_range].info = -1; 276 slot [body_range].info = -1;
276 } 277 }
277 break; 278 break;
278 279
279 case WEAPON: 280 case WEAPON:
280 if (slot [body_combat].info != -1) 281 if (slot [body_combat].info != -1)
281 { 282 {
282 LOG (llevError, "%s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info); 283 LOG (llevError, "ITEMBUG: %s: body_combat %d != -1\n", debug_desc (), slot [body_combat].info);
283 slot [body_combat].info = -1; 284 slot [body_combat].info = -1;
284 } 285 }
285 break; 286 break;
286 287
287 case SHIELD: 288 case SHIELD:
288 if (slot [body_shield].info != -1) 289 if (slot [body_shield].info != -1)
289 { 290 {
290 LOG (llevError, "%s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info); 291 LOG (llevError, "ITEMBUG: %s: body_shield %d != -1\n", debug_desc (), slot [body_shield].info);
291 slot [body_shield].info = -1; 292 slot [body_shield].info = -1;
292 } 293 }
293 break; 294 break;
294 295
295 case PLAYER: 296 case PLAYER:
296 if (slot [body_shield].info != 1) 297 if (slot [body_shield].info != 1)
297 { 298 {
298 LOG (llevError, "%s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info); 299 LOG (llevError, "ITEMBUG: %s: body_shield %d != 1\n", debug_desc (), slot [body_shield].info);
299 slot [body_shield].info = 1; 300 slot [body_shield].info = 1;
300 } 301 }
301 302
302 if (slot [body_combat].info != 1) 303 if (slot [body_combat].info != 1)
303 { 304 {
304 LOG (llevError, "%s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info); 305 LOG (llevError, "ITEMBUG: %s: body_combat %d != 1\n", debug_desc (), slot [body_combat].info);
305 slot [body_combat].info = 1; 306 slot [body_combat].info = 1;
306 } 307 }
307 308
308 if (slot [body_range].info != 1) 309 if (slot [body_range].info != 1)
309 { 310 {
310 LOG (llevError, "%s: body_range %d != 1\n", debug_desc (), slot [body_range].info); 311 LOG (llevError, "ITEMBUG: %s: body_range %d != 1\n", debug_desc (), slot [body_range].info);
311 slot [body_range].info = 1; 312 slot [body_range].info = 1;
312 } 313 }
313 break; 314 break;
314 } 315 }
315 316
… …
338 * not in the ideal fashion. 339 * not in the ideal fashion.
339 */ 340 */
340 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) 341 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
341 { 342 {
342 if (!skill) 343 if (!skill)
343 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); 344 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
344 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || 345 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
345 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 346 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
346 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); 347 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
347 } 348 }
348 349
349 /* We changed last_heal to gen_sp_armour, which is what it 350 /* We changed last_heal to gen_sp_armour, which is what it
350 * really does for many objects. Need to catch any in maps 351 * really does for many objects. Need to catch any in maps
351 * that may have an old value. 352 * that may have an old value.
… …
357 || type == AMULET || type == GIRDLE 358 || type == AMULET || type == GIRDLE
358 || type == BRACERS || type == CLOAK) 359 || type == BRACERS || type == CLOAK)
359 { 360 {
360 if (last_heal) 361 if (last_heal)
361 { 362 {
362 LOG (llevError, "Object %s still has last_heal set, not gen_sp_armour\n", debug_desc ()); 363 LOG (llevError, "ITEMBUG: object %s still has last_heal set, not gen_sp_armour\n", debug_desc ());
363 gen_sp_armour = last_heal; 364 gen_sp_armour = last_heal;
364 last_heal = 0; 365 last_heal = 0;
365 } 366 }
366 367
367 int ip = calc_item_power (this, 0); 368 int ip = calc_item_power (this, 0);
368 369
369 /* Legacy objects from before item power was in the game */ 370 /* Legacy objects from before item power was in the game */
370 if (!item_power && ip) 371 if (!item_power && ip)
371 { 372 {
372 if (ip > 3) 373 if (ip > 3)
373 LOG (llevDebug, "Object %s had no item power, using %d\n", debug_desc (), ip); 374 LOG (llevDebug, "ITEMBUG: Object %s had no item power, using %d\n", debug_desc (), ip);
374 375
375 item_power = ip; 376 item_power = ip;
376 } 377 }
377 378
378 /* Check for possibly bogus values. Has to meet both these criteria - 379 /* Check for possibly bogus values. Has to meet both these criteria -
… …
385 if (ip > 2 * item_power && ip > (item_power + 3)) 386 if (ip > 2 * item_power && ip > (item_power + 3))
386 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 387 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
387#endif 388#endif
388 } 389 }
389 390
390 /* Old spellcasting object - need to load in the appropiate object */ 391 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
391 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 392 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
393 if ((type == ROD
394 || type == WAND
395 || type == SCROLL
396 || type == HORN
397 || type == FIREWALL
392 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 398 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
393 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 399 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
400 && !inv
401 && !loading_arch
402 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
403 // TODO: at least one watchout-comments is redundant - investigate/remove
394 { 404 {
405 // TODO: fix firewall object on map
395 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' 406 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
396 * in that spell was stored in sp. 407 * in that spell was stored in sp.
397 */ 408 */
398 LOG (llevError, "old spellcasting object found: %s", debug_desc ()); 409 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
399 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 410 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
400 insert_ob_in_ob (tmp, this); 411 insert_ob_in_ob (tmp, this);
401 randomitems = NULL; /* So another spell isn't created for this object */ 412 randomitems = 0;
402 } 413 }
403 414
404 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 415 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
405 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 416 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
406 { 417 {
407 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ()); 418 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
408 object *tmp = get_archetype_by_object_name (slaying); 419 object *tmp = get_archetype_by_object_name (slaying);
409 insert_ob_in_ob (tmp, this); 420 insert_ob_in_ob (tmp, this);
410 randomitems = NULL; /* So another spell isn't created for this object */ 421 randomitems = 0; /* So another spell isn't created for this object */
411 /* without this, value is all screwed up */ 422 /* without this, value is all screwed up */
412 value = arch->value * inv->value; 423 value = arch->value * inv->value;
413 } 424 }
414 425
415 if (QUERY_FLAG (this, FLAG_MONSTER)) 426 if (QUERY_FLAG (this, FLAG_MONSTER))
416 { 427 {
417 if (stats.hp > stats.maxhp) 428 if (stats.hp > stats.maxhp)
418 { 429 {
419 LOG (llevInfo, "Monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 430 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
420 stats.maxhp = stats.hp; 431 stats.maxhp = stats.hp;
421 } 432 }
422 433
423 /* The archs just need to be updated for this */ 434 /* The archs just need to be updated for this */
424 if (move_type == 0) 435 if (move_type == 0)
… …
450 stats.maxhp = 0; 461 stats.maxhp = 0;
451 } 462 }
452 else 463 else
453 move_type = MOVE_WALK; 464 move_type = MOVE_WALK;
454 } 465 }
466 }
467
468 // if the object has an animation, try to provide a default face
469 if (has_anim ())
470 {
471 const animation &anim_ob = anim ();
472
473 if (anim_speed)
474 // if this item is time-animated, force the last frame
475 animate_object (this, 0);
476 else if (flag [FLAG_MONSTER])
477 // if it is a monster, set appropriate facing
478 animate_object (this, direction);
455 } 479 }
456} 480}
457 481
458static void 482static void
459set_move (MoveType &mt, const char *str) 483set_move (MoveType &mt, const char *str)
… …
519 543
520bool 544bool
521object::parse_kv (object_thawer &f) 545object::parse_kv (object_thawer &f)
522{ 546{
523 object *op_inv = inv; 547 object *op_inv = inv;
548 key_value *last_kv = key_values;
524 549
525 for (;;) 550 for (;;)
526 { 551 {
527 switch (f.kw) 552 switch (f.kw)
528 { 553 {
… …
549 case KW_race: f.get_ornull (race); break; 574 case KW_race: f.get_ornull (race); break;
550 case KW_slaying: f.get_ornull (slaying); break; 575 case KW_slaying: f.get_ornull (slaying); break;
551 case KW_tag: f.get_ornull (tag); break; 576 case KW_tag: f.get_ornull (tag); break;
552 577
553 case KW_arch: 578 case KW_arch:
554 {
555 object *tmp = object::read (f); 579 if (object *tmp = object::read (f))
556 tmp->deactivate ();
557
558 { 580 {
581 tmp->deactivate ();
582
559 // was: insert_ob_in_ob (tmp, op); 583 // was: insert_ob_in_ob (tmp, op);
560 // but manually adding it can improve map loading times a lot 584 // but manually adding it can improve map loading times a lot
561 // also, appending instead of prepending keeps the 585 // also, appending instead of prepending keeps the
562 // save ordering the same between repeated load/saves. 586 // save ordering the same between repeated load/saves.
563 // and finally we do not want any funny effects 587 // and finally we do not want any funny effects
… …
580 604
581 tmp->below = 0; 605 tmp->below = 0;
582 tmp->env = this; 606 tmp->env = this;
583 op_inv = tmp; 607 op_inv = tmp;
584 } 608 }
585 } 609 else
610 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
611
586 continue; 612 continue;
587 613
588 case KW_other_arch: 614 case KW_other_arch:
589 if (loading_arch == this) 615 if (loading_arch == this)
590 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); 616 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
… …
606 CLEAR_FLAG (this, FLAG_ANIMATE); 632 CLEAR_FLAG (this, FLAG_ANIMATE);
607 animation_id = 0; 633 animation_id = 0;
608 634
609 const char *str = f.get_str (); 635 const char *str = f.get_str ();
610 if (str && (animation_id = find_animation (str))) 636 if (str && (animation_id = find_animation (str)))
611 SET_FLAG (this, FLAG_ANIMATE); 637 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
612 } 638 }
613 break; 639 break;
614 640
615 case KW_last_heal: f.get (last_heal); break; 641 case KW_last_heal: f.get (last_heal); break;
616 case KW_last_sp: f.get (last_sp); break; 642 case KW_last_sp: f.get (last_sp); break;
… …
915 case KW_anim_speed: f.get (anim_speed); break; 941 case KW_anim_speed: f.get (anim_speed); break;
916 case KW_container: f.get (weight_limit); break; 942 case KW_container: f.get (weight_limit); break;
917 case KW_will_apply: f.get (will_apply); break; 943 case KW_will_apply: f.get (will_apply); break;
918 case KW_attack_movement: f.get (attack_movement); break; 944 case KW_attack_movement: f.get (attack_movement); break;
919 case KW_move_state: f.get (move_status); break; 945 case KW_move_state: f.get (move_status); break;
920 case KW_expmul: f.get (expmul); break; 946 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
921 case KW_glow_radius: f.get (glow_radius); break; 947 case KW_glow_radius: f.get (glow_radius); break;
922 case KW_weapontype: f.get (weapontype); break; 948 case KW_weapontype: f.get (weapontype); break;
923 case KW_tooltype: f.get (tooltype); break;
924 case KW_casting_time: f.get (casting_time); break; 949 case KW_casting_time: f.get (casting_time); break;
950
951 // elevation is deprecated
925 case KW_elevation: f.get (elevation); break; 952 case KW_elevation: break;
953
926 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 954 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
927 case KW_client_type: f.get (client_type); break; 955 case KW_client_type: f.get (client_type); break;
928 case KW_duration: f.get (duration); break; 956 case KW_duration: f.get (duration); break;
929 case KW_range: f.get (range); break; 957 case KW_range: f.get (range); break;
930 case KW_range_modifier: f.get (range_modifier); break; 958 case KW_range_modifier: f.get (range_modifier); break;
… …
949 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 977 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
950 case KW_can_apply: 978 case KW_can_apply:
951 break; 979 break;
952 980
953 case KW_connected: 981 case KW_connected:
954 add_button_link (this, map, f.get_sint32 ()); 982 {
983 shstr connected;
984
985 f.get (connected);
986 add_link (map, connected);
987 }
955 break; 988 break;
956 989
957 case KW_randomitems: 990 case KW_randomitems:
958 if (f.get_str ()) 991 if (f.get_str ())
959 { 992 {
… …
961 loading_arch 994 loading_arch
962 ? treasurelist::get (f.get_str ()) 995 ? treasurelist::get (f.get_str ())
963 : treasurelist::find (f.get_str ()); 996 : treasurelist::find (f.get_str ());
964 997
965 if (!randomitems) 998 if (!randomitems)
999 {
966 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1000 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1001 randomitems = treasurelist::get (shstr_none); // avoid crashes
1002 }
967 } 1003 }
968 else 1004 else
969 randomitems = 0; 1005 randomitems = 0;
970 break; 1006 break;
971 1007
… …
987 1023
988 f.next (); 1024 f.next ();
989 return true; 1025 return true;
990 1026
991 case KW_ERROR: 1027 case KW_ERROR:
992 set_ob_key_value (this, f.kw_str, f.value, true); 1028 // append as key value pair (do not use kv_set as it prepends)
1029 // we also do not even try to find old values, duplicate keys stay duplicate
1030 {
1031 key_value *kv = new key_value;
1032
1033 kv->next = 0;
1034 kv->key = shstr (f.kw_str);
1035 kv->value = shstr (f.value);
1036
1037 if (!last_kv)
1038 key_values = last_kv = kv;
1039 else
1040 {
1041 while (last_kv->next)
1042 last_kv = last_kv->next;
1043
1044 last_kv->next = kv;
1045 last_kv = kv;
1046 }
1047 }
993 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1048 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
994 break; 1049 break;
995 1050
996 default: 1051 default:
997 if (!f.parse_error ("object", name)) 1052 if (!f.parse_error ("object", name))
… …
1018 1073
1019 assert (arch); //D maybe use exception handling of sorts? 1074 assert (arch); //D maybe use exception handling of sorts?
1020 1075
1021 f.next (); 1076 f.next ();
1022 1077
1023 object *op = object::create (); 1078 object *op = arch->instance ();
1024
1025 op->map = map; 1079 op->map = map;
1026 arch->copy_to (op);
1027 // copy_to activates, this should be fixed properly 1080 // instance() activates, this should be fixed properly
1028 op->deactivate (); 1081 op->deactivate ();
1029 1082
1030 if (!op->parse_kv (f)) 1083 if (!op->parse_kv (f))
1031 { 1084 {
1032 op->destroy (true); 1085 op->destroy ();
1033 return 0; 1086 return 0;
1034 } 1087 }
1035 1088
1036 op->post_load_check (); 1089 op->post_load_check ();
1037 return op; 1090 return op;
… …
1048{ 1101{
1049 object_thawer f (buf, (AV *)0); 1102 object_thawer f (buf, (AV *)0);
1050 1103
1051 return op->parse_kv (f); 1104 return op->parse_kv (f);
1052} 1105}
1053
1054/* This returns a string of the integer movement type */
1055#if 0
1056// unused function
1057static char *
1058get_string_move_type (MoveType mt)
1059{
1060 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1061 int i, all_count = 0, count;
1062
1063 strcpy (retbuf, "");
1064 strcpy (retbuf_all, " all");
1065
1066 /* Quick check, and probably fairly common */
1067 if (mt == MOVE_ALL)
1068 return retbuf_all + 1;
1069 if (mt == 0)
1070 {
1071 strcpy (retbuf, "0");
1072 return retbuf;
1073 }
1074
1075 /* We basically slide the bits down. Why look at MOVE_ALL?
1076 * because we may want to return a string like 'all -swim',
1077 * and if we just looked at mt, we couldn't get that.
1078 */
1079 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1080 {
1081 if (mt & (1 << count))
1082 {
1083 strcat (retbuf, " ");
1084 strcat (retbuf, move_name[count]);
1085 }
1086 else
1087 {
1088 strcat (retbuf_all, " -");
1089 strcat (retbuf_all, move_name[count]);
1090 all_count++;
1091 }
1092 }
1093 /* Basically, if there is a single negation, return it, eg
1094 * 'all -swim'. But more than that, just return the
1095 * enumerated values. It doesn't make sense to return
1096 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1097 */
1098 if (all_count <= 1)
1099 return retbuf_all + 1;
1100 else
1101 return retbuf + 1;
1102}
1103#endif
1104 1106
1105// compare *op against *tmp and output differences 1107// compare *op against *tmp and output differences
1106static void 1108static void
1107write_diff (object_freezer &f, object *op, object *tmp) 1109write_diff (object_freezer &f, object *op, object *tmp)
1108{ 1110{
… …
1242 /* 110 */ 1244 /* 110 */
1243 KW_destroy_on_death, 1245 KW_destroy_on_death,
1244 KW_NULL, 1246 KW_NULL,
1245 }; 1247 };
1246 1248
1247 int i;
1248
1249 /* This saves the key/value lists. We do it first so that any 1249 /* This saves the key/value lists. We do it first so that any
1250 * keys that match field names will be overwritten by the loader. 1250 * keys that match field names will be overwritten by the loader.
1251 */ 1251 */
1252 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1252 for (key_value *kv = op->key_values; kv; kv = kv->next)
1253 { 1253 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1254 /* Find the field in the opposing member. */ 1254 f.put (kv->key, kv->value);
1255 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1256
1257 /* If there's no partnering field, or it's got a different value, save our field. */
1258 if (!arch_field || my_field->value != arch_field->value)
1259 f.put (my_field->key, my_field->value);
1260 }
1261 1255
1262 /* We don't need to worry about the arch's extra fields - they 1256 /* We don't need to worry about the arch's extra fields - they
1263 * will get taken care of the copy_to method. 1257 * will get taken care of the copy_to method.
1264 */ 1258 */
1265 1259
1260 if (op->uuid)
1266 f.put (KW_uuid, op->uuid.c_str ()); 1261 f.put (KW_uuid, op->uuid.c_str ());
1267 1262
1268#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1263#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v)
1269#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1264#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v)
1270 1265
1271 if (object *owner = op->owner) 1266 if (object *owner = op->owner)
… …
1287 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1282 if (op->face != tmp->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); 1283 if (op->sound != tmp->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); 1284 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1290 1285
1291 if (op->animation_id != tmp->animation_id) 1286 if (op->animation_id != tmp->animation_id)
1292 if (op->animation_id) 1287 if (op->has_anim ())
1288 f.put (KW_animation, op->anim ().name);
1289 else
1293 { 1290 {
1294 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1291 f.put (KW_animation, (const char *)0);
1295 1292 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 } 1293 }
1299 else
1300 f.put (KW_animation, (const char *)0);
1301 1294
1302 CMP_OUT2 (str, stats.Str); 1295 CMP_OUT2 (str, stats.Str);
1303 CMP_OUT2 (dex, stats.Dex); 1296 CMP_OUT2 (dex, stats.Dex);
1304 CMP_OUT2 (con, stats.Con); 1297 CMP_OUT2 (con, stats.Con);
1305 CMP_OUT2 (wis, stats.Wis); 1298 CMP_OUT2 (wis, stats.Wis);
… …
1335 CMP_OUT (direction); 1328 CMP_OUT (direction);
1336 CMP_OUT (type); 1329 CMP_OUT (type);
1337 CMP_OUT (subtype); 1330 CMP_OUT (subtype);
1338 CMP_OUT (attacktype); 1331 CMP_OUT (attacktype);
1339 1332
1340 for (i = 0; i < NROFATTACKS; i++) 1333 for (int i = 0; i < NROFATTACKS; i++)
1341 if (expect_false (op->resist[i] != tmp->resist[i])) 1334 if (expect_false (op->resist[i] != tmp->resist[i]))
1342 f.put (resist_save[i], op->resist[i]); 1335 f.put (resist_save[i], op->resist[i]);
1343 1336
1344 CMP_OUT (path_attuned); 1337 CMP_OUT (path_attuned);
1345 CMP_OUT (path_repelled); 1338 CMP_OUT (path_repelled);
… …
1356 CMP_OUT (last_sp); 1349 CMP_OUT (last_sp);
1357 CMP_OUT (last_grace); 1350 CMP_OUT (last_grace);
1358 CMP_OUT (last_eat); 1351 CMP_OUT (last_eat);
1359 CMP_OUT (glow_radius); 1352 CMP_OUT (glow_radius);
1360 1353
1361 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1354 if (op->flag [FLAG_IS_LINKED])
1355 if (auto (ol, op->find_link ()))
1362 f.put (KW_connected, i); 1356 f.put (KW_connected, ol->id);
1363 1357
1364 CMP_OUT (randomitems); 1358 CMP_OUT (randomitems);
1365 CMP_OUT2 (container, weight_limit); 1359 CMP_OUT2 (container, weight_limit);
1366 1360
1367 CMP_OUT (run_away); 1361 CMP_OUT (run_away);
1368 CMP_OUT (pick_up); 1362 CMP_OUT (pick_up);
1369 CMP_OUT (will_apply); 1363 CMP_OUT (will_apply);
1370 CMP_OUT (smoothlevel); 1364 CMP_OUT (smoothlevel);
1371 CMP_OUT (weapontype); 1365 CMP_OUT (weapontype);
1372 CMP_OUT (tooltype);
1373 CMP_OUT (elevation);
1374 CMP_OUT (client_type); 1366 CMP_OUT (client_type);
1375 CMP_OUT (item_power); 1367 CMP_OUT (item_power);
1376 CMP_OUT (duration); 1368 CMP_OUT (duration);
1377 CMP_OUT (range); 1369 CMP_OUT (range);
1378 CMP_OUT (range_modifier); 1370 CMP_OUT (range_modifier);
… …
1387 CMP_OUT (move_off); 1379 CMP_OUT (move_off);
1388 CMP_OUT (move_slow); 1380 CMP_OUT (move_slow);
1389 CMP_OUT (move_slow_penalty); 1381 CMP_OUT (move_slow_penalty);
1390 1382
1391 if (op->flag != tmp->flag) 1383 if (op->flag != tmp->flag)
1392 for (i = 0; i <= NUM_FLAGS; i++) 1384 for (int i = 0; i <= NUM_FLAGS; i++)
1393 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1385 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1394 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1386 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1395 1387
1396 // save body locations 1388 // save body locations
1397 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1389 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1398 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1390 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1399 f.put (body_locations[i].save_name, op->slot[i].info); 1391 f.put (body_locations[i].save_name, op->slot[i].info);
1400} 1392}
1401 1393
1402/* 1394/*
… …
1405 * the only place this is not set is when saving the player. 1397 * the only place this is not set is when saving the player.
1406 */ 1398 */
1407bool 1399bool
1408object::write (object_freezer &f) 1400object::write (object_freezer &f)
1409{ 1401{
1410 archetype *at = arch ? arch : archetype::empty; 1402 if (is_arch ())
1411 1403 {
1404 f.put (KW_object, arch->archname);
1405 write_diff (f, this, archetype::empty);
1406 }
1407 else
1408 {
1412 f.put (KW_arch, at->archname); 1409 f.put (KW_arch, arch->archname);
1413 write_diff (f, this, at); 1410 write_diff (f, this, arch);
1411 }
1414 1412
1415 for (object *tmp = inv; tmp; tmp = tmp->below) 1413 for (object *tmp = inv; tmp; tmp = tmp->below)
1416 tmp->write (f); 1414 tmp->write (f);
1417 1415
1418 f.put (this); 1416 f.put (this);

Diff Legend

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