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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.54 by root, Tue Apr 17 18:59:05 2007 UTC vs.
Revision 1.69 by root, Tue Sep 4 18:20:35 2007 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
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
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 <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	#include <cassert>	24	#include <cassert>
26		25
27	#include <global.h>	26	#include <global.h>
37	* return an object. Perhaps those should be called 'archob' functions	36	* return an object. Perhaps those should be called 'archob' functions
38	* to denote they return an object derived from the archetype.	37	* to denote they return an object derived from the archetype.
39	* MSW 2003-04-29	38	* MSW 2003-04-29
40	*/	39	*/
41		40
42	bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing	41	archetype *loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
43		42
44	// the hashtable	43	// the hashtable
45	typedef std::tr1::unordered_map	44	typedef std::tr1::unordered_map
46	<	45	<
47	const char *,	46	const char *,
…		…
50	str_equal,	49	str_equal,
51	slice_allocator< std::pair<const char *const, arch_ptr> >	50	slice_allocator< std::pair<const char *const, arch_ptr> >
52	> HT;	51	> HT;
53		52
54	static HT ht (5000);	53	static HT ht (5000);
55	static std::vector<archetype *> archetypes;	54	archvec archetypes;
56		55
57	/**	56	/**
58	* GROS - This function retrieves an archetype given the name that appears	57	* GROS - This function retrieves an archetype given the name that appears
59	* during the game (for example, "writing pen" instead of "stylus").	58	* during the game (for example, "writing pen" instead of "stylus").
60	* It does not use the hashtable system, but browse the whole archlist each time.	59	* It does not use the hashtable system, but browse the whole archlist each time.
…		…
68	archetype *	67	archetype *
69	find_archetype_by_object_name (const char *name)	68	find_archetype_by_object_name (const char *name)
70	{	69	{
71	shstr_cmp name_cmp (name);	70	shstr_cmp name_cmp (name);
72		71
73	for (archetype *at = first_archetype; at; at = at->next)	72	for_all_archetypes (at)
74	if (at->clone.name == name_cmp)	73	if (at->name == name_cmp)
75	return at;	74	return at;
76		75
77	return 0;	76	return 0;
78	}	77	}
79		78
…		…
85	archetype *	84	archetype *
86	find_archetype_by_object_type_name (int type, const char *name)	85	find_archetype_by_object_type_name (int type, const char *name)
87	{	86	{
88	shstr_cmp name_cmp (name);	87	shstr_cmp name_cmp (name);
89		88
90	for (archetype *at = first_archetype; at; at = at->next)	89	for_all_archetypes (at)
91	if (at->clone.name == name_cmp && at->clone.type == type)	90	if (at->name == name_cmp && at->type == type)
92	return at;	91	return at;
93		92
94	return 0;	93	return 0;
95	}	94	}
96		95
…		…
102	object *	101	object *
103	get_archetype_by_skill_name (const char *skill, int type)	102	get_archetype_by_skill_name (const char *skill, int type)
104	{	103	{
105	shstr_cmp skill_cmp (skill);	104	shstr_cmp skill_cmp (skill);
106		105
107	for (archetype *at = first_archetype; at; at = at->next)	106	for_all_archetypes (at)
108	if (at->clone.skill == skill_cmp && (type == -1 \|\| type == at->clone.type))	107	if (at->skill == skill_cmp && (type == -1 \|\| type == at->type))
109	return arch_to_object (at);	108	return arch_to_object (at);
110		109
111	return 0;	110	return 0;
112	}	111	}
113		112
…		…
119	* (eg, skills)	118	* (eg, skills)
120	*/	119	*/
121	archetype *	120	archetype *
122	get_archetype_by_type_subtype (int type, int subtype)	121	get_archetype_by_type_subtype (int type, int subtype)
123	{	122	{
124	for (archetype *at = first_archetype; at; at = at->next)	123	for_all_archetypes (at)
125	if ((type == -1 \|\| type == at->clone.type) && (subtype == -1 \|\| subtype == at->clone.subtype))	124	if ((type == -1 \|\| type == at->type) && (subtype == -1 \|\| subtype == at->subtype))
126	return at;	125	return at;
127		126
128	return 0;	127	return 0;
129	}	128	}
130		129
…		…
157	}	156	}
158		157
159	return create_singularity (name);	158	return create_singularity (name);
160	}	159	}
161		160
162	/* This is a subset of the parse_id command. Basically, name can be	161	/* This is a subset of the parse_id command. Basically, name can be
163	* a string seperated lists of things to match, with certain keywords.	162	* a string seperated lists of things to match, with certain keywords.
164	* pl is the player (only needed to set count properly)	163	* pl is the player (only needed to set count properly)
165	* op is the item we are trying to match. Calling function takes care	164	* op is the item we are trying to match. Calling function takes care
166	* of what action might need to be done and if it is valid	165	* of what action might need to be done and if it is valid
167	* (pickup, drop, etc.) Return NONZERO if we have a match. A higher	166	* (pickup, drop, etc.) Return NONZERO if we have a match. A higher
168	* value means a better match. 0 means no match.	167	* value means a better match. 0 means no match.
169	*	168	*
170	* Brief outline of the procedure:	169	* Brief outline of the procedure:
171	* We take apart the name variable into the individual components.	170	* We take apart the name variable into the individual components.
172	* cases for 'all' and unpaid are pretty obvious.	171	* cases for 'all' and unpaid are pretty obvious.
173	* Next, we check for a count (either specified in name, or in the	172	* Next, we check for a count (either specified in name, or in the
174	* player object.)	173	* player object.)
175	* If count is 1, make a quick check on the name.	174	* If count is 1, make a quick check on the name.
176	* IF count is >1, we need to make plural name. Return if match.	175	* IF count is >1, we need to make plural name. Return if match.
177	* Last, make a check on the full name.	176	* Last, make a check on the full name.
178	*/	177	*/
179	int	178	int
180	item_matched_string (object pl, object op, const char *name)	179	item_matched_string (object pl, object op, const char *name)
181	{	180	{
182	char *cp, local_name[MAX_BUF];	181	char *cp, local_name[MAX_BUF];
183	int count, retval = 0;	182	int count, retval = 0;
…		…
275	}	274	}
276		275
277	return 0;	276	return 0;
278	}	277	}
279		278
280	archetype::archetype ()	279	archetype::archetype (const char *name)
281	{	280	{
		281	stub = true;
282	clone.arch = this;	282	arch = this;
283		283	this->archname = this->name = this->name_pl = name;
284	CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
285	SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
286	}	284	}
287		285
288	archetype::~archetype ()	286	archetype::~archetype ()
289	{	287	{
290	//TODO: nuke ->more's	288	unlink ();
291	}	289	}
292		290
293	static void
294	unlink (archetype *at)
295	{
296	if (at->head)
297	at = at->head;
298
299	// destroy this archetype's link, making singletons out of its parts
300	while (at)
301	{
302	archetype *more = at->more;
303	at->clone.destroy_inv ();
304	at->head = at->more = 0;
305	at = more;
306	}
307	}
308
309	// dire hack, need to rationalise
310	void	291	void
311	overwrite (archetype at, object op)	292	archetype::link ()
312	{	293	{
313	at->clone = *op;	294	ht.insert (std::make_pair (archname, this));
314
315	at->clone.arch = at;
316	at->clone.inv = op->inv; op->inv = 0;
317		295
318	op->destroy ();	296	if (!archetypes.contains (this))
		297	archetypes.insert (this);
		298	}
		299
		300	void
		301	archetype::unlink ()
		302	{
		303	ht.erase (archname);
		304
		305	if (archetypes.contains (this))
		306	archetypes.erase (this);
		307	}
		308
		309	/*
		310	* Finds, using the hashtable, which archetype matches the given name.
		311	* returns a pointer to the found archetype, otherwise NULL.
		312	*/
		313	archetype *
		314	archetype::find (const char *name)
		315	{
		316	if (!name)
		317	return 0;
		318
		319	auto (i, ht.find (name));
		320
		321	if (i == ht.end ())
		322	return 0;
		323	else
		324	return i->second;
		325	}
		326
		327	archetype *
		328	archetype::get (const char *name)
		329	{
		330	if (!name)
		331	{
		332	LOG (llevError, "null archetype requested\n");
		333	name = "(null)";
		334	}
		335
		336	if (loading_arch && !strcmp (&loading_arch->archname, name))
		337	return loading_arch;
		338
		339	archetype *at = find (name);
		340
		341	if (!at)
		342	{
		343	at = new archetype (name);
		344	at->link ();
		345	}
		346
		347	return at;
319	}	348	}
320		349
321	archetype *	350	archetype *
322	archetype::read (object_thawer &f)	351	archetype::read (object_thawer &f)
323	{	352	{
324	assert (f.kw == KW_object);	353	assert (f.kw == KW_object);
325		354
326	loading_arch = true; // hack to tell parse_kv et al. to behave
327
328	typedef std::pair<archetype , object > part;
329	std::vector<part> parts;	355	std::vector<archetype *> parts;
330		356
331	coroapi::cede_to_tick_every (100);	357	coroapi::cede_to_tick_every (10);
332		358
333	for (;;)	359	for (;;)
334	{	360	{
335	object *op = object::create ();	361	// the archetype might have been referenced earlier
		362	// so try to find an existing stub archetype first
336	archetype *at = get (f.get_str ());	363	archetype *at = find (f.get_str ());
337	f.get (op->name);	364
		365	if (!at \|\| !at->stub)
		366	at = new archetype (f.get_str ());
		367
338	f.next ();	368	f.next ();
339		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	loading_arch = at; // hack to tell parse_kv et al. to behave
		388	bool parse_ok = at->parse_kv (f);
		389	loading_arch = 0;
		390
340	if (!op->parse_kv (f))	391	if (!parse_ok)
341	goto fail;	392	goto fail;
342		393
343	parts.push_back (std::make_pair (at, op));	394	loading_arch = at; // hack to tell parse_kv et al. to behave
		395	at->post_load_check ();
		396	loading_arch = 0;
		397
		398	parts.push_back (at);
344		399
345	if (f.kw != KW_more)	400	if (f.kw != KW_more)
346	break;	401	break;
347		402
348	f.next ();	403	f.next ();
…		…
353	goto fail;	408	goto fail;
354	}	409	}
355	}	410	}
356		411
357	{	412	{
		413	auto (at, parts.begin ());
		414
358	archetype *head = parts.front ().first;	415	archetype *new_head = parts.front ();
		416	archetype *old_head = find (new_head->archname);
359		417
360	// check that all archetypes belong to the same object or are heads	418	if (old_head && !old_head->is_head ())
361	for (auto (p, parts.begin ()); p != parts.end (); ++p)
362	{	419	{
363	archetype *at = p->first;	420	LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
		421	&new_head->archname, &old_head->archname);
		422	goto fail;
		423	}
364		424
365	if (at->head != head && at->head)	425	// check that all archetypes belong to the same old object or are new
		426	for (auto (at, parts.begin ()); at != parts.end (); ++at)
		427	{
		428	archetype new_part = at;
		429	archetype *old_part = find (new_part->archname);
		430
		431	if (old_part && old_part->head_ () != old_head)
366	{	432	{
367	LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name);	433	LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
368	goto fail;	434	&new_part->archname, &((archetype *)old_part->head_ ())->archname);
369	}
370
371	if (at->next && at != head)
372	{
373	LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
374	goto fail;	435	goto fail;
375	}	436	}
376	}	437	}
377		438
378	// sever chain of existing head object	439	// deactivate existing archetype
379	for (archetype more, at = head; at; at = more)	440	for (archetype at = old_head; at; at = (archetype )at->more)
380	{	441	at->unlink ();
381	more = at->more;
382		442
383	at->head = 0;
384	at->more = 0;
385	}
386
387	// replace/update head
388	overwrite (head, parts.front ().second);
389	head->tail_x = 0;
390	head->tail_y = 0;
391
392	// link into list of heads, if not already there
393	if (!head->linked)
394	{
395	head->linked = true;
396	head->next = first_archetype;
397	first_archetype = head;
398	}
399
400	// reassemble new chain	443	// assemble new chain
		444	new_head->min_x = new_head->max_x = new_head->x;
		445	new_head->min_y = new_head->max_y = new_head->y;
		446
