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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.14 by root, Fri Sep 8 17:14:07 2006 UTC vs.
Revision 1.22 by root, Thu Sep 14 22:35:53 2006 UTC

…		…
1	/*
2	* static char *rcsid_arch_c =
3	* "$Id: arch.C,v 1.14 2006/09/08 17:14:07 root Exp $";
4	*/
5
6	/*	1	/*
7	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
8		3
9	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
21		16
22	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
23	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
24	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25		20
26	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>
27	*/	22	*/
28		23
29	#include <cassert>	24	#include <cassert>
30		25
31	#include <tr1/unordered_map>	26	#include <tr1/unordered_map>
…		…
36	#include <loader.h>	31	#include <loader.h>
37		32
38	/* IF set, does a little timing on the archetype load. */	33	/* IF set, does a little timing on the archetype load. */
39	#define TIME_ARCH_LOAD 0	34	#define TIME_ARCH_LOAD 0
40		35
41	static void add_arch (archetype * at);	36	static void add_arch (archetype *at);
42		37
43	static archetype *arch_table[ARCHTABLE];	38	static archetype *arch_table[ARCHTABLE];
44	int arch_cmp = 0; /* How many strcmp's */	39	int arch_cmp = 0; /* How many strcmp's */
45	int arch_search = 0; /* How many searches */	40	int arch_search = 0; /* How many searches */
46	int arch_init; /* True if doing arch initialization */	41	int arch_init; /* True if doing arch initialization */
…		…
53	* MSW 2003-04-29	48	* MSW 2003-04-29
54	*/	49	*/
55		50
56	#if USE_UNORDERED_MAP	51	#if USE_UNORDERED_MAP
57	// the hashtable	52	// the hashtable
58	typedef std::tr1::unordered_map<size_t, archetype *> HT;	53	typedef std::tr1::unordered_map
		54	<
		55	std::size_t,
		56	archetype *,
		57	std::hash<size_t>,
		58	std::equal_to<size_t>,
		59	slice_allocator< std::pair<const std::size_t, archetype *> >
		60	true,
		61	> HT;
