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.13 by root, Wed Apr 28 19:49:50 2010 UTC vs.
Revision 1.20 by root, Wed Nov 16 23:41:59 2016 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <material.h> 26#include <material.h>
… …
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 () 234_reload_materials ()
196{ 235{
197 //TODO: somehow free old materials, or update them in-place
198 // currently we effectively leak them.
199 material_null.next = 0; materialt = &material_null;
200
201 object_thawer thawer (settings.datadir, "materials"); 236 object_thawer thawer (settings.datadir, "materials");
202 237
203 if (!thawer) 238 if (!thawer)
204 { 239 {
205 LOG (llevError, "Cannot open %s for reading\n", thawer.name); 240 LOG (llevError, "unable to load %s for reading\n", thawer.name);
206 goto done; 241 return;
207 } 242 }
208 243
209 while (thawer.kw != KW_name) 244 while (thawer.kw != KW_name)
210 { 245 {
211 thawer.next (); 246 thawer.next ();
212 247
213 if (thawer.kw == KW_EOF) 248 if (thawer.kw == KW_EOF)
214 goto done; 249 return;
215 } 250 }
216 251
217 materialtype_t *mt; 252 materialtype_t *mt;
218 253
219 for (;;) 254 for (;;)
220 { 255 {
221 switch (thawer.kw) 256 switch (thawer.kw)
222 { 257 {
223 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 {
224 mt = new materialtype_t; 272 mt = new materialtype_t;
225 thawer.get (mt->name);
226 mt->description = mt->name;
227
228 mt->next = materialt; materialt = mt; 273 mt->next = materialt; materialt = mt;
274 }
275
276 mt->name = name;
277 mt->description = name;
278 }
229 break; 279 break;
230 280
231 case KW_description: 281 case KW_description:
232 thawer.get (mt->description); 282 thawer.get (mt->description);
233 break; 283 break;
… …
290 case KW_weight: thawer.get (mt->weight); break; 340 case KW_weight: thawer.get (mt->weight); break;
291 case KW_value: thawer.get (mt->value); break; 341 case KW_value: thawer.get (mt->value); break;
292 case KW_density: thawer.get (mt->density); break; 342 case KW_density: thawer.get (mt->density); break;
293 343
294 case KW_EOF: 344 case KW_EOF:
295 goto done; 345 return;
296 346
297 default: 347 default:
298 if (!thawer.parse_error ("materials file")) 348 if (!thawer.parse_error ("materials file"))
299 goto done; 349 return;
300 break; 350 break;
301 } 351 }
302 352
303 thawer.next (); 353 thawer.next ();
304 } 354 }
305
306done:
307 LOG (llevDebug, "Done.\n");
308} 355}
309 356

Diff Legend

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