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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.41 by root, Thu Feb 8 03:09:31 2007 UTC vs.
Revision 1.65 by root, Thu Jun 7 18:55:24 2007 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software; you can redistribute it and/or modify it
9	* it under the terms of the GNU General Public License as published by	9	* under the terms of the GNU General Public License as published by the Free
10	* the Free Software Foundation; either version 2 of the License, or	10	* Software Foundation; either version 2 of the License, or (at your option)
11	* (at your option) any later version.	11	* 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, but
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16	* GNU General Public License for more details.	16	* 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 along
19	* along with this program; if not, write to the Free Software	19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 to <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	#include <tr1/functional>	31	#include <tr1/functional>
32	#include <tr1/unordered_map>	32	#include <tr1/unordered_map>
33
34	int arch_init; /* True if doing arch initialization */
35		33
36	/* The naming of these functions is really poor - they are all	34	/* The naming of these functions is really poor - they are all
37	* pretty much named '.._arch_...', but they may more may not	35	* pretty much named '.._arch_...', but they may more may not
38	* return archetypes. Some make the arch_to_object call, and thus	36	* return archetypes. Some make the arch_to_object call, and thus
39	* return an object. Perhaps those should be called 'archob' functions	37	* return an object. Perhaps those should be called 'archob' functions
40	* to denote they return an object derived from the archetype.	38	* to denote they return an object derived from the archetype.
41	* MSW 2003-04-29	39	* MSW 2003-04-29
42	*/	40	*/
		41
		42	bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
43		43
44	// the hashtable	44	// the hashtable
45	typedef std::tr1::unordered_map	45	typedef std::tr1::unordered_map
46	<	46	<
47	const char *,	47	const char *,
50	str_equal,	50	str_equal,
51	slice_allocator< std::pair<const char *const, arch_ptr> >	51	slice_allocator< std::pair<const char *const, arch_ptr> >
52	> HT;	52	> HT;
53		53
54	static HT ht (5000);	54	static HT ht (5000);
		55	archvec archetypes;
55		56
56	/**	57	/**
57	* GROS - This function retrieves an archetype given the name that appears	58	* GROS - This function retrieves an archetype given the name that appears
58	* during the game (for example, "writing pen" instead of "stylus").	59	* during the game (for example, "writing pen" instead of "stylus").
59	* 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.
…		…
67	archetype *	68	archetype *
68	find_archetype_by_object_name (const char *name)	69	find_archetype_by_object_name (const char *name)
69	{	70	{
70	shstr_cmp name_cmp (name);	71	shstr_cmp name_cmp (name);
71		72
72	for (archetype *at = first_archetype; at; at = at->next)	73	for_all_archetypes (at)
73	if (at->clone.name == name_cmp)	74	if (at->archname == name_cmp)
74	return at;	75	return at;
75		76
76	return 0;	77	return 0;
77	}	78	}
78		79
…		…
84	archetype *	85	archetype *
85	find_archetype_by_object_type_name (int type, const char *name)	86	find_archetype_by_object_type_name (int type, const char *name)
86	{	87	{
87	shstr_cmp name_cmp (name);	88	shstr_cmp name_cmp (name);
88		89
89	for (archetype *at = first_archetype; at; at = at->next)	90	for_all_archetypes (at)
90	if (at->clone.name == name_cmp && at->clone.type == type)	91	if (at->archname == name_cmp && at->type == type)
91	return at;	92	return at;
92		93
93	return 0;	94	return 0;
94	}	95	}
95		96
…		…
101	object *	102	object *
102	get_archetype_by_skill_name (const char *skill, int type)	103	get_archetype_by_skill_name (const char *skill, int type)
103	{	104	{
104	shstr_cmp skill_cmp (skill);	105	shstr_cmp skill_cmp (skill);
105		106
106	for (archetype *at = first_archetype; at; at = at->next)	107	for_all_archetypes (at)
107	if (at->clone.skill == skill_cmp && (type == -1 \|\| type == at->clone.type))	108	if (at->skill == skill_cmp && (type == -1 \|\| type == at->type))
108	return arch_to_object (at);	109	return arch_to_object (at);
109		110
110	return 0;	111	return 0;
111	}	112	}
112		113
…		…
118	* (eg, skills)	119	* (eg, skills)
119	*/	120	*/
120	archetype *	121	archetype *
121	get_archetype_by_type_subtype (int type, int subtype)	122	get_archetype_by_type_subtype (int type, int subtype)
122	{	123	{
123	for (archetype *at = first_archetype; at; at = at->next)	124	for_all_archetypes (at)
124	if ((type == -1 \|\| type == at->clone.type) && (subtype == -1 \|\| subtype == at->clone.subtype))	125	if ((type == -1 \|\| type == at->type) && (subtype == -1 \|\| subtype == at->subtype))
125	return at;	126	return at;
126		127
127	return 0;	128	return 0;
128	}	129	}
129		130
…		…
156	}	157	}
157		158
158	return create_singularity (name);	159	return create_singularity (name);
159	}	160	}
160		161
161	/* This is a subset of the parse_id command. Basically, name can be	162	/* This is a subset of the parse_id command. Basically, name can be
162	* a string seperated lists of things to match, with certain keywords.	163	* a string seperated lists of things to match, with certain keywords.
163	* pl is the player (only needed to set count properly)	164	* pl is the player (only needed to set count properly)
164	* op is the item we are trying to match. Calling function takes care	165	* op is the item we are trying to match. Calling function takes care
165	* of what action might need to be done and if it is valid	166	* of what action might need to be done and if it is valid
166	* (pickup, drop, etc.) Return NONZERO if we have a match. A higher	167	* (pickup, drop, etc.) Return NONZERO if we have a match. A higher
167	* value means a better match. 0 means no match.	168	* value means a better match. 0 means no match.
168	*	169	*
169	* Brief outline of the procedure:	170	* Brief outline of the procedure:
170	* We take apart the name variable into the individual components.	171	* We take apart the name variable into the individual components.
171	* cases for 'all' and unpaid are pretty obvious.	172	* cases for 'all' and unpaid are pretty obvious.
172	* Next, we check for a count (either specified in name, or in the	173	* Next, we check for a count (either specified in name, or in the
173	* player object.)	174	* player object.)
174	* If count is 1, make a quick check on the name.	175	* If count is 1, make a quick check on the name.
175	* IF count is >1, we need to make plural name. Return if match.	176	* IF count is >1, we need to make plural name. Return if match.
176	* Last, make a check on the full name.	177	* Last, make a check on the full name.
177	*/	178	*/
178	int	179	int
179	item_matched_string (object pl, object op, const char *name)	180	item_matched_string (object pl, object op, const char *name)
180	{	181	{
181	char *cp, local_name[MAX_BUF];	182	char *cp, local_name[MAX_BUF];
182	int count, retval = 0;	183	int count, retval = 0;
…		…
274	}	275	}
275		276
276	return 0;	277	return 0;
277	}	278	}
278		279
279	/*	280	archetype::archetype (const char *name)
280	* Initialises the internal linked list of archetypes (read from file).	281	{
281	* Then the global "empty_archetype" pointer is initialised.	282	stub = true;
282	* Then the blocksview[] array is initialised.	283	arch = this;
283	*/	284	this->archname = this->name = this->name_pl = name;
		285	}
		286
		287	archetype::~archetype ()
		288	{
		289	unlink ();
		290	}
