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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.23 by root, Thu Sep 14 23:13:48 2006 UTC vs.
Revision 1.48 by root, Mon Apr 16 11:09:30 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
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 */
42		33
43	/* The naming of these functions is really poor - they are all	34	/* The naming of these functions is really poor - they are all
44	* pretty much named '.._arch_...', but they may more may not	35	* pretty much named '.._arch_...', but they may more may not
45	* return archetypes. Some make the arch_to_object call, and thus	36	* return archetypes. Some make the arch_to_object call, and thus
46	* return an object. Perhaps those should be called 'archob' functions	37	* return an object. Perhaps those should be called 'archob' functions
47	* to denote they return an object derived from the archetype.	38	* to denote they return an object derived from the archetype.
48	* MSW 2003-04-29	39	* MSW 2003-04-29
49	*/	40	*/
50		41
51	#if USE_UNORDERED_MAP	42	bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
		43
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	55	static std::vector<archetype *> archetypes;
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 *	105	shstr_cmp skill_cmp (skill);
124	at;
125		106
126	if (skill == NULL)
127	return NULL;
128
129	for (at = first_archetype; at != NULL; at = at->next)	107	for (archetype *at = first_archetype; at; at = at->next)
130	{	108	if (at->clone.skill == skill_cmp && (type == -1 \|\| type == at->clone.type))
131	if (((type == -1) \|\| (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))
132	return arch_to_object (at);	109	return arch_to_object (at);
133	}	110
134	return NULL;	111	return 0;
135	}	112	}
136		113
137	/* similiar to above - this returns the first archetype	114	/* similiar to above - this returns the first archetype
138	* that matches both the type and subtype. type and subtype	115	* 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	116	* can be -1 to say ignore, but in this case, the match it does
…		…
142	* (eg, skills)	119	* (eg, skills)
143	*/	120	*/
144	archetype *	121	archetype *
145	get_archetype_by_type_subtype (int type, int subtype)	122	get_archetype_by_type_subtype (int type, int subtype)
146	{	123	{
147	archetype *
148	at;
149
150	for (at = first_archetype; at != NULL; at = at->next)	124	for (archetype *at = first_archetype; at; at = at->next)
151	{
152	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))
153	return at;	126	return at;
154	}	127
155	return NULL;	128	return 0;
156	}	129	}
157		130
158	/**	131	/**
159	* 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
160	* (for example, "writing pen" instead of "stylus").	133	* (for example, "writing pen" instead of "stylus").
…		…
168	* but it otherwise had a big memory leak.	141	* but it otherwise had a big memory leak.
169	*/	142	*/
170	object *	143	object *
171	get_archetype_by_object_name (const char *name)	144	get_archetype_by_object_name (const char *name)
172	{	145	{
173	archetype *at;
174	char tmpname[MAX_BUF];	146	char tmpname[MAX_BUF];
175	int i;	147	int i;
176		148
177	assign (tmpname, name);	149	assign (tmpname, name);
178		150
179	for (i = strlen (tmpname); i > 0; i--)	151	for (i = strlen (tmpname); i > 0; i--)
180	{	152	{
181	tmpname[i] = 0;	153	tmpname[i] = 0;
		154
182	at = find_archetype_by_object_name (tmpname);	155	if (archetype *at = find_archetype_by_object_name (tmpname))
183
184	if (at != NULL)
185	return arch_to_object (at);	156	return arch_to_object (at);
186	}	157	}
187		158
188	return create_singularity (name);	159	return create_singularity (name);
189	}	160	}
…		…
209	item_matched_string (object pl, object op, const char *name)	180	item_matched_string (object pl, object op, const char *name)
210	{	181	{
211	char *cp, local_name[MAX_BUF];	182	char *cp, local_name[MAX_BUF];
212	int count, retval = 0;	183	int count, retval = 0;
213		184
214	strcpy (local_name, name); /* strtok is destructive to name */	185	assign (local_name, name); /* strtok is destructive to name */
215		186
216	for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))	187	for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
217	{	188	{
218	while (cp[0] == ' ')	189	while (cp[0] == ' ')
219	++cp; /* get rid of spaces */	190	++cp; /* get rid of spaces */
…		…
304	}	275	}
305		276
306	return 0;	277	return 0;
307	}	278	}
308		279
309	/*	280	archetype::archetype ()
310	* Initialises the internal linked list of archetypes (read from file).	281	{
311	* Then the global "empty_archetype" pointer is initialised.	282	clone.arch = this;
312	* Then the blocksview[] array is initialised.
313	*/
314		283
		284	CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
		285	SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
		286	}
		287
		288	archetype::~archetype ()
		289	{
		290	//TODO: nuke ->more's
		291	}
		292
		293	static void
		294	unlink (archetype *at)
		295	{
		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
315	void	310	void
316	init_archetypes (void)	311	overwrite (archetype at, object op)
317	{ /* called from add_player() and edit() */	312	{
318	if (first_archetype != NULL) /* Only do this once */	313	at->clone = *op;
		314
		315	at->clone.arch = at;
		316	//TODO: inv et al.
		317	}
		318
		319	archetype *
		320	archetype::read (object_thawer &f)
		321	{
		322	assert (f.kw == KW_object);
		323
		324	archetype *head = get (f.get_str ());
		325	unlink (head);
		326	object *op = object::create ();
		327
		328	if (!op->parse_kv (f))
		329	{
		330	op->destroy (true);
		331	// leak head
319	return;	332	return 0;
320
321	arch_init = 1;
322	load_archetypes ();
323	arch_init = 0;
324	empty_archetype = archetype::find ("empty_archetype");
325
326	/* init_blocksview();*/
327	}
328
329	/*
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_...
353	*/
354
355	void
356	init_archetable (void)
357	{
358	archetype *at;
359
360	LOG (llevDebug, " Setting up archetable...\n");
361
362	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
363	add_arch (at);
364
365	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	{	333	}
391	dump_arch (at);	334
392	fprintf (logfile, "%s\n", errmsg);	335	overwrite (head, op);
		336	op->destroy ();
		337
		338	for (archetype *prev = head; f.kw == KW_more; )
393	}	339	{
394	}	340	f.next ();
		341	assert (f.kw == KW_object);
395		342
396	void	343	archetype *more = get (f.get_str ());
397	free_all_archs (void)	344	unlink (more);
398	{	345	object *op = object::create ();
399	archetype at, next;
400	int i = 0, f = 0;
401		346
402	for (at = first_archetype; at != NULL; at = next)	347	if (!op->parse_kv (f))
403	{
404	if (at->more)
405	next = at->more;
406	else
407	next = at->next;
408
409	delete
410	at;	348	{
		349	op->destroy (true);
		350	// leak head more*
		351	return 0;
		352	}
411		353
412	i++;	354	overwrite (more, op);
		355	op->destroy ();
		356
		357	if (more->clone.x > head->tail_x) head->tail_x = more->clone.x;
		358	if (more->clone.y > head->tail_y) head->tail_y = more->clone.y;
		359
		360	more->head = head;
		361	more->clone.head = &head->clone;
		362	prev->more = more;
		363	prev->clone.more = &more->clone;
		364
		365	prev = more;
		366	}
		367
		368	if (!head->next)
413	}	369	{
414	LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);	370	head->next = first_archetype;
415	}	371	first_archetype = head;
		372	}
416		373
417	archetype::archetype ()	374	return head;
418	{
419	clear_object (&clone); /* to initial state other also */
420	CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */
421	SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
422	}
423
424	archetype::~archetype ()
425	{
426	}	375	}
427		376
428	/*	377	/*
429	* Reads/parses the archetype-file, and copies into a linked list	378	* Reads/parses the archetype-file, and copies into a linked list
430	* of archetype-structures.	379	* of archetype-structures.
431	*/	380	*/
432	void	381	static bool
433	first_arch_pass (object_thawer & fp)	382	load_archetypes (object_thawer &f)
434	{	383	{
435	archetype at, head = NULL, *last_more = NULL;	384	for (;;)
436
437	at->clone.arch = first_archetype = at = new archetype;
438
439	while (int i = load_object (fp, &at->clone, 0))
440	{	385	{
441	at->clone.speed_left = (float) (-0.1);
442	/* copy the body_info to the body_used - this is only really
443	* need for monsters, but doesn't hurt to do it for everything.
444	* by doing so, when a monster is created, it has good starting
445	* values for the body_used info, so when items are created
446	* for it, they can be properly equipped.
447	*/
448	memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
449
450	switch (i)	386	switch (f.kw)
451	{	387	{
452	case LL_NORMAL: /* A new archetype, just link it with the previous */	388	case KW_object:
453	if (last_more != NULL)	389	loading_arch = true;
454	last_more->next = at;	390	if (!archetype::read (f))
455	if (head != NULL)
456	head->next = at;
457	head = last_more = at;
458	#if 0
459	if (!op->type)
460	LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
461	#endif
462	at->tail_x = 0;
463	at->tail_y = 0;
464	break;
465
466	case LL_MORE: /* Another part of the previous archetype, link it correctly */
467
468	at->head = head;
469	at->clone.head = &head->clone;
470	if (last_more != NULL)
471	{	391	{
472	last_more->more = at;	392	loading_arch = false;
473	last_more->clone.more = &at->clone;	393	return false;
474	}	394	}
475	last_more = at;
476		395
477	/* If this multipart image is still composed of individual small	396	loading_arch = false;
478	* images, don't set the tail_.. values. We can't use them anyways,	397	continue;
479	* and setting these to zero makes the map sending to the client much	398
480	* easier as just looking at the head, we know what to do.	399	case KW_EOF:
481	*/	400	return true;
482	if (at->clone.face != head->clone.face)	401
483	{	402	default:
484	head->tail_x = 0;	403	if (!f.parse_error ("archetypes file"))
485	head->tail_y = 0;
486	}
487	else	404	return false;
488	{
489	if (at->clone.x > head->tail_x)
490	head->tail_x = at->clone.x;
491	if (at->clone.y > head->tail_y)
492	head->tail_y = at->clone.y;
493	}
494	break;
495
496	}	405	}
497		406
498	at = new archetype;	407	f.next ();
499
500	at->clone.arch = at;
501	}
502
503	delete at;
504	}
505
506	/*
507	* Reads the archetype file once more, and links all pointers between
508	* archetypes.
509	*/
510
511	void
512	second_arch_pass (object_thawer & thawer)
513	{
514	char buf[MAX_BUF], variable = buf, argument, *cp;
515	archetype at = NULL, other;
516
517	while (fgets (buf, MAX_BUF, thawer) != NULL)
518	{	408	}
519	if (*buf == '#')
520	continue;
521	if ((argument = strchr (buf, ' ')) != NULL)
522	{
523	*argument = '\0', argument++;
524	cp = argument + strlen (argument) - 1;
525	while (isspace (*cp))
526	{
527	*cp = '\0';
528	cp--;
529	}
530	}
531	if (!strcmp ("Object", variable))
532	{
533	if ((at = archetype::find (argument)) == NULL)
534	LOG (llevError, "Warning: failed to find arch %s\n", argument);
535	}
536	else if (!strcmp ("other_arch", variable))
537	{
538	if (at != NULL && at->clone.other_arch == NULL)
539	{
540	if ((other = archetype::find (argument)) == NULL)
541	LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
542	else if (at != NULL)
543	at->clone.other_arch = other;
544	}
545	}
546	else if (!strcmp ("randomitems", variable))
547	{
548	if (at != NULL)
549	{
550	treasurelist *
551	tl = find_treasurelist (argument);
552
553	if (tl == NULL)
554	LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
555	else
556	at->clone.randomitems = tl;
557	}
558	}
559	}
560	}	409	}
561
562	#ifdef DEBUG
563	void
564	check_generators (void)
565	{
566	archetype *at;
567
568	for (at = first_archetype; at != NULL; at = at->next)
569	if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
570	LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
571	}
572	#endif
573		410
574	/*	411	/*
575	* First initialises the archtype hash-table (init_archetable()).	412	* First initialises the archtype hash-table (init_archetable()).
576	* Reads and parses the archetype file (with the first and second-pass	413	* Reads and parses the archetype file (with the first and second-pass
577	* functions).	414	* functions).
578	* Then initialises treasures by calling load_treasures().
579	*/	415	*/
580		416	bool
581	void	417	load_archetype_file (const char *filename)
582	load_archetypes (void)
583	{	418	{
584	char filename[MAX_BUF];
585
586	#if TIME_ARCH_LOAD
587	struct timeval
588	tv1,
589	tv2;
590	#endif
591
592	sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
593	LOG (llevDebug, "Reading archetypes from %s:\n", filename);
594
595	{
596	object_thawer
597	thawer (filename);	419	object_thawer f (filename);
598		420
599	clear_archetable ();	421	f.next ();
600	LOG (llevDebug, " arch-pass 1...\n");
601	first_arch_pass (thawer);
602	LOG (llevDebug, " done\n");
603	}
604		422
605	init_archetable ();	423	// make sure the next - long - step is only done after a tick
		424	coroapi::wait_for_tick_begin ();
		425
		426	if (!load_archetypes (f))
		427	return false;
		428
606	warn_archetypes = 1;	429	warn_archetypes = 1;
607		430
608	{	431	empty_archetype = archetype::find ("empty_archetype");
609	object_thawer	432	if (!empty_archetype)
610	thawer (filename);	433	return false;
611		434
612	LOG (llevDebug, " loading treasure...\n");	435	coroapi::cede ();
613	load_treasures ();	436
614	LOG (llevDebug, " done\n arch-pass 2...\n");	437	return true;
615	second_arch_pass (thawer);
616	LOG (llevDebug, " done\n");
617	#ifdef DEBUG
618	check_generators ();
619	#endif
620	}
621	LOG (llevDebug, " done\n");
622	}	438	}
623		439
624	/*	440	/*
625	* Creates and returns a new object which is a copy of the given archetype.	441	* Creates and returns a new object which is a copy of the given archetype.
626	* This function returns NULL on failure.	442	* This function returns NULL on failure.
627	*/	443	*/
628
629	object *	444	object *
630	arch_to_object (archetype *at)	445	arch_to_object (archetype *at)
631	{	446	{
632	object *op;	447	if (!at)
633
634	if (at == NULL)
635	{	448	{
636	if (warn_archetypes)	449	if (warn_archetypes)
637	LOG (llevError, "Couldn't find archetype.\n");	450	LOG (llevError, "Couldn't find archetype.\n");
638		451
639	return NULL;	452	return NULL;
640	}	453	}
641		454
642	op = get_object ();	455	object *op = at->clone.clone ();
643	copy_object (&at->clone, op);
644	op->arch = at;	456	op->arch = at;
645	op->instantiate ();	457	op->instantiate ();
646	return op;	458	return op;
647	}	459	}
648		460
…		…
650	* Creates an object. This function is called by get_archetype()	462	* Creates an object. This function is called by get_archetype()
651	* if it fails to find the appropriate archetype.	463	* if it fails to find the appropriate archetype.
652	* Thus get_archetype() will be guaranteed to always return	464	* Thus get_archetype() will be guaranteed to always return
653	* an object, and never NULL.	465	* an object, and never NULL.
654	*/	466	*/
655
656	object *	467	object *
657	create_singularity (const char *name)	468	create_singularity (const char *name)
658	{	469	{
659	object *op;	470	object *op;
660	char buf[MAX_BUF];	471	char buf[MAX_BUF];
661		472
662	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);	473	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
663	op = get_object ();	474	op = object::create ();
664	op->name = op->name_pl = buf;	475	op->name = op->name_pl = buf;
665	SET_FLAG (op, FLAG_NO_PICK);	476	SET_FLAG (op, FLAG_NO_PICK);
666	return op;	477	return op;
667	}	478	}
668		479
669	/*	480	/*
670	* Finds which archetype matches the given name, and returns a new	481	* Finds which archetype matches the given name, and returns a new
671	* object containing a copy of the archetype.	482	* object containing a copy of the archetype.
672	*/	483	*/
673
674	object *	484	object *
675	get_archetype (const char *name)	485	get_archetype (const char *name)
676	{	486	{
677	archetype *at = archetype::find (name);	487	archetype *at = archetype::find (name);
678		488
…		…
714		524
715	/*	525	/*
716	* Finds, using the hashtable, which archetype matches the given name.	526	* Finds, using the hashtable, which archetype matches the given name.
717	* returns a pointer to the found archetype, otherwise NULL.	527	* returns a pointer to the found archetype, otherwise NULL.
718	*/	528	*/
719
720	archetype *	529	archetype *
721	archetype::find (const char *name)	530	archetype::find (const char *name)
722	{	531	{
723	if (!name)	532	if (!name)
724	return 0;	533	return 0;
725		534
726	#if USE_UNORDERED_MAP
727	AUTODECL (i, ht.find ((size_t) name));	535	AUTODECL (i, ht.find (name));
728		536
729	if (i == ht.end ())	537	if (i == ht.end ())
730	return 0;	538	return 0;
731	else	539	else
732	return i->second;	540	return i->second;
733	#endif	541	}
734		542
735	archetype *at;	543	archetype *
736	unsigned long index;	544	archetype::get (const char *name)
		545	{
		546	archetype *at = find (name);
737		547
738	index = hasharch (name, ARCHTABLE);	548	if (!at)
739	arch_search++;
740	for (;;)
741	{
742	at = arch_table[index];
743
744	if (at == NULL)
745	{
746	if (warn_archetypes)
747	LOG (llevError, "Couldn't find archetype %s\n", name);
748
749	return NULL;
750	}
751
752	arch_cmp++;
753
754	if (!strcmp ((const char *) at->name, name))
755	return at;
756
757	if (++index >= ARCHTABLE)
758	index = 0;
759	}	549	{
		550	archetypes.push_back (at = new archetype);
		551	at->name = name;
		552	at->hash_add ();
		553	}
		554
		555	return at;
760	}	556	}
761		557
762	/*	558	/*
763	* Adds an archetype to the hashtable.	559	* Adds an archetype to the hashtable.
764	*/	560	*/
765		561	void
766	static void	562	archetype::hash_add ()
767	add_arch (archetype *at)
768	{	563	{
769	#if USE_UNORDERED_MAP	564	ht.insert (std::make_pair (name, this));
770	ht.insert (std::make_pair ((size_t) (const char *) at->name, at));	565	}
771	#endif
772		566
773	int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index;	567	void
774		568	archetype::hash_del ()
775	for (;;)	569	{
776	{	570	ht.erase (name);
777	if (arch_table[index] == NULL)
778	{
779	arch_table[index] = at;
780	return;
781	}
782
783	if (++index == ARCHTABLE)
784	index = 0;
785
786	if (index == org_index)
787	fatal (ARCHTABLE_TOO_SMALL);
788	}
789	}	571	}
790		572
791	/*	573	/*
792	* Returns the first archetype using the given type.	574	* Returns the first archetype using the given type.
793	* Used in treasure-generation.	575	* Used in treasure-generation.
794	*/	576	*/
795
796	archetype *	577	archetype *
797	type_to_archetype (int type)	578	type_to_archetype (int type)
798	{	579	{
799	archetype *at;
800
801	for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)	580	for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
802	if (at->clone.type == type)	581	if (at->clone.type == type)
803	return at;	582	return at;
804		583
805	return 0;	584	return 0;
806	}	585	}
…		…
808	/*	587	/*
809	* Returns a new object copied from the first archetype matching	588	* Returns a new object copied from the first archetype matching
810	* the given type.	589	* the given type.
811	* Used in treasure-generation.	590	* Used in treasure-generation.
812	*/	591	*/
813
814	object *	592	object *
815	clone_arch (int type)	593	clone_arch (int type)
816	{	594	{
817	archetype *at;	595	archetype *at;
818	object *op = get_object ();
819		596
820	if ((at = type_to_archetype (type)) == NULL)	597	if ((at = type_to_archetype (type)) == NULL)
821	{	598	{
822	LOG (llevError, "Can't clone archetype %d\n", type);	599	LOG (llevError, "Can't clone archetype %d\n", type);
823	free_object (op);
824	return NULL;	600	return 0;
825	}	601	}
826		602
827	copy_object (&at->clone, op);	603	object *op = at->clone.clone ();
828	op->instantiate ();	604	op->instantiate ();
829	return op;	605	return op;
830	}	606	}
831		607
832	/*	608	/*

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.23 by root, Thu Sep 14 23:13:48 2006 UTC vs. Revision 1.48 by root, Mon Apr 16 11:09:30 2007 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.23 by root, Thu Sep 14 23:13:48 2006 UTC vs.
Revision 1.48 by root, Mon Apr 16 11:09:30 2007 UTC