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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.52 by root, Tue Apr 17 10:06:32 2007 UTC vs.
Revision 1.74 by root, Sun Apr 20 05:24:55 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	/* The naming of these functions is really poor - they are all
35	* pretty much named '.._arch_...', but they may more may not
36	* return archetypes. Some make the arch_to_object call, and thus
37	* return an object. Perhaps those should be called 'archob' functions
38	* to denote they return an object derived from the archetype.
39	* MSW 2003-04-29
40	*/
41
42	bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing	33	archetype *loading_arch; // ugly flag to object loader etc. to suppress/request special processing
		34	arch_ptr archetype::empty;
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 *,
…		…
49	str_hash,	41	str_hash,
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 (10000);
		47	archvec archetypes;
		48	static unordered_vector<archetype *> allarch;
		49	static int dirtycnt;
		50
		51	// the vector of other_arch references to be resolved
		52	static std::vector< std::pair<arch_ptr *, shstr> > postponed_arch_ref;
		53	// the vector of loaded but not yet committed archetypes
55	static std::vector<archetype *> archetypes;	54	static std::vector<archetype *> postponed_arch;
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	{
282	clone.arch = this;	281	arch = this;
283		282	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	}	283	}
287		284
288	archetype::~archetype ()	285	archetype::~archetype ()
289	{	286	{
290	//TODO: nuke ->more's	287	unlink ();
291	}	288	}
292		289
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	290	void
311	overwrite (archetype at, object op)	291	archetype::link ()
312	{	292	{
313	at->clone = *op;	293	if (!archetypes.contains (this))
314		294	{
315	at->clone.arch = at;	295	archetypes.insert (this);
316	at->clone.inv = op->inv; op->inv = 0;	296	ht.insert (std::make_pair (archname, this));
317		297	}
318	op->destroy ();
319	}	298	}
320		299
321	bool	300	void
		301	archetype::unlink ()
		302	{
		303	if (archetypes.contains (this))
		304	{
		305	archetypes.erase (this);
		306	ht.erase (archname);
		307	}
		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)
		318	return 0;
		319
		320	auto (i, ht.find (name));
		321
		322	if (i == ht.end ())
		323	return 0;
		324	else
		325	return i->second;
		326	}
		327
		328	archetype *
