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.48 by root, Fri Jan 19 17:50:10 2007 UTC vs.
Revision 1.55 by root, Thu Feb 8 03:09:31 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>
33 32
34// future resource loader base class 33/////////////////////////////////////////////////////////////////////////////
35struct loader_base
36{
37 virtual archetype *get_arch (const char *name);
38 virtual void put_arch (archetype *arch);
39 34
40 virtual object *get_object (const char *name); 35loader_base::~loader_base ()
41 virtual void put_object (object *op); 36{
37}
42 38
43 virtual player *get_player (); 39// the base class warns about and skips everything
44 virtual void put_player (player *pl); 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 45
46 virtual region *get_region (); 46 return new archetype;
47 virtual void put_region (region *region); 47}
48 48
49 virtual facetile *get_face (const char *name); 49object *
50 virtual void put_face (facetile *face); 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);
51 54
52 virtual treasurelist *get_treasure (const char *name, bool one = false); 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
53 virtual void put_treasure (treasurelist *treasure); 134loader_base::put_treasure (treasurelist *treasure)
54
55 virtual animation *get_animation (const char *name);
56 virtual void put_animation (animation *anim);
57};
58
59// future generic resource loader
60// handles generic stuff valid in most files, such as
61// animations, treasures, faces and so on
62struct loader_generic : loader_base
63{ 135{
64 virtual region *get_region (); 136 delete treasure;
65 virtual void put_region (region *region); 137}
66 138
67 virtual facetile *get_face (const char *name); 139void
68 virtual void put_face (facetile *face); 140loader_base::put_animation (animation *anim)
141{
142 delete anim;
143}
69 144
70 virtual treasurelist *get_treasure (const char *name, bool one = false); 145/////////////////////////////////////////////////////////////////////////////
71 virtual void put_treasure (treasurelist *treasure);
72 146
73 virtual animation *get_animation (const char *name); 147bool loader_base::parse (object_thawer &thawer)
74 virtual void put_animation (animation *anim); 148{
75}; 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/////////////////////////////////////////////////////////////////////////////
76 192
77/* Maps the MOVE_* values to names */ 193/* Maps the MOVE_* values to names */
78static 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 };
79 195
80/* 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
… …
417 } 533 }
418 534
419 if (QUERY_FLAG (op, FLAG_MONSTER)) 535 if (QUERY_FLAG (op, FLAG_MONSTER))
420 { 536 {
421 if (op->stats.hp > op->stats.maxhp) 537 if (op->stats.hp > op->stats.maxhp)
538 {
422 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 }
423 542
424 /* The archs just need to be updated for this */ 543 /* The archs just need to be updated for this */
425 if (op->move_type == 0) 544 if (op->move_type == 0)
426 op->move_type = MOVE_WALK; 545 op->move_type = MOVE_WALK;
427 } 546 }
… …
751 case KW_path_denied: thawer.get (op->path_denied); break; 870 case KW_path_denied: thawer.get (op->path_denied); break;
752 case KW_invisible: thawer.get (op->invisible); break; 871 case KW_invisible: thawer.get (op->invisible); break;
753 case KW_magic: thawer.get (op->magic); break; 872 case KW_magic: thawer.get (op->magic); break;
754 case KW_state: thawer.get (op->state); break; 873 case KW_state: thawer.get (op->state); break;
755 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;
756 case KW_material: thawer.get (op->material); break; 875 case KW_material: thawer.get (op->materials); break; //TODO: nuke
757 case KW_materialname: thawer.get (op->materialname); break; 876 case KW_materialname: thawer.get (op->materialname); break;
758 877
759 /* These are the new values */ 878 /* These are the new values */
760 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;
761 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;
… …
1023 add_button_link (op, op->map, thawer.get_sint32 ()); 1142 add_button_link (op, op->map, thawer.get_sint32 ());
1024 break; 1143 break;
1025 1144
1026 case KW_randomitems: 1145 case KW_randomitems:
1027 op->randomitems = find_treasurelist (thawer.get_str ()); 1146 op->randomitems = find_treasurelist (thawer.get_str ());
1147 //if (!op->randomitems)
1148 // LOG (llevError, "%s uses unknown randomitems '%s'.\n", op->debug_desc (), thawer.get_str ());
1028 break; 1149 break;
1029 1150
1030 case KW_msg: 1151 case KW_msg:
1031 thawer.get_ml (KW_endmsg, op->msg); 1152 thawer.get_ml (KW_endmsg, op->msg);
1032 //TODO: allow longer messages 1153 //TODO: allow longer messages
… …
1075 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 1196 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1076 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D 1197 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1077 break; 1198 break;
1078 1199
1079 default: 1200 default:
1080 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1201 if (!thawer.parse_error (kw, "object", op->name))
1202 return false;
1081 break; 1203 break;
1082 } 1204 }
1083 } 1205 }
1084} 1206}
1085 1207
… …
1419 f.put (resist_save[i], op->resist[i]); 1541 f.put (resist_save[i], op->resist[i]);
1420 1542
1421 CMP_OUT (path_attuned); 1543 CMP_OUT (path_attuned);
1422 CMP_OUT (path_repelled); 1544 CMP_OUT (path_repelled);
1423 CMP_OUT (path_denied); 1545 CMP_OUT (path_denied);
1424 CMP_OUT (material); 1546 CMP_OUT2 (material, materials);//TODO: nuke
1425 CMP_OUT (materialname); 1547 CMP_OUT (materialname);
1426 CMP_OUT (value); 1548 CMP_OUT (value);
1427 CMP_OUT (carrying); 1549 CMP_OUT (carrying);
1428 CMP_OUT (weight); 1550 CMP_OUT (weight);
1429 CMP_OUT (invisible); 1551 CMP_OUT (invisible);

Diff Legend

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