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.156 by root, Sun Apr 18 12:37:07 2010 UTC vs.
Revision 1.170 by root, Sat May 7 17:14:41 2011 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,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 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
… …
265 type = 0; 265 type = 0;
266 } 266 }
267 267
268 switch (type) 268 switch (type)
269 { 269 {
270 case RANGED:
270 case BOW: 271 case BOW:
271 case WAND: 272 case WAND:
272 case ROD: 273 case ROD:
273 case HORN: 274 case HORN:
274 if (slot [body_range].info != -1) 275 if (slot [body_range].info != -1)
… …
413 // TODO: fix firewall object on map 414 // TODO: fix firewall object on map
414 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' 415 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
415 * in that spell was stored in sp. 416 * in that spell was stored in sp.
416 */ 417 */
417 //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); 418 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
418 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 419 object *tmp = archetype::get (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
419 insert_ob_in_ob (tmp, this); 420 insert_ob_in_ob (tmp, this);
420 randomitems = 0; 421 randomitems = 0;
421 } 422 }
422 423
423 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 424 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
… …
522 { 523 {
523 negate = 1; 524 negate = 1;
524 str++; 525 str++;
525 } 526 }
526 527
527 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) 528 for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f)
528 { 529 {
529 if (!strcmp (f->name, str)) 530 if (!strcmp (f->name, str))
530 { 531 {
531 if (negate) 532 if (negate)
532 mt &= ~f->flags; 533 mt &= ~f->flags;
… …
549 550
550bool 551bool
551object::parse_kv (object_thawer &f) 552object::parse_kv (object_thawer &f)
552{ 553{
553 object *op_inv = inv; 554 object *op_inv = inv;
554 key_value *last_kv = key_values; 555 key_value *last_kv = kv.first;
555 556
556 for (;;) 557 for (;;)
557 { 558 {
558 switch (f.kw) 559 switch (f.kw)
559 { 560 {
… …
736 case KW_invisible: f.get (invisible); break; 737 case KW_invisible: f.get (invisible); break;
737 case KW_magic: f.get (magic); break; 738 case KW_magic: f.get (magic); break;
738 case KW_state: f.get (state); break; 739 case KW_state: f.get (state); break;
739 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 740 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
740 case KW_material: f.get (materials); break; //TODO: nuke 741 case KW_material: f.get (materials); break; //TODO: nuke
741 742 case KW_materialname: f.get (material); break;
742 case KW_materialname:
743 {
744 shstr sh;
745 f.get (sh);
746 material = name_to_material (sh);
747 }
748 break;
749 743
750 /* These are the new values */ 744 /* These are the new values */
751 case KW_move_block: set_move (move_block, f); break; 745 case KW_move_block: set_move (move_block, f); break;
752 case KW_move_allow: set_move (move_allow, f); break; 746 case KW_move_allow: set_move (move_allow, f); break;
753 case KW_move_type: set_move (move_type , f); break; 747 case KW_move_type: set_move (move_type , f); break;
754 case KW_move_on: set_move (move_on , f); break; 748 case KW_move_on: set_move (move_on , f); break;
755 case KW_move_off: set_move (move_off , f); break; 749 case KW_move_off: set_move (move_off , f); break;
756 case KW_move_slow: set_move (move_slow , f); break; 750 case KW_move_slow: set_move (move_slow , f); break;
757 751
758 /* These are all legacy - any new objects should use the move_ .. values */
759 case KW_no_pass:
760 {
761 if (f.get_sint32 ())
762 move_block = MOVE_ALL;
763 else
764 move_block = 0;
765 }
766
767 break;
768
769 /* These are all legacy - any new objects should use the move_ .. values */
770 case KW_walk_on:
771 {
772 if (f.get_sint32 ())
773 move_on |= MOVE_WALK;
774 else
775 move_on &= ~MOVE_WALK;
776 }
777
778 break;
779
780 /* These are all legacy - any new objects should use the move_ .. values */
781 case KW_walk_off:
782 {
783 if (f.get_sint32 ())
784 move_off |= MOVE_WALK;
785 else
786 move_off &= ~MOVE_WALK;
787 }
788 break;
789
790 /* These are all legacy - any new objects should use the move_ .. values */
791 case KW_fly_on:
792 {
793 if (f.get_sint32 ())
794 move_on |= MOVE_FLY_LOW;
795 else
796 move_on &= ~MOVE_FLY_LOW;
797 }
798 break;
799
800 /* These are all legacy - any new objects should use the move_ .. values */
801 case KW_fly_off:
802 {
803 if (f.get_sint32 ())
804 move_off |= MOVE_FLY_LOW;
805 else
806 move_off &= ~MOVE_FLY_LOW;
807 }
808 break;
809
810 //TODO: remove these after converting archetypes 752 //TODO: remove these after converting archetypes
811 case KW_can_use_wand: 753 case KW_can_use_wand:
812 GET_FLAG (this, FLAG_USE_RANGE); 754 GET_FLAG (this, FLAG_USE_RANGE);
813 break; 755 break;
814
815 /* These are all legacy - any new objects should use the move_ .. values */
816 case KW_flying:
817 {
818 if (f.get_sint32 ())
819 move_type |= MOVE_FLY_LOW;
820 else
821 move_type &= ~MOVE_FLY_LOW;
822 }
823 break;
824
825 756
826 case KW_identified: 757 case KW_identified:
827 GET_FLAG (this, FLAG_IDENTIFIED); 758 GET_FLAG (this, FLAG_IDENTIFIED);
828 //TODO: move to check_object or so 759 //TODO: move to check_object or so
829 if (this->flag [FLAG_IDENTIFIED]) 760 if (this->flag [FLAG_IDENTIFIED])
… …
924 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 855 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
925 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 856 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
926 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 857 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
927 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 858 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
928 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break; 859 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
860 case KW_is_quad: GET_FLAG (this, FLAG_IS_QUAD); break;
929 861
930 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 862 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
931 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 863 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
932 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 864 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
933 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 865 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
1045 977
1046 f.next (); 978 f.next ();
1047 return true; 979 return true;
1048 980
1049 case KW_ERROR: 981 case KW_ERROR:
1050 // append as key value pair (do not use kv_set as it prepends)
1051 // we also do not even try to find old values, duplicate keys stay duplicate 982 // we do not even try to find old values, duplicate keys stay duplicate
1052 { 983 // the list gets reversed after loading
1053 key_value *kv = new key_value; 984 kv.add (shstr (f.kw_str), shstr (f.value));
1054
1055 kv->next = 0;
1056 kv->key = shstr (f.kw_str);
1057 kv->value = shstr (f.value);
1058
1059 if (!last_kv)
1060 key_values = last_kv = kv;
1061 else
1062 {
1063 while (last_kv->next)
1064 last_kv = last_kv->next;
1065
1066 last_kv->next = kv;
1067 last_kv = kv;
1068 }
1069 }
1070 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1071 break; 985 break;
1072 986
1073 default: 987 default:
1074 if (!f.parse_error ("object", name)) 988 if (!f.parse_error ("object", name))
1075 return false; 989 return false;
… …
1087 1001
1088 archetype *arch = archetype::find (f.get_str ()); 1002 archetype *arch = archetype::find (f.get_str ());
1089 1003
1090 if (!arch) 1004 if (!arch)
1091 { 1005 {
1092 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1006 LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ());
1093 arch = archetype::find (shstr_earthwall); 1007 arch = archetype::find (shstr_earthwall);
1094 } 1008 }
1095 1009
1096 assert (arch); //D maybe use exception handling of sorts? 1010 assert (arch); //D maybe use exception handling of sorts?
1097 1011
… …
1105 if (!op->parse_kv (f)) 1019 if (!op->parse_kv (f))
1106 { 1020 {
1107 op->destroy (); 1021 op->destroy ();
1108 return 0; 1022 return 0;
1109 } 1023 }
1024
1025 // the loader reverses the ordering of kv-pairs, so we reverse it again after loading
1026 // that greatly simplifies the loading code.
1027 op->kv.reverse ();
1110 1028
1111 op->post_load_check (); 1029 op->post_load_check ();
1112 return op; 1030 return op;
1113} 1031}
1114 1032
… …
1119 * override values and in c_wiz to mutate values. 1037 * override values and in c_wiz to mutate values.
1120 */ 1038 */
1121int 1039int
1122set_variable (object *op, char *buf) 1040set_variable (object *op, char *buf)
1123{ 1041{
1124 object_thawer f (buf, (AV *)0); 1042 object_thawer f (format ("%s\nend", buf), (AV *)0);
1125 1043
1126 return op->parse_kv (f); 1044 return op->parse_kv (f);
1127} 1045}
1128 1046
1129// compare *op against *arch and output differences 1047// compare *op against *arch and output differences
… …
1281 } flagmask; 1199 } flagmask;
1282 1200
1283 /* This saves the key/value lists. We do it first so that any 1201 /* This saves the key/value lists. We do it first so that any
1284 * keys that match field names will be overwritten by the loader. 1202 * keys that match field names will be overwritten by the loader.
1285 */ 1203 */
1286 for (key_value *kv = op->key_values; kv; kv = kv->next) 1204 for (key_value *kv = op->kv.first; kv; kv = kv->next)
1287 if (!arch->key_values || arch->kv (kv->key) != kv->value) 1205 if (arch->kv.empty () || arch->kv [kv->key] != kv->value)
1288 f.put (kv->key, kv->value); 1206 f.put (kv->key, kv->value);
1289 1207
1290 if (op->uuid) 1208 if (op->uuid)
1291 { 1209 {
1292 // highly optimised - this is often 25% of all data written 1210 // highly optimised - this is often 25% of all data written
… …
1471#endif 1389#endif
1472 1390
1473 // save body locations. gcc's memcmp does an abysmal job when used 1391 // save body locations. gcc's memcmp does an abysmal job when used
1474 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1392 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1475 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1393 if (expect_false (op->slot[i].info != arch->slot[i].info))
1476 f.put (body_locations[i].save_name, op->slot[i].info); 1394 f.put (body_locations[i].kw, op->slot[i].info);
1477} 1395}
1478 1396
1479/* 1397/*
1480 * Dumps all variables in an object to a file. 1398 * Dumps all variables in an object to a file.
1481 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1399 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
… …
1513{ 1431{
1514 object_thawer f (filename); 1432 object_thawer f (filename);
1515 1433
1516 for (;;) 1434 for (;;)
1517 { 1435 {
1436 coroapi::cede_to_tick ();
1437
1518 switch (f.kw) 1438 switch (f.kw)
1519 { 1439 {
1520 case KW_region: 1440 case KW_region:
1521 if (!region::read (f)) 1441 if (!region::read (f))
1522 return false; 1442 return false;

Diff Legend

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