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.138 by root, Sat Nov 7 18:30:05 2009 UTC vs.
Revision 1.147 by root, Wed Nov 11 18:06:46 2009 UTC

… …
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;
… …
852 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 859 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
853 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 860 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
854 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 861 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
855 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 862 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
856 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 863 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
857 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
858 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 864 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
859 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 865 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
860 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 866 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
861 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 867 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
862 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; 868 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
… …
1106 object_thawer f (buf, (AV *)0); 1112 object_thawer f (buf, (AV *)0);
1107 1113
1108 return op->parse_kv (f); 1114 return op->parse_kv (f);
1109} 1115}
1110 1116
1111// compare *op against *tmp and output differences 1117// compare *op against *arch and output differences
1112static void 1118static void
1113write_diff (object_freezer &f, object *op, object *tmp) 1119write_diff (object_freezer &f, object *op, object *arch)
1114{ 1120{
1115 static const keyword resist_save[NROFATTACKS] = { 1121 static const keyword resist_save[NROFATTACKS] = {
1116# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1122# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1117# include "attackinc.h" 1123# include "attackinc.h"
1118# undef def 1124# undef def
… …
1132 KW_applied, 1138 KW_applied,
1133 KW_unpaid, 1139 KW_unpaid,
1134 KW_can_use_shield, 1140 KW_can_use_shield,
1135 KW_no_pick, 1141 KW_no_pick,
1136 KW_NULL, // walk_on 1142 KW_NULL, // walk_on
1143 /* 10 */
1137 KW_NULL, // no_pass 1144 KW_NULL, // no_pass
1138 /* 10 */
1139 KW_is_animated, 1145 KW_is_animated,
1140 KW_NULL, // slow_move 1146 KW_NULL, // slow_move
1141 KW_NULL, // flying 1147 KW_NULL, // flying
1142 KW_monster, 1148 KW_monster,
1143 KW_friendly, 1149 KW_friendly,
1144 KW_generator, 1150 KW_generator,
1145 KW_is_thrown, 1151 KW_is_thrown,
1146 KW_auto_apply, 1152 KW_auto_apply,
1147 KW_treasure_env, 1153 KW_treasure_env,
1154 /* 20 */
1148 KW_player_sold, 1155 KW_player_sold,
1149 /* 20 */
1150 KW_see_invisible, 1156 KW_see_invisible,
1151 KW_can_roll, 1157 KW_can_roll,
1152 KW_overlay_floor, 1158 KW_overlay_floor,
1153 KW_is_turnable, 1159 KW_is_turnable,
1154 KW_NULL, // walk_off 1160 KW_NULL, // walk_off
1155 KW_NULL, // fly_on 1161 KW_NULL, // fly_on
1156 KW_NULL, // fly_off 1162 KW_NULL, // fly_off
1157 KW_is_used_up, 1163 KW_is_used_up,
1158 KW_identified, 1164 KW_identified,
1165 /* 30 */
1159 KW_reflecting, 1166 KW_reflecting,
1160 /* 30 */
1161 KW_changing, 1167 KW_changing,
1162 KW_splitting, 1168 KW_splitting,
1163 KW_hitback, 1169 KW_hitback,
1164 KW_startequip, 1170 KW_startequip,
1165 KW_blocksview, 1171 KW_blocksview,
1166 KW_undead, 1172 KW_undead,
1167 KW_scared, 1173 KW_scared,
1168 KW_unaggressive, 1174 KW_unaggressive,
1169 KW_reflect_missile, 1175 KW_reflect_missile,
1176 /* 40 */
1170 KW_reflect_spell, 1177 KW_reflect_spell,
1171 /* 40 */
1172 KW_no_magic, 1178 KW_no_magic,
1173 KW_no_fix_player, 1179 KW_NULL,
1174 KW_is_lightable, 1180 KW_is_lightable,
1175 KW_tear_down, 1181 KW_tear_down,
1176 KW_run_away, 1182 KW_run_away,
1177 KW_NULL, // pass_thru 1183 KW_NULL, // pass_thru
1178 KW_NULL, // an_pass_thru 1184 KW_NULL, // an_pass_thru
1179 KW_pick_up, 1185 KW_pick_up,
1180 KW_unique, 1186 KW_unique,
1187 /* 50 */
1181 KW_no_drop, 1188 KW_no_drop,
1182 /* 50 */
1183 KW_NULL, // wizcast 1189 KW_NULL, // wizcast
1184 KW_can_cast_spell, 1190 KW_can_cast_spell,
1185 KW_can_use_scroll, 1191 KW_can_use_scroll,
1186 KW_can_use_range, 1192 KW_can_use_range,
1187 KW_can_use_bow, 1193 KW_can_use_bow,
1188 KW_can_use_armour, 1194 KW_can_use_armour,
1189 KW_can_use_weapon, 1195 KW_can_use_weapon,
1190 KW_can_use_ring, 1196 KW_can_use_ring,
1191 KW_has_ready_range, 1197 KW_has_ready_range,
1198 /* 60 */
1192 KW_has_ready_bow, 1199 KW_has_ready_bow,
1193 /* 60 */
1194 KW_xrays, 1200 KW_xrays,
1195 KW_NULL, 1201 KW_NULL,
1196 KW_is_floor, 1202 KW_is_floor,
1197 KW_lifesave, 1203 KW_lifesave,
1198 KW_no_strength, 1204 KW_no_strength,
1199 KW_sleep, 1205 KW_sleep,
1200 KW_stand_still, 1206 KW_stand_still,
1201 KW_random_move, 1207 KW_random_move,
1202 KW_only_attack, 1208 KW_only_attack,
1209 /* 70 */
1203 KW_confused, 1210 KW_confused,
1204 /* 70 */
1205 KW_stealth, 1211 KW_stealth,
1206 KW_NULL, 1212 KW_NULL,
1207 KW_NULL, 1213 KW_NULL,
1208 KW_cursed, 1214 KW_cursed,
1209 KW_damned, 1215 KW_damned,
1210 KW_see_anywhere, 1216 KW_see_anywhere,
1211 KW_known_magical, 1217 KW_known_magical,
1212 KW_known_cursed, 1218 KW_known_cursed,
1213 KW_can_use_skill, 1219 KW_can_use_skill,
1220 /* 80 */
1214 KW_been_applied, 1221 KW_been_applied,
1215 /* 80 */
1216 KW_has_ready_scroll, 1222 KW_has_ready_scroll,
1217 KW_can_use_rod, 1223 KW_can_use_rod,
1218 KW_precious, 1224 KW_precious,
1219 KW_can_use_horn, 1225 KW_can_use_horn,
1220 KW_make_invisible, 1226 KW_make_invisible,
1221 KW_inv_locked, 1227 KW_inv_locked,
1222 KW_is_wooded, 1228 KW_is_wooded,
1223 KW_is_hilly, 1229 KW_is_hilly,
1224 KW_has_ready_skill, 1230 KW_has_ready_skill,
1231 /* 90 */
1225 KW_has_ready_weapon, 1232 KW_has_ready_weapon,
1226 /* 90 */
1227 KW_no_skill_ident, 1233 KW_no_skill_ident,
1228 KW_is_blind, 1234 KW_is_blind,
1229 KW_can_see_in_dark, 1235 KW_can_see_in_dark,
1230 KW_is_cauldron, 1236 KW_is_cauldron,
1231 KW_NULL, 1237 KW_NULL,
1232 KW_no_steal, 1238 KW_no_steal,
1233 KW_one_hit, 1239 KW_one_hit,
1234 KW_NULL, 1240 KW_NULL,
1235 KW_berserk, 1241 KW_berserk,
1242 /* 100 */
1236 KW_neutral, 1243 KW_neutral,
1237 /* 100 */
1238 KW_no_attack, 1244 KW_no_attack,
1239 KW_no_damage, 1245 KW_no_damage,
1240 KW_obj_original, 1246 KW_obj_original,
1241 KW_NULL, 1247 KW_NULL,
1242 KW_activate_on_push, 1248 KW_activate_on_push,
1243 KW_activate_on_release, 1249 KW_activate_on_release,
1244 KW_is_water, 1250 KW_is_water,
1245 KW_use_content_on_gen, 1251 KW_use_content_on_gen,
1246 KW_NULL, 1252 KW_NULL,
1253 /* 110 */
1247 KW_is_buildable, 1254 KW_is_buildable,
1248 /* 110 */
1249 KW_destroy_on_death, 1255 KW_destroy_on_death,
1250 KW_NULL, 1256 KW_NULL,
1251 }; 1257 };
1258
1259 // obj_original is the only commonly differing flag between archetype
1260 // and object, so special-case it here to be able to skip the loop
1261 static const struct flagmask : object::flags_t
1262 {
1263 flagmask ()
1264 {
1265 for (int i = 0; i < NUM_FLAGS; i++)
1266 if (flag_names [i])
1267 set (i);
1268 }
1269 } flagmask;
1252 1270
1253 /* This saves the key/value lists. We do it first so that any 1271 /* This saves the key/value lists. We do it first so that any
1254 * keys that match field names will be overwritten by the loader. 1272 * keys that match field names will be overwritten by the loader.
1255 */ 1273 */
1256 for (key_value *kv = op->key_values; kv; kv = kv->next) 1274 for (key_value *kv = op->key_values; kv; kv = kv->next)
1257 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1275 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1258 f.put (kv->key, kv->value); 1276 f.put (kv->key, kv->value);
1259 1277
1260 /* We don't need to worry about the arch's extra fields - they
1261 * will get taken care of the copy_to method.
1262 */
1263
1264 if (op->uuid) 1278 if (op->uuid)
1265 f.put (KW_uuid, op->uuid.c_str ()); 1279 {
1280 // highly optimised - this is often 25% of all data written
1281 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1282 char *ptr = cur;
1266 1283
1284 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1285 ptr += sizeof ("uuid ") - 1;
1286 ptr = op->uuid.append (ptr);
1287 *ptr++ = '\n';
1288
1289 f.alloc (ptr - cur);
1290 }
1291
1267#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1292#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW_ ## v, op->v)
1268#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1293#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v)
1294
1295 CMP_OUT (x);
1296 CMP_OUT (y);
1297
1298 CMP_OUT (type);
1299 CMP_OUT (subtype);
1300 CMP_OUT (direction);
1301
1302 CMP_OUT (name);
1303 CMP_OUT (name_pl);
1304
1305 CMP_OUT (speed);
1306
1307 // speed_left is a major time-burner, and has good locality, so
1308 // we use a simple lookup-cache to avoid the very slow printf.
1309 if (op->speed_left != arch->speed_left)
1310 {
1311 static double last_speed_left = 0.;
1312 static char last_speed_left_str [256] = "speed_left 0\n";
1313 static int last_speed_left_len = sizeof ("speed_left 0\n") - 1;
1314
1315 if (last_speed_left != op->speed_left)
1316 {
1317 last_speed_left = op->speed_left;
1318 last_speed_left_len = sizeof ("speed_left ") - 1
1319 + sprintf (last_speed_left_str + sizeof ("speed_left ") - 1, "%.7g\n", last_speed_left);
1320 }
1321
1322 f.add (last_speed_left_str, last_speed_left_len);
1323 }
1324
1325 CMP_OUT (title);
1326 CMP_OUT (race);
1327 CMP_OUT (slaying);
1328 CMP_OUT (skill);
1329
1330 CMP_OUT (tag);
1331 CMP_OUT (custom_name);
1269 1332
1270 if (object *owner = op->owner) 1333 if (object *owner = op->owner)
1271 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1334 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1272 1335
1273 CMP_OUT (name); 1336 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1274 CMP_OUT (name_pl); 1337
1275 CMP_OUT (custom_name);
1276 CMP_OUT (title);
1277 CMP_OUT (race);
1278 CMP_OUT (skill);
1279 CMP_OUT (slaying);
1280 CMP_OUT (tag);
1281 CMP_OUT (other_arch); 1338 CMP_OUT (other_arch);
1282 1339
1283 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1340 if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1284 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1341 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore);
1285 1342
1286 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1343 if (op->face != arch->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1287 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1344 if (op->sound != arch->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1288 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1345 if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1289 1346
1290 if (op->animation_id != tmp->animation_id) 1347 if (op->animation_id != arch->animation_id)
1291 if (op->has_anim ()) 1348 if (op->has_anim ())
1292 f.put (KW_animation, op->anim ().name); 1349 f.put (KW_animation, op->anim ().name);
1293 else 1350 else
1294 { 1351 {
1295 f.put (KW_animation, (const char *)0); 1352 f.put (KW_animation, (const char *)0);
… …
1311 CMP_OUT2 (grace, stats.grace); 1368 CMP_OUT2 (grace, stats.grace);
1312 CMP_OUT2 (maxgrace, stats.maxgrace); 1369 CMP_OUT2 (maxgrace, stats.maxgrace);
1313 CMP_OUT2 (exp, stats.exp); 1370 CMP_OUT2 (exp, stats.exp);
1314 1371
1315 CMP_OUT (perm_exp); 1372 CMP_OUT (perm_exp);
1316 CMP_OUT (expmul); 1373 //CMP_OUT (expmul);
1317 1374
1318 CMP_OUT2 (food, stats.food); 1375 CMP_OUT2 (food, stats.food);
1319 CMP_OUT2 (dam, stats.dam); 1376 CMP_OUT2 (dam, stats.dam);
1320 CMP_OUT2 (luck, stats.luck); 1377 CMP_OUT2 (luck, stats.luck);
1321 CMP_OUT2 (wc, stats.wc); 1378 CMP_OUT2 (wc, stats.wc);
1322 CMP_OUT2 (ac, stats.ac); 1379 CMP_OUT2 (ac, stats.ac);
1323 1380
1324 CMP_OUT (x);
1325 CMP_OUT (y);
1326 CMP_OUT (speed);
1327 CMP_OUT (speed_left);
1328 CMP_OUT2 (move_state, move_status); 1381 CMP_OUT2 (move_state, move_status);
1329 CMP_OUT (attack_movement); 1382 CMP_OUT (attack_movement);
1330 CMP_OUT (nrof); 1383 CMP_OUT (nrof);
1331 CMP_OUT (level); 1384 CMP_OUT (level);
1332 CMP_OUT (direction);
1333 CMP_OUT (type);
1334 CMP_OUT (subtype);
1335 CMP_OUT (attacktype); 1385 CMP_OUT (attacktype);
1336 1386
1387 // using memcmp here seems to be a loss - is gcc vectorising?
1337 for (int i = 0; i < NROFATTACKS; i++) 1388 for (int i = 0; i < NROFATTACKS; i++)
1338 if (expect_false (op->resist[i] != tmp->resist[i])) 1389 if (expect_false (op->resist[i] != arch->resist[i]))
1339 f.put (resist_save[i], op->resist[i]); 1390 f.put (resist_save[i], op->resist[i]);
1340 1391
1341 CMP_OUT (path_attuned); 1392 CMP_OUT (path_attuned);
1342 CMP_OUT (path_repelled); 1393 CMP_OUT (path_repelled);
1343 CMP_OUT (path_denied); 1394 CMP_OUT (path_denied);
1395
1344 CMP_OUT2 (material, materials);//TODO: nuke 1396 CMP_OUT2 (material, materials);//TODO: nuke
1345 CMP_OUT (materialname); 1397 if (op->material != arch->material)
1398 f.put (KW_materialname, op->material->name);
1399
1346 CMP_OUT (value); 1400 CMP_OUT (value);
1347 CMP_OUT (carrying); 1401 CMP_OUT (carrying);
1348 CMP_OUT (weight); 1402 CMP_OUT (weight);
1349 CMP_OUT (invisible); 1403 CMP_OUT (invisible);
1350 CMP_OUT (state); 1404 CMP_OUT (state);
… …
1382 CMP_OUT (move_on); 1436 CMP_OUT (move_on);
1383 CMP_OUT (move_off); 1437 CMP_OUT (move_off);
1384 CMP_OUT (move_slow); 1438 CMP_OUT (move_slow);
1385 CMP_OUT (move_slow_penalty); 1439 CMP_OUT (move_slow_penalty);
1386 1440
1387 if (op->flag != tmp->flag) 1441 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1442
1443 if (diff [FLAG_OBJ_ORIGINAL])
1444 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0");
1445
1446 diff.reset (FLAG_OBJ_ORIGINAL);
1447
1448 // quickly test whether any other flags differ
1449 if (expect_true (diff.any ()))
1388 for (int i = 0; i <= NUM_FLAGS; i++) 1450 for (int i = 0; i < NUM_FLAGS; i++)
1389 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1451 if (expect_false (diff [i]))
1390 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1452 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1391 1453
1392 // save body locations 1454 // save body locations. gcc's memcmp does an abysmal job when used
1393 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1455 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1394 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1456 if (expect_false (op->slot[i].info != arch->slot[i].info))
1395 f.put (body_locations[i].save_name, op->slot[i].info); 1457 f.put (body_locations[i].save_name, op->slot[i].info);
1396} 1458}
1397 1459
1398/* 1460/*
1399 * Dumps all variables in an object to a file. 1461 * Dumps all variables in an object to a file.

Diff Legend

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