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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.12 by root, Mon Sep 4 17:16:19 2006 UTC vs.
Revision 1.17 by root, Tue Sep 12 19:20:06 2006 UTC

…		…
1	/*
2	* static char *rcsid_arch_c =
3	* "$Id: arch.C,v 1.12 2006/09/04 17:16:19 root Exp $";
4	*/
5
6	/*	1	/*
7	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
8		3
9	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
36	#include <loader.h>	31	#include <loader.h>
37		32
38	/* IF set, does a little timing on the archetype load. */	33	/* IF set, does a little timing on the archetype load. */
39	#define TIME_ARCH_LOAD 0	34	#define TIME_ARCH_LOAD 0
40		35
41	static void add_arch (archetype * at);	36	static void add_arch (archetype *at);
42		37
43	static archetype *arch_table[ARCHTABLE];	38	static archetype *arch_table[ARCHTABLE];
44	int arch_cmp = 0; /* How many strcmp's */	39	int arch_cmp = 0; /* How many strcmp's */
45	int arch_search = 0; /* How many searches */	40	int arch_search = 0; /* How many searches */
46	int arch_init; /* True if doing arch initialization */	41	int arch_init; /* True if doing arch initialization */
…		…
53	* MSW 2003-04-29	48	* MSW 2003-04-29
54	*/	49	*/
55		50
56	#if USE_UNORDERED_MAP	51	#if USE_UNORDERED_MAP
57	// the hashtable	52	// the hashtable
58	typedef std::tr1::unordered_map<size_t, archetype *> HT;	53	typedef
		54	std::tr1::unordered_map <
		55	size_t, archetype *>
		56	HT;
59		57
60	static HT ht;	58	static
		59	HT
		60	ht;
