… | |
… | |
330 | |
330 | |
331 | if (!name_pl) |
331 | if (!name_pl) |
332 | name_pl = name; |
332 | name_pl = name; |
333 | |
333 | |
334 | /* objects now have a materialname. try to patch it in */ |
334 | /* objects now have a materialname. try to patch it in */ |
335 | if (!(is_weapon () && level > 0)) |
335 | if (material == &material_null && !(is_weapon () && level > 0)) |
336 | set_materialname (this, map ? map->difficulty : 5, 0); |
336 | select_material (this, map ? map->difficulty : 5); |
337 | |
337 | |
338 | /* only do these when program is first run - a bit |
338 | /* only do these when program is first run - a bit |
339 | * excessive to do this at every run - most of this is |
339 | * excessive to do this at every run - most of this is |
340 | * really just to catch any errors - program will still run, but |
340 | * really just to catch any errors - program will still run, but |
341 | * not in the ideal fashion. |
341 | * not in the ideal fashion. |
… | |
… | |
725 | case KW_invisible: f.get (invisible); break; |
725 | case KW_invisible: f.get (invisible); break; |
726 | case KW_magic: f.get (magic); break; |
726 | case KW_magic: f.get (magic); break; |
727 | case KW_state: f.get (state); break; |
727 | case KW_state: f.get (state); break; |
728 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
728 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
729 | case KW_material: f.get (materials); break; //TODO: nuke |
729 | case KW_material: f.get (materials); break; //TODO: nuke |
730 | 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; |
731 | |
738 | |
732 | /* These are the new values */ |
739 | /* These are the new values */ |
733 | 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; |
734 | 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; |
735 | 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; |
… | |
… | |
1132 | KW_applied, |
1139 | KW_applied, |
1133 | KW_unpaid, |
1140 | KW_unpaid, |
1134 | KW_can_use_shield, |
1141 | KW_can_use_shield, |
1135 | KW_no_pick, |
1142 | KW_no_pick, |
1136 | KW_NULL, // walk_on |
1143 | KW_NULL, // walk_on |
|
|
1144 | /* 10 */ |
1137 | KW_NULL, // no_pass |
1145 | KW_NULL, // no_pass |
1138 | /* 10 */ |
|
|
1139 | KW_is_animated, |
1146 | KW_is_animated, |
1140 | KW_NULL, // slow_move |
1147 | KW_NULL, // slow_move |
1141 | KW_NULL, // flying |
1148 | KW_NULL, // flying |
1142 | KW_monster, |
1149 | KW_monster, |
1143 | KW_friendly, |
1150 | KW_friendly, |
1144 | KW_generator, |
1151 | KW_generator, |
1145 | KW_is_thrown, |
1152 | KW_is_thrown, |
1146 | KW_auto_apply, |
1153 | KW_auto_apply, |
1147 | KW_treasure_env, |
1154 | KW_treasure_env, |
|
|
1155 | /* 20 */ |
1148 | KW_player_sold, |
1156 | KW_player_sold, |
1149 | /* 20 */ |
|
|
1150 | KW_see_invisible, |
1157 | KW_see_invisible, |
1151 | KW_can_roll, |
1158 | KW_can_roll, |
1152 | KW_overlay_floor, |
1159 | KW_overlay_floor, |
1153 | KW_is_turnable, |
1160 | KW_is_turnable, |
1154 | KW_NULL, // walk_off |
1161 | KW_NULL, // walk_off |
1155 | KW_NULL, // fly_on |
1162 | KW_NULL, // fly_on |
1156 | KW_NULL, // fly_off |
1163 | KW_NULL, // fly_off |
1157 | KW_is_used_up, |
1164 | KW_is_used_up, |
1158 | KW_identified, |
1165 | KW_identified, |
|
|
1166 | /* 30 */ |
1159 | KW_reflecting, |
1167 | KW_reflecting, |
1160 | /* 30 */ |
|
|
1161 | KW_changing, |
1168 | KW_changing, |
1162 | KW_splitting, |
1169 | KW_splitting, |
1163 | KW_hitback, |
1170 | KW_hitback, |
1164 | KW_startequip, |
1171 | KW_startequip, |
1165 | KW_blocksview, |
1172 | KW_blocksview, |
1166 | KW_undead, |
1173 | KW_undead, |
1167 | KW_scared, |
1174 | KW_scared, |
1168 | KW_unaggressive, |
1175 | KW_unaggressive, |
1169 | KW_reflect_missile, |
1176 | KW_reflect_missile, |
|
|
1177 | /* 40 */ |
1170 | KW_reflect_spell, |
1178 | KW_reflect_spell, |
1171 | /* 40 */ |
|
|
1172 | KW_no_magic, |
1179 | KW_no_magic, |
1173 | KW_no_fix_player, |
1180 | KW_no_fix_player, |
1174 | KW_is_lightable, |
1181 | KW_is_lightable, |
1175 | KW_tear_down, |
1182 | KW_tear_down, |
1176 | KW_run_away, |
1183 | KW_run_away, |
1177 | KW_NULL, // pass_thru |
1184 | KW_NULL, // pass_thru |
1178 | KW_NULL, // an_pass_thru |
1185 | KW_NULL, // an_pass_thru |
1179 | KW_pick_up, |
1186 | KW_pick_up, |
1180 | KW_unique, |
1187 | KW_unique, |
|
|
1188 | /* 50 */ |
1181 | KW_no_drop, |
1189 | KW_no_drop, |
1182 | /* 50 */ |
|
|
1183 | KW_NULL, // wizcast |
1190 | KW_NULL, // wizcast |
1184 | KW_can_cast_spell, |
1191 | KW_can_cast_spell, |
1185 | KW_can_use_scroll, |
1192 | KW_can_use_scroll, |
1186 | KW_can_use_range, |
1193 | KW_can_use_range, |
1187 | KW_can_use_bow, |
1194 | KW_can_use_bow, |
1188 | KW_can_use_armour, |
1195 | KW_can_use_armour, |
1189 | KW_can_use_weapon, |
1196 | KW_can_use_weapon, |
1190 | KW_can_use_ring, |
1197 | KW_can_use_ring, |
1191 | KW_has_ready_range, |
1198 | KW_has_ready_range, |
|
|
1199 | /* 60 */ |
1192 | KW_has_ready_bow, |
1200 | KW_has_ready_bow, |
1193 | /* 60 */ |
|
|
1194 | KW_xrays, |
1201 | KW_xrays, |
1195 | KW_NULL, |
1202 | KW_NULL, |
1196 | KW_is_floor, |
1203 | KW_is_floor, |
1197 | KW_lifesave, |
1204 | KW_lifesave, |
1198 | KW_no_strength, |
1205 | KW_no_strength, |
1199 | KW_sleep, |
1206 | KW_sleep, |
1200 | KW_stand_still, |
1207 | KW_stand_still, |
1201 | KW_random_move, |
1208 | KW_random_move, |
1202 | KW_only_attack, |
1209 | KW_only_attack, |
|
|
1210 | /* 70 */ |
1203 | KW_confused, |
1211 | KW_confused, |
1204 | /* 70 */ |
|
|
1205 | KW_stealth, |
1212 | KW_stealth, |
1206 | KW_NULL, |
1213 | KW_NULL, |
1207 | KW_NULL, |
1214 | KW_NULL, |
1208 | KW_cursed, |
1215 | KW_cursed, |
1209 | KW_damned, |
1216 | KW_damned, |
1210 | KW_see_anywhere, |
1217 | KW_see_anywhere, |
1211 | KW_known_magical, |
1218 | KW_known_magical, |
1212 | KW_known_cursed, |
1219 | KW_known_cursed, |
1213 | KW_can_use_skill, |
1220 | KW_can_use_skill, |
|
|
1221 | /* 80 */ |
1214 | KW_been_applied, |
1222 | KW_been_applied, |
1215 | /* 80 */ |
|
|
1216 | KW_has_ready_scroll, |
1223 | KW_has_ready_scroll, |
1217 | KW_can_use_rod, |
1224 | KW_can_use_rod, |
1218 | KW_precious, |
1225 | KW_precious, |
1219 | KW_can_use_horn, |
1226 | KW_can_use_horn, |
1220 | KW_make_invisible, |
1227 | KW_make_invisible, |
1221 | KW_inv_locked, |
1228 | KW_inv_locked, |
1222 | KW_is_wooded, |
1229 | KW_is_wooded, |
1223 | KW_is_hilly, |
1230 | KW_is_hilly, |
1224 | KW_has_ready_skill, |
1231 | KW_has_ready_skill, |
|
|
1232 | /* 90 */ |
1225 | KW_has_ready_weapon, |
1233 | KW_has_ready_weapon, |
1226 | /* 90 */ |
|
|
1227 | KW_no_skill_ident, |
1234 | KW_no_skill_ident, |
1228 | KW_is_blind, |
1235 | KW_is_blind, |
1229 | KW_can_see_in_dark, |
1236 | KW_can_see_in_dark, |
1230 | KW_is_cauldron, |
1237 | KW_is_cauldron, |
1231 | KW_NULL, |
1238 | KW_NULL, |
1232 | KW_no_steal, |
1239 | KW_no_steal, |
1233 | KW_one_hit, |
1240 | KW_one_hit, |
1234 | KW_NULL, |
1241 | KW_NULL, |
1235 | KW_berserk, |
1242 | KW_berserk, |
|
|
1243 | /* 100 */ |
1236 | KW_neutral, |
1244 | KW_neutral, |
1237 | /* 100 */ |
|
|
1238 | KW_no_attack, |
1245 | KW_no_attack, |
1239 | KW_no_damage, |
1246 | KW_no_damage, |
1240 | KW_obj_original, |
1247 | KW_obj_original, |
1241 | KW_NULL, |
1248 | KW_NULL, |
1242 | KW_activate_on_push, |
1249 | KW_activate_on_push, |
1243 | KW_activate_on_release, |
1250 | KW_activate_on_release, |
1244 | KW_is_water, |
1251 | KW_is_water, |
1245 | KW_use_content_on_gen, |
1252 | KW_use_content_on_gen, |
1246 | KW_NULL, |
1253 | KW_NULL, |
|
|
1254 | /* 110 */ |
1247 | KW_is_buildable, |
1255 | KW_is_buildable, |
1248 | /* 110 */ |
|
|
1249 | KW_destroy_on_death, |
1256 | KW_destroy_on_death, |
1250 | KW_NULL, |
1257 | KW_NULL, |
1251 | }; |
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; |
1252 | |
1271 | |
1253 | /* 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 |
1254 | * keys that match field names will be overwritten by the loader. |
1273 | * keys that match field names will be overwritten by the loader. |
1255 | */ |
1274 | */ |
1256 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1275 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1257 | if (!arch->key_values || arch->kv (kv->key) != kv->value) |
1276 | if (!arch->key_values || arch->kv (kv->key) != kv->value) |
1258 | f.put (kv->key, kv->value); |
1277 | f.put (kv->key, kv->value); |
1259 | |
1278 | |
1260 | if (op->uuid) |
1279 | if (op->uuid) |
1261 | f.put (KW_uuid, op->uuid.c_str ()); |
1280 | { |
|
|
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; |
|
|
1284 | |
|
|
1285 | memcpy (ptr, "uuid ", sizeof ("uuid ") - 1); |
|
|
1286 | ptr += sizeof ("uuid ") - 1; |
|
|
1287 | ptr = op->uuid.append (ptr); |
|
|
1288 | *ptr++ = '\n'; |
|
|
1289 | |
|
|
1290 | f.alloc (ptr - cur); |
|
|
1291 | } |
1262 | |
1292 | |
1263 | #define CMP_OUT(v) if (expect_false (op->v != arch->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) |
1264 | #define CMP_OUT2(k,v) if (expect_false (op->v != arch->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) |
1265 | |
1295 | |
1266 | CMP_OUT (x); |
1296 | CMP_OUT (x); |
… | |
… | |
1336 | CMP_OUT (attack_movement); |
1366 | CMP_OUT (attack_movement); |
1337 | CMP_OUT (nrof); |
1367 | CMP_OUT (nrof); |
1338 | CMP_OUT (level); |
1368 | CMP_OUT (level); |
1339 | CMP_OUT (attacktype); |
1369 | CMP_OUT (attacktype); |
1340 | |
1370 | |
1341 | // using memcmp here seems to be a loss - us gcc vectorising? |
1371 | // using memcmp here seems to be a loss - is gcc vectorising? |
1342 | for (int i = 0; i < NROFATTACKS; i++) |
1372 | for (int i = 0; i < NROFATTACKS; i++) |
1343 | if (expect_false (op->resist[i] != arch->resist[i])) |
1373 | if (expect_false (op->resist[i] != arch->resist[i])) |
1344 | f.put (resist_save[i], op->resist[i]); |
1374 | f.put (resist_save[i], op->resist[i]); |
1345 | |
1375 | |
1346 | CMP_OUT (path_attuned); |
1376 | CMP_OUT (path_attuned); |
1347 | CMP_OUT (path_repelled); |
1377 | CMP_OUT (path_repelled); |
1348 | CMP_OUT (path_denied); |
1378 | CMP_OUT (path_denied); |
|
|
1379 | |
1349 | CMP_OUT2 (material, materials);//TODO: nuke |
1380 | CMP_OUT2 (material, materials);//TODO: nuke |
1350 | CMP_OUT (materialname); |
1381 | if (op->material != arch->material) |
|
|
1382 | f.put (KW_materialname, op->material->name); |
|
|
1383 | |
1351 | CMP_OUT (value); |
1384 | CMP_OUT (value); |
1352 | CMP_OUT (carrying); |
1385 | CMP_OUT (carrying); |
1353 | CMP_OUT (weight); |
1386 | CMP_OUT (weight); |
1354 | CMP_OUT (invisible); |
1387 | CMP_OUT (invisible); |
1355 | CMP_OUT (state); |
1388 | CMP_OUT (state); |
… | |
… | |
1387 | CMP_OUT (move_on); |
1420 | CMP_OUT (move_on); |
1388 | CMP_OUT (move_off); |
1421 | CMP_OUT (move_off); |
1389 | CMP_OUT (move_slow); |
1422 | CMP_OUT (move_slow); |
1390 | CMP_OUT (move_slow_penalty); |
1423 | CMP_OUT (move_slow_penalty); |
1391 | |
1424 | |
1392 | // obj_original is the only commonly differing flag between archetype |
|
|
1393 | // and object, so special-case it here to be able to skip the loop |
|
|
1394 | object::flags_t diff = op->flags ^ arch->flags; |
1425 | object::flags_t diff = (op->flag ^ arch->flag) & flagmask; |
1395 | |
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 |
1396 | if (expect_true (diff.any ())) |
1433 | if (expect_true (diff.any ())) |
1397 | { |
|
|
1398 | if (expect_false (diff.reset (FLAG_OBJ_ORIGINAL).any ())) |
|
|
1399 | { |
|
|
1400 | // some other flags differ, too |
|
|
1401 | for (int i = 0; i < NUM_FLAGS; i++) |
1434 | for (int i = 0; i < NUM_FLAGS; i++) |
1402 | if (expect_false (flag_names [i] && op->flag [i] != arch->flag [i])) |
1435 | if (expect_false (diff [i])) |
1403 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1436 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1404 | } |
|
|
1405 | else |
|
|
1406 | { |
|
|
1407 | // only obj_original differs |
|
|
1408 | f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0"); |
|
|
1409 | } |
|
|
1410 | } |
|
|
1411 | |
1437 | |
1412 | // save body locations. gcc's memcmp does an abysmal job when used |
1438 | // save body locations. gcc's memcmp does an abysmal job when used |
1413 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1439 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1414 | if (expect_false (op->slot[i].info != arch->slot[i].info)) |
1440 | if (expect_false (op->slot[i].info != arch->slot[i].info)) |
1415 | f.put (body_locations[i].save_name, op->slot[i].info); |
1441 | f.put (body_locations[i].save_name, op->slot[i].info); |