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.57 by root, Sat Feb 10 01:52:25 2007 UTC vs.
Revision 1.58 by root, Thu Feb 15 21:07:48 2007 UTC

… …
27 variable. */ 27 variable. */
28 28
29#include <global.h> 29#include <global.h>
30#include <loader.h> 30#include <loader.h>
31#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 32
191///////////////////////////////////////////////////////////////////////////// 33/////////////////////////////////////////////////////////////////////////////
192 34
193/* Maps the MOVE_* values to names */ 35/* Maps the MOVE_* values to names */
194static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 36static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
… …
644 bool ismore = 0; 486 bool ismore = 0;
645 object *op_inv = op->inv; 487 object *op_inv = op->inv;
646 488
647 for (;;) 489 for (;;)
648 { 490 {
649 keyword kw = thawer.get_kv (); 491 switch (thawer.get_kv ())
650
651 switch (kw)
652 { 492 {
653 case KW_Object: // uppercase alias 493 case KW_Object: // uppercase alias
654 case KW_object: 494 case KW_object:
655 thawer.get (op->name); 495 thawer.get (op->name);
656 496
… …
1177 1017
1178 case KW_EOF: 1018 case KW_EOF:
1179 return LL_EOF; 1019 return LL_EOF;
1180 1020
1181 case KW_ERROR: 1021 case KW_ERROR:
1182 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 1022 set_ob_key_value (op, thawer.kw_str, thawer.value, true);
1183 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D 1023 //fprintf (stderr, "addkv(%s,%s)\n", thawer.kw_str, thawer.value);//D
1184 break; 1024 break;
1185 1025
1186 default: 1026 default:
1187 if (!thawer.parse_error (kw, "object", op->name)) 1027 if (!thawer.parse_error ("object", op->name))
1188 return false; 1028 return false;
1189 break; 1029 break;
1190 } 1030 }
1191 } 1031 }
1192} 1032}
… …
1614 1454
1615 fp.put (op); 1455 fp.put (op);
1616 fp.put (KW_end); 1456 fp.put (KW_end);
1617} 1457}
1618 1458
1459/////////////////////////////////////////////////////////////////////////////
1460
1461bool load_resource_file (const char *filename)
1462{
1463 object_thawer f (filename);
1464
1465 f.next_kv ();
1466
1467 for (;;)
1468 {
1469 switch (f.kw)
1470 {
1471 case KW_region:
1472 if (!region::load (f))
1473 return false;
1474 break;
1475
1476 case KW_EOF:
1477 return true;
1478
1479 default:
1480 if (!f.parse_error ("resource file"))
1481 return false;
1482 }
1483
1484 f.next_kv ();
1485 }
1486}
1487

Diff Legend

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