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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines