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.139 by root, Sun Nov 8 22:28:10 2009 UTC

… …
1106 object_thawer f (buf, (AV *)0); 1106 object_thawer f (buf, (AV *)0);
1107 1107
1108 return op->parse_kv (f); 1108 return op->parse_kv (f);
1109} 1109}
1110 1110
1111// compare *op against *tmp and output differences 1111// compare *op against *arch and output differences
1112static void 1112static void
1113write_diff (object_freezer &f, object *op, object *tmp) 1113write_diff (object_freezer &f, object *op, object *arch)
1114{ 1114{
1115 static const keyword resist_save[NROFATTACKS] = { 1115 static const keyword resist_save[NROFATTACKS] = {
1116# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1116# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1117# include "attackinc.h" 1117# include "attackinc.h"
1118# undef def 1118# undef def
… …
1252 1252
1253 /* This saves the key/value lists. We do it first so that any 1253 /* 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. 1254 * keys that match field names will be overwritten by the loader.
1255 */ 1255 */
1256 for (key_value *kv = op->key_values; kv; kv = kv->next) 1256 for (key_value *kv = op->key_values; kv; kv = kv->next)
1257 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1257 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1258 f.put (kv->key, kv->value); 1258 f.put (kv->key, kv->value);
1259
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 1259
1264 if (op->uuid) 1260 if (op->uuid)
1265 f.put (KW_uuid, op->uuid.c_str ()); 1261 f.put (KW_uuid, op->uuid.c_str ());
1266 1262
1267#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1263#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) 1264#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v)
1265
1266 CMP_OUT (x);
1267 CMP_OUT (y);
1268
1269 CMP_OUT (type);
1270 CMP_OUT (subtype);
1271 CMP_OUT (direction);
1272
1273 CMP_OUT (name);
1274 CMP_OUT (name_pl);
1275
1276 CMP_OUT (speed);
1277 CMP_OUT (speed_left);
1278
1279 CMP_OUT (title);
1280 CMP_OUT (race);
1281 CMP_OUT (slaying);
1282 CMP_OUT (skill);
1283
1284 CMP_OUT (tag);
1285 CMP_OUT (custom_name);
1269 1286
1270 if (object *owner = op->owner) 1287 if (object *owner = op->owner)
1271 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1288 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1272 1289
1273 CMP_OUT (name); 1290 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1274 CMP_OUT (name_pl); 1291
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); 1292 CMP_OUT (other_arch);
1282 1293
1283 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1294 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); 1295 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore);
1285 1296
1286 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1297 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); 1298 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); 1299 if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1289 1300
1290 if (op->animation_id != tmp->animation_id) 1301 if (op->animation_id != arch->animation_id)
1291 if (op->has_anim ()) 1302 if (op->has_anim ())
1292 f.put (KW_animation, op->anim ().name); 1303 f.put (KW_animation, op->anim ().name);
1293 else 1304 else
1294 { 1305 {
1295 f.put (KW_animation, (const char *)0); 1306 f.put (KW_animation, (const char *)0);
… …
1311 CMP_OUT2 (grace, stats.grace); 1322 CMP_OUT2 (grace, stats.grace);
1312 CMP_OUT2 (maxgrace, stats.maxgrace); 1323 CMP_OUT2 (maxgrace, stats.maxgrace);
1313 CMP_OUT2 (exp, stats.exp); 1324 CMP_OUT2 (exp, stats.exp);
1314 1325
1315 CMP_OUT (perm_exp); 1326 CMP_OUT (perm_exp);
1316 CMP_OUT (expmul); 1327 //CMP_OUT (expmul);
1317 1328
1318 CMP_OUT2 (food, stats.food); 1329 CMP_OUT2 (food, stats.food);
1319 CMP_OUT2 (dam, stats.dam); 1330 CMP_OUT2 (dam, stats.dam);
1320 CMP_OUT2 (luck, stats.luck); 1331 CMP_OUT2 (luck, stats.luck);
1321 CMP_OUT2 (wc, stats.wc); 1332 CMP_OUT2 (wc, stats.wc);
1322 CMP_OUT2 (ac, stats.ac); 1333 CMP_OUT2 (ac, stats.ac);
1323 1334
1324 CMP_OUT (x);
1325 CMP_OUT (y);
1326 CMP_OUT (speed);
1327 CMP_OUT (speed_left);
1328 CMP_OUT2 (move_state, move_status); 1335 CMP_OUT2 (move_state, move_status);
1329 CMP_OUT (attack_movement); 1336 CMP_OUT (attack_movement);
1330 CMP_OUT (nrof); 1337 CMP_OUT (nrof);
1331 CMP_OUT (level); 1338 CMP_OUT (level);
1332 CMP_OUT (direction);
1333 CMP_OUT (type);
1334 CMP_OUT (subtype);
1335 CMP_OUT (attacktype); 1339 CMP_OUT (attacktype);
1336 1340
1341 // using memcmp here seems to be a loss - us gcc vectorising?
1337 for (int i = 0; i < NROFATTACKS; i++) 1342 for (int i = 0; i < NROFATTACKS; i++)
1338 if (expect_false (op->resist[i] != tmp->resist[i])) 1343 if (expect_false (op->resist[i] != arch->resist[i]))
1339 f.put (resist_save[i], op->resist[i]); 1344 f.put (resist_save[i], op->resist[i]);
1340 1345
1341 CMP_OUT (path_attuned); 1346 CMP_OUT (path_attuned);
1342 CMP_OUT (path_repelled); 1347 CMP_OUT (path_repelled);
1343 CMP_OUT (path_denied); 1348 CMP_OUT (path_denied);
… …
1382 CMP_OUT (move_on); 1387 CMP_OUT (move_on);
1383 CMP_OUT (move_off); 1388 CMP_OUT (move_off);
1384 CMP_OUT (move_slow); 1389 CMP_OUT (move_slow);
1385 CMP_OUT (move_slow_penalty); 1390 CMP_OUT (move_slow_penalty);
1386 1391
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;
1395
1396 if (expect_true (diff.any ()))
1397 {
1398 if (expect_false (diff.reset (FLAG_OBJ_ORIGINAL).any ()))
1399 {
1400 // some other flags differ, too
1387 if (op->flag != tmp->flag) 1401 if (op->flag != arch->flag)
1388 for (int i = 0; i <= NUM_FLAGS; i++) 1402 for (int i = 0; i <= NUM_FLAGS; i++)
1389 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1403 if (expect_false (flag_names [i] && op->flag [i] != arch->flag [i]))
1390 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1404 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1405 }
1406 else
1407 {
1408 // only obj_original differs
1409 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0");
1410 }
1411 }
1391 1412
1392 // save body locations 1413 // save body locations. gcc's memcmp does an abysmal job when used
1393 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1414 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1394 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1415 if (expect_false (op->slot[i].info != arch->slot[i].info))
1395 f.put (body_locations[i].save_name, op->slot[i].info); 1416 f.put (body_locations[i].save_name, op->slot[i].info);
1396} 1417}
1397 1418
1398/* 1419/*
1399 * Dumps all variables in an object to a file. 1420 * Dumps all variables in an object to a file.

Diff Legend

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