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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.38 by root, Fri Feb 2 21:50:43 2007 UTC vs.
Revision 1.52 by root, Tue Apr 17 10:06:32 2007 UTC

…		…
29	#include <loader.h>	29	#include <loader.h>
30		30
31	#include <tr1/functional>	31	#include <tr1/functional>
32	#include <tr1/unordered_map>	32	#include <tr1/unordered_map>
33		33
34	int arch_init; /* True if doing arch initialization */
35
36	/* The naming of these functions is really poor - they are all	34	/* The naming of these functions is really poor - they are all
37	* pretty much named '.._arch_...', but they may more may not	35	* pretty much named '.._arch_...', but they may more may not
38	* return archetypes. Some make the arch_to_object call, and thus	36	* return archetypes. Some make the arch_to_object call, and thus
39	* return an object. Perhaps those should be called 'archob' functions	37	* return an object. Perhaps those should be called 'archob' functions
40	* to denote they return an object derived from the archetype.	38	* to denote they return an object derived from the archetype.
41	* MSW 2003-04-29	39	* MSW 2003-04-29
42	*/	40	*/
		41
		42	bool loading_arch; // ugly flag to object laoder etc. to suppress/request special processing
43		43
44	// the hashtable	44	// the hashtable
45	typedef std::tr1::unordered_map	45	typedef std::tr1::unordered_map
46	<	46	<
47	const char *,	47	const char *,
…		…
50	str_equal,	50	str_equal,
51	slice_allocator< std::pair<const char *const, arch_ptr> >	51	slice_allocator< std::pair<const char *const, arch_ptr> >
52	> HT;	52	> HT;
53		53
54	static HT ht (5000);	54	static HT ht (5000);
		55	static std::vector<archetype *> archetypes;
55		56
56	/**	57	/**
57	* GROS - This function retrieves an archetype given the name that appears	58	* GROS - This function retrieves an archetype given the name that appears
58	* during the game (for example, "writing pen" instead of "stylus").	59	* 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.	60	* It does not use the hashtable system, but browse the whole archlist each time.
…		…
65	* - the archetype found or null if nothing was found.	66	* - the archetype found or null if nothing was found.
66	*/	67	*/
67	archetype *	68	archetype *
68	find_archetype_by_object_name (const char *name)	69	find_archetype_by_object_name (const char *name)
69	{	70	{
70	archetype *at;	71	shstr_cmp name_cmp (name);
71		72
72	if (name == NULL)
73	return (archetype *) NULL;
74
75	for (at = first_archetype; at != NULL; at = at->next)	73	for (archetype *at = first_archetype; at; at = at->next)
76	{	74	if (at->clone.name == name_cmp)
77	if (!strcmp (at->clone.name, name))
78	return at;	75	return at;
79	}	76
80	return NULL;	77	return 0;
81	}	78	}
82		79
83	/**	80	/**
84	* This function retrieves an archetype by type and name that appears during	81	* This function retrieves an archetype by type and name that appears during
85	* the game. It is basically the same as find_archetype_by_object_name()	82	* the game. It is basically the same as find_archetype_by_object_name()
86	* except that it considers only items of the given type.	83	* except that it considers only items of the given type.
87	*/	84	*/
88	archetype *	85	archetype *
89	find_archetype_by_object_type_name (int type, const char *name)	86	find_archetype_by_object_type_name (int type, const char *name)
90	{	87	{
91	archetype *at;	88	shstr_cmp name_cmp (name);
92		89
93	if (name == NULL)
94	return NULL;
95
96	for (at = first_archetype; at != NULL; at = at->next)	90	for (archetype *at = first_archetype; at; at = at->next)
97	{	91	if (at->clone.name == name_cmp && at->clone.type == type)
98	if (at->clone.type == type && strcmp (at->clone.name, name) == 0)
99	return at;	92	return at;
100	}
101		93
102	return NULL;	94	return 0;
103	}	95	}
104		96
105	/* This is a lot like the above function. Instead, we are trying to match	97	/* This is a lot like the above function. Instead, we are trying to match
106	* the arch->skill values. type is the type of object to match	98	* the arch->skill values. type is the type of object to match
107	* against (eg, to only match against skills or only skill objects for example).	99	* against (eg, to only match against skills or only skill objects for example).
108	* If type is -1, ew don't match on type.	100	* If type is -1, ew don't match on type.
109	*/	101	*/
110	object *	102	object *
111	get_archetype_by_skill_name (const char *skill, int type)	103	get_archetype_by_skill_name (const char *skill, int type)
112	{	104	{
113	archetype *at;	105	shstr_cmp skill_cmp (skill);
114		106
115	if (skill)
116	for (at = first_archetype; at; at = at->next)	107	for (archetype *at = first_archetype; at; at = at->next)
117	if (((type == -1) \|\| (type == at->clone.type)) && (!strcmp (at->clone.skill, skill)))	108	if (at->clone.skill == skill_cmp && (type == -1 \|\| type == at->clone.type))
118	return arch_to_object (at);	109	return arch_to_object (at);
119		110
120	return 0;	111	return 0;
121	}	112	}
122		113
123	/* similiar to above - this returns the first archetype	114	/* similiar to above - this returns the first archetype
…		…
128	* (eg, skills)	119	* (eg, skills)
129	*/	120	*/
130	archetype *	121	archetype *
131	get_archetype_by_type_subtype (int type, int subtype)	122	get_archetype_by_type_subtype (int type, int subtype)
132	{	123	{
133	archetype *
134	at;
135
136	for (at = first_archetype; at != NULL; at = at->next)	124	for (archetype *at = first_archetype; at; at = at->next)
137	{
138	if (((type == -1) \|\| (type == at->clone.type)) && (subtype == -1 \|\| subtype == at->clone.subtype))	125	if ((type == -1 \|\| type == at->clone.type) && (subtype == -1 \|\| subtype == at->clone.subtype))
139	return at;	126	return at;
140	}	127
141	return NULL;	128	return 0;
142	}	129	}
143		130
144	/**	131	/**
145	* GROS - this returns a new object given the name that appears during the game	132	* GROS - this returns a new object given the name that appears during the game
146	* (for example, "writing pen" instead of "stylus").	133	* (for example, "writing pen" instead of "stylus").
…		…
154	* but it otherwise had a big memory leak.	141	* but it otherwise had a big memory leak.
155	*/	142	*/
156	object *	143	object *
157	get_archetype_by_object_name (const char *name)	144	get_archetype_by_object_name (const char *name)
158	{	145	{
159	archetype *at;
160	char tmpname[MAX_BUF];	146	char tmpname[MAX_BUF];
161	int i;	147	int i;
162		148
163	assign (tmpname, name);	149	assign (tmpname, name);
164		150
165	for (i = strlen (tmpname); i > 0; i--)	151	for (i = strlen (tmpname); i > 0; i--)
166	{	152	{
167	tmpname[i] = 0;	153	tmpname[i] = 0;
		154
168	at = find_archetype_by_object_name (tmpname);	155	if (archetype *at = find_archetype_by_object_name (tmpname))
169
170	if (at)
171	return arch_to_object (at);	156	return arch_to_object (at);
172	}	157	}
173		158
174	return create_singularity (name);	159	return create_singularity (name);
175	}	160	}
…		…
195	item_matched_string (object pl, object op, const char *name)	180	item_matched_string (object pl, object op, const char *name)
196	{	181	{
197	char *cp, local_name[MAX_BUF];	182	char *cp, local_name[MAX_BUF];
198	int count, retval = 0;	183	int count, retval = 0;
199		184
200	strcpy (local_name, name); /* strtok is destructive to name */	185	assign (local_name, name); /* strtok is destructive to name */
201		186
202	for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))	187	for (cp = strtok (local_name, ","); cp; cp = strtok (NULL, ","))
203	{	188	{
204	while (cp[0] == ' ')	189	while (cp[0] == ' ')
205	++cp; /* get rid of spaces */	190	++cp; /* get rid of spaces */
…		…
290	}	275	}
291		276
292	return 0;	277	return 0;
293	}	278	}
294		279
295	/*
296	* Initialises the internal linked list of archetypes (read from file).
297	* Then the global "empty_archetype" pointer is initialised.
298	* Then the blocksview[] array is initialised.
299	*/
300
301	void
302	init_archetypes (void)
303	{ /* called from add_player() and edit() */
304	if (first_archetype != NULL) /* Only do this once */
305	return;
306
307	arch_init = 1;
308	load_archetypes ();
309	arch_init = 0;
310	empty_archetype = archetype::find ("empty_archetype");
311
312	/* init_blocksview();*/
313	}
314
315	/*
316	* An alternative way to init the hashtable which is slower, but _works_...
317	*/
318	void
319	init_archetable (void)
320	{
321	archetype *at;
322
323	LOG (llevDebug, " Setting up archetable...\n");
324
325	for (at = first_archetype; at; at = at->more ? at->more : at->next)
326	at->hash_add ();
327
328	LOG (llevDebug, "done\n");
329	}
330
331	void
332	free_all_archs (void)
333	{
334	archetype at, next;
335	int i = 0, f = 0;
336
337	for (at = first_archetype; at; at = next)
338	{
339	if (at->more)
340	next = at->more;
341	else
342	next = at->next;
343
344	delete
345	at;
346
347	i++;
348	}
349
350	LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
351	}
352
353	archetype::archetype ()	280	archetype::archetype ()
354	{	281	{
		282	clone.arch = this;
		283
355	CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */	284	CLEAR_FLAG (&clone, FLAG_FREED); /* This shouldn't matter, since copy_to */
356	SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */	285	SET_FLAG (&clone, FLAG_REMOVED); /* doesn't copy these flags... */
357	}	286	}
358		287
359	archetype::~archetype ()	288	archetype::~archetype ()
360	{	289	{
		290	//TODO: nuke ->more's
		291	}
		292
		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
		311	overwrite (archetype at, object op)
		312	{
		313	at->clone = *op;
		314
		315	at->clone.arch = at;
		316	at->clone.inv = op->inv; op->inv = 0;
		317
		318	op->destroy ();
		319	}
		320
		321	bool
		322	archetype::load (object_thawer &f)
		323	{
		324	assert (f.kw == KW_object);
		325
		326	typedef std::pair<archetype , object > part;
		327	std::vector<part> parts;
		328
		329	coroapi::cede_to_tick_every (100);
		330
		331	for (;;)
		332	{
		333	archetype *at = get (f.get_str ());
		334	object *op = object::create ();
		335
		336	if (!op->parse_kv (f))
		337	goto fail;
		338
		339	parts.push_back (std::make_pair (at, op));
		340
		341	if (f.kw != KW_more)
		342	break;
		343
		344	f.next ();
		345	assert (f.kw == KW_object);
		346	}
		347
		348	{
		349	archetype *head = parts.front ().first;
		350
		351	// check that all archetypes belong to the same object or are heads
		352	for (auto (p, parts.begin ()); p != parts.end (); ++p)
		353	{
		354	archetype *at = p->first;
		355
		356	if (at->head != head && at->head)
		357	{
		358	LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name);
		359	goto fail;
		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;
		366	}
		367	}
		368
		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
		392	archetype *prev = head;
		393	for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
		394	{
		395	archetype *at = p->first;
		396	overwrite (at, p->second);
		397
		398	if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;
		399	if (at->clone.y > head->tail_y) head->tail_y = at->clone.y;
		400
		401	at->head = head;
		402	at->clone.head = &head->clone;
		403	prev->more = at;
		404	prev->clone.more = &at->clone;
		405
		406	prev = at;
		407	}
		408	}
		409
		410	return true;
		411
		412	fail:
		413	for (auto (p, parts.begin ()); p != parts.end (); ++p)
		414	p->second->destroy (true);
		415
		416	return false;
361	}	417	}
362		418
363	/*	419	/*
364	* Reads/parses the archetype-file, and copies into a linked list	420	* Reads/parses the archetype-file, and copies into a linked list
365	* of archetype-structures.	421	* of archetype-structures.
366	*/	422	*/
367	void	423	static bool
368	first_arch_pass (object_thawer & fp)	424	load_archetypes (object_thawer &f)
369	{	425	{
370	archetype head = 0, last_more = 0;	426	for (;;)
371
372	archetype *at = new archetype;
373	at->clone.arch = first_archetype = at;
374
375	while (int i = load_object (fp, &at->clone, 0))
376	{	427	{
377	at->clone.speed_left = (float) (-0.1);
378	/* copy the body_info to the body_used - this is only really
379	* need for monsters, but doesn't hurt to do it for everything.
380	* by doing so, when a monster is created, it has good starting
381	* values for the body_used info, so when items are created
382	* for it, they can be properly equipped.
383	*/
384	memcpy (&at->clone.body_used, &at->clone.body_info, sizeof (at->clone.body_info));
385
386	switch (i)	428	switch (f.kw)
387	{	429	{
388	case LL_NORMAL: /* A new archetype, just link it with the previous */	430	case KW_object:
389	if (last_more != NULL)	431	loading_arch = true;
390	last_more->next = at;	432	if (!archetype::load (f))
391	if (head != NULL)
392	head->next = at;
393	head = last_more = at;
394	#if 0
395	if (!op->type)
396	LOG (llevDebug, " WARNING: Archetype %s has no type info!\n", op->arch->name);
397	#endif
398	at->tail_x = 0;
399	at->tail_y = 0;
400	break;
401
402	case LL_MORE: /* Another part of the previous archetype, link it correctly */
403
404	at->head = head;
405	at->clone.head = &head->clone;
406	if (last_more != NULL)
407	{	433	{
408	last_more->more = at;	434	loading_arch = false;
409	last_more->clone.more = &at->clone;	435	return false;
410	}	436	}
411	last_more = at;
412		437
413	/* If this multipart image is still composed of individual small	438	loading_arch = false;
414	* images, don't set the tail_.. values. We can't use them anyways,	439	continue;
415	* and setting these to zero makes the map sending to the client much	440
416	* easier as just looking at the head, we know what to do.	441	case KW_EOF:
417	*/	442	return true;
418	if (at->clone.face != head->clone.face)	443
419	{	444	default:
420	head->tail_x = 0;	445	if (!f.parse_error ("archetypes file"))
421	head->tail_y = 0;
422	}
423	else	446	return false;
424	{
425	if (at->clone.x > head->tail_x)
426	head->tail_x = at->clone.x;
427	if (at->clone.y > head->tail_y)
428	head->tail_y = at->clone.y;
429	}
430	break;
431
432	}	447	}
433		448
434	at = new archetype;	449	f.next ();
435
436	at->clone.arch = at;
437	}
438
439	delete at;
440	}
441
442	/*
443	* Reads the archetype file once more, and links all pointers between
444	* archetypes.
445	*/
446
447	void
448	second_arch_pass (object_thawer & thawer)
449	{
450	char buf[MAX_BUF], variable = buf, argument, *cp;
451	archetype at = NULL, other;
452
453	while (fgets (buf, MAX_BUF, thawer) != NULL)
454	{	450	}
455	if (*buf == '#')
456	continue;
457	if ((argument = strchr (buf, ' ')) != NULL)
458	{
459	*argument = '\0', argument++;
460	cp = argument + strlen (argument) - 1;
461	while (isspace (*cp))
462	{
463	*cp = '\0';
464	cp--;
465	}
466	}
467	if (!strcmp ("Object", variable))
468	{
469	if ((at = archetype::find (argument)) == NULL)
470	LOG (llevError, "Warning: failed to find arch %s\n", argument);
471	}
472	else if (!strcmp ("other_arch", variable))
473	{
474	if (at != NULL && at->clone.other_arch == NULL)
475	{
476	if ((other = archetype::find (argument)) == NULL)
477	LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
478	else if (at != NULL)
479	at->clone.other_arch = other;
480	}
481	}
482	else if (!strcmp ("randomitems", variable))
483	{
484	if (at != NULL)
485	{
486	treasurelist *tl = find_treasurelist (argument);
487
488	if (tl == NULL)
489	LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
490	else
491	at->clone.randomitems = tl;
492	}
493	}
494	}
495	}	451	}
496
497	#ifdef DEBUG
498	void
499	check_generators (void)
500	{
501	archetype *at;
502
503	for (at = first_archetype; at != NULL; at = at->next)
504	if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
505	LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
506	}
507	#endif
508		452
509	/*	453	/*
510	* First initialises the archtype hash-table (init_archetable()).	454	* First initialises the archtype hash-table (init_archetable()).
511	* Reads and parses the archetype file (with the first and second-pass	455	* Reads and parses the archetype file (with the first and second-pass
512	* functions).	456	* functions).
513	* Then initialises treasures by calling load_treasures().
514	*/	457	*/
515		458	bool
516	void	459	load_archetype_file (const char *filename)
517	load_archetypes (void)
518	{	460	{
519	char filename[MAX_BUF];
520
521	sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
522	LOG (llevDebug, "Reading archetypes from %s:\n", filename);
523
524	{
525	object_thawer
526	thawer (filename);	461	object_thawer f (filename);
527		462
528	LOG (llevDebug, " arch-pass 1...\n");	463	f.next ();
529	first_arch_pass (thawer);
530	LOG (llevDebug, " done\n");
531	}
532		464
533	init_archetable ();	465	if (!load_archetypes (f))
		466	return false;
		467
534	warn_archetypes = 1;	468	warn_archetypes = 1;
535		469
536	{	470	empty_archetype = archetype::find ("empty_archetype");
537	object_thawer	471	if (!empty_archetype)
538	thawer (filename);	472	return false;
539		473
540	LOG (llevDebug, " loading treasure...\n");	474	return true;
541	load_treasures ();
542	LOG (llevDebug, " done\n");
543	LOG (llevDebug, " arch-pass 2...\n");
544	second_arch_pass (thawer);
545	LOG (llevDebug, " done\n");
546	#ifdef DEBUG
547	check_generators ();
548	#endif
549	}
550	LOG (llevDebug, " done\n");
551	}	475	}
552		476
553	/*	477	/*
554	* Creates and returns a new object which is a copy of the given archetype.	478	* Creates and returns a new object which is a copy of the given archetype.
555	* This function returns NULL on failure.	479	* This function returns NULL on failure.
556	*/	480	*/
557	object *	481	object *
558	arch_to_object (archetype *at)	482	arch_to_object (archetype *at)
559	{	483	{
560	object *op;	484	if (!at)
561
562	if (at == NULL)
563	{	485	{
564	if (warn_archetypes)	486	if (warn_archetypes)
565	LOG (llevError, "Couldn't find archetype.\n");	487	LOG (llevError, "Couldn't find archetype.\n");
566		488
567	return NULL;	489	return NULL;
568	}	490	}
569		491
570	op = at->clone.clone ();	492	object *op = at->clone.clone ();
571	op->arch = at;	493	op->arch = at;
572	op->instantiate ();	494	op->instantiate ();
573	return op;	495	return op;
574	}	496	}
575		497
…		…
606		528
607	return arch_to_object (at);	529	return arch_to_object (at);
608	}	530	}
609		531
610	/*	532	/*
611	* Hash-function used by the arch-hashtable.
612	*/
613
614	unsigned long
615	hasharch (const char *str, int tablesize)
616	{
617	unsigned long hash = 0;
618	unsigned int i = 0;
619	const char *p;
620
621	/* use the one-at-a-time hash function, which supposedly is
622	* better than the djb2-like one used by perl5.005, but
623	* certainly is better then the bug used here before.
624	* see http://burtleburtle.net/bob/hash/doobs.html
625	*/
626	for (p = str; i < MAXSTRING && *p; p++, i++)
627	{
628	hash += *p;
629	hash += hash << 10;
630	hash ^= hash >> 6;
631	}
632
633	hash += hash << 3;
634	hash ^= hash >> 11;
635	hash += hash << 15;
636
637	return hash % tablesize;
638	}
639
640	/*
641	* Finds, using the hashtable, which archetype matches the given name.	533	* Finds, using the hashtable, which archetype matches the given name.
642	* returns a pointer to the found archetype, otherwise NULL.	534	* returns a pointer to the found archetype, otherwise NULL.
643	*/	535	*/
644	archetype *	536	archetype *
645	archetype::find (const char *name)	537	archetype::find (const char *name)
646	{	538	{
647	if (!name)	539	if (!name)
648	return 0;	540	return 0;
649		541
650	AUTODECL (i, ht.find (name));	542	auto (i, ht.find (name));
651		543
652	if (i == ht.end ())	544	if (i == ht.end ())
653	return 0;	545	return 0;
654	else	546	else
655	return i->second;	547	return i->second;
656	}	548	}
657		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
658	/*	565	/*
659	* Adds an archetype to the hashtable.	566	* Adds an archetype to the hashtable.
660	*/	567	*/
661	void	568	void
662	archetype::hash_add ()	569	archetype::hash_add ()
…		…
675	* Used in treasure-generation.	582	* Used in treasure-generation.
676	*/	583	*/
677	archetype *	584	archetype *
678	type_to_archetype (int type)	585	type_to_archetype (int type)
679	{	586	{
680	archetype *at;
681
682	for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)	587	for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
683	if (at->clone.type == type)	588	if (at->clone.type == type)
684	return at;	589	return at;
685		590
686	return 0;	591	return 0;
687	}	592	}
…		…
689	/*	594	/*
690	* Returns a new object copied from the first archetype matching	595	* Returns a new object copied from the first archetype matching
691	* the given type.	596	* the given type.
692	* Used in treasure-generation.	597	* Used in treasure-generation.
693	*/	598	*/
694
695	object *	599	object *
696	clone_arch (int type)	600	clone_arch (int type)
697	{	601	{
698	archetype *at;	602	archetype *at;
699		603

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.38 by root, Fri Feb 2 21:50:43 2007 UTC vs. Revision 1.52 by root, Tue Apr 17 10:06:32 2007 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.38 by root, Fri Feb 2 21:50:43 2007 UTC vs.
Revision 1.52 by root, Tue Apr 17 10:06:32 2007 UTC