401	archetype *prev = head;	447	archetype *less = new_head;
402	for (auto (p, parts.begin () + 1); p != parts.end (); ++p)	448	for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
403	{	449	{
404	archetype *at = p->first;	450	archetype at = p;
405	overwrite (at, p->second);
406		451
407	if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;	452	// some flags get inherited formt he head (probably a lot more)
408	if (at->clone.y > head->tail_y) head->tail_y = at->clone.y;	453	// doing it here doesn't feel too cozy, but it allows code
		454	// to ignore head checks for these flags, which saves time
		455	at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
		456	at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
		457	at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
		458	at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
409		459
		460	if (at->x < new_head->min_x) new_head->min_x = at->x;
		461	if (at->y < new_head->min_y) new_head->min_y = at->y;
		462	if (at->x > new_head->max_x) new_head->max_x = at->x;
		463	if (at->y > new_head->max_y) new_head->max_y = at->y;
		464
410	at->head = head;	465	at->head = new_head;
411	at->clone.head = &head->clone;
412	prev->more = at;	466	less->more = at;
413	prev->clone.more = &at->clone;
414
415	prev = at;	467	less = at;
416	}	468	}
417		469
418	loading_arch = false;	470	// now activate it
		471	for (auto (p, parts.begin ()); p != parts.end (); ++p)
		472	{
		473	archetype at = p;
		474	at->stub = false;
		475	at->link ();
		476	}
		477
