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.135 by root, Fri Oct 23 03:08:34 2009 UTC vs.
Revision 1.144 by root, Tue Nov 10 04:38:45 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
… …
328 330
329 if (!name_pl) 331 if (!name_pl)
330 name_pl = name; 332 name_pl = name;
331 333
332 /* objects now have a materialname. try to patch it in */ 334 /* objects now have a materialname. try to patch it in */
333 if (!(is_weapon () && level > 0)) 335 if (material == &material_null && !(is_weapon () && level > 0))
334 set_materialname (this, map ? map->difficulty : 5, 0); 336 select_material (this, map ? map->difficulty : 5);
335 337
336 /* only do these when program is first run - a bit 338 /* only do these when program is first run - a bit
337 * excessive to do this at every run - most of this is 339 * excessive to do this at every run - most of this is
338 * really just to catch any errors - program will still run, but 340 * really just to catch any errors - program will still run, but
339 * not in the ideal fashion. 341 * not in the ideal fashion.
… …
536 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str); 538 LOG (llevError, "common/loader.C: set_move - unknown move string '%s'\n", str);
537 539
538next: ; 540next: ;
539 } 541 }
540} 542}
543
544//-GPL
541 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)
… …
721 case KW_invisible: f.get (invisible); break; 725 case KW_invisible: f.get (invisible); break;
722 case KW_magic: f.get (magic); break; 726 case KW_magic: f.get (magic); break;
723 case KW_state: f.get (state); break; 727 case KW_state: f.get (state); break;
724 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 728 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
725 case KW_material: f.get (materials); break; //TODO: nuke 729 case KW_material: f.get (materials); break; //TODO: nuke
726 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;
727 738
728 /* These are the new values */ 739 /* These are the new values */
729 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;
730 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;
731 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;
… …
1066 archetype *arch = archetype::find (f.get_str ()); 1077 archetype *arch = archetype::find (f.get_str ());
1067 1078
1068 if (!arch) 1079 if (!arch)
1069 { 1080 {
1070 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1081 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1071 arch = archetype::find ("earthwall"); 1082 arch = archetype::find (shstr_earthwall);
1072 } 1083 }
1073 1084
1074 assert (arch); //D maybe use exception handling of sorts? 1085 assert (arch); //D maybe use exception handling of sorts?
1075 1086
1076 f.next (); 1087 f.next ();
… …
1102 object_thawer f (buf, (AV *)0); 1113 object_thawer f (buf, (AV *)0);
1103 1114
1104 return op->parse_kv (f); 1115 return op->parse_kv (f);
1105} 1116}
1106 1117
1107/* This returns a string of the integer movement type */
1108#if 0
1109// unused function
1110static char *
1111get_string_move_type (MoveType mt)
1112{
1113 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1114 int i, all_count = 0, count;
1115
1116 strcpy (retbuf, "");
1117 strcpy (retbuf_all, " all");
1118
1119 /* Quick check, and probably fairly common */
1120 if (mt == MOVE_ALL)
1121 return retbuf_all + 1;
1122 if (mt == 0)
1123 {
1124 strcpy (retbuf, "0");
1125 return retbuf;
1126 }
1127
1128 /* We basically slide the bits down. Why look at MOVE_ALL?
1129 * because we may want to return a string like 'all -swim',
1130 * and if we just looked at mt, we couldn't get that.
1131 */
1132 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1133 {
1134 if (mt & (1 << count))
1135 {
1136 strcat (retbuf, " ");
1137 strcat (retbuf, move_name[count]);
1138 }
1139 else
1140 {
1141 strcat (retbuf_all, " -");
1142 strcat (retbuf_all, move_name[count]);
1143 all_count++;
1144 }
1145 }
1146 /* Basically, if there is a single negation, return it, eg
1147 * 'all -swim'. But more than that, just return the
1148 * enumerated values. It doesn't make sense to return
1149 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1150 */
1151 if (all_count <= 1)
1152 return retbuf_all + 1;
1153 else
1154 return retbuf + 1;
1155}
1156#endif
1157
1158// compare *op against *tmp and output differences 1118// compare *op against *arch and output differences
1159static void 1119static void
1160write_diff (object_freezer &f, object *op, object *tmp) 1120write_diff (object_freezer &f, object *op, object *arch)
1161{ 1121{
1162 static const keyword resist_save[NROFATTACKS] = { 1122 static const keyword resist_save[NROFATTACKS] = {
1163# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1123# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1164# include "attackinc.h" 1124# include "attackinc.h"
1165# undef def 1125# undef def
… …
1179 KW_applied, 1139 KW_applied,
1180 KW_unpaid, 1140 KW_unpaid,
1181 KW_can_use_shield, 1141 KW_can_use_shield,
1182 KW_no_pick, 1142 KW_no_pick,
1183 KW_NULL, // walk_on 1143 KW_NULL, // walk_on
1144 /* 10 */
1184 KW_NULL, // no_pass 1145 KW_NULL, // no_pass
1185 /* 10 */
1186 KW_is_animated, 1146 KW_is_animated,
1187 KW_NULL, // slow_move 1147 KW_NULL, // slow_move
1188 KW_NULL, // flying 1148 KW_NULL, // flying
1189 KW_monster, 1149 KW_monster,
1190 KW_friendly, 1150 KW_friendly,
1191 KW_generator, 1151 KW_generator,
1192 KW_is_thrown, 1152 KW_is_thrown,
1193 KW_auto_apply, 1153 KW_auto_apply,
1194 KW_treasure_env, 1154 KW_treasure_env,
1155 /* 20 */
1195 KW_player_sold, 1156 KW_player_sold,
1196 /* 20 */
1197 KW_see_invisible, 1157 KW_see_invisible,
1198 KW_can_roll, 1158 KW_can_roll,
1199 KW_overlay_floor, 1159 KW_overlay_floor,
1200 KW_is_turnable, 1160 KW_is_turnable,
1201 KW_NULL, // walk_off 1161 KW_NULL, // walk_off
1202 KW_NULL, // fly_on 1162 KW_NULL, // fly_on
1203 KW_NULL, // fly_off 1163 KW_NULL, // fly_off
1204 KW_is_used_up, 1164 KW_is_used_up,
1205 KW_identified, 1165 KW_identified,
1166 /* 30 */
1206 KW_reflecting, 1167 KW_reflecting,
1207 /* 30 */
1208 KW_changing, 1168 KW_changing,
1209 KW_splitting, 1169 KW_splitting,
1210 KW_hitback, 1170 KW_hitback,
1211 KW_startequip, 1171 KW_startequip,
1212 KW_blocksview, 1172 KW_blocksview,
1213 KW_undead, 1173 KW_undead,
1214 KW_scared, 1174 KW_scared,
1215 KW_unaggressive, 1175 KW_unaggressive,
1216 KW_reflect_missile, 1176 KW_reflect_missile,
1177 /* 40 */
1217 KW_reflect_spell, 1178 KW_reflect_spell,
1218 /* 40 */
1219 KW_no_magic, 1179 KW_no_magic,
1220 KW_no_fix_player, 1180 KW_no_fix_player,
1221 KW_is_lightable, 1181 KW_is_lightable,
1222 KW_tear_down, 1182 KW_tear_down,
1223 KW_run_away, 1183 KW_run_away,
1224 KW_NULL, // pass_thru 1184 KW_NULL, // pass_thru
1225 KW_NULL, // an_pass_thru 1185 KW_NULL, // an_pass_thru
1226 KW_pick_up, 1186 KW_pick_up,
1227 KW_unique, 1187 KW_unique,
1188 /* 50 */
1228 KW_no_drop, 1189 KW_no_drop,
1229 /* 50 */
1230 KW_NULL, // wizcast 1190 KW_NULL, // wizcast
1231 KW_can_cast_spell, 1191 KW_can_cast_spell,
1232 KW_can_use_scroll, 1192 KW_can_use_scroll,
1233 KW_can_use_range, 1193 KW_can_use_range,
1234 KW_can_use_bow, 1194 KW_can_use_bow,
1235 KW_can_use_armour, 1195 KW_can_use_armour,
1236 KW_can_use_weapon, 1196 KW_can_use_weapon,
1237 KW_can_use_ring, 1197 KW_can_use_ring,
1238 KW_has_ready_range, 1198 KW_has_ready_range,
1199 /* 60 */
1239 KW_has_ready_bow, 1200 KW_has_ready_bow,
1240 /* 60 */
1241 KW_xrays, 1201 KW_xrays,
1242 KW_NULL, 1202 KW_NULL,
1243 KW_is_floor, 1203 KW_is_floor,
1244 KW_lifesave, 1204 KW_lifesave,
1245 KW_no_strength, 1205 KW_no_strength,
1246 KW_sleep, 1206 KW_sleep,
1247 KW_stand_still, 1207 KW_stand_still,
1248 KW_random_move, 1208 KW_random_move,
1249 KW_only_attack, 1209 KW_only_attack,
1210 /* 70 */
1250 KW_confused, 1211 KW_confused,
1251 /* 70 */
1252 KW_stealth, 1212 KW_stealth,
1253 KW_NULL, 1213 KW_NULL,
1254 KW_NULL, 1214 KW_NULL,
1255 KW_cursed, 1215 KW_cursed,
1256 KW_damned, 1216 KW_damned,
1257 KW_see_anywhere, 1217 KW_see_anywhere,
1258 KW_known_magical, 1218 KW_known_magical,
1259 KW_known_cursed, 1219 KW_known_cursed,
1260 KW_can_use_skill, 1220 KW_can_use_skill,
1221 /* 80 */
1261 KW_been_applied, 1222 KW_been_applied,
1262 /* 80 */
1263 KW_has_ready_scroll, 1223 KW_has_ready_scroll,
1264 KW_can_use_rod, 1224 KW_can_use_rod,
1265 KW_precious, 1225 KW_precious,
1266 KW_can_use_horn, 1226 KW_can_use_horn,
1267 KW_make_invisible, 1227 KW_make_invisible,
1268 KW_inv_locked, 1228 KW_inv_locked,
1269 KW_is_wooded, 1229 KW_is_wooded,
1270 KW_is_hilly, 1230 KW_is_hilly,
1271 KW_has_ready_skill, 1231 KW_has_ready_skill,
1232 /* 90 */
1272 KW_has_ready_weapon, 1233 KW_has_ready_weapon,
1273 /* 90 */
1274 KW_no_skill_ident, 1234 KW_no_skill_ident,
1275 KW_is_blind, 1235 KW_is_blind,
1276 KW_can_see_in_dark, 1236 KW_can_see_in_dark,
1277 KW_is_cauldron, 1237 KW_is_cauldron,
1278 KW_NULL, 1238 KW_NULL,
1279 KW_no_steal, 1239 KW_no_steal,
1280 KW_one_hit, 1240 KW_one_hit,
1281 KW_NULL, 1241 KW_NULL,
1282 KW_berserk, 1242 KW_berserk,
1243 /* 100 */
1283 KW_neutral, 1244 KW_neutral,
1284 /* 100 */
1285 KW_no_attack, 1245 KW_no_attack,
1286 KW_no_damage, 1246 KW_no_damage,
1287 KW_obj_original, 1247 KW_obj_original,
1288 KW_NULL, 1248 KW_NULL,
1289 KW_activate_on_push, 1249 KW_activate_on_push,
1290 KW_activate_on_release, 1250 KW_activate_on_release,
1291 KW_is_water, 1251 KW_is_water,
1292 KW_use_content_on_gen, 1252 KW_use_content_on_gen,
1293 KW_NULL, 1253 KW_NULL,
1254 /* 110 */
1294 KW_is_buildable, 1255 KW_is_buildable,
1295 /* 110 */
1296 KW_destroy_on_death, 1256 KW_destroy_on_death,
1297 KW_NULL, 1257 KW_NULL,
1298 }; 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;
1299 1271
1300 /* 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
1301 * keys that match field names will be overwritten by the loader. 1273 * keys that match field names will be overwritten by the loader.
1302 */ 1274 */
1303 for (key_value *kv = op->key_values; kv; kv = kv->next) 1275 for (key_value *kv = op->key_values; kv; kv = kv->next)
1304 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1276 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1305 f.put (kv->key, kv->value); 1277 f.put (kv->key, kv->value);
1306 1278
1307 /* We don't need to worry about the arch's extra fields - they
1308 * will get taken care of the copy_to method.
1309 */
1310
1311 if (op->uuid) 1279 if (op->uuid)
1312 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;
1313 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 }
1292
1314#define CMP_OUT(v) if (expect_false (op->v != tmp->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)
1315#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->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)
1295
1296 CMP_OUT (x);
1297 CMP_OUT (y);
1298
1299 CMP_OUT (type);
1300 CMP_OUT (subtype);
1301 CMP_OUT (direction);
1302
1303 CMP_OUT (name);
1304 CMP_OUT (name_pl);
1305
1306 CMP_OUT (speed);
1307 CMP_OUT (speed_left);
1308
1309 CMP_OUT (title);
1310 CMP_OUT (race);
1311 CMP_OUT (slaying);
1312 CMP_OUT (skill);
1313
1314 CMP_OUT (tag);
1315 CMP_OUT (custom_name);
1316 1316
1317 if (object *owner = op->owner) 1317 if (object *owner = op->owner)
1318 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1318 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1319 1319
1320 CMP_OUT (name); 1320 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1321 CMP_OUT (name_pl); 1321
1322 CMP_OUT (custom_name);
1323 CMP_OUT (title);
1324 CMP_OUT (race);
1325 CMP_OUT (skill);
1326 CMP_OUT (slaying);
1327 CMP_OUT (tag);
1328 CMP_OUT (other_arch); 1322 CMP_OUT (other_arch);
1329 1323
1330 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1324 if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg );
1331 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1325 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore);
1332 1326
1333 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1327 if (op->face != arch->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0);
1334 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1328 if (op->sound != arch->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1335 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1329 if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1336 1330
1337 if (op->animation_id != tmp->animation_id) 1331 if (op->animation_id != arch->animation_id)
1338 if (op->has_anim ()) 1332 if (op->has_anim ())
1339 f.put (KW_animation, op->anim ().name); 1333 f.put (KW_animation, op->anim ().name);
1340 else 1334 else
1341 { 1335 {
1342 f.put (KW_animation, (const char *)0); 1336 f.put (KW_animation, (const char *)0);
… …
1358 CMP_OUT2 (grace, stats.grace); 1352 CMP_OUT2 (grace, stats.grace);
1359 CMP_OUT2 (maxgrace, stats.maxgrace); 1353 CMP_OUT2 (maxgrace, stats.maxgrace);
1360 CMP_OUT2 (exp, stats.exp); 1354 CMP_OUT2 (exp, stats.exp);
1361 1355
1362 CMP_OUT (perm_exp); 1356 CMP_OUT (perm_exp);
1363 CMP_OUT (expmul); 1357 //CMP_OUT (expmul);
1364 1358
1365 CMP_OUT2 (food, stats.food); 1359 CMP_OUT2 (food, stats.food);
1366 CMP_OUT2 (dam, stats.dam); 1360 CMP_OUT2 (dam, stats.dam);
1367 CMP_OUT2 (luck, stats.luck); 1361 CMP_OUT2 (luck, stats.luck);
1368 CMP_OUT2 (wc, stats.wc); 1362 CMP_OUT2 (wc, stats.wc);
1369 CMP_OUT2 (ac, stats.ac); 1363 CMP_OUT2 (ac, stats.ac);
1370 1364
1371 CMP_OUT (x);
1372 CMP_OUT (y);
1373 CMP_OUT (speed);
1374 CMP_OUT (speed_left);
1375 CMP_OUT2 (move_state, move_status); 1365 CMP_OUT2 (move_state, move_status);
1376 CMP_OUT (attack_movement); 1366 CMP_OUT (attack_movement);
1377 CMP_OUT (nrof); 1367 CMP_OUT (nrof);
1378 CMP_OUT (level); 1368 CMP_OUT (level);
1379 CMP_OUT (direction);
1380 CMP_OUT (type);
1381 CMP_OUT (subtype);
1382 CMP_OUT (attacktype); 1369 CMP_OUT (attacktype);
1383 1370
1371 // using memcmp here seems to be a loss - is gcc vectorising?
1384 for (int i = 0; i < NROFATTACKS; i++) 1372 for (int i = 0; i < NROFATTACKS; i++)
1385 if (expect_false (op->resist[i] != tmp->resist[i])) 1373 if (expect_false (op->resist[i] != arch->resist[i]))
1386 f.put (resist_save[i], op->resist[i]); 1374 f.put (resist_save[i], op->resist[i]);
1387 1375
1388 CMP_OUT (path_attuned); 1376 CMP_OUT (path_attuned);
1389 CMP_OUT (path_repelled); 1377 CMP_OUT (path_repelled);
1390 CMP_OUT (path_denied); 1378 CMP_OUT (path_denied);
1379
1391 CMP_OUT2 (material, materials);//TODO: nuke 1380 CMP_OUT2 (material, materials);//TODO: nuke
1392 CMP_OUT (materialname); 1381 if (op->material != arch->material)
1382 f.put (KW_materialname, op->material->name);
1383
1393 CMP_OUT (value); 1384 CMP_OUT (value);
1394 CMP_OUT (carrying); 1385 CMP_OUT (carrying);
1395 CMP_OUT (weight); 1386 CMP_OUT (weight);
1396 CMP_OUT (invisible); 1387 CMP_OUT (invisible);
1397 CMP_OUT (state); 1388 CMP_OUT (state);
… …
1429 CMP_OUT (move_on); 1420 CMP_OUT (move_on);
1430 CMP_OUT (move_off); 1421 CMP_OUT (move_off);
1431 CMP_OUT (move_slow); 1422 CMP_OUT (move_slow);
1432 CMP_OUT (move_slow_penalty); 1423 CMP_OUT (move_slow_penalty);
1433 1424
1434 if (op->flag != tmp->flag) 1425 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
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
1433 if (expect_true (diff.any ()))
1435 for (int i = 0; i <= NUM_FLAGS; i++) 1434 for (int i = 0; i < NUM_FLAGS; i++)
1436 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1435 if (expect_false (diff [i]))
1437 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1436 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1438 1437
1439 // save body locations 1438 // save body locations. gcc's memcmp does an abysmal job when used
1440 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1439 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1441 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1440 if (expect_false (op->slot[i].info != arch->slot[i].info))
1442 f.put (body_locations[i].save_name, op->slot[i].info); 1441 f.put (body_locations[i].save_name, op->slot[i].info);
1443} 1442}
1444 1443
1445/* 1444/*
1446 * Dumps all variables in an object to a file. 1445 * Dumps all variables in an object to a file.

Diff Legend

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