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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.69 by root, Tue Sep 4 18:20:35 2007 UTC vs.
Revision 1.116 by root, Sat Nov 17 23:39:59 2018 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
		5	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	6	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	7	* Copyright (©) 1992 Frank Tore Johansen
7	*	8	*
8	* Crossfire TRT is free software: you can redistribute it and/or modify	9	* 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	10	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	11	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	12	* option) any later version.
12	*	13	*
13	* This program is distributed in the hope that it will be useful,	14	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	17	* GNU General Public License for more details.
17	*	18	*
18	* You should have received a copy of the GNU General Public License	19	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	20	* and the GNU General Public License along with this program. If not, see
		21	* <http://www.gnu.org/licenses/>.
20	*	22	*
21	* The authors can be reached via e-mail to <crossfire@schmorp.de>	23	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	24	*/
23		25
24	#include <cassert>	26	#include <cassert>
		27	#include <functional>
		28
		29	#include <flat_hash_map.hpp>
25		30
26	#include <global.h>	31	#include <global.h>
27	#include <funcpoint.h>
28	#include <loader.h>
29		32
30	#include <tr1/functional>
31	#include <tr1/unordered_map>
32
33	/* The naming of these functions is really poor - they are all
34	* pretty much named '.._arch_...', but they may more may not
35	* return archetypes. Some make the arch_to_object call, and thus
36	* return an object. Perhaps those should be called 'archob' functions
37	* to denote they return an object derived from the archetype.
38	* MSW 2003-04-29
39	*/
40
41	archetype *loading_arch; // ugly flag to object laoder etc. to suppress/request special processing	33	archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
		34	arch_ptr archetype::empty;
