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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.160 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.168 by root, Fri Nov 6 13:03:34 2009 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify it under	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* the terms of the Affero GNU General Public License as published by the	9	* the terms of the Affero GNU General Public License as published by the
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
…		…
71	* by the caller.	73	* by the caller.
72	*/	74	*/
73	int	75	int
74	blocked_link (object ob, maptile m, int sx, int sy)	76	blocked_link (object ob, maptile m, int sx, int sy)
75	{	77	{
76	object *tmp;
77	int mflags, blocked;
78
79	/* Make sure the coordinates are valid - they should be, as caller should	78	/* Make sure the coordinates are valid - they should be, as caller should
80	* have already checked this.	79	* have already checked this.
81	*/	80	*/
82	if (OUT_OF_REAL_MAP (m, sx, sy))	81	if (OUT_OF_REAL_MAP (m, sx, sy))
83	{	82	{
84	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");
85	return 1;	84	return 1;
86	}	85	}
87		86
88	/* Save some cycles - instead of calling get_map_flags(), just get the value	87	mapspace &ms = m->at (sx, sy);
89	* directly.
90	*/
91	mflags = m->at (sx, sy).flags ();
92		88
93	blocked = GET_MAP_MOVE_BLOCK (m, sx, sy);	89	int mflags = ms.flags ();
		90	int blocked = ms.move_block;
94		91
95	/* If space is currently not blocked by anything, no need to	92	/* If space is currently not blocked by anything, no need to
96	* go further. Not true for players - all sorts of special	93	* go further. Not true for players - all sorts of special
97	* things we need to do for players.	94	* things we need to do for players.
98	*/	95	*/
99	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))	96	if (ob->type != PLAYER && !(mflags & P_IS_ALIVE) && (blocked == 0))
100	return 0;	97	return 0;
101		98
102	/* if there isn't anytyhing alive on this space, and this space isn't	99	/* if there isn't anything alive on this space, and this space isn't
103	* otherwise blocked, we can return now. Only if there is a living	100	* otherwise blocked, we can return now. Only if there is a living
104	* creature do we need to investigate if it is part of this creature	101	* creature do we need to investigate if it is part of this creature
105	* or another. Likewise, only if something is blocking us do we	102	* or another. Likewise, only if something is blocking us do we
106	* need to investigate if there is a special circumstance that would	103	* need to investigate if there is a special circumstance that would
107	* let the player through (inventory checkers for example)	104	* let the player through (inventory checkers for example)
…		…
114	/* We basically go through the stack of objects, and if there is	111	/* We basically go through the stack of objects, and if there is
115	* some other object that has NO_PASS or FLAG_ALIVE set, return	112	* some other object that has NO_PASS or FLAG_ALIVE set, return
116	* true. If we get through the entire stack, that must mean	113	* true. If we get through the entire stack, that must mean
117	* ob is blocking it, so return 0.	114	* ob is blocking it, so return 0.
118	*/	115	*/
119	for (tmp = GET_MAP_OB (m, sx, sy); tmp; tmp = tmp->above)	116	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
120	{	117	{
121		118	if (OB_MOVE_BLOCK (ob, tmp))
122	/* This must be before the checks below. Code for inventory checkers. */
123	if (tmp->type == CHECK_INV && OB_MOVE_BLOCK (ob, tmp))
124	{	119	{
125	/* If last_sp is set, the player/monster needs an object,	120	if (INVOKE_OBJECT (BLOCKED_MOVE, tmp, ob))
126	* so we check for it. If they don't have it, they can't	121	if (RESULT_INT (0))
127	* pass through this space.	122	return 1;
128	*/	123	else
129	if (tmp->last_sp)	124	continue;
		125
		126	if (tmp->type == CHECK_INV)
130	{	127	{
131	if (check_inv_recursive (ob, tmp) == NULL)	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;	132	return 1;
133	else	133	}
134	continue;	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))
		142	return 1;
135	}	143	}
136	else	144	else
137	{	145	return 1; // unconditional block
138	/* In this case, the player must not have the object -	146
139	* if they do, they can't pass through.
140	*/
141	if (check_inv_recursive (ob, tmp) != NULL) /* player has object */
142	return 1;
143	else
144	continue;
145	}
146	} /* if check_inv */
147	else	147	} else {
148	{	148	// space does not block the ob, directly, but
149	/* Broke apart a big nasty if into several here to make	149	// anything alive that is not a door still
150	* this more readable. first check - if the space blocks	150	// blocks anything but wizards.
151	* movement, can't move here.
152	* second - if a monster, can't move there, unless it is a
153	* hidden dm
154	*/
155	if (OB_MOVE_BLOCK (ob, tmp))
156	return 1;
157		151
158	if (tmp->flag [FLAG_ALIVE]	152	if (tmp->flag [FLAG_ALIVE]
159	&& tmp->head_ () != ob	153	&& tmp->head_ () != ob
160	&& tmp != ob	154	&& tmp != ob
161	&& tmp->type != DOOR	155	&& tmp->type != DOOR
162	&& !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))	156	&& !tmp->flag [FLAG_WIZPASS])
163	return 1;	157	return 1;
164	}	158	}
165
166	}	159	}
		160
