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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.50 by root, Mon Apr 16 13:02:28 2007 UTC vs.
Revision 1.78 by root, Fri May 2 16:16:02 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 arch_to_object (at);
110		108
111	return 0;	109	return 0;
112	}	110	}
113		111
…		…
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	{
…		…
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	at->clone.inv = op->inv; op->inv = 0;	295	ht.insert (std::make_pair (archname, this));
317		296	}
318	op->destroy ();
319	}	297	}
320		298
321	bool	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;
		325	}
		326
		327	archetype *
322	archetype::load (object_thawer &f)	328	archetype::read (object_thawer &f)
323	{	329	{
324	assert (f.kw == KW_object);	330	assert (f.kw == KW_object);
325		331
326	typedef std::pair<archetype , object > part;
327	std::vector<part> parts;	332	std::vector<archetype *> parts;
		333
		334	coroapi::cede_to_tick ();
328		335
329	for (;;)	336	for (;;)
330	{	337	{
331	archetype *at = get (f.get_str ());	338	archetype *at = new archetype (f.get_str ());
332	object *op = object::create ();
333		339
		340	f.next ();
		341
		342	#if 0
		343	// implementing it here in the server does neither allow multiple inheritence
		344	// nor does it cleanly "just override". it would allow use in map files, though,
		345	// and other resource files dynamically laoded (as opposed to being preprocessed).
		346	// not that any of this is relevant as of yet...
		347	if (f.kw == KW_inherit)
		348	{
		349	if (archetype *at = find (f.get_str ()))
		350	*op = at->clone;
		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 ();
		356	}
		357	#endif
		358
		359	loading_arch = at; // hack to tell parse_kv et al. to behave
		360	bool parse_ok = at->parse_kv (f);
		361	loading_arch = 0;
		362
334	if (!op->parse_kv (f))	363	if (!parse_ok)
335	goto fail;	364	goto fail;
336		365
337	parts.push_back (std::make_pair (at, op));	366	loading_arch = at; // hack to tell parse_kv et al. to behave
		367	at->post_load_check ();
		368	loading_arch = 0;
		369
		370	parts.push_back (at);
338		371
339	if (f.kw != KW_more)	372	if (f.kw != KW_more)
340	break;	373	break;
341		374
342	f.next ();	375	f.next ();
		376
343	assert (f.kw == KW_object);	377	if (f.kw != KW_object)
		378	{
		379	f.parse_error ("more object");
		380	goto fail;
		381	}
344	}	382	}
345		383
346	{	384	{
		385	auto (at, parts.begin ());
		386
347	archetype *head = parts.front ().first;	387	archetype *new_head = parts.front ();
		388	archetype *old_head = find (new_head->archname);
348		389
349	// check that all archetypes belong to the same object or are heads	390	if (old_head && !old_head->is_head ())
350	for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p)
351	{	391	{
352	archetype *at = p->first;	392	LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
		393	&new_head->archname, &old_head->archname);
		394	goto fail;
		395	}
353		396
354	if (at->head != head && at->head)	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)
355	{	404	{
356	LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name);	405	LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
357	goto fail;	406	&new_part->archname, &((archetype *)old_part->head_ ())->archname);
358	}
359
360	if (at->next && at != head)
361	{
362	LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
363	goto fail;	407	goto fail;
364	}	408	}
365	}	409	}
366		410
367	// sever chain of existing head object	411	// assemble new chain
368	for (archetype more, at = head; at; at = more)	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)
369	{	417	{
370	more = at->more;	418	archetype at = p;
371		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
372	at->head = 0;	433	at->head = new_head;
373	at->more = 0;	434	less->more = at;
		435	less = at;
374	}	436	}
375		437
376	// replace/update head	438	postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
377	overwrite (head, parts.front ().second);
378	head->tail_x = 0;
379	head->tail_y = 0;
380		439
381	// link into list of heads, if not already there	440	return new_head;
382	if (!head->linked)
383	{
384	head->linked = true;
385	head->next = first_archetype;
386	first_archetype = head;
387	}
388
389	// reassemble new chain
390	archetype *prev = head;
391	for (AUTODECL (p, parts.begin () + 1); p != parts.end (); ++p)
392	{
393	archetype *at = p->first;
394	overwrite (at, p->second);
395
396	if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;
397	if (at->clone.y > head->tail_y) head->tail_y = at->clone.y;
398
399	at->head = head;
400	at->clone.head = &head->clone;
401	prev->more = at;
402	prev->clone.more = &at->clone;
403
404	prev = at;
405	}
406	}	441	}
407		442
408	return true;
409
410	fail:	443	fail:
411	for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p)	444	for (auto (p, parts.begin ()); p != parts.end (); ++p)
412	p->second->destroy (true);	445	(*p)->destroy (true);
413		446
414	return false;	447	return 0;
415	}	448	}
416		449
417	/*	450	void
418	* Reads/parses the archetype-file, and copies into a linked list	451	archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
419	* of archetype-structures.
420	*/
421	static bool
422	load_archetypes (object_thawer &f)
423	{	452	{
424	for (;;)	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;
425	{	472	}
426	switch (f.kw)	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
427	{	514	{
428	case KW_object:	515	LOG (llevDebug, "garbage collect arch %s", at->debug_desc ());
429	loading_arch = true;	516	assert (at->arch == at); // verify that refcnt == 1 is truely valid
430	if (!archetype::load (f))	517	allarch.erase (idx);
		518
		519	// break chain
		520	for (object *op = at->head_ (); op; )
431	{	521	{
432	loading_arch = false;	522	object *next = op->more;
433	return false;	523	op->head = 0;
		524	op->more = 0;
		525	op = next;
434	}	526	}
435		527
436	loading_arch = false;	528	at->destroy ();
437	continue;	529	at->arch = 0;
438
439	case KW_EOF:
440	return true;
441
442	default:
443	if (!f.parse_error ("archetypes file"))
444	return false;
445	}	530	}
446
447	f.next ();
448	}	531	}
449	}	532	while (--cnt);
450
451	/*
452	* First initialises the archtype hash-table (init_archetable()).
453	* Reads and parses the archetype file (with the first and second-pass
454	* functions).
455	*/
456	bool
457	load_archetype_file (const char *filename)
458	{
459	object_thawer f (filename);
460
461	f.next ();
462
463	// make sure the next - long - step is only done after a tick
464	coroapi::wait_for_tick_begin ();
465
466	if (!load_archetypes (f))
467	return false;
468
469	warn_archetypes = 1;
470
471	empty_archetype = archetype::find ("empty_archetype");
472	if (!empty_archetype)
473	return false;
474
475	coroapi::cede ();
476
477	return true;
478	}	533	}
479		534
480	/*	535	/*
481	* Creates and returns a new object which is a copy of the given archetype.	536	* Creates and returns a new object which is a copy of the given archetype.
482	* This function returns NULL on failure.	537	* This function returns NULL on failure.
…		…
484	object *	539	object *
485	arch_to_object (archetype *at)	540	arch_to_object (archetype *at)
486	{	541	{
487	if (!at)	542	if (!at)
488	{	543	{
489	if (warn_archetypes)
490	LOG (llevError, "Couldn't find archetype.\n");	544	LOG (llevError, "Couldn't find archetype.\n");
491
492	return NULL;	545	return 0;
493	}	546	}
494		547
495	object *op = at->clone.clone ();	548	object *op = at->clone ();
496	op->arch = at;	549	op->arch = at;
497	op->instantiate ();	550	op->instantiate ();
		551
498	return op;	552	return op;
		553	}
		554
		555	object *
		556	archetype::instance ()
		557	{
		558	return arch_to_object (this);
499	}	559	}
500		560
501	/*	561	/*
502	* Creates an object. This function is called by get_archetype()	562	* Creates an object. This function is called by get_archetype()
503	* if it fails to find the appropriate archetype.	563	* if it fails to find the appropriate archetype.
…		…
505	* an object, and never NULL.	565	* an object, and never NULL.
506	*/	566	*/
507	object *	567	object *
508	create_singularity (const char *name)	568	create_singularity (const char *name)
509	{	569	{
510	object *op;	570	LOG (llevError \| logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
		571
		572	if (!strcmp (name, "bug"))
		573	abort ();
		574
511	char buf[MAX_BUF];	575	char buf[MAX_BUF];
		576	sprintf (buf, "bug, please report (%s)", name);
512		577
513	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);	578	object *op = get_archetype ("bug");
514	op = object::create ();
515	op->name = op->name_pl = buf;	579	op->name = op->name_pl = buf;
516	SET_FLAG (op, FLAG_NO_PICK);	580
517	return op;	581	return op;
518	}	582	}
519		583
520	/*	584	/*
521	* Finds which archetype matches the given name, and returns a new	585	* Finds which archetype matches the given name, and returns a new
…		…
530	return create_singularity (name);	594	return create_singularity (name);
531		595
532	return arch_to_object (at);	596	return arch_to_object (at);
533	}	597	}
534		598
535	/*	599	object *
536	* Finds, using the hashtable, which archetype matches the given name.
537	* returns a pointer to the found archetype, otherwise NULL.
538	*/
539	archetype *
540	archetype::find (const char *name)
541	{
542	if (!name)
543	return 0;
544
545	AUTODECL (i, ht.find (name));
546
547	if (i == ht.end ())
548	return 0;
549	else
550	return i->second;
551	}
552
553	archetype *
554	archetype::get (const char *name)	600	archetype::get (const char *name)
555	{	601	{
556	archetype *at = find (name);	602	return get_archetype (name);
557
558	if (!at)
559	{
560	archetypes.push_back (at = new archetype);
561	at->name = name;
562	at->hash_add ();
563	}
564
565	return at;
566	}
567
568	/*
569	* Adds an archetype to the hashtable.
570	*/
571	void
572	archetype::hash_add ()
573	{
574	ht.insert (std::make_pair (name, this));
575	}
576
577	void
578	archetype::hash_del ()
579	{
580	ht.erase (name);
581	}	603	}
582		604
583	/*	605	/*
584	* Returns the first archetype using the given type.	606	* Returns the first archetype using the given type.
585	* Used in treasure-generation.	607	* Used in treasure-generation.
586	*/	608	*/
587	archetype *	609	archetype *
588	type_to_archetype (int type)	610	type_to_archetype (int type)
589	{	611	{
590	for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)	612	for_all_archetypes (at)
591	if (at->clone.type == type)	613	if (at->type == type && at->head_ () != at)
592	return at;	614	return at;
593		615
594	return 0;	616	return 0;
595	}	617	}
596		618
…		…
608	{	630	{
609	LOG (llevError, "Can't clone archetype %d\n", type);	631	LOG (llevError, "Can't clone archetype %d\n", type);
610	return 0;	632	return 0;
611	}	633	}
612		634
613	object *op = at->clone.clone ();	635	object *op = at->clone ();
614	op->instantiate ();	636	op->instantiate ();
615	return op;	637	return op;
616	}	638	}
617		639
618	/*	640	/*
619	* member: make instance from class	641	* member: make instance from class
620	*/	642	*/
621
622	object *	643	object *
623	object_create_arch (archetype *at)	644	object_create_arch (archetype *at)
624	{	645	{
625	object op, prev = 0, *head = 0;	646	object op, prev = 0, *head = 0;
626		647
627	while (at)	648	while (at)
628	{	649	{
629	op = arch_to_object (at);	650	op = arch_to_object (at);
		651
630	op->x = at->clone.x;	652	op->x = at->x;
631	op->y = at->clone.y;	653	op->y = at->y;
632		654
633	if (head)	655	if (head)
634	op->head = head, prev->more = op;	656	op->head = head, prev->more = op;
635		657
636	if (!head)	658	if (!head)
637	head = op;	659	head = op;
638		660
639	prev = op;	661	prev = op;
640	at = at->more;	662	at = (archetype *)at->more;
641	}	663	}
642		664
643	return (head);	665	return head;
644	}	666	}
645		667

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.50 by root, Mon Apr 16 13:02:28 2007 UTC vs. Revision 1.78 by root, Fri May 2 16:16:02 2008 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.50 by root, Mon Apr 16 13:02:28 2007 UTC vs.
Revision 1.78 by root, Fri May 2 16:16:02 2008 UTC