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.18 by root, Fri Sep 15 00:31:36 2006 UTC vs.
Revision 1.19 by root, Thu Sep 21 00:05:24 2006 UTC

… …
864 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; 864 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break;
865 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break; 865 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break;
866 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break; 866 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break;
867 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break; 867 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break;
868 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break; 868 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break;
869 case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break;
869 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; 870 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break;
870 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; 871 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break;
871 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; 872 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break;
872 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; 873 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break;
873 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; 874 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break;
… …
1095 yy_pop_state (); 1096 yy_pop_state ();
1096 return retval; 1097 return retval;
1097#endif 1098#endif
1098} 1099}
1099 1100
1100/* This array equates the FLAG_ values with the V_ values. Use -1 to
1101 * put gaps in the array that should not be processed.
1102 * The order matches the order of the define values in 'define.h'.
1103 */
1104
1105/* This is a list of pointers that correspond to the FLAG_.. values.
1106 * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
1107 * the 15'th element of this array should match that name.
1108 * If an entry is NULL, that is a flag not to loaded/saved.
1109 */
1110static const char *const flag_names[NUM_FLAGS + 1] = {
1111 "alive", "wiz", NULL, NULL, "was_wiz", "applied", "unpaid",
1112 "can_use_shield", "no_pick", NULL /* walk_on */ , NULL /* no_pass */ , /* 10 */
1113 "is_animated", NULL /* slow_move */ ,
1114 NULL /* flying */ , "monster", "friendly", "generator",
1115 "is_thrown", "auto_apply", "treasure", "player sold", /* 20 */
1116 "see_invisible", "can_roll", "overlay_floor",
1117 "is_turnable", NULL /* walk_off */ , NULL /* fly_on */ ,
1118 NULL /*fly_off */ , "is_used_up", "identified", "reflecting", /* 30 */
1119 "changing", "splitting", "hitback", "startequip",
1120 "blocksview", "undead", "scared", "unaggressive",
1121 "reflect_missile", "reflect_spell", /* 40 */
1122 "no_magic", "no_fix_player", "is_lightable", "tear_down",
1123 "run_away", NULL /*pass_thru */ , NULL /*can_pass_thru */ ,
1124 "pick_up", "unique", "no_drop", /* 50 */
1125 NULL /* wizcast */ , "can_cast_spell", "can_use_scroll", "can_use_range",
1126 "can_use_bow", "can_use_armour", "can_use_weapon",
1127 "can_use_ring", "has_ready_range", "has_ready_bow", /* 60 */
1128 "xrays", NULL, "is_floor", "lifesave", "no_strength", "sleep",
1129 "stand_still", "random_move", "only_attack", "confused", /* 70 */
1130 "stealth", NULL, NULL, "cursed", "damned",
1131 "see_anywhere", "known_magical", "known_cursed",
1132 "can_use_skill", "been_applied", /* 80 */
1133 "has_ready_scroll", "can_use_rod", NULL,
1134 "can_use_horn", "make_invisible", "inv_locked", "is_wooded",
1135 "is_hilly", "has_ready_skill", "has_ready_weapon", /* 90 */
1136 "no_skill_ident", "is_blind", "can_see_in_dark", "is_cauldron",
1137 "is_dust", "no_steal", "one_hit", NULL, "berserk", "neutral", /* 100 */
1138 "no_attack", "no_damage", NULL, NULL, "activate_on_push",
1139 "activate_on_release", "is_water", "use_content_on_gen", NULL, "is_buildable", /* 110 */
1140 NULL
1141};
1142
1143
1144/* 1101/*
1145 * Initialises the array of variable-names. Needed before any 1102 * Initialises the array of variable-names. Needed before any
1146 * objects can be loaded. Called by init_library(). 1103 * objects can be loaded. Called by init_library().
1147 */ 1104 */
1148 1105
… …
1204 1161
1205// compare *op against *tmp and output differences 1162// compare *op against *tmp and output differences
1206void 1163void
1207put (object_freezer &f, object *op, object *tmp) 1164put (object_freezer &f, object *op, object *tmp)
1208{ 1165{
1166 static const keyword resist_save[NROFATTACKS] = {
1167# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1168# include "attackinc.h"
1169# undef def
1170 };
1171
1172 /* This is a list of keywords that correspond to the FLAG_.. values.
1173 * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
1174 * the 15'th element of this array should match that name.
1175 * If an entry is NULL, that is a flag not to loaded/saved.
1176 */
1177 static const keyword flag_names [NUM_FLAGS] = {
1178 KW_alive,
1179 KW_wiz,
1180 KW_NULL,
1181 KW_NULL,
1182 KW_was_wiz,
1183 KW_applied,
1184 KW_unpaid,
1185 KW_can_use_shield,
1186 KW_no_pick,
1187 KW_NULL, // walk_on
1188 KW_NULL, // no_pass
1189 /* 10 */
1190 KW_is_animated,
1191 KW_NULL, // slow_move
1192 KW_NULL, // flying
1193 KW_monster,
1194 KW_friendly,
1195 KW_generator,
1196 KW_is_thrown,
1197 KW_auto_apply,
1198 KW_treasure,
1199 KW_player_sold,
1200 /* 20 */
1201 KW_see_invisible,
1202 KW_can_roll,
1203 KW_overlay_floor,
1204 KW_is_turnable,
1205 KW_NULL, // walk_off
1206 KW_NULL, // fly_on
1207 KW_NULL, // fly_off
1208 KW_is_used_up,
1209 KW_identified,
1210 KW_reflecting,
1211 /* 30 */
1212 KW_changing,
1213 KW_splitting,
1214 KW_hitback,
1215 KW_startequip,
1216 KW_blocksview,
1217 KW_undead,
1218 KW_scared,
1219 KW_unaggressive,
1220 KW_reflect_missile,
1221 KW_reflect_spell,
1222 /* 40 */
1223 KW_no_magic,
1224 KW_no_fix_player,
1225 KW_is_lightable,
1226 KW_tear_down,
1227 KW_run_away,
1228 KW_NULL, // pass_thru
1229 KW_NULL, // an_pass_thru
1230 KW_pick_up,
1231 KW_unique,
1232 KW_no_drop,
1233 /* 50 */
1234 KW_NULL, // wizcast
1235 KW_can_cast_spell,
1236 KW_can_use_scroll,
1237 KW_can_use_range,
1238 KW_can_use_bow,
1239 KW_can_use_armour,
1240 KW_can_use_weapon,
1241 KW_can_use_ring,
1242 KW_has_ready_range,
1243 KW_has_ready_bow,
1244 /* 60 */
1245 KW_xrays,
1246 KW_NULL,
1247 KW_is_floor,
1248 KW_lifesave,
1249 KW_no_strength,
1250 KW_sleep,
1251 KW_stand_still,
1252 KW_random_move,
1253 KW_only_attack,
1254 KW_confused,
1255 /* 70 */
1256 KW_stealth,
1257 KW_NULL,
1258 KW_NULL,
1259 KW_cursed,
1260 KW_damned,
1261 KW_see_anywhere,
1262 KW_known_magical,
1263 KW_known_cursed,
1264 KW_can_use_skill,
1265 KW_been_applied,
1266 /* 80 */
1267 KW_has_ready_scroll,
1268 KW_can_use_rod,
1269 KW_NULL,
1270 KW_can_use_horn,
1271 KW_make_invisible,
1272 KW_inv_locked,
1273 KW_is_wooded,
1274 KW_is_hilly,
1275 KW_has_ready_skill,
1276 KW_has_ready_weapon,
1277 /* 90 */
1278 KW_no_skill_ident,
1279 KW_is_blind,
1280 KW_can_see_in_dark,
1281 KW_is_cauldron,
1282 KW_NULL,
1283 KW_no_steal,
1284 KW_one_hit,
1285 KW_NULL,
1286 KW_berserk,
1287 KW_neutral,
1288 /* 100 */
1289 KW_no_attack,
1290 KW_no_damage,
1291 KW_NULL,
1292 KW_NULL,
1293 KW_activate_on_push,
1294 KW_activate_on_release,
1295 KW_is_water,
1296 KW_use_content_on_gen,
1297 KW_NULL,
1298 KW_is_buildable,
1299 /* 110 */
1300 };
1301
1209 int i; 1302 int i;
1210 1303
1211 /* This saves the key/value lists. We do it first so that any 1304 /* This saves the key/value lists. We do it first so that any
1212 * keys that match field names will be overwritten by the loader. 1305 * keys that match field names will be overwritten by the loader.
1213 */ 1306 */
… …
1215 { 1308 {
1216 /* Find the field in the opposing member. */ 1309 /* Find the field in the opposing member. */
1217 key_value *arch_field = get_ob_key_link (tmp, my_field->key); 1310 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1218 1311
1219 /* If there's no partnering field, or it's got a different value, save our field. */ 1312 /* If there's no partnering field, or it's got a different value, save our field. */
1220 if (arch_field == NULL || my_field->value != arch_field->value) 1313 if (!arch_field || my_field->value != arch_field->value)
1221 f.put (my_field->key, my_field->value); 1314 f.put (my_field->key, my_field->value);
1222 } 1315 }
1223 1316
1224 /* We don't need to worry about the arch's extra fields - they 1317 /* We don't need to worry about the arch's extra fields - they
1225 * will get taken care of the copy_object function. 1318 * will get taken care of the copy_object function.
… …
1246 if (op->lore != tmp->lore) 1339 if (op->lore != tmp->lore)
1247 f.put (KW_lore, KW_endlore, op->lore); 1340 f.put (KW_lore, KW_endlore, op->lore);
1248 1341
1249 CMP_OUT (other_arch); 1342 CMP_OUT (other_arch);
1250 CMP_OUT (face); 1343 CMP_OUT (face);
1251
1252 if (!op->face || !op->face->name)
1253 printf ("ERRFACE<%s,%s, face %p,%p, fname%s>\n", &tmp->name, &op->name, tmp->face, op->face, op->face ? &op->face->name : "<noface>"); //D
1254 1344
1255 if (op->animation_id != tmp->animation_id) 1345 if (op->animation_id != tmp->animation_id)
1256 if (op->animation_id) 1346 if (op->animation_id)
1257 { 1347 {
1258 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1348 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);

Diff Legend

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