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.132 by root, Thu Sep 17 01:57:31 2009 UTC vs.
Revision 1.143 by root, Mon Nov 9 19:17:58 2009 UTC

… …
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
26#include <sproto.h> 27#include <sproto.h>
27 28
28///////////////////////////////////////////////////////////////////////////// 29/////////////////////////////////////////////////////////////////////////////
29 30
30extern archetype *loading_arch; 31extern archetype *loading_arch;
32
33//+GPL
31 34
32/* 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
33 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
34 * 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
35 * 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
… …
536 539
537next: ; 540next: ;
538 } 541 }
539} 542}
540 543
544//-GPL
545
541#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () 546#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
542 547
543bool 548bool
544object::parse_kv (object_thawer &f) 549object::parse_kv (object_thawer &f)
545{ 550{
… …
993 loading_arch 998 loading_arch
994 ? treasurelist::get (f.get_str ()) 999 ? treasurelist::get (f.get_str ())
995 : treasurelist::find (f.get_str ()); 1000 : treasurelist::find (f.get_str ());
996 1001
997 if (!randomitems) 1002 if (!randomitems)
1003 {
998 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 }
999 } 1007 }
1000 else 1008 else
1001 randomitems = 0; 1009 randomitems = 0;
1002 break; 1010 break;
1003 1011
… …
1062 archetype *arch = archetype::find (f.get_str ()); 1070 archetype *arch = archetype::find (f.get_str ());
1063 1071
1064 if (!arch) 1072 if (!arch)
1065 { 1073 {
1066 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 ());
1067 arch = archetype::find ("earthwall"); 1075 arch = archetype::find (shstr_earthwall);
1068 } 1076 }
1069 1077
1070 assert (arch); //D maybe use exception handling of sorts? 1078 assert (arch); //D maybe use exception handling of sorts?
1071 1079
1072 f.next (); 1080 f.next ();
… …
1098 object_thawer f (buf, (AV *)0); 1106 object_thawer f (buf, (AV *)0);
1099 1107
1100 return op->parse_kv (f); 1108 return op->parse_kv (f);
1101} 1109}
1102 1110
1103/* This returns a string of the integer movement type */
1104#if 0
1105// unused function
1106static char *
1107get_string_move_type (MoveType mt)
1108{
1109 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1110 int i, all_count = 0, count;
1111
1112 strcpy (retbuf, "");
1113 strcpy (retbuf_all, " all");
1114
1115 /* Quick check, and probably fairly common */
1116 if (mt == MOVE_ALL)
1117 return retbuf_all + 1;
1118 if (mt == 0)
1119 {
1120 strcpy (retbuf, "0");
1121 return retbuf;
1122 }
1123
1124 /* We basically slide the bits down. Why look at MOVE_ALL?
1125 * because we may want to return a string like 'all -swim',
1126 * and if we just looked at mt, we couldn't get that.
1127 */
1128 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1129 {
1130 if (mt & (1 << count))
1131 {
1132 strcat (retbuf, " ");
1133 strcat (retbuf, move_name[count]);
1134 }
1135 else
1136 {
1137 strcat (retbuf_all, " -");
1138 strcat (retbuf_all, move_name[count]);
1139 all_count++;
1140 }
1141 }
1142 /* Basically, if there is a single negation, return it, eg
1143 * 'all -swim'. But more than that, just return the
1144 * enumerated values. It doesn't make sense to return
1145 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1146 */
1147 if (all_count <= 1)
1148 return retbuf_all + 1;
1149 else
1150 return retbuf + 1;
1151}
1152#endif
1153
1154// compare *op against *tmp and output differences 1111// compare *op against *arch and output differences
1155static void 1112static void
1156write_diff (object_freezer &f, object *op, object *tmp) 1113write_diff (object_freezer &f, object *op, object *arch)
1157{ 1114{
1158 static const keyword resist_save[NROFATTACKS] = { 1115 static const keyword resist_save[NROFATTACKS] = {
1159# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1116# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1160# include "attackinc.h" 1117# include "attackinc.h"
1161# undef def 1118# undef def
… …
1175 KW_applied, 1132 KW_applied,
1176 KW_unpaid, 1133 KW_unpaid,
1177 KW_can_use_shield, 1134 KW_can_use_shield,
1178 KW_no_pick, 1135 KW_no_pick,
1179 KW_NULL, // walk_on 1136 KW_NULL, // walk_on
1137 /* 10 */
1180 KW_NULL, // no_pass 1138 KW_NULL, // no_pass
1181 /* 10 */
1182 KW_is_animated, 1139 KW_is_animated,
1183 KW_NULL, // slow_move 1140 KW_NULL, // slow_move
1184 KW_NULL, // flying 1141 KW_NULL, // flying
1185 KW_monster, 1142 KW_monster,
1186 KW_friendly, 1143 KW_friendly,
1187 KW_generator, 1144 KW_generator,
1188 KW_is_thrown, 1145 KW_is_thrown,
1189 KW_auto_apply, 1146 KW_auto_apply,
1190 KW_treasure_env, 1147 KW_treasure_env,
1148 /* 20 */
1191 KW_player_sold, 1149 KW_player_sold,
1192 /* 20 */
1193 KW_see_invisible, 1150 KW_see_invisible,
1194 KW_can_roll, 1151 KW_can_roll,
1195 KW_overlay_floor, 1152 KW_overlay_floor,
1196 KW_is_turnable, 1153 KW_is_turnable,
1197 KW_NULL, // walk_off 1154 KW_NULL, // walk_off
1198 KW_NULL, // fly_on 1155 KW_NULL, // fly_on
1199 KW_NULL, // fly_off 1156 KW_NULL, // fly_off
1200 KW_is_used_up, 1157 KW_is_used_up,
1201 KW_identified, 1158 KW_identified,
1159 /* 30 */
1202 KW_reflecting, 1160 KW_reflecting,
1203 /* 30 */
1204 KW_changing, 1161 KW_changing,
1205 KW_splitting, 1162 KW_splitting,
1206 KW_hitback, 1163 KW_hitback,
1207 KW_startequip, 1164 KW_startequip,
1208 KW_blocksview, 1165 KW_blocksview,
1209 KW_undead, 1166 KW_undead,
1210 KW_scared, 1167 KW_scared,
1211 KW_unaggressive, 1168 KW_unaggressive,
1212 KW_reflect_missile, 1169 KW_reflect_missile,
1170 /* 40 */
1213 KW_reflect_spell, 1171 KW_reflect_spell,
1214 /* 40 */
1215 KW_no_magic, 1172 KW_no_magic,
1216 KW_no_fix_player, 1173 KW_no_fix_player,
1217 KW_is_lightable, 1174 KW_is_lightable,
1218 KW_tear_down, 1175 KW_tear_down,
1219 KW_run_away, 1176 KW_run_away,
1220 KW_NULL, // pass_thru 1177 KW_NULL, // pass_thru
1221 KW_NULL, // an_pass_thru 1178 KW_NULL, // an_pass_thru
1222 KW_pick_up, 1179 KW_pick_up,
1223 KW_unique, 1180 KW_unique,
1181 /* 50 */
1224 KW_no_drop, 1182 KW_no_drop,
1225 /* 50 */
1226 KW_NULL, // wizcast 1183 KW_NULL, // wizcast
1227 KW_can_cast_spell, 1184 KW_can_cast_spell,
1228 KW_can_use_scroll, 1185 KW_can_use_scroll,
1229 KW_can_use_range, 1186 KW_can_use_range,
1230 KW_can_use_bow, 1187 KW_can_use_bow,
1231 KW_can_use_armour, 1188 KW_can_use_armour,
1232 KW_can_use_weapon, 1189 KW_can_use_weapon,
1233 KW_can_use_ring, 1190 KW_can_use_ring,
1234 KW_has_ready_range, 1191 KW_has_ready_range,
1192 /* 60 */
1235 KW_has_ready_bow, 1193 KW_has_ready_bow,
1236 /* 60 */
1237 KW_xrays, 1194 KW_xrays,
1238 KW_NULL, 1195 KW_NULL,
1239 KW_is_floor, 1196 KW_is_floor,
1240 KW_lifesave, 1197 KW_lifesave,
1241 KW_no_strength, 1198 KW_no_strength,
1242 KW_sleep, 1199 KW_sleep,
1243 KW_stand_still, 1200 KW_stand_still,
1244 KW_random_move, 1201 KW_random_move,
1245 KW_only_attack, 1202 KW_only_attack,
1203 /* 70 */
1246 KW_confused, 1204 KW_confused,
1247 /* 70 */
1248 KW_stealth, 1205 KW_stealth,
1249 KW_NULL, 1206 KW_NULL,
1250 KW_NULL, 1207 KW_NULL,
1251 KW_cursed, 1208 KW_cursed,
1252 KW_damned, 1209 KW_damned,
1253 KW_see_anywhere, 1210 KW_see_anywhere,
1254 KW_known_magical, 1211 KW_known_magical,
1255 KW_known_cursed, 1212 KW_known_cursed,
1256 KW_can_use_skill, 1213 KW_can_use_skill,
1214 /* 80 */
1257 KW_been_applied, 1215 KW_been_applied,
1258 /* 80 */
1259 KW_has_ready_scroll, 1216 KW_has_ready_scroll,
1260 KW_can_use_rod, 1217 KW_can_use_rod,
1261 KW_precious, 1218 KW_precious,
1262 KW_can_use_horn, 1219 KW_can_use_horn,
1263 KW_make_invisible, 1220 KW_make_invisible,
1264 KW_inv_locked, 1221 KW_inv_locked,
1265 KW_is_wooded, 1222 KW_is_wooded,
1266 KW_is_hilly, 1223 KW_is_hilly,
1267 KW_has_ready_skill, 1224 KW_has_ready_skill,
1225 /* 90 */
1268 KW_has_ready_weapon, 1226 KW_has_ready_weapon,
1269 /* 90 */
1270 KW_no_skill_ident, 1227 KW_no_skill_ident,
1271 KW_is_blind, 1228 KW_is_blind,
1272 KW_can_see_in_dark, 1229 KW_can_see_in_dark,
1273 KW_is_cauldron, 1230 KW_is_cauldron,
1274 KW_NULL, 1231 KW_NULL,
1275 KW_no_steal, 1232 KW_no_steal,
1276 KW_one_hit, 1233 KW_one_hit,
1277 KW_NULL, 1234 KW_NULL,
1278 KW_berserk, 1235 KW_berserk,
1236 /* 100 */
1279 KW_neutral, 1237 KW_neutral,
1280 /* 100 */
1281 KW_no_attack, 1238 KW_no_attack,
1282 KW_no_damage, 1239 KW_no_damage,
1283 KW_obj_original, 1240 KW_obj_original,
1284 KW_NULL, 1241 KW_NULL,
1285 KW_activate_on_push, 1242 KW_activate_on_push,
1286 KW_activate_on_release, 1243 KW_activate_on_release,
1287 KW_is_water, 1244 KW_is_water,
1288 KW_use_content_on_gen, 1245 KW_use_content_on_gen,
1289 KW_NULL, 1246 KW_NULL,
1247 /* 110 */
1290 KW_is_buildable, 1248 KW_is_buildable,
1291 /* 110 */
1292 KW_destroy_on_death, 1249 KW_destroy_on_death,
1293 KW_NULL, 1250 KW_NULL,
1294 }; 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;
1295 1264
1296 /* 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
1297 * keys that match field names will be overwritten by the loader. 1266 * keys that match field names will be overwritten by the loader.
1298 */ 1267 */
1299 for (key_value *kv = op->key_values; kv; kv = kv->next) 1268 for (key_value *kv = op->key_values; kv; kv = kv->next)
1300 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1269 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1301 f.put (kv->key, kv->value); 1270 f.put (kv->key, kv->value);
1302 1271
1303 /* We don't need to worry about the arch's extra fields - they 1272 if (op->uuid)
1304 * will get taken care of the copy_to method. 1273 {
1305 */ 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;
1306 1277
1307 f.put (KW_uuid, op->uuid.c_str ()); 1278 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1279 ptr += sizeof ("uuid ") - 1;
1280 ptr = op->uuid.append (ptr);
1281 *ptr++ = '\n';
1308 1282
1283 f.alloc (ptr - cur);
1284 }
1285
1309#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)
1310#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);
1311 1309
1312 if (object *owner = op->owner) 1310 if (object *owner = op->owner)
1313 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1311 f.put (KW_owner, static_cast<const char *>(owner->ref ()));
1314 1312
1315 CMP_OUT (name); 1313 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1316 CMP_OUT (name_pl); 1314
1317 CMP_OUT (custom_name);
1318 CMP_OUT (title);
1319 CMP_OUT (race);
1320 CMP_OUT (skill);
1321 CMP_OUT (slaying);
1322 CMP_OUT (tag);
1323 CMP_OUT (other_arch); 1315 CMP_OUT (other_arch);
1324 1316
1325 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 );
1326 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);
1327 1319
1328 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);
1329 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);
1330 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);
1331 1323
1332 if (op->animation_id != tmp->animation_id) 1324 if (op->animation_id != arch->animation_id)
1333 if (op->has_anim ()) 1325 if (op->has_anim ())
1334 f.put (KW_animation, op->anim ().name); 1326 f.put (KW_animation, op->anim ().name);
1335 else 1327 else
1336 { 1328 {
1337 f.put (KW_animation, (const char *)0); 1329 f.put (KW_animation, (const char *)0);
… …
1353 CMP_OUT2 (grace, stats.grace); 1345 CMP_OUT2 (grace, stats.grace);
1354 CMP_OUT2 (maxgrace, stats.maxgrace); 1346 CMP_OUT2 (maxgrace, stats.maxgrace);
1355 CMP_OUT2 (exp, stats.exp); 1347 CMP_OUT2 (exp, stats.exp);
1356 1348
1357 CMP_OUT (perm_exp); 1349 CMP_OUT (perm_exp);
1358 CMP_OUT (expmul); 1350 //CMP_OUT (expmul);
1359 1351
1360 CMP_OUT2 (food, stats.food); 1352 CMP_OUT2 (food, stats.food);
1361 CMP_OUT2 (dam, stats.dam); 1353 CMP_OUT2 (dam, stats.dam);
1362 CMP_OUT2 (luck, stats.luck); 1354 CMP_OUT2 (luck, stats.luck);
1363 CMP_OUT2 (wc, stats.wc); 1355 CMP_OUT2 (wc, stats.wc);
1364 CMP_OUT2 (ac, stats.ac); 1356 CMP_OUT2 (ac, stats.ac);
1365 1357
1366 CMP_OUT (x);
1367 CMP_OUT (y);
1368 CMP_OUT (speed);
1369 CMP_OUT (speed_left);
1370 CMP_OUT2 (move_state, move_status); 1358 CMP_OUT2 (move_state, move_status);
1371 CMP_OUT (attack_movement); 1359 CMP_OUT (attack_movement);
1372 CMP_OUT (nrof); 1360 CMP_OUT (nrof);
1373 CMP_OUT (level); 1361 CMP_OUT (level);
1374 CMP_OUT (direction);
1375 CMP_OUT (type);
1376 CMP_OUT (subtype);
1377 CMP_OUT (attacktype); 1362 CMP_OUT (attacktype);
1378 1363
1364 // using memcmp here seems to be a loss - us gcc vectorising?
1379 for (int i = 0; i < NROFATTACKS; i++) 1365 for (int i = 0; i < NROFATTACKS; i++)
1380 if (expect_false (op->resist[i] != tmp->resist[i])) 1366 if (expect_false (op->resist[i] != arch->resist[i]))
1381 f.put (resist_save[i], op->resist[i]); 1367 f.put (resist_save[i], op->resist[i]);
1382 1368
1383 CMP_OUT (path_attuned); 1369 CMP_OUT (path_attuned);
1384 CMP_OUT (path_repelled); 1370 CMP_OUT (path_repelled);
1385 CMP_OUT (path_denied); 1371 CMP_OUT (path_denied);
… …
1424 CMP_OUT (move_on); 1410 CMP_OUT (move_on);
1425 CMP_OUT (move_off); 1411 CMP_OUT (move_off);
1426 CMP_OUT (move_slow); 1412 CMP_OUT (move_slow);
1427 CMP_OUT (move_slow_penalty); 1413 CMP_OUT (move_slow_penalty);
1428 1414
1429 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 ()))
1430 for (int i = 0; i <= NUM_FLAGS; i++) 1424 for (int i = 0; i < NUM_FLAGS; i++)
1431 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1425 if (expect_false (diff [i]))
1432 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1426 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1433 1427
1434 // save body locations 1428 // save body locations. gcc's memcmp does an abysmal job when used
1435 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1429 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1436 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1430 if (expect_false (op->slot[i].info != arch->slot[i].info))
1437 f.put (body_locations[i].save_name, op->slot[i].info); 1431 f.put (body_locations[i].save_name, op->slot[i].info);
1438} 1432}
1439 1433
1440/* 1434/*
1441 * 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