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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.65 by root, Thu Jun 7 18:55:24 2007 UTC vs.
Revision 1.118 by root, Tue Nov 27 18:50:22 2018 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * under the terms of the GNU General Public License as published by the Free 10 * the terms of the Affero GNU General Public License as published by the
10 * Software Foundation; either version 2 of the License, or (at your option) 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, but 14 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the GNU General Public License along 19 * You should have received a copy of the Affero GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 20 * and the GNU General Public License along with this program. If not, see
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 21 * <http://www.gnu.org/licenses/>.
21 * 22 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 23 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 24 */
24 25
25#include <cassert> 26#include <cassert>
27#include <functional>
28
29#include <flat_hash_map.hpp>
26 30
27#include <global.h> 31#include <global.h>
28#include <funcpoint.h>
29#include <loader.h>
30 32
31#include <tr1/functional>
32#include <tr1/unordered_map>
33
34/* The naming of these functions is really poor - they are all
35 * pretty much named '.._arch_...', but they may more may not
36 * return archetypes. Some make the arch_to_object call, and thus
37 * return an object. Perhaps those should be called 'archob' functions
38 * to denote they return an object derived from the archetype.
39 * MSW 2003-04-29
40 */
41
42bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing 33archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
34arch_ptr archetype::empty;
43 35
44// the hashtable 36// the hashtable
45typedef std::tr1::unordered_map 37typedef ska::flat_hash_map
46 < 38 <
47 const char *, 39 const char *,
48 arch_ptr, 40 arch_ptr,
49 str_hash, 41 str_hash,
50 str_equal, 42 str_equal,
51 slice_allocator< std::pair<const char *const, arch_ptr> > 43 slice_allocator< std::pair<const char *const, arch_ptr> >
52 > HT; 44 > HT;
53 45
54static HT ht (5000); 46static HT ht (10000);
55archvec archetypes; 47archvec archetypes;
48static unordered_vector<archetype *> allarch;
49static int dirtycnt;
50
51// the vector of other_arch references to be resolved
52static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref;
53// the vector of loaded but not yet committed archetypes
54static std::vector<archetype *> postponed_arch;
55
56//+GPL
57
58/*
59 * Creates an object. This function is called by archetype::get ()
60 * if it fails to find the appropriate archetype.
61 * Thus archetype::get() will be guaranteed to always return
62 * an object, and never NULL.
63 */
64static object *
65create_singularity (const char *name)
66{
67 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
68
69 if (!strcmp (name, "bug"))
70 abort ();
71
72 object *op = archetype::get (shstr_bug);
73 op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
74
75 return op;
76}
56 77
57/** 78/**
58 * GROS - This function retrieves an archetype given the name that appears 79 * GROS - This function retrieves an archetype given the name that appears
59 * during the game (for example, "writing pen" instead of "stylus"). 80 * during the game (for example, "writing pen" instead of "stylus").
60 * It does not use the hashtable system, but browse the whole archlist each time. 81 * It does not use the hashtable system, but browse the whole archlist each time.
69find_archetype_by_object_name (const char *name) 90find_archetype_by_object_name (const char *name)
70{ 91{
71 shstr_cmp name_cmp (name); 92 shstr_cmp name_cmp (name);
72 93
73 for_all_archetypes (at) 94 for_all_archetypes (at)
74 if (at->archname == name_cmp) 95 if (at->name == name_cmp)
75 return at; 96 return at;
76 97
77 return 0; 98 return 0;
78} 99}
79 100
86find_archetype_by_object_type_name (int type, const char *name) 107find_archetype_by_object_type_name (int type, const char *name)
87{ 108{
88 shstr_cmp name_cmp (name); 109 shstr_cmp name_cmp (name);
89 110
90 for_all_archetypes (at) 111 for_all_archetypes (at)
91 if (at->archname == name_cmp && at->type == type) 112 if (at->name == name_cmp && at->type == type)
92 return at; 113 return at;
93 114
94 return 0; 115 return 0;
95} 116}
96 117
104{ 125{
105 shstr_cmp skill_cmp (skill); 126 shstr_cmp skill_cmp (skill);
106 127
107 for_all_archetypes (at) 128 for_all_archetypes (at)
108 if (at->skill == skill_cmp && (type == -1 || type == at->type)) 129 if (at->skill == skill_cmp && (type == -1 || type == at->type))
109 return arch_to_object (at); 130 return at->instance ();
110 131
111 return 0; 132 return 0;
112} 133}
113 134
114/* similiar to above - this returns the first archetype 135/* similiar to above - this returns the first archetype
135 * - name: The name we're searching for (ex: "writing pen"); 156 * - name: The name we're searching for (ex: "writing pen");
136 * Return value: 157 * Return value:
137 * - a corresponding object if found; a singularity object if not found. 158 * - a corresponding object if found; a singularity object if not found.
138 * Note by MSW - it appears that it takes the full name and keeps 159 * Note by MSW - it appears that it takes the full name and keeps
139 * shortening it until it finds a match. I re-wrote this so that it 160 * shortening it until it finds a match. I re-wrote this so that it
140 * doesn't malloc it each time - not that this function is used much, 161 * doesn't allocate it each time - not that this function is used much,
141 * but it otherwise had a big memory leak. 162 * but it otherwise had a big memory leak.
142 */ 163 */
143object * 164object *
144get_archetype_by_object_name (const char *name) 165get_archetype_by_object_name (const char *name)
145{ 166{
146 char tmpname[MAX_BUF]; 167 char tmpname[MAX_BUF];
147 int i;
148 168
149 assign (tmpname, name); 169 assign (tmpname, name);
150 170
151 for (i = strlen (tmpname); i > 0; i--) 171 for (int i = strlen (tmpname); i > 0; i--)
152 { 172 {
153 tmpname[i] = 0; 173 tmpname[i] = 0;
154 174
155 if (archetype *at = find_archetype_by_object_name (tmpname)) 175 if (archetype *at = find_archetype_by_object_name (tmpname))
156 return arch_to_object (at); 176 return at->instance ();
157 } 177 }
158 178
159 return create_singularity (name); 179 return create_singularity (name);
160} 180}
161 181
193 /* All is a very generic match - low match value */ 213 /* All is a very generic match - low match value */
194 if (!strcmp (cp, "all")) 214 if (!strcmp (cp, "all"))
195 return 1; 215 return 1;
196 216
197 /* unpaid is a little more specific */ 217 /* unpaid is a little more specific */
198 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) 218 if (!strcmp (cp, "unpaid") && op->flag [FLAG_UNPAID])
199 return 2; 219 return 2;
200 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 220
221 if (!strcmp (cp, "cursed") && op->flag [FLAG_KNOWN_CURSED] && (op->flag [FLAG_CURSED] || op->flag [FLAG_DAMNED]))
201 return 2; 222 return 2;
202 223
203 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) 224 if (!strcmp (cp, "unlocked") && !op->flag [FLAG_INV_LOCKED])
204 return 2; 225 return 2;
205 226
206 /* Allow for things like '100 arrows' */ 227 /* Allow for things like '100 arrows' */
207 if ((count = atoi (cp)) != 0) 228 if ((count = atoi (cp)) != 0)
208 { 229 {
226 * is because of the 'else' handling - we don't want to match on 247 * is because of the 'else' handling - we don't want to match on
227 * something and set a low retval, even though it may match a higher retcal 248 * something and set a low retval, even though it may match a higher retcal
228 * later. So keep it in descending order here, so we try for the best 249 * later. So keep it in descending order here, so we try for the best
229 * match first, and work downward. 250 * match first, and work downward.
230 */ 251 */
252 const char *qbn0, *qbn1, *qsn; // query base name/short name caches
253
231 if (!strcasecmp (cp, query_name (op))) 254 if (!strcasecmp (cp, query_name (op)))
232 retval = 20; 255 retval = 20;
233 else if (!strcasecmp (cp, query_short_name (op))) 256 else if (!strcasecmp (cp, qsn = query_short_name (op)))
234 retval = 18; 257 retval = 18;
235 else if (!strcasecmp (cp, query_base_name (op, 0))) 258 else if (!strcasecmp (cp, qbn0 = query_base_name (op, 0)))
236 retval = 16; 259 retval = 16;
237 else if (!strcasecmp (cp, query_base_name (op, 1))) 260 else if (!strcasecmp (cp, qbn1 = query_base_name (op, 1)))
238 retval = 16; 261 retval = 16;
239 else if (op->custom_name && !strcasecmp (cp, op->custom_name)) 262 else if (op->custom_name && !strcasecmp (cp, op->custom_name))
240 retval = 15; 263 retval = 15;
241 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 264 else if (!strncasecmp (cp, qbn0, strlen (cp)))
242 retval = 14; 265 retval = 14;
243 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 266 else if (!strncasecmp (cp, qbn1, strlen (cp)))
244 retval = 14; 267 retval = 14;
245 /* Do substring checks, so things like 'Str+1' will match. 268 /* Do substring checks, so things like 'Str+1' will match.
246 * retval of these should perhaps be lower - they are lower 269 * retval of these should perhaps be lower - they are lower
247 * then the specific strcasecmp aboves, but still higher than 270 * then the specific strcasecmp aboves, but still higher than
248 * some other match criteria. 271 * some other match criteria.
249 */ 272 */
250 else if (strstr (query_base_name (op, 1), cp)) 273 else if (strstr (qbn1, cp))
251 retval = 12; 274 retval = 12;
252 else if (strstr (query_base_name (op, 0), cp)) 275 else if (strstr (qbn0, cp))
253 retval = 12; 276 retval = 12;
254 else if (strstr (query_short_name (op), cp)) 277 else if (strstr (qsn, cp))
255 retval = 12; 278 retval = 12;
256 /* Check against plural/non plural based on count. */ 279 /* Check against plural/non plural based on count. */
257 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 280 else if (count > 1 && !strcasecmp (cp, op->name_pl))
258 retval = 6; 281 retval = 6;
259 else if (count == 1 && !strcasecmp (op->name, cp)) 282 else if (count == 1 && !strcasecmp (op->name, cp))
260 retval = 6; 283 retval = 6;
261 /* base name matched - not bad */ 284 /* base name matched - not bad */
262 else if (strcasecmp (cp, op->name) == 0 && !count) 285 else if (strcasecmp (cp, op->name) == 0 && !count)
263 retval = 4; 286 retval = 4;
264 /* Check for partial custom name, but give a real low priority */ 287 /* Check for partial custom name, but give a real low priority */
265 else if (op->custom_name && strstr (op->custom_name, cp)) 288 else if (op->custom_name.contains (cp))
266 retval = 3; 289 retval = 3;
267 290
268 if (retval) 291 if (retval)
269 { 292 {
270 if (pl->type == PLAYER) 293 if (pl->type == PLAYER)
275 } 298 }
276 299
277 return 0; 300 return 0;
278} 301}
279 302
303//-GPL
304
305void
306archetype::do_delete ()
307{
308 delete this;
309}
310
280archetype::archetype (const char *name) 311archetype::archetype (const char *name)
281{ 312{
282 stub = true;
283 arch = this; 313 arch = this;
284 this->archname = this->name = this->name_pl = name; 314 this->archname = this->name = this->name_pl = name;
285} 315}
286 316
287archetype::~archetype () 317archetype::~archetype ()
290} 320}
291 321
292void 322void
293archetype::link () 323archetype::link ()
294{ 324{
295 ht.insert (std::make_pair (archname, this));
296
297 if (!archetypes.contains (this)) 325 if (!archetypes.contains (this))
326 {
298 archetypes.insert (this); 327 archetypes.insert (this);
328 ht.insert (std::make_pair (archname, this));
329 }
299} 330}
300 331
301void 332void
302archetype::unlink () 333archetype::unlink ()
303{ 334{
304 ht.erase (archname);
305 if (!strcmp (&archname, "Gaea")) fprintf (stderr, "oI\n");//D
306 if (archetypes.contains (this)) 335 if (archetypes.contains (this))
336 {
307 archetypes.erase (this); 337 archetypes.erase (this);
338 ht.erase (archname);
339 }
308} 340}
309 341
310/* 342/*
311 * Finds, using the hashtable, which archetype matches the given name. 343 * Finds, using the hashtable, which archetype matches the given name.
312 * returns a pointer to the found archetype, otherwise NULL. 344 * returns a pointer to the found archetype, otherwise NULL.
323 return 0; 355 return 0;
324 else 356 else
325 return i->second; 357 return i->second;
326} 358}
327 359
328archetype * 360void
329archetype::get (const char *name) 361archetype::post_load_check ()
330{ 362{
331 if (!name) 363 assert (("obj_original MUST NOT be set for archetypes", !flag [FLAG_OBJ_ORIGINAL]));
332 {
333 LOG (llevError, "null archetype requested\n");
334 name = "(null)";
335 }
336 364
337 archetype *at = find (name); 365 if (type == SKILL)
366 add_skill_archetype (this);
338 367
339 if (!at) 368 object::post_load_check ();
340 {
341 at = new archetype (name);
342 at->link ();
343 }
344
345 return at;
346} 369}
347 370
348archetype * 371archetype *
349archetype::read (object_thawer &f) 372archetype::read (object_thawer &f)
350{ 373{
351 assert (f.kw == KW_object); 374 assert (f.kw == KW_object);
352 375
353 loading_arch = true; // hack to tell parse_kv et al. to behave
354
355 std::vector<archetype *> parts; 376 std::vector<archetype *> parts;
356 377
357 coroapi::cede_to_tick_every (10); 378 coroapi::cede_to_tick ();
358 379
359 for (;;) 380 for (;;)
360 { 381 {
361 // the archetype might have been referenced earlier
362 // so try to find an existing stub archetype first
363 archetype *at = find (f.get_str ()); 382 archetype *at = new archetype (f.get_str ());
364
365 if (!at || !at->stub)
366 at = new archetype (f.get_str ());
367 383
368 f.next (); 384 f.next ();
369 385
370#if 0 386#if 0
371 // implementing it here in the server does neither allow multiple inheritence 387 // implementing it here in the server does neither allow multiple inheritence
372 // nor does it cleanly "just override". it would allow use in map files, though, 388 // nor does it cleanly "just override". it would allow use in map files, though,
373 // and other resource files dynamically laoded (as opposed to being preprocessed). 389 // and other resource files dynamically loaded (as opposed to being preprocessed).
374 // not that any of this is relevant as of yet... 390 // not that any of this is relevant as of yet...
375 if (f.kw == KW_inherit) 391 if (f.kw == KW_inherit)
376 { 392 {
377 if (archetype *at = find (f.get_str ())) 393 if (archetype *at = find (f.get_str ()))
378 *op = at->clone; 394 *op = at->clone;
382 398
383 f.next (); 399 f.next ();
384 } 400 }
385#endif 401#endif
386 402
403 loading_arch = at; // hack to tell parse_kv et al. to behave
404 bool parse_ok = at->parse_kv (f);
405 loading_arch = 0;
406
387 if (!at->parse_kv (f)) 407 if (!parse_ok)
388 goto fail; 408 goto fail;
389 409
410 loading_arch = at; // hack to tell parse_kv et al. to behave
390 at->post_load_check (); 411 at->post_load_check ();
412 loading_arch = 0;
391 413
392 parts.push_back (at); 414 parts.push_back (at);
393 415
394 if (f.kw != KW_more) 416 if (f.kw != KW_more)
395 break; 417 break;
401 f.parse_error ("more object"); 423 f.parse_error ("more object");
402 goto fail; 424 goto fail;
403 } 425 }
404 } 426 }
405 427
406 loading_arch = false;
407
408 { 428 {
409 auto (at, parts.begin ());
410
411 archetype *new_head = parts.front (); 429 archetype *new_head = parts.front ();
412 archetype *old_head = find (new_head->archname); 430 archetype *old_head = find (new_head->archname);
413 431
414 if (old_head && !old_head->is_head ()) 432 if (old_head && !old_head->is_head ())
415 { 433 {
417 &new_head->archname, &old_head->archname); 435 &new_head->archname, &old_head->archname);
418 goto fail; 436 goto fail;
419 } 437 }
420 438
421 // check that all archetypes belong to the same old object or are new 439 // check that all archetypes belong to the same old object or are new
422 for (auto (at, parts.begin ()); at != parts.end (); ++at) 440 for (auto &&at : parts)
423 { 441 {
424 archetype *new_part = *at; 442 archetype *new_part = at;
425 archetype *old_part = find (new_part->archname); 443 archetype *old_part = find (new_part->archname);
426 444
427 if (old_part && old_part->head_ () != old_head) 445 if (old_part && old_part->head_ () != old_head)
428 { 446 {
429 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n", 447 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
430 &new_part->archname, &((archetype *)old_part->head_ ())->archname); 448 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
431 goto fail; 449 goto fail;
432 } 450 }
433 } 451 }
434 452
435 // deactivate existing archetype
436 for (archetype *at = old_head; at; at = (archetype *)at->more)
437 at->unlink ();
438
439 // assemble new chain 453 // assemble new chain
440 new_head->min_x = new_head->max_x = new_head->x; 454 new_head->max_x = new_head->x;
441 new_head->min_y = new_head->max_y = new_head->y;
442 455
443 archetype *less = new_head; 456 archetype *less = new_head;
444 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 457 for (auto &&p = parts.begin () + 1; p != parts.end (); ++p)
445 { 458 {
446 archetype *at = *p; 459 archetype *at = *p;
447 460
448 if (at->x < new_head->min_x) new_head->min_x = at->x; 461 // some flags get inherited from the head (probably a lot more)
449 if (at->y < new_head->min_y) new_head->min_y = at->y; 462 // doing it here doesn't feel too cozy, but it allows code
463 // to ignore head checks for these flags, which saves time
464 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
465 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
466 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
467 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
468
450 if (at->x > new_head->max_x) new_head->max_x = at->x; 469 new_head->max_x = max (new_head->max_x, at->x);
451 if (at->y > new_head->max_y) new_head->max_y = at->y;
452 470
453 at->head = new_head; 471 at->head = new_head;
454 less->more = at; 472 less->more = at;
455 less = at; 473 less = at;
456 } 474 }
457 475
458 // now activate it 476 postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
459 for (auto (p, parts.begin ()); p != parts.end (); ++p)
460 {
461 archetype *at = *p;
462 at->stub = false;
463 at->link ();
464 }
465 477
466 return new_head; 478 return new_head;
467 } 479 }
468 480
469fail: 481fail:
470 for (auto (p, parts.begin ()); p != parts.end (); ++p) 482 for (auto &&at : parts)
471 (*p)->destroy (true); 483 at->destroy ();
472 484
473 loading_arch = false;
474 return 0; 485 return 0;
475} 486}
476 487
477/*
478 * Initialize global archtype pointers:
479 */
480void 488void
481init_archetype_pointers () 489archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
482{ 490{
483 ring_arch = archetype::find ("ring"); 491 ref = 0;
484 amulet_arch = archetype::find ("amulet"); 492 postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
485 staff_arch = archetype::find ("staff");
486 crown_arch = archetype::find ("crown");
487 empty_archetype = archetype::find ("empty_archetype");
488} 493}
489 494
490/* 495void
491 * Creates and returns a new object which is a copy of the given archetype. 496archetype::commit_load ()
492 * This function returns NULL on failure. 497{
493 */ 498 // unlink old archetypes and link in new ones */
499 for (auto &&at : postponed_arch)
500 {
501 if (archetype *old = find (at->archname))
502 old->unlink ();
503
504 allarch.push_back (at);
505
506 at->link ();
507 ++dirtycnt;
508 }
509
510 postponed_arch.clear ();
511
512 // now resolve arch references
513 for (auto &&p : postponed_arch_ref) // not yet C++17
514 {
515 arch_ptr *ap = p.first;
516 archetype *at = find (p.second);
517
518 if (!at)
519 LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p.second);
520
521 *ap = at;
522 }
523
524 postponed_arch_ref.clear ();
525
526 empty = find (shstr_empty_archetype);
527}
528
529void
530archetype::gc ()
531{
532 int cnt = max (1, min<int> (allarch.size () / 128, dirtycnt));
533 dirtycnt = max (0, dirtycnt - cnt);
534
535 do
536 {
537 static int idx;
538
539 if (idx >= allarch.size ())
540 if (idx)
541 idx = 0;
542 else
543 return;
544
545 archetype *at = allarch [idx];
546
547 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
548 ++idx;
549 else
550 {
551 //LOG (llevDebug, "garbage collect arch %s", &at->archname);
552 assert (at->arch == at); // verify that refcnt == 1 is truly valid
553 allarch.erase (idx);
554
555 // break chain
556 for (object *op = at->head_ (); op; )
557 {
558 object *next = op->more;
559 op->head = 0;
560 op->more = 0;
561 op = next;
562 }
563
564 at->destroy ();
565 at->arch = 0;
566 }
567 }
568 while (--cnt);
569}
570
494object * 571object *
495arch_to_object (archetype *at) 572archetype::instance ()
496{ 573{
497 if (!at)
498 {
499 LOG (llevError, "Couldn't find archetype.\n");
500 return 0;
501 }
502
503 object *op = at->clone (); 574 object *op = clone ();
504 op->arch = at;
505 op->instantiate (); 575 op->instantiate ();
506
507 return op; 576 return op;
508} 577}
509 578
510/* 579//+GPL
511 * Creates an object. This function is called by get_archetype()
512 * if it fails to find the appropriate archetype.
513 * Thus get_archetype() will be guaranteed to always return
514 * an object, and never NULL.
515 */
516object *
517create_singularity (const char *name)
518{
519 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
520
521 if (!strcmp (name, "bug"))
522 abort ();
523
524 char buf[MAX_BUF];
525 sprintf (buf, "bug, please report (%s)", ARCH_SINGULARITY, name);
526
527 object *op = get_archetype ("bug");
528 op->name = op->name_pl = buf;
529
530 return op;
531}
532 580
533/* 581/*
534 * Finds which archetype matches the given name, and returns a new 582 * Finds which archetype matches the given name, and returns a new
535 * object containing a copy of the archetype. 583 * object containing a copy of the archetype.
536 */ 584 */
537object * 585object *
538get_archetype (const char *name) 586archetype::get (const char *name)
539{ 587{
540 archetype *at = archetype::find (name); 588 archetype *at = find (name);
541 589
542 if (!at) 590 if (!at)
543 return create_singularity (name); 591 return create_singularity (name);
544 592
545 return arch_to_object (at); 593 return at->instance ();
546} 594}
547 595
548/* 596/*
549 * Returns the first archetype using the given type. 597 * Returns the first archetype using the given type.
550 * Used in treasure-generation. 598 * Used in treasure-generation.
551 */ 599 */
552archetype * 600static archetype *
553type_to_archetype (int type) 601type_to_archetype (int type)
554{ 602{
555 for_all_archetypes (at) 603 for_all_archetypes (at)
556 if (at->type == type && at->head_ () != at) 604 if (at->type == type && at->head_ () != at)
557 return at; 605 return at;
565 * Used in treasure-generation. 613 * Used in treasure-generation.
566 */ 614 */
567object * 615object *
568clone_arch (int type) 616clone_arch (int type)
569{ 617{
570 archetype *at; 618 archetype *at = type_to_archetype (type);
571 619
572 if ((at = type_to_archetype (type)) == NULL) 620 if (!at)
573 { 621 {
574 LOG (llevError, "Can't clone archetype %d\n", type); 622 LOG (llevError, "Can't clone archetype %d\n", type);
575 return 0; 623 return 0;
576 } 624 }
577 625
578 object *op = at->clone (); 626 return at->instance ();
579 op->instantiate ();
580 return op;
581} 627}
582 628
583/* 629/*
584 * member: make instance from class 630 * member: make instance from class
585 */ 631 */
588{ 634{
589 object *op, *prev = 0, *head = 0; 635 object *op, *prev = 0, *head = 0;
590 636
591 while (at) 637 while (at)
592 { 638 {
593 op = arch_to_object (at); 639 op = at->instance ();
594 640
595 op->x = at->x; 641 op->x = at->x;
596 op->y = at->y; 642 op->y = at->y;
597 643
598 if (head) 644 if (head)
606 } 652 }
607 653
608 return head; 654 return head;
609} 655}
610 656
657//-GPL
658

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines