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.43 by root, Mon Jan 8 12:44:34 2007 UTC vs.
Revision 1.52 by root, Thu Feb 1 19:15:38 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
35// the base class warns about and skips everything
36archetype *
37loader_base::get_arch (const char *name)
38{
39 LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of this type.\n",
40 filename, name);
41
42 return new archetype;
43}
44
45object *
46loader_base::get_object (const char *name)
47{
48 LOG (llevError, "%s: found object definition '%s', which is not allowed in files of this type.\n",
49 filename, name);
50
51 return object::create ();
52}
53
54player *
55loader_base::get_player ()
56{
57 LOG (llevError, "%s: found player definition, which is not allowed in files of this type.\n",
58 filename);
59
60 return player::create ();
61}
62
63region *
64loader_base::get_region (const char *name)
65{
66 LOG (llevError, "%s: found region definition '%s', which is not allowed in files of this type.\n",
67 filename, name);
68
69 return new region;
70}
71
72facetile *
73loader_base::get_face (const char *name)
74{
75 LOG (llevError, "%s: found face definition '%s', which is not allowed in files of this type.\n",
76 filename, name);
77
78 return new facetile;
79}
80
81treasurelist *
82loader_base::get_treasure (const char *name, bool one)
83{
84 LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of this type.\n",
85 filename, name);
86
87 return new treasurelist;//D
88}
89
90animation *
91loader_base::get_animation (const char *name)
92{
93 LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of this type.\n",
94 filename, name);
95
96 return new animation;
97}
98
99void
100loader_base::put_arch (archetype *arch)
101{
102 delete arch;
103}
104
105void
106loader_base::put_object (object *op)
107{
108 op->destroy ();
109}
110
111void
112loader_base::put_player (player *pl)
113{
114 delete pl;
115}
116
117void
118loader_base::put_region (region *region)
119{
120 delete region;
121}
122
123void
124loader_base::put_face (facetile *face)
125{
126 delete face;
127}
128
129void
130loader_base::put_treasure (treasurelist *treasure)
131{
132 delete treasure;
133}
134
135void
136loader_base::put_animation (animation *anim)
137{
138 delete anim;
139}
140
141/////////////////////////////////////////////////////////////////////////////
142
143bool loader_base::parse (object_thawer &thawer)
144{
145 for (;;)
146 {
147 keyword kw = thawer.get_kv ();
148
149 switch (kw)
150 {
151 case KW_region:
152 {
153 region *rgn = get_region (thawer.get_str ());
154
155 if (!parse_region (thawer, rgn))
156 {
157 delete rgn;
158 return false;
159 }
160
161 put_region (rgn);
162 }
163 break;
164
165 case KW_EOF:
166 return true;
167
168 default:
169 if (!thawer.parse_error (kw, "resource file"))
170 return false;
171 }
172 }
173}
174
175bool loader_base::load (const char *filename)
176{
177 this->filename = filename;
178
179 object_thawer fp (filename);
180
181 if (!fp)
182 return false;
183
184 return parse (fp);
185}
186
187/////////////////////////////////////////////////////////////////////////////
33 188
34/* Maps the MOVE_* values to names */ 189/* Maps the MOVE_* values to names */
35static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 190static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
36 191
37/* This table is only necessary to convert objects that existed before the 192/* This table is only necessary to convert objects that existed before the
… …
374 } 529 }
375 530
376 if (QUERY_FLAG (op, FLAG_MONSTER)) 531 if (QUERY_FLAG (op, FLAG_MONSTER))
377 { 532 {
378 if (op->stats.hp > op->stats.maxhp) 533 if (op->stats.hp > op->stats.maxhp)
534 {
379 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 535 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);
536 op->stats.maxhp = op->stats.hp;
537 }
380 538
381 /* The archs just need to be updated for this */ 539 /* The archs just need to be updated for this */
382 if (op->move_type == 0) 540 if (op->move_type == 0)
383 op->move_type = MOVE_WALK; 541 op->move_type = MOVE_WALK;
384 } 542 }
… …
630 if (!str) 788 if (!str)
631 { 789 {
632 op->animation_id = 0; 790 op->animation_id = 0;
633 CLEAR_FLAG (op, FLAG_ANIMATE); 791 CLEAR_FLAG (op, FLAG_ANIMATE);
634 } 792 }
635 else
636 {
637 op->animation_id = find_animation (str); 793 else if ((op->animation_id = find_animation (str)))
638 SET_FLAG (op, FLAG_ANIMATE); 794 SET_FLAG (op, FLAG_ANIMATE);
639 }
640 } 795 }
641 796
642 break; 797 break;
643 798
644 case KW_last_heal: thawer.get (op->last_heal); break; 799 case KW_last_heal: thawer.get (op->last_heal); break;
… …
651 thawer.get (op->speed); 806 thawer.get (op->speed);
652 807
653 //TODO: maybe do in check_object 808 //TODO: maybe do in check_object
654 // removed check for style maps 809 // removed check for style maps
655 if (op->speed < 0) 810 if (op->speed < 0)
656 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 811 op->speed_left = op->speed_left - rndm ();
657 812
658 break; 813 break;
659 814
660 case KW_slow_move: 815 case KW_slow_move:
661 op->move_slow |= MOVE_WALK; 816 op->move_slow |= MOVE_WALK;
… …
1035 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 1190 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1036 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D 1191 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1037 break; 1192 break;
1038 1193
1039 default: 1194 default:
1040 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1195 if (!thawer.parse_error (kw, "object", op->name))
1196 return false;
1041 break; 1197 break;
1042 } 1198 }
1043 } 1199 }
1044} 1200}
1045 1201
… …
1277 KW_use_content_on_gen, 1433 KW_use_content_on_gen,
1278 KW_NULL, 1434 KW_NULL,
1279 KW_is_buildable, 1435 KW_is_buildable,
1280 /* 110 */ 1436 /* 110 */
1281 KW_destroy_on_death, 1437 KW_destroy_on_death,
1438 KW_NULL,
1282 }; 1439 };
1283 1440
1284 int i; 1441 int i;
1285 1442
1286 /* This saves the key/value lists. We do it first so that any 1443 /* This saves the key/value lists. We do it first so that any
1287 * keys that match field names will be overwritten by the loader. 1444 * keys that match field names will be overwritten by the loader.
1288 */ 1445 */
1289 for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) 1446 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1290 { 1447 {
1291 /* Find the field in the opposing member. */ 1448 /* Find the field in the opposing member. */
1292 key_value *arch_field = get_ob_key_link (tmp, my_field->key); 1449 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1293 1450
1294 /* If there's no partnering field, or it's got a different value, save our field. */ 1451 /* If there's no partnering field, or it's got a different value, save our field. */

Diff Legend

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