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.147 by root, Wed Nov 11 18:06:46 2009 UTC vs.
Revision 1.151 by root, Sat Jan 16 13:41:37 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
… …
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <loader.h>
27#include <sproto.h> 26#include <sproto.h>
28 27
29///////////////////////////////////////////////////////////////////////////// 28/////////////////////////////////////////////////////////////////////////////
30 29
31extern archetype *loading_arch; 30extern archetype *loading_arch;
… …
333 332
334 /* objects now have a materialname. try to patch it in */ 333 /* objects now have a materialname. try to patch it in */
335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0)) 334 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
336 select_material (this, map ? map->difficulty : 5); 335 select_material (this, map ? map->difficulty : 5);
337 336
337 if (speed < 0.)
338 {
339 flag [FLAG_RANDOM_SPEED] = true;
340 speed = -speed;
341 // speed_left will be randomised in instantiate () and copy_to ()
342 }
343
338 /* only do these when program is first run - a bit 344 /* only do these when program is first run - a bit
339 * excessive to do this at every run - most of this is 345 * excessive to do this at every run - most of this is
340 * really just to catch any errors - program will still run, but 346 * really just to catch any errors - program will still run, but
341 * not in the ideal fashion. 347 * not in the ideal fashion.
342 */ 348 */
… …
480 animate_object (this, direction); 486 animate_object (this, direction);
481 } 487 }
482} 488}
483 489
484static void 490static void
485set_move (MoveType &mt, const char *str) 491set_move (MoveType &mt, object_thawer &f)
486{ 492{
487 static const struct flagstr { 493 static const struct flagstr {
488 const char *name; 494 const char *name;
489 MoveType flags; 495 MoveType flags;
490 } move_flags[] = { 496 } move_flags[] = {
… …
496 { "boat" , MOVE_BOAT }, 502 { "boat" , MOVE_BOAT },
497 { "ship" , MOVE_SHIP }, 503 { "ship" , MOVE_SHIP },
498 { "all" , MOVE_ALL }, 504 { "all" , MOVE_ALL },
499 }; 505 };
500 506
501 if (!str) 507 const char *str = f.get_str ();
502 {
503 mt = 0;
504 return;
505 }
506 508
507 if (isdigit (*str)) 509 if (!*str || isdigit (*str))
508 { 510 {
509 mt = atoi (str); 511 mt = atoi (str);
510 return; 512 return;
511 } 513 }
512 514
513 mt = 0; 515 mt = 0;
514 516
515 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 517 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
516 { 518 {
517 bool negate = 0; 519 bool negate = 0;
518 520
519 if (*str == '-') 521 if (*str == '-')
520 { 522 {
… …
554 for (;;) 556 for (;;)
555 { 557 {
556 switch (f.kw) 558 switch (f.kw)
557 { 559 {
558 case KW_uuid: 560 case KW_uuid:
559 if (const char *s = f.get_str ())
560 if (!uuid.parse (s)) 561 if (!uuid.parse (f.get_str ()))
561 { 562 {
562 f.parse_warn ("unparseable uuid"); 563 f.parse_warn ("unparseable uuid");
563 uuid = UUID::gen (); 564 uuid = UUID::gen ();
564 } 565 }
565 break; 566 break;
566 567
567 case KW_oid: 568 case KW_oid:
568 f.get (this, f.get_sint32 ()); 569 f.get (this, f.get_sint32 ());
569 break; 570 break;
… …
634 case KW_animation: 635 case KW_animation:
635 { 636 {
636 CLEAR_FLAG (this, FLAG_ANIMATE); 637 CLEAR_FLAG (this, FLAG_ANIMATE);
637 animation_id = 0; 638 animation_id = 0;
638 639
639 const char *str = f.get_str ();
640 if (str && (animation_id = find_animation (str))) 640 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
641 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here 641 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
642 } 642 }
643 break; 643 break;
644 644
645 case KW_last_heal: f.get (last_heal); break; 645 case KW_last_heal: f.get (last_heal); break;
646 case KW_last_sp: f.get (last_sp); break; 646 case KW_last_sp: f.get (last_sp); break;
647 case KW_last_grace: f.get (last_grace); break; 647 case KW_last_grace: f.get (last_grace); break;
648 case KW_last_eat: f.get (last_eat); break; 648 case KW_last_eat: f.get (last_eat); break;
649 case KW_sl:
649 case KW_speed_left: f.get (speed_left); break; 650 case KW_speed_left: f.get (speed_left); break;
650 651
651 case KW_speed: 652 case KW_speed:
652 f.get (speed); 653 f.get (speed);
653 654
… …
662 move_slow |= MOVE_WALK; 663 move_slow |= MOVE_WALK;
663 f.get (move_slow_penalty); 664 f.get (move_slow_penalty);
664 break; 665 break;
665 666
666 case KW_face: 667 case KW_face:
667 face = face_find (f.get_str ()); 668 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
668 break; 669 break;
669 670
670 case KW_sound: 671 case KW_sound:
672 if (f.has_value ())
673 {
671 sound = sound_find (f.get_str ()); 674 sound = sound_find (f.get_str ());
672 if (!sound) 675 if (!sound)
673 f.parse_warn ("sound not found"); 676 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
677 }
678 else
679 sound = 0;
674 break; 680 break;
675 681
676 case KW_sound_destroy: 682 case KW_sound_destroy:
683 if (f.has_value ())
684 {
677 sound_destroy = sound_find (f.get_str ()); 685 sound_destroy = sound_find (f.get_str ());
678 if (!sound_destroy) 686 if (!sound_destroy)
679 f.parse_warn ("sound not found"); 687 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
688 }
689 else
690 sound_destroy = 0;
680 break; 691 break;
681 692
682 case KW_x: f.get (x); break; 693 case KW_x: f.get (x); break;
683 case KW_y: f.get (y); break; 694 case KW_y: f.get (y); break;
684 695
… …
735 material = name_to_material (sh); 746 material = name_to_material (sh);
736 } 747 }
737 break; 748 break;
738 749
739 /* These are the new values */ 750 /* These are the new values */
740 case KW_move_block: set_move (move_block, f.get_str ()); break; 751 case KW_move_block: set_move (move_block, f); break;
741 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 752 case KW_move_allow: set_move (move_allow, f); break;
742 case KW_move_type: set_move (move_type, f.get_str ()); break; 753 case KW_move_type: set_move (move_type , f); break;
743 case KW_move_on: set_move (move_on, f.get_str ()); break; 754 case KW_move_on: set_move (move_on , f); break;
744 case KW_move_off: set_move (move_off, f.get_str ()); break; 755 case KW_move_off: set_move (move_off , f); break;
745 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 756 case KW_move_slow: set_move (move_slow , f); break;
746 757
747 /* These are all legacy - any new objects should use the move_ .. values */ 758 /* These are all legacy - any new objects should use the move_ .. values */
748 case KW_no_pass: 759 case KW_no_pass:
749 { 760 {
750 if (f.get_sint32 ()) 761 if (f.get_sint32 ())
… …
912 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 923 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
913 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 924 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
914 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 925 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
915 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 926 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
916 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 927 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
928 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
917 929
918 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 930 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
919 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 931 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
920 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 932 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
921 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 933 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
996 add_link (map, connected); 1008 add_link (map, connected);
997 } 1009 }
998 break; 1010 break;
999 1011
1000 case KW_randomitems: 1012 case KW_randomitems:
1001 if (f.get_str ()) 1013 if (f.has_value ())
1002 { 1014 {
1003 randomitems = 1015 randomitems =
1004 loading_arch 1016 loading_arch
1005 ? treasurelist::get (f.get_str ()) 1017 ? treasurelist::get (f.get_str ())
1006 : treasurelist::find (f.get_str ()); 1018 : treasurelist::find (f.get_str ());
… …
1242 /* 100 */ 1254 /* 100 */
1243 KW_neutral, 1255 KW_neutral,
1244 KW_no_attack, 1256 KW_no_attack,
1245 KW_no_damage, 1257 KW_no_damage,
1246 KW_obj_original, 1258 KW_obj_original,
1247 KW_NULL, 1259 KW_random_speed,
1248 KW_activate_on_push, 1260 KW_activate_on_push,
1249 KW_activate_on_release, 1261 KW_activate_on_release,
1250 KW_is_water, 1262 KW_is_water,
1251 KW_use_content_on_gen, 1263 KW_use_content_on_gen,
1252 KW_NULL, 1264 KW_NULL,
… …
1287 *ptr++ = '\n'; 1299 *ptr++ = '\n';
1288 1300
1289 f.alloc (ptr - cur); 1301 f.alloc (ptr - cur);
1290 } 1302 }
1291 1303
1292#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW_ ## v, op->v) 1304#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v)
1293#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW_ ## k, op->v) 1305#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v)
1294 1306
1295 CMP_OUT (x); 1307 CMP_OUT (x);
1296 CMP_OUT (y); 1308 CMP_OUT (y);
1297 1309
1298 CMP_OUT (type); 1310 CMP_OUT (type);
1299 CMP_OUT (subtype); 1311 CMP_OUT (subtype);
1300 CMP_OUT (direction); 1312 CMP_OUT (direction);
1301 1313
1302 CMP_OUT (name); 1314 CMP_OUT (name);
1303 CMP_OUT (name_pl); 1315 CMP_OUT (name_pl);
1304
1305 CMP_OUT (speed); 1316 CMP_OUT (speed);
1306 1317
1307 // speed_left is a major time-burner, and has good locality, so 1318 // speed_left is a major time-burner, and has good locality, so
1308 // we use a simple lookup-cache to avoid the very slow printf. 1319 // we use a simple lookup-cache to avoid the very slow printf.
1309 if (op->speed_left != arch->speed_left) 1320 if (op->speed_left != arch->speed_left)
1310 { 1321 {
1311 static double last_speed_left = 0.; 1322 static double last_speed_left = 0.;
1312 static char last_speed_left_str [256] = "speed_left 0\n"; 1323 static char last_speed_left_str [256] = "sl 0\n";
1313 static int last_speed_left_len = sizeof ("speed_left 0\n") - 1; 1324 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1314 1325
1315 if (last_speed_left != op->speed_left) 1326 if (last_speed_left != op->speed_left)
1316 { 1327 {
1317 last_speed_left = op->speed_left; 1328 last_speed_left = op->speed_left;
1318 last_speed_left_len = sizeof ("speed_left ") - 1 1329 last_speed_left_len = sizeof ("sl ") - 1
1319 + sprintf (last_speed_left_str + sizeof ("speed_left ") - 1, "%.7g\n", last_speed_left); 1330 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1320 } 1331 }
1321 1332
1322 f.add (last_speed_left_str, last_speed_left_len); 1333 f.add (last_speed_left_str, last_speed_left_len);
1323 } 1334 }
1324 1335
… …
1329 1340
1330 CMP_OUT (tag); 1341 CMP_OUT (tag);
1331 CMP_OUT (custom_name); 1342 CMP_OUT (custom_name);
1332 1343
1333 if (object *owner = op->owner) 1344 if (object *owner = op->owner)
1334 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1345 f.put (KW(owner), static_cast<const char *>(owner->ref ()));
1335 1346
1336 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved 1347 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1337 1348
1338 CMP_OUT (other_arch); 1349 CMP_OUT (other_arch);
1339 1350
1340 if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1351 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1341 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore); 1352 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1342 1353
1343 if (op->face != arch->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1354 if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0);
1344 if (op->sound != arch->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1355 if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0);
1345 if (op->sound_destroy != arch->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1356 if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0);
1346 1357
1347 if (op->animation_id != arch->animation_id) 1358 if (op->animation_id != arch->animation_id)
1348 if (op->has_anim ()) 1359 if (op->has_anim ())
1349 f.put (KW_animation, op->anim ().name); 1360 f.put (KW(animation), op->anim ().name);
1350 else 1361 else
1351 { 1362 {
1352 f.put (KW_animation, (const char *)0); 1363 f.put (KW(animation));
1353 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1364 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1354 } 1365 }
1355 1366
1356 CMP_OUT2 (str, stats.Str); 1367 CMP_OUT2 (str, stats.Str);
1357 CMP_OUT2 (dex, stats.Dex); 1368 CMP_OUT2 (dex, stats.Dex);
… …
1393 CMP_OUT (path_repelled); 1404 CMP_OUT (path_repelled);
1394 CMP_OUT (path_denied); 1405 CMP_OUT (path_denied);
1395 1406
1396 CMP_OUT2 (material, materials);//TODO: nuke 1407 CMP_OUT2 (material, materials);//TODO: nuke
1397 if (op->material != arch->material) 1408 if (op->material != arch->material)
1398 f.put (KW_materialname, op->material->name); 1409 f.put (KW(materialname), op->material->name);
1399 1410
1400 CMP_OUT (value); 1411 CMP_OUT (value);
1401 CMP_OUT (carrying); 1412 CMP_OUT (carrying);
1402 CMP_OUT (weight); 1413 CMP_OUT (weight);
1403 CMP_OUT (invisible); 1414 CMP_OUT (invisible);
… …
1409 CMP_OUT (last_eat); 1420 CMP_OUT (last_eat);
1410 CMP_OUT (glow_radius); 1421 CMP_OUT (glow_radius);
1411 1422
1412 if (op->flag [FLAG_IS_LINKED]) 1423 if (op->flag [FLAG_IS_LINKED])
1413 if (auto (ol, op->find_link ())) 1424 if (auto (ol, op->find_link ()))
1414 f.put (KW_connected, ol->id); 1425 f.put (KW(connected), ol->id);
1415 1426
1416 CMP_OUT (randomitems); 1427 CMP_OUT (randomitems);
1428
1417 CMP_OUT2 (container, weight_limit); 1429 CMP_OUT2 (container, weight_limit);
1418 1430
1419 CMP_OUT (run_away); 1431 CMP_OUT (run_away);
1420 CMP_OUT (pick_up); 1432 CMP_OUT (pick_up);
1421 CMP_OUT (will_apply); 1433 CMP_OUT (will_apply);
… …
1439 CMP_OUT (move_slow_penalty); 1451 CMP_OUT (move_slow_penalty);
1440 1452
1441 object::flags_t diff = (op->flag ^ arch->flag) & flagmask; 1453 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1442 1454
1443 if (diff [FLAG_OBJ_ORIGINAL]) 1455 if (diff [FLAG_OBJ_ORIGINAL])
1444 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0"); 1456 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1445 1457
1446 diff.reset (FLAG_OBJ_ORIGINAL); 1458 diff.reset (FLAG_OBJ_ORIGINAL);
1447 1459
1448 // quickly test whether any other flags differ 1460 // quickly test whether any other flags differ
1449 if (expect_true (diff.any ())) 1461 if (expect_true (diff.any ()))
1450 for (int i = 0; i < NUM_FLAGS; i++) 1462 for (int i = 0; i < NUM_FLAGS; i++)
1451 if (expect_false (diff [i])) 1463 if (expect_false (diff [i]))
1452 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1464 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1453 1465
1454 // save body locations. gcc's memcmp does an abysmal job when used 1466 // save body locations. gcc's memcmp does an abysmal job when used
1455 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1467 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1456 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1468 if (expect_false (op->slot[i].info != arch->slot[i].info))
1457 f.put (body_locations[i].save_name, op->slot[i].info); 1469 f.put (body_locations[i].save_name, op->slot[i].info);
… …
1463 * the only place this is not set is when saving the player. 1475 * the only place this is not set is when saving the player.
1464 */ 1476 */
1465bool 1477bool
1466object::write (object_freezer &f) 1478object::write (object_freezer &f)
1467{ 1479{
1468 if (is_arch ()) 1480 if (expect_false (is_arch ()))
1469 { 1481 {
1470 f.put (KW_object, arch->archname); 1482 f.put (KW(object), arch->archname);
1471 write_diff (f, this, archetype::empty); 1483 write_diff (f, this, archetype::empty);
1472 } 1484 }
1473 else 1485 else
1474 { 1486 {
1475 f.put (KW_arch, arch->archname); 1487 f.put (KW(arch), arch->archname);
1476 write_diff (f, this, arch); 1488 write_diff (f, this, arch);
1477 } 1489 }
1478 1490
1479 for (object *tmp = inv; tmp; tmp = tmp->below) 1491 for (object *tmp = inv; tmp; tmp = tmp->below)
1480 tmp->write (f); 1492 tmp->write (f);
1481 1493
1482 f.put (this); 1494 f.put (this);
1483 f.put (KW_end); 1495 f.put (KW(end));
1484 1496
1485 return true; 1497 return true;
1486} 1498}
1487 1499
1488///////////////////////////////////////////////////////////////////////////// 1500/////////////////////////////////////////////////////////////////////////////

Diff Legend

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