61	#endif	61	#endif
62		62
63	/**	63	/**
64	* GROS - This function retrieves an archetype given the name that appears	64	* GROS - This function retrieves an archetype given the name that appears
65	* during the game (for example, "writing pen" instead of "stylus").	65	* during the game (for example, "writing pen" instead of "stylus").
…		…
72	* - the archetype found or null if nothing was found.	72	* - the archetype found or null if nothing was found.
73	*/	73	*/
74	archetype *	74	archetype *
75	find_archetype_by_object_name (const char *name)	75	find_archetype_by_object_name (const char *name)
76	{	76	{
77	archetype *at;	77	archetype *
		78	at;
78		79
79	if (name == NULL)	80	if (name == NULL)
80	return (archetype *) NULL;	81	return (archetype *) NULL;
81		82
82	for (at = first_archetype; at != NULL; at = at->next)	83	for (at = first_archetype; at != NULL; at = at->next)
…		…
93	* except that it considers only items of the given type.	94	* except that it considers only items of the given type.
94	*/	95	*/
95	archetype *	96	archetype *
96	find_archetype_by_object_type_name (int type, const char *name)	97	find_archetype_by_object_type_name (int type, const char *name)
97	{	98	{
98	archetype *at;	99	archetype *
		100	at;
99		101
100	if (name == NULL)	102	if (name == NULL)
101	return NULL;	103	return NULL;
102		104
103	for (at = first_archetype; at != NULL; at = at->next)	105	for (at = first_archetype; at != NULL; at = at->next)
…		…
165	* but it otherwise had a big memory leak.	167	* but it otherwise had a big memory leak.
166	*/	168	*/
167	object *	169	object *
168	get_archetype_by_object_name (const char *name)	170	get_archetype_by_object_name (const char *name)
169	{	171	{
170	archetype *	172	archetype *at;
171	at;
172	char
173	tmpname[MAX_BUF];	173	char tmpname[MAX_BUF];
174	int	174	int i;
175	i;
176		175
177	strncpy (tmpname, name, MAX_BUF - 1);	176	assign (tmpname, name);
178	tmpname[MAX_BUF - 1] = 0;	177
179	for (i = strlen (tmpname); i > 0; i--)	178	for (i = strlen (tmpname); i > 0; i--)
180	{	179	{
181	tmpname[i] = 0;	180	tmpname[i] = 0;
182	at = find_archetype_by_object_name (tmpname);	181	at = find_archetype_by_object_name (tmpname);
		182
183	if (at != NULL)	183	if (at != NULL)
184	{	184	{
185	return arch_to_object (at);	185	return arch_to_object (at);
186	}	186	}
187	}	187	}
		188
188	return create_singularity (name);	189	return create_singularity (name);
189	}	190	}
190		191
191	/* This is a subset of the parse_id command. Basically, name can be	192	/* This is a subset of the parse_id command. Basically, name can be
192	* a string seperated lists of things to match, with certain keywords.	193	* a string seperated lists of things to match, with certain keywords.
…		…
204	* If count is 1, make a quick check on the name.	205	* If count is 1, make a quick check on the name.
205	* IF count is >1, we need to make plural name. Return if match.	206	* IF count is >1, we need to make plural name. Return if match.
206	* Last, make a check on the full name.	207	* Last, make a check on the full name.
207	*/	208	*/
208	int	209	int
209	item_matched_string (object * pl, object * op, const char *name)	210	item_matched_string (object pl, object op, const char *name)
210	{	211	{
211	char *	212	char *
212	cp,	213	cp,
213	local_name[MAX_BUF];	214	local_name[MAX_BUF];
214	int	215	int
215	count,	216	count,
216	retval = 0;	217	retval = 0;
		218
217	strcpy (local_name, name); /* strtok is destructive to name */	219	strcpy (local_name, name); /* strtok is destructive to name */
218		220
219	for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))	221	for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
220	{	222	{
221	while (cp[0] == ' ')	223	while (cp[0] == ' ')
…		…
326	return;	328	return;
327	arch_init = 1;	329	arch_init = 1;
328	load_archetypes ();	330	load_archetypes ();
329	arch_init = 0;	331	arch_init = 0;
330	empty_archetype = find_archetype ("empty_archetype");	332	empty_archetype = find_archetype ("empty_archetype");
		333
331	/* init_blocksview();*/	334	/* init_blocksview();*/
332	}	335	}
333		336
334	/*	337	/*
335	* Stores debug-information about how efficient the hashtable	338	* Stores debug-information about how efficient the hashtable
336	* used for archetypes has been in the static errmsg array.	339	* used for archetypes has been in the static errmsg array.
337	*/	340	*/
338		341
339	void	342	void
340	arch_info (object * op)	343	arch_info (object *op)
341	{	344	{
342	sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);	345	sprintf (errmsg, "%d searches and %d strcmp()'s", arch_search, arch_cmp);
343	new_draw_info (NDI_BLACK, 0, op, errmsg);	346	new_draw_info (NDI_BLACK, 0, op, errmsg);
344	}	347	}
345		348
…		…
358	*/	361	*/
359		362
360	void	363	void
361	init_archetable (void)	364	init_archetable (void)
362	{	365	{
363	archetype *at;	366	archetype *
		367	at;
364		368
365	LOG (llevDebug, " Setting up archetable...\n");	369	LOG (llevDebug, " Setting up archetable...\n");
366		370
367	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)	371	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
368	add_arch (at);	372	add_arch (at);
…		…
373	/*	377	/*
374	* Dumps an archetype to debug-level output.	378	* Dumps an archetype to debug-level output.
375	*/	379	*/
376		380
377	void	381	void
378	dump_arch (archetype * at)	382	dump_arch (archetype *at)
379	{	383	{
380	dump_object (&at->clone);	384	dump_object (&at->clone);
381	}	385	}
382		386
383	/*	387	/*
…		…
389	void	393	void
390	dump_all_archetypes (void)	394	dump_all_archetypes (void)
391	{	395	{
392	archetype *	396	archetype *
393	at;	397	at;
		398
394	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)	399	for (at = first_archetype; at != NULL; at = (at->more == NULL) ? at->next : at->more)
395	{	400	{
396	dump_arch (at);	401	dump_arch (at);
397	fprintf (logfile, "%s\n", errmsg);	402	fprintf (logfile, "%s\n", errmsg);
398	}	403	}
…		…
414	else	419	else
415	next = at->next;	420	next = at->next;
416		421
417	delete	422	delete
418	at;	423	at;
		424
419	i++;	425	i++;
420	}	426	}
421	LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);	427	LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
422	}	428	}
423		429
424	/*	430	archetype::archetype ()
425	* Allocates, initialises and returns the pointer to an archetype structure.
426	*/
427	// TODO: should become constructor
428	archetype *
429	get_archetype_struct (void)
430	{	431	{
431	archetype *
432	arch;
433
434	arch = new archetype;
435
436	clear_object (&arch->clone); /* to initial state other also */	432	clear_object (&clone); /* to initial state other also */
437	CLEAR_FLAG (&arch->clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */	433	CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_object() */
438	SET_FLAG (&arch->clone, FLAG_REMOVED); /* doesn't copy these flags... */	434	SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
		435	}
439		436
440	return arch;	437	archetype::~archetype ()
		438	{
441	}	439	}
442		440
443	/*	441	/*
444	* Reads/parses the archetype-file, and copies into a linked list	442	* Reads/parses the archetype-file, and copies into a linked list
445	* of archetype-structures.	443	* of archetype-structures.
446	*/	444	*/
447	void	445	void
448	first_arch_pass (object_thawer & fp)	446	first_arch_pass (object_thawer & fp)
449	{	447	{
450	object *
451	op;
452	archetype *	448	archetype *
453	at, *	449	at, *
454	head = NULL, *last_more = NULL;	450	head = NULL, *last_more = NULL;
455	int
456	i;
457		451
458	op = get_object ();
459	op->arch = first_archetype = at = get_archetype_struct ();	452	at->clone.arch = first_archetype = at = new archetype;
460		453
461	while ((i = load_object (fp, op, 0)))	454	while (int i = load_object (fp, &at->clone, 0))
462	{	455	{
463	copy_object (op, &at->clone);
464	at->clone.speed_left = (float) (-0.1);	456	at->clone.speed_left = (float) (-0.1);
465	/* copy the body_info to the body_used - this is only really	457	/* copy the body_info to the body_used - this is only really
466	* need for monsters, but doesn't hurt to do it for everything.	458	* need for monsters, but doesn't hurt to do it for everything.
467	* by doing so, when a monster is created, it has good starting	459	* by doing so, when a monster is created, it has good starting
468	* values for the body_used info, so when items are created	460	* values for the body_used info, so when items are created
469	* for it, they can be properly equipped.	461	* for it, they can be properly equipped.
470	*/	462	*/
471	memcpy (&at->clone.body_used, &op->body_info, sizeof (op->body_info));	463	memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
472		464
473	switch (i)	465	switch (i)
474	{	466	{
475	case LL_NORMAL: /* A new archetype, just link it with the previous */	467	case LL_NORMAL: /* A new archetype, just link it with the previous */
476	if (last_more != NULL)	468	if (last_more != NULL)
477	last_more->next = at;	469	last_more->next = at;
478	if (head != NULL)	470	if (head != NULL)
479	head->next = at;	471	head->next = at;
480	head = last_more = at;	472	head = last_more = at;
481	#if 0	473	#if 0
482	if (!op->type)	474	if (!op->type)
483	LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);	475	LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
484	#endif	476	#endif
485	at->tail_x = 0;	477	at->tail_x = 0;
486	at->tail_y = 0;	478	at->tail_y = 0;
487	break;	479	break;
488		480
489	case LL_MORE: /* Another part of the previous archetype, link it correctly */	481	case LL_MORE: /* Another part of the previous archetype, link it correctly */
490		482
491	at->head = head;	483	at->head = head;
492	at->clone.head = &head->clone;	484	at->clone.head = &head->clone;
493	if (last_more != NULL)	485	if (last_more != NULL)
494	{	486	{
495	last_more->more = at;	487	last_more->more = at;
496	last_more->clone.more = &at->clone;	488	last_more->clone.more = &at->clone;
497	}	489	}
498	last_more = at;	490	last_more = at;
499		491
500	/* If this multipart image is still composed of individual small	492	/* If this multipart image is still composed of individual small
501	* images, don't set the tail_.. values. We can't use them anyways,	493	* images, don't set the tail_.. values. We can't use them anyways,
502	* and setting these to zero makes the map sending to the client much	494	* and setting these to zero makes the map sending to the client much
503	* easier as just looking at the head, we know what to do.	495	* easier as just looking at the head, we know what to do.
504	*/	496	*/
505	if (at->clone.face != head->clone.face)	497	if (at->clone.face != head->clone.face)
506	{	498	{
507	head->tail_x = 0;	499	head->tail_x = 0;
508	head->tail_y = 0;	500	head->tail_y = 0;
509	}	501	}
510	else	502	else
511	{	503	{
512	if (at->clone.x > head->tail_x)	504	if (at->clone.x > head->tail_x)
513	head->tail_x = at->clone.x;	505	head->tail_x = at->clone.x;
514	if (at->clone.y > head->tail_y)	506	if (at->clone.y > head->tail_y)
515	head->tail_y = at->clone.y;	507	head->tail_y = at->clone.y;
516	}	508	}
517	break;	509	break;
518		510
519	}	511	}
520		512
521	at = get_archetype_struct ();	513	at = new archetype;
522	clear_object (op);	514
523	op->arch = at;	515	at->clone.arch = at;
524	}	516	}
525		517
526	delete	518	delete at;
527	at;
528	free_object (op);
529	}	519	}
530		520
531	/*	521	/*
532	* Reads the archetype file once more, and links all pointers between	522	* Reads the archetype file once more, and links all pointers between
533	* archetypes.	523	* archetypes.
…		…
575	{	565	{
576	if (at != NULL)	566	if (at != NULL)
577	{	567	{
578	treasurelist *	568	treasurelist *
579	tl = find_treasurelist (argument);	569	tl = find_treasurelist (argument);
		570
580	if (tl == NULL)	571	if (tl == NULL)
581	LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);	572	LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
582	else	573	else
583	at->clone.randomitems = tl;	574	at->clone.randomitems = tl;
584	}	575	}
…		…
590	void	581	void
591	check_generators (void)	582	check_generators (void)
592	{	583	{
593	archetype *	584	archetype *
594	at;	585	at;
		586
595	for (at = first_archetype; at != NULL; at = at->next)	587	for (at = first_archetype; at != NULL; at = at->next)
596	if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)	588	if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
597	LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);	589	LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
598	}	590	}
599	#endif	591	#endif
…		…
608	void	600	void
609	load_archetypes (void)	601	load_archetypes (void)
610	{	602	{
611	char	603	char
612	filename[MAX_BUF];	604	filename[MAX_BUF];
613	int	605
614	comp;
615	#if TIME_ARCH_LOAD	606	#if TIME_ARCH_LOAD
616	struct timeval	607	struct timeval
617	tv1,	608	tv1,
618	tv2;	609	tv2;
619	#endif	610	#endif
…		…
654	* Creates and returns a new object which is a copy of the given archetype.	645	* Creates and returns a new object which is a copy of the given archetype.
655	* This function returns NULL on failure.	646	* This function returns NULL on failure.
656	*/	647	*/
657		648
658	object *	649	object *
659	arch_to_object (archetype * at)	650	arch_to_object (archetype *at)
660	{	651	{
661	object *	652	object *
662	op;	653	op;
		654
663	if (at == NULL)	655	if (at == NULL)
664	{	656	{
665	if (warn_archetypes)	657	if (warn_archetypes)
666	LOG (llevError, "Couldn't find archetype.\n");	658	LOG (llevError, "Couldn't find archetype.\n");
		659
667	return NULL;	660	return NULL;
668	}	661	}
		662
669	op = get_object ();	663	op = get_object ();
670	copy_object (&at->clone, op);	664	copy_object (&at->clone, op);
		665	op->arch = at;
671	op->instantiate ();	666	op->instantiate ();
672	op->arch = at;
673	return op;	667	return op;
674	}	668	}
675		669
676	/*	670	/*
677	* Creates an object. This function is called by get_archetype()	671	* Creates an object. This function is called by get_archetype()
…		…
685	{	679	{
686	object *	680	object *
687	op;	681	op;
688	char	682	char
689	buf[MAX_BUF];	683	buf[MAX_BUF];
		684
690	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);	685	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);
691	op = get_object ();	686	op = get_object ();
692	op->name = op->name_pl = buf;	687	op->name = op->name_pl = buf;
693	SET_FLAG (op, FLAG_NO_PICK);	688	SET_FLAG (op, FLAG_NO_PICK);
694	return op;	689	return op;
…		…
702	object *	697	object *
703	get_archetype (const char *name)	698	get_archetype (const char *name)
704	{	699	{
705	archetype *	700	archetype *
706	at;	701	at;
		702
707	at = find_archetype (name);	703	at = find_archetype (name);
708	if (at == NULL)	704	if (at == NULL)
709	return create_singularity (name);	705	return create_singularity (name);
		706
710	return arch_to_object (at);	707	return arch_to_object (at);
711	}	708	}
712		709
713	/*	710	/*
714	* Hash-function used by the arch-hashtable.	711	* Hash-function used by the arch-hashtable.
…		…
755	name = shstr::find (name);	752	name = shstr::find (name);
756		753
757	if (!name)	754	if (!name)
758	return 0;	755	return 0;
759		756
760	HT::const_iterator i = ht.find ((size_t)name);	757	HT::const_iterator i = ht.find ((size_t) name);
761		758
762	if (i == ht.end ())	759	if (i == ht.end ())
763	return 0;	760	return 0;
764	else	761	else
765	return i->second;	762	return i->second;
766	#endif	763	#endif
767		764
768	archetype *at;	765	archetype *
		766	at;
769	unsigned long index;	767	unsigned long
		768	index;
770		769
771	if (name == NULL)	770	if (name == NULL)
772	return (archetype *) NULL;	771	return (archetype *) NULL;
773		772
774	index = hasharch (name, ARCHTABLE);	773	index = hasharch (name, ARCHTABLE);
…		…
796		795
797	static void	796	static void
798	add_arch (archetype *at)	797	add_arch (archetype *at)
799	{	798	{
800	#if USE_UNORDERED_MAP	799	#if USE_UNORDERED_MAP
801	ht.insert (std::make_pair ((size_t)(const char *)at->name, at));	800	ht.insert (std::make_pair ((size_t) (const char *) at->name, at));
802	#endif	801	#endif
803		802
		803	int
804	int index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index;	804	index = hasharch ((const char *) at->name, ARCHTABLE), org_index = index;
805		805
806	for (;;)	806	for (;;)
807	{	807	{
808	if (arch_table[index] == NULL)	808	if (arch_table[index] == NULL)
809	{	809	{
…		…
864	/*	864	/*
865	* member: make instance from class	865	* member: make instance from class
866	*/	866	*/
867		867
868	object *	868	object *
869	object_create_arch (archetype * at)	869	object_create_arch (archetype *at)
870	{	870	{
871	object *	871	object *
872	op, *	872	op, *
873	prev = NULL, *head = NULL;	873	prev = NULL, *head = NULL;
874		874

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.12 by root, Mon Sep 4 17:16:19 2006 UTC vs. Revision 1.17 by root, Tue Sep 12 19:20:06 2006 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.12 by root, Mon Sep 4 17:16:19 2006 UTC vs.
Revision 1.17 by root, Tue Sep 12 19:20:06 2006 UTC