59		62
60	static HT ht;	63	static HT ht;
61	#endif	64	#endif
62		65
63	/**	66	/**
…		…
165	* but it otherwise had a big memory leak.	168	* but it otherwise had a big memory leak.
166	*/	169	*/
167	object *	170	object *
168	get_archetype_by_object_name (const char *name)	171	get_archetype_by_object_name (const char *name)
169	{	172	{
170	archetype *	173	archetype *at;
171	at;
172	char
173	tmpname[MAX_BUF];	174	char tmpname[MAX_BUF];
174	int	175	int i;
175	i;
176		176
177	strncpy (tmpname, name, MAX_BUF - 1);	177	assign (tmpname, name);
178	tmpname[MAX_BUF - 1] = 0;	178
179	for (i = strlen (tmpname); i > 0; i--)	179	for (i = strlen (tmpname); i > 0; i--)
180	{	180	{
181	tmpname[i] = 0;	181	tmpname[i] = 0;
182	at = find_archetype_by_object_name (tmpname);	182	at = find_archetype_by_object_name (tmpname);
		183
183	if (at != NULL)	184	if (at != NULL)
184	{
185	return arch_to_object (at);	185	return arch_to_object (at);
186	}
187	}	186	}
		187
188	return create_singularity (name);	188	return create_singularity (name);
189	}	189	}
190		190
191	/* 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
192	* a string seperated lists of things to match, with certain keywords.	192	* a string seperated lists of things to match, with certain keywords.
…		…
204	* If count is 1, make a quick check on the name.	204	* If count is 1, make a quick check on the name.
205	* IF count is >1, we need to make plural name. Return if match.	205	* IF count is >1, we need to make plural name. Return if match.
206	* Last, make a check on the full name.	206	* Last, make a check on the full name.
207	*/	207	*/
208	int	208	int
209	item_matched_string (object * pl, object * op, const char *name)	209	item_matched_string (object pl, object op, const char *name)
210	{	210	{
211	char *
212	cp,
213	local_name[MAX_BUF];	211	char *cp, local_name[MAX_BUF];
214	int	212	int count, retval = 0;
215	count,	213
216	retval = 0;
217	strcpy (local_name, name); /* strtok is destructive to name */	214	strcpy (local_name, name); /* strtok is destructive to name */
218		215
219	for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))	216	for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
220	{	217	{
221	while (cp[0] == ' ')	218	while (cp[0] == ' ')
…		…
322	void	319	void
323	init_archetypes (void)	320	init_archetypes (void)
324	{ /* called from add_player() and edit() */	321	{ /* called from add_player() and edit() */
325	if (first_archetype != NULL) /* Only do this once */	322	if (first_archetype != NULL) /* Only do this once */
326	return;	323	return;
		324
327	arch_init = 1;	325	arch_init = 1;
328	load_archetypes ();	326	load_archetypes ();
329	arch_init = 0;	327	arch_init = 0;
330	empty_archetype = find_archetype ("empty_archetype");	328	empty_archetype = archetype::find ("empty_archetype");
		329
331	/* init_blocksview();*/	330	/* init_blocksview();*/
332	}	331	}
333		332
334	/*	333	/*
335	* Stores debug-information about how efficient the hashtable	334	* Stores debug-information about how efficient the hashtable
336	* used for archetypes has been in the static errmsg array.	335	* used for archetypes has been in the static errmsg array.
337	*/	336	*/
338		337
339	void	338	void
340	arch_info (object * op)	339	arch_info (object *op)
341	{	340	{
342	sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);	341	sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
343	new_draw_info (NDI_BLACK, 0, op, errmsg);	342	new_draw_info (NDI_BLACK, 0, op, errmsg);
344	}	343	}
345		344
…		…
373	/*	372	/*
374	* Dumps an archetype to debug-level output.	373	* Dumps an archetype to debug-level output.
375	*/	374	*/
376		375
377	void	376	void
378	dump_arch (archetype * at)	377	dump_arch (archetype *at)
379	{	378	{
380	dump_object (&at->clone);	379	dump_object (&at->clone);
381	}	380	}
382		381
383	/*	382	/*
…		…
387	*/	386	*/
388		387
389	void	388	void
390	dump_all_archetypes (void)	389	dump_all_archetypes (void)
391	{	390	{
392	archetype *	391	archetype *at;
393	at;	392
394	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)	393	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
395	{	394	{
396	dump_arch (at);	395	dump_arch (at);
397	fprintf (logfile, "%s\n", errmsg);	396	fprintf (logfile, "%s\n", errmsg);
398	}	397	}
399	}	398	}
400		399
401	void	400	void
402	free_all_archs (void)	401	free_all_archs (void)
403	{	402	{
404	archetype *	403	archetype at, next;
405	at, *
406	next;
407	int
408	i = 0, f = 0;	404	int i = 0, f = 0;
409		405
410	for (at = first_archetype; at != NULL; at = next)	406	for (at = first_archetype; at != NULL; at = next)
411	{	407	{
412	if (at->more)	408	if (at->more)
413	next = at->more;	409	next = at->more;
414	else	410	else
415	next = at->next;	411	next = at->next;
416		412
417	delete	413	delete
418	at;	414	at;
		415
419	i++;	416	i++;
420	}	417	}
421	LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);	418	LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
422	}	419	}
423		420
424	archetype::archetype ()	421	archetype::archetype ()
425	{	422	{
426	clear_object (&clone); /* to initial state other also */	423	clear_object (&clone); /* to initial state other also */
427	CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */	424	CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */
428	SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */	425	SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
429	}	426	}
430		427
431	archetype::~archetype ()	428	archetype::~archetype ()
432	{	429	{
433	}	430	}
…		…
454	*/	451	*/
455	memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));	452	memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
456		453
457	switch (i)	454	switch (i)
458	{	455	{
459	case LL_NORMAL: /* A new archetype, just link it with the previous */	456	case LL_NORMAL: /* A new archetype, just link it with the previous */
460	if (last_more != NULL)	457	if (last_more != NULL)
461	last_more->next = at;	458	last_more->next = at;
462	if (head != NULL)	459	if (head != NULL)
463	head->next = at;	460	head->next = at;
464	head = last_more = at;	461	head = last_more = at;
465	#if 0	462	#if 0
466	if (!op->type)	463	if (!op->type)
467	LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);	464	LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
468	#endif	465	#endif
469	at->tail_x = 0;	466	at->tail_x = 0;
470	at->tail_y = 0;	467	at->tail_y = 0;
471	break;	468	break;
472		469
473	case LL_MORE: /* Another part of the previous archetype, link it correctly */	470	case LL_MORE: /* Another part of the previous archetype, link it correctly */
474		471
475	at->head = head;	472	at->head = head;
476	at->clone.head = &head->clone;	473	at->clone.head = &head->clone;
477	if (last_more != NULL)	474	if (last_more != NULL)
478	{	475	{
479	last_more->more = at;	476	last_more->more = at;
480	last_more->clone.more = &at->clone;	477	last_more->clone.more = &at->clone;
481	}	478	}
482	last_more = at;	479	last_more = at;
483		480
484	/* If this multipart image is still composed of individual small	481	/* If this multipart image is still composed of individual small
485	* images, don't set the tail_.. values. We can't use them anyways,	482	* images, don't set the tail_.. values. We can't use them anyways,
486	* and setting these to zero makes the map sending to the client much	483	* and setting these to zero makes the map sending to the client much
487	* easier as just looking at the head, we know what to do.	484	* easier as just looking at the head, we know what to do.
488	*/	485	*/
489	if (at->clone.face != head->clone.face)	486	if (at->clone.face != head->clone.face)
490	{	487	{
491	head->tail_x = 0;	488	head->tail_x = 0;
492	head->tail_y = 0;	489	head->tail_y = 0;
493	}	490	}
494	else	491	else
495	{	492	{
496	if (at->clone.x > head->tail_x)	493	if (at->clone.x > head->tail_x)
497	head->tail_x = at->clone.x;	494	head->tail_x = at->clone.x;
498	if (at->clone.y > head->tail_y)	495	if (at->clone.y > head->tail_y)
499	head->tail_y = at->clone.y;	496	head->tail_y = at->clone.y;
500	}	497	}
501	break;	498	break;
502		499
503	}	500	}
504		501
505	at = new archetype;	502	at = new archetype;
		503
