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.27 by root, Sat Dec 23 06:41:39 2006 UTC

… …
26 variable. */ 26 variable. */
27 27
28 28
29#include <global.h> 29#include <global.h>
30#include <loader.h> 30#include <loader.h>
31#include <newserver.h>
32#include <sproto.h> 31#include <sproto.h>
33 32
34/* Maps the MOVE_* values to names */ 33/* Maps the MOVE_* values to names */
35static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 34static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
36 35
… …
280 279
281 if (!op->name_pl) 280 if (!op->name_pl)
282 op->name_pl = op->name; 281 op->name_pl = op->name;
283 282
284 /* objects now have a materialname. try to patch it in */ 283 /* objects now have a materialname. try to patch it in */
285 if (!(IS_WEAPON (op) && op->level > 0)) 284 if (!(op->is_weapon () && op->level > 0))
286 { 285 {
287 if (op->map != NULL) 286 if (op->map != NULL)
288 set_materialname (op, op->map->difficulty, NULL); 287 set_materialname (op, op->map->difficulty, NULL);
289 else 288 else
290 set_materialname (op, 5, NULL); 289 set_materialname (op, 5, NULL);
… …
556 555
557 if (arch != NULL) 556 if (arch != NULL)
558 tmp = arch_to_object (arch); 557 tmp = arch_to_object (arch);
559 else 558 else
560 { 559 {
561 tmp = get_object (); 560 tmp = object::create ();
562 /* record the name of the broken object */ 561 /* record the name of the broken object */
563 tmp->name = str; 562 tmp->name = str;
564 } 563 }
565 564
566 parse_object (tmp, thawer, map_flags); 565 parse_object (tmp, thawer, map_flags);
… …
593 op_inv = tmp; 592 op_inv = tmp;
594 } 593 }
595 else 594 else
596 { 595 {
597 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); 596 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
598 free_object (tmp); 597 tmp->destroy ();
599 } 598 }
600 } 599 }
601 else 600 else
602 { 601 {
603 /* This is the actual archetype definition then */ 602 /* This is the actual archetype definition then */
604 op->arch = archetype::find (str); 603 op->arch = archetype::find (str);
605 604
606 if (op->arch != NULL) 605 if (op->arch)
607 copy_object (&op->arch->clone, op); 606 op->arch->clone.copy_to (op);
608 else if (!arch_init) 607 else if (!arch_init)
609 /* record the name of the broken object */ 608 /* record the name of the broken object */
610 op->name = str; 609 op->name = str;
611 } 610 }
612 } 611 }
… …
826 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 825 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
827 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 826 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
828 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 827 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
829 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 828 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
830 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 829 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
831 case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break;
832 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 830 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
833 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 831 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
834 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 832 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
835 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 833 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
836 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; 834 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
… …
864 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; 862 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; 863 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; 864 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; 865 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; 866 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break;
867 case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break;
869 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; 868 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break;
870 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; 869 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break;
871 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; 870 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break;
872 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; 871 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break;
873 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; 872 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break;
… …
1080 * override values and in c_wiz to mutate values. 1079 * override values and in c_wiz to mutate values.
1081 */ 1080 */
1082int 1081int
1083set_variable (object *op, char *buf) 1082set_variable (object *op, char *buf)
1084{ 1083{
1085 return 0;
1086#if 0
1087 int retval;
1088 object_thawer thawer (0); 1084 object_thawer thawer (buf, (AV *)0);
1089 1085
1090 strcpy (msgbuf, "");
1091 strcpy (lorebuf, "");
1092 retval = parse_object (op, thawer, 0); 1086 return parse_object (op, thawer, 0);
1093 yy_switch_to_buffer (yycurbuf);
1094 yy_delete_buffer (yybufstate);
1095 yy_pop_state ();
1096 return retval;
1097#endif
1098} 1087}
1099
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 1088
1144/* 1089/*
1145 * Initialises the array of variable-names. Needed before any 1090 * Initialises the array of variable-names. Needed before any
1146 * objects can be loaded. Called by init_library(). 1091 * objects can be loaded. Called by init_library().
1147 */ 1092 */
… …
1204 1149
1205// compare *op against *tmp and output differences 1150// compare *op against *tmp and output differences
1206void 1151void
1207put (object_freezer &f, object *op, object *tmp) 1152put (object_freezer &f, object *op, object *tmp)
1208{ 1153{
1154 static const keyword resist_save[NROFATTACKS] = {
1155# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1156# include "attackinc.h"
1157# undef def
1158 };
1159
1160 /* This is a list of keywords that correspond to the FLAG_.. values.
1161 * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
1162 * the 15'th element of this array should match that name.
1163 * If an entry is NULL, that is a flag not to loaded/saved.
1164 */
1165 static const keyword flag_names [NUM_FLAGS] = {
1166 KW_alive,
1167 KW_wiz,
1168 KW_NULL,
1169 KW_NULL,
1170 KW_was_wiz,
1171 KW_applied,
1172 KW_unpaid,
1173 KW_can_use_shield,
1174 KW_no_pick,
1175 KW_NULL, // walk_on
1176 KW_NULL, // no_pass
1177 /* 10 */
1178 KW_is_animated,
1179 KW_NULL, // slow_move
1180 KW_NULL, // flying
1181 KW_monster,
1182 KW_friendly,
1183 KW_generator,
1184 KW_is_thrown,
1185 KW_auto_apply,
1186 KW_NULL, // was KW_treasure
1187 KW_player_sold,
1188 /* 20 */
1189 KW_see_invisible,
1190 KW_can_roll,
1191 KW_overlay_floor,
1192 KW_is_turnable,
1193 KW_NULL, // walk_off
1194 KW_NULL, // fly_on
1195 KW_NULL, // fly_off
1196 KW_is_used_up,
1197 KW_identified,
1198 KW_reflecting,
1199 /* 30 */
1200 KW_changing,
1201 KW_splitting,
1202 KW_hitback,
1203 KW_startequip,
1204 KW_blocksview,
1205 KW_undead,
1206 KW_scared,
1207 KW_unaggressive,
1208 KW_reflect_missile,
1209 KW_reflect_spell,
1210 /* 40 */
1211 KW_no_magic,
1212 KW_no_fix_player,
1213 KW_is_lightable,
1214 KW_tear_down,
1215 KW_run_away,
1216 KW_NULL, // pass_thru
1217 KW_NULL, // an_pass_thru
1218 KW_pick_up,
1219 KW_unique,
1220 KW_no_drop,
1221 /* 50 */
1222 KW_NULL, // wizcast
1223 KW_can_cast_spell,
1224 KW_can_use_scroll,
1225 KW_can_use_range,
1226 KW_can_use_bow,
1227 KW_can_use_armour,
1228 KW_can_use_weapon,
1229 KW_can_use_ring,
1230 KW_has_ready_range,
1231 KW_has_ready_bow,
1232 /* 60 */
1233 KW_xrays,
1234 KW_NULL,
1235 KW_is_floor,
1236 KW_lifesave,
1237 KW_no_strength,
1238 KW_sleep,
1239 KW_stand_still,
1240 KW_random_move,
1241 KW_only_attack,
1242 KW_confused,
1243 /* 70 */
1244 KW_stealth,
1245 KW_NULL,
1246 KW_NULL,
1247 KW_cursed,
1248 KW_damned,
1249 KW_see_anywhere,
1250 KW_known_magical,
1251 KW_known_cursed,
1252 KW_can_use_skill,
1253 KW_been_applied,
1254 /* 80 */
1255 KW_has_ready_scroll,
1256 KW_can_use_rod,
1257 KW_NULL,
1258 KW_can_use_horn,
1259 KW_make_invisible,
1260 KW_inv_locked,
1261 KW_is_wooded,
1262 KW_is_hilly,
1263 KW_has_ready_skill,
1264 KW_has_ready_weapon,
1265 /* 90 */
1266 KW_no_skill_ident,
1267 KW_is_blind,
1268 KW_can_see_in_dark,
1269 KW_is_cauldron,
1270 KW_NULL,
1271 KW_no_steal,
1272 KW_one_hit,
1273 KW_NULL,
1274 KW_berserk,
1275 KW_neutral,
1276 /* 100 */
1277 KW_no_attack,
1278 KW_no_damage,
1279 KW_NULL,
1280 KW_NULL,
1281 KW_activate_on_push,
1282 KW_activate_on_release,
1283 KW_is_water,
1284 KW_use_content_on_gen,
1285 KW_NULL,
1286 KW_is_buildable,
1287 /* 110 */
1288 };
1289
1209 int i; 1290 int i;
1210 1291
1211 /* This saves the key/value lists. We do it first so that any 1292 /* 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. 1293 * keys that match field names will be overwritten by the loader.
1213 */ 1294 */
… …
1215 { 1296 {
1216 /* Find the field in the opposing member. */ 1297 /* Find the field in the opposing member. */
1217 key_value *arch_field = get_ob_key_link (tmp, my_field->key); 1298 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1218 1299
1219 /* If there's no partnering field, or it's got a different value, save our field. */ 1300 /* 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) 1301 if (!arch_field || my_field->value != arch_field->value)
1221 f.put (my_field->key, my_field->value); 1302 f.put (my_field->key, my_field->value);
1222 } 1303 }
1223 1304
1224 /* We don't need to worry about the arch's extra fields - they 1305 /* We don't need to worry about the arch's extra fields - they
1225 * will get taken care of the copy_object function. 1306 * will get taken care of the copy_to method.
1226 */ 1307 */
1227 1308
1228 { 1309 {
1229 char uids[64]; 1310 char uids[64];
1230 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); 1311 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
… …
1246 if (op->lore != tmp->lore) 1327 if (op->lore != tmp->lore)
1247 f.put (KW_lore, KW_endlore, op->lore); 1328 f.put (KW_lore, KW_endlore, op->lore);
1248 1329
1249 CMP_OUT (other_arch); 1330 CMP_OUT (other_arch);
1250 CMP_OUT (face); 1331 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 1332
1255 if (op->animation_id != tmp->animation_id) 1333 if (op->animation_id != tmp->animation_id)
1256 if (op->animation_id) 1334 if (op->animation_id)
1257 { 1335 {
1258 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1336 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
… …
1350 CMP_OUT (move_on); 1428 CMP_OUT (move_on);
1351 CMP_OUT (move_off); 1429 CMP_OUT (move_off);
1352 CMP_OUT (move_slow); 1430 CMP_OUT (move_slow);
1353 CMP_OUT (move_slow_penalty); 1431 CMP_OUT (move_slow_penalty);
1354 1432
1355 if (!COMPARE_FLAGS (op, tmp)) 1433 if (op->flag != tmp->flag)
1356 for (i = 0; i <= NUM_FLAGS; i++) 1434 for (i = 0; i <= NUM_FLAGS; i++)
1357 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1435 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1358 f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); 1436 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1359 1437
1360 /* Save body locations */ 1438 /* Save body locations */
1361 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1439 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1362 if (op->body_info[i] != tmp->body_info[i]) 1440 if (op->body_info[i] != tmp->body_info[i])
1363 f.put (body_locations[i].save_name, op->body_info[i]); 1441 f.put (body_locations[i].save_name, op->body_info[i]);
… …
1418 save_object (fp, tmp, flag); 1496 save_object (fp, tmp, flag);
1419 old = tmp; 1497 old = tmp;
1420 } 1498 }
1421 1499
1422 if (!(flag & 2)) 1500 if (!(flag & 2))
1423 { 1501 op->destroy ();
1424 remove_ob (op);
1425 free_object (op);
1426 }
1427 1502
1428 fp.put (op); 1503 fp.put (op);
1429 fprintf (fp, "end\n"); 1504 fprintf (fp, "end\n");
1430} 1505}
1431 1506

Diff Legend

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