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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.50 by root, Mon Apr 16 13:02:28 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	/* 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 laoder etc. to suppress/request special processing
		34	archetype *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 *,
…		…
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
55	static std::vector<archetype *> archetypes;	52	static std::vector<archetype *> postponed_arch;
56		53
57	/**	54	/**
58	* GROS - This function retrieves an archetype given the name that appears	55	* GROS - This function retrieves an archetype given the name that appears
59	* during the game (for example, "writing pen" instead of "stylus").	56	* 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.	57	* It does not use the hashtable system, but browse the whole archlist each time.
…		…
68	archetype *	65	archetype *
69	find_archetype_by_object_name (const char *name)	66	find_archetype_by_object_name (const char *name)
70	{	67	{
71	shstr_cmp name_cmp (name);	68	shstr_cmp name_cmp (name);
72		69
73	for (archetype *at = first_archetype; at; at = at->next)	70	for_all_archetypes (at)
74	if (at->clone.name == name_cmp)	71	if (at->name == name_cmp)
75	return at;	72	return at;
76		73
77	return 0;	74	return 0;
78	}	75	}
79		76
…		…
85	archetype *	82	archetype *
86	find_archetype_by_object_type_name (int type, const char *name)	83	find_archetype_by_object_type_name (int type, const char *name)
87	{	84	{
88	shstr_cmp name_cmp (name);	85	shstr_cmp name_cmp (name);
89		86
90	for (archetype *at = first_archetype; at; at = at->next)	87	for_all_archetypes (at)
91	if (at->clone.name == name_cmp && at->clone.type == type)	88	if (at->name == name_cmp && at->type == type)
92	return at;	89	return at;
93		90
94	return 0;	91	return 0;
95	}	92	}
96		93
…		…
102	object *	99	object *
103	get_archetype_by_skill_name (const char *skill, int type)	100	get_archetype_by_skill_name (const char *skill, int type)
104	{	101	{
105	shstr_cmp skill_cmp (skill);	102	shstr_cmp skill_cmp (skill);
106		103
107	for (archetype *at = first_archetype; at; at = at->next)	104	for_all_archetypes (at)
108	if (at->clone.skill == skill_cmp && (type == -1 \|\| type == at->clone.type))	105	if (at->skill == skill_cmp && (type == -1 \|\| type == at->type))
109	return arch_to_object (at);	106	return arch_to_object (at);
110		107
111	return 0;	108	return 0;
112	}	109	}
113		110
…		…
119	* (eg, skills)	116	* (eg, skills)
120	*/	117	*/
121	archetype *	118	archetype *
122	get_archetype_by_type_subtype (int type, int subtype)	119	get_archetype_by_type_subtype (int type, int subtype)
123	{	120	{
124	for (archetype *at = first_archetype; at; at = at->next)	121	for_all_archetypes (at)
125	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))
126	return at;	123	return at;
127		124
128	return 0;	125	return 0;
129	}	126	}
130		127
…		…
157	}	154	}
158		155
159	return create_singularity (name);	156	return create_singularity (name);
160	}	157	}
161		158
162	/* 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
163	* a string seperated lists of things to match, with certain keywords.	160	* a string seperated lists of things to match, with certain keywords.
164	* pl is the player (only needed to set count properly)	161	* pl is the player (only needed to set count properly)
165	* 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
166	* 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
167	* (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
168	* value means a better match. 0 means no match.	165	* value means a better match. 0 means no match.
169	*	166	*
170	* Brief outline of the procedure:	167	* Brief outline of the procedure:
171	* We take apart the name variable into the individual components.	168	* We take apart the name variable into the individual components.
172	* cases for 'all' and unpaid are pretty obvious.	169	* cases for 'all' and unpaid are pretty obvious.
173	* 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
174	* player object.)	171	* player object.)
175	* If count is 1, make a quick check on the name.	172	* 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.	173	* IF count is >1, we need to make plural name. Return if match.
177	* Last, make a check on the full name.	174	* Last, make a check on the full name.
178	*/	175	*/
179	int	176	int
180	item_matched_string (object pl, object op, const char *name)	177	item_matched_string (object pl, object op, const char *name)
181	{	178	{
182	char *cp, local_name[MAX_BUF];	179	char *cp, local_name[MAX_BUF];
183	int count, retval = 0;	180	int count, retval = 0;
…		…
275	}	272	}
276		273
277	return 0;	274	return 0;
278	}	275	}
279		276
280	archetype::archetype ()	277	archetype::archetype (const char *name)
281	{	278	{
282	clone.arch = this;	279	arch = this;
283		280	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	}	281	}
287		282
288	archetype::~archetype ()	283	archetype::~archetype ()
289	{	284	{
290	//TODO: nuke ->more's	285	unlink ();
291	}	286	}
292		287
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	288	void
311	overwrite (archetype at, object op)	289	archetype::link ()
312	{	290	{
313	at->clone = *op;	291	ht.insert (std::make_pair (archname, this));
314
315	at->clone.arch = at;
316	at->clone.inv = op->inv; op->inv = 0;
317		292
318	op->destroy ();	293	if (!archetypes.contains (this))
		294	archetypes.insert (this);
319	}	295	}
320		296
321	bool	297	void
		298	archetype::unlink ()
		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	*/
		310	archetype *
		311	archetype::find (const char *name)
		312	{
		313	if (!name)
		314	return 0;
		315
		316	auto (i, ht.find (name));
		317
		318	if (i == ht.end ())
		319	return 0;
		320	else
		321	return i->second;
		322	}
		323
		324	archetype *
