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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.163 by root, Thu Oct 15 21:40:42 2009 UTC vs.
Revision 1.169 by root, Sat Nov 7 18:30:05 2009 UTC

…		…
26		26
27	#include "global.h"	27	#include "global.h"
28	#include "loader.h"	28	#include "loader.h"
29	#include "path.h"	29	#include "path.h"
30		30
		31	//+GPL
		32
31	sint8 maptile::outdoor_darkness;	33	sint8 maptile::outdoor_darkness;
32		34
33	/* This rolls up wall, blocks_magic, blocks_view, etc, all into	35	/* This rolls up wall, blocks_magic, blocks_view, etc, all into
34	* one function that just returns a P_.. value (see map.h)	36	* one function that just returns a P_.. value (see map.h)
35	* it will also do map translation for tiled maps, returning	37	* it will also do map translation for tiled maps, returning
…		…
80	{	82	{
81	LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");	83	LOG (llevError, "blocked_link: Passed map, x, y coordinates outside of map\n");
82	return 1;	84	return 1;
83	}	85	}
84		86
85	/* Save some cycles - instead of calling get_map_flags(), just get the value
86	* directly.
87	*/
88	mapspace &ms = m->at (sx, sy);	87	mapspace &ms = m->at (sx, sy);
89		88
90	int mflags = ms.flags ();	89	int mflags = ms.flags ();
91	int blocked = ms.move_block;	90	int blocked = ms.move_block;
92		91
…		…
114	* true. If we get through the entire stack, that must mean	113	* true. If we get through the entire stack, that must mean
115	* ob is blocking it, so return 0.	114	* ob is blocking it, so return 0.
116	*/	115	*/
117	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	116	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
118	{	117	{
119	bool block = OB_MOVE_BLOCK (ob, tmp);	118	if (OB_MOVE_BLOCK (ob, tmp))
120
121	/* This must be before the checks below. Code for inventory checkers. */
122	if (block && tmp->type == CHECK_INV)
123	{	119	{
124	bool have = check_inv_recursive (ob, tmp);	120	if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
125		121	if (RESULT_INT (0))
126	/* If last_sp is set, the player/monster needs an object,	122	return 1;
127	* so we check for it. If they don't have it, they can't
128	* pass through this space.
129	*/	123	else
130	if (tmp->last_sp)	124	continue;
		125
		126	if (tmp->type == CHECK_INV)
131	{	127	{
132	if (!have)	128	bool have = check_inv_recursive (ob, tmp);
		129
		130	// last_sp set means we block if we don't have.
		131	if (logical_xor (have, tmp->last_sp))
		132	return 1;
		133	}
		134	else if (tmp->type == T_MATCH)
		135	{
		136	// T_MATCH allows "entrance" iff the match is true
		137	// == blocks if the match fails
		138
		139	// we could have used an INVOKE_OBJECT, but decided against it, as we
		140	// assume that T_MATCH is relatively common.
		141	if (!match (tmp->slaying, ob, tmp, ob))
133	return 1;	142	return 1;
134	}	143	}
135	else	144	else
136	{	145	return 1; // unconditional block
137	/* In this case, the player must not have the object -	146
138	* if they do, they can't pass through.
139	*/
140	if (have)
141	return 1;
142	}
143	}
144	else if (block && tmp->type == T_MATCH)
145	{
146	//TODO
147	}
148	else	147	} else {
149	{	148	// space does not block the ob, directly, but
150	/* Broke apart a big nasty if into several here to make	149	// anything alive that is not a door still
151	* this more readable. first check - if the space blocks	150	// blocks anything but wizards.
152	* movement, can't move here.
153	* second - if a monster, can't move there, unless it is a
154	* dm.
155	*/
156	if (block)
157	return 1;
158		151
159	if (tmp->flag [FLAG_ALIVE]	152	if (tmp->flag [FLAG_ALIVE]
160	&& tmp->head_ () != ob	153	&& tmp->head_ () != ob
161	&& tmp != ob	154	&& tmp != ob
162	&& tmp->type != DOOR	155	&& tmp->type != DOOR
163	&& !tmp->flag [FLAG_WIZ])	156	&& !tmp->flag [FLAG_WIZPASS])
164	return 1;	157	return 1;
165	}	158	}
166	}	159	}
167		160
168	return 0;	161	return 0;
…		…
230	* into inventory, but just links them. What this does is go through	223	* into inventory, but just links them. What this does is go through
231	* and insert them properly.	224	* and insert them properly.
232	* The object 'container' is the object that contains the inventory.	225	* The object 'container' is the object that contains the inventory.
233	* This is needed so that we can update the containers weight.	226	* This is needed so that we can update the containers weight.
234	*/	227	*/
235	void	228	static void
236	fix_container (object *container)	229	fix_container (object *container)
237	{	230	{
238	object tmp = container->inv, next;	231	object tmp = container->inv, next;
239		232
240	container->inv = 0;	233	container->inv = 0;
…		…
251	// go through and calculate what all the containers are carrying.	244	// go through and calculate what all the containers are carrying.
252	//TODO: remove	245	//TODO: remove
253	container->update_weight ();	246	container->update_weight ();
254	}	247	}
255		248
		249	//-GPL
		250
256	void	251	void
257	maptile::set_object_flag (int flag, int value)	252	maptile::set_object_flag (int flag, int value)
258	{	253	{
259	if (!spaces)	254	if (!spaces)
260	return;	255	return;
…		…
274		269
275	for (mapspace *ms = spaces + size (); ms-- > spaces; )	270	for (mapspace *ms = spaces + size (); ms-- > spaces; )
276	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	271	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
277	INVOKE_OBJECT (RESET, tmp);	272	INVOKE_OBJECT (RESET, tmp);
278	}	273	}
		274
		275	//+GPL
279		276
280	/* link_multipart_objects go through all the objects on the map looking	277	/* link_multipart_objects go through all the objects on the map looking
281	* for objects whose arch says they are multipart yet according to the	278	* for objects whose arch says they are multipart yet according to the
282	* info we have, they only have the head (as would be expected when	279	* info we have, they only have the head (as would be expected when
283	* they are saved).	280	* they are saved).
…		…
310	else	307	else
311	op = op->above;	308	op = op->above;
312	}	309	}
313	}	310	}
314	}	311	}
		312
		313	//-GPL
315		314
316	/*	315	/*
317	* Loads (ands parses) the objects into a given map from the specified	316	* Loads (ands parses) the objects into a given map from the specified
318	* file pointer.	317	* file pointer.
319	*/	318	*/
…		…
480	if (spaces)	479	if (spaces)
481	return;	480	return;
482		481
483	spaces = salloc0<mapspace> (size ());	482	spaces = salloc0<mapspace> (size ());
484	}	483	}
		484
		485	//+GPL
485		486
486	/* Takes a string from a map definition and outputs a pointer to the array of shopitems	487	/* Takes a string from a map definition and outputs a pointer to the array of shopitems
487	* corresponding to that string. Memory is allocated for this, it must be freed	488	* corresponding to that string. Memory is allocated for this, it must be freed
488	* at a later date.	489	* at a later date.
489	* Called by parse_map_headers below.	490	* Called by parse_map_headers below.
…		…
566	return items;	567	return items;
567	}	568	}
568		569
569	/* opposite of parse string, this puts the string that was originally fed in to	570	/* opposite of parse string, this puts the string that was originally fed in to
570	* the map (or something equivilent) into output_string. */	571	* the map (or something equivilent) into output_string. */
571	static void	572	static const char *
572	print_shop_string (maptile m, char output_string)	573	print_shop_string (maptile *m)
573	{	574	{
574	int i;	575	static dynbuf_text buf; buf.clear ();
575	char tmp[MAX_BUF];
576		576
577	strcpy (output_string, "");
578	for (i = 0; i < m->shopitems[0].index; i++)	577	for (int i = 0; i < m->shopitems[0].index; i++)
579	{	578	{
580	if (m->shopitems[i].typenum)	579	if (m->shopitems[i].typenum)
581	{	580	{
582	if (m->shopitems[i].strength)	581	if (m->shopitems[i].strength)
583	sprintf (tmp, "%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);	582	buf.printf ("%s:%d;", m->shopitems[i].name, m->shopitems[i].strength);
584	else	583	else
585	sprintf (tmp, "%s;", m->shopitems[i].name);	584	buf.printf ("%s;", m->shopitems[i].name);
586	}	585	}
587	else	586	else
588	{	587	{
589	if (m->shopitems[i].strength)	588	if (m->shopitems[i].strength)
590	sprintf (tmp, "*:%d;", m->shopitems[i].strength);	589	buf.printf ("*:%d;", m->shopitems[i].strength);
591	else	590	else
592	sprintf (tmp, "*");	591	buf.printf ("*");
593	}	592	}
594
595	strcat (output_string, tmp);
596	}	593	}
		594
		595	return buf;
597	}	596	}
		597
		598	//-GPL
598		599
599	/* This loads the header information of the map. The header	600	/* This loads the header information of the map. The header
600	* contains things like difficulty, size, timeout, etc.	601	* contains things like difficulty, size, timeout, etc.
601	* this used to be stored in the map object, but with the	602	* this used to be stored in the map object, but with the
602	* addition of tiling, fields beyond that easily named in an	603	* addition of tiling, fields beyond that easily named in an
…		…
694	}	695	}
695		696
696	abort ();	697	abort ();
697	}	698	}
698		699
		700	//+GPL
		701
699	/******************************************************************************	702	/******************************************************************************
700	* This is the start of unique map handling code	703	* This is the start of unique map handling code
701	*****************************************************************************/	704	*****************************************************************************/
702		705
703	/* This goes through the maptile and removed any unique items on the map. */	706	/* This goes through the maptile and removed any unique items on the map. */
…		…
719		722
720	op = above;	723	op = above;
721	}	724	}
722	}	725	}
723	}	726	}
		727
		728	//-GPL
724		729
725	bool	730	bool
726	maptile::_save_header (object_freezer &freezer)	731	maptile::_save_header (object_freezer &freezer)
727	{	732	{
728	#define MAP_OUT(k) freezer.put (KW_ ## k, k)	733	#define MAP_OUT(k) freezer.put (KW_ ## k, k)
…		…
736	MAP_OUT (reset_timeout);	741	MAP_OUT (reset_timeout);
737	MAP_OUT (fixed_resettime);	742	MAP_OUT (fixed_resettime);
738	MAP_OUT (no_reset);	743	MAP_OUT (no_reset);
739	MAP_OUT (no_drop);	744	MAP_OUT (no_drop);
740	MAP_OUT (difficulty);	745	MAP_OUT (difficulty);
741
742	if (default_region) MAP_OUT2 (region, default_region->name);	746	if (default_region) MAP_OUT2 (region, default_region->name);
743		747
744	if (shopitems)	748	if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
745	{
746	char shop[MAX_BUF];
747	print_shop_string (this, shop);
748	MAP_OUT2 (shopitems, shop);
749	}
750
751	MAP_OUT (shopgreed);	749	MAP_OUT (shopgreed);
752	MAP_OUT (shopmin);	750	MAP_OUT (shopmin);
753	MAP_OUT (shopmax);	751	MAP_OUT (shopmax);
754	if (shoprace) MAP_OUT (shoprace);	752	if (shoprace) MAP_OUT (shoprace);
		753
755	MAP_OUT (darkness);	754	MAP_OUT (darkness);
756	MAP_OUT (width);	755	MAP_OUT (width);
757	MAP_OUT (height);	756	MAP_OUT (height);
758	MAP_OUT (enter_x);	757	MAP_OUT (enter_x);
759	MAP_OUT (enter_y);	758	MAP_OUT (enter_y);
…		…
791	if (!_save_header (freezer))	790	if (!_save_header (freezer))
792	return false;	791	return false;
793		792
794	return freezer.save (path);	793	return freezer.save (path);
795	}	794	}
		795
		796	//+GPL
796		797
797	/*	798	/*
798	* Remove and free all objects in the given map.	799	* Remove and free all objects in the given map.
799	*/	800	*/
800	void	801	void
…		…
1539	int dx, dy;	1540	int dx, dy;
1540		1541
1541	return adjacent_map (op1->map, op2->map, &dx, &dy);	1542	return adjacent_map (op1->map, op2->map, &dx, &dy);
1542	}	1543	}
1543		1544
		1545	//-GPL
		1546
1544	object *	1547	object *
1545	maptile::insert (object op, int x, int y, object originator, int flags)	1548	maptile::insert (object op, int x, int y, object originator, int flags)
1546	{	1549	{
1547	return insert_ob_in_map_at (op, this, originator, flags, x, y);	1550	return insert_ob_in_map_at (op, this, originator, flags, x, y);
1548	}	1551	}
…		…
1559	if (default_region)	1562	if (default_region)
1560	return default_region;	1563	return default_region;
1561		1564
1562	return ::region::default_region ();	1565	return ::region::default_region ();
1563	}	1566	}
		1567
		1568	//+GPL
1564		1569
1565	/* picks a random object from a style map.	1570	/* picks a random object from a style map.
1566	*/	1571	*/
1567	object *	1572	object *
1568	maptile::pick_random_object (rand_gen &gen) const	1573	maptile::pick_random_object (rand_gen &gen) const
…		…
1581	if (pick && pick->is_head ())	1586	if (pick && pick->is_head ())
1582	return pick->head_ ();	1587	return pick->head_ ();
1583	}	1588	}
1584		1589
1585	// instead of crashing in the unlikely(?) case, try to return something	1590	// instead of crashing in the unlikely(?) case, try to return something
1586	return archetype::find ("bug");	1591	return archetype::find (shstr_bug);
1587	}	1592	}
		1593
		1594	//-GPL
1588		1595
1589	void	1596	void
1590	maptile::play_sound (faceidx sound, int x, int y) const	1597	maptile::play_sound (faceidx sound, int x, int y) const
1591	{	1598	{
1592	if (!sound)	1599	if (!sound)

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.163 by root, Thu Oct 15 21:40:42 2009 UTC vs. Revision 1.169 by root, Sat Nov 7 18:30:05 2009 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.163 by root, Thu Oct 15 21:40:42 2009 UTC vs.
Revision 1.169 by root, Sat Nov 7 18:30:05 2009 UTC