167	return 0;	161	return 0;
168	}	162	}
169		163
170	/*	164	/*
171	* Returns qthe blocking object if the given object can't fit in the given	165	* Returns qthe blocking object if the given object can't fit in the given
…		…
229	* 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
230	* and insert them properly.	224	* and insert them properly.
231	* The object 'container' is the object that contains the inventory.	225	* The object 'container' is the object that contains the inventory.
232	* This is needed so that we can update the containers weight.	226	* This is needed so that we can update the containers weight.
233	*/	227	*/
234	void	228	static void
235	fix_container (object *container)	229	fix_container (object *container)
236	{	230	{
237	object tmp = container->inv, next;	231	object tmp = container->inv, next;
238		232
239	container->inv = 0;	233	container->inv = 0;
…		…
250	// go through and calculate what all the containers are carrying.	244	// go through and calculate what all the containers are carrying.
251	//TODO: remove	245	//TODO: remove
252	container->update_weight ();	246	container->update_weight ();
253	}	247	}
254		248
		249	//-GPL
		250
255	void	251	void
256	maptile::set_object_flag (int flag, int value)	252	maptile::set_object_flag (int flag, int value)
257	{	253	{
258	if (!spaces)	254	if (!spaces)
259	return;	255	return;
…		…
273		269
274	for (mapspace *ms = spaces + size (); ms-- > spaces; )	270	for (mapspace *ms = spaces + size (); ms-- > spaces; )
275	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	271	for (object *tmp = ms->bot; tmp; tmp = tmp->above)
276	INVOKE_OBJECT (RESET, tmp);	272	INVOKE_OBJECT (RESET, tmp);
277	}	273	}
		274
		275	//+GPL
278		276
279	/* 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
280	* 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
281	* 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
282	* they are saved).	280	* they are saved).
…		…
309	else	307	else
310	op = op->above;	308	op = op->above;
311	}	309	}
312	}	310	}
313	}	311	}
		312
		313	//-GPL
314		314
315	/*	315	/*
316	* 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
317	* file pointer.	317	* file pointer.
318	*/	318	*/
…		…
479	if (spaces)	479	if (spaces)
480	return;	480	return;
481		481
482	spaces = salloc0<mapspace> (size ());	482	spaces = salloc0<mapspace> (size ());
483	}	483	}
		484
		485	//+GPL
484		486
485	/* 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
486	* 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
487	* at a later date.	489	* at a later date.
488	* Called by parse_map_headers below.	490	* Called by parse_map_headers below.
…		…
565	return items;	567	return items;
566	}	568	}
567		569
568	/* 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
569	* the map (or something equivilent) into output_string. */	571	* the map (or something equivilent) into output_string. */
570	static void	572	static const char *
571	print_shop_string (maptile m, char output_string)	573	print_shop_string (maptile *m)
572	{	574	{
573	int i;	575	static dynbuf_text buf; buf.clear ();
574	char tmp[MAX_BUF];
575		576
576	strcpy (output_string, "");
577	for (i = 0; i < m->shopitems[0].index; i++)	577	for (int i = 0; i < m->shopitems[0].index; i++)
578	{	578	{
579	if (m->shopitems[i].typenum)	579	if (m->shopitems[i].typenum)
580	{	580	{
581	if (m->shopitems[i].strength)	581	if (m->shopitems[i].strength)
582	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);
583	else	583	else
584	sprintf (tmp, "%s;", m->shopitems[i].name);	584	buf.printf ("%s;", m->shopitems[i].name);
585	}	585	}
586	else	586	else
587	{	587	{
588	if (m->shopitems[i].strength)	588	if (m->shopitems[i].strength)
589	sprintf (tmp, "*:%d;", m->shopitems[i].strength);	589	buf.printf ("*:%d;", m->shopitems[i].strength);
590	else	590	else
591	sprintf (tmp, "*");	591	buf.printf ("*");
592	}	592	}
593
594	strcat (output_string, tmp);
595	}	593	}
		594
		595	return buf;
596	}	596	}
		597
		598	//-GPL
