[ViewVC] Diff of: cvs/deliantra/server/common/arch.C

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.48 by root, Mon Apr 16 11:09:30 2007 UTC vs.
Revision 1.85 by root, Mon Sep 29 10:32:50 2008 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
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your 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 GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	#include <cassert>	24	#include <cassert>
26		25
27	#include <global.h>	26	#include <global.h>
28	#include <funcpoint.h>
29	#include <loader.h>	27	#include <loader.h>
30		28
31	#include <tr1/functional>	29	#include <tr1/functional>
32	#include <tr1/unordered_map>	30	#include <tr1/unordered_map>
33		31
34	/* The naming of these functions is really poor - they are all
35	* pretty much named '.._arch_...', but they may more may not
36	* return archetypes. Some make the arch_to_object call, and thus
37	* return an object. Perhaps those should be called 'archob' functions
38	* to denote they return an object derived from the archetype.
39	* MSW 2003-04-29
40	*/
41
42	bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing	32	archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
		33	arch_ptr archetype::empty;
43		34
44	// the hashtable	35	// the hashtable
45	typedef std::tr1::unordered_map	36	typedef std::tr1::unordered_map
46	<	37	<
47	const char *,	38	const char *,
49	str_hash,	40	str_hash,
50	str_equal,	41	str_equal,
51	slice_allocator< std::pair<const char *const, arch_ptr> >	42	slice_allocator< std::pair<const char *const, arch_ptr> >
52	> HT;	43	> HT;
53		44
54	static HT ht (5000);	45	static HT ht (10000);
		46	archvec archetypes;
		47	static unordered_vector<archetype *> allarch;
		48	static int dirtycnt;
		49
		50	// the vector of other_arch references to be resolved
		51	static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref;
		52	// the vector of loaded but not yet committed archetypes
