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.64 by root, Tue Jun 5 13:05:02 2007 UTC vs.
Revision 1.92 by root, Thu Nov 5 15:43:21 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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> 28#include <loader.h>
30 29
31#include <tr1/functional> 30#include <tr1/functional>
32#include <tr1/unordered_map> 31#include <tr1/unordered_map>
33 32
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 std::tr1::unordered_map
46 < 38 <
47 const char *, 39 const char *,
… …
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
56 57
57/** 58/**
58 * GROS - This function retrieves an archetype given the name that appears 59 * GROS - This function retrieves an archetype given the name that appears
59 * during the game (for example, "writing pen" instead of "stylus"). 60 * 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. 61 * It does not use the hashtable system, but browse the whole archlist each time.
… …
69find_archetype_by_object_name (const char *name) 70find_archetype_by_object_name (const char *name)
70{ 71{
71 shstr_cmp name_cmp (name); 72 shstr_cmp name_cmp (name);
72 73
73 for_all_archetypes (at) 74 for_all_archetypes (at)
74 if (at->archname == name_cmp) 75 if (at->name == name_cmp)
75 return at; 76 return at;
76 77
77 return 0; 78 return 0;
78} 79}
79 80
… …
86find_archetype_by_object_type_name (int type, const char *name) 87find_archetype_by_object_type_name (int type, const char *name)
87{ 88{
88 shstr_cmp name_cmp (name); 89 shstr_cmp name_cmp (name);
89 90
90 for_all_archetypes (at) 91 for_all_archetypes (at)
91 if (at->archname == name_cmp && at->type == type) 92 if (at->name == name_cmp && at->type == type)
92 return at; 93 return at;
93 94
94 return 0; 95 return 0;
95} 96}
96 97
… …
104{ 105{
105 shstr_cmp skill_cmp (skill); 106 shstr_cmp skill_cmp (skill);
106 107
107 for_all_archetypes (at) 108 for_all_archetypes (at)
108 if (at->skill == skill_cmp && (type == -1 || type == at->type)) 109 if (at->skill == skill_cmp && (type == -1 || type == at->type))
109 return arch_to_object (at); 110 return at->instance ();
110 111
111 return 0; 112 return 0;
112} 113}
113 114
114/* similiar to above - this returns the first archetype 115/* similiar to above - this returns the first archetype
… …
135 * - name: The name we're searching for (ex: "writing pen"); 136 * - name: The name we're searching for (ex: "writing pen");
136 * Return value: 137 * Return value:
137 * - a corresponding object if found; a singularity object if not found. 138 * - 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 139 * 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 140 * 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, 141 * doesn't allocate it each time - not that this function is used much,
141 * but it otherwise had a big memory leak. 142 * but it otherwise had a big memory leak.
142 */ 143 */
143object * 144object *
144get_archetype_by_object_name (const char *name) 145get_archetype_by_object_name (const char *name)
145{ 146{
146 char tmpname[MAX_BUF]; 147 char tmpname[MAX_BUF];
147 int i;
148 148
149 assign (tmpname, name); 149 assign (tmpname, name);
150 150
151 for (i = strlen (tmpname); i > 0; i--) 151 for (int i = strlen (tmpname); i > 0; i--)
152 { 152 {
153 tmpname[i] = 0; 153 tmpname[i] = 0;
154 154
155 if (archetype *at = find_archetype_by_object_name (tmpname)) 155 if (archetype *at = find_archetype_by_object_name (tmpname))
156 return arch_to_object (at); 156 return at->instance ();
157 } 157 }
158 158
159 return create_singularity (name); 159 return create_singularity (name);
160} 160}
161 161
162 /* This is a subset of the parse_id command. Basically, name can be 162/* This is a subset of the parse_id command. Basically, name can be
163 * a string seperated lists of things to match, with certain keywords. 163 * a string seperated lists of things to match, with certain keywords.
164 * pl is the player (only needed to set count properly) 164 * pl is the player (only needed to set count properly)
165 * op is the item we are trying to match. Calling function takes care 165 * op is the item we are trying to match. Calling function takes care
166 * of what action might need to be done and if it is valid 166 * of what action might need to be done and if it is valid
167 * (pickup, drop, etc.) Return NONZERO if we have a match. A higher 167 * (pickup, drop, etc.) Return NONZERO if we have a match. A higher
168 * value means a better match. 0 means no match. 168 * value means a better match. 0 means no match.
169 * 169 *
170 * Brief outline of the procedure: 170 * Brief outline of the procedure:
171 * We take apart the name variable into the individual components. 171 * We take apart the name variable into the individual components.
172 * cases for 'all' and unpaid are pretty obvious. 172 * cases for 'all' and unpaid are pretty obvious.
173 * Next, we check for a count (either specified in name, or in the 173 * Next, we check for a count (either specified in name, or in the
174 * player object.) 174 * player object.)
175 * If count is 1, make a quick check on the name. 175 * If count is 1, make a quick check on the name.
176 * IF count is >1, we need to make plural name. Return if match. 176 * IF count is >1, we need to make plural name. Return if match.
177 * Last, make a check on the full name. 177 * Last, make a check on the full name.
178 */ 178 */
179int 179int
180item_matched_string (object *pl, object *op, const char *name) 180item_matched_string (object *pl, object *op, const char *name)
181{ 181{
182 char *cp, local_name[MAX_BUF]; 182 char *cp, local_name[MAX_BUF];
183 int count, retval = 0; 183 int count, retval = 0;
… …
195 return 1; 195 return 1;
196 196
197 /* unpaid is a little more specific */ 197 /* unpaid is a little more specific */
198 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID)) 198 if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID))
199 return 2; 199 return 2;
200
200 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))) 201 if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)))
201 return 2; 202 return 2;
202 203
203 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED)) 204 if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED))
204 return 2; 205 return 2;
… …
226 * is because of the 'else' handling - we don't want to match on 227 * 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 228 * 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 229 * later. So keep it in descending order here, so we try for the best
229 * match first, and work downward. 230 * match first, and work downward.
230 */ 231 */
232 const char *qbn0, *qbn1, *qsn; // query base name/short name caches
233
231 if (!strcasecmp (cp, query_name (op))) 234 if (!strcasecmp (cp, query_name (op)))
232 retval = 20; 235 retval = 20;
233 else if (!strcasecmp (cp, query_short_name (op))) 236 else if (!strcasecmp (cp, qsn = query_short_name (op)))
234 retval = 18; 237 retval = 18;
235 else if (!strcasecmp (cp, query_base_name (op, 0))) 238 else if (!strcasecmp (cp, qbn0 = query_base_name (op, 0)))
236 retval = 16; 239 retval = 16;
237 else if (!strcasecmp (cp, query_base_name (op, 1))) 240 else if (!strcasecmp (cp, qbn1 = query_base_name (op, 1)))
238 retval = 16; 241 retval = 16;
239 else if (op->custom_name && !strcasecmp (cp, op->custom_name)) 242 else if (op->custom_name && !strcasecmp (cp, op->custom_name))
240 retval = 15; 243 retval = 15;
241 else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp))) 244 else if (!strncasecmp (cp, qbn0, strlen (cp)))
242 retval = 14; 245 retval = 14;
243 else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) 246 else if (!strncasecmp (cp, qbn1, strlen (cp)))
244 retval = 14; 247 retval = 14;
245 /* Do substring checks, so things like 'Str+1' will match. 248 /* Do substring checks, so things like 'Str+1' will match.
246 * retval of these should perhaps be lower - they are lower 249 * retval of these should perhaps be lower - they are lower
247 * then the specific strcasecmp aboves, but still higher than 250 * then the specific strcasecmp aboves, but still higher than
248 * some other match criteria. 251 * some other match criteria.
249 */ 252 */
250 else if (strstr (query_base_name (op, 1), cp)) 253 else if (strstr (qbn1, cp))
251 retval = 12; 254 retval = 12;
252 else if (strstr (query_base_name (op, 0), cp)) 255 else if (strstr (qbn0, cp))
253 retval = 12; 256 retval = 12;
254 else if (strstr (query_short_name (op), cp)) 257 else if (strstr (qsn, cp))
255 retval = 12; 258 retval = 12;
256 /* Check against plural/non plural based on count. */ 259 /* Check against plural/non plural based on count. */
257 else if (count > 1 && !strcasecmp (cp, op->name_pl)) 260 else if (count > 1 && !strcasecmp (cp, op->name_pl))
258 retval = 6; 261 retval = 6;
259 else if (count == 1 && !strcasecmp (op->name, cp)) 262 else if (count == 1 && !strcasecmp (op->name, cp))
260 retval = 6; 263 retval = 6;
261 /* base name matched - not bad */ 264 /* base name matched - not bad */
262 else if (strcasecmp (cp, op->name) == 0 && !count) 265 else if (strcasecmp (cp, op->name) == 0 && !count)
263 retval = 4; 266 retval = 4;
264 /* Check for partial custom name, but give a real low priority */ 267 /* Check for partial custom name, but give a real low priority */
265 else if (op->custom_name && strstr (op->custom_name, cp)) 268 else if (op->custom_name.contains (cp))
266 retval = 3; 269 retval = 3;
267 270
268 if (retval) 271 if (retval)
269 { 272 {
270 if (pl->type == PLAYER) 273 if (pl->type == PLAYER)
… …
275 } 278 }
276 279
277 return 0; 280 return 0;
278} 281}
279 282
283//-GPL
284
280archetype::archetype (const char *name) 285archetype::archetype (const char *name)
281{ 286{
282 stub = true;
283 arch = this; 287 arch = this;
284 this->archname = this->name = this->name_pl = name; 288 this->archname = this->name = this->name_pl = name;
285} 289}
286 290
287archetype::~archetype () 291archetype::~archetype ()
… …
290} 294}
291 295
292void 296void
293archetype::link () 297archetype::link ()
294{ 298{
295 ht.insert (std::make_pair (archname, this));
296
297 if (!archetypes.contains (this)) 299 if (!archetypes.contains (this))
300 {
298 archetypes.insert (this); 301 archetypes.insert (this);
302 ht.insert (std::make_pair (archname, this));
303 }
299} 304}
300 305
301void 306void
302archetype::unlink () 307archetype::unlink ()
303{ 308{
304 ht.erase (archname);
305 if (!strcmp (&archname, "Gaea")) fprintf (stderr, "oI\n");//D
306 if (archetypes.contains (this)) 309 if (archetypes.contains (this))
310 {
307 archetypes.erase (this); 311 archetypes.erase (this);
312 ht.erase (archname);
313 }
308} 314}
309 315
310/* 316/*
311 * Finds, using the hashtable, which archetype matches the given name. 317 * Finds, using the hashtable, which archetype matches the given name.
312 * returns a pointer to the found archetype, otherwise NULL. 318 * returns a pointer to the found archetype, otherwise NULL.
… …
324 else 330 else
325 return i->second; 331 return i->second;
326} 332}
327 333
328archetype * 334archetype *
329archetype::get (const char *name)
330{
331 if (!name)
332 {
333 LOG (llevError, "null archetype requested\n");
334 name = "(null)";
335 }
336
337 archetype *at = find (name);
338
339 if (!at)
340 {
341 at = new archetype (name);
342 at->link ();
343 }
344
345 return at;
346}
347
348archetype *
349archetype::read (object_thawer &f) 335archetype::read (object_thawer &f)
350{ 336{
351 assert (f.kw == KW_object); 337 assert (f.kw == KW_object);
352 338
353 loading_arch = true; // hack to tell parse_kv et al. to behave
354
355 std::vector<archetype *> parts; 339 std::vector<archetype *> parts;
356 340
357 coroapi::cede_to_tick_every (10); 341 coroapi::cede_to_tick ();
358 342
359 for (;;) 343 for (;;)
360 { 344 {
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 ()); 345 archetype *at = new archetype (f.get_str ());
364
365 if (!at || !at->stub)
366 at = new archetype (f.get_str ());
367 346
368 f.next (); 347 f.next ();
369 348
370#if 0 349#if 0
371 // implementing it here in the server does neither allow multiple inheritence 350 // implementing it here in the server does neither allow multiple inheritence
… …
382 361
383 f.next (); 362 f.next ();
384 } 363 }
385#endif 364#endif
386 365
366 loading_arch = at; // hack to tell parse_kv et al. to behave
367 bool parse_ok = at->parse_kv (f);
368 loading_arch = 0;
369
387 if (!at->parse_kv (f)) 370 if (!parse_ok)
388 goto fail; 371 goto fail;
389 372
373 loading_arch = at; // hack to tell parse_kv et al. to behave
390 at->post_load_check (); 374 at->post_load_check ();
375 loading_arch = 0;
391 376
392 parts.push_back (at); 377 parts.push_back (at);
393 378
394 if (f.kw != KW_more) 379 if (f.kw != KW_more)
395 break; 380 break;
… …
400 { 385 {
401 f.parse_error ("more object"); 386 f.parse_error ("more object");
402 goto fail; 387 goto fail;
403 } 388 }
404 } 389 }
405
406 loading_arch = false;
407 390
408 { 391 {
409 auto (at, parts.begin ()); 392 auto (at, parts.begin ());
410 393
411 archetype *new_head = parts.front (); 394 archetype *new_head = parts.front ();
… …
430 &new_part->archname, &((archetype *)old_part->head_ ())->archname); 413 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
431 goto fail; 414 goto fail;
432 } 415 }
433 } 416 }
434 417
435 // deactivate existing archetype
436 for (archetype *at = old_head; at; at = (archetype *)at->more)
437 at->unlink ();
438
439 // assemble new chain 418 // assemble new chain
440 new_head->min_x = new_head->max_x = new_head->x; 419 new_head->min_x = new_head->max_x = new_head->x;
441 new_head->min_y = new_head->max_y = new_head->y; 420 new_head->min_y = new_head->max_y = new_head->y;
442 421
443 archetype *less = new_head; 422 archetype *less = new_head;
444 for (auto (p, parts.begin () + 1); p != parts.end (); ++p) 423 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
445 { 424 {
446 archetype *at = *p; 425 archetype *at = *p;
447 426
427 // some flags get inherited from the head (probably a lot more)
428 // doing it here doesn't feel too cozy, but it allows code
429 // to ignore head checks for these flags, which saves time
430 at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
431 at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
432 at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
433 at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
434
448 if (at->x < new_head->min_x) new_head->min_x = at->x; 435 new_head->min_x = min (new_head->min_x, at->x);
449 if (at->y < new_head->min_y) new_head->min_y = at->y; 436 new_head->min_y = min (new_head->min_y, at->y);
450 if (at->x > new_head->max_x) new_head->max_x = at->x; 437 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; 438 new_head->max_y = max (new_head->max_y, at->y);
452 439
453 at->head = new_head; 440 at->head = new_head;
454 less->more = at; 441 less->more = at;
455 less = at; 442 less = at;
456 } 443 }
457 444
458 // now activate it 445 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 446
466 return new_head; 447 return new_head;
467 } 448 }
468 449
469fail: 450fail:
470 for (auto (p, parts.begin ()); p != parts.end (); ++p) 451 for (auto (p, parts.begin ()); p != parts.end (); ++p)
471 (*p)->destroy (true); 452 (*p)->destroy ();
472 453
473 loading_arch = false;
474 return 0; 454 return 0;
475} 455}
476 456
477/*
478 * Initialize global archtype pointers:
479 */
480void 457void
481init_archetype_pointers () 458archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
482{ 459{
483 ring_arch = archetype::find ("ring"); 460 ref = 0;
484 amulet_arch = archetype::find ("amulet"); 461 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} 462}
489 463
490/* 464void
491 * Creates and returns a new object which is a copy of the given archetype. 465archetype::commit_load ()
492 * This function returns NULL on failure.
493 */
494object *
495arch_to_object (archetype *at)
496{ 466{
467 // unlink old archetypes and link in new ones */
468 for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p)
469 {
470 archetype *at = *p;
471
472 if (archetype *old = find (at->archname))
473 old->unlink ();
474
475 allarch.push_back (at);
476
477 at->link ();
478 ++dirtycnt;
479 }
480
481 postponed_arch.clear ();
482
483 // now resolve arch references
484 for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p)
485 {
486 arch_ptr *ap = p->first;
487 archetype *at = find (p->second);
488
497 if (!at) 489 if (!at)
490 LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second);
491
492 *ap = at;
498 { 493 }
499 LOG (llevError, "Couldn't find archetype.\n"); 494
495 postponed_arch_ref.clear ();
496
497 empty = find (shstr_empty_archetype);
498}
499
500void
501archetype::gc ()
502{
503 int cnt = max (1, min (allarch.size () / 128, dirtycnt));
504 dirtycnt = max (0, dirtycnt - cnt);
505
506 do
507 {
508 static int idx;
509
510 if (idx >= allarch.size ())
511 if (idx)
512 idx = 0;
513 else
500 return 0; 514 return;
501 }
502 515
516 archetype *at = allarch [idx];
517
518 if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
519 ++idx;
520 else
521 {
522 LOG (llevDebug, "garbage collect arch %s", &at->archname);
523 assert (at->arch == at); // verify that refcnt == 1 is truly valid
524 allarch.erase (idx);
525
526 // break chain
527 for (object *op = at->head_ (); op; )
528 {
529 object *next = op->more;
530 op->head = 0;
531 op->more = 0;
532 op = next;
533 }
534
535 at->destroy ();
536 at->arch = 0;
537 }
538 }
539 while (--cnt);
540}
541
542object *
543archetype::instance ()
544{
503 object *op = at->clone (); 545 object *op = clone ();
504 op->arch = at;
505 op->instantiate (); 546 op->instantiate ();
506
507 return op; 547 return op;
508} 548}
549
550//+GPL
509 551
510/* 552/*
511 * Creates an object. This function is called by get_archetype() 553 * Creates an object. This function is called by get_archetype()
512 * if it fails to find the appropriate archetype. 554 * if it fails to find the appropriate archetype.
513 * Thus get_archetype() will be guaranteed to always return 555 * Thus get_archetype() will be guaranteed to always return
514 * an object, and never NULL. 556 * an object, and never NULL.
515 */ 557 */
516object * 558object *
517create_singularity (const char *name) 559create_singularity (const char *name)
518{ 560{
519 object *op; 561 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
520 char buf[MAX_BUF];
521 562
522 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 563 if (!strcmp (name, "bug"))
523 op = object::create (); 564 abort ();
524 op->name = op->name_pl = buf; 565
525 SET_FLAG (op, FLAG_NO_PICK); 566 object *op = archetype::get (shstr_bug);
567 op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
568
526 return op; 569 return op;
527} 570}
528 571
529/* 572/*
530 * Finds which archetype matches the given name, and returns a new 573 * Finds which archetype matches the given name, and returns a new
531 * object containing a copy of the archetype. 574 * object containing a copy of the archetype.
532 */ 575 */
533object * 576object *
534get_archetype (const char *name) 577get_archetype (const char *name)
535{ 578{
579 return archetype::get (name);
580}
581
582object *
583archetype::get (const char *name)
584{
536 archetype *at = archetype::find (name); 585 archetype *at = find (name);
537 586
538 if (!at) 587 if (!at)
539 return create_singularity (name); 588 return create_singularity (name);
540 589
541 return arch_to_object (at); 590 return at->instance ();
542} 591}
543 592
544/* 593/*
545 * Returns the first archetype using the given type. 594 * Returns the first archetype using the given type.
546 * Used in treasure-generation. 595 * Used in treasure-generation.
… …
561 * Used in treasure-generation. 610 * Used in treasure-generation.
562 */ 611 */
563object * 612object *
564clone_arch (int type) 613clone_arch (int type)
565{ 614{
566 archetype *at; 615 archetype *at = type_to_archetype (type);
567 616
568 if ((at = type_to_archetype (type)) == NULL) 617 if (!at)
569 { 618 {
570 LOG (llevError, "Can't clone archetype %d\n", type); 619 LOG (llevError, "Can't clone archetype %d\n", type);
571 return 0; 620 return 0;
572 } 621 }
573 622
574 object *op = at->clone (); 623 return at->instance ();
575 op->instantiate ();
576 return op;
577} 624}
578 625
579/* 626/*
580 * member: make instance from class 627 * member: make instance from class
581 */ 628 */
… …
584{ 631{
585 object *op, *prev = 0, *head = 0; 632 object *op, *prev = 0, *head = 0;
586 633
587 while (at) 634 while (at)
588 { 635 {
589 op = arch_to_object (at); 636 op = at->instance ();
590 637
591 op->x = at->x; 638 op->x = at->x;
592 op->y = at->y; 639 op->y = at->y;
593 640
594 if (head) 641 if (head)
… …
602 } 649 }
603 650
604 return head; 651 return head;
605} 652}
606 653
654//-GPL
655

Diff Legend

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