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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.16 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.27 by root, Sat Dec 9 14:01:12 2006 UTC

…		…
1
2	/*
3	* static char *rcsid_arch_c =
4	* "$Id: arch.C,v 1.16 2006/09/10 16:00:23 root Exp $";
5	*/
6
7	/*	1	/*
8	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
9		3
10	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
22		16
23	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
24	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26		20
27	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
28	*/	22	*/
29		23
30	#include <cassert>	24	#include <cassert>
31		25
32	#include <tr1/unordered_map>
33
34	#include <global.h>	26	#include <global.h>
35	#include <arch.h>
36	#include <funcpoint.h>	27	#include <funcpoint.h>
37	#include <loader.h>	28	#include <loader.h>
38		29
39	/* IF set, does a little timing on the archetype load. */	30	#define USE_UNORDERED_MAP 0
40	#define TIME_ARCH_LOAD 0
41		31
42	static void add_arch (archetype *at);	32	#if USE_UNORDERED_MAP
		33	# include <tr1/functional>
		34	# include <tr1/unordered_map>
		35	#endif
43		36
44	static archetype *arch_table[ARCHTABLE];
45	int arch_cmp = 0; /* How many strcmp's */	37	int arch_cmp = 0; /* How many strcmp's */
46	int arch_search = 0; /* How many searches */	38	int arch_search = 0; /* How many searches */
47	int arch_init; /* True if doing arch initialization */	39	int arch_init; /* True if doing arch initialization */
48		40
49	/* The naming of these functions is really poor - they are all	41	/* The naming of these functions is really poor - they are all
…		…
54	* MSW 2003-04-29	46	* MSW 2003-04-29
55	*/	47	*/
56		48
57	#if USE_UNORDERED_MAP	49	#if USE_UNORDERED_MAP
58	// the hashtable	50	// the hashtable
59	typedef
60	std::tr1::unordered_map <	51	typedef std::tr1::unordered_map
61	size_t, archetype *>	52	<
		53	std::size_t,
		54	arch_ptr,
		55	std::tr1::hash<size_t>,
		56	std::equal_to<size_t>,
		57	slice_allocator< std::pair<const std::size_t, archetype *> >
		58	true,
