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.72 by root, Wed Apr 2 11:13:51 2008 UTC vs.
Revision 1.119 by root, Sat Dec 1 20:22:12 2018 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra is free software: you can redistribute it and/or modify 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 10 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License 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 19 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 20 * and the GNU General Public License along with this program. If not, see
21 * <http://www.gnu.org/licenses/>.
20 * 22 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 24 */
23 25
24#include <cassert> 26#include <cassert>
27#include <functional>
28
29#include <flat_hash_map.hpp>
25 30
26#include <global.h> 31#include <global.h>
27#include <funcpoint.h>
28#include <loader.h>
29 32
30#include <tr1/functional>
31#include <tr1/unordered_map>
32
33/* The naming of these functions is really poor - they are all
34 * pretty much named '.._arch_...', but they may more may not
35 * return archetypes. Some make the arch_to_object call, and thus
36 * return an object. Perhaps those should be called 'archob' functions
37 * to denote they return an object derived from the archetype.
38 * MSW 2003-04-29
39 */
40
41archetype *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;
42 35
43// the hashtable 36// the hashtable
44typedef std::tr1::unordered_map 37typedef ska::flat_hash_map
45 < 38 <
46 const char *, 39 const char *,
47 arch_ptr, 40 arch_ptr,
48 str_hash, 41 str_hash,
49 str_equal, 42 str_equal,
50 slice_allocator< std::pair<const char *const, arch_ptr> > 43 slice_allocator< std::pair<const char *const, arch_ptr> >
51 > HT; 44 > HT;
52 45
53static HT ht (5000); 46static HT ht (10000);
54archvec 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}
55 77
56/** 78/**
57 * GROS - This function retrieves an archetype given the name that appears 79 * GROS - This function retrieves an archetype given the name that appears
58 * during the game (for example, "writing pen" instead of "stylus"). 80 * during the game (for example, "writing pen" instead of "stylus").
59 * 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.
… …
103{ 125{
104 shstr_cmp skill_cmp (skill); 126 shstr_cmp skill_cmp (skill);
105 127
106 for_all_archetypes (at) 128 for_all_archetypes (at)
107 if (at->skill == skill_cmp && (type == -1 || type == at->type)) 129 if (at->skill == skill_cmp && (type == -1 || type == at->type))
108 return arch_to_object (at); 130 return at->instance ();
109 131
110 return 0; 132 return 0;
111} 133}
112 134
113/* similiar to above - this returns the first archetype 135/* similiar to above - this returns the first archetype
… …
134 * - name: The name we're searching for (ex: "writing pen"); 156 * - name: The name we're searching for (ex: "writing pen");
135 * Return value: 157 * Return value:
136 * - a corresponding object if found; a singularity object if not found. 158 * - a corresponding object if found; a singularity object if not found.
137 * 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
138 * 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
139 * 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,
140 * but it otherwise had a big memory leak. 162 * but it otherwise had a big memory leak.
141 */ 163 */
142object * 164object *
143get_archetype_by_object_name (const char *name) 165get_archetype_by_object_name (const char *name)
144{ 166{
145 char tmpname[MAX_BUF]; 167 char tmpname[MAX_BUF];
146 int i;
147 168
148 assign (tmpname, name); 169 assign (tmpname, name);
149 170
150 for (i = strlen (tmpname); i > 0; i--) 171 for (int i = strlen (tmpname); i > 0; i--)
151 { 172 {
152 tmpname[i] = 0; 173 tmpname[i] = 0;
153 174
154 if (archetype *at = find_archetype_by_object_name (tmpname)) 175 if (archetype *at = find_archetype_by_object_name (tmpname))
155 return arch_to_object (at); 176 return at->instance ();
156 } 177 }
157 178
158 return create_singularity (name); 179 return create_singularity (name);
159} 180}
160 181
… …
192 /* All is a very generic match - low match value */ 213 /* All is a very generic match - low match value */
193 if (!strcmp (cp, "all")) 214 if (!strcmp (cp, "all"))
194 return 1; 215 return 1;
195 216
196 /* unpaid is a little more specific */ 217 /* unpaid is a little more specific */
197 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) 218 if (!strcmp (cp, "unpaid") && op->flag [FLAG_UNPAID])
198 return 2; 219 return 2;
199 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]))
200 return 2; 222 return 2;
201 223
202 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) 224 if (!strcmp (cp, "unlocked") && !op->flag [FLAG_INV_LOCKED])
203 return 2; 225 return 2;
204 226
205 /* Allow for things like '100 arrows' */ 227 /* Allow for things like '100 arrows' */
206 if ((count = atoi (cp)) != 0) 228 if ((count = atoi (cp)) != 0)
207 { 229 {
… …
225 * 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
226 * 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
227 * 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
228 * match first, and work downward. 250 * match first, and work downward.
229 */ 251 */
252 const char *qbn0, *qbn1, *qsn; // query base name/short name caches
253
230 if (!strcasecmp (cp, query_name (op))) 254 if (!strcasecmp (cp, query_name (op)))
231 retval = 20; 255 retval = 20;
232 else if (!strcasecmp (cp, query_short_name (op))) 256 else if (!strcasecmp (cp, qsn = query_short_name (op)))
233 retval = 18; 257 retval = 18;
234 else if (!strcasecmp (cp, query_base_name (op, 0))) 258 else if (!strcasecmp (cp, qbn0 = query_base_name (op, 0)))
235 retval = 16; 259 retval = 16;
236 else if (!strcasecmp (cp, query_base_name (op, 1))) 260 else if (!strcasecmp (cp, qbn1 = query_base_name (op, 1)))
237 retval = 16; 261 retval = 16;
238 else if (op->custom_name && !strcasecmp (cp, op->custom_name)) 262 else if (op->custom_name && !strcasecmp (cp, op->custom_name))
239 retval = 15; 263 retval = 15;
240 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 264 else if (!strncasecmp (cp, qbn0, strlen (cp)))
241 retval = 14; 265 retval = 14;
242 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 266 else if (!strncasecmp (cp, qbn1, strlen (cp)))
243 retval = 14; 267 retval = 14;
244 /* Do substring checks, so things like 'Str+1' will match. 268 /* Do substring checks, so things like 'Str+1' will match.
245 * retval of these should perhaps be lower - they are lower 269 * retval of these should perhaps be lower - they are lower
246 * then the specific strcasecmp aboves, but still higher than 270 * then the specific strcasecmp aboves, but still higher than
247 * some other match criteria. 271 * some other match criteria.
248 */ 272 */
249 else if (strstr (query_base_name (op, 1), cp)) 273 else if (strstr (qbn1, cp))
250 retval = 12; 274 retval = 12;
251 else if (strstr (query_base_name (op, 0), cp)) 275 else if (strstr (qbn0, cp))
252 retval = 12; 276 retval = 12;
253 else if (strstr (query_short_name (op), cp)) 277 else if (strstr (qsn, cp))
254 retval = 12; 278 retval = 12;
255 /* Check against plural/non plural based on count. */ 279 /* Check against plural/non plural based on count. */
256 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 280 else if (count > 1 && !strcasecmp (cp, op->name_pl))
257 retval = 6; 281 retval = 6;
258 else if (count == 1 && !strcasecmp (op->name, cp)) 282 else if (count == 1 && !strcasecmp (op->name, cp))
259 retval = 6; 283 retval = 6;
260 /* base name matched - not bad */ 284 /* base name matched - not bad */
261 else if (strcasecmp (cp, op->name) == 0 && !count) 285 else if (strcasecmp (cp, op->name) == 0 && !count)
262 retval = 4; 286 retval = 4;
263 /* Check for partial custom name, but give a real low priority */ 287 /* Check for partial custom name, but give a real low priority */
264 else if (op->custom_name && strstr (op->custom_name, cp)) 288 else if (op->custom_name.contains (cp))
265 retval = 3; 289 retval = 3;
266 290
267 if (retval) 291 if (retval)
268 { 292 {
269 if (pl->type == PLAYER) 293 if (pl->type == PLAYER)
… …
274 } 298 }
275 299
276 return 0; 300 return 0;
277} 301}
278 302
303//-GPL
304
305void
306archetype::do_delete ()
307{
308 delete this;
309}
310
279archetype::archetype (const char *name) 311archetype::archetype (const char *name)
280{ 312{
281 stub = true;
282 arch = this; 313 arch = this;
283 this->archname = this->name = this->name_pl = name; 314 this->archname = this->name = this->name_pl = name;
284} 315}
285 316
286archetype::~archetype () 317archetype::~archetype ()
… …
289} 320}
290 321
291void 322void
292archetype::link () 323archetype::link ()
293{ 324{
294 ht.insert (std::make_pair (archname, this));
295
296 if (!archetypes.contains (this)) 325 if (!archetypes.contains (this))
326 {
297 archetypes.insert (this); 327 archetypes.insert (this);
328 ht.insert (std::make_pair (archname, this));
329 }
298} 330}
299 331
300void 332void
301archetype::unlink () 333archetype::unlink ()
302{ 334{
303 ht.erase (archname);
304
305 if (archetypes.contains (this)) 335 if (archetypes.contains (this))
336 {
306 archetypes.erase (this); 337 archetypes.erase (this);
338 ht.erase (archname);
339 }
307} 340}
308 341
309/* 342/*
310 * Finds, using the hashtable, which archetype matches the given name. 343 * Finds, using the hashtable, which archetype matches the given name.
311 * returns a pointer to the found archetype, otherwise NULL. 344 * returns a pointer to the found archetype, otherwise NULL.
… …
314archetype::find (const char *name) 347archetype::find (const char *name)
315{ 348{
316 if (!name) 349 if (!name)
317 return 0; 350 return 0;
318 351
319 auto (i, ht.find (name)); 352 auto i = ht.find (name);
320 353
321 if (i == ht.end ()) 354 if (i == ht.end ())
322 return 0; 355 return 0;
323 else 356 else
324 return i->second; 357 return i->second;
325} 358}
326 359
327archetype * 360void
328archetype::get (const char *name) 361archetype::post_load_check ()
329{ 362{
330 if (!name) 363 assert (("obj_original MUST NOT be set for archetypes", !flag [FLAG_OBJ_ORIGINAL]));
331 {
332 LOG (llevError, "null archetype requested\n");
333 name = "(null)";
334 }
335 364
336 if (loading_arch && !strcmp (&loading_arch->archname, name)) 365 if (type == SKILL)
337 return loading_arch; 366 add_skill_archetype (this);
338 367
339 archetype *at = find (name); 368 object::post_load_check ();
340
341 if (!at)
342 {
343 at = new archetype (name);
344 at->link ();
345 }
346
347 return at;
348} 369}
349 370
350archetype * 371archetype *
351archetype::read (object_thawer &f) 372archetype::read (object_thawer &f)
352{ 373{
… …
356 377
357 coroapi::cede_to_tick (); 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;
… …
408 goto fail; 424 goto fail;
409 } 425 }
410 } 426 }
411 427
412 { 428 {
413 auto (at, parts.begin ());
414
415 archetype *new_head = parts.front (); 429 archetype *new_head = parts.front ();
416 archetype *old_head = find (new_head->archname); 430 archetype *old_head = find (new_head->archname);
417 431
418 if (old_head && !old_head->is_head ()) 432 if (old_head && !old_head->is_head ())
419 { 433 {
… …
421 &new_head->archname, &old_head->archname); 435 &new_head->archname, &old_head->archname);
422 goto fail; 436 goto fail;
423 } 437 }
424 438
425 // 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
426 for (auto (at, parts.begin ()); at != parts.end (); ++at) 440 for (auto &&at : parts)
427 { 441 {
428 archetype *new_part = *at; 442 archetype *new_part = at;
429 archetype *old_part = find (new_part->archname); 443 archetype *old_part = find (new_part->archname);
430 444
431 if (old_part && old_part->head_ () != old_head) 445 if (old_part && old_part->head_ () != old_head)
432 { 446 {
433 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",
434 &new_part->archname, &((archetype *)old_part->head_ ())->archname); 448 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
435 goto fail; 449 goto fail;
436 } 450 }
437 } 451 }
438 452
439 // deactivate existing archetype
440 for (archetype *at = old_head; at; at = (archetype *)at->more)
441 at->unlink ();
442
443 // assemble new chain 453 // assemble new chain
444 new_head->min_x = new_head->max_x = new_head->x; 454 new_head->max_x = new_head->x;
445 new_head->min_y = new_head->max_y = new_head->y;
446 455
447 archetype *less = new_head; 456 archetype *less = new_head;
448 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 457 for (auto &&p = parts.begin () + 1; p != parts.end (); ++p)
449 { 458 {
450 archetype *at = *p; 459 archetype *at = *p;
451 460
452 // some flags get inherited formt he head (probably a lot more) 461 // some flags get inherited from the head (probably a lot more)
453 // doing it here doesn't feel too cozy, but it allows code 462 // doing it here doesn't feel too cozy, but it allows code
454 // to ignore head checks for these flags, which saves time 463 // to ignore head checks for these flags, which saves time
455 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE]; 464 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
456 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK]; 465 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
457 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER]; 466 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
458 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR]; 467 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
459 468
460 if (at->x < new_head->min_x) new_head->min_x = at->x;
461 if (at->y < new_head->min_y) new_head->min_y = at->y;
462 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);
463 if (at->y > new_head->max_y) new_head->max_y = at->y;
464 470
465 at->head = new_head; 471 at->head = new_head;
466 less->more = at; 472 less->more = at;
467 less = at; 473 less = at;
468 } 474 }
469 475
470 // now activate it 476 postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
471 for (auto (p, parts.begin ()); p != parts.end (); ++p)
472 {
473 archetype *at = *p;
474 at->stub = false;
475 at->link ();
476 }
477 477
478 return new_head; 478 return new_head;
479 } 479 }
480 480
481fail: 481fail:
482 for (auto (p, parts.begin ()); p != parts.end (); ++p) 482 for (auto &&at : parts)
483 (*p)->destroy (true); 483 at->destroy ();
484 484
485 return 0; 485 return 0;
486} 486}
487 487
488/*
489 * Initialize global archtype pointers:
490 */
491void 488void
492init_archetype_pointers () 489archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
493{ 490{
494 ring_arch = archetype::find ("ring"); 491 ref = 0;
495 amulet_arch = archetype::find ("amulet"); 492 postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
496 staff_arch = archetype::find ("staff");
497 crown_arch = archetype::find ("crown");
498 empty_archetype = archetype::find ("empty_archetype");
499} 493}
500 494
501/* 495void
502 * Creates and returns a new object which is a copy of the given archetype. 496archetype::commit_load ()
503 * This function returns NULL on failure.
504 */
505object *
506arch_to_object (archetype *at)
507{ 497{
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
508 if (!at) 518 if (!at)
519 LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p.second);
520
521 *ap = at;
509 { 522 }
510 LOG (llevError, "Couldn't find archetype.\n"); 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
511 return 0; 543 return;
512 }
513 544
514 object *op = at->clone (); 545 archetype *at = allarch [idx];
515 op->arch = at;
516 op->instantiate ();
517 546
518 return op; 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);
519} 569}
520 570
521object * 571object *
522archetype::instance () 572archetype::instance ()
523{ 573{
524 return arch_to_object (this); 574 object *op = clone ();
525} 575 op->instantiate ();
526
527/*
528 * Creates an object. This function is called by get_archetype()
529 * if it fails to find the appropriate archetype.
530 * Thus get_archetype() will be guaranteed to always return
531 * an object, and never NULL.
532 */
533object *
534create_singularity (const char *name)
535{
536 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
537
538 if (!strcmp (name, "bug"))
539 abort ();
540
541 char buf[MAX_BUF];
542 sprintf (buf, "bug, please report (%s)", name);
543
544 object *op = get_archetype ("bug");
545 op->name = op->name_pl = buf;
546
547 return op; 576 return op;
548} 577}
578
579//+GPL
549 580
550/* 581/*
551 * Finds which archetype matches the given name, and returns a new 582 * Finds which archetype matches the given name, and returns a new
552 * object containing a copy of the archetype. 583 * object containing a copy of the archetype.
553 */ 584 */
554object * 585object *
555get_archetype (const char *name) 586archetype::get (const char *name)
556{ 587{
557 archetype *at = archetype::find (name); 588 archetype *at = find (name);
558 589
559 if (!at) 590 if (!at)
560 return create_singularity (name); 591 return create_singularity (name);
561 592
562 return arch_to_object (at); 593 return at->instance ();
563} 594}
564 595
565/* 596/*
566 * Returns the first archetype using the given type. 597 * Returns the first archetype using the given type.
567 * Used in treasure-generation. 598 * Used in treasure-generation.
568 */ 599 */
569archetype * 600static archetype *
570type_to_archetype (int type) 601type_to_archetype (int type)
571{ 602{
572 for_all_archetypes (at) 603 for_all_archetypes (at)
573 if (at->type == type && at->head_ () != at) 604 if (at->type == type && at->head_ () != at)
574 return at; 605 return at;
… …
582 * Used in treasure-generation. 613 * Used in treasure-generation.
583 */ 614 */
584object * 615object *
585clone_arch (int type) 616clone_arch (int type)
586{ 617{
587 archetype *at; 618 archetype *at = type_to_archetype (type);
588 619
589 if ((at = type_to_archetype (type)) == NULL) 620 if (!at)
590 { 621 {
591 LOG (llevError, "Can't clone archetype %d\n", type); 622 LOG (llevError, "Can't clone archetype %d\n", type);
592 return 0; 623 return 0;
593 } 624 }
594 625
595 object *op = at->clone (); 626 return at->instance ();
596 op->instantiate ();
597 return op;
598} 627}
599 628
600/* 629/*
601 * member: make instance from class 630 * member: make instance from class
602 */ 631 */
… …
605{ 634{
606 object *op, *prev = 0, *head = 0; 635 object *op, *prev = 0, *head = 0;
607 636
608 while (at) 637 while (at)
609 { 638 {
610 op = arch_to_object (at); 639 op = at->instance ();
611 640
612 op->x = at->x; 641 op->x = at->x;
613 op->y = at->y; 642 op->y = at->y;
614 643
615 if (head) 644 if (head)
… …
623 } 652 }
624 653
625 return head; 654 return head;
626} 655}
627 656
657//-GPL
658

Diff Legend

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