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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.73 by root, Sun Apr 20 00:44:12 2008 UTC vs.
Revision 1.107 by root, Sat Apr 23 04:56:45 2011 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* 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 Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <cassert>	25	#include <cassert>
25		26
26	#include <global.h>	27	#include <global.h>
27	#include <funcpoint.h>
28	#include <loader.h>
29		28
30	#include <tr1/functional>	29	#include <tr1/functional>
31	#include <tr1/unordered_map>	30	#include <tr1/unordered_map>
32		31
33	archetype *loading_arch; // ugly flag to object laoder etc. to suppress/request special processing	32	archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
34	archetype *archetype::empty;	33	arch_ptr archetype::empty;
35		34
36	// the hashtable	35	// the hashtable
37	typedef std::tr1::unordered_map	36	typedef std::tr1::unordered_map
38	<	37	<
39	const char *,	38	const char *,
41	str_hash,	40	str_hash,
42	str_equal,	41	str_equal,
43	slice_allocator< std::pair<const char *const, arch_ptr> >	42	slice_allocator< std::pair<const char *const, arch_ptr> >
44	> HT;	43	> HT;
45		44
46	static HT ht (5000);	45	static HT ht (10000);
47	archvec archetypes;	46	archvec archetypes;
		47	static unordered_vector<archetype *> allarch;
		48	static int dirtycnt;
48		49
49	// the vector of other_arch references to be resolved	50	// the vector of other_arch references to be resolved
50	static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref;	51	static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref;
51	// the vector of loaded but not yet committed archetypes	52	// the vector of loaded but not yet committed archetypes
52	static std::vector<archetype *> postponed_arch;	53	static std::vector<archetype *> postponed_arch;
		54
		55	//+GPL
		56
		57	/*
		58	* Creates an object. This function is called by get_archetype ()
		59	* if it fails to find the appropriate archetype.
		60	* Thus get_archetype() will be guaranteed to always return
		61	* an object, and never NULL.
		62	*/
		63	static object *
		64	create_singularity (const char *name)
		65	{
		66	LOG (llevError \| logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
		67
		68	if (!strcmp (name, "bug"))
		69	abort ();
		70
		71	object *op = archetype::get (shstr_bug);
		72	op->name = op->name_pl = format ("bug, please report (missing archetype %s)", name);
		73
		74	return op;
		75	}
53		76
54	/**	77	/**
55	* GROS - This function retrieves an archetype given the name that appears	78	* GROS - This function retrieves an archetype given the name that appears
56	* during the game (for example, "writing pen" instead of "stylus").	79	* during the game (for example, "writing pen" instead of "stylus").
57	* It does not use the hashtable system, but browse the whole archlist each time.	80	* It does not use the hashtable system, but browse the whole archlist each time.
…		…
101	{	124	{
102	shstr_cmp skill_cmp (skill);	125	shstr_cmp skill_cmp (skill);
103		126
104	for_all_archetypes (at)	127	for_all_archetypes (at)
105	if (at->skill == skill_cmp && (type == -1 \|\| type == at->type))	128	if (at->skill == skill_cmp && (type == -1 \|\| type == at->type))
106	return arch_to_object (at);	129	return at->instance ();
107		130
108	return 0;	131	return 0;
109	}	132	}
110		133
111	/* similiar to above - this returns the first archetype	134	/* similiar to above - this returns the first archetype
…		…
132	* - name: The name we're searching for (ex: "writing pen");	155	* - name: The name we're searching for (ex: "writing pen");
133	* Return value:	156	* Return value:
134	* - a corresponding object if found; a singularity object if not found.	157	* - a corresponding object if found; a singularity object if not found.
135	* Note by MSW - it appears that it takes the full name and keeps	158	* Note by MSW - it appears that it takes the full name and keeps
136	* shortening it until it finds a match. I re-wrote this so that it	159	* shortening it until it finds a match. I re-wrote this so that it
137	* doesn't malloc it each time - not that this function is used much,	160	* doesn't allocate it each time - not that this function is used much,
138	* but it otherwise had a big memory leak.	161	* but it otherwise had a big memory leak.
139	*/	162	*/
140	object *	163	object *
141	get_archetype_by_object_name (const char *name)	164	get_archetype_by_object_name (const char *name)
142	{	165	{
143	char tmpname[MAX_BUF];	166	char tmpname[MAX_BUF];
144	int i;
145		167
146	assign (tmpname, name);	168	assign (tmpname, name);
147		169
148	for (i = strlen (tmpname); i > 0; i--)	170	for (int i = strlen (tmpname); i > 0; i--)
149	{	171	{
150	tmpname[i] = 0;	172	tmpname[i] = 0;
151		173
152	if (archetype *at = find_archetype_by_object_name (tmpname))	174	if (archetype *at = find_archetype_by_object_name (tmpname))
153	return arch_to_object (at);	175	return at->instance ();
154	}	176	}
155		177
156	return create_singularity (name);	178	return create_singularity (name);
157	}	179	}
158		180
…		…
190	/* All is a very generic match - low match value */	212	/* All is a very generic match - low match value */
191	if (!strcmp (cp, "all"))	213	if (!strcmp (cp, "all"))
192	return 1;	214	return 1;
193		215
194	/* unpaid is a little more specific */	216	/* unpaid is a little more specific */
195	if (!strcmp (cp, "unpaid") && QUERY_FLAG (op, FLAG_UNPAID))	217	if (!strcmp (cp, "unpaid") && op->flag [FLAG_UNPAID])
196	return 2;	218	return 2;
197	if (!strcmp (cp, "cursed") && QUERY_FLAG (op, FLAG_KNOWN_CURSED) && (QUERY_FLAG (op, FLAG_CURSED) \|\| QUERY_FLAG (op, FLAG_DAMNED)))	219
		220	if (!strcmp (cp, "cursed") && op->flag [FLAG_KNOWN_CURSED] && (op->flag [FLAG_CURSED] \|\| op->flag [FLAG_DAMNED]))
198	return 2;	221	return 2;
199		222
200	if (!strcmp (cp, "unlocked") && !QUERY_FLAG (op, FLAG_INV_LOCKED))	223	if (!strcmp (cp, "unlocked") && !op->flag [FLAG_INV_LOCKED])
201	return 2;	224	return 2;
202		225
203	/* Allow for things like '100 arrows' */	226	/* Allow for things like '100 arrows' */
204	if ((count = atoi (cp)) != 0)	227	if ((count = atoi (cp)) != 0)
205	{	228	{
…		…
223	* is because of the 'else' handling - we don't want to match on	246	* is because of the 'else' handling - we don't want to match on
224	* something and set a low retval, even though it may match a higher retcal	247	* something and set a low retval, even though it may match a higher retcal
225	* later. So keep it in descending order here, so we try for the best	248	* later. So keep it in descending order here, so we try for the best
226	* match first, and work downward.	249	* match first, and work downward.
227	*/	250	*/
		251	const char qbn0, qbn1, *qsn; // query base name/short name caches
		252
228	if (!strcasecmp (cp, query_name (op)))	253	if (!strcasecmp (cp, query_name (op)))
229	retval = 20;	254	retval = 20;
230	else if (!strcasecmp (cp, query_short_name (op)))	255	else if (!strcasecmp (cp, qsn = query_short_name (op)))
231	retval = 18;	256	retval = 18;
232	else if (!strcasecmp (cp, query_base_name (op, 0)))	257	else if (!strcasecmp (cp, qbn0 = query_base_name (op, 0)))
233	retval = 16;	258	retval = 16;
234	else if (!strcasecmp (cp, query_base_name (op, 1)))	259	else if (!strcasecmp (cp, qbn1 = query_base_name (op, 1)))
235	retval = 16;	260	retval = 16;
236	else if (op->custom_name && !strcasecmp (cp, op->custom_name))	261	else if (op->custom_name && !strcasecmp (cp, op->custom_name))
237	retval = 15;	262	retval = 15;
238	else if (!strncasecmp (cp, query_base_name (op, 0), strlen (cp)))	263	else if (!strncasecmp (cp, qbn0, strlen (cp)))
239	retval = 14;	264	retval = 14;
240	else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp)))	265	else if (!strncasecmp (cp, qbn1, strlen (cp)))
241	retval = 14;	266	retval = 14;
242	/* Do substring checks, so things like 'Str+1' will match.	267	/* Do substring checks, so things like 'Str+1' will match.
243	* retval of these should perhaps be lower - they are lower	268	* retval of these should perhaps be lower - they are lower
244	* then the specific strcasecmp aboves, but still higher than	269	* then the specific strcasecmp aboves, but still higher than
245	* some other match criteria.	270	* some other match criteria.
246	*/	271	*/
247	else if (strstr (query_base_name (op, 1), cp))	272	else if (strstr (qbn1, cp))
248	retval = 12;	273	retval = 12;
249	else if (strstr (query_base_name (op, 0), cp))	274	else if (strstr (qbn0, cp))
250	retval = 12;	275	retval = 12;
251	else if (strstr (query_short_name (op), cp))	276	else if (strstr (qsn, cp))
252	retval = 12;	277	retval = 12;
253	/* Check against plural/non plural based on count. */	278	/* Check against plural/non plural based on count. */
254	else if (count > 1 && !strcasecmp (cp, op->name_pl))	279	else if (count > 1 && !strcasecmp (cp, op->name_pl))
255	retval = 6;	280	retval = 6;
256	else if (count == 1 && !strcasecmp (op->name, cp))	281	else if (count == 1 && !strcasecmp (op->name, cp))
257	retval = 6;	282	retval = 6;
258	/* base name matched - not bad */	283	/* base name matched - not bad */
259	else if (strcasecmp (cp, op->name) == 0 && !count)	284	else if (strcasecmp (cp, op->name) == 0 && !count)
260	retval = 4;	285	retval = 4;
261	/* Check for partial custom name, but give a real low priority */	286	/* Check for partial custom name, but give a real low priority */
262	else if (op->custom_name && strstr (op->custom_name, cp))	287	else if (op->custom_name.contains (cp))
263	retval = 3;	288	retval = 3;
264		289
265	if (retval)	290	if (retval)
266	{	291	{
267	if (pl->type == PLAYER)	292	if (pl->type == PLAYER)
…		…
272	}	297	}
273		298
274	return 0;	299	return 0;
275	}	300	}
276		301
		302	//-GPL
		303
		304	void
		305	archetype::do_delete ()
		306	{
		307	delete this;
		308	}
		309