62	HT;	59	> HT;
63		60
64	static	61	static HT ht;
65	HT	62	#else
66	ht;	63	static arch_ptr arch_table[ARCHTABLE];
67	#endif	64	#endif
68		65
69	/**	66	/**
70	* GROS - This function retrieves an archetype given the name that appears	67	* GROS - This function retrieves an archetype given the name that appears
71	* during the game (for example, "writing pen" instead of "stylus").	68	* during the game (for example, "writing pen" instead of "stylus").
…		…
78	* - the archetype found or null if nothing was found.	75	* - the archetype found or null if nothing was found.
79	*/	76	*/
80	archetype *	77	archetype *
81	find_archetype_by_object_name (const char *name)	78	find_archetype_by_object_name (const char *name)
82	{	79	{
83	archetype *	80	archetype *at;
84	at;
85		81
86	if (name == NULL)	82	if (name == NULL)
87	return (archetype *) NULL;	83	return (archetype *) NULL;
88		84
89	for (at = first_archetype; at != NULL; at = at->next)	85	for (at = first_archetype; at != NULL; at = at->next)
…		…
100	* except that it considers only items of the given type.	96	* except that it considers only items of the given type.
101	*/	97	*/
102	archetype *	98	archetype *
103	find_archetype_by_object_type_name (int type, const char *name)	99	find_archetype_by_object_type_name (int type, const char *name)
104	{	100	{
105	archetype *	101	archetype *at;
106	at;
107		102
108	if (name == NULL)	103	if (name == NULL)
109	return NULL;	104	return NULL;
110		105
111	for (at = first_archetype; at != NULL; at = at->next)	106	for (at = first_archetype; at != NULL; at = at->next)
…		…
173	* but it otherwise had a big memory leak.	168	* but it otherwise had a big memory leak.
174	*/	169	*/
175	object *	170	object *
176	get_archetype_by_object_name (const char *name)	171	get_archetype_by_object_name (const char *name)
177	{	172	{
178	archetype *	173	archetype *at;
179	at;
180	char
181	tmpname[MAX_BUF];	174	char tmpname[MAX_BUF];
182	int	175	int i;
183	i;
184		176
185	strncpy (tmpname, name, MAX_BUF - 1);	177	assign (tmpname, name);
186	tmpname[MAX_BUF - 1] = 0;	178
187	for (i = strlen (tmpname); i > 0; i--)	179	for (i = strlen (tmpname); i > 0; i--)
188	{	180	{
189	tmpname[i] = 0;	181	tmpname[i] = 0;
190	at = find_archetype_by_object_name (tmpname);	182	at = find_archetype_by_object_name (tmpname);
		183
191	if (at != NULL)	184	if (at != NULL)
192	{
193	return arch_to_object (at);	185	return arch_to_object (at);
194	}
195	}	186	}
		187
196	return create_singularity (name);	188	return create_singularity (name);
197	}	189	}
198		190
199	/* This is a subset of the parse_id command. Basically, name can be	191	/* This is a subset of the parse_id command. Basically, name can be
200	* a string seperated lists of things to match, with certain keywords.	192	* a string seperated lists of things to match, with certain keywords.
…		…
214	* Last, make a check on the full name.	206	* Last, make a check on the full name.
215	*/	207	*/
216	int	208	int
217	item_matched_string (object pl, object op, const char *name)	209	item_matched_string (object pl, object op, const char *name)
218	{	210	{
219	char *
220	cp,
221	local_name[MAX_BUF];	211	char *cp, local_name[MAX_BUF];
222	int	212	int count, retval = 0;
223	count,
224	retval = 0;
225		213
226	strcpy (local_name, name); /* strtok is destructive to name */	214	strcpy (local_name, name); /* strtok is destructive to name */
227		215
228	for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))	216	for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
229	{	217	{
…		…
281	retval = 15;	269	retval = 15;
282	else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))	270	else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))
283	retval = 14;	271	retval = 14;
284	else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))	272	else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))
285	retval = 14;	273	retval = 14;
286
287	/* Do substring checks, so things like 'Str+1' will match.	274	/* Do substring checks, so things like 'Str+1' will match.
288	* retval of these should perhaps be lower - they are lower	275	* retval of these should perhaps be lower - they are lower
289	* then the specific strcasecmp aboves, but still higher than	276	* then the specific strcasecmp aboves, but still higher than
290	* some other match criteria.	277	* some other match criteria.
291	*/	278	*/
…		…
293	retval = 12;	280	retval = 12;
294	else if (strstr (query_base_name (op, 0), cp))	281	else if (strstr (query_base_name (op, 0), cp))
295	retval = 12;	282	retval = 12;
296	else if (strstr (query_short_name (op), cp))	283	else if (strstr (query_short_name (op), cp))
297	retval = 12;	284	retval = 12;
298
299	/* Check against plural/non plural based on count. */	285	/* Check against plural/non plural based on count. */
300	else if (count > 1 && !strcasecmp (cp, op->name_pl))	286	else if (count > 1 && !strcasecmp (cp, op->name_pl))
301	{
302	retval = 6;	287	retval = 6;
303	}
304	else if (count == 1 && !strcasecmp (op->name, cp))	288	else if (count == 1 && !strcasecmp (op->name, cp))
305	{
306	retval = 6;	289	retval = 6;
307	}
308	/* base name matched - not bad */	290	/* base name matched - not bad */
309	else if (strcasecmp (cp, op->name) == 0 && !count)	291	else if (strcasecmp (cp, op->name) == 0 && !count)
310	retval = 4;	292	retval = 4;
311	/* Check for partial custom name, but give a real low priority */	293	/* Check for partial custom name, but give a real low priority */
312	else if (op->custom_name && strstr (op->custom_name, cp))	294	else if (op->custom_name && strstr (op->custom_name, cp))
…		…
314		296
315	if (retval)	297	if (retval)
316	{	298	{
317	if (pl->type == PLAYER)	299	if (pl->type == PLAYER)
318	pl->contr->count = count;	300	pl->contr->count = count;
		301
319	return retval;	302	return retval;
320	}	303	}
321	}	304	}
		305
