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.120 by root, Thu Sep 11 12:43:17 2008 UTC vs.
Revision 1.145 by root, Tue Nov 10 16:29:20 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>
… …
26#include <sproto.h> 27#include <sproto.h>
27 28
28///////////////////////////////////////////////////////////////////////////// 29/////////////////////////////////////////////////////////////////////////////
29 30
30extern archetype *loading_arch; 31extern archetype *loading_arch;
32
33//+GPL
31 34
32/* 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
33 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
34 * 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
35 * 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
… …
257void 260void
258object::post_load_check () 261object::post_load_check ()
259{ 262{
260 if (type >= NUM_TYPES) 263 if (type >= NUM_TYPES)
261 { 264 {
262 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 ());
263 type = 0; 266 type = 0;
264 } 267 }
265 268
266 switch (type) 269 switch (type)
267 { 270 {
… …
269 case WAND: 272 case WAND:
270 case ROD: 273 case ROD:
271 case HORN: 274 case HORN:
272 if (slot [body_range].info != -1) 275 if (slot [body_range].info != -1)
273 { 276 {
274 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);
275 slot [body_range].info = -1; 278 slot [body_range].info = -1;
276 } 279 }
277 break; 280 break;
278 281
279 case WEAPON: 282 case WEAPON:
280 if (slot [body_combat].info != -1) 283 if (slot [body_combat].info != -1)
281 { 284 {
282 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);
283 slot [body_combat].info = -1; 286 slot [body_combat].info = -1;
284 } 287 }
285 break; 288 break;
286 289
287 case SHIELD: 290 case SHIELD:
288 if (slot [body_shield].info != -1) 291 if (slot [body_shield].info != -1)
289 { 292 {
290 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);
291 slot [body_shield].info = -1; 294 slot [body_shield].info = -1;
292 } 295 }
293 break; 296 break;
294 297
295 case PLAYER: 298 case PLAYER:
296 if (slot [body_shield].info != 1) 299 if (slot [body_shield].info != 1)
297 { 300 {
298 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);
299 slot [body_shield].info = 1; 302 slot [body_shield].info = 1;
300 } 303 }
301 304
302 if (slot [body_combat].info != 1) 305 if (slot [body_combat].info != 1)
303 { 306 {
304 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);
305 slot [body_combat].info = 1; 308 slot [body_combat].info = 1;
306 } 309 }
307 310
308 if (slot [body_range].info != 1) 311 if (slot [body_range].info != 1)
309 { 312 {
310 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);
311 slot [body_range].info = 1; 314 slot [body_range].info = 1;
312 } 315 }
313 break; 316 break;
314 } 317 }
315 318
… …
327 330
328 if (!name_pl) 331 if (!name_pl)
329 name_pl = name; 332 name_pl = name;
330 333
331 /* objects now have a materialname. try to patch it in */ 334 /* objects now have a materialname. try to patch it in */
332 if (!(is_weapon () && level > 0)) 335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
333 set_materialname (this, map ? map->difficulty : 5, 0); 336 select_material (this, map ? map->difficulty : 5);
334 337
335 /* only do these when program is first run - a bit 338 /* only do these when program is first run - a bit
336 * excessive to do this at every run - most of this is 339 * excessive to do this at every run - most of this is
337 * really just to catch any errors - program will still run, but 340 * really just to catch any errors - program will still run, but
338 * not in the ideal fashion. 341 * not in the ideal fashion.
339 */ 342 */
340 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))
341 { 344 {
342 if (!skill) 345 if (!skill)
343 LOG (llevError, "Weapon %s lacks a skill.\n", debug_desc ()); 346 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
344 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) ||
345 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 348 (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); 349 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
347 } 350 }
348 351
349 /* 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
350 * really does for many objects. Need to catch any in maps 353 * really does for many objects. Need to catch any in maps
351 * that may have an old value. 354 * that may have an old value.
… …
357 || type == AMULET || type == GIRDLE 360 || type == AMULET || type == GIRDLE
358 || type == BRACERS || type == CLOAK) 361 || type == BRACERS || type == CLOAK)
359 { 362 {
360 if (last_heal) 363 if (last_heal)
361 { 364 {
362 LOG (llevError, "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 ());
363 gen_sp_armour = last_heal; 366 gen_sp_armour = last_heal;
364 last_heal = 0; 367 last_heal = 0;
365 } 368 }
366 369
367 int ip = calc_item_power (this, 0); 370 int ip = calc_item_power (this, 0);
368 371
369 /* Legacy objects from before item power was in the game */ 372 /* Legacy objects from before item power was in the game */
370 if (!item_power && ip) 373 if (!item_power && ip)
371 { 374 {
372 if (ip > 3) 375 if (ip > 3)
373 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);
374 377
375 item_power = ip; 378 item_power = ip;
376 } 379 }
377 380
378 /* Check for possibly bogus values. Has to meet both these criteria - 381 /* Check for possibly bogus values. Has to meet both these criteria -
… …
412 } 415 }
413 416
414 /* 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 */
415 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 418 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
416 { 419 {
417 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ()); 420 LOG (llevError, "ITEMBUG: spellbook/rune found without inv but slaying: %s", debug_desc ());
418 object *tmp = get_archetype_by_object_name (slaying); 421 object *tmp = get_archetype_by_object_name (slaying);
419 insert_ob_in_ob (tmp, this); 422 insert_ob_in_ob (tmp, this);
420 randomitems = 0; /* So another spell isn't created for this object */ 423 randomitems = 0; /* So another spell isn't created for this object */
421 /* without this, value is all screwed up */ 424 /* without this, value is all screwed up */
422 value = arch->value * inv->value; 425 value = arch->value * inv->value;
… …
424 427
425 if (QUERY_FLAG (this, FLAG_MONSTER)) 428 if (QUERY_FLAG (this, FLAG_MONSTER))
426 { 429 {
427 if (stats.hp > stats.maxhp) 430 if (stats.hp > stats.maxhp)
428 { 431 {
429 LOG (llevInfo, "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);
430 stats.maxhp = stats.hp; 433 stats.maxhp = stats.hp;
431 } 434 }
432 435
433 /* The archs just need to be updated for this */ 436 /* The archs just need to be updated for this */
434 if (move_type == 0) 437 if (move_type == 0)
… …
460 stats.maxhp = 0; 463 stats.maxhp = 0;
461 } 464 }
462 else 465 else
463 move_type = MOVE_WALK; 466 move_type = MOVE_WALK;
464 } 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);
465 } 481 }
466} 482}
467 483
468static void 484static void
469set_move (MoveType &mt, const char *str) 485set_move (MoveType &mt, const char *str)
… …
523 539
524next: ; 540next: ;
525 } 541 }
526} 542}
527 543
544//-GPL
545
528#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () 546#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
529 547
530bool 548bool
531object::parse_kv (object_thawer &f) 549object::parse_kv (object_thawer &f)
532{ 550{
… …
560 case KW_race: f.get_ornull (race); break; 578 case KW_race: f.get_ornull (race); break;
561 case KW_slaying: f.get_ornull (slaying); break; 579 case KW_slaying: f.get_ornull (slaying); break;
562 case KW_tag: f.get_ornull (tag); break; 580 case KW_tag: f.get_ornull (tag); break;
563 581
564 case KW_arch: 582 case KW_arch:
565 {
566 object *tmp = object::read (f); 583 if (object *tmp = object::read (f))
567 tmp->deactivate ();
568
569 { 584 {
585 tmp->deactivate ();
586
570 // was: insert_ob_in_ob (tmp, op); 587 // was: insert_ob_in_ob (tmp, op);
571 // but manually adding it can improve map loading times a lot 588 // but manually adding it can improve map loading times a lot
572 // also, appending instead of prepending keeps the 589 // also, appending instead of prepending keeps the
573 // save ordering the same between repeated load/saves. 590 // save ordering the same between repeated load/saves.
574 // and finally we do not want any funny effects 591 // and finally we do not want any funny effects
… …
591 608
592 tmp->below = 0; 609 tmp->below = 0;
593 tmp->env = this; 610 tmp->env = this;
594 op_inv = tmp; 611 op_inv = tmp;
595 } 612 }
596 } 613 else
614 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
615
597 continue; 616 continue;
598 617
599 case KW_other_arch: 618 case KW_other_arch:
600 if (loading_arch == this) 619 if (loading_arch == this)
601 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); 620 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
… …
706 case KW_invisible: f.get (invisible); break; 725 case KW_invisible: f.get (invisible); break;
707 case KW_magic: f.get (magic); break; 726 case KW_magic: f.get (magic); break;
708 case KW_state: f.get (state); break; 727 case KW_state: f.get (state); break;
709 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 728 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
710 case KW_material: f.get (materials); break; //TODO: nuke 729 case KW_material: f.get (materials); break; //TODO: nuke
711 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;
712 738
713 /* These are the new values */ 739 /* These are the new values */
714 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;
715 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;
716 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;
… …
926 case KW_anim_speed: f.get (anim_speed); break; 952 case KW_anim_speed: f.get (anim_speed); break;
927 case KW_container: f.get (weight_limit); break; 953 case KW_container: f.get (weight_limit); break;
928 case KW_will_apply: f.get (will_apply); break; 954 case KW_will_apply: f.get (will_apply); break;
929 case KW_attack_movement: f.get (attack_movement); break; 955 case KW_attack_movement: f.get (attack_movement); break;
930 case KW_move_state: f.get (move_status); break; 956 case KW_move_state: f.get (move_status); break;
931 case KW_expmul: f.get (expmul); break; 957 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
932 case KW_glow_radius: f.get (glow_radius); break; 958 case KW_glow_radius: f.get (glow_radius); break;
933 case KW_weapontype: f.get (weapontype); break; 959 case KW_weapontype: f.get (weapontype); break;
934 case KW_tooltype: f.get (tooltype); break;
935 case KW_casting_time: f.get (casting_time); break; 960 case KW_casting_time: f.get (casting_time); break;
936 961
937 // elevation is deprecated 962 // elevation is deprecated
938 case KW_elevation: break; 963 case KW_elevation: break;
939 964
… …
963 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 988 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
964 case KW_can_apply: 989 case KW_can_apply:
965 break; 990 break;
966 991
967 case KW_connected: 992 case KW_connected:
968 add_button_link (this, map, f.get_sint32 ()); 993 {
994 shstr connected;
995
996 f.get (connected);
997 add_link (map, connected);
998 }
969 break; 999 break;
970 1000
971 case KW_randomitems: 1001 case KW_randomitems:
972 if (f.get_str ()) 1002 if (f.get_str ())
973 { 1003 {
… …
975 loading_arch 1005 loading_arch
976 ? treasurelist::get (f.get_str ()) 1006 ? treasurelist::get (f.get_str ())
977 : treasurelist::find (f.get_str ()); 1007 : treasurelist::find (f.get_str ());
978 1008
979 if (!randomitems) 1009 if (!randomitems)
1010 {
980 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1011 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1012 randomitems = treasurelist::get (shstr_none); // avoid crashes
1013 }
981 } 1014 }
982 else 1015 else
983 randomitems = 0; 1016 randomitems = 0;
984 break; 1017 break;
985 1018
… …
1044 archetype *arch = archetype::find (f.get_str ()); 1077 archetype *arch = archetype::find (f.get_str ());
1045 1078
1046 if (!arch) 1079 if (!arch)
1047 { 1080 {
1048 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1081 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1049 arch = archetype::find ("earthwall"); 1082 arch = archetype::find (shstr_earthwall);
1050 } 1083 }
1051 1084
1052 assert (arch); //D maybe use exception handling of sorts? 1085 assert (arch); //D maybe use exception handling of sorts?
1053 1086
1054 f.next (); 1087 f.next ();
… …
1058 // instance() activates, this should be fixed properly 1091 // instance() activates, this should be fixed properly
1059 op->deactivate (); 1092 op->deactivate ();
1060 1093
1061 if (!op->parse_kv (f)) 1094 if (!op->parse_kv (f))
1062 { 1095 {
1063 op->destroy (true); 1096 op->destroy ();
1064 return 0; 1097 return 0;
1065 } 1098 }
1066 1099
1067 op->post_load_check (); 1100 op->post_load_check ();
1068 return op; 1101 return op;
… …
1080 object_thawer f (buf, (AV *)0); 1113 object_thawer f (buf, (AV *)0);
1081 1114
1082 return op->parse_kv (f); 1115 return op->parse_kv (f);
1083} 1116}
1084 1117
1085/* This returns a string of the integer movement type */
1086#if 0
1087// unused function
1088static char *
1089get_string_move_type (MoveType mt)
1090{
1091 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1092 int i, all_count = 0, count;
1093
1094 strcpy (retbuf, "");
1095 strcpy (retbuf_all, " all");
1096
1097 /* Quick check, and probably fairly common */
1098 if (mt == MOVE_ALL)
1099 return retbuf_all + 1;
1100 if (mt == 0)
1101 {
1102 strcpy (retbuf, "0");
1103 return retbuf;
1104 }
1105
1106 /* We basically slide the bits down. Why look at MOVE_ALL?
1107 * because we may want to return a string like 'all -swim',
1108 * and if we just looked at mt, we couldn't get that.
1109 */
1110 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1111 {
1112 if (mt & (1 << count))
1113 {
1114 strcat (retbuf, " ");
1115 strcat (retbuf, move_name[count]);
1116 }
1117 else
1118 {
1119 strcat (retbuf_all, " -");
1120 strcat (retbuf_all, move_name[count]);
1121 all_count++;
1122 }
1123 }
1124 /* Basically, if there is a single negation, return it, eg
1125 * 'all -swim'. But more than that, just return the
1126 * enumerated values. It doesn't make sense to return
1127 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1128 */
1129 if (all_count <= 1)
1130 return retbuf_all + 1;
1131 else
1132 return retbuf + 1;
1133}
1134#endif
1135
1136// compare *op against *tmp and output differences 1118// compare *op against *arch and output differences
1137static void 1119static void
1138write_diff (object_freezer &f, object *op, object *tmp) 1120write_diff (object_freezer &f, object *op, object *arch)
1139{ 1121{
1140 static const keyword resist_save[NROFATTACKS] = { 1122 static const keyword resist_save[NROFATTACKS] = {
1141# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1123# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1142# include "attackinc.h" 1124# include "attackinc.h"
1143# undef def 1125# undef def
… …
1157 KW_applied, 1139 KW_applied,
1158 KW_unpaid, 1140 KW_unpaid,
1159 KW_can_use_shield, 1141 KW_can_use_shield,
1160 KW_no_pick, 1142 KW_no_pick,
1161 KW_NULL, // walk_on 1143 KW_NULL, // walk_on
1144 /* 10 */
1162 KW_NULL, // no_pass 1145 KW_NULL, // no_pass
1163 /* 10 */
1164 KW_is_animated, 1146 KW_is_animated,
1165 KW_NULL, // slow_move 1147 KW_NULL, // slow_move
1166 KW_NULL, // flying 1148 KW_NULL, // flying
1167 KW_monster, 1149 KW_monster,
1168 KW_friendly, 1150 KW_friendly,
1169 KW_generator, 1151 KW_generator,
1170 KW_is_thrown, 1152 KW_is_thrown,
1171 KW_auto_apply, 1153 KW_auto_apply,
1172 KW_treasure_env, 1154 KW_treasure_env,
1155 /* 20 */
1173 KW_player_sold, 1156 KW_player_sold,
1174 /* 20 */
1175 KW_see_invisible, 1157 KW_see_invisible,
1176 KW_can_roll, 1158 KW_can_roll,
1177 KW_overlay_floor, 1159 KW_overlay_floor,
1178 KW_is_turnable, 1160 KW_is_turnable,
1179 KW_NULL, // walk_off 1161 KW_NULL, // walk_off
1180 KW_NULL, // fly_on 1162 KW_NULL, // fly_on
1181 KW_NULL, // fly_off 1163 KW_NULL, // fly_off
1182 KW_is_used_up, 1164 KW_is_used_up,
1183 KW_identified, 1165 KW_identified,
1166 /* 30 */
1184 KW_reflecting, 1167 KW_reflecting,
1185 /* 30 */
1186 KW_changing, 1168 KW_changing,
1187 KW_splitting, 1169 KW_splitting,
1188 KW_hitback, 1170 KW_hitback,
1189 KW_startequip, 1171 KW_startequip,
1190 KW_blocksview, 1172 KW_blocksview,
1191 KW_undead, 1173 KW_undead,
1192 KW_scared, 1174 KW_scared,
1193 KW_unaggressive, 1175 KW_unaggressive,
1194 KW_reflect_missile, 1176 KW_reflect_missile,
1177 /* 40 */
1195 KW_reflect_spell, 1178 KW_reflect_spell,
1196 /* 40 */
1197 KW_no_magic, 1179 KW_no_magic,
1198 KW_no_fix_player, 1180 KW_no_fix_player,
1199 KW_is_lightable, 1181 KW_is_lightable,
1200 KW_tear_down, 1182 KW_tear_down,
1201 KW_run_away, 1183 KW_run_away,
1202 KW_NULL, // pass_thru 1184 KW_NULL, // pass_thru
1203 KW_NULL, // an_pass_thru 1185 KW_NULL, // an_pass_thru
1204 KW_pick_up, 1186 KW_pick_up,
1205 KW_unique, 1187 KW_unique,
1188 /* 50 */
1206 KW_no_drop, 1189 KW_no_drop,
1207 /* 50 */
1208 KW_NULL, // wizcast 1190 KW_NULL, // wizcast
1209 KW_can_cast_spell, 1191 KW_can_cast_spell,
1210 KW_can_use_scroll, 1192 KW_can_use_scroll,
1211 KW_can_use_range, 1193 KW_can_use_range,
1212 KW_can_use_bow, 1194 KW_can_use_bow,
1213 KW_can_use_armour, 1195 KW_can_use_armour,
1214 KW_can_use_weapon, 1196 KW_can_use_weapon,
1215 KW_can_use_ring, 1197 KW_can_use_ring,
1216 KW_has_ready_range, 1198 KW_has_ready_range,
1199 /* 60 */
1217 KW_has_ready_bow, 1200 KW_has_ready_bow,
1218 /* 60 */
1219 KW_xrays, 1201 KW_xrays,
1220 KW_NULL, 1202 KW_NULL,
1221 KW_is_floor, 1203 KW_is_floor,
1222 KW_lifesave, 1204 KW_lifesave,
1223 KW_no_strength, 1205 KW_no_strength,
1224 KW_sleep, 1206 KW_sleep,
1225 KW_stand_still, 1207 KW_stand_still,
1226 KW_random_move, 1208 KW_random_move,
1227 KW_only_attack, 1209 KW_only_attack,
1210 /* 70 */
1228 KW_confused, 1211 KW_confused,
1229 /* 70 */
1230 KW_stealth, 1212 KW_stealth,
1231 KW_NULL, 1213 KW_NULL,
1232 KW_NULL, 1214 KW_NULL,
1233 KW_cursed, 1215 KW_cursed,
1234 KW_damned, 1216 KW_damned,
1235 KW_see_anywhere, 1217 KW_see_anywhere,
1236 KW_known_magical, 1218 KW_known_magical,
1237 KW_known_cursed, 1219 KW_known_cursed,
1238 KW_can_use_skill, 1220 KW_can_use_skill,
1221 /* 80 */
1239 KW_been_applied, 1222 KW_been_applied,
1240 /* 80 */
1241 KW_has_ready_scroll, 1223 KW_has_ready_scroll,
1242 KW_can_use_rod, 1224 KW_can_use_rod,
1243 KW_precious, 1225 KW_precious,
1244 KW_can_use_horn, 1226 KW_can_use_horn,
1245 KW_make_invisible, 1227 KW_make_invisible,
1246 KW_inv_locked, 1228 KW_inv_locked,
1247 KW_is_wooded, 1229 KW_is_wooded,
1248 KW_is_hilly, 1230 KW_is_hilly,
1249 KW_has_ready_skill, 1231 KW_has_ready_skill,
1232 /* 90 */
1250 KW_has_ready_weapon, 1233 KW_has_ready_weapon,
1251 /* 90 */
1252 KW_no_skill_ident, 1234 KW_no_skill_ident,
1253 KW_is_blind, 1235 KW_is_blind,
1254 KW_can_see_in_dark, 1236 KW_can_see_in_dark,
1255 KW_is_cauldron, 1237 KW_is_cauldron,
1256 KW_NULL, 1238 KW_NULL,
1257 KW_no_steal, 1239 KW_no_steal,
1258 KW_one_hit, 1240 KW_one_hit,
1259 KW_NULL, 1241 KW_NULL,
1260 KW_berserk, 1242 KW_berserk,
1243 /* 100 */
1261 KW_neutral, 1244 KW_neutral,
1262 /* 100 */
1263 KW_no_attack, 1245 KW_no_attack,
1264 KW_no_damage, 1246 KW_no_damage,
1265 KW_obj_original, 1247 KW_obj_original,
1266 KW_NULL, 1248 KW_NULL,
1267 KW_activate_on_push, 1249 KW_activate_on_push,
1268 KW_activate_on_release, 1250 KW_activate_on_release,
1269 KW_is_water, 1251 KW_is_water,
1270 KW_use_content_on_gen, 1252 KW_use_content_on_gen,
1271 KW_NULL, 1253 KW_NULL,
1254 /* 110 */
1272 KW_is_buildable, 1255 KW_is_buildable,
1273 /* 110 */
1274 KW_destroy_on_death, 1256 KW_destroy_on_death,
1275 KW_NULL, 1257 KW_NULL,
1276 }; 1258 };
1259
1260 // obj_original is the only commonly differing flag between archetype
1261 // and object, so special-case it here to be able to skip the loop
1262 static const struct flagmask : object::flags_t
1263 {
1264 flagmask ()
1265 {
1266 for (int i = 0; i < NUM_FLAGS; i++)
1267 if (flag_names [i])
1268 set (i);
1269 }
1270 } flagmask;
1277 1271
1278 /* This saves the key/value lists. We do it first so that any 1272 /* This saves the key/value lists. We do it first so that any
1279 * keys that match field names will be overwritten by the loader. 1273 * keys that match field names will be overwritten by the loader.
1280 */ 1274 */
1281 for (key_value *kv = op->key_values; kv; kv = kv->next) 1275 for (key_value *kv = op->key_values; kv; kv = kv->next)
1282 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1276 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1283 f.put (kv->key, kv->value); 1277 f.put (kv->key, kv->value);
1284 1278
1285 /* We don't need to worry about the arch's extra fields - they 1279 if (op->uuid)
1286 * will get taken care of the copy_to method. 1280 {
1287 */ 1281 // highly optimised - this is often 25% of all data written
1282 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1283 char *ptr = cur;
1288 1284
1289 f.put (KW_uuid, op->uuid.c_str ()); 1285 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1286 ptr += sizeof ("uuid ") - 1;
1287 ptr = op->uuid.append (ptr);
1288 *ptr++ = '\n';
1290 1289
1290 f.alloc (ptr - cur);
1291 }
1292
1291#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1293#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW_ ## v, op->v)
1292#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1294#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v)
1295
1296 CMP_OUT (x);
1297 CMP_OUT (y);
1298
1299 CMP_OUT (type);
1300 CMP_OUT (subtype);
1301 CMP_OUT (direction);
1302
1303 CMP_OUT (name);
1304 CMP_OUT (name_pl);
1305
1306 CMP_OUT (speed);
1307 CMP_OUT (speed_left);
1308
1309 CMP_OUT (title);
1310 CMP_OUT (race);
1311 CMP_OUT (slaying);
1312 CMP_OUT (skill);
1313
1314 CMP_OUT (tag);
1315 CMP_OUT (custom_name);
1293 1316
1294 if (object *owner = op->owner) 1317 if (object *owner = op->owner)
1295 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1318 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1296 1319
1297 CMP_OUT (name); 1320 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1298 CMP_OUT (name_pl); 1321
1299 CMP_OUT (custom_name);
1300 CMP_OUT (title);
1301 CMP_OUT (race);
1302 CMP_OUT (skill);
1303 CMP_OUT (slaying);
1304 CMP_OUT (tag);
1305 CMP_OUT (other_arch); 1322 CMP_OUT (other_arch);
1306 1323
1307 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1324 if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1308 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1325 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore);
1309 1326
1310 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1327 if (op->face != arch->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1311 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1328 if (op->sound != arch->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1312 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1329 if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1313 1330
1314 if (op->animation_id != tmp->animation_id) 1331 if (op->animation_id != arch->animation_id)
1315 if (op->animation_id) 1332 if (op->has_anim ())
1316 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1333 f.put (KW_animation, op->anim ().name);
1317 else 1334 else
1318 { 1335 {
1319 f.put (KW_animation, (const char *)0); 1336 f.put (KW_animation, (const char *)0);
1320 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1337 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1321 } 1338 }
… …
1335 CMP_OUT2 (grace, stats.grace); 1352 CMP_OUT2 (grace, stats.grace);
1336 CMP_OUT2 (maxgrace, stats.maxgrace); 1353 CMP_OUT2 (maxgrace, stats.maxgrace);
1337 CMP_OUT2 (exp, stats.exp); 1354 CMP_OUT2 (exp, stats.exp);
1338 1355
1339 CMP_OUT (perm_exp); 1356 CMP_OUT (perm_exp);
1340 CMP_OUT (expmul); 1357 //CMP_OUT (expmul);
1341 1358
1342 CMP_OUT2 (food, stats.food); 1359 CMP_OUT2 (food, stats.food);
1343 CMP_OUT2 (dam, stats.dam); 1360 CMP_OUT2 (dam, stats.dam);
1344 CMP_OUT2 (luck, stats.luck); 1361 CMP_OUT2 (luck, stats.luck);
1345 CMP_OUT2 (wc, stats.wc); 1362 CMP_OUT2 (wc, stats.wc);
1346 CMP_OUT2 (ac, stats.ac); 1363 CMP_OUT2 (ac, stats.ac);
1347 1364
1348 CMP_OUT (x);
1349 CMP_OUT (y);
1350 CMP_OUT (speed);
1351 CMP_OUT (speed_left);
1352 CMP_OUT2 (move_state, move_status); 1365 CMP_OUT2 (move_state, move_status);
1353 CMP_OUT (attack_movement); 1366 CMP_OUT (attack_movement);
1354 CMP_OUT (nrof); 1367 CMP_OUT (nrof);
1355 CMP_OUT (level); 1368 CMP_OUT (level);
1356 CMP_OUT (direction);
1357 CMP_OUT (type);
1358 CMP_OUT (subtype);
1359 CMP_OUT (attacktype); 1369 CMP_OUT (attacktype);
1360 1370
1371 // using memcmp here seems to be a loss - is gcc vectorising?
1361 for (int i = 0; i < NROFATTACKS; i++) 1372 for (int i = 0; i < NROFATTACKS; i++)
1362 if (expect_false (op->resist[i] != tmp->resist[i])) 1373 if (expect_false (op->resist[i] != arch->resist[i]))
1363 f.put (resist_save[i], op->resist[i]); 1374 f.put (resist_save[i], op->resist[i]);
1364 1375
1365 CMP_OUT (path_attuned); 1376 CMP_OUT (path_attuned);
1366 CMP_OUT (path_repelled); 1377 CMP_OUT (path_repelled);
1367 CMP_OUT (path_denied); 1378 CMP_OUT (path_denied);
1379
1368 CMP_OUT2 (material, materials);//TODO: nuke 1380 CMP_OUT2 (material, materials);//TODO: nuke
1369 CMP_OUT (materialname); 1381 if (op->material != arch->material)
1382 f.put (KW_materialname, op->material->name);
1383
1370 CMP_OUT (value); 1384 CMP_OUT (value);
1371 CMP_OUT (carrying); 1385 CMP_OUT (carrying);
1372 CMP_OUT (weight); 1386 CMP_OUT (weight);
1373 CMP_OUT (invisible); 1387 CMP_OUT (invisible);
1374 CMP_OUT (state); 1388 CMP_OUT (state);
… …
1378 CMP_OUT (last_grace); 1392 CMP_OUT (last_grace);
1379 CMP_OUT (last_eat); 1393 CMP_OUT (last_eat);
1380 CMP_OUT (glow_radius); 1394 CMP_OUT (glow_radius);
1381 1395
1382 if (op->flag [FLAG_IS_LINKED]) 1396 if (op->flag [FLAG_IS_LINKED])
1383 if (int i = get_button_value (op)) 1397 if (auto (ol, op->find_link ()))
1384 f.put (KW_connected, i); 1398 f.put (KW_connected, ol->id);
1385 1399
1386 CMP_OUT (randomitems); 1400 CMP_OUT (randomitems);
1387 CMP_OUT2 (container, weight_limit); 1401 CMP_OUT2 (container, weight_limit);
1388 1402
1389 CMP_OUT (run_away); 1403 CMP_OUT (run_away);
1390 CMP_OUT (pick_up); 1404 CMP_OUT (pick_up);
1391 CMP_OUT (will_apply); 1405 CMP_OUT (will_apply);
1392 CMP_OUT (smoothlevel); 1406 CMP_OUT (smoothlevel);
1393 CMP_OUT (weapontype); 1407 CMP_OUT (weapontype);
1394 CMP_OUT (tooltype);
1395 CMP_OUT (client_type); 1408 CMP_OUT (client_type);
1396 CMP_OUT (item_power); 1409 CMP_OUT (item_power);
1397 CMP_OUT (duration); 1410 CMP_OUT (duration);
1398 CMP_OUT (range); 1411 CMP_OUT (range);
1399 CMP_OUT (range_modifier); 1412 CMP_OUT (range_modifier);
… …
1407 CMP_OUT (move_on); 1420 CMP_OUT (move_on);
1408 CMP_OUT (move_off); 1421 CMP_OUT (move_off);
1409 CMP_OUT (move_slow); 1422 CMP_OUT (move_slow);
1410 CMP_OUT (move_slow_penalty); 1423 CMP_OUT (move_slow_penalty);
1411 1424
1412 if (op->flag != tmp->flag) 1425 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1426
1427 if (diff [FLAG_OBJ_ORIGINAL])
1428 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0");
1429
1430 diff.reset (FLAG_OBJ_ORIGINAL);
1431
1432 // quickly test whether any other flags differ
1433 if (expect_true (diff.any ()))
1413 for (int i = 0; i <= NUM_FLAGS; i++) 1434 for (int i = 0; i < NUM_FLAGS; i++)
1414 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1435 if (expect_false (diff [i]))
1415 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1436 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1416 1437
1417 // save body locations 1438 // save body locations. gcc's memcmp does an abysmal job when used
1418 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1439 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1419 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1440 if (expect_false (op->slot[i].info != arch->slot[i].info))
1420 f.put (body_locations[i].save_name, op->slot[i].info); 1441 f.put (body_locations[i].save_name, op->slot[i].info);
1421} 1442}
1422 1443
1423/* 1444/*
1424 * Dumps all variables in an object to a file. 1445 * Dumps all variables in an object to a file.
… …
1426 * the only place this is not set is when saving the player. 1447 * the only place this is not set is when saving the player.
1427 */ 1448 */
1428bool 1449bool
1429object::write (object_freezer &f) 1450object::write (object_freezer &f)
1430{ 1451{
1431 archetype *at = arch ? arch : archetype::empty; 1452 if (is_arch ())
1432 1453 {
1454 f.put (KW_object, arch->archname);
1455 write_diff (f, this, archetype::empty);
1456 }
1457 else
1458 {
1433 f.put (KW_arch, at->archname); 1459 f.put (KW_arch, arch->archname);
1434 write_diff (f, this, at); 1460 write_diff (f, this, arch);
1461 }
1435 1462
1436 for (object *tmp = inv; tmp; tmp = tmp->below) 1463 for (object *tmp = inv; tmp; tmp = tmp->below)
1437 tmp->write (f); 1464 tmp->write (f);
1438 1465
1439 f.put (this); 1466 f.put (this);

Diff Legend

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