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.136 by root, Wed Nov 4 00:02:48 2009 UTC vs.
Revision 1.143 by root, Mon Nov 9 19:17:58 2009 UTC

… …
27#include <sproto.h> 27#include <sproto.h>
28 28
29///////////////////////////////////////////////////////////////////////////// 29/////////////////////////////////////////////////////////////////////////////
30 30
31extern archetype *loading_arch; 31extern archetype *loading_arch;
32
33//+GPL
32 34
33/* 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
34 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
35 * 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
36 * 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
… …
537 539
538next: ; 540next: ;
539 } 541 }
540} 542}
541 543
544//-GPL
545
542#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () 546#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
543 547
544bool 548bool
545object::parse_kv (object_thawer &f) 549object::parse_kv (object_thawer &f)
546{ 550{
… …
1066 archetype *arch = archetype::find (f.get_str ()); 1070 archetype *arch = archetype::find (f.get_str ());
1067 1071
1068 if (!arch) 1072 if (!arch)
1069 { 1073 {
1070 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1074 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1071 arch = archetype::find ("earthwall"); 1075 arch = archetype::find (shstr_earthwall);
1072 } 1076 }
1073 1077
1074 assert (arch); //D maybe use exception handling of sorts? 1078 assert (arch); //D maybe use exception handling of sorts?
1075 1079
1076 f.next (); 1080 f.next ();
… …
1102 object_thawer f (buf, (AV *)0); 1106 object_thawer f (buf, (AV *)0);
1103 1107
1104 return op->parse_kv (f); 1108 return op->parse_kv (f);
1105} 1109}
1106 1110
1107// compare *op against *tmp and output differences 1111// compare *op against *arch and output differences
1108static void 1112static void
1109write_diff (object_freezer &f, object *op, object *tmp) 1113write_diff (object_freezer &f, object *op, object *arch)
1110{ 1114{
1111 static const keyword resist_save[NROFATTACKS] = { 1115 static const keyword resist_save[NROFATTACKS] = {
1112# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1116# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1113# include "attackinc.h" 1117# include "attackinc.h"
1114# undef def 1118# undef def
… …
1128 KW_applied, 1132 KW_applied,
1129 KW_unpaid, 1133 KW_unpaid,
1130 KW_can_use_shield, 1134 KW_can_use_shield,
1131 KW_no_pick, 1135 KW_no_pick,
1132 KW_NULL, // walk_on 1136 KW_NULL, // walk_on
1137 /* 10 */
1133 KW_NULL, // no_pass 1138 KW_NULL, // no_pass
1134 /* 10 */
1135 KW_is_animated, 1139 KW_is_animated,
1136 KW_NULL, // slow_move 1140 KW_NULL, // slow_move
1137 KW_NULL, // flying 1141 KW_NULL, // flying
1138 KW_monster, 1142 KW_monster,
1139 KW_friendly, 1143 KW_friendly,
1140 KW_generator, 1144 KW_generator,
1141 KW_is_thrown, 1145 KW_is_thrown,
1142 KW_auto_apply, 1146 KW_auto_apply,
1143 KW_treasure_env, 1147 KW_treasure_env,
1148 /* 20 */
1144 KW_player_sold, 1149 KW_player_sold,
1145 /* 20 */
1146 KW_see_invisible, 1150 KW_see_invisible,
1147 KW_can_roll, 1151 KW_can_roll,
1148 KW_overlay_floor, 1152 KW_overlay_floor,
1149 KW_is_turnable, 1153 KW_is_turnable,
1150 KW_NULL, // walk_off 1154 KW_NULL, // walk_off
1151 KW_NULL, // fly_on 1155 KW_NULL, // fly_on
1152 KW_NULL, // fly_off 1156 KW_NULL, // fly_off
1153 KW_is_used_up, 1157 KW_is_used_up,
1154 KW_identified, 1158 KW_identified,
1159 /* 30 */
1155 KW_reflecting, 1160 KW_reflecting,
1156 /* 30 */
1157 KW_changing, 1161 KW_changing,
1158 KW_splitting, 1162 KW_splitting,
1159 KW_hitback, 1163 KW_hitback,
1160 KW_startequip, 1164 KW_startequip,
1161 KW_blocksview, 1165 KW_blocksview,
1162 KW_undead, 1166 KW_undead,
1163 KW_scared, 1167 KW_scared,
1164 KW_unaggressive, 1168 KW_unaggressive,
1165 KW_reflect_missile, 1169 KW_reflect_missile,
1170 /* 40 */
1166 KW_reflect_spell, 1171 KW_reflect_spell,
1167 /* 40 */
1168 KW_no_magic, 1172 KW_no_magic,
1169 KW_no_fix_player, 1173 KW_no_fix_player,
1170 KW_is_lightable, 1174 KW_is_lightable,
1171 KW_tear_down, 1175 KW_tear_down,
1172 KW_run_away, 1176 KW_run_away,
1173 KW_NULL, // pass_thru 1177 KW_NULL, // pass_thru
1174 KW_NULL, // an_pass_thru 1178 KW_NULL, // an_pass_thru
1175 KW_pick_up, 1179 KW_pick_up,
1176 KW_unique, 1180 KW_unique,
1181 /* 50 */
1177 KW_no_drop, 1182 KW_no_drop,
1178 /* 50 */
1179 KW_NULL, // wizcast 1183 KW_NULL, // wizcast
1180 KW_can_cast_spell, 1184 KW_can_cast_spell,
1181 KW_can_use_scroll, 1185 KW_can_use_scroll,
1182 KW_can_use_range, 1186 KW_can_use_range,
1183 KW_can_use_bow, 1187 KW_can_use_bow,
1184 KW_can_use_armour, 1188 KW_can_use_armour,
1185 KW_can_use_weapon, 1189 KW_can_use_weapon,
1186 KW_can_use_ring, 1190 KW_can_use_ring,
1187 KW_has_ready_range, 1191 KW_has_ready_range,
1192 /* 60 */
1188 KW_has_ready_bow, 1193 KW_has_ready_bow,
1189 /* 60 */
1190 KW_xrays, 1194 KW_xrays,
1191 KW_NULL, 1195 KW_NULL,
1192 KW_is_floor, 1196 KW_is_floor,
1193 KW_lifesave, 1197 KW_lifesave,
1194 KW_no_strength, 1198 KW_no_strength,
1195 KW_sleep, 1199 KW_sleep,
1196 KW_stand_still, 1200 KW_stand_still,
1197 KW_random_move, 1201 KW_random_move,
1198 KW_only_attack, 1202 KW_only_attack,
1203 /* 70 */
1199 KW_confused, 1204 KW_confused,
1200 /* 70 */
1201 KW_stealth, 1205 KW_stealth,
1202 KW_NULL, 1206 KW_NULL,
1203 KW_NULL, 1207 KW_NULL,
1204 KW_cursed, 1208 KW_cursed,
1205 KW_damned, 1209 KW_damned,
1206 KW_see_anywhere, 1210 KW_see_anywhere,
1207 KW_known_magical, 1211 KW_known_magical,
1208 KW_known_cursed, 1212 KW_known_cursed,
1209 KW_can_use_skill, 1213 KW_can_use_skill,
1214 /* 80 */
1210 KW_been_applied, 1215 KW_been_applied,
1211 /* 80 */
1212 KW_has_ready_scroll, 1216 KW_has_ready_scroll,
1213 KW_can_use_rod, 1217 KW_can_use_rod,
1214 KW_precious, 1218 KW_precious,
1215 KW_can_use_horn, 1219 KW_can_use_horn,
1216 KW_make_invisible, 1220 KW_make_invisible,
1217 KW_inv_locked, 1221 KW_inv_locked,
1218 KW_is_wooded, 1222 KW_is_wooded,
1219 KW_is_hilly, 1223 KW_is_hilly,
1220 KW_has_ready_skill, 1224 KW_has_ready_skill,
1225 /* 90 */
1221 KW_has_ready_weapon, 1226 KW_has_ready_weapon,
1222 /* 90 */
1223 KW_no_skill_ident, 1227 KW_no_skill_ident,
1224 KW_is_blind, 1228 KW_is_blind,
1225 KW_can_see_in_dark, 1229 KW_can_see_in_dark,
1226 KW_is_cauldron, 1230 KW_is_cauldron,
1227 KW_NULL, 1231 KW_NULL,
1228 KW_no_steal, 1232 KW_no_steal,
1229 KW_one_hit, 1233 KW_one_hit,
1230 KW_NULL, 1234 KW_NULL,
1231 KW_berserk, 1235 KW_berserk,
1236 /* 100 */
1232 KW_neutral, 1237 KW_neutral,
1233 /* 100 */
1234 KW_no_attack, 1238 KW_no_attack,
1235 KW_no_damage, 1239 KW_no_damage,
1236 KW_obj_original, 1240 KW_obj_original,
1237 KW_NULL, 1241 KW_NULL,
1238 KW_activate_on_push, 1242 KW_activate_on_push,
1239 KW_activate_on_release, 1243 KW_activate_on_release,
1240 KW_is_water, 1244 KW_is_water,
1241 KW_use_content_on_gen, 1245 KW_use_content_on_gen,
1242 KW_NULL, 1246 KW_NULL,
1247 /* 110 */
1243 KW_is_buildable, 1248 KW_is_buildable,
1244 /* 110 */
1245 KW_destroy_on_death, 1249 KW_destroy_on_death,
1246 KW_NULL, 1250 KW_NULL,
1247 }; 1251 };
1252
1253 // obj_original is the only commonly differing flag between archetype
1254 // and object, so special-case it here to be able to skip the loop
1255 static const struct flagmask : object::flags_t
1256 {
1257 flagmask ()
1258 {
1259 for (int i = 0; i < NUM_FLAGS; i++)
1260 if (flag_names [i])
1261 set (i);
1262 }
1263 } flagmask;
1248 1264
1249 /* This saves the key/value lists. We do it first so that any 1265 /* 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. 1266 * keys that match field names will be overwritten by the loader.
1251 */ 1267 */
1252 for (key_value *kv = op->key_values; kv; kv = kv->next) 1268 for (key_value *kv = op->key_values; kv; kv = kv->next)
1253 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1269 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1254 f.put (kv->key, kv->value); 1270 f.put (kv->key, kv->value);
1255 1271
1256 /* We don't need to worry about the arch's extra fields - they
1257 * will get taken care of the copy_to method.
1258 */
1259
1260 if (op->uuid) 1272 if (op->uuid)
1261 f.put (KW_uuid, op->uuid.c_str ()); 1273 {
1274 // highly optimised - this is often 25% of all data written
1275 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1276 char *ptr = cur;
1262 1277
1278 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1279 ptr += sizeof ("uuid ") - 1;
1280 ptr = op->uuid.append (ptr);
1281 *ptr++ = '\n';
1282
1283 f.alloc (ptr - cur);
1284 }
1285
1263#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1286#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 != tmp->v)) f.put (KW_ ## k, op->v) 1287#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v)
1288
1289 CMP_OUT (x);
1290 CMP_OUT (y);
1291
1292 CMP_OUT (type);
1293 CMP_OUT (subtype);
1294 CMP_OUT (direction);
1295
1296 CMP_OUT (name);
1297 CMP_OUT (name_pl);
1298
1299 CMP_OUT (speed);
1300 CMP_OUT (speed_left);
1301
1302 CMP_OUT (title);
1303 CMP_OUT (race);
1304 CMP_OUT (slaying);
1305 CMP_OUT (skill);
1306
1307 CMP_OUT (tag);
1308 CMP_OUT (custom_name);
1265 1309
1266 if (object *owner = op->owner) 1310 if (object *owner = op->owner)
1267 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1311 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1268 1312
1269 CMP_OUT (name); 1313 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1270 CMP_OUT (name_pl); 1314
1271 CMP_OUT (custom_name);
1272 CMP_OUT (title);
1273 CMP_OUT (race);
1274 CMP_OUT (skill);
1275 CMP_OUT (slaying);
1276 CMP_OUT (tag);
1277 CMP_OUT (other_arch); 1315 CMP_OUT (other_arch);
1278 1316
1279 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1317 if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1280 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1318 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore);
1281 1319
1282 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1320 if (op->face != arch->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1283 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1321 if (op->sound != arch->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1284 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1322 if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1285 1323
1286 if (op->animation_id != tmp->animation_id) 1324 if (op->animation_id != arch->animation_id)
1287 if (op->has_anim ()) 1325 if (op->has_anim ())
1288 f.put (KW_animation, op->anim ().name); 1326 f.put (KW_animation, op->anim ().name);
1289 else 1327 else
1290 { 1328 {
1291 f.put (KW_animation, (const char *)0); 1329 f.put (KW_animation, (const char *)0);
… …
1307 CMP_OUT2 (grace, stats.grace); 1345 CMP_OUT2 (grace, stats.grace);
1308 CMP_OUT2 (maxgrace, stats.maxgrace); 1346 CMP_OUT2 (maxgrace, stats.maxgrace);
1309 CMP_OUT2 (exp, stats.exp); 1347 CMP_OUT2 (exp, stats.exp);
1310 1348
1311 CMP_OUT (perm_exp); 1349 CMP_OUT (perm_exp);
1312 CMP_OUT (expmul); 1350 //CMP_OUT (expmul);
1313 1351
1314 CMP_OUT2 (food, stats.food); 1352 CMP_OUT2 (food, stats.food);
1315 CMP_OUT2 (dam, stats.dam); 1353 CMP_OUT2 (dam, stats.dam);
1316 CMP_OUT2 (luck, stats.luck); 1354 CMP_OUT2 (luck, stats.luck);
1317 CMP_OUT2 (wc, stats.wc); 1355 CMP_OUT2 (wc, stats.wc);
1318 CMP_OUT2 (ac, stats.ac); 1356 CMP_OUT2 (ac, stats.ac);
1319 1357
1320 CMP_OUT (x);
1321 CMP_OUT (y);
1322 CMP_OUT (speed);
1323 CMP_OUT (speed_left);
1324 CMP_OUT2 (move_state, move_status); 1358 CMP_OUT2 (move_state, move_status);
1325 CMP_OUT (attack_movement); 1359 CMP_OUT (attack_movement);
1326 CMP_OUT (nrof); 1360 CMP_OUT (nrof);
1327 CMP_OUT (level); 1361 CMP_OUT (level);
1328 CMP_OUT (direction);
1329 CMP_OUT (type);
1330 CMP_OUT (subtype);
1331 CMP_OUT (attacktype); 1362 CMP_OUT (attacktype);
1332 1363
1364 // using memcmp here seems to be a loss - us gcc vectorising?
1333 for (int i = 0; i < NROFATTACKS; i++) 1365 for (int i = 0; i < NROFATTACKS; i++)
1334 if (expect_false (op->resist[i] != tmp->resist[i])) 1366 if (expect_false (op->resist[i] != arch->resist[i]))
1335 f.put (resist_save[i], op->resist[i]); 1367 f.put (resist_save[i], op->resist[i]);
1336 1368
1337 CMP_OUT (path_attuned); 1369 CMP_OUT (path_attuned);
1338 CMP_OUT (path_repelled); 1370 CMP_OUT (path_repelled);
1339 CMP_OUT (path_denied); 1371 CMP_OUT (path_denied);
… …
1378 CMP_OUT (move_on); 1410 CMP_OUT (move_on);
1379 CMP_OUT (move_off); 1411 CMP_OUT (move_off);
1380 CMP_OUT (move_slow); 1412 CMP_OUT (move_slow);
1381 CMP_OUT (move_slow_penalty); 1413 CMP_OUT (move_slow_penalty);
1382 1414
1383 if (op->flag != tmp->flag) 1415 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1416
1417 if (diff [FLAG_OBJ_ORIGINAL])
1418 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0");
1419
1420 diff.reset (FLAG_OBJ_ORIGINAL);
1421
1422 // quickly test whether any other flags differ
1423 if (expect_true (diff.any ()))
1384 for (int i = 0; i <= NUM_FLAGS; i++) 1424 for (int i = 0; i < NUM_FLAGS; i++)
1385 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1425 if (expect_false (diff [i]))
1386 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1426 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1387 1427
1388 // save body locations 1428 // save body locations. gcc's memcmp does an abysmal job when used
1389 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1429 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1390 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1430 if (expect_false (op->slot[i].info != arch->slot[i].info))
1391 f.put (body_locations[i].save_name, op->slot[i].info); 1431 f.put (body_locations[i].save_name, op->slot[i].info);
1392} 1432}
1393 1433
1394/* 1434/*
1395 * Dumps all variables in an object to a file. 1435 * Dumps all variables in an object to a file.

Diff Legend

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