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.48 by root, Mon Apr 16 11:09:30 2007 UTC vs.
Revision 1.92 by root, Thu Nov 5 15:43:21 2009 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * 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 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <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);
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
55static std::vector<archetype *> 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.
68archetype * 69archetype *
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 (archetype *at = first_archetype; at; at = at->next) 74 for_all_archetypes (at)
74 if (at->clone.name == 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
85archetype * 86archetype *
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 (archetype *at = first_archetype; at; at = at->next) 91 for_all_archetypes (at)
91 if (at->clone.name == name_cmp && at->clone.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
102object * 103object *
103get_archetype_by_skill_name (const char *skill, int type) 104get_archetype_by_skill_name (const char *skill, int type)
104{ 105{
105 shstr_cmp skill_cmp (skill); 106 shstr_cmp skill_cmp (skill);
106 107
107 for (archetype *at = first_archetype; at; at = at->next) 108 for_all_archetypes (at)
108 if (at->clone.skill == skill_cmp && (type == -1 || type == at->clone.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
119 * (eg, skills) 120 * (eg, skills)
120 */ 121 */
121archetype * 122archetype *
122get_archetype_by_type_subtype (int type, int subtype) 123get_archetype_by_type_subtype (int type, int subtype)
123{ 124{
124 for (archetype *at = first_archetype; at; at = at->next) 125 for_all_archetypes (at)
125 if ((type == -1 || type == at->clone.type) && (subtype == -1 || subtype == at->clone.subtype)) 126 if ((type == -1 || type == at->type) && (subtype == -1 || subtype == at->subtype))
126 return at; 127 return at;
127 128
128 return 0; 129 return 0;
129} 130}
130 131
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
280archetype::archetype () 283//-GPL
284
285archetype::archetype (const char *name)
281{ 286{
282 clone.arch = this; 287 arch = this;
283 288 this->archname = this->name = this->name_pl = name;
284 CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
285 SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
286} 289}
287 290
288archetype::~archetype () 291archetype::~archetype ()
289{ 292{
290 //TODO: nuke ->more's 293 unlink ();
291} 294}
292 295
293static void
294unlink (archetype *at)
295{
296 if (at->head)
297 at = at->head;
298
299 // destroy this archetype's link, making singletons out of its parts
300 while (at)
301 {
302 archetype *more = at->more;
303 at->clone.destroy_inv ();
304 at->head = at->more = 0;
305 at = more;
306 }
307}
308
309// dire hack, need to rationalise
310void 296void
311overwrite (archetype *at, object *op) 297archetype::link ()
312{ 298{
313 at->clone = *op; 299 if (!archetypes.contains (this))
314 300 {
315 at->clone.arch = at; 301 archetypes.insert (this);
316 //TODO: inv et al. 302 ht.insert (std::make_pair (archname, this));
303 }
304}
305
306void
307archetype::unlink ()
308{
309 if (archetypes.contains (this))
310 {
311 archetypes.erase (this);
312 ht.erase (archname);
313 }
314}
315
316/*
317 * Finds, using the hashtable, which archetype matches the given name.
318 * returns a pointer to the found archetype, otherwise NULL.
319 */
320archetype *
321archetype::find (const char *name)
322{
323 if (!name)
324 return 0;
325
326 auto (i, ht.find (name));
327
328 if (i == ht.end ())
329 return 0;
330 else
331 return i->second;
317} 332}
318 333
319archetype * 334archetype *
320archetype::read (object_thawer &f) 335archetype::read (object_thawer &f)
321{ 336{
322 assert (f.kw == KW_object); 337 assert (f.kw == KW_object);
323 338
324 archetype *head = get (f.get_str ()); 339 std::vector<archetype *> parts;
325 unlink (head);
326 object *op = object::create ();
327 340
328 if (!op->parse_kv (f)) 341 coroapi::cede_to_tick ();
329 { 342
330 op->destroy (true); 343 for (;;)
331 // leak head
332 return 0;
333 } 344 {
345 archetype *at = new archetype (f.get_str ());
334 346
335 overwrite (head, op);
336 op->destroy ();
337
338 for (archetype *prev = head; f.kw == KW_more; )
339 {
340 f.next (); 347 f.next ();
341 assert (f.kw == KW_object);
342 348
343 archetype *more = get (f.get_str ()); 349#if 0
344 unlink (more); 350 // implementing it here in the server does neither allow multiple inheritence
345 object *op = object::create (); 351 // nor does it cleanly "just override". it would allow use in map files, though,
346 352 // and other resource files dynamically laoded (as opposed to being preprocessed).
347 if (!op->parse_kv (f)) 353 // not that any of this is relevant as of yet...
354 if (f.kw == KW_inherit)
348 { 355 {
349 op->destroy (true); 356 if (archetype *at = find (f.get_str ()))
350 // leak head more* 357 *op = at->clone;
351 return 0; 358 else
359 LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
360 &at->archname, f.get_str ());
361
362 f.next ();
352 } 363 }
364#endif
353 365
354 overwrite (more, op); 366 loading_arch = at; // hack to tell parse_kv et al. to behave
355 op->destroy (); 367 bool parse_ok = at->parse_kv (f);
368 loading_arch = 0;
356 369
357 if (more->clone.x > head->tail_x) head->tail_x = more->clone.x; 370 if (!parse_ok)
358 if (more->clone.y > head->tail_y) head->tail_y = more->clone.y; 371 goto fail;
359 372
360 more->head = head; 373 loading_arch = at; // hack to tell parse_kv et al. to behave
361 more->clone.head = &head->clone; 374 at->post_load_check ();
362 prev->more = more; 375 loading_arch = 0;
363 prev->clone.more = &more->clone;
364 376
365 prev = more; 377 parts.push_back (at);
366 }
367 378
368 if (!head->next) 379 if (f.kw != KW_more)
369 { 380 break;
370 head->next = first_archetype;
371 first_archetype = head;
372 }
373 381
374 return head; 382 f.next ();
375}
376 383
377/* 384 if (f.kw != KW_object)
378 * Reads/parses the archetype-file, and copies into a linked list
379 * of archetype-structures.
380 */
381static bool
382load_archetypes (object_thawer &f)
383{
384 for (;;)
385 {
386 switch (f.kw)
387 { 385 {
388 case KW_object: 386 f.parse_error ("more object");
389 loading_arch = true; 387 goto fail;
390 if (!archetype::read (f))
391 {
392 loading_arch = false;
393 return false;
394 }
395
396 loading_arch = false;
397 continue;
398
399 case KW_EOF:
400 return true;
401
402 default:
403 if (!f.parse_error ("archetypes file"))
404 return false;
405 } 388 }
406
407 f.next ();
408 } 389 }
409}
410 390
411/* 391 {
412 * First initialises the archtype hash-table (init_archetable()). 392 auto (at, parts.begin ());
413 * Reads and parses the archetype file (with the first and second-pass
414 * functions).
415 */
416bool
417load_archetype_file (const char *filename)
418{
419 object_thawer f (filename);
420 393
421 f.next (); 394 archetype *new_head = parts.front ();
395 archetype *old_head = find (new_head->archname);
422 396
423 // make sure the next - long - step is only done after a tick 397 if (old_head && !old_head->is_head ())
424 coroapi::wait_for_tick_begin ();
425
426 if (!load_archetypes (f))
427 return false;
428
429 warn_archetypes = 1;
430
431 empty_archetype = archetype::find ("empty_archetype");
432 if (!empty_archetype)
433 return false;
434
435 coroapi::cede ();
436
437 return true;
438}
439
440/*
441 * Creates and returns a new object which is a copy of the given archetype.
442 * This function returns NULL on failure.
443 */
444object *
445arch_to_object (archetype *at)
446{
447 if (!at)
448 { 398 {
449 if (warn_archetypes) 399 LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
450 LOG (llevError, "Couldn't find archetype.\n"); 400 &new_head->archname, &old_head->archname);
451 401 goto fail;
452 return NULL;
453 } 402 }
454 403
404 // check that all archetypes belong to the same old object or are new
405 for (auto (at, parts.begin ()); at != parts.end (); ++at)
406 {
407 archetype *new_part = *at;
408 archetype *old_part = find (new_part->archname);
409
410 if (old_part && old_part->head_ () != old_head)
411 {
412 LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
413 &new_part->archname, &((archetype *)old_part->head_ ())->archname);
414 goto fail;
415 }
416 }
417
418 // assemble new chain
419 new_head->min_x = new_head->max_x = new_head->x;
420 new_head->min_y = new_head->max_y = new_head->y;
421
422 archetype *less = new_head;
423 for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
424 {
425 archetype *at = *p;
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
435 new_head->min_x = min (new_head->min_x, at->x);
436 new_head->min_y = min (new_head->min_y, at->y);
437 new_head->max_x = max (new_head->max_x, at->x);
438 new_head->max_y = max (new_head->max_y, at->y);
439
440 at->head = new_head;
441 less->more = at;
442 less = at;
443 }
444
445 postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
446
447 return new_head;
448 }
449
450fail:
451 for (auto (p, parts.begin ()); p != parts.end (); ++p)
452 (*p)->destroy ();
453
454 return 0;
455}
456
457void
458archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
459{
460 ref = 0;
461 postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
462}
463
464void
465archetype::commit_load ()
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
489 if (!at)
490 LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second);
491
492 *ap = at;
493 }
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
514 return;
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{
455 object *op = at->clone.clone (); 545 object *op = clone ();
456 op->arch = at;
457 op->instantiate (); 546 op->instantiate ();
458 return op; 547 return op;
459} 548}
549
550//+GPL
460 551
461/* 552/*
462 * Creates an object. This function is called by get_archetype() 553 * Creates an object. This function is called by get_archetype()
463 * if it fails to find the appropriate archetype. 554 * if it fails to find the appropriate archetype.
464 * Thus get_archetype() will be guaranteed to always return 555 * Thus get_archetype() will be guaranteed to always return
465 * an object, and never NULL. 556 * an object, and never NULL.
466 */ 557 */
467object * 558object *
468create_singularity (const char *name) 559create_singularity (const char *name)
469{ 560{
470 object *op; 561 LOG (llevError | logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
471 char buf[MAX_BUF];
472 562
473 sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name); 563 if (!strcmp (name, "bug"))
474 op = object::create (); 564 abort ();
475 op->name = op->name_pl = buf; 565
476 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
477 return op; 569 return op;
478} 570}
479 571
480/* 572/*
481 * Finds which archetype matches the given name, and returns a new 573 * Finds which archetype matches the given name, and returns a new
482 * object containing a copy of the archetype. 574 * object containing a copy of the archetype.
483 */ 575 */
484object * 576object *
485get_archetype (const char *name) 577get_archetype (const char *name)
486{ 578{
579 return archetype::get (name);
580}
581
582object *
583archetype::get (const char *name)
584{
487 archetype *at = archetype::find (name); 585 archetype *at = find (name);
488 586
489 if (!at) 587 if (!at)
490 return create_singularity (name); 588 return create_singularity (name);
491 589
492 return arch_to_object (at); 590 return at->instance ();
493}
494
495/*
496 * Hash-function used by the arch-hashtable.
497 */
498
499unsigned long
500hasharch (const char *str, int tablesize)
501{
502 unsigned long hash = 0;
503 unsigned int i = 0;
504 const char *p;
505
506 /* use the one-at-a-time hash function, which supposedly is
507 * better than the djb2-like one used by perl5.005, but
508 * certainly is better then the bug used here before.
509 * see http://burtleburtle.net/bob/hash/doobs.html
510 */
511 for (p = str; i < MAXSTRING && *p; p++, i++)
512 {
513 hash += *p;
514 hash += hash << 10;
515 hash ^= hash >> 6;
516 }
517
518 hash += hash << 3;
519 hash ^= hash >> 11;
520 hash += hash << 15;
521
522 return hash % tablesize;
523}
524
525/*
526 * Finds, using the hashtable, which archetype matches the given name.
527 * returns a pointer to the found archetype, otherwise NULL.
528 */
529archetype *
530archetype::find (const char *name)
531{
532 if (!name)
533 return 0;
534
535 AUTODECL (i, ht.find (name));
536
537 if (i == ht.end ())
538 return 0;
539 else
540 return i->second;
541}
542
543archetype *
544archetype::get (const char *name)
545{
546 archetype *at = find (name);
547
548 if (!at)
549 {
550 archetypes.push_back (at = new archetype);
551 at->name = name;
552 at->hash_add ();
553 }
554
555 return at;
556}
557
558/*
559 * Adds an archetype to the hashtable.
560 */
561void
562archetype::hash_add ()
563{
564 ht.insert (std::make_pair (name, this));
565}
566
567void
568archetype::hash_del ()
569{
570 ht.erase (name);
571} 591}
572 592
573/* 593/*
574 * Returns the first archetype using the given type. 594 * Returns the first archetype using the given type.
575 * Used in treasure-generation. 595 * Used in treasure-generation.
576 */ 596 */
577archetype * 597archetype *
578type_to_archetype (int type) 598type_to_archetype (int type)
579{ 599{
580 for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more) 600 for_all_archetypes (at)
581 if (at->clone.type == type) 601 if (at->type == type && at->head_ () != at)
582 return at; 602 return at;
583 603
584 return 0; 604 return 0;
585} 605}
586 606
590 * Used in treasure-generation. 610 * Used in treasure-generation.
591 */ 611 */
592object * 612object *
593clone_arch (int type) 613clone_arch (int type)
594{ 614{
595 archetype *at; 615 archetype *at = type_to_archetype (type);
596 616
597 if ((at = type_to_archetype (type)) == NULL) 617 if (!at)
598 { 618 {
599 LOG (llevError, "Can't clone archetype %d\n", type); 619 LOG (llevError, "Can't clone archetype %d\n", type);
600 return 0; 620 return 0;
601 } 621 }
602 622
603 object *op = at->clone.clone (); 623 return at->instance ();
604 op->instantiate ();
605 return op;
606} 624}
607 625
608/* 626/*
609 * member: make instance from class 627 * member: make instance from class
610 */ 628 */
611
612object * 629object *
613object_create_arch (archetype *at) 630object_create_arch (archetype *at)
614{ 631{
615 object *op, *prev = 0, *head = 0; 632 object *op, *prev = 0, *head = 0;
616 633
617 while (at) 634 while (at)
618 { 635 {
619 op = arch_to_object (at); 636 op = at->instance ();
637
620 op->x = at->clone.x; 638 op->x = at->x;
621 op->y = at->clone.y; 639 op->y = at->y;
622 640
623 if (head) 641 if (head)
624 op->head = head, prev->more = op; 642 op->head = head, prev->more = op;
625 643
626 if (!head) 644 if (!head)
627 head = op; 645 head = op;
628 646
629 prev = op; 647 prev = op;
630 at = at->more; 648 at = (archetype *)at->more;
631 } 649 }
632 650
633 return (head); 651 return head;
634} 652}
635 653
654//-GPL
655

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines