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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.35 by root, Wed Jan 3 20:32:13 2007 UTC vs.
Revision 1.59 by root, Mon May 7 06:01:47 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 <global.h>	27	#include <global.h>
27	#include <funcpoint.h>	28	#include <funcpoint.h>
28	#include <loader.h>	29	#include <loader.h>
29		30
30	#define USE_UNORDERED_MAP 0
31
32	#if USE_UNORDERED_MAP
33	# include <tr1/functional>	31	#include <tr1/functional>
34	# include <tr1/unordered_map>	32	#include <tr1/unordered_map>
35	#endif
36
37	int arch_cmp = 0; /* How many strcmp's */
38	int arch_search = 0; /* How many searches */
39	int arch_init; /* True if doing arch initialization */
40		33
41	/* The naming of these functions is really poor - they are all	34	/* The naming of these functions is really poor - they are all
42	* pretty much named '.._arch_...', but they may more may not	35	* pretty much named '.._arch_...', but they may more may not
43	* return archetypes. Some make the arch_to_object call, and thus	36	* return archetypes. Some make the arch_to_object call, and thus
44	* return an object. Perhaps those should be called 'archob' functions	37	* return an object. Perhaps those should be called 'archob' functions
45	* to denote they return an object derived from the archetype.	38	* to denote they return an object derived from the archetype.
46	* MSW 2003-04-29	39	* MSW 2003-04-29
47	*/	40	*/
48		41
49	#if USE_UNORDERED_MAP	42	bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
		43
