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.110 by root, Sun Apr 20 05:24:55 2008 UTC vs.
Revision 1.122 by root, Mon Sep 15 00:16:19 2008 UTC

… …
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23
24/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25 sub/add_weight will transcend the environment updating the carrying
26 variable. */
27 23
28#include <global.h> 24#include <global.h>
29#include <loader.h> 25#include <loader.h>
30#include <sproto.h> 26#include <sproto.h>
31 27
… …
389 if (ip > 2 * item_power && ip > (item_power + 3)) 385 if (ip > 2 * item_power && ip > (item_power + 3))
390 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 386 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
391#endif 387#endif
392 } 388 }
393 389
394 /* Old spellcasting object - need to load in the appropiate object */ 390 /* old style spellcasting object (pretty common) - need to load in the appropiate object */
395 if ((type == ROD || type == WAND || type == SCROLL || type == HORN || type == FIREWALL || 391 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
392 if ((type == ROD
393 || type == WAND
394 || type == SCROLL
395 || type == HORN
396 || type == FIREWALL
396 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 397 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
397 ((type == POTION || type == ALTAR) && stats.sp)) && !inv && !loading_arch) 398 || ((type == POTION || type == ALTAR) && stats.sp)) // watchout: sp = 0 is still magic bullet.
399 && !inv
400 && !loading_arch
401 && stats.sp) // watchout: old magic bullet stuff directly on the map is going to break here!
402 // TODO: at least one watchout-comments is redundant - investigate/remove
398 { 403 {
404 // TODO: fix firewall object on map
399 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' 405 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
400 * in that spell was stored in sp. 406 * in that spell was stored in sp.
401 */ 407 */
402 LOG (llevError, "old spellcasting object found: %s", debug_desc ()); 408 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
403 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 409 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
404 insert_ob_in_ob (tmp, this); 410 insert_ob_in_ob (tmp, this);
405 randomitems = NULL; /* So another spell isn't created for this object */ 411 randomitems = 0;
406 } 412 }
407 413
408 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 414 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
409 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch) 415 if ((type == SPELLBOOK || type == RUNE) && slaying && !inv && !loading_arch)
410 { 416 {
411 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ()); 417 LOG (llevError, "spellbook/rune found without inv but slaying: %s", debug_desc ());
412 object *tmp = get_archetype_by_object_name (slaying); 418 object *tmp = get_archetype_by_object_name (slaying);
413 insert_ob_in_ob (tmp, this); 419 insert_ob_in_ob (tmp, this);
414 randomitems = NULL; /* So another spell isn't created for this object */ 420 randomitems = 0; /* So another spell isn't created for this object */
415 /* without this, value is all screwed up */ 421 /* without this, value is all screwed up */
416 value = arch->value * inv->value; 422 value = arch->value * inv->value;
417 } 423 }
418 424
419 if (QUERY_FLAG (this, FLAG_MONSTER)) 425 if (QUERY_FLAG (this, FLAG_MONSTER))
… …
523 529
524bool 530bool
525object::parse_kv (object_thawer &f) 531object::parse_kv (object_thawer &f)
526{ 532{
527 object *op_inv = inv; 533 object *op_inv = inv;
534 key_value *last_kv = key_values;
528 535
529 for (;;) 536 for (;;)
530 { 537 {
531 switch (f.kw) 538 switch (f.kw)
532 { 539 {
… …
553 case KW_race: f.get_ornull (race); break; 560 case KW_race: f.get_ornull (race); break;
554 case KW_slaying: f.get_ornull (slaying); break; 561 case KW_slaying: f.get_ornull (slaying); break;
555 case KW_tag: f.get_ornull (tag); break; 562 case KW_tag: f.get_ornull (tag); break;
556 563
557 case KW_arch: 564 case KW_arch:
558 {
559 object *tmp = object::read (f); 565 if (object *tmp = object::read (f))
560 tmp->deactivate ();
561
562 { 566 {
567 tmp->deactivate ();
568
563 // was: insert_ob_in_ob (tmp, op); 569 // was: insert_ob_in_ob (tmp, op);
564 // but manually adding it can improve map loading times a lot 570 // but manually adding it can improve map loading times a lot
565 // also, appending instead of prepending keeps the 571 // also, appending instead of prepending keeps the
566 // save ordering the same between repeated load/saves. 572 // save ordering the same between repeated load/saves.
567 // and finally we do not want any funny effects 573 // and finally we do not want any funny effects
… …
584 590
585 tmp->below = 0; 591 tmp->below = 0;
586 tmp->env = this; 592 tmp->env = this;
587 op_inv = tmp; 593 op_inv = tmp;
588 } 594 }
589 } 595 else
596 LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n");
597
590 continue; 598 continue;
591 599
592 case KW_other_arch: 600 case KW_other_arch:
593 if (loading_arch == this) 601 if (loading_arch == this)
594 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); 602 archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ());
… …
610 CLEAR_FLAG (this, FLAG_ANIMATE); 618 CLEAR_FLAG (this, FLAG_ANIMATE);
611 animation_id = 0; 619 animation_id = 0;
612 620
613 const char *str = f.get_str (); 621 const char *str = f.get_str ();
614 if (str && (animation_id = find_animation (str))) 622 if (str && (animation_id = find_animation (str)))
615 SET_FLAG (this, FLAG_ANIMATE); 623 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
616 } 624 }
617 break; 625 break;
618 626
619 case KW_last_heal: f.get (last_heal); break; 627 case KW_last_heal: f.get (last_heal); break;
620 case KW_last_sp: f.get (last_sp); break; 628 case KW_last_sp: f.get (last_sp); break;
… …
924 case KW_expmul: f.get (expmul); break; 932 case KW_expmul: f.get (expmul); break;
925 case KW_glow_radius: f.get (glow_radius); break; 933 case KW_glow_radius: f.get (glow_radius); break;
926 case KW_weapontype: f.get (weapontype); break; 934 case KW_weapontype: f.get (weapontype); break;
927 case KW_tooltype: f.get (tooltype); break; 935 case KW_tooltype: f.get (tooltype); break;
928 case KW_casting_time: f.get (casting_time); break; 936 case KW_casting_time: f.get (casting_time); break;
937
938 // elevation is deprecated
929 case KW_elevation: f.get (elevation); break; 939 case KW_elevation: break;
940
930 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break; 941 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
931 case KW_client_type: f.get (client_type); break; 942 case KW_client_type: f.get (client_type); break;
932 case KW_duration: f.get (duration); break; 943 case KW_duration: f.get (duration); break;
933 case KW_range: f.get (range); break; 944 case KW_range: f.get (range); break;
934 case KW_range_modifier: f.get (range_modifier); break; 945 case KW_range_modifier: f.get (range_modifier); break;
… …
991 1002
992 f.next (); 1003 f.next ();
993 return true; 1004 return true;
994 1005
995 case KW_ERROR: 1006 case KW_ERROR:
996 set_ob_key_value (this, f.kw_str, f.value, true); 1007 // append as key value pair (do not use kv_set as it prepends)
1008 // we also do not even try to find old values, duplicate keys stay duplicate
1009 {
1010 key_value *kv = new key_value;
1011
1012 kv->next = 0;
1013 kv->key = shstr (f.kw_str);
1014 kv->value = shstr (f.value);
1015
1016 if (!last_kv)
1017 key_values = last_kv = kv;
1018 else
1019 {
1020 while (last_kv->next)
1021 last_kv = last_kv->next;
1022
1023 last_kv->next = kv;
1024 last_kv = kv;
1025 }
1026 }
997 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D 1027 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
998 break; 1028 break;
999 1029
1000 default: 1030 default:
1001 if (!f.parse_error ("object", name)) 1031 if (!f.parse_error ("object", name))
… …
1022 1052
1023 assert (arch); //D maybe use exception handling of sorts? 1053 assert (arch); //D maybe use exception handling of sorts?
1024 1054
1025 f.next (); 1055 f.next ();
1026 1056
1027 object *op = object::create (); 1057 object *op = arch->instance ();
1028
1029 op->map = map; 1058 op->map = map;
1030 arch->copy_to (op);
1031 // copy_to activates, this should be fixed properly 1059 // instance() activates, this should be fixed properly
1032 op->deactivate (); 1060 op->deactivate ();
1033 1061
1034 if (!op->parse_kv (f)) 1062 if (!op->parse_kv (f))
1035 { 1063 {
1036 op->destroy (true); 1064 op->destroy (true);
… …
1246 /* 110 */ 1274 /* 110 */
1247 KW_destroy_on_death, 1275 KW_destroy_on_death,
1248 KW_NULL, 1276 KW_NULL,
1249 }; 1277 };
1250 1278
1251 int i;
1252
1253 /* This saves the key/value lists. We do it first so that any 1279 /* 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. 1280 * keys that match field names will be overwritten by the loader.
1255 */ 1281 */
1256 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) 1282 for (key_value *kv = op->key_values; kv; kv = kv->next)
1257 { 1283 if (!tmp->key_values || tmp->kv (kv->key) != kv->value)
1258 /* Find the field in the opposing member. */ 1284 f.put (kv->key, kv->value);
1259 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1260
1261 /* If there's no partnering field, or it's got a different value, save our field. */
1262 if (!arch_field || my_field->value != arch_field->value)
1263 f.put (my_field->key, my_field->value);
1264 }
1265 1285
1266 /* We don't need to worry about the arch's extra fields - they 1286 /* We don't need to worry about the arch's extra fields - they
1267 * will get taken care of the copy_to method. 1287 * will get taken care of the copy_to method.
1268 */ 1288 */
1269 1289
… …
1278 CMP_OUT (name); 1298 CMP_OUT (name);
1279 CMP_OUT (name_pl); 1299 CMP_OUT (name_pl);
1280 CMP_OUT (custom_name); 1300 CMP_OUT (custom_name);
1281 CMP_OUT (title); 1301 CMP_OUT (title);
1282 CMP_OUT (race); 1302 CMP_OUT (race);
1303 CMP_OUT (skill);
1283 CMP_OUT (slaying); 1304 CMP_OUT (slaying);
1284 CMP_OUT (tag); 1305 CMP_OUT (tag);
1285 CMP_OUT (other_arch); 1306 CMP_OUT (other_arch);
1286 1307
1287 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1308 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg );
… …
1291 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1312 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0);
1292 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1313 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0);
1293 1314
1294 if (op->animation_id != tmp->animation_id) 1315 if (op->animation_id != tmp->animation_id)
1295 if (op->animation_id) 1316 if (op->animation_id)
1317 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
1318 else
1296 { 1319 {
1297 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1320 f.put (KW_animation, (const char *)0);
1298 1321 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1299 if (!QUERY_FLAG (op, FLAG_ANIMATE))
1300 f.put (KW_is_animated, (sint32)0);
1301 } 1322 }
1302 else
1303 f.put (KW_animation, (const char *)0);
1304 1323
1305 CMP_OUT2 (str, stats.Str); 1324 CMP_OUT2 (str, stats.Str);
1306 CMP_OUT2 (dex, stats.Dex); 1325 CMP_OUT2 (dex, stats.Dex);
1307 CMP_OUT2 (con, stats.Con); 1326 CMP_OUT2 (con, stats.Con);
1308 CMP_OUT2 (wis, stats.Wis); 1327 CMP_OUT2 (wis, stats.Wis);
… …
1338 CMP_OUT (direction); 1357 CMP_OUT (direction);
1339 CMP_OUT (type); 1358 CMP_OUT (type);
1340 CMP_OUT (subtype); 1359 CMP_OUT (subtype);
1341 CMP_OUT (attacktype); 1360 CMP_OUT (attacktype);
1342 1361
1343 for (i = 0; i < NROFATTACKS; i++) 1362 for (int i = 0; i < NROFATTACKS; i++)
1344 if (expect_false (op->resist[i] != tmp->resist[i])) 1363 if (expect_false (op->resist[i] != tmp->resist[i]))
1345 f.put (resist_save[i], op->resist[i]); 1364 f.put (resist_save[i], op->resist[i]);
1346 1365
1347 CMP_OUT (path_attuned); 1366 CMP_OUT (path_attuned);
1348 CMP_OUT (path_repelled); 1367 CMP_OUT (path_repelled);
… …
1359 CMP_OUT (last_sp); 1378 CMP_OUT (last_sp);
1360 CMP_OUT (last_grace); 1379 CMP_OUT (last_grace);
1361 CMP_OUT (last_eat); 1380 CMP_OUT (last_eat);
1362 CMP_OUT (glow_radius); 1381 CMP_OUT (glow_radius);
1363 1382
1364 if (QUERY_FLAG (op, FLAG_IS_LINKED) && (i = get_button_value (op))) 1383 if (op->flag [FLAG_IS_LINKED])
1384 if (int i = get_button_value (op))
1365 f.put (KW_connected, i); 1385 f.put (KW_connected, i);
1366 1386
1367 CMP_OUT (randomitems); 1387 CMP_OUT (randomitems);
1368 CMP_OUT2 (container, weight_limit); 1388 CMP_OUT2 (container, weight_limit);
1369 1389
1370 CMP_OUT (run_away); 1390 CMP_OUT (run_away);
1371 CMP_OUT (pick_up); 1391 CMP_OUT (pick_up);
1372 CMP_OUT (will_apply); 1392 CMP_OUT (will_apply);
1373 CMP_OUT (smoothlevel); 1393 CMP_OUT (smoothlevel);
1374 CMP_OUT (weapontype); 1394 CMP_OUT (weapontype);
1375 CMP_OUT (tooltype); 1395 CMP_OUT (tooltype);
1376 CMP_OUT (elevation);
1377 CMP_OUT (client_type); 1396 CMP_OUT (client_type);
1378 CMP_OUT (item_power); 1397 CMP_OUT (item_power);
1379 CMP_OUT (duration); 1398 CMP_OUT (duration);
1380 CMP_OUT (range); 1399 CMP_OUT (range);
1381 CMP_OUT (range_modifier); 1400 CMP_OUT (range_modifier);
… …
1390 CMP_OUT (move_off); 1409 CMP_OUT (move_off);
1391 CMP_OUT (move_slow); 1410 CMP_OUT (move_slow);
1392 CMP_OUT (move_slow_penalty); 1411 CMP_OUT (move_slow_penalty);
1393 1412
1394 if (op->flag != tmp->flag) 1413 if (op->flag != tmp->flag)
1395 for (i = 0; i <= NUM_FLAGS; i++) 1414 for (int i = 0; i <= NUM_FLAGS; i++)
1396 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1415 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i]))
1397 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1416 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1398 1417
1399 // save body locations 1418 // save body locations
1400 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1419 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1401 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1420 if (expect_false (op->slot[i].info != tmp->slot[i].info))
1402 f.put (body_locations[i].save_name, op->slot[i].info); 1421 f.put (body_locations[i].save_name, op->slot[i].info);
1403} 1422}
1404 1423
1405/* 1424/*

Diff Legend

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