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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines