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

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.44 by pippijn, Thu Mar 1 11:14:45 2007 UTC vs.
Revision 1.58 by root, Sat Apr 21 11:55:36 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.
…		…
274	}	275	}
275		276
276	return 0;	277	return 0;
277	}	278	}
278		279
279	/*
280	* Initialises the internal linked list of archetypes (read from file).
281	* Then the global "empty_archetype" pointer is initialised.
282	* Then the blocksview[] array is initialised.
283	*/
284
285	void
286	init_archetypes (void)
287	{ /* called from add_player() and edit() */
288	if (first_archetype != NULL) /* Only do this once */
289	return;
290
291	arch_init = 1;
292	load_archetypes ();
293	arch_init = 0;
294	empty_archetype = archetype::find ("empty_archetype");
295
296	/* init_blocksview();*/
297	}
298
299	/*
300	* An alternative way to init the hashtable which is slower, but _works_...
301	*/
302	void
303	init_archetable (void)
304	{
305	LOG (llevDebug, " Setting up archetable...\n");
306
307	for (archetype *at = first_archetype; at; at = at->next)
308	for (archetype *bt = at; bt; bt = bt->more)
309	bt->hash_add ();
310
311	LOG (llevDebug, "done\n");
312	}
313
314	void
315	free_all_archs (void)
316	{
317	archetype at, next;
318	int i = 0, f = 0;
319
320	for (at = first_archetype; at; at = next)
321	{
322	if (at->more)
323	next = at->more;
324	else
325	next = at->next;
326
327	delete
328	at;
329
330	i++;
331	}
332
333	LOG (llevDebug, "Freed %d archetypes, %d faces\n", i, f);
334	}
335
336	archetype::archetype ()	280	archetype::archetype ()
337	{	281	{
338	clone.arch = this;	282	clone.arch = this;
339		283
340	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 */
…		…
344	archetype::~archetype ()	288	archetype::~archetype ()
345	{	289	{
346	//TODO: nuke ->more's	290	//TODO: nuke ->more's
347	}	291	}
348		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	at->clone.arch = at;
		315
		316	at->clone.inv = op->inv; op->inv = 0;
		317
		318	op->destroy ();
		319	}
		320
349	archetype *	321	archetype *
350	archetype::read (object_thawer &f)	322	archetype::read (object_thawer &f)
351	{	323	{
352	assert (f.kw == KW_object);	324	assert (f.kw == KW_object);
353		325
354	archetype *head = new archetype;	326	loading_arch = true; // hack to tell parse_kv et al. to behave
355	f.get (head->name);
356		327
357	if (!head->clone.parse_kv (f))	328	typedef std::pair<archetype , object > part;
358	{	329	std::vector<part> parts;
359	delete head;	330
360	return 0;	331	coroapi::cede_to_tick_every (100);
		332
		333	for (;;)
361	}	334	{
362		335	object *op = object::create ();
363	for (archetype *prev = head; f.kw == KW_more; )	336	archetype *at = get (f.get_str ());
364	{	337	f.get (op->name);
365	f.next ();	338	f.next ();
366		339
367	assert (f.kw == KW_object);	340	#if 0
368		341	if (f.kw == KW_inherit)
369	archetype *more = new archetype;
370	f.get (more->name);
371
372	if (!more->clone.parse_kv (f))
373	{	342	{
374	delete head;	343	if (archetype *at = find (f.get_str ()))
375	return 0;	344	*op = at->clone;
		345	else
		346	LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n",
		347	&at->name, f.get_str ());
		348
		349	f.next ();
376	}	350	}
		351	#endif
377		352
378	if (more->clone.x > head->tail_x) head->tail_x = more->clone.x;	353	if (!op->parse_kv (f))
379	if (more->clone.y > head->tail_y) head->tail_y = more->clone.y;	354	goto fail;
380		355
381	more->head = head;	356	parts.push_back (std::make_pair (at, op));
382	more->clone.head = &head->clone;
383	prev->more = more;
384	prev->clone.more = &more->clone;
385		357
386	prev = more;	358	if (f.kw != KW_more)
387	}	359	break;
388		360
389	head->next = first_archetype;	361	f.next ();
390	first_archetype = head;
391		362
392	return head;	363	if (f.kw != KW_object)
393	}
394
395	/*
396	* Reads/parses the archetype-file, and copies into a linked list
397	* of archetype-structures.
398	*/
399	static bool
400	first_arch_pass (object_thawer &f)
401	{
402	for (;;)
403	{
404	switch (f.kw)
405	{	364	{
406	case KW_object:	365	f.parse_error ("more object");
407	if (!archetype::read (f))	366	goto fail;
408	return false;
409	continue;
410
411	case KW_EOF:
412	return true;
413
414	default:
415	if (!f.parse_error ("archetypes file"))
416	return false;
417	}	367	}
		368	}
418		369
419	f.next ();	370	{
		371	archetype *head = parts.front ().first;
		372
		373	// check that all archetypes belong to the same object or are heads
		374	for (auto (p, parts.begin ()); p != parts.end (); ++p)
		375	{
		376	archetype *at = p->first;
		377
		378	if (at->head != head && at->head)
		379	{
		380	LOG (llevError, "%s: unable to overwrite foreign non-head archetype with non-head archetype\n", &at->name);
		381	goto fail;
		382	}
		383
		384	if (at->next && at != head)
		385	{
		386	LOG (llevError, "%s: unable to overwrite foreign head archetype with non-head archetype\n", &at->name);
		387	goto fail;
		388	}
420	}	389	}
421	}
422		390
		391	// sever chain of existing head object
		392	for (archetype more, at = head; at; at = more)
		393	{
		394	more = at->more;
		395
		396	at->head = 0;
		397	at->more = 0;
		398	}
		399
		400	// replace/update head
		401	overwrite (head, parts.front ().second);
		402	head->tail_x = 0;
		403	head->tail_y = 0;
		404
		405	// link into list of heads, if not already there
		406	if (!head->linked)
		407	{
		408	head->linked = true;
		409	head->next = first_archetype;
		410	first_archetype = head;
		411	}
		412
		413	// reassemble new chain
		414	archetype *prev = head;
		415	for (auto (p, parts.begin () + 1); p != parts.end (); ++p)
		416	{
		417	archetype *at = p->first;
		418	overwrite (at, p->second);
		419
		420	if (at->clone.x > head->tail_x) head->tail_x = at->clone.x;
		421	if (at->clone.y > head->tail_y) head->tail_y = at->clone.y;
		422
		423	at->head = head;
		424	at->clone.head = &head->clone;
		425	prev->more = at;
		426	prev->clone.more = &at->clone;
		427
		428	prev = at;
		429	}
		430
		431	loading_arch = false;
		432	return head;
		433	}
		434
		435	fail:
		436	for (auto (p, parts.begin ()); p != parts.end (); ++p)
		437	p->second->destroy (true);
		438
		439	loading_arch = false;
		440	return 0;
		441	}
		442
423	/*	443	/*
424	* Reads the archetype file once more, and links all pointers between	444	* Initialize global archtype pointers:
425	* archetypes.
426	*/	445	*/
427	void	446	void
428	second_arch_pass (object_thawer & thawer)	447	init_archetype_pointers ()
429	{	448	{
430	char buf[MAX_BUF], variable = buf, argument, *cp;	449	ring_arch = archetype::find ("ring");
431	archetype at = NULL, other;	450	amulet_arch = archetype::find ("amulet");
432		451	staff_arch = archetype::find ("staff");
433	while (fgets (buf, MAX_BUF, thawer) != NULL)	452	crown_arch = archetype::find ("crown");
434	{	453	empty_archetype = archetype::find ("empty_archetype");
435	if (*buf == '#')
436	continue;
437
438	if ((argument = strchr (buf, ' ')) != NULL)
439	{
440	*argument = '\0', argument++;
441	cp = argument + strlen (argument) - 1;
442	while (isspace (*cp))
443	{
444	*cp = '\0';
445	cp--;
446	}
447	}
448
449	if (!strcmp ("object", variable))
450	{
451	if ((at = archetype::find (argument)) == NULL)
452	LOG (llevError, "Warning: failed to find arch %s\n", argument);
453	}
454	else if (!strcmp ("other_arch", variable))
455	{
456	if (at != NULL && at->clone.other_arch == NULL)
457	{
458	if ((other = archetype::find (argument)) == NULL)
459	LOG (llevError, "Warning: failed to find other_arch %s\n", argument);
460	else if (at != NULL)
461	at->clone.other_arch = other;
462	}
463	}
464	else if (!strcmp ("randomitems", variable))
465	{
466	if (at)
467	{
468	treasurelist *tl = find_treasurelist (argument);
469
470	if (tl == NULL)
471	LOG (llevError, "Failed to link treasure to arch (%s): %s\n", &at->name, argument);
472	else
473	at->clone.randomitems = tl;
474	}
475	}
476	}
477	}
478
479	#ifdef DEBUG
480	void
481	check_generators (void)
482	{
483	archetype *at;
484
485	for (at = first_archetype; at != NULL; at = at->next)
486	if (QUERY_FLAG (&at->clone, FLAG_GENERATOR) && at->clone.other_arch == NULL)
487	LOG (llevError, "Warning: %s is generator but lacks other_arch.\n", &at->name);
488	}
489	#endif
490
491	/*
492	* First initialises the archtype hash-table (init_archetable()).
493	* Reads and parses the archetype file (with the first and second-pass
494	* functions).
495	* Then initialises treasures by calling load_treasures().
496	*/
497
498	void
499	load_archetypes (void)
500	{
501	char filename[MAX_BUF];
502
503	sprintf (filename, "%s/%s", settings.datadir, settings.archetypes);
504	LOG (llevDebug, "Reading archetypes from %s:\n", filename);
505
506	{
507	object_thawer f (filename);
508
509	f.next ();
510
511	LOG (llevDebug, " arch-pass 1...\n");
512	if (!first_arch_pass (f))
513	cleanup ("errors during first arch pass are fatal");
514	LOG (llevDebug, " done\n");
515	}
516
517	init_archetable ();
518	warn_archetypes = 1;
519
520	{
521	object_thawer f (filename);
522
523	LOG (llevDebug, " loading treasure...\n");
524	load_treasures ();
525	LOG (llevDebug, " done\n");
526	LOG (llevDebug, " arch-pass 2...\n");
527	second_arch_pass (f);
528	LOG (llevDebug, " done\n");
529	#ifdef DEBUG
530	check_generators ();
531	#endif
532	}
533	LOG (llevDebug, " done\n");
534	}	454	}
535		455
536	/*	456	/*
537	* Creates and returns a new object which is a copy of the given archetype.	457	* Creates and returns a new object which is a copy of the given archetype.
538	* This function returns NULL on failure.	458	* This function returns NULL on failure.
…		…
540	object *	460	object *
541	arch_to_object (archetype *at)	461	arch_to_object (archetype *at)
542	{	462	{
543	if (!at)	463	if (!at)
544	{	464	{
545	if (warn_archetypes)
546	LOG (llevError, "Couldn't find archetype.\n");	465	LOG (llevError, "Couldn't find archetype.\n");
547
548	return NULL;	466	return 0;
549	}	467	}
550		468
551	object *op = at->clone.clone ();	469	object *op = at->clone.clone ();
552	op->arch = at;	470	op->arch = at;
553	op->instantiate ();	471	op->instantiate ();
		472
554	return op;	473	return op;
555	}	474	}
556		475
557	/*	476	/*
558	* Creates an object. This function is called by get_archetype()	477	* Creates an object. This function is called by get_archetype()
…		…
587		506
588	return arch_to_object (at);	507	return arch_to_object (at);
589	}	508	}
590		509
591	/*	510	/*
592	* Hash-function used by the arch-hashtable.
593	*/
594
595	unsigned long
596	hasharch (const char *str, int tablesize)
597	{
598	unsigned long hash = 0;
599	unsigned int i = 0;
600	const char *p;
601
602	/* use the one-at-a-time hash function, which supposedly is
603	* better than the djb2-like one used by perl5.005, but
604	* certainly is better then the bug used here before.
605	* see http://burtleburtle.net/bob/hash/doobs.html
606	*/
607	for (p = str; i < MAXSTRING && *p; p++, i++)
608	{
609	hash += *p;
610	hash += hash << 10;
611	hash ^= hash >> 6;
612	}
613
614	hash += hash << 3;
615	hash ^= hash >> 11;
616	hash += hash << 15;
617
618	return hash % tablesize;
619	}
620
621	/*
622	* Finds, using the hashtable, which archetype matches the given name.	511	* Finds, using the hashtable, which archetype matches the given name.
623	* returns a pointer to the found archetype, otherwise NULL.	512	* returns a pointer to the found archetype, otherwise NULL.
624	*/	513	*/
625	archetype *	514	archetype *
626	archetype::find (const char *name)	515	archetype::find (const char *name)
627	{	516	{
628	if (!name)	517	if (!name)
629	return 0;	518	return 0;
630		519
631	AUTODECL (i, ht.find (name));	520	auto (i, ht.find (name));
632		521
633	if (i == ht.end ())	522	if (i == ht.end ())
634	return 0;	523	return 0;
635	else	524	else
636	return i->second;	525	return i->second;
637	}	526	}
638		527
		528	archetype *
		529	archetype::get (const char *name)
		530	{
		531	if (!name)
		532	{
		533	LOG (llevError, "null archetype requested\n");
		534	name = "(null)";
		535	}
		536
		537	archetype *at = find (name);
		538
		539	if (!at)
		540	{
		541	archetypes.push_back (at = new archetype);
		542	at->name = at->clone.name = at->clone.name_pl = name;
		543	at->hash_add ();
		544	}
		545
		546	return at;
		547	}
		548
639	/*	549	/*
640	* Adds an archetype to the hashtable.	550	* Adds an archetype to the hashtable.
641	*/	551	*/
642	void	552	void
643	archetype::hash_add ()	553	archetype::hash_add ()
…		…
656	* Used in treasure-generation.	566	* Used in treasure-generation.
657	*/	567	*/
658	archetype *	568	archetype *
659	type_to_archetype (int type)	569	type_to_archetype (int type)
660	{	570	{
661	archetype *at;
662
663	for (at = first_archetype; at; at = at->more == 0 ? at->next : at->more)	571	for (archetype *at = first_archetype; at; at = at->more == 0 ? at->next : at->more)
664	if (at->clone.type == type)	572	if (at->clone.type == type)
665	return at;	573	return at;
666		574
667	return 0;	575	return 0;
668	}	576	}
…		…
670	/*	578	/*
671	* Returns a new object copied from the first archetype matching	579	* Returns a new object copied from the first archetype matching
672	* the given type.	580	* the given type.
673	* Used in treasure-generation.	581	* Used in treasure-generation.
674	*/	582	*/
675
676	object *	583	object *
677	clone_arch (int type)	584	clone_arch (int type)
678	{	585	{
679	archetype *at;	586	archetype *at;
680		587

Diff Legend

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

Comparing deliantra/server/common/arch.C (file contents): Revision 1.44 by pippijn, Thu Mar 1 11:14:45 2007 UTC vs. Revision 1.58 by root, Sat Apr 21 11:55:36 2007 UTC

Diff Legend

Comparing deliantra/server/common/arch.C (file contents):
Revision 1.44 by pippijn, Thu Mar 1 11:14:45 2007 UTC vs.
Revision 1.58 by root, Sat Apr 21 11:55:36 2007 UTC