42		35
43	// the hashtable	36	// the hashtable
44	typedef std::tr1::unordered_map	37	typedef ska::flat_hash_map<
45	<
46	const char *,	38	const char *,
47	arch_ptr,	39	arch_ptr,
48	str_hash,	40	str_hash,
49	str_equal,	41	str_equal,
50	slice_allocator< std::pair<const char *const, arch_ptr> >	42	slice_allocator< std::pair<const char *const, arch_ptr> >
51	> HT;	43	> HT;
52		44
53	static HT ht (5000);	45	static HT ht (10000);
54	archvec archetypes;	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
		53	static std::vector<archetype *> postponed_arch;
		54
		55	//+GPL
		56
		57	/*
		58	* Creates an object. This function is called by archetype::get ()
		59	* if it fails to find the appropriate archetype.
		60	* Thus archetype::get() will be guaranteed to always return
		61	* an object, and never NULL.
		62	*/
		63	static object *
		64	create_singularity (const char *name)
		65	{
		66	LOG (llevError \| logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
		67
		68	if (!strcmp (name, "bug"))
		69	abort ();
		70
		71	object *op = archetype::get (shstr_bug);
		72	op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
		73
		74	return op;
		75	}
55		76
56	/**	77	/**
57	* GROS - This function retrieves an archetype given the name that appears	78	* GROS - This function retrieves an archetype given the name that appears
58	* during the game (for example, "writing pen" instead of "stylus").	79	* during the game (for example, "writing pen" instead of "stylus").
59	* It does not use the hashtable system, but browse the whole archlist each time.	80	* It does not use the hashtable system, but browse the whole archlist each time.
103	{	124	{
104	shstr_cmp skill_cmp (skill);	125	shstr_cmp skill_cmp (skill);
105		126
106	for_all_archetypes (at)	127	for_all_archetypes (at)
107	if (at->skill == skill_cmp && (type == -1 \|\| type == at->type))	128	if (at->skill == skill_cmp && (type == -1 \|\| type == at->type))
108	return arch_to_object (at);	129	return at->instance ();
109		130
110	return 0;	131	return 0;
111	}	132	}
112		133
113	/* similiar to above - this returns the first archetype	134	/* similiar to above - this returns the first archetype
…		…
134	* - name: The name we're searching for (ex: "writing pen");	155	* - name: The name we're searching for (ex: "writing pen");
135	* Return value:	156	* Return value:
136	* - a corresponding object if found; a singularity object if not found.	157	* - a corresponding object if found; a singularity object if not found.
137	* Note by MSW - it appears that it takes the full name and keeps	158	* Note by MSW - it appears that it takes the full name and keeps
138	* shortening it until it finds a match. I re-wrote this so that it	159	* shortening it until it finds a match. I re-wrote this so that it
139	* doesn't malloc it each time - not that this function is used much,	160	* doesn't allocate it each time - not that this function is used much,
140	* but it otherwise had a big memory leak.	161	* but it otherwise had a big memory leak.
141	*/	162	*/
142	object *	163	object *
143	get_archetype_by_object_name (const char *name)	164	get_archetype_by_object_name (const char *name)
144	{	165	{
145	char tmpname[MAX_BUF];	166	char tmpname[MAX_BUF];
146	int i;
147		167
148	assign (tmpname, name);	168	assign (tmpname, name);
149		169
150	for (i = strlen (tmpname); i > 0; i--)	170	for (int i = strlen (tmpname); i > 0; i--)
151	{	171	{
152	tmpname[i] = 0;	172	tmpname[i] = 0;
153		173
154	if (archetype *at = find_archetype_by_object_name (tmpname))	174	if (archetype *at = find_archetype_by_object_name (tmpname))
155	return arch_to_object (at);	175	return at->instance ();
156	}	176	}
157		177
158	return create_singularity (name);	178	return create_singularity (name);
159	}	179	}
160		180
…		…
192	/* All is a very generic match - low match value */	212	/* All is a very generic match - low match value */
193	if (!strcmp (cp, "all"))	213	if (!strcmp (cp, "all"))
194	return 1;	214	return 1;
195		215
196	/* unpaid is a little more specific */	216	/* unpaid is a little more specific */
197	if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID))	217	if (!strcmp (cp, "unpaid") && op->flag [FLAG_UNPAID])
198	return 2;	218	return 2;
199	if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) \|\| QUERY_FLAG (op, FLAG_DAMNED)))	219
		220	if (!strcmp (cp, "cursed") && op->flag [FLAG_KNOWN_CURSED] && (op->flag [FLAG_CURSED] \|\| op->flag [FLAG_DAMNED]))
