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.112 by root, Tue Apr 29 15:19:30 2008 UTC vs.
Revision 1.117 by elmex, Sun Jun 15 20:29:56 2008 UTC

… …
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
520bool 520bool
521object::parse_kv (object_thawer &f) 521object::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;
… …
920 case KW_expmul: f.get (expmul); break; 921 case KW_expmul: f.get (expmul); break;
921 case KW_glow_radius: f.get (glow_radius); break; 922 case KW_glow_radius: f.get (glow_radius); break;
922 case KW_weapontype: f.get (weapontype); break; 923 case KW_weapontype: f.get (weapontype); break;
923 case KW_tooltype: f.get (tooltype); break; 924 case KW_tooltype: f.get (tooltype); break;
924 case KW_casting_time: f.get (casting_time); break; 925 case KW_casting_time: f.get (casting_time); break;
926
927 // elevation is deprecated
925 case KW_elevation: f.get (elevation); break; 928 case KW_elevation: break;
929
926 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 930 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
927 case KW_client_type: f.get (client_type); break; 931 case KW_client_type: f.get (client_type); break;
928 case KW_duration: f.get (duration); break; 932 case KW_duration: f.get (duration); break;
929 case KW_range: f.get (range); break; 933 case KW_range: f.get (range); break;
930 case KW_range_modifier: f.get (range_modifier); break; 934 case KW_range_modifier: f.get (range_modifier); break;
… …
987 991
988 f.next (); 992 f.next ();
989 return true; 993 return true;
990 994
991 case KW_ERROR: 995 case KW_ERROR:
992 set_ob_key_value (this, f.kw_str, f.value, true); 996 // append as key value pair (do not use kv_set as it prepends)
997 // we also do not even try to find old values, duplicate keys stay duplicate
998 {
999 key_value *kv = new key_value;
1000
1001 kv->next = 0;
1002 kv->key = shstr (f.kw_str);
1003 kv->value = shstr (f.value);
1004
1005 if (!last_kv)
1006 key_values = last_kv = kv;
1007 else
1008 {
1009 while (last_kv->next)
1010 last_kv = last_kv->next;
1011
1012 last_kv->next = kv;
1013 last_kv = kv;
1014 }
1015 }
993 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1016 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
994 break; 1017 break;
995 1018
996 default: 1019 default:
997 if (!f.parse_error ("object", name)) 1020 if (!f.parse_error ("object", name))
… …
1018 1041
1019 assert (arch); //D maybe use exception handling of sorts? 1042 assert (arch); //D maybe use exception handling of sorts?
1020 1043
1021 f.next (); 1044 f.next ();
1022 1045
1023 object *op = object::create (); 1046 object *op = arch->instance ();
1024
1025 op->map = map; 1047 op->map = map;
1026 arch->copy_to (op);
1027 // copy_to activates, this should be fixed properly 1048 // instance() activates, this should be fixed properly
1028 op->deactivate (); 1049 op->deactivate ();
1029 1050
1030 if (!op->parse_kv (f)) 1051 if (!op->parse_kv (f))
1031 { 1052 {
1032 op->destroy (true); 1053 op->destroy (true);
… …
1242 /* 110 */ 1263 /* 110 */
1243 KW_destroy_on_death, 1264 KW_destroy_on_death,
1244 KW_NULL, 1265 KW_NULL,
1245 }; 1266 };
1246 1267
1247 int i;
1248
1249 /* This saves the key/value lists. We do it first so that any 1268 /* This saves the key/value lists. We do it first so that any
1250 * keys that match field names will be overwritten by the loader. 1269 * keys that match field names will be overwritten by the loader.
1251 */ 1270 */
1252 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1271 for (key_value *kv = op->key_values; kv; kv = kv->next)
1253 { 1272 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1254 /* Find the field in the opposing member. */ 1273 f.put (kv->key, kv->value);
1255 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1256
1257 /* If there's no partnering field, or it's got a different value, save our field. */
1258 if (!arch_field || my_field->value != arch_field->value)
1259 f.put (my_field->key, my_field->value);
1260 }
1261 1274
1262 /* We don't need to worry about the arch's extra fields - they 1275 /* We don't need to worry about the arch's extra fields - they
1263 * will get taken care of the copy_to method. 1276 * will get taken care of the copy_to method.
1264 */ 1277 */
1265 1278
… …
1288 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1301 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1289 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1302 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1290 1303
1291 if (op->animation_id != tmp->animation_id) 1304 if (op->animation_id != tmp->animation_id)
1292 if (op->animation_id) 1305 if (op->animation_id)
1306 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1307 else
1293 { 1308 {
1294 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1309 f.put (KW_animation, (const char *)0);
1295 1310 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1296 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1297 f.put (KW_is_animated, (sint32)0);
1298 } 1311 }
1299 else
1300 f.put (KW_animation, (const char *)0);
1301 1312
1302 CMP_OUT2 (str, stats.Str); 1313 CMP_OUT2 (str, stats.Str);
1303 CMP_OUT2 (dex, stats.Dex); 1314 CMP_OUT2 (dex, stats.Dex);
1304 CMP_OUT2 (con, stats.Con); 1315 CMP_OUT2 (con, stats.Con);
1305 CMP_OUT2 (wis, stats.Wis); 1316 CMP_OUT2 (wis, stats.Wis);
… …
1335 CMP_OUT (direction); 1346 CMP_OUT (direction);
1336 CMP_OUT (type); 1347 CMP_OUT (type);
1337 CMP_OUT (subtype); 1348 CMP_OUT (subtype);
1338 CMP_OUT (attacktype); 1349 CMP_OUT (attacktype);
1339 1350
1340 for (i = 0; i < NROFATTACKS; i++) 1351 for (int i = 0; i < NROFATTACKS; i++)
1341 if (expect_false (op->resist[i] != tmp->resist[i])) 1352 if (expect_false (op->resist[i] != tmp->resist[i]))
1342 f.put (resist_save[i], op->resist[i]); 1353 f.put (resist_save[i], op->resist[i]);
1343 1354
1344 CMP_OUT (path_attuned); 1355 CMP_OUT (path_attuned);
1345 CMP_OUT (path_repelled); 1356 CMP_OUT (path_repelled);
… …
1356 CMP_OUT (last_sp); 1367 CMP_OUT (last_sp);
1357 CMP_OUT (last_grace); 1368 CMP_OUT (last_grace);
1358 CMP_OUT (last_eat); 1369 CMP_OUT (last_eat);
1359 CMP_OUT (glow_radius); 1370 CMP_OUT (glow_radius);
1360 1371
1361 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1372 if (op->flag [FLAG_IS_LINKED])
1373 if (int i = get_button_value (op))
1362 f.put (KW_connected, i); 1374 f.put (KW_connected, i);
1363 1375
1364 CMP_OUT (randomitems); 1376 CMP_OUT (randomitems);
1365 CMP_OUT2 (container, weight_limit); 1377 CMP_OUT2 (container, weight_limit);
1366 1378
1367 CMP_OUT (run_away); 1379 CMP_OUT (run_away);
1368 CMP_OUT (pick_up); 1380 CMP_OUT (pick_up);
1369 CMP_OUT (will_apply); 1381 CMP_OUT (will_apply);
1370 CMP_OUT (smoothlevel); 1382 CMP_OUT (smoothlevel);
1371 CMP_OUT (weapontype); 1383 CMP_OUT (weapontype);
1372 CMP_OUT (tooltype); 1384 CMP_OUT (tooltype);
1373 CMP_OUT (elevation);
1374 CMP_OUT (client_type); 1385 CMP_OUT (client_type);
1375 CMP_OUT (item_power); 1386 CMP_OUT (item_power);
1376 CMP_OUT (duration); 1387 CMP_OUT (duration);
1377 CMP_OUT (range); 1388 CMP_OUT (range);
1378 CMP_OUT (range_modifier); 1389 CMP_OUT (range_modifier);
… …
1387 CMP_OUT (move_off); 1398 CMP_OUT (move_off);
1388 CMP_OUT (move_slow); 1399 CMP_OUT (move_slow);
1389 CMP_OUT (move_slow_penalty); 1400 CMP_OUT (move_slow_penalty);
1390 1401
1391 if (op->flag != tmp->flag) 1402 if (op->flag != tmp->flag)
1392 for (i = 0; i <= NUM_FLAGS; i++) 1403 for (int i = 0; i <= NUM_FLAGS; i++)
1393 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1404 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1394 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1405 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1395 1406
1396 // save body locations 1407 // save body locations
1397 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1408 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1398 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1409 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1399 f.put (body_locations[i].save_name, op->slot[i].info); 1410 f.put (body_locations[i].save_name, op->slot[i].info);
1400} 1411}
1401 1412
1402/* 1413/*

Diff Legend

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