419	return head;	478	return new_head;
420	}	479	}
421		480
422	fail:	481	fail:
423	for (auto (p, parts.begin ()); p != parts.end (); ++p)	482	for (auto (p, parts.begin ()); p != parts.end (); ++p)
424	p->second->destroy (true);	483	(*p)->destroy (true);
425		484
426	loading_arch = false;
427	return 0;	485	return 0;
428	}	486	}
429		487
430	/*	488	/*
431	* Initialize global archtype pointers:	489	* Initialize global archtype pointers:
…		…
451	{	509	{
452	LOG (llevError, "Couldn't find archetype.\n");	510	LOG (llevError, "Couldn't find archetype.\n");
453	return 0;	511	return 0;
454	}	512	}
455		513
456	object *op = at->clone.clone ();	514	object *op = at->clone ();
457	op->arch = at;	515	op->arch = at;
458	op->instantiate ();	516	op->instantiate ();
459		517
460	return op;	518	return op;
461	}	519	}
…		…
467	* an object, and never NULL.	525	* an object, and never NULL.
468	*/	526	*/
469	object *	527	object *
470	create_singularity (const char *name)	528	create_singularity (const char *name)
471	{	529	{
472	object *op;	530	LOG (llevError \| logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
		531
		532	if (!strcmp (name, "bug"))
		533	abort ();
		534
473	char buf[MAX_BUF];	535	char buf[MAX_BUF];
		536	sprintf (buf, "bug, please report (%s)", name);
474		537
475	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);	538	object *op = get_archetype ("bug");
476	op = object::create ();
477	op->name = op->name_pl = buf;	539	op->name = op->name_pl = buf;
478	SET_FLAG (op, FLAG_NO_PICK);	540
479	return op;	541	return op;
480	}	542	}
481		543
482	/*	544	/*
483	* Finds which archetype matches the given name, and returns a new	545	* Finds which archetype matches the given name, and returns a new
…		…
493		555
494	return arch_to_object (at);	556	return arch_to_object (at);
495	}	557	}
496		558
497	/*	559	/*
498	* Finds, using the hashtable, which archetype matches the given name.
499	* returns a pointer to the found archetype, otherwise NULL.
500	*/
501	archetype *
502	archetype::find (const char *name)
503	{
504	if (!name)
505	return 0;
506
507	auto (i, ht.find (name));
508
509	if (i == ht.end ())
510	return 0;
511	else
512	return i->second;
513	}
514
515	archetype *
516	archetype::get (const char *name)
517	{
518	archetype *at = find (name);
519
520	if (!at)
521	{
522	archetypes.push_back (at = new archetype);
523	at->name = name;
524	at->hash_add ();
525	}
526
527	return at;
528	}
529
530	/*
531	* Adds an archetype to the hashtable.
532	*/
533	void
534	archetype::hash_add ()
535	{
536	ht.insert (std::make_pair (name, this));
537	}
538
539	void
540	archetype::hash_del ()
541	{
542	ht.erase (name);
543	}
544
545	/*
546	* Returns the first archetype using the given type.	560	* Returns the first archetype using the given type.
547	* Used in treasure-generation.	561	* Used in treasure-generation.
548	*/	562	*/
549	archetype *	563	archetype *
550	type_to_archetype (int type)	564	type_to_archetype (int type)
551	{	565	{
552	for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)	566	for_all_archetypes (at)
553	if (at->clone.type == type)	567	if (at->type == type && at->head_ () != at)
554	return at;	568	return at;
555		569
556	return 0;	570	return 0;
557	}	571	}
558		572
…		…
570	{	584	{
571	LOG (llevError, "Can't clone archetype %d\n", type);	585	LOG (llevError, "Can't clone archetype %d\n", type);
572	return 0;	586	return 0;
573	}	587	}
574		588
575	object *op = at->clone.clone ();	589	object *op = at->clone ();
576	op->instantiate ();	590	op->instantiate ();
577	return op;	591	return op;
578	}	592	}
579		593
580	/*	594	/*
581	* member: make instance from class	595	* member: make instance from class
582	*/	596	*/
583
584	object *	597	object *
585	object_create_arch (archetype *at)	598	object_create_arch (archetype *at)
586	{	599	{
587	object op, prev = 0, *head = 0;	600	object op, prev = 0, *head = 0;
588		601
589	while (at)	602	while (at)
590	{	603	{
591	op = arch_to_object (at);	604	op = arch_to_object (at);
		605
592	op->x = at->clone.x;	606	op->x = at->x;
593	op->y = at->clone.y;	607	op->y = at->y;
594		608
595	if (head)	609	if (head)
596	op->head = head, prev->more = op;	610	op->head = head, prev->more = op;
597		611
598	if (!head)	612	if (!head)
599	head = op;	613	head = op;
600		614
601	prev = op;	615	prev = op;
602	at = at->more;	616	at = (archetype *)at->more;
603	}	617	}
604		618
605	return (head);	619	return head;
606	}	620	}
607		621

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.54 by root, Tue Apr 17 18:59:05 2007 UTC vs. Revision 1.69 by root, Tue Sep 4 18:20:35 2007 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.54 by root, Tue Apr 17 18:59:05 2007 UTC vs.
Revision 1.69 by root, Tue Sep 4 18:20:35 2007 UTC