200	return 2;	221	return 2;
201		222
202	if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED))	223	if (!strcmp (cp, "unlocked") && !op->flag [FLAG_INV_LOCKED])
203	return 2;	224	return 2;
204		225
205	/* Allow for things like '100 arrows' */	226	/* Allow for things like '100 arrows' */
206	if ((count = atoi (cp)) != 0)	227	if ((count = atoi (cp)) != 0)
207	{	228	{
…		…
225	* is because of the 'else' handling - we don't want to match on	246	* is because of the 'else' handling - we don't want to match on
226	* something and set a low retval, even though it may match a higher retcal	247	* something and set a low retval, even though it may match a higher retcal
227	* later. So keep it in descending order here, so we try for the best	248	* later. So keep it in descending order here, so we try for the best
228	* match first, and work downward.	249	* match first, and work downward.
229	*/	250	*/
		251	const char qbn0, qbn1, *qsn; // query base name/short name caches
		252
230	if (!strcasecmp (cp, query_name (op)))	253	if (!strcasecmp (cp, query_name (op)))
231	retval = 20;	254	retval = 20;
232	else if (!strcasecmp (cp, query_short_name (op)))	255	else if (!strcasecmp (cp, qsn = query_short_name (op)))
233	retval = 18;	256	retval = 18;
234	else if (!strcasecmp (cp, query_base_name (op, 0)))	257	else if (!strcasecmp (cp, qbn0 = query_base_name (op, 0)))
235	retval = 16;	258	retval = 16;
236	else if (!strcasecmp (cp, query_base_name (op, 1)))	259	else if (!strcasecmp (cp, qbn1 = query_base_name (op, 1)))
237	retval = 16;	260	retval = 16;
238	else if (op->custom_name && !strcasecmp (cp, op->custom_name))	261	else if (op->custom_name && !strcasecmp (cp, op->custom_name))
239	retval = 15;	262	retval = 15;
240	else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))	263	else if (!strncasecmp (cp, qbn0, strlen (cp)))
241	retval = 14;	264	retval = 14;
242	else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))	265	else if (!strncasecmp (cp, qbn1, strlen (cp)))
243	retval = 14;	266	retval = 14;
244	/* Do substring checks, so things like 'Str+1' will match.	267	/* Do substring checks, so things like 'Str+1' will match.
245	* retval of these should perhaps be lower - they are lower	268	* retval of these should perhaps be lower - they are lower
246	* then the specific strcasecmp aboves, but still higher than	269	* then the specific strcasecmp aboves, but still higher than
247	* some other match criteria.	270	* some other match criteria.
248	*/	271	*/
249	else if (strstr (query_base_name (op, 1), cp))	272	else if (strstr (qbn1, cp))
250	retval = 12;	273	retval = 12;
251	else if (strstr (query_base_name (op, 0), cp))	274	else if (strstr (qbn0, cp))
252	retval = 12;	275	retval = 12;
253	else if (strstr (query_short_name (op), cp))	276	else if (strstr (qsn, cp))
254	retval = 12;	277	retval = 12;
255	/* Check against plural/non plural based on count. */	278	/* Check against plural/non plural based on count. */
256	else if (count > 1 && !strcasecmp (cp, op->name_pl))	279	else if (count > 1 && !strcasecmp (cp, op->name_pl))
257	retval = 6;	280	retval = 6;
258	else if (count == 1 && !strcasecmp (op->name, cp))	281	else if (count == 1 && !strcasecmp (op->name, cp))
259	retval = 6;	282	retval = 6;
260	/* base name matched - not bad */	283	/* base name matched - not bad */
261	else if (strcasecmp (cp, op->name) == 0 && !count)	284	else if (strcasecmp (cp, op->name) == 0 && !count)
262	retval = 4;	285	retval = 4;
263	/* Check for partial custom name, but give a real low priority */	286	/* Check for partial custom name, but give a real low priority */
264	else if (op->custom_name && strstr (op->custom_name, cp))	287	else if (op->custom_name.contains (cp))
265	retval = 3;	288	retval = 3;
266		289
267	if (retval)	290	if (retval)
268	{	291	{
269	if (pl->type == PLAYER)	292	if (pl->type == PLAYER)
…		…
274	}	297	}
275		298
276	return 0;	299	return 0;
277	}	300	}
278		301
		302	//-GPL
		303
		304	void
		305	archetype::do_delete ()
		306	{
		307	delete this;
		308	}
		309
