ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/material.C
(Generate patch)

Comparing deliantra/server/common/material.C (file contents):
Revision 1.10 by root, Fri Mar 26 01:04:44 2010 UTC vs.
Revision 1.15 by root, Thu May 6 22:35:41 2010 UTC

… …
52}; 52};
53*/ 53*/
54 54
55materialtype_t::materialtype_t () 55materialtype_t::materialtype_t ()
56{ 56{
57 next = 0; 57 next = 0;
58 reset ();
59}
60
61void
62materialtype_t::reset ()
63{
58 name = shstr_unknown; 64 name = shstr_unknown;
59 description = shstr_unknown_material_description; 65 description = shstr_unknown_material_description;
60 material = 0; 66 material = 0;
61 67
62 for (int i = 0; i < NROFATTACKS; i++) 68 for (int i = 0; i < NROFATTACKS; i++)
… …
75 weight = 100; 81 weight = 100;
76 value = 100; 82 value = 100;
77 density = 1000; 83 density = 1000;
78} 84}
79 85
86// create a new material of the given name
87static materialtype_t *
88dummy_material (shstr_tmp name)
89{
90 materialtype_t *mt = new materialtype_t;
91 mt->name = name;
92
93 // make it susceptible to attacks
94 for (int i = 0; i < NROFATTACKS; i++)
95 {
96 mt->save [i] = 10;
97 mt->mod [i] = 9;
98 }
99
100 mt->next = materialt; materialt = mt;
101
102 return mt;
103}
104
105static materialtype_t *
106find (const shstr_tmp name)
107{
108 for (materialtype_t *mt = materialt; mt; mt = mt->next)
109 if (name == mt->name)
110 return mt;
111
112 return 0;
113}
114
80/* convert materialname to materialtype_t */ 115/* convert materialname to materialtype_t */
81materialtype_t * 116materialtype_t *
82name_to_material (const shstr_tmp name) 117name_to_material (const shstr_tmp name)
83{ 118{
84 for (materialtype_t *mt = materialt; mt; mt = mt->next) 119 materialtype_t *mt = find (name);
85 if (name == mt->name)
86 return mt;
87 120
121 if (!mt)
122 {
88 LOG (llevError, "name_to_material called with nonexistent material '%s'\n", &name); 123 LOG (llevError, "name_to_material called with nonexistent material '%s'\n", &name);
89 124 mt = dummy_material (name);
90 // create a new material of the given name
91 materialtype_t *mt = new materialtype_t;
92 mt->name = name;
93
94 // make it susceptible to attacks
95 for (int i = 0; i < NROFATTACKS; i++)
96 { 125 }
97 mt->save [i] = 10;
98 mt->mod [i] = 9;
99 }
100
101 mt->next = materialt; materialt = mt;
102 126
103 return mt; 127 return mt;
128}
129
130void
131object_thawer::get (materialtype_t *&mt) const
132{
133 shstr name;
134 get (name);
135
136 mt = find (name);
137
138 if (!mt)
139 {
140 parse_error (format ("material called %s requested, but not found, creating dummy material.\n", &name));
141 mt = dummy_material (name);
142 }
104} 143}
105 144
106/* when doing transmutation of objects, we have to recheck the resistances, 145/* when doing transmutation of objects, we have to recheck the resistances,
107 * as some that did not apply previously, may apply now. 146 * as some that did not apply previously, may apply now.
108 */ 147 */
… …
190} 229}
191 230
192//-GPL 231//-GPL
193 232
194void 233void
195load_materials () 234reload_materials ()
196{ 235{
197 char filename[MAX_BUF]; 236 object_thawer thawer (settings.datadir, "materials");
198
199 sprintf (filename, "%s/materials", settings.datadir);
200 LOG (llevDebug, "Reading material type data from %s...\n", filename);
201
202 //TODO: somehow free old materials, or update them in-place
203 material_null.next = 0; materialt = &material_null;
204
205 object_thawer thawer (filename);
206 237
207 if (!thawer) 238 if (!thawer)
208 { 239 {
209 LOG (llevError, "Cannot open %s for reading\n", filename); 240 LOG (llevError, "unable to load %s for reading\n", thawer.name);
210 goto done; 241 return;
211 } 242 }
212 243
213 while (thawer.kw != KW_name) 244 while (thawer.kw != KW_name)
214 { 245 {
215 thawer.next (); 246 thawer.next ();
216 247
217 if (thawer.kw == KW_EOF) 248 if (thawer.kw == KW_EOF)
218 goto done; 249 return;
219 } 250 }
220 251
221 materialtype_t *mt; 252 materialtype_t *mt;
222 253
223 for (;;) 254 for (;;)
224 { 255 {
225 switch (thawer.kw) 256 switch (thawer.kw)
226 { 257 {
227 case KW_name: 258 case KW_name:
259 coroapi::cede_to_tick ();
260
261 {
262 // create a new dummy material, or find the existing material
263 shstr name;
264 thawer.get (name);
265
266 mt = find (name);
267
268 if (mt)
269 mt->reset ();
270 else
271 {
228 mt = new materialtype_t; 272 mt = new materialtype_t;
229 thawer.get (mt->name);
230 mt->description = mt->name;
231
232 mt->next = materialt; materialt = mt; 273 mt->next = materialt; materialt = mt;
274 }
275
276 mt->name = name;
277 mt->description = name;
278 }
233 break; 279 break;
234 280
235 case KW_description: 281 case KW_description:
236 thawer.get (mt->description); 282 thawer.get (mt->description);
237 break; 283 break;
… …
294 case KW_weight: thawer.get (mt->weight); break; 340 case KW_weight: thawer.get (mt->weight); break;
295 case KW_value: thawer.get (mt->value); break; 341 case KW_value: thawer.get (mt->value); break;
296 case KW_density: thawer.get (mt->density); break; 342 case KW_density: thawer.get (mt->density); break;
297 343
298 case KW_EOF: 344 case KW_EOF:
299 goto done; 345 return;
300 346
301 default: 347 default:
302 if (!thawer.parse_error ("materials file", "materials")) 348 if (!thawer.parse_error ("materials file"))
303 goto done; 349 return;
304 break; 350 break;
305 } 351 }
306 352
307 thawer.next (); 353 thawer.next ();
308 } 354 }
309
310done:
311 LOG (llevDebug, "Done.\n");
312} 355}
313 356

Diff Legend

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