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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.25 by root, Tue Nov 7 16:30:54 2006 UTC vs.
Revision 1.38 by root, Fri Feb 2 21:50:43 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	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
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	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
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	#include <cassert>	25	#include <cassert>
25		26
26	#include <tr1/unordered_map>
27
28	#include <global.h>	27	#include <global.h>
29	#include <arch.h>
30	#include <funcpoint.h>	28	#include <funcpoint.h>
31	#include <loader.h>	29	#include <loader.h>
32		30
33	/* IF set, does a little timing on the archetype load. */	31	#include <tr1/functional>
34	#define TIME_ARCH_LOAD 0	32	#include <tr1/unordered_map>
35		33
36	static void add_arch (archetype *at);
37
38	static archetype *arch_table[ARCHTABLE];
39	int arch_cmp = 0; /* How many strcmp's */
40	int arch_search = 0; /* How many searches */
41	int arch_init; /* True if doing arch initialization */	34	int arch_init; /* True if doing arch initialization */
42		35
43	/* The naming of these functions is really poor - they are all	36	/* The naming of these functions is really poor - they are all
44	* pretty much named '.._arch_...', but they may more may not	37	* pretty much named '.._arch_...', but they may more may not
45	* return archetypes. Some make the arch_to_object call, and thus	38	* return archetypes. Some make the arch_to_object call, and thus
46	* return an object. Perhaps those should be called 'archob' functions	39	* return an object. Perhaps those should be called 'archob' functions
47	* to denote they return an object derived from the archetype.	40	* to denote they return an object derived from the archetype.
48	* MSW 2003-04-29	41	* MSW 2003-04-29
49	*/	42	*/
50		43
51	#if USE_UNORDERED_MAP
52	// the hashtable	44	// the hashtable
53	typedef std::tr1::unordered_map	45	typedef std::tr1::unordered_map
54	<	46	<
55	std::size_t,	47	const char *,
56	archetype *,	48	arch_ptr,
57	std::hash<size_t>,	49	str_hash,
58	std::equal_to<size_t>,	50	str_equal,
59	slice_allocator< std::pair<const std::size_t, archetype *> >	51	slice_allocator< std::pair<const char *const, arch_ptr> >
60	true,
61	> HT;	52	> HT;
62		53
63	static HT ht;	54	static HT ht (5000);
64	#endif
65		55
66	/**	56	/**
67	* GROS - This function retrieves an archetype given the name that appears	57	* GROS - This function retrieves an archetype given the name that appears
68	* during the game (for example, "writing pen" instead of "stylus").	58	* during the game (for example, "writing pen" instead of "stylus").
69	* It does not use the hashtable system, but browse the whole archlist each time.	59	* It does not use the hashtable system, but browse the whole archlist each time.
118	* If type is -1, ew don't match on type.	108	* If type is -1, ew don't match on type.
119	*/	109	*/
120	object *	110	object *
121	get_archetype_by_skill_name (const char *skill, int type)	111	get_archetype_by_skill_name (const char *skill, int type)
122	{	112	{
123	archetype *	113	archetype *at;
124	at;
125		114
126	if (skill == NULL)	115	if (skill)
127	return NULL;
128
129	for (at = first_archetype; at != NULL; at = at->next)	116	for (at = first_archetype; at; at = at->next)
130	{
131	if (((type == -1) \|\| (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))	117	if (((type == -1) \|\| (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
132	return arch_to_object (at);	118	return arch_to_object (at);
133	}	119
134	return NULL;	120	return 0;
135	}	121	}
136		122
137	/* similiar to above - this returns the first archetype	123	/* similiar to above - this returns the first archetype
138	* that matches both the type and subtype. type and subtype	124	* that matches both the type and subtype. type and subtype
139	* can be -1 to say ignore, but in this case, the match it does	125	* can be -1 to say ignore, but in this case, the match it does
…		…
179	for (i = strlen (tmpname); i > 0; i--)	165	for (i = strlen (tmpname); i > 0; i--)
180	{	166	{
181	tmpname[i] = 0;	167	tmpname[i] = 0;
182	at = find_archetype_by_object_name (tmpname);	168	at = find_archetype_by_object_name (tmpname);
183		169
184	if (at != NULL)	170	if (at)
185	return arch_to_object (at);	171	return arch_to_object (at);
186	}	172	}
187		173
188	return create_singularity (name);	174	return create_singularity (name);
189	}	175	}
…		…
325		311
326	/* init_blocksview();*/	312	/* init_blocksview();*/
327	}	313	}
328		314
329	/*	315	/*
330	* Stores debug-information about how efficient the hashtable
331	* used for archetypes has been in the static errmsg array.
332	*/
333
334	void
335	arch_info (object *op)
336	{
337	sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
338	new_draw_info (NDI_BLACK, 0, op, errmsg);
339	}
340
341	/*
342	* Initialise the hashtable used by the archetypes.
343	*/
344
345	void
346	clear_archetable (void)
347	{
348	memset ((void ) arch_table, 0, ARCHTABLE sizeof (archetype *));
349	}
350
351	/*
352	* An alternative way to init the hashtable which is slower, but _works_...	316	* An alternative way to init the hashtable which is slower, but _works_...
353	*/	317	*/
354
355	void	318	void
356	init_archetable (void)	319	init_archetable (void)
357	{	320	{
358	archetype *at;	321	archetype *at;
359		322
360	LOG (llevDebug, " Setting up archetable...\n");	323	LOG (llevDebug, " Setting up archetable...\n");
361		324
362	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)	325	for (at = first_archetype; at; at = at->more ? at->more : at->next)
363	add_arch (at);	326	at->hash_add ();
364		327
365	LOG (llevDebug, "done\n");	328	LOG (llevDebug, "done\n");
366	}	329	}
367		330
368	void	331	void
369	free_all_archs (void)	332	free_all_archs (void)
370	{	333	{
371	archetype at, next;	334	archetype at, next;
372	int i = 0, f = 0;	335	int i = 0, f = 0;
373		336
374	for (at = first_archetype; at != NULL; at = next)	337	for (at = first_archetype; at; at = next)
375	{	338	{
376	if (at->more)	339	if (at->more)
377	next = at->more;	340	next = at->more;
378	else	341	else
379	next = at->next;	342	next = at->next;
…		…
381	delete	344	delete
382	at;	345	at;
383		346
384	i++;	347	i++;
385	}	348	}
		349
386	LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);	350	LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
387	}	351	}
388		352
389	archetype::archetype ()	353	archetype::archetype ()
390	{	354	{
391	clear_object (&clone); /* to initial state other also */
392	CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */	355	CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
393	SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */	356	SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
394	}	357	}
395		358
396	archetype::~archetype ()	359	archetype::~archetype ()
397	{	360	{
…		…
402	* of archetype-structures.	365	* of archetype-structures.
403	*/	366	*/
404	void	367	void
405	first_arch_pass (object_thawer & fp)	368	first_arch_pass (object_thawer & fp)
406	{	369	{
407	archetype at, head = NULL, *last_more = NULL;	370	archetype head = 0, last_more = 0;
408		371
		372	archetype *at = new archetype;
409	at->clone.arch = first_archetype = at = new archetype;	373	at->clone.arch = first_archetype = at;
410		374
411	while (int i = load_object (fp, &at->clone, 0))	375	while (int i = load_object (fp, &at->clone, 0))
412	{	376	{
413	at->clone.speed_left = (float) (-0.1);	377	at->clone.speed_left = (float) (-0.1);
414	/* copy the body_info to the body_used - this is only really	378	/* copy the body_info to the body_used - this is only really
…		…
552	void	516	void
553	load_archetypes (void)	517	load_archetypes (void)
554	{	518	{
555	char filename[MAX_BUF];	519	char filename[MAX_BUF];
556		520
557	#if TIME_ARCH_LOAD
558	struct timeval
559	tv1,
560	tv2;
561	#endif
562
563	sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);	521	sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
564	LOG (llevDebug, "Reading archetypes from %s:\n", filename);	522	LOG (llevDebug, "Reading archetypes from %s:\n", filename);
565		523
566	{	524	{
567	object_thawer	525	object_thawer
568	thawer (filename);	526	thawer (filename);
569		527
570	clear_archetable ();
571	LOG (llevDebug, " arch-pass 1...\n");	528	LOG (llevDebug, " arch-pass 1...\n");
572	first_arch_pass (thawer);	529	first_arch_pass (thawer);
573	LOG (llevDebug, " done\n");	530	LOG (llevDebug, " done\n");
574	}	531	}
575		532
…		…
580	object_thawer	537	object_thawer
581	thawer (filename);	538	thawer (filename);
582		539
583	LOG (llevDebug, " loading treasure...\n");	540	LOG (llevDebug, " loading treasure...\n");
584	load_treasures ();	541	load_treasures ();
		542	LOG (llevDebug, " done\n");
585	LOG (llevDebug, " done\n arch-pass 2...\n");	543	LOG (llevDebug, " arch-pass 2...\n");
586	second_arch_pass (thawer);	544	second_arch_pass (thawer);
587	LOG (llevDebug, " done\n");	545	LOG (llevDebug, " done\n");
588	#ifdef DEBUG	546	#ifdef DEBUG
589	check_generators ();	547	check_generators ();
590	#endif	548	#endif
…		…
594		552
595	/*	553	/*
596	* Creates and returns a new object which is a copy of the given archetype.	554	* Creates and returns a new object which is a copy of the given archetype.
597	* This function returns NULL on failure.	555	* This function returns NULL on failure.
598	*/	556	*/
599
600	object *	557	object *
601	arch_to_object (archetype *at)	558	arch_to_object (archetype *at)
602	{	559	{
603	object *op;	560	object *op;
604		561
…		…
608	LOG (llevError, "Couldn't find archetype.\n");	565	LOG (llevError, "Couldn't find archetype.\n");
609		566
610	return NULL;	567	return NULL;
611	}	568	}
612		569
613	op = get_object ();	570	op = at->clone.clone ();
614	copy_object (&at->clone, op);
615	op->arch = at;	571	op->arch = at;
616	op->instantiate ();	572	op->instantiate ();
617	return op;	573	return op;
618	}	574	}
619		575
…		…
621	* Creates an object. This function is called by get_archetype()	577	* Creates an object. This function is called by get_archetype()
622	* if it fails to find the appropriate archetype.	578	* if it fails to find the appropriate archetype.
623	* Thus get_archetype() will be guaranteed to always return	579	* Thus get_archetype() will be guaranteed to always return
624	* an object, and never NULL.	580	* an object, and never NULL.
625	*/	581	*/
626
627	object *	582	object *
628	create_singularity (const char *name)	583	create_singularity (const char *name)
629	{	584	{
630	object *op;	585	object *op;
631	char buf[MAX_BUF];	586	char buf[MAX_BUF];
632		587
633	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);	588	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
634	op = get_object ();	589	op = object::create ();
635	op->name = op->name_pl = buf;	590	op->name = op->name_pl = buf;
636	SET_FLAG (op, FLAG_NO_PICK);	591	SET_FLAG (op, FLAG_NO_PICK);
637	return op;	592	return op;
638	}	593	}
639		594
640	/*	595	/*
641	* Finds which archetype matches the given name, and returns a new	596	* Finds which archetype matches the given name, and returns a new
642	* object containing a copy of the archetype.	597	* object containing a copy of the archetype.
643	*/	598	*/
644
645	object *	599	object *
646	get_archetype (const char *name)	600	get_archetype (const char *name)
647	{	601	{
648	archetype *at = archetype::find (name);	602	archetype *at = archetype::find (name);
649		603
…		…
685		639
686	/*	640	/*
687	* Finds, using the hashtable, which archetype matches the given name.	641	* Finds, using the hashtable, which archetype matches the given name.
688	* returns a pointer to the found archetype, otherwise NULL.	642	* returns a pointer to the found archetype, otherwise NULL.
689	*/	643	*/
690
691	archetype *	644	archetype *
692	archetype::find (const char *name)	645	archetype::find (const char *name)
693	{	646	{
694	if (!name)	647	if (!name)
695	return 0;	648	return 0;
696		649
697	#if USE_UNORDERED_MAP
698	AUTODECL (i, ht.find ((size_t) name));	650	AUTODECL (i, ht.find (name));
699		651
700	if (i == ht.end ())	652	if (i == ht.end ())
701	return 0;	653	return 0;
702	else	654	else
703	return i->second;	655	return i->second;
704	#endif
705
706	archetype *at;
707	unsigned long index;
708
709	index = hasharch (name, ARCHTABLE);
710	arch_search++;
711	for (;;)
712	{
713	at = arch_table[index];
714
715	if (at == NULL)
716	{
717	if (warn_archetypes)
718	LOG (llevError, "Couldn't find archetype %s\n", name);
719
720	return NULL;
721	}
722
723	arch_cmp++;
724
725	if (!strcmp ((const char *) at->name, name))
726	return at;
727
728	if (++index >= ARCHTABLE)
729	index = 0;
730	}
731	}	656	}
732		657
733	/*	658	/*
734	* Adds an archetype to the hashtable.	659	* Adds an archetype to the hashtable.
735	*/	660	*/
736		661	void
737	static void	662	archetype::hash_add ()
738	add_arch (archetype *at)
739	{	663	{
740	#if USE_UNORDERED_MAP	664	ht.insert (std::make_pair (name, this));
741	ht.insert (std::make_pair ((size_t) (const char *) at->name, at));	665	}
742	#endif
743		666
744	int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index;	667	void
745		668	archetype::hash_del ()
746	for (;;)	669	{
747	{	670	ht.erase (name);
748	if (arch_table[index] == NULL)
749	{
750	arch_table[index] = at;
751	return;
752	}
753
754	if (++index == ARCHTABLE)
755	index = 0;
756
757	if (index == org_index)
758	fatal (ARCHTABLE_TOO_SMALL);
759	}
760	}	671	}
761		672
762	/*	673	/*
763	* Returns the first archetype using the given type.	674	* Returns the first archetype using the given type.
764	* Used in treasure-generation.	675	* Used in treasure-generation.
765	*/	676	*/
766
767	archetype *	677	archetype *
768	type_to_archetype (int type)	678	type_to_archetype (int type)
769	{	679	{
770	archetype *at;	680	archetype *at;
771		681
…		…
784		694
785	object *	695	object *
786	clone_arch (int type)	696	clone_arch (int type)
787	{	697	{
788	archetype *at;	698	archetype *at;
789	object *op = get_object ();
790		699
791	if ((at = type_to_archetype (type)) == NULL)	700	if ((at = type_to_archetype (type)) == NULL)
792	{	701	{
793	LOG (llevError, "Can't clone archetype %d\n", type);	702	LOG (llevError, "Can't clone archetype %d\n", type);
794	free_object (op);
795	return NULL;	703	return 0;
796	}	704	}
797		705
798	copy_object (&at->clone, op);	706	object *op = at->clone.clone ();
799	op->instantiate ();	707	op->instantiate ();
800	return op;	708	return op;
801	}	709	}
802		710
803	/*	711	/*

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.25 by root, Tue Nov 7 16:30:54 2006 UTC vs. Revision 1.38 by root, Fri Feb 2 21:50:43 2007 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.25 by root, Tue Nov 7 16:30:54 2006 UTC vs.
Revision 1.38 by root, Fri Feb 2 21:50:43 2007 UTC