… | |
… | |
3 | * |
3 | * |
4 | * Copyright (©) 2005,2006,2007,2008,2009 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 | |
30 | extern archetype *loading_arch; |
31 | extern 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 |
… | |
… | |
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. |
… | |
… | |
535 | LOG (llevError, "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); |
536 | |
539 | |
537 | next: ; |
540 | next: ; |
538 | } |
541 | } |
539 | } |
542 | } |
|
|
543 | |
|
|
544 | //-GPL |
540 | |
545 | |
541 | #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () |
546 | #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () |
542 | |
547 | |
543 | bool |
548 | bool |
544 | object::parse_kv (object_thawer &f) |
549 | object::parse_kv (object_thawer &f) |
… | |
… | |
720 | case KW_invisible: f.get (invisible); break; |
725 | case KW_invisible: f.get (invisible); break; |
721 | case KW_magic: f.get (magic); break; |
726 | case KW_magic: f.get (magic); break; |
722 | case KW_state: f.get (state); break; |
727 | case KW_state: f.get (state); break; |
723 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
728 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
724 | case KW_material: f.get (materials); break; //TODO: nuke |
729 | case KW_material: f.get (materials); break; //TODO: nuke |
725 | 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; |
726 | |
738 | |
727 | /* These are the new values */ |
739 | /* These are the new values */ |
728 | 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; |
729 | 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; |
730 | 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; |
… | |
… | |
993 | loading_arch |
1005 | loading_arch |
994 | ? treasurelist::get (f.get_str ()) |
1006 | ? treasurelist::get (f.get_str ()) |
995 | : treasurelist::find (f.get_str ()); |
1007 | : treasurelist::find (f.get_str ()); |
996 | |
1008 | |
997 | if (!randomitems) |
1009 | if (!randomitems) |
|
|
1010 | { |
998 | 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 | } |
999 | } |
1014 | } |
1000 | else |
1015 | else |
1001 | randomitems = 0; |
1016 | randomitems = 0; |
1002 | break; |
1017 | break; |
1003 | |
1018 | |
… | |
… | |
1062 | archetype *arch = archetype::find (f.get_str ()); |
1077 | archetype *arch = archetype::find (f.get_str ()); |
1063 | |
1078 | |
1064 | if (!arch) |
1079 | if (!arch) |
1065 | { |
1080 | { |
1066 | 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 ()); |
1067 | arch = archetype::find ("earthwall"); |
1082 | arch = archetype::find (shstr_earthwall); |
1068 | } |
1083 | } |
1069 | |
1084 | |
1070 | assert (arch); //D maybe use exception handling of sorts? |
1085 | assert (arch); //D maybe use exception handling of sorts? |
1071 | |
1086 | |
1072 | f.next (); |
1087 | f.next (); |
… | |
… | |
1098 | object_thawer f (buf, (AV *)0); |
1113 | object_thawer f (buf, (AV *)0); |
1099 | |
1114 | |
1100 | return op->parse_kv (f); |
1115 | return op->parse_kv (f); |
1101 | } |
1116 | } |
1102 | |
1117 | |
1103 | /* This returns a string of the integer movement type */ |
|
|
1104 | #if 0 |
|
|
1105 | // unused function |
|
|
1106 | static char * |
|
|
1107 | get_string_move_type (MoveType mt) |
|
|
1108 | { |
|
|
1109 | static char retbuf[MAX_BUF], retbuf_all[MAX_BUF]; |
|
|
1110 | int i, all_count = 0, count; |
|
|
1111 | |
|
|
1112 | strcpy (retbuf, ""); |
|
|
1113 | strcpy (retbuf_all, " all"); |
|
|
1114 | |
|
|
1115 | /* Quick check, and probably fairly common */ |
|
|
1116 | if (mt == MOVE_ALL) |
|
|
1117 | return retbuf_all + 1; |
|
|
1118 | if (mt == 0) |
|
|
1119 | { |
|
|
1120 | strcpy (retbuf, "0"); |
|
|
1121 | return retbuf; |
|
|
1122 | } |
|
|
1123 | |
|
|
1124 | /* We basically slide the bits down. Why look at MOVE_ALL? |
|
|
1125 | * because we may want to return a string like 'all -swim', |
|
|
1126 | * and if we just looked at mt, we couldn't get that. |
|
|
1127 | */ |
|
|
1128 | for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++) |
|
|
1129 | { |
|
|
1130 | if (mt & (1 << count)) |
|
|
1131 | { |
|
|
1132 | strcat (retbuf, " "); |
|
|
1133 | strcat (retbuf, move_name[count]); |
|
|
1134 | } |
|
|
1135 | else |
|
|
1136 | { |
|
|
1137 | strcat (retbuf_all, " -"); |
|
|
1138 | strcat (retbuf_all, move_name[count]); |
|
|
1139 | all_count++; |
|
|
1140 | } |
|
|
1141 | } |
|
|
1142 | /* Basically, if there is a single negation, return it, eg |
|
|
1143 | * 'all -swim'. But more than that, just return the |
|
|
1144 | * enumerated values. It doesn't make sense to return |
|
|
1145 | * 'all -walk -fly_low' - it is shorter to return 'fly_high swim' |
|
|
1146 | */ |
|
|
1147 | if (all_count <= 1) |
|
|
1148 | return retbuf_all + 1; |
|
|
1149 | else |
|
|
1150 | return retbuf + 1; |
|
|
1151 | } |
|
|
1152 | #endif |
|
|
1153 | |
|
|
1154 | // compare *op against *tmp and output differences |
1118 | // compare *op against *arch and output differences |
1155 | static void |
1119 | static void |
1156 | write_diff (object_freezer &f, object *op, object *tmp) |
1120 | write_diff (object_freezer &f, object *op, object *arch) |
1157 | { |
1121 | { |
1158 | static const keyword resist_save[NROFATTACKS] = { |
1122 | static const keyword resist_save[NROFATTACKS] = { |
1159 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1123 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1160 | # include "attackinc.h" |
1124 | # include "attackinc.h" |
1161 | # undef def |
1125 | # undef def |
… | |
… | |
1175 | KW_applied, |
1139 | KW_applied, |
1176 | KW_unpaid, |
1140 | KW_unpaid, |
1177 | KW_can_use_shield, |
1141 | KW_can_use_shield, |
1178 | KW_no_pick, |
1142 | KW_no_pick, |
1179 | KW_NULL, // walk_on |
1143 | KW_NULL, // walk_on |
|
|
1144 | /* 10 */ |
1180 | KW_NULL, // no_pass |
1145 | KW_NULL, // no_pass |
1181 | /* 10 */ |
|
|
1182 | KW_is_animated, |
1146 | KW_is_animated, |
1183 | KW_NULL, // slow_move |
1147 | KW_NULL, // slow_move |
1184 | KW_NULL, // flying |
1148 | KW_NULL, // flying |
1185 | KW_monster, |
1149 | KW_monster, |
1186 | KW_friendly, |
1150 | KW_friendly, |
1187 | KW_generator, |
1151 | KW_generator, |
1188 | KW_is_thrown, |
1152 | KW_is_thrown, |
1189 | KW_auto_apply, |
1153 | KW_auto_apply, |
1190 | KW_treasure_env, |
1154 | KW_treasure_env, |
|
|
1155 | /* 20 */ |
1191 | KW_player_sold, |
1156 | KW_player_sold, |
1192 | /* 20 */ |
|
|
1193 | KW_see_invisible, |
1157 | KW_see_invisible, |
1194 | KW_can_roll, |
1158 | KW_can_roll, |
1195 | KW_overlay_floor, |
1159 | KW_overlay_floor, |
1196 | KW_is_turnable, |
1160 | KW_is_turnable, |
1197 | KW_NULL, // walk_off |
1161 | KW_NULL, // walk_off |
1198 | KW_NULL, // fly_on |
1162 | KW_NULL, // fly_on |
1199 | KW_NULL, // fly_off |
1163 | KW_NULL, // fly_off |
1200 | KW_is_used_up, |
1164 | KW_is_used_up, |
1201 | KW_identified, |
1165 | KW_identified, |
|
|
1166 | /* 30 */ |
1202 | KW_reflecting, |
1167 | KW_reflecting, |
1203 | /* 30 */ |
|
|
1204 | KW_changing, |
1168 | KW_changing, |
1205 | KW_splitting, |
1169 | KW_splitting, |
1206 | KW_hitback, |
1170 | KW_hitback, |
1207 | KW_startequip, |
1171 | KW_startequip, |
1208 | KW_blocksview, |
1172 | KW_blocksview, |
1209 | KW_undead, |
1173 | KW_undead, |
1210 | KW_scared, |
1174 | KW_scared, |
1211 | KW_unaggressive, |
1175 | KW_unaggressive, |
1212 | KW_reflect_missile, |
1176 | KW_reflect_missile, |
|
|
1177 | /* 40 */ |
1213 | KW_reflect_spell, |
1178 | KW_reflect_spell, |
1214 | /* 40 */ |
|
|
1215 | KW_no_magic, |
1179 | KW_no_magic, |
1216 | KW_no_fix_player, |
1180 | KW_no_fix_player, |
1217 | KW_is_lightable, |
1181 | KW_is_lightable, |
1218 | KW_tear_down, |
1182 | KW_tear_down, |
1219 | KW_run_away, |
1183 | KW_run_away, |
1220 | KW_NULL, // pass_thru |
1184 | KW_NULL, // pass_thru |
1221 | KW_NULL, // an_pass_thru |
1185 | KW_NULL, // an_pass_thru |
1222 | KW_pick_up, |
1186 | KW_pick_up, |
1223 | KW_unique, |
1187 | KW_unique, |
|
|
1188 | /* 50 */ |
1224 | KW_no_drop, |
1189 | KW_no_drop, |
1225 | /* 50 */ |
|
|
1226 | KW_NULL, // wizcast |
1190 | KW_NULL, // wizcast |
1227 | KW_can_cast_spell, |
1191 | KW_can_cast_spell, |
1228 | KW_can_use_scroll, |
1192 | KW_can_use_scroll, |
1229 | KW_can_use_range, |
1193 | KW_can_use_range, |
1230 | KW_can_use_bow, |
1194 | KW_can_use_bow, |
1231 | KW_can_use_armour, |
1195 | KW_can_use_armour, |
1232 | KW_can_use_weapon, |
1196 | KW_can_use_weapon, |
1233 | KW_can_use_ring, |
1197 | KW_can_use_ring, |
1234 | KW_has_ready_range, |
1198 | KW_has_ready_range, |
|
|
1199 | /* 60 */ |
1235 | KW_has_ready_bow, |
1200 | KW_has_ready_bow, |
1236 | /* 60 */ |
|
|
1237 | KW_xrays, |
1201 | KW_xrays, |
1238 | KW_NULL, |
1202 | KW_NULL, |
1239 | KW_is_floor, |
1203 | KW_is_floor, |
1240 | KW_lifesave, |
1204 | KW_lifesave, |
1241 | KW_no_strength, |
1205 | KW_no_strength, |
1242 | KW_sleep, |
1206 | KW_sleep, |
1243 | KW_stand_still, |
1207 | KW_stand_still, |
1244 | KW_random_move, |
1208 | KW_random_move, |
1245 | KW_only_attack, |
1209 | KW_only_attack, |
|
|
1210 | /* 70 */ |
1246 | KW_confused, |
1211 | KW_confused, |
1247 | /* 70 */ |
|
|
1248 | KW_stealth, |
1212 | KW_stealth, |
1249 | KW_NULL, |
1213 | KW_NULL, |
1250 | KW_NULL, |
1214 | KW_NULL, |
1251 | KW_cursed, |
1215 | KW_cursed, |
1252 | KW_damned, |
1216 | KW_damned, |
1253 | KW_see_anywhere, |
1217 | KW_see_anywhere, |
1254 | KW_known_magical, |
1218 | KW_known_magical, |
1255 | KW_known_cursed, |
1219 | KW_known_cursed, |
1256 | KW_can_use_skill, |
1220 | KW_can_use_skill, |
|
|
1221 | /* 80 */ |
1257 | KW_been_applied, |
1222 | KW_been_applied, |
1258 | /* 80 */ |
|
|
1259 | KW_has_ready_scroll, |
1223 | KW_has_ready_scroll, |
1260 | KW_can_use_rod, |
1224 | KW_can_use_rod, |
1261 | KW_precious, |
1225 | KW_precious, |
1262 | KW_can_use_horn, |
1226 | KW_can_use_horn, |
1263 | KW_make_invisible, |
1227 | KW_make_invisible, |
1264 | KW_inv_locked, |
1228 | KW_inv_locked, |
1265 | KW_is_wooded, |
1229 | KW_is_wooded, |
1266 | KW_is_hilly, |
1230 | KW_is_hilly, |
1267 | KW_has_ready_skill, |
1231 | KW_has_ready_skill, |
|
|
1232 | /* 90 */ |
1268 | KW_has_ready_weapon, |
1233 | KW_has_ready_weapon, |
1269 | /* 90 */ |
|
|
1270 | KW_no_skill_ident, |
1234 | KW_no_skill_ident, |
1271 | KW_is_blind, |
1235 | KW_is_blind, |
1272 | KW_can_see_in_dark, |
1236 | KW_can_see_in_dark, |
1273 | KW_is_cauldron, |
1237 | KW_is_cauldron, |
1274 | KW_NULL, |
1238 | KW_NULL, |
1275 | KW_no_steal, |
1239 | KW_no_steal, |
1276 | KW_one_hit, |
1240 | KW_one_hit, |
1277 | KW_NULL, |
1241 | KW_NULL, |
1278 | KW_berserk, |
1242 | KW_berserk, |
|
|
1243 | /* 100 */ |
1279 | KW_neutral, |
1244 | KW_neutral, |
1280 | /* 100 */ |
|
|
1281 | KW_no_attack, |
1245 | KW_no_attack, |
1282 | KW_no_damage, |
1246 | KW_no_damage, |
1283 | KW_obj_original, |
1247 | KW_obj_original, |
1284 | KW_NULL, |
1248 | KW_NULL, |
1285 | KW_activate_on_push, |
1249 | KW_activate_on_push, |
1286 | KW_activate_on_release, |
1250 | KW_activate_on_release, |
1287 | KW_is_water, |
1251 | KW_is_water, |
1288 | KW_use_content_on_gen, |
1252 | KW_use_content_on_gen, |
1289 | KW_NULL, |
1253 | KW_NULL, |
|
|
1254 | /* 110 */ |
1290 | KW_is_buildable, |
1255 | KW_is_buildable, |
1291 | /* 110 */ |
|
|
1292 | KW_destroy_on_death, |
1256 | KW_destroy_on_death, |
1293 | KW_NULL, |
1257 | KW_NULL, |
1294 | }; |
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; |
1295 | |
1271 | |
1296 | /* 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 |
1297 | * keys that match field names will be overwritten by the loader. |
1273 | * keys that match field names will be overwritten by the loader. |
1298 | */ |
1274 | */ |
1299 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1275 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1300 | if (!tmp->key_values || tmp->kv (kv->key) != kv->value) |
1276 | if (!arch->key_values || arch->kv (kv->key) != kv->value) |
1301 | f.put (kv->key, kv->value); |
1277 | f.put (kv->key, kv->value); |
1302 | |
1278 | |
1303 | /* We don't need to worry about the arch's extra fields - they |
1279 | if (op->uuid) |
1304 | * will get taken care of the copy_to method. |
1280 | { |
1305 | */ |
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; |
1306 | |
1284 | |
1307 | 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'; |
1308 | |
1289 | |
|
|
1290 | f.alloc (ptr - cur); |
|
|
1291 | } |
|
|
1292 | |
1309 | #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) |
1310 | #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); |
1311 | |
1316 | |
1312 | if (object *owner = op->owner) |
1317 | if (object *owner = op->owner) |
1313 | f.put (KW_owner, static_cast<const char *>(owner->ref ())); |
1318 | f.put (KW_owner, static_cast<const char *>(owner->ref ())); |
1314 | |
1319 | |
1315 | CMP_OUT (name); |
1320 | // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved |
1316 | CMP_OUT (name_pl); |
1321 | |
1317 | CMP_OUT (custom_name); |
|
|
1318 | CMP_OUT (title); |
|
|
1319 | CMP_OUT (race); |
|
|
1320 | CMP_OUT (skill); |
|
|
1321 | CMP_OUT (slaying); |
|
|
1322 | CMP_OUT (tag); |
|
|
1323 | CMP_OUT (other_arch); |
1322 | CMP_OUT (other_arch); |
1324 | |
1323 | |
1325 | 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 ); |
1326 | 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); |
1327 | |
1326 | |
1328 | 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); |
1329 | 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); |
1330 | 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); |
1331 | |
1330 | |
1332 | if (op->animation_id != tmp->animation_id) |
1331 | if (op->animation_id != arch->animation_id) |
1333 | if (op->has_anim ()) |
1332 | if (op->has_anim ()) |
1334 | f.put (KW_animation, op->anim ().name); |
1333 | f.put (KW_animation, op->anim ().name); |
1335 | else |
1334 | else |
1336 | { |
1335 | { |
1337 | f.put (KW_animation, (const char *)0); |
1336 | f.put (KW_animation, (const char *)0); |
… | |
… | |
1353 | CMP_OUT2 (grace, stats.grace); |
1352 | CMP_OUT2 (grace, stats.grace); |
1354 | CMP_OUT2 (maxgrace, stats.maxgrace); |
1353 | CMP_OUT2 (maxgrace, stats.maxgrace); |
1355 | CMP_OUT2 (exp, stats.exp); |
1354 | CMP_OUT2 (exp, stats.exp); |
1356 | |
1355 | |
1357 | CMP_OUT (perm_exp); |
1356 | CMP_OUT (perm_exp); |
1358 | CMP_OUT (expmul); |
1357 | //CMP_OUT (expmul); |
1359 | |
1358 | |
1360 | CMP_OUT2 (food, stats.food); |
1359 | CMP_OUT2 (food, stats.food); |
1361 | CMP_OUT2 (dam, stats.dam); |
1360 | CMP_OUT2 (dam, stats.dam); |
1362 | CMP_OUT2 (luck, stats.luck); |
1361 | CMP_OUT2 (luck, stats.luck); |
1363 | CMP_OUT2 (wc, stats.wc); |
1362 | CMP_OUT2 (wc, stats.wc); |
1364 | CMP_OUT2 (ac, stats.ac); |
1363 | CMP_OUT2 (ac, stats.ac); |
1365 | |
1364 | |
1366 | CMP_OUT (x); |
|
|
1367 | CMP_OUT (y); |
|
|
1368 | CMP_OUT (speed); |
|
|
1369 | CMP_OUT (speed_left); |
|
|
1370 | CMP_OUT2 (move_state, move_status); |
1365 | CMP_OUT2 (move_state, move_status); |
1371 | CMP_OUT (attack_movement); |
1366 | CMP_OUT (attack_movement); |
1372 | CMP_OUT (nrof); |
1367 | CMP_OUT (nrof); |
1373 | CMP_OUT (level); |
1368 | CMP_OUT (level); |
1374 | CMP_OUT (direction); |
|
|
1375 | CMP_OUT (type); |
|
|
1376 | CMP_OUT (subtype); |
|
|
1377 | CMP_OUT (attacktype); |
1369 | CMP_OUT (attacktype); |
1378 | |
1370 | |
|
|
1371 | // using memcmp here seems to be a loss - is gcc vectorising? |
1379 | for (int i = 0; i < NROFATTACKS; i++) |
1372 | for (int i = 0; i < NROFATTACKS; i++) |
1380 | if (expect_false (op->resist[i] != tmp->resist[i])) |
1373 | if (expect_false (op->resist[i] != arch->resist[i])) |
1381 | f.put (resist_save[i], op->resist[i]); |
1374 | f.put (resist_save[i], op->resist[i]); |
1382 | |
1375 | |
1383 | CMP_OUT (path_attuned); |
1376 | CMP_OUT (path_attuned); |
1384 | CMP_OUT (path_repelled); |
1377 | CMP_OUT (path_repelled); |
1385 | CMP_OUT (path_denied); |
1378 | CMP_OUT (path_denied); |
|
|
1379 | |
1386 | CMP_OUT2 (material, materials);//TODO: nuke |
1380 | CMP_OUT2 (material, materials);//TODO: nuke |
1387 | CMP_OUT (materialname); |
1381 | if (op->material != arch->material) |
|
|
1382 | f.put (KW_materialname, op->material->name); |
|
|
1383 | |
1388 | CMP_OUT (value); |
1384 | CMP_OUT (value); |
1389 | CMP_OUT (carrying); |
1385 | CMP_OUT (carrying); |
1390 | CMP_OUT (weight); |
1386 | CMP_OUT (weight); |
1391 | CMP_OUT (invisible); |
1387 | CMP_OUT (invisible); |
1392 | CMP_OUT (state); |
1388 | CMP_OUT (state); |
… | |
… | |
1424 | CMP_OUT (move_on); |
1420 | CMP_OUT (move_on); |
1425 | CMP_OUT (move_off); |
1421 | CMP_OUT (move_off); |
1426 | CMP_OUT (move_slow); |
1422 | CMP_OUT (move_slow); |
1427 | CMP_OUT (move_slow_penalty); |
1423 | CMP_OUT (move_slow_penalty); |
1428 | |
1424 | |
1429 | 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 ())) |
1430 | for (int i = 0; i <= NUM_FLAGS; i++) |
1434 | for (int i = 0; i < NUM_FLAGS; i++) |
1431 | if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) |
1435 | if (expect_false (diff [i])) |
1432 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1436 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1433 | |
1437 | |
1434 | // save body locations |
1438 | // save body locations. gcc's memcmp does an abysmal job when used |
1435 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1439 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1436 | if (expect_false (op->slot[i].info != tmp->slot[i].info)) |
1440 | if (expect_false (op->slot[i].info != arch->slot[i].info)) |
1437 | f.put (body_locations[i].save_name, op->slot[i].info); |
1441 | f.put (body_locations[i].save_name, op->slot[i].info); |
1438 | } |
1442 | } |
1439 | |
1443 | |
1440 | /* |
1444 | /* |
1441 | * Dumps all variables in an object to a file. |
1445 | * Dumps all variables in an object to a file. |