506	at->clone.arch = at;	504	at->clone.arch = at;
507	}	505	}
508		506
509	delete at;	507	delete at;
510	}	508	}
…		…
534	cp--;	532	cp--;
535	}	533	}
536	}	534	}
537	if (!strcmp ("Object", variable))	535	if (!strcmp ("Object", variable))
538	{	536	{
539	if ((at = find_archetype (argument)) == NULL)	537	if ((at = archetype::find (argument)) == NULL)
540	LOG (llevError, "Warning: failed to find arch %s\n", argument);	538	LOG (llevError, "Warning: failed to find arch %s\n", argument);
541	}	539	}
542	else if (!strcmp ("other_arch", variable))	540	else if (!strcmp ("other_arch", variable))
543	{	541	{
544	if (at != NULL && at->clone.other_arch == NULL)	542	if (at != NULL && at->clone.other_arch == NULL)
545	{	543	{
546	if ((other = find_archetype (argument)) == NULL)	544	if ((other = archetype::find (argument)) == NULL)
547	LOG (llevError, "Warning: failed to find other_arch %s\n", argument);	545	LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
548	else if (at != NULL)	546	else if (at != NULL)
549	at->clone.other_arch = other;	547	at->clone.other_arch = other;
550	}	548	}
551	}	549	}
…		…
553	{	551	{
554	if (at != NULL)	552	if (at != NULL)
555	{	553	{
556	treasurelist *	554	treasurelist *
557	tl = find_treasurelist (argument);	555	tl = find_treasurelist (argument);
		556
558	if (tl == NULL)	557	if (tl == NULL)
559	LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);	558	LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
560	else	559	else
561	at->clone.randomitems = tl;	560	at->clone.randomitems = tl;
562	}	561	}
…		…
566		565
567	#ifdef DEBUG	566	#ifdef DEBUG
568	void	567	void
569	check_generators (void)	568	check_generators (void)
570	{	569	{
571	archetype *	570	archetype *at;
572	at;	571
573	for (at = first_archetype; at != NULL; at = at->next)	572	for (at = first_archetype; at != NULL; at = at->next)
574	if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)	573	if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
575	LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);	574	LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
576	}	575	}
577	#endif	576	#endif
…		…
584	*/	583	*/
585		584
586	void	585	void
587	load_archetypes (void)	586	load_archetypes (void)
588	{	587	{
589	char
590	filename[MAX_BUF];	588	char filename[MAX_BUF];
		589
591	#if TIME_ARCH_LOAD	590	#if TIME_ARCH_LOAD
592	struct timeval	591	struct timeval
593	tv1,	592	tv1,
594	tv2;	593	tv2;
595	#endif	594	#endif
…		…
630	* Creates and returns a new object which is a copy of the given archetype.	629	* Creates and returns a new object which is a copy of the given archetype.
631	* This function returns NULL on failure.	630	* This function returns NULL on failure.
632	*/	631	*/
633		632
634	object *	633	object *
635	arch_to_object (archetype * at)	634	arch_to_object (archetype *at)
636	{	635	{
637	object *	636	object *op;
638	op;	637
639	if (at == NULL)	638	if (at == NULL)
640	{	639	{
641	if (warn_archetypes)	640	if (warn_archetypes)
642	LOG (llevError, "Couldn't find archetype.\n");	641	LOG (llevError, "Couldn't find archetype.\n");
		642
643	return NULL;	643	return NULL;
644	}	644	}
		645
645	op = get_object ();	646	op = get_object ();
646	copy_object (&at->clone, op);	647	copy_object (&at->clone, op);
		648	op->arch = at;
647	op->instantiate ();	649	op->instantiate ();
648	op->arch = at;
649	return op;	650	return op;
650	}	651	}
651		652
652	/*	653	/*
653	* Creates an object. This function is called by get_archetype()	654	* Creates an object. This function is called by get_archetype()
…		…
659	object *	660	object *
660	create_singularity (const char *name)	661	create_singularity (const char *name)
661	{	662	{
662	object *op;	663	object *op;
663	char buf[MAX_BUF];	664	char buf[MAX_BUF];
		665
664	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);	666	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
665	op = get_object ();	667	op = get_object ();
666	op->name = op->name_pl = buf;	668	op->name = op->name_pl = buf;
667	SET_FLAG (op, FLAG_NO_PICK);	669	SET_FLAG (op, FLAG_NO_PICK);
668	return op;	670	return op;
…		…
674	*/	676	*/
675		677
676	object *	678	object *
677	get_archetype (const char *name)	679	get_archetype (const char *name)
678	{	680	{
679	archetype *at;	681	archetype *at = archetype::find (name);
680	at = find_archetype (name);	682
681	if (at == NULL)	683	if (!at)
682	return create_singularity (name);	684	return create_singularity (name);
		685
683	return arch_to_object (at);	686	return arch_to_object (at);
684	}	687	}
685		688
686	/*	689	/*
687	* Hash-function used by the arch-hashtable.	690	* Hash-function used by the arch-hashtable.
…		…
717	* Finds, using the hashtable, which archetype matches the given name.	720	* Finds, using the hashtable, which archetype matches the given name.
718	* returns a pointer to the found archetype, otherwise NULL.	721	* returns a pointer to the found archetype, otherwise NULL.
719	*/	722	*/
720		723
721	archetype *	724	archetype *
722	find_archetype (const char *name)	725	archetype::find (const char *name)
723	{	726	{
724	#if USE_UNORDERED_MAP
725	name = shstr::find (name);
726
727	if (!name)	727	if (!name)
728	return 0;	728	return 0;
729		729
730	HT::const_iterator i = ht.find ((size_t)name);	730	#if USE_UNORDERED_MAP
		731	AUTODECL (i, ht.find ((size_t) name));
731		732
732	if (i == ht.end ())	733	if (i == ht.end ())
733	return 0;	734	return 0;
734	else	735	else
735	return i->second;	736	return i->second;
736	#endif	737	#endif
737		738
738	archetype *at;	739	archetype *at;
739	unsigned long index;	740	unsigned long index;
740		741
741	if (name == NULL)
742	return (archetype *) NULL;
743
744	index = hasharch (name, ARCHTABLE);	742	index = hasharch (name, ARCHTABLE);
745	arch_search++;	743	arch_search++;
746	for (;;)	744	for (;;)
747	{	745	{
748	at = arch_table[index];	746	at = arch_table[index];
		747
749	if (at == NULL)	748	if (at == NULL)
750	{	749	{
751	if (warn_archetypes)	750	if (warn_archetypes)
752	LOG (llevError, "Couldn't find archetype %s\n", name);	751	LOG (llevError, "Couldn't find archetype %s\n", name);
		752
753	return NULL;	753	return NULL;
754	}	754	}
		755
755	arch_cmp++;	756	arch_cmp++;
		757
756	if (!strcmp ((const char *) at->name, name))	758	if (!strcmp ((const char *) at->name, name))
757	return at;	759	return at;
		760
758	if (++index >= ARCHTABLE)	761	if (++index >= ARCHTABLE)
759	index = 0;	762	index = 0;
760	}	763	}
761	}	764	}
762		765
…		…
766		769
767	static void	770	static void
768	add_arch (archetype *at)	771	add_arch (archetype *at)
769	{	772	{
770	#if USE_UNORDERED_MAP	773	#if USE_UNORDERED_MAP
771	ht.insert (std::make_pair ((size_t)(const char *)at->name, at));	774	ht.insert (std::make_pair ((size_t) (const char *) at->name, at));
772	#endif	775	#endif
773		776
774	int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index;	777	int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index;
775		778
776	for (;;)	779	for (;;)
…		…
795	*/	798	*/
796		799
797	archetype *	800	archetype *
798	type_to_archetype (int type)	801	type_to_archetype (int type)
799	{	802	{
800	archetype *	803	archetype *at;
801	at;
802		804
803	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)	805	for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
804	if (at->clone.type == type)	806	if (at->clone.type == type)
805	return at;	807	return at;
		808
806	return NULL;	809	return 0;
807	}	810	}
808		811
809	/*	812	/*
810	* Returns a new object copied from the first archetype matching	813	* Returns a new object copied from the first archetype matching
811	* the given type.	814	* the given type.
…		…
813	*/	816	*/
814		817
815	object *	818	object *
816	clone_arch (int type)	819	clone_arch (int type)
817	{	820	{
818	archetype *	821	archetype *at;
819	at;
820	object *
821	op = get_object ();	822	object *op = get_object ();
822		823
823	if ((at = type_to_archetype (type)) == NULL)	824	if ((at = type_to_archetype (type)) == NULL)
824	{	825	{
825	LOG (llevError, "Can't clone archetype %d\n", type);	826	LOG (llevError, "Can't clone archetype %d\n", type);
826	free_object (op);	827	free_object (op);
827	return NULL;	828	return NULL;
828	}	829	}
		830
829	copy_object (&at->clone, op);	831	copy_object (&at->clone, op);
830	op->instantiate ();	832	op->instantiate ();
831	return op;	833	return op;
832	}	834	}
833		835
834	/*	836	/*
835	* member: make instance from class	837	* member: make instance from class
836	*/	838	*/
837		839
838	object *	840	object *
839	object_create_arch (archetype * at)	841	object_create_arch (archetype *at)
840	{	842	{
841	object *	843	object op, prev = 0, *head = 0;
842	op, *
843	prev = NULL, *head = NULL;
844		844
845	while (at)	845	while (at)
846	{	846	{
847	op = arch_to_object (at);	847	op = arch_to_object (at);
848	op->x = at->clone.x;	848	op->x = at->clone.x;
849	op->y = at->clone.y;	849	op->y = at->clone.y;
		850
850	if (head)	851	if (head)
851	op->head = head, prev->more = op;	852	op->head = head, prev->more = op;
		853
852	if (!head)	854	if (!head)
853	head = op;	855	head = op;
		856
854	prev = op;	857	prev = op;
855	at = at->more;	858	at = at->more;
856	}	859	}
		860
857	return (head);	861	return (head);
858	}	862	}
859		863
860	/* end of arch.c */

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.14 by root, Fri Sep 8 17:14:07 2006 UTC vs. Revision 1.22 by root, Thu Sep 14 22:35:53 2006 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.14 by root, Fri Sep 8 17:14:07 2006 UTC vs.
Revision 1.22 by root, Thu Sep 14 22:35:53 2006 UTC