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.134 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.139 by root, Sun Nov 8 22:28:10 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{
… …
994 loading_arch 998 loading_arch
995 ? treasurelist::get (f.get_str ()) 999 ? treasurelist::get (f.get_str ())
996 : treasurelist::find (f.get_str ()); 1000 : treasurelist::find (f.get_str ());
997 1001
998 if (!randomitems) 1002 if (!randomitems)
1003 {
999 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1004 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1005 randomitems = treasurelist::get (shstr_none); // avoid crashes
1006 }
1000 } 1007 }
1001 else 1008 else
1002 randomitems = 0; 1009 randomitems = 0;
1003 break; 1010 break;
1004 1011
… …
1063 archetype *arch = archetype::find (f.get_str ()); 1070 archetype *arch = archetype::find (f.get_str ());
1064 1071
1065 if (!arch) 1072 if (!arch)
1066 { 1073 {
1067 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 ());
1068 arch = archetype::find ("earthwall"); 1075 arch = archetype::find (shstr_earthwall);
1069 } 1076 }
1070 1077
1071 assert (arch); //D maybe use exception handling of sorts? 1078 assert (arch); //D maybe use exception handling of sorts?
1072 1079
1073 f.next (); 1080 f.next ();
… …
1099 object_thawer f (buf, (AV *)0); 1106 object_thawer f (buf, (AV *)0);
1100 1107
1101 return op->parse_kv (f); 1108 return op->parse_kv (f);
1102} 1109}
1103 1110
1104/* This returns a string of the integer movement type */
1105#if 0
1106// unused function
1107static char *
1108get_string_move_type (MoveType mt)
1109{
1110 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1111 int i, all_count = 0, count;
1112
1113 strcpy (retbuf, "");
1114 strcpy (retbuf_all, " all");
1115
1116 /* Quick check, and probably fairly common */
1117 if (mt == MOVE_ALL)
1118 return retbuf_all + 1;
1119 if (mt == 0)
1120 {
1121 strcpy (retbuf, "0");
1122 return retbuf;
1123 }
1124
1125 /* We basically slide the bits down. Why look at MOVE_ALL?
1126 * because we may want to return a string like 'all -swim',
1127 * and if we just looked at mt, we couldn't get that.
1128 */
1129 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1130 {
1131 if (mt & (1 << count))
1132 {
1133 strcat (retbuf, " ");
1134 strcat (retbuf, move_name[count]);
1135 }
1136 else
1137 {
1138 strcat (retbuf_all, " -");
1139 strcat (retbuf_all, move_name[count]);
1140 all_count++;
1141 }
1142 }
1143 /* Basically, if there is a single negation, return it, eg
1144 * 'all -swim'. But more than that, just return the
1145 * enumerated values. It doesn't make sense to return
1146 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1147 */
1148 if (all_count <= 1)
1149 return retbuf_all + 1;
1150 else
1151 return retbuf + 1;
1152}
1153#endif
1154
1155// compare *op against *tmp and output differences 1111// compare *op against *arch and output differences
1156static void 1112static void
1157write_diff (object_freezer &f, object *op, object *tmp) 1113write_diff (object_freezer &f, object *op, object *arch)
1158{ 1114{
1159 static const keyword resist_save[NROFATTACKS] = { 1115 static const keyword resist_save[NROFATTACKS] = {
1160# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1116# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1161# include "attackinc.h" 1117# include "attackinc.h"
1162# undef def 1118# undef def
… …
1296 1252
1297 /* 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
1298 * keys that match field names will be overwritten by the loader. 1254 * keys that match field names will be overwritten by the loader.
1299 */ 1255 */
1300 for (key_value *kv = op->key_values; kv; kv = kv->next) 1256 for (key_value *kv = op->key_values; kv; kv = kv->next)
1301 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1257 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1302 f.put (kv->key, kv->value); 1258 f.put (kv->key, kv->value);
1303
1304 /* We don't need to worry about the arch's extra fields - they
1305 * will get taken care of the copy_to method.
1306 */
1307 1259
1308 if (op->uuid) 1260 if (op->uuid)
1309 f.put (KW_uuid, op->uuid.c_str ()); 1261 f.put (KW_uuid, op->uuid.c_str ());
1310 1262
1311#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)
1312#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);
1313 1286
1314 if (object *owner = op->owner) 1287 if (object *owner = op->owner)
1315 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1288 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1316 1289
1317 CMP_OUT (name); 1290 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1318 CMP_OUT (name_pl); 1291
1319 CMP_OUT (custom_name);
1320 CMP_OUT (title);
1321 CMP_OUT (race);
1322 CMP_OUT (skill);
1323 CMP_OUT (slaying);
1324 CMP_OUT (tag);
1325 CMP_OUT (other_arch); 1292 CMP_OUT (other_arch);
1326 1293
1327 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 );
1328 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);
1329 1296
1330 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);
1331 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);
1332 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);
1333 1300
1334 if (op->animation_id != tmp->animation_id) 1301 if (op->animation_id != arch->animation_id)
1335 if (op->has_anim ()) 1302 if (op->has_anim ())
1336 f.put (KW_animation, op->anim ().name); 1303 f.put (KW_animation, op->anim ().name);
1337 else 1304 else
1338 { 1305 {
1339 f.put (KW_animation, (const char *)0); 1306 f.put (KW_animation, (const char *)0);
… …
1355 CMP_OUT2 (grace, stats.grace); 1322 CMP_OUT2 (grace, stats.grace);
1356 CMP_OUT2 (maxgrace, stats.maxgrace); 1323 CMP_OUT2 (maxgrace, stats.maxgrace);
1357 CMP_OUT2 (exp, stats.exp); 1324 CMP_OUT2 (exp, stats.exp);
1358 1325
1359 CMP_OUT (perm_exp); 1326 CMP_OUT (perm_exp);
1360 CMP_OUT (expmul); 1327 //CMP_OUT (expmul);
1361 1328
1362 CMP_OUT2 (food, stats.food); 1329 CMP_OUT2 (food, stats.food);
1363 CMP_OUT2 (dam, stats.dam); 1330 CMP_OUT2 (dam, stats.dam);
1364 CMP_OUT2 (luck, stats.luck); 1331 CMP_OUT2 (luck, stats.luck);
1365 CMP_OUT2 (wc, stats.wc); 1332 CMP_OUT2 (wc, stats.wc);
1366 CMP_OUT2 (ac, stats.ac); 1333 CMP_OUT2 (ac, stats.ac);
1367 1334
1368 CMP_OUT (x);
1369 CMP_OUT (y);
1370 CMP_OUT (speed);
1371 CMP_OUT (speed_left);
1372 CMP_OUT2 (move_state, move_status); 1335 CMP_OUT2 (move_state, move_status);
1373 CMP_OUT (attack_movement); 1336 CMP_OUT (attack_movement);
1374 CMP_OUT (nrof); 1337 CMP_OUT (nrof);
1375 CMP_OUT (level); 1338 CMP_OUT (level);
1376 CMP_OUT (direction);
1377 CMP_OUT (type);
1378 CMP_OUT (subtype);
1379 CMP_OUT (attacktype); 1339 CMP_OUT (attacktype);
1380 1340
1341 // using memcmp here seems to be a loss - us gcc vectorising?
1381 for (int i = 0; i < NROFATTACKS; i++) 1342 for (int i = 0; i < NROFATTACKS; i++)
1382 if (expect_false (op->resist[i] != tmp->resist[i])) 1343 if (expect_false (op->resist[i] != arch->resist[i]))
1383 f.put (resist_save[i], op->resist[i]); 1344 f.put (resist_save[i], op->resist[i]);
1384 1345
1385 CMP_OUT (path_attuned); 1346 CMP_OUT (path_attuned);
1386 CMP_OUT (path_repelled); 1347 CMP_OUT (path_repelled);
1387 CMP_OUT (path_denied); 1348 CMP_OUT (path_denied);
… …
1426 CMP_OUT (move_on); 1387 CMP_OUT (move_on);
1427 CMP_OUT (move_off); 1388 CMP_OUT (move_off);
1428 CMP_OUT (move_slow); 1389 CMP_OUT (move_slow);
1429 CMP_OUT (move_slow_penalty); 1390 CMP_OUT (move_slow_penalty);
1430 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
1431 if (op->flag != tmp->flag) 1401 if (op->flag != arch->flag)
1432 for (int i = 0; i <= NUM_FLAGS; i++) 1402 for (int i = 0; i <= NUM_FLAGS; i++)
1433 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]))
1434 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 }
1435 1412
1436 // save body locations 1413 // save body locations. gcc's memcmp does an abysmal job when used
1437 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1414 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1438 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1415 if (expect_false (op->slot[i].info != arch->slot[i].info))
1439 f.put (body_locations[i].save_name, op->slot[i].info); 1416 f.put (body_locations[i].save_name, op->slot[i].info);
1440} 1417}
1441 1418
1442/* 1419/*
1443 * 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