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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.36 by pippijn, Sat Jan 6 14:42:28 2007 UTC vs.
Revision 1.43 by root, Fri Feb 16 19:43:40 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) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
7		7	*
8	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
9	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
10	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	(at your option) any later version.	11	* (at your option) any later version.
12		12	*
13	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,
14	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	GNU General Public License for more details.	16	* GNU General Public License for more details.
17		17	*
18	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
19	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		21	*
22	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>
23	*/	23	*/
24		24
25	#include <cassert>	25	#include <cassert>
26		26
27	#include <global.h>	27	#include <global.h>
28	#include <funcpoint.h>	28	#include <funcpoint.h>
29	#include <loader.h>	29	#include <loader.h>
30		30
31	#define USE_UNORDERED_MAP 0
32
33	#if USE_UNORDERED_MAP
34	# include <tr1/functional>	31	#include <tr1/functional>
35	# include <tr1/unordered_map>	32	#include <tr1/unordered_map>
36	#endif
37		33
38	int arch_cmp = 0; /* How many strcmp's */
39	int arch_search = 0; /* How many searches */
40	int arch_init; /* True if doing arch initialization */	34	int arch_init; /* True if doing arch initialization */
41		35
42	/* The naming of these functions is really poor - they are all	36	/* The naming of these functions is really poor - they are all
43	* pretty much named '.._arch_...', but they may more may not	37	* pretty much named '.._arch_...', but they may more may not
44	* return archetypes. Some make the arch_to_object call, and thus	38	* return archetypes. Some make the arch_to_object call, and thus
45	* return an object. Perhaps those should be called 'archob' functions	39	* return an object. Perhaps those should be called 'archob' functions
46	* to denote they return an object derived from the archetype.	40	* to denote they return an object derived from the archetype.
47	* MSW 2003-04-29	41	* MSW 2003-04-29
48	*/	42	*/
49		43
50	#if USE_UNORDERED_MAP
51	// the hashtable	44	// the hashtable
52	typedef std::tr1::unordered_map	45	typedef std::tr1::unordered_map
53	<	46	<
54	std::size_t,	47	const char *,
55	arch_ptr,	48	arch_ptr,
56	std::tr1::hash<size_t>,	49	str_hash,
57	std::equal_to<size_t>,	50	str_equal,
58	slice_allocator< std::pair<const std::size_t, archetype *> >	51	slice_allocator< std::pair<const char *const, arch_ptr> >
59	true,
60	> HT;	52	> HT;
61		53
62	static HT ht;	54	static HT ht (5000);
63	#else
64	static arch_ptr arch_table[ARCHTABLE];
65	#endif
66		55
67	/**	56	/**
68	* GROS - This function retrieves an archetype given the name that appears	57	* GROS - This function retrieves an archetype given the name that appears
69	* during the game (for example, "writing pen" instead of "stylus").	58	* during the game (for example, "writing pen" instead of "stylus").
70	* 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.
76	* - the archetype found or null if nothing was found.	65	* - the archetype found or null if nothing was found.
77	*/	66	*/
78	archetype *	67	archetype *
79	find_archetype_by_object_name (const char *name)	68	find_archetype_by_object_name (const char *name)
80	{	69	{
81	archetype *at;	70	shstr_cmp name_cmp (name);
82		71
83	if (name == NULL)
84	return (archetype *) NULL;
85
86	for (at = first_archetype; at != NULL; at = at->next)	72	for (archetype *at = first_archetype; at; at = at->next)
87	{	73	if (at->clone.name == name_cmp)
88	if (!strcmp (at->clone.name, name))
89	return at;	74	return at;
90	}	75
91	return NULL;	76	return 0;
92	}	77	}
93		78
94	/**	79	/**
95	* This function retrieves an archetype by type and name that appears during	80	* This function retrieves an archetype by type and name that appears during
96	* the game. It is basically the same as find_archetype_by_object_name()	81	* the game. It is basically the same as find_archetype_by_object_name()
97	* except that it considers only items of the given type.	82	* except that it considers only items of the given type.
98	*/	83	*/
99	archetype *	84	archetype *
100	find_archetype_by_object_type_name (int type, const char *name)	85	find_archetype_by_object_type_name (int type, const char *name)
101	{	86	{
102	archetype *at;	87	shstr_cmp name_cmp (name);
103		88
104	if (name == NULL)
105	return NULL;
106
107	for (at = first_archetype; at != NULL; at = at->next)	89	for (archetype *at = first_archetype; at; at = at->next)
108	{	90	if (at->clone.name == name_cmp && at->clone.type == type)
109	if (at->clone.type == type && strcmp (at->clone.name, name) == 0)
110	return at;	91	return at;
111	}
112		92
113	return NULL;	93	return 0;
114	}	94	}
115		95
116	/* This is a lot like the above function. Instead, we are trying to match	96	/* This is a lot like the above function. Instead, we are trying to match
117	* the arch->skill values. type is the type of object to match	97	* the arch->skill values. type is the type of object to match
118	* against (eg, to only match against skills or only skill objects for example).	98	* against (eg, to only match against skills or only skill objects for example).
119	* If type is -1, ew don't match on type.	99	* If type is -1, ew don't match on type.
120	*/	100	*/
121	object *	101	object *
122	get_archetype_by_skill_name (const char *skill, int type)	102	get_archetype_by_skill_name (const char *skill, int type)
123	{	103	{
124	archetype *at;	104	shstr_cmp skill_cmp (skill);
125		105
126	if (skill)
127	for (at = first_archetype; at; at = at->next)	106	for (archetype *at = first_archetype; at; at = at->next)
128	if (((type == -1) \|\| (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))	107	if (at->clone.skill == skill_cmp && (type == -1 \|\| type == at->clone.type))
129	return arch_to_object (at);	108	return arch_to_object (at);
130		109
131	return 0;	110	return 0;
132	}	111	}
133		112
134	/* similiar to above - this returns the first archetype	113	/* similiar to above - this returns the first archetype
…		…
139	* (eg, skills)	118	* (eg, skills)
140	*/	119	*/
141	archetype *	120	archetype *
142	get_archetype_by_type_subtype (int type, int subtype)	121	get_archetype_by_type_subtype (int type, int subtype)
143	{	122	{
144	archetype *
145	at;
146
147	for (at = first_archetype; at != NULL; at = at->next)	123	for (archetype *at = first_archetype; at; at = at->next)
148	{
149	if (((type == -1) \|\| (type == at->clone.type)) && (subtype == -1 \|\| subtype == at->clone.subtype))	124	if ((type == -1 \|\| type == at->clone.type) && (subtype == -1 \|\| subtype == at->clone.subtype))
150	return at;	125	return at;
151	}	126
152	return NULL;	127	return 0;
153	}	128	}
154		129
155	/**	130	/**
156	* GROS - this returns a new object given the name that appears during the game	131	* GROS - this returns a new object given the name that appears during the game
157	* (for example, "writing pen" instead of "stylus").	132	* (for example, "writing pen" instead of "stylus").
…		…
165	* but it otherwise had a big memory leak.	140	* but it otherwise had a big memory leak.
166	*/	141	*/
167	object *	142	object *
168	get_archetype_by_object_name (const char *name)	143	get_archetype_by_object_name (const char *name)
169	{	144	{
170	archetype *at;
171	char tmpname[MAX_BUF];	145	char tmpname[MAX_BUF];
172	int i;	146	int i;
173		147
174	assign (tmpname, name);	148	assign (tmpname, name);
175		149
176	for (i = strlen (tmpname); i > 0; i--)	150	for (i = strlen (tmpname); i > 0; i--)
177	{	151	{
178	tmpname[i] = 0;	152	tmpname[i] = 0;
		153
179	at = find_archetype_by_object_name (tmpname);	154	if (archetype *at = find_archetype_by_object_name (tmpname))
180
181	if (at)
182	return arch_to_object (at);	155	return arch_to_object (at);
183	}	156	}
184		157
185	return create_singularity (name);	158	return create_singularity (name);
186	}	159	}
…		…
206	item_matched_string (object pl, object op, const char *name)	179	item_matched_string (object pl, object op, const char *name)
207	{	180	{
208	char *cp, local_name[MAX_BUF];	181	char *cp, local_name[MAX_BUF];
209	int count, retval = 0;	182	int count, retval = 0;
210		183
211	strcpy (local_name, name); /* strtok is destructive to name */	184	assign (local_name, name); /* strtok is destructive to name */
212		185
213	for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))	186	for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
214	{	187	{
215	while (cp[0] == ' ')	188	while (cp[0] == ' ')
216	++cp; /* get rid of spaces */	189	++cp; /* get rid of spaces */
…		…
322		295
323	/* init_blocksview();*/	296	/* init_blocksview();*/
324	}	297	}
325		298
326	/*	299	/*
327	* Stores debug-information about how efficient the hashtable
328	* used for archetypes has been in the static errmsg array.
329	*/
330
331	void
332	arch_info (object *op)
333	{
334	sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
335	new_draw_info (NDI_BLACK, 0, op, errmsg);
336	}
337
338	/*
339	* Initialise the hashtable used by the archetypes.
340	*/
341
342	void
343	clear_archetable (void)
344	{
345	memset ((void ) arch_table, 0, ARCHTABLE sizeof (archetype *));
346	}
347
348	/*
349	* An alternative way to init the hashtable which is slower, but _works_...	300	* An alternative way to init the hashtable which is slower, but _works_...
350	*/	301	*/
351
352	void	302	void
353	init_archetable (void)	303	init_archetable (void)
354	{	304	{
355	archetype *at;
356
357	LOG (llevDebug, " Setting up archetable...\n");	305	LOG (llevDebug, " Setting up archetable...\n");
358		306
359	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)	307	for (archetype *at = first_archetype; at; at = at->next)
		308	for (archetype *bt = at; bt; bt = bt->more)
360	at->hash_add ();	309	bt->hash_add ();
361		310
362	LOG (llevDebug, "done\n");	311	LOG (llevDebug, "done\n");
363	}	312	}
364		313
365	void	314	void
366	free_all_archs (void)	315	free_all_archs (void)
367	{	316	{
368	archetype at, next;	317	archetype at, next;
369	int i = 0, f = 0;	318	int i = 0, f = 0;
370		319
371	for (at = first_archetype; at != NULL; at = next)	320	for (at = first_archetype; at; at = next)
372	{	321	{
373	if (at->more)	322	if (at->more)
374	next = at->more;	323	next = at->more;
375	else	324	else
376	next = at->next;	325	next = at->next;
…		…
384	LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);	333	LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
385	}	334	}
386		335
387	archetype::archetype ()	336	archetype::archetype ()
388	{	337	{
		338	clone.arch = this;
		339
389	CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */	340	CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
390	SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */	341	SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
391	}	342	}
392		343
393	archetype::~archetype ()	344	archetype::~archetype ()
394	{	345	{
		346	//TODO: nuke ->more's
		347	}
		348
		349	archetype *
		350	archetype::read (object_thawer &f)
		351	{
		352	assert (f.kw == KW_object);
		353
		354	archetype *head = new archetype;
		355	f.get (head->name);
		356
		357	if (!head->clone.parse_kv (f))
		358	{
		359	delete head;
		360	return 0;
		361	}
		362
		363	for (archetype *prev = head; f.kw == KW_more; )
		364	{
		365	f.next ();
		366
		367	assert (f.kw == KW_object);
		368
		369	archetype *more = new archetype;
		370	f.get (more->name);
		371
		372	if (!more->clone.parse_kv (f))
		373	{
		374	delete head;
		375	return 0;
		376	}
		377
		378	assert (("pippijn sagt es gibt keine tiles mehr", head->clone.face == more->clone.face));
		379
		380	if (more->clone.x > head->tail_x) head->tail_x = more->clone.x;
		381	if (more->clone.y > head->tail_y) head->tail_y = more->clone.y;
		382
		383	more->head = head;
		384	more->clone.head = &head->clone;
		385	prev->more = more;
		386	prev->clone.more = &more->clone;
		387
		388	prev = more;
		389	}
		390
		391	head->next = first_archetype;
		392	first_archetype = head;
		393
		394	return head;
395	}	395	}
396		396
397	/*	397	/*
398	* Reads/parses the archetype-file, and copies into a linked list	398	* Reads/parses the archetype-file, and copies into a linked list
399	* of archetype-structures.	399	* of archetype-structures.
400	*/	400	*/
401	void	401	static bool
402	first_arch_pass (object_thawer & fp)	402	first_arch_pass (object_thawer &f)
403	{	403	{
404	archetype head = 0, last_more = 0;	404	for (;;)
405
406	archetype *at = new archetype;
407	at->clone.arch = first_archetype = at;
408
409	while (int i = load_object (fp, &at->clone, 0))
410	{	405	{
411	at->clone.speed_left = (float) (-0.1);
412	/* copy the body_info to the body_used - this is only really
413	* need for monsters, but doesn't hurt to do it for everything.
414	* by doing so, when a monster is created, it has good starting
415	* values for the body_used info, so when items are created
416	* for it, they can be properly equipped.
417	*/
418	memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
419
420	switch (i)	406	switch (f.kw)
421	{
422	case LL_NORMAL: /* A new archetype, just link it with the previous */
423	if (last_more != NULL)
424	last_more->next = at;
425	if (head != NULL)
426	head->next = at;
427	head = last_more = at;
428	#if 0
429	if (!op->type)
430	LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
431	#endif
432	at->tail_x = 0;
433	at->tail_y = 0;
434	break;
435
436	case LL_MORE: /* Another part of the previous archetype, link it correctly */
437
438	at->head = head;
439	at->clone.head = &head->clone;
440	if (last_more != NULL)
441	{
442	last_more->more = at;
443	last_more->clone.more = &at->clone;
444	}
445	last_more = at;
446
447	/* If this multipart image is still composed of individual small
448	* images, don't set the tail_.. values. We can't use them anyways,
449	* and setting these to zero makes the map sending to the client much
450	* easier as just looking at the head, we know what to do.
451	*/
452	if (at->clone.face != head->clone.face)
453	{
454	head->tail_x = 0;
455	head->tail_y = 0;
456	}
457	else
458	{
459	if (at->clone.x > head->tail_x)
460	head->tail_x = at->clone.x;
461	if (at->clone.y > head->tail_y)
462	head->tail_y = at->clone.y;
463	}
464	break;
465
466	}	407	{
		408	case KW_object:
		409	if (!archetype::read (f))
		410	return false;
		411	continue;
467		412
468	at = new archetype;	413	case KW_EOF:
		414	return true;
469		415
470	at->clone.arch = at;	416	default:
471	}	417	if (!f.parse_error ("archetypes file"))
		418	return false;
		419	}
472		420
473	delete at;	421	f.next ();
		422	}
474	}	423	}
475		424
476	/*	425	/*
477	* Reads the archetype file once more, and links all pointers between	426	* Reads the archetype file once more, and links all pointers between
478	* archetypes.	427	* archetypes.
479	*/	428	*/
480
481	void	429	void
482	second_arch_pass (object_thawer & thawer)	430	second_arch_pass (object_thawer & thawer)
483	{	431	{
484	char buf[MAX_BUF], variable = buf, argument, *cp;	432	char buf[MAX_BUF], variable = buf, argument, *cp;
485	archetype at = NULL, other;	433	archetype at = NULL, other;
486		434
487	while (fgets (buf, MAX_BUF, thawer) != NULL)	435	while (fgets (buf, MAX_BUF, thawer) != NULL)
488	{	436	{
489	if (*buf == '#')	437	if (*buf == '#')
490	continue;	438	continue;
		439
491	if ((argument = strchr (buf, ' ')) != NULL)	440	if ((argument = strchr (buf, ' ')) != NULL)
492	{	441	{
493	*argument = '\0', argument++;	442	*argument = '\0', argument++;
494	cp = argument + strlen (argument) - 1;	443	cp = argument + strlen (argument) - 1;
495	while (isspace (*cp))	444	while (isspace (*cp))
496	{	445	{
497	*cp = '\0';	446	*cp = '\0';
498	cp--;	447	cp--;
499	}	448	}
500	}	449	}
		450
501	if (!strcmp ("Object", variable))	451	if (!strcmp ("object", variable))
502	{	452	{
503	if ((at = archetype::find (argument)) == NULL)	453	if ((at = archetype::find (argument)) == NULL)
504	LOG (llevError, "Warning: failed to find arch %s\n", argument);	454	LOG (llevError, "Warning: failed to find arch %s\n", argument);
505	}	455	}
506	else if (!strcmp ("other_arch", variable))	456	else if (!strcmp ("other_arch", variable))
…		…
513	at->clone.other_arch = other;	463	at->clone.other_arch = other;
514	}	464	}
515	}	465	}
516	else if (!strcmp ("randomitems", variable))	466	else if (!strcmp ("randomitems", variable))
517	{	467	{
518	if (at != NULL)	468	if (at)
519	{	469	{
520	treasurelist *tl = find_treasurelist (argument);	470	treasurelist *tl = find_treasurelist (argument);
521		471
522	if (tl == NULL)	472	if (tl == NULL)
523	LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);	473	LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
…		…
554		504
555	sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);	505	sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
556	LOG (llevDebug, "Reading archetypes from %s:\n", filename);	506	LOG (llevDebug, "Reading archetypes from %s:\n", filename);
557		507
558	{	508	{
559	object_thawer
560	thawer (filename);	509	object_thawer f (filename);
561		510
562	clear_archetable ();	511	f.next ();
		512
563	LOG (llevDebug, " arch-pass 1...\n");	513	LOG (llevDebug, " arch-pass 1...\n");
564	first_arch_pass (thawer);	514	if (!first_arch_pass (f))
		515	cleanup ("errors during first arch pass are fatal");
565	LOG (llevDebug, " done\n");	516	LOG (llevDebug, " done\n");
566	}	517	}
567		518
568	init_archetable ();	519	init_archetable ();
569	warn_archetypes = 1;	520	warn_archetypes = 1;
570		521
571	{	522	{
572	object_thawer
573	thawer (filename);	523	object_thawer f (filename);
574		524
575	LOG (llevDebug, " loading treasure...\n");	525	LOG (llevDebug, " loading treasure...\n");
576	load_treasures ();	526	load_treasures ();
577	LOG (llevDebug, " done\n");	527	LOG (llevDebug, " done\n");
578	LOG (llevDebug, " arch-pass 2...\n");	528	LOG (llevDebug, " arch-pass 2...\n");
579	second_arch_pass (thawer);	529	second_arch_pass (f);
580	LOG (llevDebug, " done\n");	530	LOG (llevDebug, " done\n");
581	#ifdef DEBUG	531	#ifdef DEBUG
582	check_generators ();	532	check_generators ();
583	#endif	533	#endif
584	}	534	}
…		…
590	* This function returns NULL on failure.	540	* This function returns NULL on failure.
591	*/	541	*/
592	object *	542	object *
593	arch_to_object (archetype *at)	543	arch_to_object (archetype *at)
594	{	544	{
595	object *op;	545	if (!at)
596
597	if (at == NULL)
598	{	546	{
599	if (warn_archetypes)	547	if (warn_archetypes)
600	LOG (llevError, "Couldn't find archetype.\n");	548	LOG (llevError, "Couldn't find archetype.\n");
601		549
602	return NULL;	550	return NULL;
603	}	551	}
604		552
605	op = at->clone.clone ();	553	object *op = at->clone.clone ();
606	op->arch = at;	554	op->arch = at;
607	op->instantiate ();	555	op->instantiate ();
608	return op;	556	return op;
609	}	557	}
610		558
…		…
674		622
675	/*	623	/*
676	* Finds, using the hashtable, which archetype matches the given name.	624	* Finds, using the hashtable, which archetype matches the given name.
677	* returns a pointer to the found archetype, otherwise NULL.	625	* returns a pointer to the found archetype, otherwise NULL.
678	*/	626	*/
679
680	archetype *	627	archetype *
681	archetype::find (const char *name)	628	archetype::find (const char *name)
682	{	629	{
683	if (!name)	630	if (!name)
684	return 0;	631	return 0;
685		632
686	#if USE_UNORDERED_MAP
687	AUTODECL (i, ht.find ((size_t) name));	633	AUTODECL (i, ht.find (name));
688		634
689	if (i == ht.end ())	635	if (i == ht.end ())
690	return 0;	636	return 0;
691	else	637	else
692	return i->second;	638	return i->second;
693	#endif
694
695	archetype *at;
696	unsigned long index;
697
698	index = hasharch (name, ARCHTABLE);
699	arch_search++;
700	for (;;)
701	{
702	at = arch_table[index];
703
704	if (at == NULL)
705	{
706	if (warn_archetypes)
707	LOG (llevError, "Couldn't find archetype %s\n", name);
708
709	return NULL;
710	}
711
712	arch_cmp++;
713
714	if (!strcmp ((const char *) at->name, name))
715	return at;
716
717	if (++index >= ARCHTABLE)
718	index = 0;
719	}
720	}	639	}
721		640
722	/*	641	/*
723	* Adds an archetype to the hashtable.	642	* Adds an archetype to the hashtable.
724	*/	643	*/
725	void	644	void
726	archetype::hash_add ()	645	archetype::hash_add ()
727	{	646	{
728	#if USE_UNORDERED_MAP
729	ht.insert (std::make_pair ((size_t) (const char *) name, this));	647	ht.insert (std::make_pair (name, this));
730	#else
731
732	int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
733
734	for (;;)
735	{
736	if (!arch_table[index])
737	{
738	arch_table[index] = this;
739	break;
740	}
741
742	if (++index == ARCHTABLE)
743	index = 0;
744
745	if (index == org_index)
746	fatal (ARCHTABLE_TOO_SMALL);
747	}
748	#endif
749	}	648	}
750		649
751	void	650	void
752	archetype::hash_del ()	651	archetype::hash_del ()
753	{	652	{
754	#if USE_UNORDERED_MAP	653	ht.erase (name);
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
775	}	654	}
776		655
777	/*	656	/*
778	* Returns the first archetype using the given type.	657	* Returns the first archetype using the given type.
779	* Used in treasure-generation.	658	* Used in treasure-generation.
780	*/	659	*/
781
782	archetype *	660	archetype *
783	type_to_archetype (int type)	661	type_to_archetype (int type)
784	{	662	{
785	archetype *at;	663	archetype *at;
786		664

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.36 by pippijn, Sat Jan 6 14:42:28 2007 UTC vs. Revision 1.43 by root, Fri Feb 16 19:43:40 2007 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.36 by pippijn, Sat Jan 6 14:42:28 2007 UTC vs.
Revision 1.43 by root, Fri Feb 16 19:43:40 2007 UTC