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.47 by root, Thu Jan 18 19:42:09 2007 UTC vs.
Revision 1.50 by root, Fri Jan 19 18:06:51 2007 UTC

… …
28 28
29 29
30#include <global.h> 30#include <global.h>
31#include <loader.h> 31#include <loader.h>
32#include <sproto.h> 32#include <sproto.h>
33
34// future resource loader base class
35struct loader_base
36{
37 const char *filename;
38 virtual const char *type () const = 0;
39
40 virtual archetype *get_arch (const char *name);
41 virtual void put_arch (archetype *arch);
42
43 virtual object *get_object (const char *name);
44 virtual void put_object (object *op);
45
46 virtual player *get_player ();
47 virtual void put_player (player *pl);
48
49 virtual region *get_region (const char *name);
50 virtual void put_region (region *region);
51
52 virtual facetile *get_face (const char *name);
53 virtual void put_face (facetile *face);
54
55 virtual treasurelist *get_treasure (const char *name, bool one = false);
56 virtual void put_treasure (treasurelist *treasure);
57
58 virtual animation *get_animation (const char *name);
59 virtual void put_animation (animation *anim);
60};
61
62// future generic resource loader
63// handles generic stuff valid in most files, such as
64// animations, treasures, faces and so on
65struct loader_generic : loader_base
66{
67 const char *type () const = 0;
68
69 region *get_region ();
70 void put_region (region *region);
71
72 facetile *get_face (const char *name);
73 void put_face (facetile *face);
74
75 treasurelist *get_treasure (const char *name, bool one = false);
76 void put_treasure (treasurelist *treasure);
77
78 animation *get_animation (const char *name);
79 void put_animation (animation *anim);
80};
81
82// the base class warns about and skips everything
83archetype *
84loader_base::get_arch (const char *name)
85{
86 LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of type %s.\n",
87 filename, name, type ());
88
89 return new archetype;
90}
91
92object *
93loader_base::get_object (const char *name)
94{
95 LOG (llevError, "%s: found object definition '%s', which is not allowed in files of type %s.\n",
96 filename, name, type ());
97
98 return object::create ();
99}
100
101player *
102loader_base::get_player ()
103{
104 LOG (llevError, "%s: found player definition, which is not allowed in files of type %s.\n",
105 filename, type ());
106
107 return player::create ();
108}
109
110region *
111loader_base::get_region (const char *name)
112{
113 LOG (llevError, "%s: found region definition '%s', which is not allowed in files of type %s.\n",
114 filename, name, type ());
115
116 return new region;
117}
118
119facetile *
120loader_base::get_face (const char *name)
121{
122 LOG (llevError, "%s: found face definition '%s', which is not allowed in files of type %s.\n",
123 filename, name, type ());
124
125 return new facetile;
126}
127
128treasurelist *
129loader_base::get_treasure (const char *name, bool one)
130{
131 LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of type %s.\n",
132 filename, name, type ());
133
134 return new treasurelist;//D
135}
136
137animation *
138loader_base::get_animation (const char *name)
139{
140 LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of type %s.\n",
141 filename, name, type ());
142
143 return new animation;
144}
145
146void
147loader_base::put_arch (archetype *arch)
148{
149 delete arch;
150}
151
152void
153loader_base::put_object (object *op)
154{
155 op->destroy ();
156}
157
158void
159loader_base::put_player (player *pl)
160{
161 delete pl;
162}
163
164void
165loader_base::put_region (region *region)
166{
167 delete region;
168}
169
170void
171loader_base::put_face (facetile *face)
172{
173 delete face;
174}
175
176void
177loader_base::put_treasure (treasurelist *treasure)
178{
179 delete treasure;
180}
181
182void
183loader_base::put_animation (animation *anim)
184{
185 delete anim;
186}
33 187
34/* Maps the MOVE_* values to names */ 188/* Maps the MOVE_* values to names */
35static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 189static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
36 190
37/* This table is only necessary to convert objects that existed before the 191/* This table is only necessary to convert objects that existed before the
… …
374 } 528 }
375 529
376 if (QUERY_FLAG (op, FLAG_MONSTER)) 530 if (QUERY_FLAG (op, FLAG_MONSTER))
377 { 531 {
378 if (op->stats.hp > op->stats.maxhp) 532 if (op->stats.hp > op->stats.maxhp)
533 {
379 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 534 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);
535 op->stats.maxhp = op->stats.hp;
536 }
380 537
381 /* The archs just need to be updated for this */ 538 /* The archs just need to be updated for this */
382 if (op->move_type == 0) 539 if (op->move_type == 0)
383 op->move_type = MOVE_WALK; 540 op->move_type = MOVE_WALK;
384 } 541 }

Diff Legend

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