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.148 by root, Wed Nov 11 23:27:56 2009 UTC vs.
Revision 1.154 by root, Sun Apr 11 01:35:51 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 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 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
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
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 */
… …
423 randomitems = 0; /* So another spell isn't created for this object */ 429 randomitems = 0; /* So another spell isn't created for this object */
424 /* without this, value is all screwed up */ 430 /* without this, value is all screwed up */
425 value = arch->value * inv->value; 431 value = arch->value * inv->value;
426 } 432 }
427 433
428 if (QUERY_FLAG (this, FLAG_MONSTER)) 434 if (this->flag [FLAG_MONSTER])
429 { 435 {
430 if (stats.hp > stats.maxhp) 436 if (stats.hp > stats.maxhp)
431 { 437 {
432 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 438 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
433 stats.maxhp = stats.hp; 439 stats.maxhp = stats.hp;
… …
436 /* The archs just need to be updated for this */ 442 /* The archs just need to be updated for this */
437 if (move_type == 0) 443 if (move_type == 0)
438 move_type = MOVE_WALK; 444 move_type = MOVE_WALK;
439 } 445 }
440 446
441 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 447 if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER)
442 /* Object will duplicate it's content as part of the 448 /* Object will duplicate it's content as part of the
443 * generation process. To do this, we must flag inventory 449 * generation process. To do this, we must flag inventory
444 * so it remains unevaluated concerning the randomitems and 450 * so it remains unevaluated concerning the randomitems and
445 * the living (a demonlord shouldn't cast from inside generator!) 451 * the living (a demonlord shouldn't cast from inside generator!)
446 */ 452 */
… …
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;
… …
587 // was: insert_ob_in_ob (tmp, op); 588 // was: insert_ob_in_ob (tmp, op);
588 // but manually adding it can improve map loading times a lot 589 // but manually adding it can improve map loading times a lot
589 // also, appending instead of prepending keeps the 590 // also, appending instead of prepending keeps the
590 // save ordering the same between repeated load/saves. 591 // save ordering the same between repeated load/saves.
591 // and finally we do not want any funny effects 592 // and finally we do not want any funny effects
592 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 593 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
593 CLEAR_FLAG (tmp, FLAG_REMOVED); 594 tmp->clr_flag (FLAG_REMOVED);
594 595
595 if (!op_inv) 596 if (!op_inv)
596 { 597 {
597 inv = tmp; 598 inv = tmp;
598 tmp->above = 0; 599 tmp->above = 0;
… …
631 f.delayed_deref (this, owner, f.get_str ()); 632 f.delayed_deref (this, owner, f.get_str ());
632 break; 633 break;
633 634
634 case KW_animation: 635 case KW_animation:
635 { 636 {
636 CLEAR_FLAG (this, FLAG_ANIMATE); 637 this->clr_flag (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 this->set_flag (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 ())
… …
813 824
814 825
815 case KW_identified: 826 case KW_identified:
816 GET_FLAG (this, FLAG_IDENTIFIED); 827 GET_FLAG (this, FLAG_IDENTIFIED);
817 //TODO: move to check_object or so 828 //TODO: move to check_object or so
818 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 829 if (this->flag [FLAG_IDENTIFIED])
819 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 830 this->clr_flag (FLAG_KNOWN_MAGICAL);
820 831
821 break; 832 break;
822 833
823 case KW_friendly: 834 case KW_friendly:
824 if (f.get_bool ()) 835 if (f.get_bool ())
… …
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,
… …
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 if (const char *ref = owner->ref ())
1346 f.put (KW(owner), ref);
1335 1347
1336 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved 1348 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1337 1349
1338 CMP_OUT (other_arch); 1350 CMP_OUT (other_arch);
1339 1351
… …
1412 if (op->flag [FLAG_IS_LINKED]) 1424 if (op->flag [FLAG_IS_LINKED])
1413 if (auto (ol, op->find_link ())) 1425 if (auto (ol, op->find_link ()))
1414 f.put (KW(connected), ol->id); 1426 f.put (KW(connected), ol->id);
1415 1427
1416 CMP_OUT (randomitems); 1428 CMP_OUT (randomitems);
1429
1417 CMP_OUT2 (container, weight_limit); 1430 CMP_OUT2 (container, weight_limit);
1418 1431
1419 CMP_OUT (run_away); 1432 CMP_OUT (run_away);
1420 CMP_OUT (pick_up); 1433 CMP_OUT (pick_up);
1421 CMP_OUT (will_apply); 1434 CMP_OUT (will_apply);

Diff Legend

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