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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.24 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.36 by pippijn, Sat Jan 6 14:42:28 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
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	#define USE_UNORDERED_MAP 0
34	#define TIME_ARCH_LOAD 0
35		32
36	static void add_arch (archetype *at);	33	#if USE_UNORDERED_MAP
		34	# include <tr1/functional>
		35	# include <tr1/unordered_map>
		36	#endif
37		37
38	static archetype *arch_table[ARCHTABLE];
39	int arch_cmp = 0; /* How many strcmp's */	38	int arch_cmp = 0; /* How many strcmp's */
40	int arch_search = 0; /* How many searches */	39	int arch_search = 0; /* How many searches */
41	int arch_init; /* True if doing arch initialization */	40	int arch_init; /* True if doing arch initialization */
42		41
43	/* The naming of these functions is really poor - they are all	42	/* The naming of these functions is really poor - they are all
…		…
51	#if USE_UNORDERED_MAP	50	#if USE_UNORDERED_MAP
52	// the hashtable	51	// the hashtable
53	typedef std::tr1::unordered_map	52	typedef std::tr1::unordered_map
54	<	53	<
55	std::size_t,	54	std::size_t,
56	archetype *,	55	arch_ptr,
57	std::hash<size_t>,	56	std::tr1::hash<size_t>,
58	std::equal_to<size_t>,	57	std::equal_to<size_t>,
59	slice_allocator< std::pair<const std::size_t, archetype *> >	58	slice_allocator< std::pair<const std::size_t, archetype *> >
60	true,	59	true,
61	> HT;	60	> HT;
62		61
63	static HT ht;	62	static HT ht;
		63	#else
		64	static arch_ptr arch_table[ARCHTABLE];
64	#endif	65	#endif
65		66
66	/**	67	/**
67	* GROS - This function retrieves an archetype given the name that appears	68	* GROS - This function retrieves an archetype given the name that appears
68	* during the game (for example, "writing pen" instead of "stylus").	69	* during the game (for example, "writing pen" instead of "stylus").
…		…
118	* If type is -1, ew don't match on type.	119	* If type is -1, ew don't match on type.
119	*/	120	*/
120	object *	121	object *
121	get_archetype_by_skill_name (const char *skill, int type)	122	get_archetype_by_skill_name (const char *skill, int type)
122	{	123	{
123	archetype *	124	archetype *at;
124	at;
125		125
126	if (skill == NULL)	126	if (skill)
127	return NULL;
128
129	for (at = first_archetype; at != NULL; at = at->next)	127	for (at = first_archetype; at; at = at->next)
130	{
131	if (((type == -1) \|\| (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))	128	if (((type == -1) \|\| (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
132	return arch_to_object (at);	129	return arch_to_object (at);
133	}	130
134	return NULL;	131	return 0;
135	}	132	}
136		133
137	/* similiar to above - this returns the first archetype	134	/* similiar to above - this returns the first archetype
138	* that matches both the type and subtype. type and subtype	135	* 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	136	* can be -1 to say ignore, but in this case, the match it does
…		…
179	for (i = strlen (tmpname); i > 0; i--)	176	for (i = strlen (tmpname); i > 0; i--)
180	{	177	{
181	tmpname[i] = 0;	178	tmpname[i] = 0;
182	at = find_archetype_by_object_name (tmpname);	179	at = find_archetype_by_object_name (tmpname);
183		180
184	if (at != NULL)	181	if (at)
185	return arch_to_object (at);	182	return arch_to_object (at);
186	}	183	}
187		184
188	return create_singularity (name);	185	return create_singularity (name);
189	}	186	}
…		…
358	archetype *at;	355	archetype *at;
359		356
360	LOG (llevDebug, " Setting up archetable...\n");	357	LOG (llevDebug, " Setting up archetable...\n");
361		358
362	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)	359	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
363	add_arch (at);	360	at->hash_add ();
364		361
365	LOG (llevDebug, "done\n");	362	LOG (llevDebug, "done\n");
366	}
367
368	/*
369	* Dumps an archetype to debug-level output.
370	*/
371
372	void
373	dump_arch (archetype *at)
374	{
375	dump_object (&at->clone);
376	}
377
378	/*
379	* Dumps _all_ archetypes to debug-level output.
380	* If you run crossfire with debug, and enter DM-mode, you can trigger
381	* this with the O key.
382	*/
383
384	void
385	dump_all_archetypes (void)
386	{
387	archetype *at;
388
389	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
390	{
391	dump_arch (at);
392	fprintf (logfile, "%s\n", errmsg);
393	}
394	}	363	}
395		364
396	void	365	void
397	free_all_archs (void)	366	free_all_archs (void)
398	{	367	{
…		…
409	delete	378	delete
410	at;	379	at;
411		380
412	i++;	381	i++;
413	}	382	}
		383
414	LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);	384	LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
415	}	385	}
416		386
417	archetype::archetype ()	387	archetype::archetype ()
418	{	388	{
419	clear_object (&clone); /* to initial state other also */
420	CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */	389	CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
421	SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */	390	SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
422	}	391	}
423		392
424	archetype::~archetype ()	393	archetype::~archetype ()
425	{	394	{
…		…
430	* of archetype-structures.	399	* of archetype-structures.
431	*/	400	*/
432	void	401	void
433	first_arch_pass (object_thawer & fp)	402	first_arch_pass (object_thawer & fp)
434	{	403	{
435	archetype at, head = NULL, *last_more = NULL;	404	archetype head = 0, last_more = 0;
436		405
		406	archetype *at = new archetype;
437	at->clone.arch = first_archetype = at = new archetype;	407	at->clone.arch = first_archetype = at;
438		408
439	while (int i = load_object (fp, &at->clone, 0))	409	while (int i = load_object (fp, &at->clone, 0))
440	{	410	{
441	at->clone.speed_left = (float) (-0.1);	411	at->clone.speed_left = (float) (-0.1);
442	/* copy the body_info to the body_used - this is only really	412	/* copy the body_info to the body_used - this is only really
…		…
580	void	550	void
581	load_archetypes (void)	551	load_archetypes (void)
582	{	552	{
583	char filename[MAX_BUF];	553	char filename[MAX_BUF];
584		554
585	#if TIME_ARCH_LOAD
586	struct timeval
587	tv1,
588	tv2;
589	#endif
590
591	sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);	555	sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
592	LOG (llevDebug, "Reading archetypes from %s:\n", filename);	556	LOG (llevDebug, "Reading archetypes from %s:\n", filename);
593		557
594	{	558	{
595	object_thawer	559	object_thawer
…		…
608	object_thawer	572	object_thawer
609	thawer (filename);	573	thawer (filename);
610		574
611	LOG (llevDebug, " loading treasure...\n");	575	LOG (llevDebug, " loading treasure...\n");
612	load_treasures ();	576	load_treasures ();
		577	LOG (llevDebug, " done\n");
613	LOG (llevDebug, " done\n arch-pass 2...\n");	578	LOG (llevDebug, " arch-pass 2...\n");
614	second_arch_pass (thawer);	579	second_arch_pass (thawer);
615	LOG (llevDebug, " done\n");	580	LOG (llevDebug, " done\n");
616	#ifdef DEBUG	581	#ifdef DEBUG
617	check_generators ();	582	check_generators ();
618	#endif	583	#endif
…		…
622		587
623	/*	588	/*
624	* Creates and returns a new object which is a copy of the given archetype.	589	* Creates and returns a new object which is a copy of the given archetype.
625	* This function returns NULL on failure.	590	* This function returns NULL on failure.
626	*/	591	*/
627
628	object *	592	object *
629	arch_to_object (archetype *at)	593	arch_to_object (archetype *at)
630	{	594	{
631	object *op;	595	object *op;
632		596
…		…
636	LOG (llevError, "Couldn't find archetype.\n");	600	LOG (llevError, "Couldn't find archetype.\n");
637		601
638	return NULL;	602	return NULL;
639	}	603	}
640		604
641	op = get_object ();	605	op = at->clone.clone ();
642	copy_object (&at->clone, op);
643	op->arch = at;	606	op->arch = at;
644	op->instantiate ();	607	op->instantiate ();
645	return op;	608	return op;
646	}	609	}
647		610
…		…
649	* Creates an object. This function is called by get_archetype()	612	* Creates an object. This function is called by get_archetype()
650	* if it fails to find the appropriate archetype.	613	* if it fails to find the appropriate archetype.
651	* Thus get_archetype() will be guaranteed to always return	614	* Thus get_archetype() will be guaranteed to always return
652	* an object, and never NULL.	615	* an object, and never NULL.
653	*/	616	*/
654
655	object *	617	object *
656	create_singularity (const char *name)	618	create_singularity (const char *name)
657	{	619	{
658	object *op;	620	object *op;
659	char buf[MAX_BUF];	621	char buf[MAX_BUF];
660		622
661	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);	623	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
662	op = get_object ();	624	op = object::create ();
663	op->name = op->name_pl = buf;	625	op->name = op->name_pl = buf;
664	SET_FLAG (op, FLAG_NO_PICK);	626	SET_FLAG (op, FLAG_NO_PICK);
665	return op;	627	return op;
666	}	628	}
667		629
668	/*	630	/*
669	* Finds which archetype matches the given name, and returns a new	631	* Finds which archetype matches the given name, and returns a new
670	* object containing a copy of the archetype.	632	* object containing a copy of the archetype.
671	*/	633	*/
672
673	object *	634	object *
674	get_archetype (const char *name)	635	get_archetype (const char *name)
675	{	636	{
676	archetype *at = archetype::find (name);	637	archetype *at = archetype::find (name);
677		638
…		…
759	}	720	}
760		721
761	/*	722	/*
762	* Adds an archetype to the hashtable.	723	* Adds an archetype to the hashtable.
763	*/	724	*/
764		725	void
765	static void	726	archetype::hash_add ()
766	add_arch (archetype *at)
767	{	727	{
768	#if USE_UNORDERED_MAP	728	#if USE_UNORDERED_MAP
769	ht.insert (std::make_pair ((size_t) (const char *) at->name, at));	729	ht.insert (std::make_pair ((size_t) (const char *) name, this));
770	#endif	730	#else
771		731
772	int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index;	732	int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
773		733
774	for (;;)	734	for (;;)
775	{	735	{
776	if (arch_table[index] == NULL)	736	if (!arch_table[index])
777	{	737	{
778	arch_table[index] = at;	738	arch_table[index] = this;
779	return;	739	break;
780	}	740	}
781		741
782	if (++index == ARCHTABLE)	742	if (++index == ARCHTABLE)
783	index = 0;	743	index = 0;
784		744
785	if (index == org_index)	745	if (index == org_index)
786	fatal (ARCHTABLE_TOO_SMALL);	746	fatal (ARCHTABLE_TOO_SMALL);
787	}	747	}
		748	#endif
		749	}
		750
		751	void
		752	archetype::hash_del ()
		753	{
		754	#if USE_UNORDERED_MAP
		755	# error remove this from HT
		756	#else
		757
		758	int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
		759
		760	for (;;)
		761	{
		762	if (arch_table[index] == this)
		763	{
		764	arch_table[index] = 0;
		765	break;
		766	}
		767
		768	if (++index == ARCHTABLE)
		769	index = 0;
		770
		771	if (index == org_index)
		772	break;
		773	}
		774	#endif
788	}	775	}
789		776
790	/*	777	/*
791	* Returns the first archetype using the given type.	778	* Returns the first archetype using the given type.
792	* Used in treasure-generation.	779	* Used in treasure-generation.
…		…
812		799
813	object *	800	object *
814	clone_arch (int type)	801	clone_arch (int type)
815	{	802	{
816	archetype *at;	803	archetype *at;
817	object *op = get_object ();
818		804
819	if ((at = type_to_archetype (type)) == NULL)	805	if ((at = type_to_archetype (type)) == NULL)
820	{	806	{
821	LOG (llevError, "Can't clone archetype %d\n", type);	807	LOG (llevError, "Can't clone archetype %d\n", type);
822	free_object (op);
823	return NULL;	808	return 0;
824	}	809	}
825		810
826	copy_object (&at->clone, op);	811	object *op = at->clone.clone ();
827	op->instantiate ();	812	op->instantiate ();
828	return op;	813	return op;
829	}	814	}
830		815
831	/*	816	/*

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.24 by root, Sat Sep 16 22:24:12 2006 UTC vs. Revision 1.36 by pippijn, Sat Jan 6 14:42:28 2007 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.24 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.36 by pippijn, Sat Jan 6 14:42:28 2007 UTC