277	archetype::archetype (const char *name)	310	archetype::archetype (const char *name)
278	{	311	{
279	arch = this;	312	arch = this;
280	this->archname = this->name = this->name_pl = name;	313	this->archname = this->name = this->name_pl = name;
281	}	314	}
…		…
286	}	319	}
287		320
288	void	321	void
289	archetype::link ()	322	archetype::link ()
290	{	323	{
291	ht.insert (std::make_pair (archname, this));
292
293	if (!archetypes.contains (this))	324	if (!archetypes.contains (this))
		325	{
294	archetypes.insert (this);	326	archetypes.insert (this);
		327	ht.insert (std::make_pair (archname, this));
		328	}
295	}	329	}
296		330
297	void	331	void
298	archetype::unlink ()	332	archetype::unlink ()
299	{	333	{
300	ht.erase (archname);
301
302	if (archetypes.contains (this))	334	if (archetypes.contains (this))
		335	{
303	archetypes.erase (this);	336	archetypes.erase (this);
		337	ht.erase (archname);
		338	}
304	}	339	}
305		340
306	/*	341	/*
307	* Finds, using the hashtable, which archetype matches the given name.	342	* Finds, using the hashtable, which archetype matches the given name.
308	* returns a pointer to the found archetype, otherwise NULL.	343	* returns a pointer to the found archetype, otherwise NULL.
…		…
319	return 0;	354	return 0;
320	else	355	else
321	return i->second;	356	return i->second;
322	}	357	}
323		358
		359	void
		360	archetype::post_load_check ()
		361	{
		362	assert (("obj_original MUST NOT be set for archetypes", !flag [FLAG_OBJ_ORIGINAL]));
		363
		364	if (type == SKILL)
		365	add_skill_archetype (this);
		366
		367	object::post_load_check ();
		368	}
		369
324	archetype *	370	archetype *
325	archetype::read (object_thawer &f)	371	archetype::read (object_thawer &f)
326	{	372	{
327	assert (f.kw == KW_object);	373	assert (f.kw == KW_object);
328		374
…		…
337	f.next ();	383	f.next ();
338		384
339	#if 0	385	#if 0
340	// implementing it here in the server does neither allow multiple inheritence	386	// 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,	387	// 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).	388	// and other resource files dynamically loaded (as opposed to being preprocessed).
343	// not that any of this is relevant as of yet...	389	// not that any of this is relevant as of yet...
344	if (f.kw == KW_inherit)	390	if (f.kw == KW_inherit)
345	{	391	{
346	if (archetype *at = find (f.get_str ()))	392	if (archetype *at = find (f.get_str ()))
347	*op = at->clone;	393	*op = at->clone;
…		…
404	goto fail;	450	goto fail;
405	}	451	}
406	}	452	}
407		453
408	// assemble new chain	454	// assemble new chain
409	new_head->min_x = new_head->max_x = new_head->x;	455	new_head->max_x = new_head->x;
410	new_head->min_y = new_head->max_y = new_head->y;
411		456
412	archetype *less = new_head;	457	archetype *less = new_head;
413	for (auto (p, parts.begin () + 1); p != parts.end (); ++p)	458	for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
414	{	459	{
415	archetype at = p;	460	archetype at = p;
416		461
417	// some flags get inherited formt he head (probably a lot more)	462	// some flags get inherited from the head (probably a lot more)
418	// doing it here doesn't feel too cozy, but it allows code	463	// doing it here doesn't feel too cozy, but it allows code
419	// to ignore head checks for these flags, which saves time	464	// to ignore head checks for these flags, which saves time
420	at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];	465	at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
421	at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];	466	at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
422	at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];	467	at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
423	at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];	468	at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
424		469
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;	470	new_head->max_x = max (new_head->max_x, at->x);
428	if (at->y > new_head->max_y) new_head->max_y = at->y;
429		471
430	at->head = new_head;	472	at->head = new_head;
431	less->more = at;	473	less->more = at;
432	less = at;	474	less = at;
433	}	475	}
…		…
437	return new_head;	479	return new_head;
438	}	480	}
439		481
440	fail:	482	fail:
441	for (auto (p, parts.begin ()); p != parts.end (); ++p)	483	for (auto (p, parts.begin ()); p != parts.end (); ++p)
442	(*p)->destroy (true);	484	(*p)->destroy ();
443		485
444	return 0;	486	return 0;
445	}	487	}
446		488
447	void	489	void
…		…
460	archetype at = p;	502	archetype at = p;
461		503
462	if (archetype *old = find (at->archname))	504	if (archetype *old = find (at->archname))
463	old->unlink ();	505	old->unlink ();
464		506
		507	allarch.push_back (at);
		508
465	at->link ();	509	at->link ();
		510	++dirtycnt;
466	}	511	}
467		512
468	postponed_arch.clear ();	513	postponed_arch.clear ();
469		514
470	// now resolve arch references	515	// now resolve arch references
…		…
482	postponed_arch_ref.clear ();	527	postponed_arch_ref.clear ();
483		528
484	empty = find (shstr_empty_archetype);	529	empty = find (shstr_empty_archetype);
485	}	530	}
486		531
487	/*	532	void
488	* Creates and returns a new object which is a copy of the given archetype.	533	archetype::gc ()
489	* This function returns NULL on failure.
490	*/
491	object *
492	arch_to_object (archetype *at)
493	{	534	{
494	if (!at)	535	int cnt = max (1, min (allarch.size () / 128, dirtycnt));
		536	dirtycnt = max (0, dirtycnt - cnt);
		537
		538	do
495	{	539	{
496	LOG (llevError, "Couldn't find archetype.\n");	540	static int idx;
		541
		542	if (idx >= allarch.size ())
		543	if (idx)
		544	idx = 0;
		545	else
497	return 0;	546	return;
498	}
499		547
500	object *op = at->clone ();	548	archetype *at = allarch [idx];
501	op->arch = at;
502	op->instantiate ();
503		549
504	return op;	550	if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
		551	++idx;
		552	else
		553	{
		554	//LOG (llevDebug, "garbage collect arch %s", &at->archname);
		555	assert (at->arch == at); // verify that refcnt == 1 is truly valid
		556	allarch.erase (idx);
		557
		558	// break chain
		559	for (object *op = at->head_ (); op; )
		560	{
		561	object *next = op->more;
		562	op->head = 0;
		563	op->more = 0;
		564	op = next;
		565	}
		566
		567	at->destroy ();
		568	at->arch = 0;
		569	}
		570	}
		571	while (--cnt);
505	}	572	}
506		573
507	object *	574	object *
508	archetype::instance ()	575	archetype::instance ()
509	{	576	{
510	return arch_to_object (this);	577	object *op = clone ();
511	}	578	op->instantiate ();
512
513	/*
514	* Creates an object. This function is called by get_archetype()
515	* if it fails to find the appropriate archetype.
516	* Thus get_archetype() will be guaranteed to always return
517	* an object, and never NULL.
518	*/
519	object *
520	create_singularity (const char *name)
521	{
522	LOG (llevError \| logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
523
524	if (!strcmp (name, "bug"))
525	abort ();
526
527	char buf[MAX_BUF];
528	sprintf (buf, "bug, please report (%s)", name);
529
530	object *op = get_archetype ("bug");
531	op->name = op->name_pl = buf;
532
533	return op;	579	return op;
534	}	580	}
		581
		582	//+GPL
535		583
536	/*	584	/*
537	* Finds which archetype matches the given name, and returns a new	585	* Finds which archetype matches the given name, and returns a new
538	* object containing a copy of the archetype.	586	* object containing a copy of the archetype.
539	*/	587	*/
540	object *	588	object *
541	get_archetype (const char *name)	589	get_archetype (const char *name)
542	{	590	{
		591	return archetype::get (name);
		592	}
		593
		594	object *
		595	archetype::get (const char *name)
		596	{
543	archetype *at = archetype::find (name);	597	archetype *at = find (name);
544		598
545	if (!at)	599	if (!at)
546	return create_singularity (name);	600	return create_singularity (name);
547		601
548	return arch_to_object (at);	602	return at->instance ();
549	}	603	}
550		604
551	/*	605	/*
552	* Returns the first archetype using the given type.	606	* Returns the first archetype using the given type.
553	* Used in treasure-generation.	607	* Used in treasure-generation.
554	*/	608	*/
555	archetype *	609	static archetype *
556	type_to_archetype (int type)	610	type_to_archetype (int type)
557	{	611	{
558	for_all_archetypes (at)	612	for_all_archetypes (at)
559	if (at->type == type && at->head_ () != at)	613	if (at->type == type && at->head_ () != at)
560	return at;	614	return at;
…		…
568	* Used in treasure-generation.	622	* Used in treasure-generation.
569	*/	623	*/
570	object *	624	object *
571	clone_arch (int type)	625	clone_arch (int type)
572	{	626	{
573	archetype *at;	627	archetype *at = type_to_archetype (type);
574		628
575	if ((at = type_to_archetype (type)) == NULL)	629	if (!at)
576	{	630	{
577	LOG (llevError, "Can't clone archetype %d\n", type);	631	LOG (llevError, "Can't clone archetype %d\n", type);
578	return 0;	632	return 0;
579	}	633	}
580		634
581	object *op = at->clone ();	635	return at->instance ();
582	op->instantiate ();
583	return op;
584	}	636	}
585		637
586	/*	638	/*
587	* member: make instance from class	639	* member: make instance from class
588	*/	640	*/
…		…
591	{	643	{
592	object op, prev = 0, *head = 0;	644	object op, prev = 0, *head = 0;
593		645
594	while (at)	646	while (at)
595	{	647	{
596	op = arch_to_object (at);	648	op = at->instance ();
597		649
598	op->x = at->x;	650	op->x = at->x;
599	op->y = at->y;	651	op->y = at->y;
600		652
601	if (head)	653	if (head)
…		…
609	}	661	}
610		662
611	return head;	663	return head;
612	}	664	}
613		665
		666	//-GPL
		667

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.73 by root, Sun Apr 20 00:44:12 2008 UTC vs. Revision 1.107 by root, Sat Apr 23 04:56:45 2011 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.73 by root, Sun Apr 20 00:44:12 2008 UTC vs.
Revision 1.107 by root, Sat Apr 23 04:56:45 2011 UTC