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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.40 by root, Fri Feb 2 22:08:23 2007 UTC vs.
Revision 1.73 by root, Sun Apr 20 00:44:12 2008 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	#include <cassert>	24	#include <cassert>
26		25
27	#include <global.h>	26	#include <global.h>
29	#include <loader.h>	28	#include <loader.h>
30		29
31	#include <tr1/functional>	30	#include <tr1/functional>
32	#include <tr1/unordered_map>	31	#include <tr1/unordered_map>
33		32
34	int arch_init; /* True if doing arch initialization */	33	archetype *loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
35		34	archetype *archetype::empty;
36	/* The naming of these functions is really poor - they are all
37	* pretty much named '.._arch_...', but they may more may not
38	* return archetypes. Some make the arch_to_object call, and thus
39	* return an object. Perhaps those should be called 'archob' functions
40	* to denote they return an object derived from the archetype.
41	* MSW 2003-04-29
42	*/
43		35
44	// the hashtable	36	// the hashtable
45	typedef std::tr1::unordered_map	37	typedef std::tr1::unordered_map
46	<	38	<
47	const char *,	39	const char *,
…		…
50	str_equal,	42	str_equal,
51	slice_allocator< std::pair<const char *const, arch_ptr> >	43	slice_allocator< std::pair<const char *const, arch_ptr> >
52	> HT;	44	> HT;
53		45
54	static HT ht (5000);	46	static HT ht (5000);
		47	archvec archetypes;
		48
		49	// the vector of other_arch references to be resolved
		50	static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref;
		51	// the vector of loaded but not yet committed archetypes
		52	static std::vector<archetype *> postponed_arch;
55		53
56	/**	54	/**
57	* GROS - This function retrieves an archetype given the name that appears	55	* GROS - This function retrieves an archetype given the name that appears
58	* during the game (for example, "writing pen" instead of "stylus").	56	* 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.	57	* It does not use the hashtable system, but browse the whole archlist each time.
…		…
67	archetype *	65	archetype *
68	find_archetype_by_object_name (const char *name)	66	find_archetype_by_object_name (const char *name)
69	{	67	{
70	shstr_cmp name_cmp (name);	68	shstr_cmp name_cmp (name);
71		69
72	for (archetype *at = first_archetype; at; at = at->next)	70	for_all_archetypes (at)
73	if (at->clone.name == name_cmp)	71	if (at->name == name_cmp)
74	return at;	72	return at;
75		73
76	return 0;	74	return 0;
77	}	75	}
78		76
…		…
84	archetype *	82	archetype *
85	find_archetype_by_object_type_name (int type, const char *name)	83	find_archetype_by_object_type_name (int type, const char *name)
86	{	84	{
87	shstr_cmp name_cmp (name);	85	shstr_cmp name_cmp (name);
88		86
89	for (archetype *at = first_archetype; at; at = at->next)	87	for_all_archetypes (at)
90	if (at->clone.name == name_cmp && at->clone.type == type)	88	if (at->name == name_cmp && at->type == type)
91	return at;	89	return at;
92		90
93	return 0;	91	return 0;
94	}	92	}
95		93
…		…
101	object *	99	object *
102	get_archetype_by_skill_name (const char *skill, int type)	100	get_archetype_by_skill_name (const char *skill, int type)
103	{	101	{
104	shstr_cmp skill_cmp (skill);	102	shstr_cmp skill_cmp (skill);
105		103
106	for (archetype *at = first_archetype; at; at = at->next)	104	for_all_archetypes (at)
107	if (at->clone.skill == skill_cmp && (type == -1 \|\| type == at->clone.type))	105	if (at->skill == skill_cmp && (type == -1 \|\| type == at->type))
108	return arch_to_object (at);	106	return arch_to_object (at);
109		107
110	return 0;	108	return 0;
111	}	109	}
112		110
…		…
118	* (eg, skills)	116	* (eg, skills)
119	*/	117	*/
120	archetype *	118	archetype *
121	get_archetype_by_type_subtype (int type, int subtype)	119	get_archetype_by_type_subtype (int type, int subtype)
122	{	120	{
123	for (archetype *at = first_archetype; at; at = at->next)	121	for_all_archetypes (at)
124	if ((type == -1 \|\| type == at->clone.type) && (subtype == -1 \|\| subtype == at->clone.subtype))	122	if ((type == -1 \|\| type == at->type) && (subtype == -1 \|\| subtype == at->subtype))
125	return at;	123	return at;
126		124
127	return 0;	125	return 0;
128	}	126	}
129		127
…		…
156	}	154	}
157		155
158	return create_singularity (name);	156	return create_singularity (name);
159	}	157	}
160		158
161	/* This is a subset of the parse_id command. Basically, name can be	159	/* 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.	160	* a string seperated lists of things to match, with certain keywords.
163	* pl is the player (only needed to set count properly)	161	* pl is the player (only needed to set count properly)
164	* op is the item we are trying to match. Calling function takes care	162	* 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	163	* 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	164	* (pickup, drop, etc.) Return NONZERO if we have a match. A higher
167	* value means a better match. 0 means no match.	165	* value means a better match. 0 means no match.
168	*	166	*
169	* Brief outline of the procedure:	167	* Brief outline of the procedure:
170	* We take apart the name variable into the individual components.	168	* We take apart the name variable into the individual components.
171	* cases for 'all' and unpaid are pretty obvious.	169	* cases for 'all' and unpaid are pretty obvious.
172	* Next, we check for a count (either specified in name, or in the	170	* Next, we check for a count (either specified in name, or in the
173	* player object.)	171	* player object.)
174	* If count is 1, make a quick check on the name.	172	* 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.	173	* IF count is >1, we need to make plural name. Return if match.
176	* Last, make a check on the full name.	174	* Last, make a check on the full name.
177	*/	175	*/
178	int	176	int
179	item_matched_string (object pl, object op, const char *name)	177	item_matched_string (object pl, object op, const char *name)
180	{	178	{
181	char *cp, local_name[MAX_BUF];	179	char *cp, local_name[MAX_BUF];
182	int count, retval = 0;	180	int count, retval = 0;
…		…
274	}	272	}
275		273
276	return 0;	274	return 0;
277	}	275	}
278		276
279	/*	277	archetype::archetype (const char *name)
280	* Initialises the internal linked list of archetypes (read from file).	278	{
281	* Then the global "empty_archetype" pointer is initialised.	279	arch = this;
282	* Then the blocksview[] array is initialised.	280	this->archname = this->name = this->name_pl = name;
283	*/	281	}
		282
		283	archetype::~archetype ()
		284	{
		285	unlink ();
		286	}