279	archetype::archetype (const char *name)	310	archetype::archetype (const char *name)
280	{	311	{
281	stub = true;
282	arch = this;	312	arch = this;
283	this->archname = this->name = this->name_pl = name;	313	this->archname = this->name = this->name_pl = name;
284	}	314	}
285		315
286	archetype::~archetype ()	316	archetype::~archetype ()
…		…
289	}	319	}
290		320
291	void	321	void
292	archetype::link ()	322	archetype::link ()
293	{	323	{
294	ht.insert (std::make_pair (archname, this));
295
296	if (!archetypes.contains (this))	324	if (!archetypes.contains (this))
		325	{
297	archetypes.insert (this);	326	archetypes.insert (this);
		327	ht.insert (std::make_pair (archname, this));
		328	}
298	}	329	}
299		330
300	void	331	void
301	archetype::unlink ()	332	archetype::unlink ()
302	{	333	{
303	ht.erase (archname);
304
305	if (archetypes.contains (this))	334	if (archetypes.contains (this))
		335	{
306	archetypes.erase (this);	336	archetypes.erase (this);
		337	ht.erase (archname);
		338	}
307	}	339	}
308		340
309	/*	341	/*
310	* Finds, using the hashtable, which archetype matches the given name.	342	* Finds, using the hashtable, which archetype matches the given name.
311	* returns a pointer to the found archetype, otherwise NULL.	343	* returns a pointer to the found archetype, otherwise NULL.
…		…
322	return 0;	354	return 0;
323	else	355	else
324	return i->second;	356	return i->second;
325	}	357	}
326		358
327	archetype *	359	void
328	archetype::get (const char *name)	360	archetype::post_load_check ()
329	{	361	{
330	if (!name)	362	assert (("obj_original MUST NOT be set for archetypes", !flag [FLAG_OBJ_ORIGINAL]));
331	{
332	LOG (llevError, "null archetype requested\n");
333	name = "(null)";
334	}
335		363
336	if (loading_arch && !strcmp (&loading_arch->archname, name))	364	if (type == SKILL)
337	return loading_arch;	365	add_skill_archetype (this);
338		366
339	archetype *at = find (name);	367	object::post_load_check ();
340
341	if (!at)
342	{
343	at = new archetype (name);
344	at->link ();
345	}
346
347	return at;
348	}	368	}
349		369
350	archetype *	370	archetype *
351	archetype::read (object_thawer &f)	371	archetype::read (object_thawer &f)
352	{	372	{
353	assert (f.kw == KW_object);	373	assert (f.kw == KW_object);
354		374
355	std::vector<archetype *> parts;	375	std::vector<archetype *> parts;
356		376
357	coroapi::cede_to_tick_every (10);	377	coroapi::cede_to_tick ();
358		378
359	for (;;)	379	for (;;)
360	{	380	{
361	// the archetype might have been referenced earlier
362	// so try to find an existing stub archetype first
363	archetype *at = find (f.get_str ());	381	archetype *at = new archetype (f.get_str ());
364
365	if (!at \|\| !at->stub)
366	at = new archetype (f.get_str ());
367		382
368	f.next ();	383	f.next ();
369		384
370	#if 0	385	#if 0
371	// implementing it here in the server does neither allow multiple inheritence	386	// implementing it here in the server does neither allow multiple inheritence
372	// nor does it cleanly "just override". it would allow use in map files, though,	387	// nor does it cleanly "just override". it would allow use in map files, though,
373	// and other resource files dynamically laoded (as opposed to being preprocessed).	388	// and other resource files dynamically loaded (as opposed to being preprocessed).
374	// not that any of this is relevant as of yet...	389	// not that any of this is relevant as of yet...
375	if (f.kw == KW_inherit)	390	if (f.kw == KW_inherit)
376	{	391	{
377	if (archetype *at = find (f.get_str ()))	392	if (archetype *at = find (f.get_str ()))
378	*op = at->clone;	393	*op = at->clone;
…		…
434	&new_part->archname, &((archetype *)old_part->head_ ())->archname);	449	&new_part->archname, &((archetype *)old_part->head_ ())->archname);
435	goto fail;	450	goto fail;
436	}	451	}
437	}	452	}
438		453
439	// deactivate existing archetype
440	for (archetype at = old_head; at; at = (archetype )at->more)
441	at->unlink ();
442
443	// assemble new chain	454	// assemble new chain
444	new_head->min_x = new_head->max_x = new_head->x;	455	new_head->max_x = new_head->x;
445	new_head->min_y = new_head->max_y = new_head->y;
446		456
447	archetype *less = new_head;	457	archetype *less = new_head;
448	for (auto (p, parts.begin () + 1); p != parts.end (); ++p)	458	for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
449	{	459	{
450	archetype at = p;	460	archetype at = p;
451		461
452	// some flags get inherited formt he head (probably a lot more)	462	// some flags get inherited from the head (probably a lot more)
453	// doing it here doesn't feel too cozy, but it allows code	463	// doing it here doesn't feel too cozy, but it allows code
454	// to ignore head checks for these flags, which saves time	464	// to ignore head checks for these flags, which saves time
455	at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];	465	at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
456	at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];	466	at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
457	at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];	467	at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
458	at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];	468	at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
459		469
460	if (at->x < new_head->min_x) new_head->min_x = at->x;
461	if (at->y < new_head->min_y) new_head->min_y = at->y;
462	if (at->x > new_head->max_x) new_head->max_x = at->x;	470	new_head->max_x = max (new_head->max_x, at->x);
463	if (at->y > new_head->max_y) new_head->max_y = at->y;
464		471
465	at->head = new_head;	472	at->head = new_head;
466	less->more = at;	473	less->more = at;
467	less = at;	474	less = at;
468	}	475	}
469		476
470	// now activate it	477	postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
471	for (auto (p, parts.begin ()); p != parts.end (); ++p)
472	{
473	archetype at = p;
474	at->stub = false;
475	at->link ();
476	}
477		478
478	return new_head;	479	return new_head;
479	}	480	}
480		481
481	fail:	482	fail:
482	for (auto (p, parts.begin ()); p != parts.end (); ++p)	483	for (auto (p, parts.begin ()); p != parts.end (); ++p)
483	(*p)->destroy (true);	484	(*p)->destroy ();
484		485
485	return 0;	486	return 0;
486	}	487	}
487		488
488	/*
489	* Initialize global archtype pointers:
490	*/
491	void	489	void
492	init_archetype_pointers ()	490	archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
493	{	491	{
494	ring_arch = archetype::find ("ring");	492	ref = 0;
495	amulet_arch = archetype::find ("amulet");	493	postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
496	staff_arch = archetype::find ("staff");
497	crown_arch = archetype::find ("crown");
498	empty_archetype = archetype::find ("empty_archetype");
499	}	494	}
500		495
501	/*	496	void
502	* Creates and returns a new object which is a copy of the given archetype.	497	archetype::commit_load ()
503	* This function returns NULL on failure.	498	{
504	*/	499	// unlink old archetypes and link in new ones */
		500	for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p)
		501	{
		502	archetype at = p;
		503
		504	if (archetype *old = find (at->archname))
		505	old->unlink ();
		506
		507	allarch.push_back (at);
		508
		509	at->link ();
		510	++dirtycnt;
		511	}
		512
		513	postponed_arch.clear ();
		514
		515	// now resolve arch references
		516	for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p)
		517	{
		518	arch_ptr *ap = p->first;
		519	archetype *at = find (p->second);
		520
		521	if (!at)
		522	LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second);
		523
		524	*ap = at;
		525	}
		526
		527	postponed_arch_ref.clear ();
		528
		529	empty = find (shstr_empty_archetype);
		530	}
		531
		532	void
		533	archetype::gc ()
		534	{
		535	int cnt = max (1, min<int> (allarch.size () / 128, dirtycnt));
		536	dirtycnt = max (0, dirtycnt - cnt);
		537
		538	do
		539	{
		540	static int idx;
		541
		542	if (idx >= allarch.size ())
		543	if (idx)
		544	idx = 0;
		545	else
		546	return;
		547
		548	archetype *at = allarch [idx];
		549
		550	if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
		551	++idx;
		552	else
		553	{
		554	//LOG (llevDebug, "garbage collect arch %s", &at->archname);
		555	assert (at->arch == at); // verify that refcnt == 1 is truly valid
		556	allarch.erase (idx);
		557
		558	// break chain
		559	for (object *op = at->head_ (); op; )
		560	{
		561	object *next = op->more;
		562	op->head = 0;
		563	op->more = 0;
		564	op = next;
		565	}
		566
		567	at->destroy ();
		568	at->arch = 0;
		569	}
		570	}
		571	while (--cnt);
		572	}
		573