322	archetype::load (object_thawer &f)	329	archetype::read (object_thawer &f)
323	{	330	{
324	assert (f.kw == KW_object);	331	assert (f.kw == KW_object);
325		332
326	typedef std::pair<archetype , object > part;
327	std::vector<part> parts;	333	std::vector<archetype *> parts;
328		334
329	coroapi::cede_to_tick_every (100);	335	coroapi::cede_to_tick ();
330		336
331	for (;;)	337	for (;;)
332	{	338	{
333	archetype *at = get (f.get_str ());	339	archetype *at = new archetype (f.get_str ());
334	object *op = object::create ();
335		340
		341	f.next ();
		342
		343	#if 0
		344	// implementing it here in the server does neither allow multiple inheritence
		345	// nor does it cleanly "just override". it would allow use in map files, though,
		346	// and other resource files dynamically laoded (as opposed to being preprocessed).
		347	// not that any of this is relevant as of yet...
		348	if (f.kw == KW_inherit)
		349	{
		350	if (archetype *at = find (f.get_str ()))
		351	*op = at->clone;
		352	else
		353	LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
		354	&at->archname, f.get_str ());
		355
		356	f.next ();
		357	}
		358	#endif
		359
		360	loading_arch = at; // hack to tell parse_kv et al. to behave
		361	bool parse_ok = at->parse_kv (f);
		362	loading_arch = 0;
		363
336	if (!op->parse_kv (f))	364	if (!parse_ok)
337	goto fail;	365	goto fail;
338		366
339	parts.push_back (std::make_pair (at, op));	367	loading_arch = at; // hack to tell parse_kv et al. to behave
		368	at->post_load_check ();
		369	loading_arch = 0;
		370
		371	parts.push_back (at);
340		372
341	if (f.kw != KW_more)	373	if (f.kw != KW_more)
342	break;	374	break;
343		375
344	f.next ();	376	f.next ();
		377
345	assert (f.kw == KW_object);	378	if (f.kw != KW_object)
		379	{
		380	f.parse_error ("more object");
		381	goto fail;
		382	}
346	}	383	}
347		384
348	{	385	{
		386	auto (at, parts.begin ());
		387
349	archetype *head = parts.front ().first;	388	archetype *new_head = parts.front ();
		389	archetype *old_head = find (new_head->archname);
350		390
351	// check that all archetypes belong to the same object or are heads	391	if (old_head && !old_head->is_head ())
352	for (auto (p, parts.begin ()); p != parts.end (); ++p)
353	{	392	{
354	archetype *at = p->first;	393	LOG (llevError, "%s: unable to overwrite non-head archetype '%s' with head archetype, skipping.\n",
		394	&new_head->archname, &old_head->archname);
		395	goto fail;
		396	}
355		397
356	if (at->head != head && at->head)	398	// check that all archetypes belong to the same old object or are new
		399	for (auto (at, parts.begin ()); at != parts.end (); ++at)
		400	{
		401	archetype new_part = at;
		402	archetype *old_part = find (new_part->archname);
		403
		404	if (old_part && old_part->head_ () != old_head)
357	{	405	{
358	LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name);	406	LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
359	goto fail;	407	&new_part->archname, &((archetype *)old_part->head_ ())->archname);
360	}
361
362	if (at->next && at != head)
363	{
364	LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
365	goto fail;	408	goto fail;
366	}	409	}
367	}	410	}
368		411
369	// sever chain of existing head object
370	for (archetype more, at = head; at; at = more)
371	{
372	more = at->more;
373
374	at->head = 0;
375	at->more = 0;
376	}
377
378	// replace/update head
379	overwrite (head, parts.front ().second);
380	head->tail_x = 0;
381	head->tail_y = 0;
382
383	// link into list of heads, if not already there
384	if (!head->linked)
385	{
386	head->linked = true;
387	head->next = first_archetype;
388	first_archetype = head;
389	}
390
391	// reassemble new chain	412	// assemble new chain
		413	new_head->min_x = new_head->max_x = new_head->x;
		414	new_head->min_y = new_head->max_y = new_head->y;
		415
392	archetype *prev = head;	416	archetype *less = new_head;
393	for (auto (p, parts.begin () + 1); p != parts.end (); ++p)	417	for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
394	{	418	{
395	archetype *at = p->first;	419	archetype at = p;
396	overwrite (at, p->second);
397		420
398	if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;	421	// some flags get inherited from the head (probably a lot more)
399	if (at->clone.y > head->tail_y) head->tail_y = at->clone.y;	422	// doing it here doesn't feel too cozy, but it allows code
		423	// to ignore head checks for these flags, which saves time
		424	at->flag [FLAG_ALIVE] = new_head->flag [FLAG_ALIVE];
		425	at->flag [FLAG_NO_PICK] = new_head->flag [FLAG_NO_PICK];
		426	at->flag [FLAG_MONSTER] = new_head->flag [FLAG_MONSTER];
		427	at->flag [FLAG_IS_FLOOR] = new_head->flag [FLAG_IS_FLOOR];
400		428
		429	new_head->min_x = min (new_head->min_x, at->x);
		430	new_head->min_y = min (new_head->min_y, at->y);
		431	new_head->max_x = max (new_head->max_x, at->x);
		432	new_head->max_y = max (new_head->max_y, at->y);
		433
401	at->head = head;	434	at->head = new_head;
402	at->clone.head = &head->clone;
403	prev->more = at;	435	less->more = at;
404	prev->clone.more = &at->clone;
405
406	prev = at;	436	less = at;
407	}	437	}
		438
		439	postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
		440
		441	return new_head;
408	}	442	}
409
410	return true;
411		443
412	fail:	444	fail:
413	for (auto (p, parts.begin ()); p != parts.end (); ++p)	445	for (auto (p, parts.begin ()); p != parts.end (); ++p)
414	p->second->destroy (true);	446	(*p)->destroy (true);
415		447
416	return false;	448	return 0;
417	}	449	}
418		450
419	/*	451	void
420	* Reads/parses the archetype-file, and copies into a linked list	452	archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
421	* of archetype-structures.
422	*/
423	static bool
424	load_archetypes (object_thawer &f)
425	{	453	{
426	for (;;)	454	ref = 0;
		455	postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
		456	}
		457
		458	void
		459	archetype::commit_load ()
		460	{
		461	// unlink old archetypes and link in new ones */
		462	for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p)
		463	{
		464	archetype at = p;
		465
		466	if (archetype *old = find (at->archname))
		467	old->unlink ();
		468
		469	allarch.push_back (at);
		470
		471	at->link ();
		472	++dirtycnt;
427	{	473	}
428	switch (f.kw)	474
		475	postponed_arch.clear ();
		476
		477	// now resolve arch references
		478	for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p)
		479	{
		480	arch_ptr *ap = p->first;
		481	archetype *at = find (p->second);
		482
		483	if (!at)
		484	LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second);
		485
		486	*ap = at;
		487	}
		488
		489	postponed_arch_ref.clear ();
		490
		491	empty = find (shstr_empty_archetype);
		492	}
		493
		494	void
		495	archetype::gc ()
		496	{
		497	int cnt = max (1, min (allarch.size () / 128, dirtycnt));
		498	dirtycnt = max (0, dirtycnt - cnt);
		499
		500	do
		501	{
		502	static int idx;
		503
		504	if (idx >= allarch.size ())
		505	if (idx)
		506	idx = 0;
		507	else
		508	return;
		509
		510	archetype *at = allarch [idx];
		511
		512	if (at->refcnt_cnt () > 1) // all arches have ONE refcount from their object
		513	++idx;
		514	else
429	{	515	{
430	case KW_object:	516	LOG (llevDebug, "garbage collect arch %s", at->debug_desc ());
431	loading_arch = true;	517	assert (at->arch == at); // verify that refcnt == 1 is truely valid
432	if (!archetype::load (f))	518	allarch.erase (idx);
433	{	519	at->arch = 0;
434	loading_arch = false;	520	at->more = 0;
435	return false;	521	at->destroy ();
436	}
437
438	loading_arch = false;
439	continue;
440
441	case KW_EOF:
442	return true;
443
444	default:
445	if (!f.parse_error ("archetypes file"))
446	return false;
447	}	522	}
448
449	f.next ();
450	}	523	}
451	}	524	while (--cnt);
452
453	/*
454	* First initialises the archtype hash-table (init_archetable()).
455	* Reads and parses the archetype file (with the first and second-pass
456	* functions).
457	*/
458	bool
459	load_archetype_file (const char *filename)
460	{
461	object_thawer f (filename);
462
463	f.next ();
464
465	if (!load_archetypes (f))
466	return false;
467
468	warn_archetypes = 1;
469
470	empty_archetype = archetype::find ("empty_archetype");
471	if (!empty_archetype)
472	return false;
473
474	return true;
475	}	525	}
476		526
477	/*	527	/*
478	* Creates and returns a new object which is a copy of the given archetype.	528	* Creates and returns a new object which is a copy of the given archetype.
479	* This function returns NULL on failure.	529	* This function returns NULL on failure.
…		…
481	object *	531	object *
482	arch_to_object (archetype *at)	532	arch_to_object (archetype *at)
483	{	533	{
484	if (!at)	534	if (!at)
485	{	535	{
486	if (warn_archetypes)
487	LOG (llevError, "Couldn't find archetype.\n");	536	LOG (llevError, "Couldn't find archetype.\n");
488
489	return NULL;	537	return 0;
490	}	538	}
491		539
492	object *op = at->clone.clone ();	540	object *op = at->clone ();
493	op->arch = at;	541	op->arch = at;
494	op->instantiate ();	542	op->instantiate ();
		543
495	return op;	544	return op;
		545	}
		546
		547	object *
		548	archetype::instance ()
		549	{
		550	return arch_to_object (this);
496	}	551	}
497		552
498	/*	553	/*
499	* Creates an object. This function is called by get_archetype()	554	* Creates an object. This function is called by get_archetype()
500	* if it fails to find the appropriate archetype.	555	* if it fails to find the appropriate archetype.
…		…
502	* an object, and never NULL.	557	* an object, and never NULL.
503	*/	558	*/
504	object *	559	object *
505	create_singularity (const char *name)	560	create_singularity (const char *name)
506	{	561	{
507	object *op;	562	LOG (llevError \| logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
		563
		564	if (!strcmp (name, "bug"))
		565	abort ();
		566
508	char buf[MAX_BUF];	567	char buf[MAX_BUF];
		568	sprintf (buf, "bug, please report (%s)", name);
509		569
510	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);	570	object *op = get_archetype ("bug");
511	op = object::create ();
512	op->name = op->name_pl = buf;	571	op->name = op->name_pl = buf;
513	SET_FLAG (op, FLAG_NO_PICK);	572
514	return op;	573	return op;
515	}	574	}
516		575
517	/*	576	/*
518	* Finds which archetype matches the given name, and returns a new	577	* Finds which archetype matches the given name, and returns a new
…		…
528		587
529	return arch_to_object (at);	588	return arch_to_object (at);
530	}	589	}
531		590
532	/*	591	/*
533	* Finds, using the hashtable, which archetype matches the given name.
534	* returns a pointer to the found archetype, otherwise NULL.
535	*/
536	archetype *
537	archetype::find (const char *name)
538	{
539	if (!name)
540	return 0;
541
542	auto (i, ht.find (name));
543
544	if (i == ht.end ())
545	return 0;
546	else
547	return i->second;
548	}
549
550	archetype *
551	archetype::get (const char *name)
552	{
553	archetype *at = find (name);
554
555	if (!at)
556	{
557	archetypes.push_back (at = new archetype);
558	at->name = name;
559	at->hash_add ();
560	}
561
562	return at;
563	}
564
565	/*
566	* Adds an archetype to the hashtable.
567	*/
568	void
569	archetype::hash_add ()
570	{
571	ht.insert (std::make_pair (name, this));
572	}
573
574	void
575	archetype::hash_del ()
576	{
577	ht.erase (name);
578	}
579
580	/*
581	* Returns the first archetype using the given type.	592	* Returns the first archetype using the given type.
582	* Used in treasure-generation.	593	* Used in treasure-generation.
583	*/	594	*/
584	archetype *	595	archetype *
585	type_to_archetype (int type)	596	type_to_archetype (int type)
586	{	597	{
587	for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)	598	for_all_archetypes (at)
588	if (at->clone.type == type)	599	if (at->type == type && at->head_ () != at)
589	return at;	600	return at;
590		601
591	return 0;	602	return 0;
592	}	603	}
593		604
…		…
605	{	616	{
606	LOG (llevError, "Can't clone archetype %d\n", type);	617	LOG (llevError, "Can't clone archetype %d\n", type);
607	return 0;	618	return 0;
608	}	619	}
609		620
610	object *op = at->clone.clone ();	621	object *op = at->clone ();
611	op->instantiate ();	622	op->instantiate ();
612	return op;	623	return op;
613	}	624	}
614		625
615	/*	626	/*
616	* member: make instance from class	627	* member: make instance from class
617	*/	628	*/
618
619	object *	629	object *
620	object_create_arch (archetype *at)	630	object_create_arch (archetype *at)
621	{	631	{
622	object op, prev = 0, *head = 0;	632	object op, prev = 0, *head = 0;
623		633
624	while (at)	634	while (at)
625	{	635	{
626	op = arch_to_object (at);	636	op = arch_to_object (at);
		637
627	op->x = at->clone.x;	638	op->x = at->x;
628	op->y = at->clone.y;	639	op->y = at->y;
629		640
630	if (head)	641	if (head)
631	op->head = head, prev->more = op;	642	op->head = head, prev->more = op;
632		643
633	if (!head)	644	if (!head)
634	head = op;	645	head = op;
635		646
636	prev = op;	647	prev = op;
637	at = at->more;	648	at = (archetype *)at->more;
638	}	649	}
639		650
640	return (head);	651	return head;
641	}	652	}
642		653

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.52 by root, Tue Apr 17 10:06:32 2007 UTC vs. Revision 1.74 by root, Sun Apr 20 05:24:55 2008 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.52 by root, Tue Apr 17 10:06:32 2007 UTC vs.
Revision 1.74 by root, Sun Apr 20 05:24:55 2008 UTC