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.40 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.54 by root, Wed Feb 7 02:04:46 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
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, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 21 *
22 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
23*/ 23 */
24 24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 27 variable. */
28 28
29
30#include <global.h> 29#include <global.h>
31#include <loader.h> 30#include <loader.h>
32#include <sproto.h> 31#include <sproto.h>
32
33/////////////////////////////////////////////////////////////////////////////
34
35loader_base::~loader_base ()
36{
37}
38
39// the base class warns about and skips everything
40archetype *
41loader_base::get_arch (const char *name)
42{
43 LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of this type.\n",
44 filename, name);
45
46 return new archetype;
47}
48
49object *
50loader_base::get_object (const char *name)
51{
52 LOG (llevError, "%s: found object definition '%s', which is not allowed in files of this type.\n",
53 filename, name);
54
55 return object::create ();
56}
57
58player *
59loader_base::get_player ()
60{
61 LOG (llevError, "%s: found player definition, which is not allowed in files of this type.\n",
62 filename);
63
64 return player::create ();
65}
66
67region *
68loader_base::get_region (const char *name)
69{
70 LOG (llevError, "%s: found region definition '%s', which is not allowed in files of this type.\n",
71 filename, name);
72
73 return new region;
74}
75
76facetile *
77loader_base::get_face (const char *name)
78{
79 LOG (llevError, "%s: found face definition '%s', which is not allowed in files of this type.\n",
80 filename, name);
81
82 return new facetile;
83}
84
85treasurelist *
86loader_base::get_treasure (const char *name, bool one)
87{
88 LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of this type.\n",
89 filename, name);
90
91 return new treasurelist;//D
92}
93
94animation *
95loader_base::get_animation (const char *name)
96{
97 LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of this type.\n",
98 filename, name);
99
100 return new animation;
101}
102
103void
104loader_base::put_arch (archetype *arch)
105{
106 delete arch;
107}
108
109void
110loader_base::put_object (object *op)
111{
112 op->destroy ();
113}
114
115void
116loader_base::put_player (player *pl)
117{
118 delete pl;
119}
120
121void
122loader_base::put_region (region *region)
123{
124 delete region;
125}
126
127void
128loader_base::put_face (facetile *face)
129{
130 delete face;
131}
132
133void
134loader_base::put_treasure (treasurelist *treasure)
135{
136 delete treasure;
137}
138
139void
140loader_base::put_animation (animation *anim)
141{
142 delete anim;
143}
144
145/////////////////////////////////////////////////////////////////////////////
146
147bool loader_base::parse (object_thawer &thawer)
148{
149 for (;;)
150 {
151 keyword kw = thawer.get_kv ();
152
153 switch (kw)
154 {
155 case KW_region:
156 {
157 region *rgn = get_region (thawer.get_str ());
158
159 if (!parse_region (thawer, rgn))
160 {
161 delete rgn;
162 return false;
163 }
164
165 put_region (rgn);
166 }
167 break;
168
169 case KW_EOF:
170 return true;
171
172 default:
173 if (!thawer.parse_error (kw, "resource file"))
174 return false;
175 }
176 }
177}
178
179bool loader_base::load (const char *filename)
180{
181 this->filename = filename;
182
183 object_thawer fp (filename);
184
185 if (!fp)
186 return false;
187
188 return parse (fp);
189}
190
191/////////////////////////////////////////////////////////////////////////////
33 192
34/* Maps the MOVE_* values to names */ 193/* Maps the MOVE_* values to names */
35static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 194static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
36 195
37/* This table is only necessary to convert objects that existed before the 196/* This table is only necessary to convert objects that existed before the
… …
374 } 533 }
375 534
376 if (QUERY_FLAG (op, FLAG_MONSTER)) 535 if (QUERY_FLAG (op, FLAG_MONSTER))
377 { 536 {
378 if (op->stats.hp > op->stats.maxhp) 537 if (op->stats.hp > op->stats.maxhp)
538 {
379 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 539 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);
540 op->stats.maxhp = op->stats.hp;
541 }
380 542
381 /* The archs just need to be updated for this */ 543 /* The archs just need to be updated for this */
382 if (op->move_type == 0) 544 if (op->move_type == 0)
383 op->move_type = MOVE_WALK; 545 op->move_type = MOVE_WALK;
384 } 546 }
… …
630 if (!str) 792 if (!str)
631 { 793 {
632 op->animation_id = 0; 794 op->animation_id = 0;
633 CLEAR_FLAG (op, FLAG_ANIMATE); 795 CLEAR_FLAG (op, FLAG_ANIMATE);
634 } 796 }
635 else
636 {
637 op->animation_id = find_animation (str); 797 else if ((op->animation_id = find_animation (str)))
638 SET_FLAG (op, FLAG_ANIMATE); 798 SET_FLAG (op, FLAG_ANIMATE);
639 }
640 } 799 }
641 800
642 break; 801 break;
643 802
644 case KW_last_heal: thawer.get (op->last_heal); break; 803 case KW_last_heal: thawer.get (op->last_heal); break;
… …
651 thawer.get (op->speed); 810 thawer.get (op->speed);
652 811
653 //TODO: maybe do in check_object 812 //TODO: maybe do in check_object
654 // removed check for style maps 813 // removed check for style maps
655 if (op->speed < 0) 814 if (op->speed < 0)
656 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 815 op->speed_left = op->speed_left - rndm ();
657 816
658 break; 817 break;
659 818
660 case KW_slow_move: 819 case KW_slow_move:
661 op->move_slow |= MOVE_WALK; 820 op->move_slow |= MOVE_WALK;
… …
711 case KW_path_denied: thawer.get (op->path_denied); break; 870 case KW_path_denied: thawer.get (op->path_denied); break;
712 case KW_invisible: thawer.get (op->invisible); break; 871 case KW_invisible: thawer.get (op->invisible); break;
713 case KW_magic: thawer.get (op->magic); break; 872 case KW_magic: thawer.get (op->magic); break;
714 case KW_state: thawer.get (op->state); break; 873 case KW_state: thawer.get (op->state); break;
715 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; 874 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break;
716 case KW_material: thawer.get (op->material); break; 875 case KW_material: thawer.get (op->materials); break; //TODO: nuke
717 case KW_materialname: thawer.get (op->materialname); break; 876 case KW_materialname: thawer.get (op->materialname); break;
718 877
719 /* These are the new values */ 878 /* These are the new values */
720 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; 879 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break;
721 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; 880 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break;
… …
815 CLEAR_FLAG (op, FLAG_WIZCAST); 974 CLEAR_FLAG (op, FLAG_WIZCAST);
816 } 975 }
817 break; 976 break;
818 977
819 case KW_friendly: 978 case KW_friendly:
820 GET_FLAG (op, FLAG_FRIENDLY); 979 if (thawer.get_sint32 ())
821 //TODO: move to check_object or so 980 if (op->type != PLAYER)
822 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
823 add_friendly_object (op); 981 add_friendly_object (op);
982
824 break; 983 break;
825 984
826 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 985 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
827 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 986 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
828 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 987 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
829 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 988 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
989 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
830 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 990 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
831 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 991 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
832 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 992 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
833 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 993 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
834 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 994 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
… …
905 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 1065 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
906 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 1066 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
907 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 1067 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
908 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 1068 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
909 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 1069 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
1070 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
910 1071
911 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 1072 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
912 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 1073 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
913 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 1074 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
914 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 1075 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
1033 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 1194 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1034 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D 1195 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1035 break; 1196 break;
1036 1197
1037 default: 1198 default:
1038 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1199 if (!thawer.parse_error (kw, "object", op->name))
1200 return false;
1039 break; 1201 break;
1040 } 1202 }
1041 } 1203 }
1042} 1204}
1043 1205
… …
1265 KW_berserk, 1427 KW_berserk,
1266 KW_neutral, 1428 KW_neutral,
1267 /* 100 */ 1429 /* 100 */
1268 KW_no_attack, 1430 KW_no_attack,
1269 KW_no_damage, 1431 KW_no_damage,
1270 KW_NULL, 1432 KW_obj_original,
1271 KW_NULL, 1433 KW_NULL,
1272 KW_activate_on_push, 1434 KW_activate_on_push,
1273 KW_activate_on_release, 1435 KW_activate_on_release,
1274 KW_is_water, 1436 KW_is_water,
1275 KW_use_content_on_gen, 1437 KW_use_content_on_gen,
1276 KW_NULL, 1438 KW_NULL,
1277 KW_is_buildable, 1439 KW_is_buildable,
1278 /* 110 */ 1440 /* 110 */
1441 KW_destroy_on_death,
1442 KW_NULL,
1279 }; 1443 };
1280 1444
1281 int i; 1445 int i;
1282 1446
1283 /* This saves the key/value lists. We do it first so that any 1447 /* 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. 1448 * keys that match field names will be overwritten by the loader.
1285 */ 1449 */
1286 for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) 1450 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1287 { 1451 {
1288 /* Find the field in the opposing member. */ 1452 /* Find the field in the opposing member. */
1289 key_value *arch_field = get_ob_key_link (tmp, my_field->key); 1453 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1290 1454
1291 /* If there's no partnering field, or it's got a different value, save our field. */ 1455 /* If there's no partnering field, or it's got a different value, save our field. */
… …
1375 f.put (resist_save[i], op->resist[i]); 1539 f.put (resist_save[i], op->resist[i]);
1376 1540
1377 CMP_OUT (path_attuned); 1541 CMP_OUT (path_attuned);
1378 CMP_OUT (path_repelled); 1542 CMP_OUT (path_repelled);
1379 CMP_OUT (path_denied); 1543 CMP_OUT (path_denied);
1380 CMP_OUT (material); 1544 CMP_OUT2 (material, materials);//TODO: nuke
1381 CMP_OUT (materialname); 1545 CMP_OUT (materialname);
1382 CMP_OUT (value); 1546 CMP_OUT (value);
1383 CMP_OUT (carrying); 1547 CMP_OUT (carrying);
1384 CMP_OUT (weight); 1548 CMP_OUT (weight);
1385 CMP_OUT (invisible); 1549 CMP_OUT (invisible);

Diff Legend

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