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.142 by root, Mon Nov 9 17:39:05 2009 UTC vs.
Revision 1.143 by root, Mon Nov 9 19:17:58 2009 UTC

… …
1132 KW_applied, 1132 KW_applied,
1133 KW_unpaid, 1133 KW_unpaid,
1134 KW_can_use_shield, 1134 KW_can_use_shield,
1135 KW_no_pick, 1135 KW_no_pick,
1136 KW_NULL, // walk_on 1136 KW_NULL, // walk_on
1137 /* 10 */
1137 KW_NULL, // no_pass 1138 KW_NULL, // no_pass
1138 /* 10 */
1139 KW_is_animated, 1139 KW_is_animated,
1140 KW_NULL, // slow_move 1140 KW_NULL, // slow_move
1141 KW_NULL, // flying 1141 KW_NULL, // flying
1142 KW_monster, 1142 KW_monster,
1143 KW_friendly, 1143 KW_friendly,
1144 KW_generator, 1144 KW_generator,
1145 KW_is_thrown, 1145 KW_is_thrown,
1146 KW_auto_apply, 1146 KW_auto_apply,
1147 KW_treasure_env, 1147 KW_treasure_env,
1148 /* 20 */
1148 KW_player_sold, 1149 KW_player_sold,
1149 /* 20 */
1150 KW_see_invisible, 1150 KW_see_invisible,
1151 KW_can_roll, 1151 KW_can_roll,
1152 KW_overlay_floor, 1152 KW_overlay_floor,
1153 KW_is_turnable, 1153 KW_is_turnable,
1154 KW_NULL, // walk_off 1154 KW_NULL, // walk_off
1155 KW_NULL, // fly_on 1155 KW_NULL, // fly_on
1156 KW_NULL, // fly_off 1156 KW_NULL, // fly_off
1157 KW_is_used_up, 1157 KW_is_used_up,
1158 KW_identified, 1158 KW_identified,
1159 /* 30 */
1159 KW_reflecting, 1160 KW_reflecting,
1160 /* 30 */
1161 KW_changing, 1161 KW_changing,
1162 KW_splitting, 1162 KW_splitting,
1163 KW_hitback, 1163 KW_hitback,
1164 KW_startequip, 1164 KW_startequip,
1165 KW_blocksview, 1165 KW_blocksview,
1166 KW_undead, 1166 KW_undead,
1167 KW_scared, 1167 KW_scared,
1168 KW_unaggressive, 1168 KW_unaggressive,
1169 KW_reflect_missile, 1169 KW_reflect_missile,
1170 /* 40 */
1170 KW_reflect_spell, 1171 KW_reflect_spell,
1171 /* 40 */
1172 KW_no_magic, 1172 KW_no_magic,
1173 KW_no_fix_player, 1173 KW_no_fix_player,
1174 KW_is_lightable, 1174 KW_is_lightable,
1175 KW_tear_down, 1175 KW_tear_down,
1176 KW_run_away, 1176 KW_run_away,
1177 KW_NULL, // pass_thru 1177 KW_NULL, // pass_thru
1178 KW_NULL, // an_pass_thru 1178 KW_NULL, // an_pass_thru
1179 KW_pick_up, 1179 KW_pick_up,
1180 KW_unique, 1180 KW_unique,
1181 /* 50 */
1181 KW_no_drop, 1182 KW_no_drop,
1182 /* 50 */
1183 KW_NULL, // wizcast 1183 KW_NULL, // wizcast
1184 KW_can_cast_spell, 1184 KW_can_cast_spell,
1185 KW_can_use_scroll, 1185 KW_can_use_scroll,
1186 KW_can_use_range, 1186 KW_can_use_range,
1187 KW_can_use_bow, 1187 KW_can_use_bow,
1188 KW_can_use_armour, 1188 KW_can_use_armour,
1189 KW_can_use_weapon, 1189 KW_can_use_weapon,
1190 KW_can_use_ring, 1190 KW_can_use_ring,
1191 KW_has_ready_range, 1191 KW_has_ready_range,
1192 /* 60 */
1192 KW_has_ready_bow, 1193 KW_has_ready_bow,
1193 /* 60 */
1194 KW_xrays, 1194 KW_xrays,
1195 KW_NULL, 1195 KW_NULL,
1196 KW_is_floor, 1196 KW_is_floor,
1197 KW_lifesave, 1197 KW_lifesave,
1198 KW_no_strength, 1198 KW_no_strength,
1199 KW_sleep, 1199 KW_sleep,
1200 KW_stand_still, 1200 KW_stand_still,
1201 KW_random_move, 1201 KW_random_move,
1202 KW_only_attack, 1202 KW_only_attack,
1203 /* 70 */
1203 KW_confused, 1204 KW_confused,
1204 /* 70 */
1205 KW_stealth, 1205 KW_stealth,
1206 KW_NULL, 1206 KW_NULL,
1207 KW_NULL, 1207 KW_NULL,
1208 KW_cursed, 1208 KW_cursed,
1209 KW_damned, 1209 KW_damned,
1210 KW_see_anywhere, 1210 KW_see_anywhere,
1211 KW_known_magical, 1211 KW_known_magical,
1212 KW_known_cursed, 1212 KW_known_cursed,
1213 KW_can_use_skill, 1213 KW_can_use_skill,
1214 /* 80 */
1214 KW_been_applied, 1215 KW_been_applied,
1215 /* 80 */
1216 KW_has_ready_scroll, 1216 KW_has_ready_scroll,
1217 KW_can_use_rod, 1217 KW_can_use_rod,
1218 KW_precious, 1218 KW_precious,
1219 KW_can_use_horn, 1219 KW_can_use_horn,
1220 KW_make_invisible, 1220 KW_make_invisible,
1221 KW_inv_locked, 1221 KW_inv_locked,
1222 KW_is_wooded, 1222 KW_is_wooded,
1223 KW_is_hilly, 1223 KW_is_hilly,
1224 KW_has_ready_skill, 1224 KW_has_ready_skill,
1225 /* 90 */
1225 KW_has_ready_weapon, 1226 KW_has_ready_weapon,
1226 /* 90 */
1227 KW_no_skill_ident, 1227 KW_no_skill_ident,
1228 KW_is_blind, 1228 KW_is_blind,
1229 KW_can_see_in_dark, 1229 KW_can_see_in_dark,
1230 KW_is_cauldron, 1230 KW_is_cauldron,
1231 KW_NULL, 1231 KW_NULL,
1232 KW_no_steal, 1232 KW_no_steal,
1233 KW_one_hit, 1233 KW_one_hit,
1234 KW_NULL, 1234 KW_NULL,
1235 KW_berserk, 1235 KW_berserk,
1236 /* 100 */
1236 KW_neutral, 1237 KW_neutral,
1237 /* 100 */
1238 KW_no_attack, 1238 KW_no_attack,
1239 KW_no_damage, 1239 KW_no_damage,
1240 KW_obj_original, 1240 KW_obj_original,
1241 KW_NULL, 1241 KW_NULL,
1242 KW_activate_on_push, 1242 KW_activate_on_push,
1243 KW_activate_on_release, 1243 KW_activate_on_release,
1244 KW_is_water, 1244 KW_is_water,
1245 KW_use_content_on_gen, 1245 KW_use_content_on_gen,
1246 KW_NULL, 1246 KW_NULL,
1247 /* 110 */
1247 KW_is_buildable, 1248 KW_is_buildable,
1248 /* 110 */
1249 KW_destroy_on_death, 1249 KW_destroy_on_death,
1250 KW_NULL, 1250 KW_NULL,
1251 }; 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;
1252 1264
1253 /* 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
1254 * keys that match field names will be overwritten by the loader. 1266 * keys that match field names will be overwritten by the loader.
1255 */ 1267 */
1256 for (key_value *kv = op->key_values; kv; kv = kv->next) 1268 for (key_value *kv = op->key_values; kv; kv = kv->next)
… …
1398 CMP_OUT (move_on); 1410 CMP_OUT (move_on);
1399 CMP_OUT (move_off); 1411 CMP_OUT (move_off);
1400 CMP_OUT (move_slow); 1412 CMP_OUT (move_slow);
1401 CMP_OUT (move_slow_penalty); 1413 CMP_OUT (move_slow_penalty);
1402 1414
1403 // obj_original is the only commonly differing flag between archetype
1404 // and object, so special-case it here to be able to skip the loop
1405 object::flags_t diff = op->flag ^ arch->flag; 1415 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1406 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
1407 if (expect_true (diff.any ())) 1423 if (expect_true (diff.any ()))
1408 {
1409 if (expect_false (diff.reset (FLAG_OBJ_ORIGINAL).any ()) || 1)
1410 {
1411 // some other flags differ, too
1412 for (int i = 0; i < NUM_FLAGS; i++) 1424 for (int i = 0; i < NUM_FLAGS; i++)
1413 if (expect_false (flag_names [i] && op->flag [i] != arch->flag [i])) 1425 if (expect_false (diff [i]))
1414 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1426 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1415 }
1416 else
1417 {
1418 // only obj_original differs
1419 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0");
1420 }
1421 }
1422 1427
1423 // save body locations. gcc's memcmp does an abysmal job when used 1428 // save body locations. gcc's memcmp does an abysmal job when used
1424 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1429 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1425 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1430 if (expect_false (op->slot[i].info != arch->slot[i].info))
1426 f.put (body_locations[i].save_name, op->slot[i].info); 1431 f.put (body_locations[i].save_name, op->slot[i].info);

Diff Legend

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