… | |
… | |
405 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
405 | if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) |
406 | { |
406 | { |
407 | LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ()); |
407 | LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ()); |
408 | object *tmp = get_archetype_by_object_name (slaying); |
408 | object *tmp = get_archetype_by_object_name (slaying); |
409 | insert_ob_in_ob (tmp, this); |
409 | insert_ob_in_ob (tmp, this); |
410 | randomitems = NULL; /* So another spell isn't created for this object */ |
410 | randomitems = 0; /* So another spell isn't created for this object */ |
411 | /* without this, value is all screwed up */ |
411 | /* without this, value is all screwed up */ |
412 | value = arch->value * inv->value; |
412 | value = arch->value * inv->value; |
413 | } |
413 | } |
414 | |
414 | |
415 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
415 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
… | |
… | |
519 | |
519 | |
520 | bool |
520 | bool |
521 | object::parse_kv (object_thawer &f) |
521 | object::parse_kv (object_thawer &f) |
522 | { |
522 | { |
523 | object *op_inv = inv; |
523 | object *op_inv = inv; |
|
|
524 | key_value *last_kv = key_values; |
524 | |
525 | |
525 | for (;;) |
526 | for (;;) |
526 | { |
527 | { |
527 | switch (f.kw) |
528 | switch (f.kw) |
528 | { |
529 | { |
… | |
… | |
606 | CLEAR_FLAG (this, FLAG_ANIMATE); |
607 | CLEAR_FLAG (this, FLAG_ANIMATE); |
607 | animation_id = 0; |
608 | animation_id = 0; |
608 | |
609 | |
609 | const char *str = f.get_str (); |
610 | const char *str = f.get_str (); |
610 | if (str && (animation_id = find_animation (str))) |
611 | if (str && (animation_id = find_animation (str))) |
611 | SET_FLAG (this, FLAG_ANIMATE); |
612 | SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here |
612 | } |
613 | } |
613 | break; |
614 | break; |
614 | |
615 | |
615 | case KW_last_heal: f.get (last_heal); break; |
616 | case KW_last_heal: f.get (last_heal); break; |
616 | case KW_last_sp: f.get (last_sp); break; |
617 | case KW_last_sp: f.get (last_sp); break; |
… | |
… | |
987 | |
988 | |
988 | f.next (); |
989 | f.next (); |
989 | return true; |
990 | return true; |
990 | |
991 | |
991 | case KW_ERROR: |
992 | case KW_ERROR: |
992 | set_ob_key_value (this, f.kw_str, f.value, true); |
993 | // append as key value pair (do not use kv_set as it prepends) |
|
|
994 | // we also do not even try to find old values, duplicate keys stay duplicate |
|
|
995 | { |
|
|
996 | key_value *kv = new key_value; |
|
|
997 | |
|
|
998 | kv->next = 0; |
|
|
999 | kv->key = shstr (f.kw_str); |
|
|
1000 | kv->value = shstr (f.value); |
|
|
1001 | |
|
|
1002 | if (!last_kv) |
|
|
1003 | key_values = last_kv = kv; |
|
|
1004 | else |
|
|
1005 | { |
|
|
1006 | while (last_kv->next) |
|
|
1007 | last_kv = last_kv->next; |
|
|
1008 | |
|
|
1009 | last_kv->next = kv; |
|
|
1010 | last_kv = kv; |
|
|
1011 | } |
|
|
1012 | } |
993 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
1013 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
994 | break; |
1014 | break; |
995 | |
1015 | |
996 | default: |
1016 | default: |
997 | if (!f.parse_error ("object", name)) |
1017 | if (!f.parse_error ("object", name)) |
… | |
… | |
1240 | /* 110 */ |
1260 | /* 110 */ |
1241 | KW_destroy_on_death, |
1261 | KW_destroy_on_death, |
1242 | KW_NULL, |
1262 | KW_NULL, |
1243 | }; |
1263 | }; |
1244 | |
1264 | |
1245 | int i; |
|
|
1246 | |
|
|
1247 | /* 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 |
1248 | * keys that match field names will be overwritten by the loader. |
1266 | * keys that match field names will be overwritten by the loader. |
1249 | */ |
1267 | */ |
1250 | for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) |
1268 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1251 | { |
1269 | if (!tmp->key_values || tmp->kv (kv->key) != kv->value) |
1252 | /* Find the field in the opposing member. */ |
1270 | f.put (kv->key, kv->value); |
1253 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
|
|
1254 | |
|
|
1255 | /* If there's no partnering field, or it's got a different value, save our field. */ |
|
|
1256 | if (!arch_field || my_field->value != arch_field->value) |
|
|
1257 | f.put (my_field->key, my_field->value); |
|
|
1258 | } |
|
|
1259 | |
1271 | |
1260 | /* We don't need to worry about the arch's extra fields - they |
1272 | /* We don't need to worry about the arch's extra fields - they |
1261 | * will get taken care of the copy_to method. |
1273 | * will get taken care of the copy_to method. |
1262 | */ |
1274 | */ |
1263 | |
1275 | |
… | |
… | |
1286 | if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); |
1298 | if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); |
1287 | if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1299 | if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1288 | |
1300 | |
1289 | if (op->animation_id != tmp->animation_id) |
1301 | if (op->animation_id != tmp->animation_id) |
1290 | if (op->animation_id) |
1302 | if (op->animation_id) |
|
|
1303 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
|
|
1304 | else |
1291 | { |
1305 | { |
1292 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1306 | f.put (KW_animation, (const char *)0); |
1293 | |
1307 | op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? |
1294 | if (!QUERY_FLAG (op, FLAG_ANIMATE)) |
|
|
1295 | f.put (KW_is_animated, (sint32)0); |
|
|
1296 | } |
1308 | } |
1297 | else |
|
|
1298 | f.put (KW_animation, (const char *)0); |
|
|
1299 | |
1309 | |
1300 | CMP_OUT2 (str, stats.Str); |
1310 | CMP_OUT2 (str, stats.Str); |
1301 | CMP_OUT2 (dex, stats.Dex); |
1311 | CMP_OUT2 (dex, stats.Dex); |
1302 | CMP_OUT2 (con, stats.Con); |
1312 | CMP_OUT2 (con, stats.Con); |
1303 | CMP_OUT2 (wis, stats.Wis); |
1313 | CMP_OUT2 (wis, stats.Wis); |
… | |
… | |
1333 | CMP_OUT (direction); |
1343 | CMP_OUT (direction); |
1334 | CMP_OUT (type); |
1344 | CMP_OUT (type); |
1335 | CMP_OUT (subtype); |
1345 | CMP_OUT (subtype); |
1336 | CMP_OUT (attacktype); |
1346 | CMP_OUT (attacktype); |
1337 | |
1347 | |
1338 | for (i = 0; i < NROFATTACKS; i++) |
1348 | for (int i = 0; i < NROFATTACKS; i++) |
1339 | if (expect_false (op->resist[i] != tmp->resist[i])) |
1349 | if (expect_false (op->resist[i] != tmp->resist[i])) |
1340 | f.put (resist_save[i], op->resist[i]); |
1350 | f.put (resist_save[i], op->resist[i]); |
1341 | |
1351 | |
1342 | CMP_OUT (path_attuned); |
1352 | CMP_OUT (path_attuned); |
1343 | CMP_OUT (path_repelled); |
1353 | CMP_OUT (path_repelled); |
… | |
… | |
1354 | CMP_OUT (last_sp); |
1364 | CMP_OUT (last_sp); |
1355 | CMP_OUT (last_grace); |
1365 | CMP_OUT (last_grace); |
1356 | CMP_OUT (last_eat); |
1366 | CMP_OUT (last_eat); |
1357 | CMP_OUT (glow_radius); |
1367 | CMP_OUT (glow_radius); |
1358 | |
1368 | |
1359 | if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) |
1369 | if (op->flag [FLAG_IS_LINKED]) |
|
|
1370 | if (int i = get_button_value (op)) |
1360 | f.put (KW_connected, i); |
1371 | f.put (KW_connected, i); |
1361 | |
1372 | |
1362 | CMP_OUT (randomitems); |
1373 | CMP_OUT (randomitems); |
1363 | CMP_OUT2 (container, weight_limit); |
1374 | CMP_OUT2 (container, weight_limit); |
1364 | |
1375 | |
1365 | CMP_OUT (run_away); |
1376 | CMP_OUT (run_away); |
… | |
… | |
1385 | CMP_OUT (move_off); |
1396 | CMP_OUT (move_off); |
1386 | CMP_OUT (move_slow); |
1397 | CMP_OUT (move_slow); |
1387 | CMP_OUT (move_slow_penalty); |
1398 | CMP_OUT (move_slow_penalty); |
1388 | |
1399 | |
1389 | if (op->flag != tmp->flag) |
1400 | if (op->flag != tmp->flag) |
1390 | for (i = 0; i <= NUM_FLAGS; i++) |
1401 | for (int i = 0; i <= NUM_FLAGS; i++) |
1391 | if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) |
1402 | if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) |
1392 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1403 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1393 | |
1404 | |
1394 | // save body locations |
1405 | // save body locations |
1395 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1406 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1396 | if (expect_false (op->slot[i].info != tmp->slot[i].info)) |
1407 | if (expect_false (op->slot[i].info != tmp->slot[i].info)) |
1397 | f.put (body_locations[i].save_name, op->slot[i].info); |
1408 | f.put (body_locations[i].save_name, op->slot[i].info); |
1398 | } |
1409 | } |
1399 | |
1410 | |
1400 | /* |
1411 | /* |