284		287
285	void	288	void
286	init_archetypes (void)	289	archetype::link ()
287	{ /* called from add_player() and edit() */	290	{
288	if (first_archetype != NULL) /* Only do this once */	291	ht.insert (std::make_pair (archname, this));
289	return;
290		292
291	arch_init = 1;	293	if (!archetypes.contains (this))
292	load_archetypes ();	294	archetypes.insert (this);
293	arch_init = 0;
294	empty_archetype = archetype::find ("empty_archetype");
295
296	/* init_blocksview();*/
297	}	295	}
298		296
299	/*
300	* An alternative way to init the hashtable which is slower, but _works_...
301	*/
302	void	297	void
303	init_archetable (void)	298	archetype::unlink ()
304	{	299	{
		300	ht.erase (archname);
		301
		302	if (archetypes.contains (this))
		303	archetypes.erase (this);
		304	}
		305
		306	/*
		307	* Finds, using the hashtable, which archetype matches the given name.
		308	* returns a pointer to the found archetype, otherwise NULL.
		309	*/
305	archetype *at;	310	archetype *
		311	archetype::find (const char *name)
		312	{
		313	if (!name)
		314	return 0;
306		315
307	LOG (llevDebug, " Setting up archetable...\n");	316	auto (i, ht.find (name));
308		317
309	for (at = first_archetype; at; at = at->more ? at->more : at->next)	318	if (i == ht.end ())
310	at->hash_add ();	319	return 0;
		320	else
		321	return i->second;
		322	}
311		323
312	LOG (llevDebug, "done\n");	324	archetype *
		325	archetype::read (object_thawer &f)
		326	{
		327	assert (f.kw == KW_object);
		328
		329	std::vector<archetype *> parts;
		330
		331	coroapi::cede_to_tick ();
		332
		333	for (;;)
		334	{
		335	archetype *at = new archetype (f.get_str ());
		336
		337	f.next ();
		338
		339	#if 0
		340	// implementing it here in the server does neither allow multiple inheritence
		341	// nor does it cleanly "just override". it would allow use in map files, though,
		342	// and other resource files dynamically laoded (as opposed to being preprocessed).
		343	// not that any of this is relevant as of yet...
		344	if (f.kw == KW_inherit)
		345	{
		346	if (archetype *at = find (f.get_str ()))
		347	*op = at->clone;
		348	else
		349	LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
		350	&at->archname, f.get_str ());
		351
		352	f.next ();
		353	}
		354	#endif
		355
		356	loading_arch = at; // hack to tell parse_kv et al. to behave
		357	bool parse_ok = at->parse_kv (f);
		358	loading_arch = 0;
		359
		360	if (!parse_ok)
		361	goto fail;
		362
		363	loading_arch = at; // hack to tell parse_kv et al. to behave
		364	at->post_load_check ();
		365	loading_arch = 0;
		366
		367	parts.push_back (at);
		368
		369	if (f.kw != KW_more)
		370	break;
		371
		372	f.next ();
		373
		374	if (f.kw != KW_object)
		375	{
		376	f.parse_error ("more object");
		377	goto fail;
		378	}
		379	}
		380
		381	{
		382	auto (at, parts.begin ());
		383
		384	archetype *new_head = parts.front ();
		385	archetype *old_head = find (new_head->archname);
		386
		387	if (old_head && !old_head->is_head ())
		388	{
		389	LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
		390	&new_head->archname, &old_head->archname);
		391	goto fail;
		392	}
		393
		394	// check that all archetypes belong to the same old object or are new
		395	for (auto (at, parts.begin ()); at != parts.end (); ++at)
		396	{
		397	archetype new_part = at;
		398	archetype *old_part = find (new_part->archname);
		399
		400	if (old_part && old_part->head_ () != old_head)
		401	{
		402	LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
		403	&new_part->archname, &((archetype *)old_part->head_ ())->archname);
		404	goto fail;
		405	}
		406	}
		407
		408	// assemble new chain
		409	new_head->min_x = new_head->max_x = new_head->x;
		410	new_head->min_y = new_head->max_y = new_head->y;
		411
		412	archetype *less = new_head;
		413	for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
		414	{
		415	archetype at = p;
		416
		417	// some flags get inherited formt he head (probably a lot more)
		418	// doing it here doesn't feel too cozy, but it allows code
		419	// to ignore head checks for these flags, which saves time
		420	at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
		421	at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
		422	at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
		423	at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
		424
		425	if (at->x < new_head->min_x) new_head->min_x = at->x;
		426	if (at->y < new_head->min_y) new_head->min_y = at->y;
		427	if (at->x > new_head->max_x) new_head->max_x = at->x;
		428	if (at->y > new_head->max_y) new_head->max_y = at->y;
		429
		430	at->head = new_head;
		431	less->more = at;
		432	less = at;
		433	}
		434
		435	postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
		436
		437	return new_head;
		438	}
		439
		440	fail:
		441	for (auto (p, parts.begin ()); p != parts.end (); ++p)
		442	(*p)->destroy (true);
		443
		444	return 0;
