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.46 by pippijn, Mon Jan 15 21:06:18 2007 UTC vs.
Revision 1.54 by root, Wed Feb 7 02:04:46 2007 UTC

… …
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 }
… …
648 thawer.get (op->speed); 810 thawer.get (op->speed);
649 811
650 //TODO: maybe do in check_object 812 //TODO: maybe do in check_object
651 // removed check for style maps 813 // removed check for style maps
652 if (op->speed < 0) 814 if (op->speed < 0)
653 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 815 op->speed_left = op->speed_left - rndm ();
654 816
655 break; 817 break;
656 818
657 case KW_slow_move: 819 case KW_slow_move:
658 op->move_slow |= MOVE_WALK; 820 op->move_slow |= MOVE_WALK;
… …
708 case KW_path_denied: thawer.get (op->path_denied); break; 870 case KW_path_denied: thawer.get (op->path_denied); break;
709 case KW_invisible: thawer.get (op->invisible); break; 871 case KW_invisible: thawer.get (op->invisible); break;
710 case KW_magic: thawer.get (op->magic); break; 872 case KW_magic: thawer.get (op->magic); break;
711 case KW_state: thawer.get (op->state); break; 873 case KW_state: thawer.get (op->state); break;
712 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;
713 case KW_material: thawer.get (op->material); break; 875 case KW_material: thawer.get (op->materials); break; //TODO: nuke
714 case KW_materialname: thawer.get (op->materialname); break; 876 case KW_materialname: thawer.get (op->materialname); break;
715 877
716 /* These are the new values */ 878 /* These are the new values */
717 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;
718 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;
… …
1032 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);
1033 //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
1034 break; 1196 break;
1035 1197
1036 default: 1198 default:
1037 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;
1038 break; 1201 break;
1039 } 1202 }
1040 } 1203 }
1041} 1204}
1042 1205
… …
1376 f.put (resist_save[i], op->resist[i]); 1539 f.put (resist_save[i], op->resist[i]);
1377 1540
1378 CMP_OUT (path_attuned); 1541 CMP_OUT (path_attuned);
1379 CMP_OUT (path_repelled); 1542 CMP_OUT (path_repelled);
1380 CMP_OUT (path_denied); 1543 CMP_OUT (path_denied);
1381 CMP_OUT (material); 1544 CMP_OUT2 (material, materials);//TODO: nuke
1382 CMP_OUT (materialname); 1545 CMP_OUT (materialname);
1383 CMP_OUT (value); 1546 CMP_OUT (value);
1384 CMP_OUT (carrying); 1547 CMP_OUT (carrying);
1385 CMP_OUT (weight); 1548 CMP_OUT (weight);
1386 CMP_OUT (invisible); 1549 CMP_OUT (invisible);

Diff Legend

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