50	// the hashtable	44	// the hashtable
51	typedef std::tr1::unordered_map	45	typedef std::tr1::unordered_map
52	<	46	<
53	std::size_t,	47	const char *,
54	arch_ptr,	48	arch_ptr,
55	std::tr1::hash<size_t>,	49	str_hash,
56	std::equal_to<size_t>,	50	str_equal,
57	slice_allocator< std::pair<const std::size_t, archetype *> >	51	slice_allocator< std::pair<const char *const, arch_ptr> >
58	true,
59	> HT;	52	> HT;
60		53
61	static HT ht;	54	static HT ht (5000);
62	#else	55	static std::vector<archetype *> archetypes;
63	static arch_ptr arch_table[ARCHTABLE];
64	#endif
65		56
66	/**	57	/**
67	* GROS - This function retrieves an archetype given the name that appears	58	* GROS - This function retrieves an archetype given the name that appears
68	* during the game (for example, "writing pen" instead of "stylus").	59	* 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.	60	* It does not use the hashtable system, but browse the whole archlist each time.
75	* - the archetype found or null if nothing was found.	66	* - the archetype found or null if nothing was found.
76	*/	67	*/
77	archetype *	68	archetype *
78	find_archetype_by_object_name (const char *name)	69	find_archetype_by_object_name (const char *name)
79	{	70	{
80	archetype *at;	71	shstr_cmp name_cmp (name);
81		72
82	if (name == NULL)
83	return (archetype *) NULL;
84
85	for (at = first_archetype; at != NULL; at = at->next)	73	for (archetype *at = first_archetype; at; at = at->next)
86	{	74	if (at->clone.name == name_cmp)
87	if (!strcmp (at->clone.name, name))
88	return at;	75	return at;
89	}	76
90	return NULL;	77	return 0;
91	}	78	}
92		79
93	/**	80	/**
94	* This function retrieves an archetype by type and name that appears during	81	* This function retrieves an archetype by type and name that appears during
95	* the game. It is basically the same as find_archetype_by_object_name()	82	* the game. It is basically the same as find_archetype_by_object_name()
96	* except that it considers only items of the given type.	83	* except that it considers only items of the given type.
97	*/	84	*/
98	archetype *	85	archetype *
99	find_archetype_by_object_type_name (int type, const char *name)	86	find_archetype_by_object_type_name (int type, const char *name)
100	{	87	{
101	archetype *at;	88	shstr_cmp name_cmp (name);
102		89
103	if (name == NULL)
104	return NULL;
105
106	for (at = first_archetype; at != NULL; at = at->next)	90	for (archetype *at = first_archetype; at; at = at->next)
107	{	91	if (at->clone.name == name_cmp && at->clone.type == type)
108	if (at->clone.type == type && strcmp (at->clone.name, name) == 0)
109	return at;	92	return at;
110	}
111		93
112	return NULL;	94	return 0;
113	}	95	}
114		96
115	/* This is a lot like the above function. Instead, we are trying to match	97	/* This is a lot like the above function. Instead, we are trying to match
116	* the arch->skill values. type is the type of object to match	98	* the arch->skill values. type is the type of object to match
117	* against (eg, to only match against skills or only skill objects for example).	99	* against (eg, to only match against skills or only skill objects for example).
118	* If type is -1, ew don't match on type.	100	* If type is -1, ew don't match on type.
119	*/	101	*/
120	object *	102	object *
121	get_archetype_by_skill_name (const char *skill, int type)	103	get_archetype_by_skill_name (const char *skill, int type)
122	{	104	{
123	archetype *at;	105	shstr_cmp skill_cmp (skill);
124		106
125	if (skill)
126	for (at = first_archetype; at; at = at->next)	107	for (archetype *at = first_archetype; at; at = at->next)
127	if (((type == -1) \|\| (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))	108	if (at->clone.skill == skill_cmp && (type == -1 \|\| type == at->clone.type))
128	return arch_to_object (at);	109	return arch_to_object (at);
129		110
130	return 0;	111	return 0;
131	}	112	}
132		113
133	/* similiar to above - this returns the first archetype	114	/* similiar to above - this returns the first archetype
…		…
138	* (eg, skills)	119	* (eg, skills)
139	*/	120	*/
140	archetype *	121	archetype *
141	get_archetype_by_type_subtype (int type, int subtype)	122	get_archetype_by_type_subtype (int type, int subtype)
142	{	123	{
143	archetype *
144	at;
145
146	for (at = first_archetype; at != NULL; at = at->next)	124	for (archetype *at = first_archetype; at; at = at->next)
147	{
148	if (((type == -1) \|\| (type == at->clone.type)) && (subtype == -1 \|\| subtype == at->clone.subtype))	125	if ((type == -1 \|\| type == at->clone.type) && (subtype == -1 \|\| subtype == at->clone.subtype))
149	return at;	126	return at;
150	}	127
151	return NULL;	128	return 0;
152	}	129	}
153		130
154	/**	131	/**
155	* GROS - this returns a new object given the name that appears during the game	132	* GROS - this returns a new object given the name that appears during the game
156	* (for example, "writing pen" instead of "stylus").	133	* (for example, "writing pen" instead of "stylus").
…		…
164	* but it otherwise had a big memory leak.	141	* but it otherwise had a big memory leak.
165	*/	142	*/
166	object *	143	object *
167	get_archetype_by_object_name (const char *name)	144	get_archetype_by_object_name (const char *name)
168	{	145	{
169	archetype *at;
170	char tmpname[MAX_BUF];	146	char tmpname[MAX_BUF];
171	int i;	147	int i;
172		148
173	assign (tmpname, name);	149	assign (tmpname, name);
174		150
175	for (i = strlen (tmpname); i > 0; i--)	151	for (i = strlen (tmpname); i > 0; i--)
176	{	152	{
177	tmpname[i] = 0;	153	tmpname[i] = 0;
		154
178	at = find_archetype_by_object_name (tmpname);	155	if (archetype *at = find_archetype_by_object_name (tmpname))
179
180	if (at)
181	return arch_to_object (at);	156	return arch_to_object (at);
182	}	157	}
183		158
184	return create_singularity (name);	159	return create_singularity (name);
185	}	160	}
…		…
205	item_matched_string (object pl, object op, const char *name)	180	item_matched_string (object pl, object op, const char *name)
206	{	181	{
207	char *cp, local_name[MAX_BUF];	182	char *cp, local_name[MAX_BUF];
208	int count, retval = 0;	183	int count, retval = 0;
209		184
210	strcpy (local_name, name); /* strtok is destructive to name */	185	assign (local_name, name); /* strtok is destructive to name */
211		186
212	for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))	187	for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
213	{	188	{
214	while (cp[0] == ' ')	189	while (cp[0] == ' ')
215	++cp; /* get rid of spaces */	190	++cp; /* get rid of spaces */
…		…
300	}	275	}
301		276
302	return 0;	277	return 0;
303	}	278	}
304		279
305	/*
306	* Initialises the internal linked list of archetypes (read from file).
307	* Then the global "empty_archetype" pointer is initialised.
308	* Then the blocksview[] array is initialised.
309	*/
310
311	void
312	init_archetypes (void)
313	{ /* called from add_player() and edit() */
314	if (first_archetype != NULL) /* Only do this once */
315	return;
316
317	arch_init = 1;
318	load_archetypes ();
319	arch_init = 0;
320	empty_archetype = archetype::find ("empty_archetype");
321
322	/* init_blocksview();*/
323	}
324
325	/*
326	* Stores debug-information about how efficient the hashtable
327	* used for archetypes has been in the static errmsg array.
328	*/
329
330	void
331	arch_info (object *op)
332	{
333	sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
334	new_draw_info (NDI_BLACK, 0, op, errmsg);
335	}
336
337	/*
338	* Initialise the hashtable used by the archetypes.
339	*/
340
341	void
342	clear_archetable (void)
343	{
344	memset ((void ) arch_table, 0, ARCHTABLE sizeof (archetype *));
345	}
346
347	/*
348	* An alternative way to init the hashtable which is slower, but _works_...
349	*/
350
351	void
352	init_archetable (void)
353	{
354	archetype *at;
355
356	LOG (llevDebug, " Setting up archetable...\n");
357
358	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
359	at->hash_add ();
360
361	LOG (llevDebug, "done\n");
362	}
363
364	void
365	free_all_archs (void)
366	{
367	archetype at, next;
368	int i = 0, f = 0;
369
370	for (at = first_archetype; at != NULL; at = next)
371	{
372	if (at->more)
373	next = at->more;
374	else
375	next = at->next;
376
377	delete
378	at;
379
380	i++;
381	}
382
383	LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
384	}
385
386	archetype::archetype ()	280	archetype::archetype ()
387	{	281	{
		282	clone.arch = this;
		283
388	CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */	284	CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
389	SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */	285	SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
390	}	286	}
391		287
392	archetype::~archetype ()	288	archetype::~archetype ()
393	{	289	{
		290	//TODO: nuke ->more's
394	}	291	}
395		292
396	/*	293	static void
397	* Reads/parses the archetype-file, and copies into a linked list	294	unlink (archetype *at)
398	* of archetype-structures.	295	{
399	*/	296	if (at->head)
		297	at = at->head;
		298
		299	// destroy this archetype's link, making singletons out of its parts
		300	while (at)
		301	{
		302	archetype *more = at->more;
		303	at->clone.destroy_inv ();
		304	at->head = at->more = 0;
		305	at = more;
		306	}
		307	}
		308
		309	// dire hack, need to rationalise