313	}	445	}
314		446
315	void	447	void
316	free_all_archs (void)	448	archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
317	{	449	{
318	archetype at, next;	450	ref = 0;
319	int i = 0, f = 0;	451	postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
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	}	452	}
336		453
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	454	void
352	first_arch_pass (object_thawer & fp)	455	archetype::commit_load ()
353	{	456	{
354	archetype head = 0, last_more = 0;	457	// unlink old archetypes and link in new ones */
355		458	for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p)
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	}	459	{
		460	archetype at = p;
422		461
423	delete at;	462	if (archetype *old = find (at->archname))
424	}	463	old->unlink ();
425		464
426	/*	465	at->link ();
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	{	466	}
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		467
472	if (tl == NULL)	468	postponed_arch.clear ();
473	LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);	469
474	else	470	// now resolve arch references
475	at->clone.randomitems = tl;	471	for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p)
476	}
477	}
478	}	472	{
479	}	473	arch_ptr *ap = p->first;
		474	archetype *at = find (p->second);
480		475
481	#ifdef DEBUG	476	if (!at)
482	void	477	LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second);
483	check_generators (void)
484	{
485	archetype *at;
486		478
487	for (at = first_archetype; at != NULL; at = at->next)	479	*ap = at;
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	}	480	}
516		481
517	init_archetable ();	482	postponed_arch_ref.clear ();
518	warn_archetypes = 1;
519		483
520	{	484	empty = find (shstr_empty_archetype);
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	}	485	}
536		486
537	/*	487	/*
538	* Creates and returns a new object which is a copy of the given archetype.	488	* Creates and returns a new object which is a copy of the given archetype.
539	* This function returns NULL on failure.	489	* This function returns NULL on failure.
540	*/	490	*/
541	object *	491	object *
542	arch_to_object (archetype *at)	492	arch_to_object (archetype *at)
543	{	493	{
544	object *op;	494	if (!at)
545
546	if (at == NULL)
547	{	495	{
548	if (warn_archetypes)
549	LOG (llevError, "Couldn't find archetype.\n");	496	LOG (llevError, "Couldn't find archetype.\n");
550
551	return NULL;	497	return 0;
552	}	498	}
553		499
554	op = at->clone.clone ();	500	object *op = at->clone ();
555	op->arch = at;	501	op->arch = at;
556	op->instantiate ();	502	op->instantiate ();
		503
557	return op;	504	return op;
		505	}
		506
		507	object *
		508	archetype::instance ()
		509	{
		510	return arch_to_object (this);
558	}	511	}
559		512
560	/*	513	/*
561	* Creates an object. This function is called by get_archetype()	514	* Creates an object. This function is called by get_archetype()
562	* if it fails to find the appropriate archetype.	515	* if it fails to find the appropriate archetype.
…		…
564	* an object, and never NULL.	517	* an object, and never NULL.
565	*/	518	*/
566	object *	519	object *
567	create_singularity (const char *name)	520	create_singularity (const char *name)
568	{	521	{
569	object *op;	522	LOG (llevError \| logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
		523
		524	if (!strcmp (name, "bug"))
		525	abort ();
		526
570	char buf[MAX_BUF];	527	char buf[MAX_BUF];
		528	sprintf (buf, "bug, please report (%s)", name);
571		529
572	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);	530	object *op = get_archetype ("bug");
573	op = object::create ();
574	op->name = op->name_pl = buf;	531	op->name = op->name_pl = buf;
575	SET_FLAG (op, FLAG_NO_PICK);	532
576	return op;	533	return op;
577	}	534	}
578		535
579	/*	536	/*
580	* Finds which archetype matches the given name, and returns a new	537	* Finds which archetype matches the given name, and returns a new
…		…
590		547
591	return arch_to_object (at);	548	return arch_to_object (at);
592	}	549	}
593		550
594	/*	551	/*
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.	552	* Returns the first archetype using the given type.
659	* Used in treasure-generation.	553	* Used in treasure-generation.
660	*/	554	*/
661	archetype *	555	archetype *
662	type_to_archetype (int type)	556	type_to_archetype (int type)
663	{	557	{
664	archetype *at;	558	for_all_archetypes (at)
665		559	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;	560	return at;
669		561
670	return 0;	562	return 0;
671	}	563	}
672		564
673	/*	565	/*
674	* Returns a new object copied from the first archetype matching	566	* Returns a new object copied from the first archetype matching
675	* the given type.	567	* the given type.
676	* Used in treasure-generation.	568	* Used in treasure-generation.
677	*/	569	*/
678
679	object *	570	object *
680	clone_arch (int type)	571	clone_arch (int type)
681	{	572	{
682	archetype *at;	573	archetype *at;
683		574
…		…
685	{	576	{
686	LOG (llevError, "Can't clone archetype %d\n", type);	577	LOG (llevError, "Can't clone archetype %d\n", type);
687	return 0;	578	return 0;
688	}	579	}
689		580
690	object *op = at->clone.clone ();	581	object *op = at->clone ();
691	op->instantiate ();	582	op->instantiate ();
692	return op;	583	return op;
693	}	584	}
694		585
695	/*	586	/*
696	* member: make instance from class	587	* member: make instance from class
697	*/	588	*/
698
699	object *	589	object *
700	object_create_arch (archetype *at)	590	object_create_arch (archetype *at)
701	{	591	{
702	object op, prev = 0, *head = 0;	592	object op, prev = 0, *head = 0;
703		593
704	while (at)	594	while (at)
705	{	595	{
706	op = arch_to_object (at);	596	op = arch_to_object (at);
		597
707	op->x = at->clone.x;	598	op->x = at->x;
708	op->y = at->clone.y;	599	op->y = at->y;
709		600
710	if (head)	601	if (head)
711	op->head = head, prev->more = op;	602	op->head = head, prev->more = op;
712		603
713	if (!head)	604	if (!head)
714	head = op;	605	head = op;
715		606
716	prev = op;	607	prev = op;
717	at = at->more;	608	at = (archetype *)at->more;
718	}	609	}
719		610
720	return (head);	611	return head;
721	}	612	}
722		613

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.40 by root, Fri Feb 2 22:08:23 2007 UTC vs. Revision 1.73 by root, Sun Apr 20 00:44:12 2008 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.40 by root, Fri Feb 2 22:08:23 2007 UTC vs.
Revision 1.73 by root, Sun Apr 20 00:44:12 2008 UTC