284		291
285	void	292	void
286	init_archetypes (void)	293	archetype::link ()
287	{ /* called from add_player() and edit() */	294	{
288	if (first_archetype != NULL) /* Only do this once */	295	ht.insert (std::make_pair (archname, this));
		296
		297	if (!archetypes.contains (this))
		298	archetypes.insert (this);
		299	}
		300
		301	void
		302	archetype::unlink ()
		303	{
		304	ht.erase (archname);
		305	if (!strcmp (&archname, "Gaea")) fprintf (stderr, "oI\n");//D
		306	if (archetypes.contains (this))
		307	archetypes.erase (this);
		308	}
		309
		310	/*
		311	* Finds, using the hashtable, which archetype matches the given name.
		312	* returns a pointer to the found archetype, otherwise NULL.
		313	*/
		314	archetype *
		315	archetype::find (const char *name)
		316	{
		317	if (!name)
289	return;	318	return 0;
290		319
291	arch_init = 1;	320	auto (i, ht.find (name));
292	load_archetypes ();	321
293	arch_init = 0;	322	if (i == ht.end ())
		323	return 0;
		324	else
		325	return i->second;
		326	}
		327
		328	archetype *
		329	archetype::get (const char *name)
		330	{
		331	if (!name)
		332	{
		333	LOG (llevError, "null archetype requested\n");
		334	name = "(null)";
		335	}
		336
		337	archetype *at = find (name);
		338
		339	if (!at)
		340	{
		341	at = new archetype (name);
		342	at->link ();
		343	}
		344
		345	return at;
		346	}
		347
		348	archetype *
		349	archetype::read (object_thawer &f)
		350	{
		351	assert (f.kw == KW_object);
		352
		353	loading_arch = true; // hack to tell parse_kv et al. to behave
		354
		355	std::vector<archetype *> parts;
		356
		357	coroapi::cede_to_tick_every (10);
		358
		359	for (;;)
		360	{
		361	// the archetype might have been referenced earlier
		362	// so try to find an existing stub archetype first
		363	archetype *at = find (f.get_str ());
		364
		365	if (!at \|\| !at->stub)
		366	at = new archetype (f.get_str ());
		367
		368	f.next ();
		369
		370	#if 0
		371	// implementing it here in the server does neither allow multiple inheritence
		372	// nor does it cleanly "just override". it would allow use in map files, though,
		373	// and other resource files dynamically laoded (as opposed to being preprocessed).
		374	// not that any of this is relevant as of yet...
		375	if (f.kw == KW_inherit)
		376	{
		377	if (archetype *at = find (f.get_str ()))
		378	*op = at->clone;
		379	else
		380	LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
		381	&at->archname, f.get_str ());
		382
		383	f.next ();
		384	}
		385	#endif
		386
		387	if (!at->parse_kv (f))
		388	goto fail;
		389
		390	at->post_load_check ();
		391
		392	parts.push_back (at);
		393
		394	if (f.kw != KW_more)
		395	break;
		396
		397	f.next ();
		398
		399	if (f.kw != KW_object)
		400	{
		401	f.parse_error ("more object");
		402	goto fail;
		403	}
		404	}
		405
		406	loading_arch = false;
		407
		408	{
		409	auto (at, parts.begin ());
		410
		411	archetype *new_head = parts.front ();
		412	archetype *old_head = find (new_head->archname);
		413
		414	if (old_head && !old_head->is_head ())
		415	{
		416	LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
		417	&new_head->archname, &old_head->archname);
		418	goto fail;
		419	}
		420
		421	// check that all archetypes belong to the same old object or are new
		422	for (auto (at, parts.begin ()); at != parts.end (); ++at)
		423	{
		424	archetype new_part = at;
		425	archetype *old_part = find (new_part->archname);
		426
		427	if (old_part && old_part->head_ () != old_head)
		428	{
		429	LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
		430	&new_part->archname, &((archetype *)old_part->head_ ())->archname);
		431	goto fail;
		432	}
		433	}
		434
		435	// deactivate existing archetype
		436	for (archetype at = old_head; at; at = (archetype )at->more)
		437	at->unlink ();
		438
		439	// assemble new chain
		440	new_head->min_x = new_head->max_x = new_head->x;
		441	new_head->min_y = new_head->max_y = new_head->y;
		442
		443	archetype *less = new_head;
		444	for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
		445	{
		446	archetype at = p;
		447
		448	if (at->x < new_head->min_x) new_head->min_x = at->x;
		449	if (at->y < new_head->min_y) new_head->min_y = at->y;
		450	if (at->x > new_head->max_x) new_head->max_x = at->x;
		451	if (at->y > new_head->max_y) new_head->max_y = at->y;
		452
		453	at->head = new_head;
		454	less->more = at;
		455	less = at;
		456	}
		457
		458	// now activate it
		459	for (auto (p, parts.begin ()); p != parts.end (); ++p)
		460	{
		461	archetype at = p;
		462	at->stub = false;
		463	at->link ();
		464	}
		465
		466	return new_head;
		467	}
		468
		469	fail:
		470	for (auto (p, parts.begin ()); p != parts.end (); ++p)
		471	(*p)->destroy (true);
		472
		473	loading_arch = false;
		474	return 0;
		475	}
		476
		477	/*
		478	* Initialize global archtype pointers:
		479	*/
		480	void
		481	init_archetype_pointers ()
		482	{
		483	ring_arch = archetype::find ("ring");
		484	amulet_arch = archetype::find ("amulet");
		485	staff_arch = archetype::find ("staff");
		486	crown_arch = archetype::find ("crown");
294	empty_archetype = archetype::find ("empty_archetype");	487	empty_archetype = archetype::find ("empty_archetype");
295
296	/* init_blocksview();*/
297	}
298
299	/*
300	* An alternative way to init the hashtable which is slower, but _works_...
301	*/
302	void
303	init_archetable (void)
304	{
305	archetype *at;
306
307	LOG (llevDebug, " Setting up archetable...\n");
308
309	for (at = first_archetype; at; at = at->more ? at->more : at->next)
310	at->hash_add ();
311
312	LOG (llevDebug, "done\n");
313	}
314
315	void
316	free_all_archs (void)
317	{
318	archetype at, next;
319	int i = 0, f = 0;
320
321	for (at = first_archetype; at; at = next)
322	{
323	if (at->more)
324	next = at->more;
325	else
326	next = at->next;
327
328	delete
329	at;
330
331	i++;
332	}
333
334	LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
335	}
336
337	archetype::archetype ()
338	{
339	CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
340	SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
341	}
342
343	archetype::~archetype ()
344	{
345	}
346
347	/*
348	* Reads/parses the archetype-file, and copies into a linked list
349	* of archetype-structures.
350	*/
351	void
352	first_arch_pass (object_thawer & fp)
353	{
354	archetype head = 0, last_more = 0;
355
356	archetype *at = new archetype;
357	at->clone.arch = first_archetype = at;
358
359	while (int i = load_object (fp, &at->clone, 0))
360	{
361	at->clone.speed_left = (float) (-0.1);
362	/* copy the body_info to the body_used - this is only really
363	* need for monsters, but doesn't hurt to do it for everything.
364	* by doing so, when a monster is created, it has good starting
365	* values for the body_used info, so when items are created
366	* for it, they can be properly equipped.
367	*/
368	memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
369
370	switch (i)
371	{
372	case LL_NORMAL: /* A new archetype, just link it with the previous */
373	if (last_more != NULL)
374	last_more->next = at;
375	if (head != NULL)
376	head->next = at;
377	head = last_more = at;
378	#if 0
379	if (!op->type)
380	LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
381	#endif
382	at->tail_x = 0;
383	at->tail_y = 0;
384	break;
385
386	case LL_MORE: /* Another part of the previous archetype, link it correctly */
387
388	at->head = head;
389	at->clone.head = &head->clone;
390	if (last_more != NULL)
391	{
392	last_more->more = at;
393	last_more->clone.more = &at->clone;
394	}
395	last_more = at;
396
397	/* If this multipart image is still composed of individual small
398	* images, don't set the tail_.. values. We can't use them anyways,
399	* and setting these to zero makes the map sending to the client much
400	* easier as just looking at the head, we know what to do.
401	*/
402	if (at->clone.face != head->clone.face)
403	{
404	head->tail_x = 0;
405	head->tail_y = 0;
406	}
407	else
408	{
409	if (at->clone.x > head->tail_x)
410	head->tail_x = at->clone.x;
411	if (at->clone.y > head->tail_y)
412	head->tail_y = at->clone.y;
413	}
414	break;
415
416	}
417
418	at = new archetype;
419
420	at->clone.arch = at;
421	}
422
423	delete at;
424	}
425
426	/*
427	* Reads the archetype file once more, and links all pointers between
428	* archetypes.
429	*/
430
431	void
432	second_arch_pass (object_thawer & thawer)
433	{
434	char buf[MAX_BUF], variable = buf, argument, *cp;
435	archetype at = NULL, other;
436
437	while (fgets (buf, MAX_BUF, thawer) != NULL)
438	{
439	if (*buf == '#')
440	continue;
441	if ((argument = strchr (buf, ' ')) != NULL)
442	{
443	*argument = '\0', argument++;
444	cp = argument + strlen (argument) - 1;
445	while (isspace (*cp))
446	{
447	*cp = '\0';
448	cp--;
449	}
450	}
451	if (!strcmp ("object", variable))
452	{
453	if ((at = archetype::find (argument)) == NULL)
454	LOG (llevError, "Warning: failed to find arch %s\n", argument);
455	}
456	else if (!strcmp ("other_arch", variable))
457	{
458	if (at != NULL && at->clone.other_arch == NULL)
459	{
460	if ((other = archetype::find (argument)) == NULL)
461	LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
462	else if (at != NULL)
463	at->clone.other_arch = other;
464	}
465	}
466	else if (!strcmp ("randomitems", variable))
467	{
468	if (at != NULL)
469	{
470	treasurelist *tl = find_treasurelist (argument);
471
472	if (tl == NULL)
473	LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
474	else
475	at->clone.randomitems = tl;
476	}
477	}
478	}
479	}
480
481	#ifdef DEBUG
482	void
483	check_generators (void)
484	{
485	archetype *at;
486
487	for (at = first_archetype; at != NULL; at = at->next)
488	if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
489	LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
490	}
491	#endif
492
493	/*
494	* First initialises the archtype hash-table (init_archetable()).
495	* Reads and parses the archetype file (with the first and second-pass
496	* functions).
497	* Then initialises treasures by calling load_treasures().
498	*/
499
500	void
501	load_archetypes (void)
502	{
503	char filename[MAX_BUF];
504
505	sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
506	LOG (llevDebug, "Reading archetypes from %s:\n", filename);
507
508	{
509	object_thawer
510	thawer (filename);
511
512	LOG (llevDebug, " arch-pass 1...\n");
513	first_arch_pass (thawer);
514	LOG (llevDebug, " done\n");
515	}
516
517	init_archetable ();
518	warn_archetypes = 1;
519
520	{
521	object_thawer
522	thawer (filename);
523
524	LOG (llevDebug, " loading treasure...\n");
525	load_treasures ();
526	LOG (llevDebug, " done\n");
527	LOG (llevDebug, " arch-pass 2...\n");
528	second_arch_pass (thawer);
529	LOG (llevDebug, " done\n");
530	#ifdef DEBUG
531	check_generators ();
532	#endif
533	}
534	LOG (llevDebug, " done\n");
535	}	488	}
536		489
537	/*	490	/*
538	* Creates and returns a new object which is a copy of the given archetype.	491	* Creates and returns a new object which is a copy of the given archetype.
539	* This function returns NULL on failure.	492	* This function returns NULL on failure.
540	*/	493	*/
541	object *	494	object *
542	arch_to_object (archetype *at)	495	arch_to_object (archetype *at)
543	{	496	{
544	object *op;	497	if (!at)
545
546	if (at == NULL)
547	{	498	{
548	if (warn_archetypes)
549	LOG (llevError, "Couldn't find archetype.\n");	499	LOG (llevError, "Couldn't find archetype.\n");
550
551	return NULL;	500	return 0;
552	}	501	}
553		502
554	op = at->clone.clone ();	503	object *op = at->clone ();
555	op->arch = at;	504	op->arch = at;
556	op->instantiate ();	505	op->instantiate ();
		506
557	return op;	507	return op;
558	}	508	}
559		509
560	/*	510	/*
561	* Creates an object. This function is called by get_archetype()	511	* Creates an object. This function is called by get_archetype()
…		…
564	* an object, and never NULL.	514	* an object, and never NULL.
565	*/	515	*/
566	object *	516	object *
567	create_singularity (const char *name)	517	create_singularity (const char *name)
568	{	518	{
569	object *op;	519	LOG (llevError \| logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
		520
		521	if (!strcmp (name, "bug"))
		522	abort ();
		523
570	char buf[MAX_BUF];	524	char buf[MAX_BUF];
571
572	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);	525	sprintf (buf, "bug, please report (%s)", ARCH_SINGULARITY, name);
573	op = object::create ();	526
		527	object *op = get_archetype ("bug");
574	op->name = op->name_pl = buf;	528	op->name = op->name_pl = buf;
575	SET_FLAG (op, FLAG_NO_PICK);	529
576	return op;	530	return op;
577	}	531	}
578		532
579	/*	533	/*
580	* Finds which archetype matches the given name, and returns a new	534	* Finds which archetype matches the given name, and returns a new
…		…
590		544
591	return arch_to_object (at);	545	return arch_to_object (at);
592	}	546	}
593		547
594	/*	548	/*
595	* Hash-function used by the arch-hashtable.
596	*/
597
598	unsigned long
599	hasharch (const char *str, int tablesize)
600	{
601	unsigned long hash = 0;
602	unsigned int i = 0;
603	const char *p;
604
605	/* use the one-at-a-time hash function, which supposedly is
606	* better than the djb2-like one used by perl5.005, but
607	* certainly is better then the bug used here before.
608	* see http://burtleburtle.net/bob/hash/doobs.html
609	*/
610	for (p = str; i < MAXSTRING && *p; p++, i++)
611	{
612	hash += *p;
613	hash += hash << 10;
614	hash ^= hash >> 6;
615	}
616
617	hash += hash << 3;
618	hash ^= hash >> 11;
619	hash += hash << 15;
620
621	return hash % tablesize;
622	}
623
624	/*
625	* Finds, using the hashtable, which archetype matches the given name.
626	* returns a pointer to the found archetype, otherwise NULL.
627	*/
628	archetype *
629	archetype::find (const char *name)
630	{
631	if (!name)
632	return 0;
633
634	AUTODECL (i, ht.find (name));
635
636	if (i == ht.end ())
637	return 0;
638	else
639	return i->second;
640	}
641
642	/*
643	* Adds an archetype to the hashtable.
644	*/
645	void
646	archetype::hash_add ()
647	{
648	ht.insert (std::make_pair (name, this));
649	}
650
651	void
652	archetype::hash_del ()
653	{
654	ht.erase (name);
655	}
656
657	/*
658	* Returns the first archetype using the given type.	549	* Returns the first archetype using the given type.
659	* Used in treasure-generation.	550	* Used in treasure-generation.
660	*/	551	*/
661	archetype *	552	archetype *
662	type_to_archetype (int type)	553	type_to_archetype (int type)
663	{	554	{
664	archetype *at;	555	for_all_archetypes (at)
665		556	if (at->type == type && at->head_ () != at)
666	for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
667	if (at->clone.type == type)
668	return at;	557	return at;
669		558
670	return 0;	559	return 0;
671	}	560	}
672		561
673	/*	562	/*
674	* Returns a new object copied from the first archetype matching	563	* Returns a new object copied from the first archetype matching
675	* the given type.	564	* the given type.
676	* Used in treasure-generation.	565	* Used in treasure-generation.
677	*/	566	*/
678
679	object *	567	object *
680	clone_arch (int type)	568	clone_arch (int type)
681	{	569	{
682	archetype *at;	570	archetype *at;
683		571
…		…
685	{	573	{
686	LOG (llevError, "Can't clone archetype %d\n", type);	574	LOG (llevError, "Can't clone archetype %d\n", type);
687	return 0;	575	return 0;
688	}	576	}
689		577
690	object *op = at->clone.clone ();	578	object *op = at->clone ();
691	op->instantiate ();	579	op->instantiate ();
692	return op;	580	return op;
693	}	581	}
694		582
695	/*	583	/*
696	* member: make instance from class	584	* member: make instance from class
697	*/	585	*/
698
699	object *	586	object *
700	object_create_arch (archetype *at)	587	object_create_arch (archetype *at)
701	{	588	{
702	object op, prev = 0, *head = 0;	589	object op, prev = 0, *head = 0;
703		590
704	while (at)	591	while (at)
705	{	592	{
706	op = arch_to_object (at);	593	op = arch_to_object (at);
		594
707	op->x = at->clone.x;	595	op->x = at->x;
708	op->y = at->clone.y;	596	op->y = at->y;
709		597
710	if (head)	598	if (head)
711	op->head = head, prev->more = op;	599	op->head = head, prev->more = op;
712		600
713	if (!head)	601	if (!head)
714	head = op;	602	head = op;
715		603
716	prev = op;	604	prev = op;
717	at = at->more;	605	at = (archetype *)at->more;
718	}	606	}
719		607
720	return (head);	608	return head;
721	}	609	}
722		610

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.41 by root, Thu Feb 8 03:09:31 2007 UTC vs. Revision 1.65 by root, Thu Jun 7 18:55:24 2007 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.41 by root, Thu Feb 8 03:09:31 2007 UTC vs.
Revision 1.65 by root, Thu Jun 7 18:55:24 2007 UTC