[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.23 by root, Thu Sep 14 23:13:48 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>	26	#include <tr1/unordered_map>
…		…
54	* MSW 2003-04-29	48	* MSW 2003-04-29
55	*/	49	*/
56		50
57	#if USE_UNORDERED_MAP	51	#if USE_UNORDERED_MAP
58	// the hashtable	52	// the hashtable
59	typedef
60	std::tr1::unordered_map <	53	typedef std::tr1::unordered_map
61	size_t, archetype *>	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,
62	HT;	61	> HT;
63		62
64	static	63	static HT ht;
65	HT
66	ht;
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	add_arch (at);
…		…
398	*/	382	*/
399		383
400	void	384	void
401	dump_all_archetypes (void)	385	dump_all_archetypes (void)
402	{	386	{
403	archetype *	387	archetype *at;
404	at;
405		388
406	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)	389	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
407	{	390	{
408	dump_arch (at);	391	dump_arch (at);
409	fprintf (logfile, "%s\n", errmsg);	392	fprintf (logfile, "%s\n", errmsg);
…		…
411	}	394	}
412		395
413	void	396	void
414	free_all_archs (void)	397	free_all_archs (void)
415	{	398	{
416	archetype *	399	archetype at, next;
417	at, *
418	next;
419	int
420	i = 0, f = 0;	400	int i = 0, f = 0;
421		401
422	for (at = first_archetype; at != NULL; at = next)	402	for (at = first_archetype; at != NULL; at = next)
423	{	403	{
424	if (at->more)	404	if (at->more)
425	next = at->more;	405	next = at->more;
…		…
450	* of archetype-structures.	430	* of archetype-structures.
451	*/	431	*/
452	void	432	void
453	first_arch_pass (object_thawer & fp)	433	first_arch_pass (object_thawer & fp)
454	{	434	{
455	archetype *
456	at, *
457	head = NULL, *last_more = NULL;	435	archetype at, head = NULL, *last_more = NULL;
458		436
459	at->clone.arch = first_archetype = at = new archetype;	437	at->clone.arch = first_archetype = at = new archetype;
460		438
461	while (int i = load_object (fp, &at->clone, 0))	439	while (int i = load_object (fp, &at->clone, 0))
462	{	440	{
…		…
531	*/	509	*/
532		510
533	void	511	void
534	second_arch_pass (object_thawer & thawer)	512	second_arch_pass (object_thawer & thawer)
535	{	513	{
536	char
537	buf[MAX_BUF], *
538	variable = buf, argument, cp;	514	char buf[MAX_BUF], variable = buf, argument, *cp;
539	archetype *
540	at = NULL, *other;	515	archetype at = NULL, other;
541		516
542	while (fgets (buf, MAX_BUF, thawer) != NULL)	517	while (fgets (buf, MAX_BUF, thawer) != NULL)
543	{	518	{
544	if (*buf == '#')	519	if (*buf == '#')
545	continue;	520	continue;
…		…
553	cp--;	528	cp--;
554	}	529	}
555	}	530	}
556	if (!strcmp ("Object", variable))	531	if (!strcmp ("Object", variable))
557	{	532	{
558	if ((at = find_archetype (argument)) == NULL)	533	if ((at = archetype::find (argument)) == NULL)
559	LOG (llevError, "Warning: failed to find arch %s\n", argument);	534	LOG (llevError, "Warning: failed to find arch %s\n", argument);
560	}	535	}
561	else if (!strcmp ("other_arch", variable))	536	else if (!strcmp ("other_arch", variable))
562	{	537	{
563	if (at != NULL && at->clone.other_arch == NULL)	538	if (at != NULL && at->clone.other_arch == NULL)
564	{	539	{
565	if ((other = find_archetype (argument)) == NULL)	540	if ((other = archetype::find (argument)) == NULL)
566	LOG (llevError, "Warning: failed to find other_arch %s\n", argument);	541	LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
567	else if (at != NULL)	542	else if (at != NULL)
568	at->clone.other_arch = other;	543	at->clone.other_arch = other;
569	}	544	}
570	}	545	}
…		…
586		561
587	#ifdef DEBUG	562	#ifdef DEBUG
588	void	563	void
589	check_generators (void)	564	check_generators (void)
590	{	565	{
591	archetype *	566	archetype *at;
592	at;
593		567
594	for (at = first_archetype; at != NULL; at = at->next)	568	for (at = first_archetype; at != NULL; at = at->next)
595	if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)	569	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);	570	LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
597	}	571	}
…		…
605	*/	579	*/
606		580
607	void	581	void
608	load_archetypes (void)	582	load_archetypes (void)
609	{	583	{
610	char
611	filename[MAX_BUF];	584	char filename[MAX_BUF];
612		585
613	#if TIME_ARCH_LOAD	586	#if TIME_ARCH_LOAD
614	struct timeval	587	struct timeval
615	tv1,	588	tv1,
616	tv2;	589	tv2;
…		…
654	*/	627	*/
655		628
656	object *	629	object *
657	arch_to_object (archetype *at)	630	arch_to_object (archetype *at)
658	{	631	{
659	object *	632	object *op;
660	op;
661		633
662	if (at == NULL)	634	if (at == NULL)
663	{	635	{
664	if (warn_archetypes)	636	if (warn_archetypes)
665	LOG (llevError, "Couldn't find archetype.\n");	637	LOG (llevError, "Couldn't find archetype.\n");
…		…
682	*/	654	*/
683		655
684	object *	656	object *
685	create_singularity (const char *name)	657	create_singularity (const char *name)
686	{	658	{
687	object *	659	object *op;
688	op;
689	char
690	buf[MAX_BUF];	660	char buf[MAX_BUF];
691		661
692	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);	662	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
693	op = get_object ();	663	op = get_object ();
694	op->name = op->name_pl = buf;	664	op->name = op->name_pl = buf;
695	SET_FLAG (op, FLAG_NO_PICK);	665	SET_FLAG (op, FLAG_NO_PICK);
…		…
702	*/	672	*/
703		673
704	object *	674	object *
705	get_archetype (const char *name)	675	get_archetype (const char *name)
706	{	676	{
707	archetype *	677	archetype *at = archetype::find (name);
708	at;
709		678
710	at = find_archetype (name);	679	if (!at)
711	if (at == NULL)
712	return create_singularity (name);	680	return create_singularity (name);
713		681
714	return arch_to_object (at);	682	return arch_to_object (at);
715	}	683	}
716		684
…		…
719	*/	687	*/
720		688
721	unsigned long	689	unsigned long
722	hasharch (const char *str, int tablesize)	690	hasharch (const char *str, int tablesize)
723	{	691	{
724	unsigned long	692	unsigned long hash = 0;
725	hash = 0;
726	unsigned int	693	unsigned int i = 0;
727	i = 0;
728	const char *	694	const char *p;
729	p;
730		695
731	/* use the one-at-a-time hash function, which supposedly is	696	/* use the one-at-a-time hash function, which supposedly is
732	* better than the djb2-like one used by perl5.005, but	697	* better than the djb2-like one used by perl5.005, but
733	* certainly is better then the bug used here before.	698	* certainly is better then the bug used here before.
734	* see http://burtleburtle.net/bob/hash/doobs.html	699	* see http://burtleburtle.net/bob/hash/doobs.html
…		…
751	* Finds, using the hashtable, which archetype matches the given name.	716	* Finds, using the hashtable, which archetype matches the given name.
752	* returns a pointer to the found archetype, otherwise NULL.	717	* returns a pointer to the found archetype, otherwise NULL.
753	*/	718	*/
754		719
755	archetype *	720	archetype *
756	find_archetype (const char *name)	721	archetype::find (const char *name)
757	{	722	{
758	#if USE_UNORDERED_MAP
759	name = shstr::find (name);
760
761	if (!name)	723	if (!name)
762	return 0;	724	return 0;
763		725
764	HT::const_iterator i = ht.find ((size_t) name);	726	#if USE_UNORDERED_MAP
		727	AUTODECL (i, ht.find ((size_t) name));
765		728
766	if (i == ht.end ())	729	if (i == ht.end ())
767	return 0;	730	return 0;
768	else	731	else
769	return i->second;	732	return i->second;
770	#endif	733	#endif
771		734
772	archetype *	735	archetype *at;
773	at;
774	unsigned long	736	unsigned long index;
775	index;
776
777	if (name == NULL)
778	return (archetype *) NULL;
779		737
780	index = hasharch (name, ARCHTABLE);	738	index = hasharch (name, ARCHTABLE);
781	arch_search++;	739	arch_search++;
782	for (;;)	740	for (;;)
783	{	741	{
784	at = arch_table[index];	742	at = arch_table[index];
		743
785	if (at == NULL)	744	if (at == NULL)
786	{	745	{
787	if (warn_archetypes)	746	if (warn_archetypes)
788	LOG (llevError, "Couldn't find archetype %s\n", name);	747	LOG (llevError, "Couldn't find archetype %s\n", name);
		748
789	return NULL;	749	return NULL;
790	}	750	}
		751
791	arch_cmp++;	752	arch_cmp++;
		753
792	if (!strcmp ((const char *) at->name, name))	754	if (!strcmp ((const char *) at->name, name))
793	return at;	755	return at;
		756
794	if (++index >= ARCHTABLE)	757	if (++index >= ARCHTABLE)
795	index = 0;	758	index = 0;
796	}	759	}
797	}	760	}
798		761
…		…
805	{	768	{
806	#if USE_UNORDERED_MAP	769	#if USE_UNORDERED_MAP
807	ht.insert (std::make_pair ((size_t) (const char *) at->name, at));	770	ht.insert (std::make_pair ((size_t) (const char *) at->name, at));
808	#endif	771	#endif
809		772
810	int
811	index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index;	773	int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index;
812		774
813	for (;;)	775	for (;;)
814	{	776	{
815	if (arch_table[index] == NULL)	777	if (arch_table[index] == NULL)
816	{	778	{
…		…
832	*/	794	*/
833		795
834	archetype *	796	archetype *
835	type_to_archetype (int type)	797	type_to_archetype (int type)
836	{	798	{
837	archetype *	799	archetype *at;
838	at;
839		800
840	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)	801	for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
841	if (at->clone.type == type)	802	if (at->clone.type == type)
842	return at;	803	return at;
		804
843	return NULL;	805	return 0;
844	}	806	}
845		807
846	/*	808	/*
847	* Returns a new object copied from the first archetype matching	809	* Returns a new object copied from the first archetype matching
848	* the given type.	810	* the given type.
…		…
850	*/	812	*/
851		813
852	object *	814	object *
853	clone_arch (int type)	815	clone_arch (int type)
854	{	816	{
855	archetype *	817	archetype *at;
856	at;
857	object *
858	op = get_object ();	818	object *op = get_object ();
859		819
860	if ((at = type_to_archetype (type)) == NULL)	820	if ((at = type_to_archetype (type)) == NULL)
861	{	821	{
862	LOG (llevError, "Can't clone archetype %d\n", type);	822	LOG (llevError, "Can't clone archetype %d\n", type);
863	free_object (op);	823	free_object (op);
864	return NULL;	824	return NULL;
865	}	825	}
		826
866	copy_object (&at->clone, op);	827	copy_object (&at->clone, op);
867	op->instantiate ();	828	op->instantiate ();
868	return op;	829	return op;
869	}	830	}
870		831
…		…
873	*/	834	*/
874		835
875	object *	836	object *
876	object_create_arch (archetype *at)	837	object_create_arch (archetype *at)
877	{	838	{
878	object *	839	object op, prev = 0, *head = 0;
879	op, *
880	prev = NULL, *head = NULL;
881		840
882	while (at)	841	while (at)
883	{	842	{
884	op = arch_to_object (at);	843	op = arch_to_object (at);
885	op->x = at->clone.x;	844	op->x = at->clone.x;
886	op->y = at->clone.y;	845	op->y = at->clone.y;
		846
887	if (head)	847	if (head)
888	op->head = head, prev->more = op;	848	op->head = head, prev->more = op;
		849
889	if (!head)	850	if (!head)
890	head = op;	851	head = op;
		852
891	prev = op;	853	prev = op;
892	at = at->more;	854	at = at->more;
893	}	855	}
		856
894	return (head);	857	return (head);
895	}	858	}
896		859
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.23 by root, Thu Sep 14 23:13:48 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.23 by root, Thu Sep 14 23:13:48 2006 UTC