400	void	310	void
401	first_arch_pass (object_thawer & fp)	311	overwrite (archetype at, object op)
402	{	312	{
403	archetype head = 0, last_more = 0;	313	at->clone = *op;
		314	at->clone.arch = at;
404		315
405	archetype *at = new archetype;	316	at->clone.inv = op->inv; op->inv = 0;
406	at->clone.arch = first_archetype = at;
407		317
408	while (int i = load_object (fp, &at->clone, 0))	318	op->destroy ();
409	{	319	}
410	at->clone.speed_left = (float) (-0.1);
411	/* copy the body_info to the body_used - this is only really
412	* need for monsters, but doesn't hurt to do it for everything.
413	* by doing so, when a monster is created, it has good starting
414	* values for the body_used info, so when items are created
415	* for it, they can be properly equipped.
416	*/
417	memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
418		320
419	switch (i)	321	archetype *
		322	archetype::read (object_thawer &f)
		323	{
		324	assert (f.kw == KW_object);
		325
		326	loading_arch = true; // hack to tell parse_kv et al. to behave
		327
		328	typedef std::pair<archetype , object > part;
		329	std::vector<part> parts;
		330
		331	coroapi::cede_to_tick_every (100);
		332
		333	for (;;)
		334	{
		335	object *op = object::create ();
		336	archetype *at = get (f.get_str ());
		337	f.get (op->name);
		338	f.next ();
		339
		340	#if 0
		341	if (f.kw == KW_inherit)
420	{	342	{
421	case LL_NORMAL: /* A new archetype, just link it with the previous */	343	if (archetype *at = find (f.get_str ()))
422	if (last_more != NULL)	344	*op = at->clone;
423	last_more->next = at;	345	else
424	if (head != NULL)	346	LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
425	head->next = at;	347	&at->name, f.get_str ());
426	head = last_more = at;	348
427	#if 0	349	f.next ();
428	if (!op->type)	350	}
429	LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
430	#endif	351	#endif
431	at->tail_x = 0;	352
432	at->tail_y = 0;	353	if (!op->parse_kv (f))
		354	goto fail;
		355
		356	op->post_load_check ();
		357
		358	parts.push_back (std::make_pair (at, op));
		359
		360	if (f.kw != KW_more)
433	break;	361	break;
434		362
435	case LL_MORE: /* Another part of the previous archetype, link it correctly */	363	f.next ();
436		364
437	at->head = head;	365	if (f.kw != KW_object)
438	at->clone.head = &head->clone;	366	{
439	if (last_more != NULL)	367	f.parse_error ("more object");
440	{	368	goto fail;
441	last_more->more = at;
442	last_more->clone.more = &at->clone;
443	}
444	last_more = at;
445
446	/* If this multipart image is still composed of individual small
447	* images, don't set the tail_.. values. We can't use them anyways,
448	* and setting these to zero makes the map sending to the client much
449	* easier as just looking at the head, we know what to do.
450	*/
451	if (at->clone.face != head->clone.face)
452	{
453	head->tail_x = 0;
454	head->tail_y = 0;
455	}
456	else
457	{
458	if (at->clone.x > head->tail_x)
459	head->tail_x = at->clone.x;
460	if (at->clone.y > head->tail_y)
461	head->tail_y = at->clone.y;
462	}
463	break;
464
465	}	369	}
		370	}
466		371
467	at = new archetype;	372	{
		373	archetype *head = parts.front ().first;
468		374
469	at->clone.arch = at;	375	// check that all archetypes belong to the same object or are heads
		376	for (auto (p, parts.begin ()); p != parts.end (); ++p)
		377	{
		378	archetype *at = p->first;
		379
		380	if (at->head != head && at->head)
		381	{
		382	LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name);
		383	goto fail;
		384	}
		385
		386	if (at->next && at != head)
		387	{
		388	LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
		389	goto fail;
		390	}
470	}	391	}
471		392
472	delete at;	393	// sever chain of existing head object
473	}	394	for (archetype more, at = head; at; at = more)
		395	{
		396	more = at->more;
474		397
475	/*	398	at->head = 0;
476	* Reads the archetype file once more, and links all pointers between	399	at->more = 0;
477	* archetypes.	400	}
478	*/
479		401
		402	// replace/update head
		403	overwrite (head, parts.front ().second);
		404	head->tail_x = 0;
		405	head->tail_y = 0;
		406
		407	// link into list of heads, if not already there
		408	if (!head->linked)
		409	{
		410	head->linked = true;
		411	head->next = first_archetype;
		412	first_archetype = head;
		413	}
		414
		415	// reassemble new chain
		416	archetype *prev = head;
		417	for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
		418	{
		419	archetype *at = p->first;
		420	overwrite (at, p->second);
		421
		422	if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;
		423	if (at->clone.y > head->tail_y) head->tail_y = at->clone.y;
		424
		425	at->head = head;
		426	at->clone.head = &head->clone;
		427	prev->more = at;
		428	prev->clone.more = &at->clone;
		429
		430	prev = at;
		431	}
		432
		433	loading_arch = false;
		434	return head;
		435	}
		436
		437	fail:
		438	for (auto (p, parts.begin ()); p != parts.end (); ++p)
		439	p->second->destroy (true);
		440
		441	loading_arch = false;
		442	return 0;
		443	}
		444
		445	/*
		446	* Initialize global archtype pointers:
		447	*/