597		599
598	/* This loads the header information of the map. The header	600	/* This loads the header information of the map. The header
599	* contains things like difficulty, size, timeout, etc.	601	* contains things like difficulty, size, timeout, etc.
600	* 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
601	* addition of tiling, fields beyond that easily named in an	603	* addition of tiling, fields beyond that easily named in an
…		…
693	}	695	}
694		696
695	abort ();	697	abort ();
696	}	698	}
697		699
		700	//+GPL
		701
698	/******************************************************************************	702	/******************************************************************************
699	* This is the start of unique map handling code	703	* This is the start of unique map handling code
700	*****************************************************************************/	704	*****************************************************************************/
701		705
702	/* 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. */
…		…
718		722
719	op = above;	723	op = above;
720	}	724	}
721	}	725	}
722	}	726	}
		727
		728	//-GPL
723		729
724	bool	730	bool
725	maptile::_save_header (object_freezer &freezer)	731	maptile::_save_header (object_freezer &freezer)
726	{	732	{
727	#define MAP_OUT(k) freezer.put (KW_ ## k, k)	733	#define MAP_OUT(k) freezer.put (KW_ ## k, k)
…		…
735	MAP_OUT (reset_timeout);	741	MAP_OUT (reset_timeout);
736	MAP_OUT (fixed_resettime);	742	MAP_OUT (fixed_resettime);
737	MAP_OUT (no_reset);	743	MAP_OUT (no_reset);
738	MAP_OUT (no_drop);	744	MAP_OUT (no_drop);
739	MAP_OUT (difficulty);	745	MAP_OUT (difficulty);
740
741	if (default_region) MAP_OUT2 (region, default_region->name);	746	if (default_region) MAP_OUT2 (region, default_region->name);
742		747
743	if (shopitems)	748	if (shopitems) MAP_OUT2 (shopitems, print_shop_string (this));
744	{
745	char shop[MAX_BUF];
746	print_shop_string (this, shop);
747	MAP_OUT2 (shopitems, shop);
748	}
749
750	MAP_OUT (shopgreed);	749	MAP_OUT (shopgreed);
751	MAP_OUT (shopmin);	750	MAP_OUT (shopmin);
752	MAP_OUT (shopmax);	751	MAP_OUT (shopmax);
753	if (shoprace) MAP_OUT (shoprace);	752	if (shoprace) MAP_OUT (shoprace);
		753
754	MAP_OUT (darkness);	754	MAP_OUT (darkness);
755	MAP_OUT (width);	755	MAP_OUT (width);
756	MAP_OUT (height);	756	MAP_OUT (height);
757	MAP_OUT (enter_x);	757	MAP_OUT (enter_x);
758	MAP_OUT (enter_y);	758	MAP_OUT (enter_y);
…		…
790	if (!_save_header (freezer))	790	if (!_save_header (freezer))
791	return false;	791	return false;
792		792
793	return freezer.save (path);	793	return freezer.save (path);
794	}	794	}
		795
		796	//+GPL
795		797
796	/*	798	/*
797	* Remove and free all objects in the given map.	799	* Remove and free all objects in the given map.
798	*/	800	*/
799	void	801	void
…		…
1538	int dx, dy;	1540	int dx, dy;
1539		1541
1540	return adjacent_map (op1->map, op2->map, &dx, &dy);	1542	return adjacent_map (op1->map, op2->map, &dx, &dy);
1541	}	1543	}
1542		1544
		1545	//-GPL
		1546
1543	object *	1547	object *
1544	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)
1545	{	1549	{
1546	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);
1547	}	1551	}
…		…
1558	if (default_region)	1562	if (default_region)
1559	return default_region;	1563	return default_region;
1560		1564
1561	return ::region::default_region ();	1565	return ::region::default_region ();
1562	}	1566	}
		1567
		1568	//+GPL
1563		1569
1564	/* picks a random object from a style map.	1570	/* picks a random object from a style map.
1565	*/	1571	*/
1566	object *	1572	object *
1567	maptile::pick_random_object (rand_gen &gen) const	1573	maptile::pick_random_object (rand_gen &gen) const
…		…
1583		1589
1584	// instead of crashing in the unlikely(?) case, try to return something	1590	// instead of crashing in the unlikely(?) case, try to return something
1585	return archetype::find ("bug");	1591	return archetype::find ("bug");
1586	}	1592	}
1587		1593
		1594	//-GPL
		1595
1588	void	1596	void
1589	maptile::play_sound (faceidx sound, int x, int y) const	1597	maptile::play_sound (faceidx sound, int x, int y) const
1590	{	1598	{
1591	if (!sound)	1599	if (!sound)
1592	return;	1600	return;

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.160 by root, Mon Oct 12 14:00:57 2009 UTC vs. Revision 1.168 by root, Fri Nov 6 13:03:34 2009 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.160 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.168 by root, Fri Nov 6 13:03:34 2009 UTC