55	static std::vector<archetype *> archetypes;	53	static std::vector<archetype *> postponed_arch;
56		54
57	/**	55	/**
58	* GROS - This function retrieves an archetype given the name that appears	56	* GROS - This function retrieves an archetype given the name that appears
59	* during the game (for example, "writing pen" instead of "stylus").	57	* 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.	58	* It does not use the hashtable system, but browse the whole archlist each time.
…		…
68	archetype *	66	archetype *
69	find_archetype_by_object_name (const char *name)	67	find_archetype_by_object_name (const char *name)
70	{	68	{
71	shstr_cmp name_cmp (name);	69	shstr_cmp name_cmp (name);
72		70
73	for (archetype *at = first_archetype; at; at = at->next)	71	for_all_archetypes (at)
74	if (at->clone.name == name_cmp)	72	if (at->name == name_cmp)
75	return at;	73	return at;
76		74
77	return 0;	75	return 0;
78	}	76	}
79		77
…		…
85	archetype *	83	archetype *
86	find_archetype_by_object_type_name (int type, const char *name)	84	find_archetype_by_object_type_name (int type, const char *name)
87	{	85	{
88	shstr_cmp name_cmp (name);	86	shstr_cmp name_cmp (name);
89		87
90	for (archetype *at = first_archetype; at; at = at->next)	88	for_all_archetypes (at)
91	if (at->clone.name == name_cmp && at->clone.type == type)	89	if (at->name == name_cmp && at->type == type)
92	return at;	90	return at;
93		91
94	return 0;	92	return 0;
95	}	93	}
96		94
…		…
102	object *	100	object *
103	get_archetype_by_skill_name (const char *skill, int type)	101	get_archetype_by_skill_name (const char *skill, int type)
104	{	102	{
105	shstr_cmp skill_cmp (skill);	103	shstr_cmp skill_cmp (skill);
106		104
107	for (archetype *at = first_archetype; at; at = at->next)	105	for_all_archetypes (at)
108	if (at->clone.skill == skill_cmp && (type == -1 \|\| type == at->clone.type))	106	if (at->skill == skill_cmp && (type == -1 \|\| type == at->type))
109	return arch_to_object (at);	107	return at->instance ();
110		108
111	return 0;	109	return 0;
112	}	110	}
113		111
114	/* similiar to above - this returns the first archetype	112	/* similiar to above - this returns the first archetype
…		…
119	* (eg, skills)	117	* (eg, skills)
120	*/	118	*/
121	archetype *	119	archetype *
122	get_archetype_by_type_subtype (int type, int subtype)	120	get_archetype_by_type_subtype (int type, int subtype)
123	{	121	{
124	for (archetype *at = first_archetype; at; at = at->next)	122	for_all_archetypes (at)
125	if ((type == -1 \|\| type == at->clone.type) && (subtype == -1 \|\| subtype == at->clone.subtype))	123	if ((type == -1 \|\| type == at->type) && (subtype == -1 \|\| subtype == at->subtype))
126	return at;	124	return at;
127		125
128	return 0;	126	return 0;
129	}	127	}
130		128
…		…
135	* - name: The name we're searching for (ex: "writing pen");	133	* - name: The name we're searching for (ex: "writing pen");
136	* Return value:	134	* Return value:
137	* - a corresponding object if found; a singularity object if not found.	135	* - 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	136	* 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	137	* 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,	138	* doesn't allocate it each time - not that this function is used much,
141	* but it otherwise had a big memory leak.	139	* but it otherwise had a big memory leak.
142	*/	140	*/
143	object *	141	object *
144	get_archetype_by_object_name (const char *name)	142	get_archetype_by_object_name (const char *name)
145	{	143	{
…		…
151	for (i = strlen (tmpname); i > 0; i--)	149	for (i = strlen (tmpname); i > 0; i--)
152	{	150	{
153	tmpname[i] = 0;	151	tmpname[i] = 0;
154		152
155	if (archetype *at = find_archetype_by_object_name (tmpname))	153	if (archetype *at = find_archetype_by_object_name (tmpname))
156	return arch_to_object (at);	154	return at->instance ();
157	}	155	}
158		156
159	return create_singularity (name);	157	return create_singularity (name);
160	}	158	}
161		159
162	/* This is a subset of the parse_id command. Basically, name can be	160	/* 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.	161	* a string seperated lists of things to match, with certain keywords.
164	* pl is the player (only needed to set count properly)	162	* pl is the player (only needed to set count properly)
165	* op is the item we are trying to match. Calling function takes care	163	* 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	164	* 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	165	* (pickup, drop, etc.) Return NONZERO if we have a match. A higher
168	* value means a better match. 0 means no match.	166	* value means a better match. 0 means no match.
169	*	167	*
170	* Brief outline of the procedure:	168	* Brief outline of the procedure:
171	* We take apart the name variable into the individual components.	169	* We take apart the name variable into the individual components.
172	* cases for 'all' and unpaid are pretty obvious.	170	* cases for 'all' and unpaid are pretty obvious.
173	* Next, we check for a count (either specified in name, or in the	171	* Next, we check for a count (either specified in name, or in the
174	* player object.)	172	* player object.)
175	* If count is 1, make a quick check on the name.	173	* 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.	174	* IF count is >1, we need to make plural name. Return if match.
177	* Last, make a check on the full name.	175	* Last, make a check on the full name.
178	*/	176	*/
179	int	177	int
180	item_matched_string (object pl, object op, const char *name)	178	item_matched_string (object pl, object op, const char *name)
181	{	179	{
182	char *cp, local_name[MAX_BUF];	180	char *cp, local_name[MAX_BUF];
183	int count, retval = 0;	181	int count, retval = 0;
…		…
275	}	273	}
276		274
277	return 0;	275	return 0;
278	}	276	}
279		277
280	archetype::archetype ()	278	archetype::archetype (const char *name)
281	{	279	{
282	clone.arch = this;	280	arch = this;
283		281	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	}	282	}
287		283
288	archetype::~archetype ()	284	archetype::~archetype ()
289	{	285	{
290	//TODO: nuke ->more's	286	unlink ();
291	}	287	}
292		288
293	static void
294	unlink (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
310	void	289	void
311	overwrite (archetype at, object op)	290	archetype::link ()
312	{	291	{
313	at->clone = *op;	292	if (!archetypes.contains (this))
314		293	{
315	at->clone.arch = at;	294	archetypes.insert (this);
316	//TODO: inv et al.	295	ht.insert (std::make_pair (archname, this));
		296	}
		297	}
		298
		299	void
		300	archetype::unlink ()
		301	{
		302	if (archetypes.contains (this))
		303	{
		304	archetypes.erase (this);
		305	ht.erase (archname);
		306	}
		307	}
		308
		309	/*
		310	* Finds, using the hashtable, which archetype matches the given name.
		311	* returns a pointer to the found archetype, otherwise NULL.
		312	*/
		313	archetype *
		314	archetype::find (const char *name)
		315	{
		316	if (!name)
		317	return 0;
		318
		319	auto (i, ht.find (name));
		320
		321	if (i == ht.end ())
		322	return 0;
		323	else
		324	return i->second;
317	}	325	}
318		326
319	archetype *	327	archetype *
320	archetype::read (object_thawer &f)	328	archetype::read (object_thawer &f)
321	{	329	{
322	assert (f.kw == KW_object);	330	assert (f.kw == KW_object);
323		331
324	archetype *head = get (f.get_str ());	332	std::vector<archetype *> parts;
325	unlink (head);
326	object *op = object::create ();
327		333
328	if (!op->parse_kv (f))	334	coroapi::cede_to_tick ();
329	{	335
330	op->destroy (true);	336	for (;;)
331	// leak head
332	return 0;
333	}	337	{
		338	archetype *at = new archetype (f.get_str ());
334		339
335	overwrite (head, op);
336	op->destroy ();
337
338	for (archetype *prev = head; f.kw == KW_more; )
339	{
340	f.next ();	340	f.next ();
341	assert (f.kw == KW_object);
342		341
343	archetype *more = get (f.get_str ());	342	#if 0
344	unlink (more);	343	// implementing it here in the server does neither allow multiple inheritence
345	object *op = object::create ();	344	// nor does it cleanly "just override". it would allow use in map files, though,
346		345	// and other resource files dynamically laoded (as opposed to being preprocessed).
347	if (!op->parse_kv (f))	346	// not that any of this is relevant as of yet...
		347	if (f.kw == KW_inherit)
348	{	348	{
349	op->destroy (true);	349	if (archetype *at = find (f.get_str ()))
350	// leak head more*	350	*op = at->clone;
351	return 0;	351	else
		352	LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
		353	&at->archname, f.get_str ());
		354
		355	f.next ();
352	}	356	}
		357	#endif
353		358
354	overwrite (more, op);	359	loading_arch = at; // hack to tell parse_kv et al. to behave
355	op->destroy ();	360	bool parse_ok = at->parse_kv (f);
		361	loading_arch = 0;
356		362
357	if (more->clone.x > head->tail_x) head->tail_x = more->clone.x;	363	if (!parse_ok)
358	if (more->clone.y > head->tail_y) head->tail_y = more->clone.y;	364	goto fail;
359		365
360	more->head = head;	366	loading_arch = at; // hack to tell parse_kv et al. to behave
361	more->clone.head = &head->clone;	367	at->post_load_check ();
362	prev->more = more;	368	loading_arch = 0;
363	prev->clone.more = &more->clone;
364		369
365	prev = more;	370	parts.push_back (at);
366	}
367		371
368	if (!head->next)	372	if (f.kw != KW_more)
369	{	373	break;
370	head->next = first_archetype;
371	first_archetype = head;
372	}
373		374
374	return head;	375	f.next ();
375	}
376		376
377	/*	377	if (f.kw != KW_object)
378	* Reads/parses the archetype-file, and copies into a linked list
379	* of archetype-structures.
380	*/
381	static bool
382	load_archetypes (object_thawer &f)
383	{
384	for (;;)
385	{
386	switch (f.kw)
387	{	378	{
388	case KW_object:	379	f.parse_error ("more object");
389	loading_arch = true;	380	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	}	381	}
406
407	f.next ();
408	}	382	}
409	}
410		383
411	/*	384	{
412	* First initialises the archtype hash-table (init_archetable()).	385	auto (at, parts.begin ());
413	* Reads and parses the archetype file (with the first and second-pass
414	* functions).
415	*/
416	bool
417	load_archetype_file (const char *filename)
418	{
419	object_thawer f (filename);
420		386
421	f.next ();	387	archetype *new_head = parts.front ();
		388	archetype *old_head = find (new_head->archname);
422		389
423	// make sure the next - long - step is only done after a tick	390	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	*/
444	object *
445	arch_to_object (archetype *at)
446	{
447	if (!at)
448	{	391	{
449	if (warn_archetypes)	392	LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
450	LOG (llevError, "Couldn't find archetype.\n");	393	&new_head->archname, &old_head->archname);
451		394	goto fail;
452	return NULL;
453	}	395	}
454		396
		397	// check that all archetypes belong to the same old object or are new
		398	for (auto (at, parts.begin ()); at != parts.end (); ++at)
		399	{
		400	archetype new_part = at;
		401	archetype *old_part = find (new_part->archname);
		402
		403	if (old_part && old_part->head_ () != old_head)
		404	{
		405	LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
		406	&new_part->archname, &((archetype *)old_part->head_ ())->archname);
		407	goto fail;
		408	}
		409	}
		410
		411	// assemble new chain
		412	new_head->min_x = new_head->max_x = new_head->x;
		413	new_head->min_y = new_head->max_y = new_head->y;
		414
		415	archetype *less = new_head;
		416	for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
		417	{
		418	archetype at = p;
		419
		420	// some flags get inherited from the head (probably a lot more)
		421	// doing it here doesn't feel too cozy, but it allows code
		422	// to ignore head checks for these flags, which saves time
		423	at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
		424	at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
		425	at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
		426	at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
		427
		428	new_head->min_x = min (new_head->min_x, at->x);
		429	new_head->min_y = min (new_head->min_y, at->y);
		430	new_head->max_x = max (new_head->max_x, at->x);
		431	new_head->max_y = max (new_head->max_y, at->y);
		432
		433	at->head = new_head;
		434	less->more = at;
		435	less = at;
		436	}
		437
		438	postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
		439
		440	return new_head;
		441	}
		442
		443	fail:
		444	for (auto (p, parts.begin ()); p != parts.end (); ++p)
		445	(*p)->destroy ();
		446
		447	return 0;
		448	}
		449
		450	void
		451	archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
		452	{
		453	ref = 0;
		454	postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
		455	}
		456
		457	void
		458	archetype::commit_load ()
		459	{
		460	// unlink old archetypes and link in new ones */
		461	for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p)
		462	{
		463	archetype at = p;
		464
		465	if (archetype *old = find (at->archname))
		466	old->unlink ();
		467
		468	allarch.push_back (at);
		469
		470	at->link ();
		471	++dirtycnt;
		472	}
		473
		474	postponed_arch.clear ();
		475
		476	// now resolve arch references
		477	for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p)
		478	{
		479	arch_ptr *ap = p->first;
		480	archetype *at = find (p->second);
		481
		482	if (!at)
		483	LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second);
		484
		485	*ap = at;
		486	}
		487
		488	postponed_arch_ref.clear ();
		489
		490	empty = find (shstr_empty_archetype);
		491	}
		492
		493	void
		494	archetype::gc ()
		495	{
		496	int cnt = max (1, min (allarch.size () / 128, dirtycnt));
		497	dirtycnt = max (0, dirtycnt - cnt);
		498
		499	do
		500	{
		501	static int idx;
		502
		503	if (idx >= allarch.size ())
		504	if (idx)
		505	idx = 0;
		506	else
		507	return;
		508
		509	archetype *at = allarch [idx];
		510
		511	if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
		512	++idx;
		513	else
		514	{
		515	LOG (llevDebug, "garbage collect arch %s", at->debug_desc ());
		516	assert (at->arch == at); // verify that refcnt == 1 is truly valid
		517	allarch.erase (idx);
		518
		519	// break chain
		520	for (object *op = at->head_ (); op; )
		521	{
		522	object *next = op->more;
		523	op->head = 0;
		524	op->more = 0;
		525	op = next;
		526	}
		527
		528	at->destroy ();
		529	at->arch = 0;
		530	}
		531	}
		532	while (--cnt);
		533	}
		534
		535	object *
		536	archetype::instance ()
		537	{
455	object *op = at->clone.clone ();	538	object *op = clone ();
456	op->arch = at;
457	op->instantiate ();	539	op->instantiate ();
458	return op;	540	return op;
459	}	541	}
460		542
461	/*	543	/*
…		…
465	* an object, and never NULL.	547	* an object, and never NULL.
466	*/	548	*/
467	object *	549	object *
468	create_singularity (const char *name)	550	create_singularity (const char *name)
469	{	551	{
470	object *op;	552	LOG (llevError \| logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
471	char buf[MAX_BUF];
472		553
473	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);	554	if (!strcmp (name, "bug"))
474	op = object::create ();	555	abort ();
475	op->name = op->name_pl = buf;	556
476	SET_FLAG (op, FLAG_NO_PICK);	557	object *op = archetype::get (shstr_bug);
		558	op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
		559
477	return op;	560	return op;
478	}	561	}
479		562
480	/*	563	/*
481	* Finds which archetype matches the given name, and returns a new	564	* Finds which archetype matches the given name, and returns a new
482	* object containing a copy of the archetype.	565	* object containing a copy of the archetype.
483	*/	566	*/
484	object *	567	object *
485	get_archetype (const char *name)	568	get_archetype (const char *name)
486	{	569	{
		570	return archetype::get (name);
		571	}
		572
		573	object *
		574	archetype::get (const char *name)
		575	{
487	archetype *at = archetype::find (name);	576	archetype *at = find (name);
488		577
489	if (!at)	578	if (!at)
490	return create_singularity (name);	579	return create_singularity (name);
491		580
492	return arch_to_object (at);	581	return at->instance ();
493	}
494
495	/*
496	* Hash-function used by the arch-hashtable.
497	*/
498
499	unsigned long
500	hasharch (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	*/
529	archetype *
530	archetype::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
543	archetype *
544	archetype::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	*/
561	void
562	archetype::hash_add ()
563	{
564	ht.insert (std::make_pair (name, this));
565	}
566
567	void
568	archetype::hash_del ()
569	{
570	ht.erase (name);
571	}	582	}
572		583
573	/*	584	/*
574	* Returns the first archetype using the given type.	585	* Returns the first archetype using the given type.
575	* Used in treasure-generation.	586	* Used in treasure-generation.
576	*/	587	*/
577	archetype *	588	archetype *
578	type_to_archetype (int type)	589	type_to_archetype (int type)
579	{	590	{
580	for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)	591	for_all_archetypes (at)
581	if (at->clone.type == type)	592	if (at->type == type && at->head_ () != at)
582	return at;	593	return at;
583		594
584	return 0;	595	return 0;
585	}	596	}
586		597
…		…
590	* Used in treasure-generation.	601	* Used in treasure-generation.
591	*/	602	*/
592	object *	603	object *
593	clone_arch (int type)	604	clone_arch (int type)
594	{	605	{
595	archetype *at;	606	archetype *at = type_to_archetype (type);
596		607
597	if ((at = type_to_archetype (type)) == NULL)	608	if (!at)
598	{	609	{
599	LOG (llevError, "Can't clone archetype %d\n", type);	610	LOG (llevError, "Can't clone archetype %d\n", type);
600	return 0;	611	return 0;
601	}	612	}
602		613
603	object *op = at->clone.clone ();	614	return at->instance ();
604	op->instantiate ();
605	return op;
606	}	615	}
607		616
608	/*	617	/*
609	* member: make instance from class	618	* member: make instance from class
610	*/	619	*/
611
612	object *	620	object *
613	object_create_arch (archetype *at)	621	object_create_arch (archetype *at)
614	{	622	{
615	object op, prev = 0, *head = 0;	623	object op, prev = 0, *head = 0;
616		624
617	while (at)	625	while (at)
618	{	626	{
619	op = arch_to_object (at);	627	op = at->instance ();
		628
620	op->x = at->clone.x;	629	op->x = at->x;
621	op->y = at->clone.y;	630	op->y = at->y;
622		631
623	if (head)	632	if (head)
624	op->head = head, prev->more = op;	633	op->head = head, prev->more = op;
625		634
626	if (!head)	635	if (!head)
627	head = op;	636	head = op;
628		637
629	prev = op;	638	prev = op;
630	at = at->more;	639	at = (archetype *)at->more;
631	}	640	}
632		641
633	return (head);	642	return head;
634	}	643	}
635		644

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.48 by root, Mon Apr 16 11:09:30 2007 UTC vs. Revision 1.85 by root, Mon Sep 29 10:32:50 2008 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.48 by root, Mon Apr 16 11:09:30 2007 UTC vs.
Revision 1.85 by root, Mon Sep 29 10:32:50 2008 UTC