322	archetype::load (object_thawer &f)	325	archetype::read (object_thawer &f)
323	{	326	{
324	assert (f.kw == KW_object);	327	assert (f.kw == KW_object);
325		328
326	typedef std::pair<archetype , object > part;
327	std::vector<part> parts;	329	std::vector<archetype *> parts;
		330
		331	coroapi::cede_to_tick ();
328		332
329	for (;;)	333	for (;;)
330	{	334	{
331	archetype *at = get (f.get_str ());	335	archetype *at = new archetype (f.get_str ());
332	object *op = object::create ();
333		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
334	if (!op->parse_kv (f))	360	if (!parse_ok)
335	goto fail;	361	goto fail;
336		362
337	parts.push_back (std::make_pair (at, op));	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);
338		368
339	if (f.kw != KW_more)	369	if (f.kw != KW_more)
340	break;	370	break;
341		371
342	f.next ();	372	f.next ();
		373
343	assert (f.kw == KW_object);	374	if (f.kw != KW_object)
		375	{
		376	f.parse_error ("more object");
		377	goto fail;
		378	}
344	}	379	}
345		380
346	{	381	{
		382	auto (at, parts.begin ());
		383
347	archetype *head = parts.front ().first;	384	archetype *new_head = parts.front ();
		385	archetype *old_head = find (new_head->archname);
348		386
349	// check that all archetypes belong to the same object or are heads	387	if (old_head && !old_head->is_head ())
350	for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p)
351	{	388	{
352	archetype *at = p->first;	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	}
353		393
354	if (at->head != head && at->head)	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)
355	{	401	{
356	LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name);	402	LOG (llevError, "%s: unable to overwrite archetype '%s' with archetype of different object, skipping.\n",
357	goto fail;	403	&new_part->archname, &((archetype *)old_part->head_ ())->archname);
358	}
359
360	if (at->next && at != head)
361	{
362	LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
363	goto fail;	404	goto fail;
364	}	405	}
365	}	406	}
366		407
367	// sever chain of existing head object	408	// assemble new chain
368	for (archetype more, at = head; at; at = more)	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)
369	{	414	{
370	more = at->more;	415	archetype at = p;
371		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
372	at->head = 0;	430	at->head = new_head;
373	at->more = 0;	431	less->more = at;
		432	less = at;
374	}	433	}
375		434
376	// replace/update head	435	postponed_arch.insert (postponed_arch.end (), parts.begin (), parts.end ());
377	overwrite (head, parts.front ().second);
378	head->tail_x = 0;
379	head->tail_y = 0;
380		436
381	// link into list of heads, if not already there	437	return new_head;
382	if (!head->linked)
383	{
384	head->linked = true;
385	head->next = first_archetype;
386	first_archetype = head;
387	}
388
389	// reassemble new chain
390	archetype *prev = head;
391	for (AUTODECL (p, parts.begin () + 1); p != parts.end (); ++p)
392	{
393	archetype *at = p->first;
394	overwrite (at, p->second);
395
396	if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;
397	if (at->clone.y > head->tail_y) head->tail_y = at->clone.y;
398
399	at->head = head;
400	at->clone.head = &head->clone;
401	prev->more = at;
402	prev->clone.more = &at->clone;
403
404	prev = at;
405	}
406	}	438	}
407		439
408	return true;
409
410	fail:	440	fail:
411	for (AUTODECL (p, parts.begin ()); p != parts.end (); ++p)	441	for (auto (p, parts.begin ()); p != parts.end (); ++p)
412	p->second->destroy (true);	442	(*p)->destroy (true);
413		443
414	return false;
415	}
416
417	/*
418	* Reads/parses the archetype-file, and copies into a linked list
419	* of archetype-structures.
420	*/
421	static bool
422	load_archetypes (object_thawer &f)
423	{
424	for (;;)
425	{
426	switch (f.kw)
427	{
428	case KW_object:
429	loading_arch = true;
430	if (!archetype::load (f))
431	{
432	loading_arch = false;
433	return false;
434	}
435
436	loading_arch = false;
437	continue;
438
439	case KW_EOF:
440	return true;
441
442	default:
443	if (!f.parse_error ("archetypes file"))
444	return false;
445	}
446
447	f.next ();
448	}
449	}
450
451	/*
452	* First initialises the archtype hash-table (init_archetable()).
453	* Reads and parses the archetype file (with the first and second-pass
454	* functions).
455	*/
456	bool
457	load_archetype_file (const char *filename)
458	{
459	object_thawer f (filename);
460
461	f.next ();
462
463	// make sure the next - long - step is only done after a tick
464	coroapi::wait_for_tick_begin ();
465
466	if (!load_archetypes (f))
467	return false;
468
469	warn_archetypes = 1;
470
471	empty_archetype = archetype::find ("empty_archetype");
472	if (!empty_archetype)
473	return false;
474
475	coroapi::cede ();
476
477	return true;	444	return 0;
		445	}
		446
		447	void
		448	archetype::postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch)
		449	{
		450	ref = 0;
		451	postponed_arch_ref.push_back (std::pair<arch_ptr *, shstr>(&ref, shstr (other_arch)));
		452	}
		453
		454	void
		455	archetype::commit_load ()
		456	{
		457	// unlink old archetypes and link in new ones */
		458	for (auto (p, postponed_arch.begin ()); p != postponed_arch.end (); ++p)
		459	{
		460	archetype at = p;
		461
		462	if (archetype *old = find (at->archname))
		463	old->unlink ();
		464
		465	at->link ();
		466	}
		467
		468	postponed_arch.clear ();
		469
		470	// now resolve arch references
		471	for (auto (p, postponed_arch_ref.begin ()); p != postponed_arch_ref.end (); ++p)
		472	{
		473	arch_ptr *ap = p->first;
		474	archetype *at = find (p->second);
		475
		476	if (!at)
		477	LOG (llevError, "unable to resolve postponed arch reference to '%s'", &p->second);
		478
		479	*ap = at;
		480	}
		481
		482	postponed_arch_ref.clear ();
		483
		484	empty = find (shstr_empty_archetype);
478	}	485	}
479		486
480	/*	487	/*
481	* 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.
482	* This function returns NULL on failure.	489	* This function returns NULL on failure.
…		…
484	object *	491	object *
485	arch_to_object (archetype *at)	492	arch_to_object (archetype *at)
486	{	493	{
487	if (!at)	494	if (!at)
488	{	495	{
489	if (warn_archetypes)
490	LOG (llevError, "Couldn't find archetype.\n");	496	LOG (llevError, "Couldn't find archetype.\n");
491
492	return NULL;	497	return 0;
493	}	498	}
494		499
495	object *op = at->clone.clone ();	500	object *op = at->clone ();
496	op->arch = at;	501	op->arch = at;
497	op->instantiate ();	502	op->instantiate ();
		503
498	return op;	504	return op;
		505	}
		506
		507	object *
		508	archetype::instance ()
		509	{
		510	return arch_to_object (this);
499	}	511	}
500		512
501	/*	513	/*
502	* Creates an object. This function is called by get_archetype()	514	* Creates an object. This function is called by get_archetype()
503	* if it fails to find the appropriate archetype.	515	* if it fails to find the appropriate archetype.
…		…
505	* an object, and never NULL.	517	* an object, and never NULL.
506	*/	518	*/
507	object *	519	object *
508	create_singularity (const char *name)	520	create_singularity (const char *name)
509	{	521	{
510	object *op;	522	LOG (llevError \| logBacktrace, "FATAL: creating singularity for '%s'.\n", name);
		523
		524	if (!strcmp (name, "bug"))
		525	abort ();
		526
511	char buf[MAX_BUF];	527	char buf[MAX_BUF];
		528	sprintf (buf, "bug, please report (%s)", name);
512		529
513	sprintf (buf, "%s (%s)", ARCH_SINGULARITY, name);	530	object *op = get_archetype ("bug");
514	op = object::create ();
515	op->name = op->name_pl = buf;	531	op->name = op->name_pl = buf;
516	SET_FLAG (op, FLAG_NO_PICK);	532
517	return op;	533	return op;
518	}	534	}
519		535
520	/*	536	/*
521	* Finds which archetype matches the given name, and returns a new	537	* Finds which archetype matches the given name, and returns a new
…		…
531		547
532	return arch_to_object (at);	548	return arch_to_object (at);
533	}	549	}
534		550
535	/*	551	/*
536	* Finds, using the hashtable, which archetype matches the given name.
537	* returns a pointer to the found archetype, otherwise NULL.
538	*/
539	archetype *
540	archetype::find (const char *name)
541	{
542	if (!name)
543	return 0;
544
545	AUTODECL (i, ht.find (name));
546
547	if (i == ht.end ())
548	return 0;
549	else
550	return i->second;
551	}
552
553	archetype *
554	archetype::get (const char *name)
555	{
556	archetype *at = find (name);
557
558	if (!at)
559	{
560	archetypes.push_back (at = new archetype);
561	at->name = name;
562	at->hash_add ();
563	}
564
565	return at;
566	}
567
568	/*
569	* Adds an archetype to the hashtable.
570	*/
571	void
572	archetype::hash_add ()
573	{
574	ht.insert (std::make_pair (name, this));
575	}
576
577	void
578	archetype::hash_del ()
579	{
580	ht.erase (name);
581	}
582
583	/*
584	* Returns the first archetype using the given type.	552	* Returns the first archetype using the given type.
585	* Used in treasure-generation.	553	* Used in treasure-generation.
586	*/	554	*/
587	archetype *	555	archetype *
588	type_to_archetype (int type)	556	type_to_archetype (int type)
589	{	557	{
590	for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)	558	for_all_archetypes (at)
591	if (at->clone.type == type)	559	if (at->type == type && at->head_ () != at)
592	return at;	560	return at;
593		561
594	return 0;	562	return 0;
595	}	563	}
596		564
…		…
608	{	576	{
609	LOG (llevError, "Can't clone archetype %d\n", type);	577	LOG (llevError, "Can't clone archetype %d\n", type);
610	return 0;	578	return 0;
611	}	579	}
612		580
613	object *op = at->clone.clone ();	581	object *op = at->clone ();
614	op->instantiate ();	582	op->instantiate ();
615	return op;	583	return op;
616	}	584	}
617		585
618	/*	586	/*
619	* member: make instance from class	587	* member: make instance from class
620	*/	588	*/
621
622	object *	589	object *
623	object_create_arch (archetype *at)	590	object_create_arch (archetype *at)
624	{	591	{
625	object op, prev = 0, *head = 0;	592	object op, prev = 0, *head = 0;
626		593
627	while (at)	594	while (at)
628	{	595	{
629	op = arch_to_object (at);	596	op = arch_to_object (at);
		597
630	op->x = at->clone.x;	598	op->x = at->x;
631	op->y = at->clone.y;	599	op->y = at->y;
632		600
633	if (head)	601	if (head)
634	op->head = head, prev->more = op;	602	op->head = head, prev->more = op;
635		603
636	if (!head)	604	if (!head)
637	head = op;	605	head = op;
638		606
639	prev = op;	607	prev = op;
640	at = at->more;	608	at = (archetype *)at->more;
641	}	609	}
642		610
643	return (head);	611	return head;
644	}	612	}
645		613

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.50 by root, Mon Apr 16 13:02:28 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.50 by root, Mon Apr 16 13:02:28 2007 UTC vs.
Revision 1.73 by root, Sun Apr 20 00:44:12 2008 UTC