505	object *	574	object *
506	arch_to_object (archetype *at)	575	archetype::instance ()
507	{	576	{
508	if (!at)
509	{
510	LOG (llevError, "Couldn't find archetype.\n");
511	return 0;
512	}
513
514	object *op = at->clone ();	577	object *op = clone ();
515	op->arch = at;
516	op->instantiate ();	578	op->instantiate ();
517
518	return op;	579	return op;
519	}	580	}
520		581
521	/*	582	//+GPL
522	* Creates an object. This function is called by get_archetype()
523	* if it fails to find the appropriate archetype.
524	* Thus get_archetype() will be guaranteed to always return
525	* an object, and never NULL.
526	*/
527	object *
528	create_singularity (const char *name)
529	{
530	LOG (llevError \| logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
531
532	if (!strcmp (name, "bug"))
533	abort ();
534
535	char buf[MAX_BUF];
536	sprintf (buf, "bug, please report (%s)", name);
537
538	object *op = get_archetype ("bug");
539	op->name = op->name_pl = buf;
540
541	return op;
542	}
543		583
544	/*	584	/*
545	* Finds which archetype matches the given name, and returns a new	585	* Finds which archetype matches the given name, and returns a new
546	* object containing a copy of the archetype.	586	* object containing a copy of the archetype.
547	*/	587	*/
548	object *	588	object *
549	get_archetype (const char *name)	589	archetype::get (const char *name)
550	{	590	{
551	archetype *at = archetype::find (name);	591	archetype *at = find (name);
552		592
553	if (!at)	593	if (!at)
554	return create_singularity (name);	594	return create_singularity (name);
555		595
556	return arch_to_object (at);	596	return at->instance ();
557	}	597	}
558		598
559	/*	599	/*
560	* Returns the first archetype using the given type.	600	* Returns the first archetype using the given type.
561	* Used in treasure-generation.	601	* Used in treasure-generation.
562	*/	602	*/
563	archetype *	603	static archetype *
564	type_to_archetype (int type)	604	type_to_archetype (int type)
565	{	605	{
566	for_all_archetypes (at)	606	for_all_archetypes (at)
567	if (at->type == type && at->head_ () != at)	607	if (at->type == type && at->head_ () != at)
568	return at;	608	return at;
…		…
576	* Used in treasure-generation.	616	* Used in treasure-generation.
577	*/	617	*/
578	object *	618	object *
579	clone_arch (int type)	619	clone_arch (int type)
580	{	620	{
581	archetype *at;	621	archetype *at = type_to_archetype (type);
582		622
583	if ((at = type_to_archetype (type)) == NULL)	623	if (!at)
584	{	624	{
585	LOG (llevError, "Can't clone archetype %d\n", type);	625	LOG (llevError, "Can't clone archetype %d\n", type);
586	return 0;	626	return 0;
587	}	627	}
588		628
589	object *op = at->clone ();	629	return at->instance ();
590	op->instantiate ();
591	return op;
592	}	630	}
593		631
594	/*	632	/*
595	* member: make instance from class	633	* member: make instance from class
596	*/	634	*/
…		…
599	{	637	{
600	object op, prev = 0, *head = 0;	638	object op, prev = 0, *head = 0;
601		639
602	while (at)	640	while (at)
603	{	641	{
604	op = arch_to_object (at);	642	op = at->instance ();
605		643
606	op->x = at->x;	644	op->x = at->x;
607	op->y = at->y;	645	op->y = at->y;
608		646
609	if (head)	647	if (head)
…		…
617	}	655	}
618		656
619	return head;	657	return head;
620	}	658	}
621		659
		660	//-GPL
		661

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.69 by root, Tue Sep 4 18:20:35 2007 UTC vs. Revision 1.116 by root, Sat Nov 17 23:39:59 2018 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.69 by root, Tue Sep 4 18:20:35 2007 UTC vs.
Revision 1.116 by root, Sat Nov 17 23:39:59 2018 UTC