480	void	448	void
481	second_arch_pass (object_thawer & thawer)	449	init_archetype_pointers ()
482	{	450	{
483	char buf[MAX_BUF], variable = buf, argument, *cp;	451	ring_arch = archetype::find ("ring");
484	archetype at = NULL, other;	452	amulet_arch = archetype::find ("amulet");
485		453	staff_arch = archetype::find ("staff");
486	while (fgets (buf, MAX_BUF, thawer) != NULL)	454	crown_arch = archetype::find ("crown");
487	{	455	empty_archetype = archetype::find ("empty_archetype");
488	if (*buf == '#')
489	continue;
490	if ((argument = strchr (buf, ' ')) != NULL)
491	{
492	*argument = '\0', argument++;
493	cp = argument + strlen (argument) - 1;
494	while (isspace (*cp))
495	{
496	*cp = '\0';
497	cp--;
498	}
499	}
500	if (!strcmp ("Object", variable))
501	{
502	if ((at = archetype::find (argument)) == NULL)
503	LOG (llevError, "Warning: failed to find arch %s\n", argument);
504	}
505	else if (!strcmp ("other_arch", variable))
506	{
507	if (at != NULL && at->clone.other_arch == NULL)
508	{
509	if ((other = archetype::find (argument)) == NULL)
510	LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
511	else if (at != NULL)
512	at->clone.other_arch = other;
513	}
514	}
515	else if (!strcmp ("randomitems", variable))
516	{
517	if (at != NULL)
518	{
519	treasurelist *tl = find_treasurelist (argument);
520
521	if (tl == NULL)
522	LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
523	else
524	at->clone.randomitems = tl;
525	}
526	}
527	}
528	}
529
530	#ifdef DEBUG
531	void
532	check_generators (void)
533	{
534	archetype *at;
535
536	for (at = first_archetype; at != NULL; at = at->next)
537	if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
538	LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
539	}
540	#endif
541
542	/*
543	* First initialises the archtype hash-table (init_archetable()).
544	* Reads and parses the archetype file (with the first and second-pass
545	* functions).
546	* Then initialises treasures by calling load_treasures().
547	*/
548
549	void
550	load_archetypes (void)
551	{
552	char filename[MAX_BUF];
553
554	sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
555	LOG (llevDebug, "Reading archetypes from %s:\n", filename);
556
557	{
558	object_thawer
559	thawer (filename);
560
561	clear_archetable ();
562	LOG (llevDebug, " arch-pass 1...\n");
563	first_arch_pass (thawer);
564	LOG (llevDebug, " done\n");
565	}
566
567	init_archetable ();
568	warn_archetypes = 1;
569
570	{
571	object_thawer
572	thawer (filename);
573
574	LOG (llevDebug, " loading treasure...\n");
575	load_treasures ();
576	LOG (llevDebug, " done\n");
577	LOG (llevDebug, " arch-pass 2...\n");
578	second_arch_pass (thawer);
579	LOG (llevDebug, " done\n");
580	#ifdef DEBUG
581	check_generators ();
582	#endif
583	}
584	LOG (llevDebug, " done\n");
585	}	456	}
586		457
587	/*	458	/*
588	* Creates and returns a new object which is a copy of the given archetype.	459	* Creates and returns a new object which is a copy of the given archetype.
589	* This function returns NULL on failure.	460	* This function returns NULL on failure.
590	*/	461	*/
591	object *	462	object *
592	arch_to_object (archetype *at)	463	arch_to_object (archetype *at)
593	{	464	{
594	object *op;	465	if (!at)
595
596	if (at == NULL)
597	{	466	{
598	if (warn_archetypes)
599	LOG (llevError, "Couldn't find archetype.\n");	467	LOG (llevError, "Couldn't find archetype.\n");
600
601	return NULL;	468	return 0;
602	}	469	}
603		470
604	op = at->clone.clone ();	471	object *op = at->clone.clone ();
605	op->arch = at;	472	op->arch = at;
606	op->instantiate ();	473	op->instantiate ();
		474
607	return op;	475	return op;
608	}	476	}
609		477
610	/*	478	/*
611	* Creates an object. This function is called by get_archetype()	479	* Creates an object. This function is called by get_archetype()
…		…
640		508
641	return arch_to_object (at);	509	return arch_to_object (at);
642	}	510	}
643		511
644	/*	512	/*
645	* Hash-function used by the arch-hashtable.
646	*/
647
648	unsigned long
649	hasharch (const char *str, int tablesize)
650	{
651	unsigned long hash = 0;
652	unsigned int i = 0;
653	const char *p;
654
655	/* use the one-at-a-time hash function, which supposedly is
656	* better than the djb2-like one used by perl5.005, but
657	* certainly is better then the bug used here before.
658	* see http://burtleburtle.net/bob/hash/doobs.html
659	*/
660	for (p = str; i < MAXSTRING && *p; p++, i++)
661	{
662	hash += *p;
663	hash += hash << 10;
664	hash ^= hash >> 6;
665	}
666
667	hash += hash << 3;
668	hash ^= hash >> 11;
669	hash += hash << 15;
670
671	return hash % tablesize;
672	}
673
674	/*
675	* Finds, using the hashtable, which archetype matches the given name.	513	* Finds, using the hashtable, which archetype matches the given name.
676	* returns a pointer to the found archetype, otherwise NULL.	514	* returns a pointer to the found archetype, otherwise NULL.
677	*/	515	*/
678
679	archetype *	516	archetype *
680	archetype::find (const char *name)	517	archetype::find (const char *name)
681	{	518	{
682	if (!name)	519	if (!name)
683	return 0;	520	return 0;
684		521
685	#if USE_UNORDERED_MAP	522	auto (i, ht.find (name));
686	AUTODECL (i, ht.find ((size_t) name));
687		523
688	if (i == ht.end ())	524	if (i == ht.end ())
689	return 0;	525	return 0;
690	else	526	else
691	return i->second;	527	return i->second;
692	#endif	528	}
693		529
694	archetype *at;	530	archetype *
695	unsigned long index;	531	archetype::get (const char *name)
696		532	{
697	index = hasharch (name, ARCHTABLE);	533	if (!name)
698	arch_search++;
699	for (;;)
700	{
701	at = arch_table[index];
702
703	if (at == NULL)
704	{
705	if (warn_archetypes)
706	LOG (llevError, "Couldn't find archetype %s\n", name);
707
708	return NULL;
709	}
710
711	arch_cmp++;
712
713	if (!strcmp ((const char *) at->name, name))
714	return at;
715
716	if (++index >= ARCHTABLE)
717	index = 0;
718	}	534	{
		535	LOG (llevError, "null archetype requested\n");
		536	name = "(null)";
		537	}
		538
		539	archetype *at = find (name);
		540
		541	if (!at)
		542	{
		543	archetypes.push_back (at = new archetype);
		544	at->name = at->clone.name = at->clone.name_pl = name;
		545	at->hash_add ();
		546	}
		547
		548	return at;
719	}	549	}
720		550
721	/*	551	/*
722	* Adds an archetype to the hashtable.	552	* Adds an archetype to the hashtable.
723	*/	553	*/
724	void	554	void
725	archetype::hash_add ()	555	archetype::hash_add ()
726	{	556	{
727	#if USE_UNORDERED_MAP
728	ht.insert (std::make_pair ((size_t) (const char *) name, this));	557	ht.insert (std::make_pair (name, this));
729	#else
730
731	int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
732
733	for (;;)
734	{
735	if (!arch_table[index])
736	{
737	arch_table[index] = this;
738	break;
739	}
740
741	if (++index == ARCHTABLE)
742	index = 0;
743
744	if (index == org_index)
745	fatal (ARCHTABLE_TOO_SMALL);
746	}
747	#endif
748	}	558	}
749		559
750	void	560	void
751	archetype::hash_del ()	561	archetype::hash_del ()
752	{	562	{
753	#if USE_UNORDERED_MAP	563	ht.erase (name);
754	# error remove this from HT
755	#else
756
757	int index = hasharch ((const char *) name, ARCHTABLE), org_index = index;
758
759	for (;;)
760	{
761	if (arch_table[index] == this)
762	{
763	arch_table[index] = 0;
764	break;
765	}
766
767	if (++index == ARCHTABLE)
768	index = 0;
769
770	if (index == org_index)
771	break;
772	}
773	#endif
774	}	564	}
775		565
776	/*	566	/*
777	* Returns the first archetype using the given type.	567	* Returns the first archetype using the given type.
778	* Used in treasure-generation.	568	* Used in treasure-generation.
779	*/	569	*/
780
781	archetype *	570	archetype *
782	type_to_archetype (int type)	571	type_to_archetype (int type)
783	{	572	{
784	archetype *at;
785
786	for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)	573	for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
787	if (at->clone.type == type)	574	if (at->clone.type == type)
788	return at;	575	return at;
789		576
790	return 0;	577	return 0;
791	}	578	}
…		…
793	/*	580	/*
794	* Returns a new object copied from the first archetype matching	581	* Returns a new object copied from the first archetype matching
795	* the given type.	582	* the given type.
796	* Used in treasure-generation.	583	* Used in treasure-generation.
797	*/	584	*/
798
799	object *	585	object *
800	clone_arch (int type)	586	clone_arch (int type)
801	{	587	{
802	archetype *at;	588	archetype *at;
803		589

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.35 by root, Wed Jan 3 20:32:13 2007 UTC vs. Revision 1.59 by root, Mon May 7 06:01:47 2007 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.35 by root, Wed Jan 3 20:32:13 2007 UTC vs.
Revision 1.59 by root, Mon May 7 06:01:47 2007 UTC