322	return 0;	306	return 0;
323	}	307	}
324		308
325	/*	309	/*
326	* Initialises the internal linked list of archetypes (read from file).	310	* Initialises the internal linked list of archetypes (read from file).
…		…
331	void	315	void
332	init_archetypes (void)	316	init_archetypes (void)
333	{ /* called from add_player() and edit() */	317	{ /* called from add_player() and edit() */
334	if (first_archetype != NULL) /* Only do this once */	318	if (first_archetype != NULL) /* Only do this once */
335	return;	319	return;
		320
336	arch_init = 1;	321	arch_init = 1;
337	load_archetypes ();	322	load_archetypes ();
338	arch_init = 0;	323	arch_init = 0;
339	empty_archetype = find_archetype ("empty_archetype");	324	empty_archetype = archetype::find ("empty_archetype");
340		325
341	/* init_blocksview();*/	326	/* init_blocksview();*/
342	}	327	}
343		328
344	/*	329	/*
…		…
368	*/	353	*/
369		354
370	void	355	void
371	init_archetable (void)	356	init_archetable (void)
372	{	357	{
373	archetype *	358	archetype *at;
374	at;
375		359
376	LOG (llevDebug, " Setting up archetable...\n");	360	LOG (llevDebug, " Setting up archetable...\n");
377		361
378	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)	362	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
379	add_arch (at);	363	at->hash_add ();
380		364
381	LOG (llevDebug, "done\n");	365	LOG (llevDebug, "done\n");
382	}	366	}
383		367
384	/*
385	* Dumps an archetype to debug-level output.
386	*/
387
388	void
389	dump_arch (archetype *at)
390	{
391	dump_object (&at->clone);
392	}
393
394	/*
395	* Dumps _all_ archetypes to debug-level output.
396	* If you run crossfire with debug, and enter DM-mode, you can trigger
397	* this with the O key.
398	*/
399
400	void
401	dump_all_archetypes (void)
402	{
403	archetype *
404	at;
405
406	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
407	{
408	dump_arch (at);
409	fprintf (logfile, "%s\n", errmsg);
410	}
411	}
412
413	void	368	void
414	free_all_archs (void)	369	free_all_archs (void)
415	{	370	{
416	archetype *	371	archetype at, next;
417	at, *
418	next;
419	int
420	i = 0, f = 0;	372	int i = 0, f = 0;
421		373
422	for (at = first_archetype; at != NULL; at = next)	374	for (at = first_archetype; at != NULL; at = next)
423	{	375	{
424	if (at->more)	376	if (at->more)
425	next = at->more;	377	next = at->more;
…		…
429	delete	381	delete
430	at;	382	at;
431		383
432	i++;	384	i++;
433	}	385	}
		386
434	LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);	387	LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
435	}	388	}
436		389
437	archetype::archetype ()	390	archetype::archetype ()
438	{	391	{
…		…
450	* of archetype-structures.	403	* of archetype-structures.
451	*/	404	*/
452	void	405	void
453	first_arch_pass (object_thawer & fp)	406	first_arch_pass (object_thawer & fp)
454	{	407	{
455	archetype *	408	archetype head = 0, last_more = 0;
456	at, *
457	head = NULL, *last_more = NULL;
458		409
		410	archetype *at = new archetype;
459	at->clone.arch = first_archetype = at = new archetype;	411	at->clone.arch = first_archetype = at;
460		412
461	while (int i = load_object (fp, &at->clone, 0))	413	while (int i = load_object (fp, &at->clone, 0))
462	{	414	{
463	at->clone.speed_left = (float) (-0.1);	415	at->clone.speed_left = (float) (-0.1);
464	/* copy the body_info to the body_used - this is only really	416	/* copy the body_info to the body_used - this is only really
…		…
531	*/	483	*/
532		484
533	void	485	void
534	second_arch_pass (object_thawer & thawer)	486	second_arch_pass (object_thawer & thawer)
535	{	487	{
536	char
537	buf[MAX_BUF], *
538	variable = buf, argument, cp;	488	char buf[MAX_BUF], variable = buf, argument, *cp;
539	archetype *
540	at = NULL, *other;	489	archetype at = NULL, other;
541		490
542	while (fgets (buf, MAX_BUF, thawer) != NULL)	491	while (fgets (buf, MAX_BUF, thawer) != NULL)
543	{	492	{
544	if (*buf == '#')	493	if (*buf == '#')
545	continue;	494	continue;
…		…
553	cp--;	502	cp--;
554	}	503	}
555	}	504	}
556	if (!strcmp ("Object", variable))	505	if (!strcmp ("Object", variable))
557	{	506	{
558	if ((at = find_archetype (argument)) == NULL)	507	if ((at = archetype::find (argument)) == NULL)
559	LOG (llevError, "Warning: failed to find arch %s\n", argument);	508	LOG (llevError, "Warning: failed to find arch %s\n", argument);
560	}	509	}
561	else if (!strcmp ("other_arch", variable))	510	else if (!strcmp ("other_arch", variable))
562	{	511	{
563	if (at != NULL && at->clone.other_arch == NULL)	512	if (at != NULL && at->clone.other_arch == NULL)
564	{	513	{
565	if ((other = find_archetype (argument)) == NULL)	514	if ((other = archetype::find (argument)) == NULL)
566	LOG (llevError, "Warning: failed to find other_arch %s\n", argument);	515	LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
567	else if (at != NULL)	516	else if (at != NULL)
568	at->clone.other_arch = other;	517	at->clone.other_arch = other;
569	}	518	}
570	}	519	}
571	else if (!strcmp ("randomitems", variable))	520	else if (!strcmp ("randomitems", variable))
572	{	521	{
573	if (at != NULL)	522	if (at != NULL)
574	{	523	{
575	treasurelist *
576	tl = find_treasurelist (argument);	524	treasurelist *tl = find_treasurelist (argument);
577		525
578	if (tl == NULL)	526	if (tl == NULL)
579	LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);	527	LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
580	else	528	else
581	at->clone.randomitems = tl;	529	at->clone.randomitems = tl;
…		…
586		534
587	#ifdef DEBUG	535	#ifdef DEBUG
588	void	536	void
589	check_generators (void)	537	check_generators (void)
590	{	538	{
591	archetype *	539	archetype *at;
592	at;
593		540
594	for (at = first_archetype; at != NULL; at = at->next)	541	for (at = first_archetype; at != NULL; at = at->next)
595	if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)	542	if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
596	LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);	543	LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
597	}	544	}
…		…
605	*/	552	*/
606		553
607	void	554	void
608	load_archetypes (void)	555	load_archetypes (void)
609	{	556	{
610	char
611	filename[MAX_BUF];	557	char filename[MAX_BUF];
612
613	#if TIME_ARCH_LOAD
614	struct timeval
615	tv1,
616	tv2;
617	#endif
618		558
619	sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);	559	sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
620	LOG (llevDebug, "Reading archetypes from %s:\n", filename);	560	LOG (llevDebug, "Reading archetypes from %s:\n", filename);
621		561
622	{	562	{
…		…
654	*/	594	*/
655		595
656	object *	596	object *
657	arch_to_object (archetype *at)	597	arch_to_object (archetype *at)
658	{	598	{
659	object *	599	object *op;
660	op;
661		600
662	if (at == NULL)	601	if (at == NULL)
663	{	602	{
664	if (warn_archetypes)	603	if (warn_archetypes)
665	LOG (llevError, "Couldn't find archetype.\n");	604	LOG (llevError, "Couldn't find archetype.\n");
…		…
682	*/	621	*/
683		622
684	object *	623	object *
685	create_singularity (const char *name)	624	create_singularity (const char *name)
686	{	625	{
687	object *	626	object *op;
688	op;
689	char
690	buf[MAX_BUF];	627	char buf[MAX_BUF];
691		628
692	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);	629	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
693	op = get_object ();	630	op = get_object ();
694	op->name = op->name_pl = buf;	631	op->name = op->name_pl = buf;
695	SET_FLAG (op, FLAG_NO_PICK);	632	SET_FLAG (op, FLAG_NO_PICK);
…		…
702	*/	639	*/
703		640
704	object *	641	object *
705	get_archetype (const char *name)	642	get_archetype (const char *name)
706	{	643	{
707	archetype *	644	archetype *at = archetype::find (name);
708	at;
709		645
710	at = find_archetype (name);	646	if (!at)
711	if (at == NULL)
712	return create_singularity (name);	647	return create_singularity (name);
713		648
714	return arch_to_object (at);	649	return arch_to_object (at);
715	}	650	}
716		651
…		…
719	*/	654	*/
720		655
721	unsigned long	656	unsigned long
722	hasharch (const char *str, int tablesize)	657	hasharch (const char *str, int tablesize)
723	{	658	{
724	unsigned long	659	unsigned long hash = 0;
725	hash = 0;
726	unsigned int	660	unsigned int i = 0;
727	i = 0;
728	const char *	661	const char *p;
729	p;
730		662
731	/* use the one-at-a-time hash function, which supposedly is	663	/* use the one-at-a-time hash function, which supposedly is
732	* better than the djb2-like one used by perl5.005, but	664	* better than the djb2-like one used by perl5.005, but
733	* certainly is better then the bug used here before.	665	* certainly is better then the bug used here before.
734	* see http://burtleburtle.net/bob/hash/doobs.html	666	* see http://burtleburtle.net/bob/hash/doobs.html
…		…
751	* Finds, using the hashtable, which archetype matches the given name.	683	* Finds, using the hashtable, which archetype matches the given name.
752	* returns a pointer to the found archetype, otherwise NULL.	684	* returns a pointer to the found archetype, otherwise NULL.
753	*/	685	*/
754		686
755	archetype *	687	archetype *
756	find_archetype (const char *name)	688	archetype::find (const char *name)
757	{	689	{
758	#if USE_UNORDERED_MAP
759	name = shstr::find (name);
760
761	if (!name)	690	if (!name)
762	return 0;	691	return 0;
763		692
764	HT::const_iterator i = ht.find ((size_t) name);	693	#if USE_UNORDERED_MAP
		694	AUTODECL (i, ht.find ((size_t) name));
765		695
766	if (i == ht.end ())	696	if (i == ht.end ())
767	return 0;	697	return 0;
768	else	698	else
769	return i->second;	699	return i->second;
770	#endif	700	#endif
771		701
772	archetype *	702	archetype *at;
773	at;
774	unsigned long	703	unsigned long index;
775	index;
776
777	if (name == NULL)
778	return (archetype *) NULL;
779		704
780	index = hasharch (name, ARCHTABLE);	705	index = hasharch (name, ARCHTABLE);
781	arch_search++;	706	arch_search++;
782	for (;;)	707	for (;;)
783	{	708	{
784	at = arch_table[index];	709	at = arch_table[index];
		710
785	if (at == NULL)	711	if (at == NULL)
786	{	712	{
787	if (warn_archetypes)	713	if (warn_archetypes)
788	LOG (llevError, "Couldn't find archetype %s\n", name);	714	LOG (llevError, "Couldn't find archetype %s\n", name);
		715
789	return NULL;	716	return NULL;
790	}	717	}
		718
791	arch_cmp++;	719	arch_cmp++;
		720
792	if (!strcmp ((const char *) at->name, name))	721	if (!strcmp ((const char *) at->name, name))
793	return at;	722	return at;
		723
794	if (++index >= ARCHTABLE)	724	if (++index >= ARCHTABLE)
795	index = 0;	725	index = 0;
796	}	726	}
797	}	727	}
798		728
799	/*	729	/*
800	* Adds an archetype to the hashtable.	730	* Adds an archetype to the hashtable.
801	*/	731	*/
802		732	void
803	static void	733	archetype::hash_add ()
804	add_arch (archetype *at)
805	{	734	{
806	#if USE_UNORDERED_MAP	735	#if USE_UNORDERED_MAP
807	ht.insert (std::make_pair ((size_t) (const char *) at->name, at));	736	ht.insert (std::make_pair ((size_t) (const char *) name, this));
808	#endif	737	#else
809		738
810	int
811	index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index;	739	int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
812		740
813	for (;;)	741	for (;;)
814	{	742	{
815	if (arch_table[index] == NULL)	743	if (!arch_table[index])
816	{	744	{
817	arch_table[index] = at;	745	arch_table[index] = this;
818	return;	746	break;
819	}	747	}
820		748
821	if (++index == ARCHTABLE)	749	if (++index == ARCHTABLE)
822	index = 0;	750	index = 0;
823		751
824	if (index == org_index)	752	if (index == org_index)
825	fatal (ARCHTABLE_TOO_SMALL);	753	fatal (ARCHTABLE_TOO_SMALL);
826	}	754	}
		755	#endif
		756	}
		757
		758	void
		759	archetype::hash_del ()
		760	{
		761	#if USE_UNORDERED_MAP
		762	# error remove this from HT
		763	#else
		764
		765	int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
		766
		767	for (;;)
		768	{
		769	if (arch_table[index] == this)
		770	{
		771	arch_table[index] = 0;
		772	break;
		773	}
		774
		775	if (++index == ARCHTABLE)
		776	index = 0;
		777
		778	if (index == org_index)
		779	break;
		780	}
		781	#endif
827	}	782	}
828		783
829	/*	784	/*
830	* Returns the first archetype using the given type.	785	* Returns the first archetype using the given type.
831	* Used in treasure-generation.	786	* Used in treasure-generation.
832	*/	787	*/
833		788
834	archetype *	789	archetype *
835	type_to_archetype (int type)	790	type_to_archetype (int type)
836	{	791	{
837	archetype *	792	archetype *at;
838	at;
839		793
840	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)	794	for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
841	if (at->clone.type == type)	795	if (at->clone.type == type)
842	return at;	796	return at;
		797
843	return NULL;	798	return 0;
844	}	799	}
845		800
846	/*	801	/*
847	* Returns a new object copied from the first archetype matching	802	* Returns a new object copied from the first archetype matching
848	* the given type.	803	* the given type.
…		…
850	*/	805	*/
851		806
852	object *	807	object *
853	clone_arch (int type)	808	clone_arch (int type)
854	{	809	{
855	archetype *	810	archetype *at;
856	at;
857	object *
858	op = get_object ();	811	object *op = get_object ();
859		812
860	if ((at = type_to_archetype (type)) == NULL)	813	if ((at = type_to_archetype (type)) == NULL)
861	{	814	{
862	LOG (llevError, "Can't clone archetype %d\n", type);	815	LOG (llevError, "Can't clone archetype %d\n", type);
863	free_object (op);	816	free_object (op);
864	return NULL;	817	return NULL;
865	}	818	}
		819
866	copy_object (&at->clone, op);	820	copy_object (&at->clone, op);
867	op->instantiate ();	821	op->instantiate ();
868	return op;	822	return op;
869	}	823	}
870		824
…		…
873	*/	827	*/
874		828
875	object *	829	object *
876	object_create_arch (archetype *at)	830	object_create_arch (archetype *at)
877	{	831	{
878	object *	832	object op, prev = 0, *head = 0;
879	op, *
880	prev = NULL, *head = NULL;
881		833
882	while (at)	834	while (at)
883	{	835	{
884	op = arch_to_object (at);	836	op = arch_to_object (at);
885	op->x = at->clone.x;	837	op->x = at->clone.x;
886	op->y = at->clone.y;	838	op->y = at->clone.y;
		839
887	if (head)	840	if (head)
888	op->head = head, prev->more = op;	841	op->head = head, prev->more = op;
		842
889	if (!head)	843	if (!head)
890	head = op;	844	head = op;
		845
891	prev = op;	846	prev = op;
892	at = at->more;	847	at = at->more;
893	}	848	}
		849
894	return (head);	850	return (head);
895	}	851	}
896		852
897	/* end of arch.c */

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.16 by root, Sun Sep 10 16:00:23 2006 UTC vs. Revision 1.27 by root, Sat Dec 9 14:01:12 2006 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.16 by root, Sun Sep 10 16:00:23 2006 UTC vs.
Revision 1.27 by root, Sat Dec 9 14:01:12 2006 UTC