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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.99 by root, Mon Apr 16 06:23:39 2007 UTC vs.
Revision 1.111 by elmex, Thu Jul 12 18:28:09 2007 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5	* Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001-2003,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	* Crossfire TRT 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 <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	#include <unistd.h>	24	#include <unistd.h>
26		25
27	#include "global.h"	26	#include "global.h"
174	* let the player through (inventory checkers for example)	173	* let the player through (inventory checkers for example)
175	*/	174	*/
176	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))	175	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
177	return 0;	176	return 0;
178		177
179	if (ob->head != NULL)
180	ob = ob->head;	178	ob = ob->head_ ();
181		179
182	/* We basically go through the stack of objects, and if there is	180	/* We basically go through the stack of objects, and if there is
183	* some other object that has NO_PASS or FLAG_ALIVE set, return	181	* some other object that has NO_PASS or FLAG_ALIVE set, return
184	* true. If we get through the entire stack, that must mean	182	* true. If we get through the entire stack, that must mean
185	* ob is blocking it, so return 0.	183	* ob is blocking it, so return 0.
…		…
215	else	213	else
216	{	214	{
217	/* Broke apart a big nasty if into several here to make	215	/* Broke apart a big nasty if into several here to make
218	* this more readable. first check - if the space blocks	216	* this more readable. first check - if the space blocks
219	* movement, can't move here.	217	* movement, can't move here.
220	* second - if a monster, can't move there, unles it is a	218	* second - if a monster, can't move there, unless it is a
221	* hidden dm	219	* hidden dm
222	*/	220	*/
223	if (OB_MOVE_BLOCK (ob, tmp))	221	if (OB_MOVE_BLOCK (ob, tmp))
224	return 1;	222	return 1;
225	if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob &&	223
226	tmp->type != DOOR && !(QUERY_FLAG (tmp, FLAG_WIZ) && tmp->contr->hidden))	224	if (tmp->flag [FLAG_ALIVE]
		225	&& tmp->head_ () != ob
		226	&& tmp != ob
		227	&& tmp->type != DOOR
		228	&& !(tmp->flag [FLAG_WIZ] && tmp->contr->hidden))
227	return 1;	229	return 1;
228	}	230	}
229		231
230	}	232	}
231	return 0;	233	return 0;
…		…
273		275
274	/* don't have object, so don't know what types would block */	276	/* don't have object, so don't know what types would block */
275	return m1->at (sx, sy).move_block;	277	return m1->at (sx, sy).move_block;
276	}	278	}
277		279
278	for (tmp = ob->arch; tmp; tmp = tmp->more)	280	for (tmp = ob->arch; tmp; tmp = (archetype *)tmp->more)
279	{	281	{
280	flag = get_map_flags (m, &m1, x + tmp->clone.x, y + tmp->clone.y, &sx, &sy);	282	flag = get_map_flags (m, &m1, x + tmp->x, y + tmp->y, &sx, &sy);
281		283
282	if (flag & P_OUT_OF_MAP)	284	if (flag & P_OUT_OF_MAP)
283	return P_OUT_OF_MAP;	285	return P_OUT_OF_MAP;
284	if (flag & P_IS_ALIVE)	286	if (flag & P_IS_ALIVE)
285	return P_IS_ALIVE;	287	return P_IS_ALIVE;
…		…
353	{	355	{
354	if (!spaces)	356	if (!spaces)
355	return;	357	return;
356		358
357	for (mapspace *ms = spaces + size (); ms-- > spaces; )	359	for (mapspace *ms = spaces + size (); ms-- > spaces; )
358	for (object *tmp = ms->bot; tmp; tmp = tmp->above)	360	{
		361	object *op = ms->bot;
		362	while (op)
359	{	363	{
360	/* already multipart - don't do anything more */	364	/* already multipart - don't do anything more */
361	if (!tmp->head && !tmp->more)	365	if (op->head_ () == op && !op->more && op->arch->more)
362	{
363	/* If there is nothing more to this object, this for loop
364	* won't do anything.
365	*/
366	archetype *at;
367	object last, op;
368	for (at = tmp->arch->more, last = tmp;
369	at;
370	at = at->more, last = op)
371	{	366	{
372	op = arch_to_object (at);	367	op->remove ();
		368	op->expand_tail ();
373		369
374	/* update x,y coordinates */	370	// FIXME: INS_ON_TOP is just a workaround for the pentagram vs.
375	op->x += tmp->x;	371	// multi-tile monster bug, where INS_ABOVE_FLOOR_ONLY put the monsters
376	op->y += tmp->y;	372	// below the pentagrams... hopefully INS_ON_TOP doesn't break anything
377	op->head = tmp;
378	op->map = this;
379	last->more = op;
380	op->name = tmp->name;
381	op->title = tmp->title;
382
383	/* we could link all the parts onto tmp, and then just
384	* call insert_ob_in_map once, but the effect is the same,
385	* as insert_ob_in_map will call itself with each part, and
386	* the coding is simpler to just to it here with each part.
387	*/
388	insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE \| INS_ABOVE_FLOOR_ONLY \| INS_NO_WALK_ON);	373	insert (op, op->x, op->y, 0, INS_NO_MERGE \| INS_ON_TOP \| INS_NO_WALK_ON);
		374
		375	op = ms->bot; // we are mutating the mapspace too much with INS_ON_TOP
		376	// so we have to reset the iteration through the mapspace
389	}	377	}
		378	else
		379	op = op->above;
390	}	380	}
391	}	381	}
392	}	382	}
393		383
394	/*	384	/*
395	* Loads (ands parses) the objects into a given map from the specified	385	* Loads (ands parses) the objects into a given map from the specified
396	* file pointer.	386	* file pointer.
…		…
398	bool	388	bool
399	maptile::_load_objects (object_thawer &f)	389	maptile::_load_objects (object_thawer &f)
400	{	390	{
401	for (;;)	391	for (;;)
402	{	392	{
403	coroapi::cede_every (1000); // cede once in a while	393	coroapi::cede_to_tick_every (100); // cede once in a while
404		394
405	switch (f.kw)	395	switch (f.kw)
406	{	396	{
407	case KW_arch:	397	case KW_arch:
408	if (object *op = object::read (f, this))	398	if (object *op = object::read (f, this))
…		…
431	}	421	}
432		422
433	void	423	void
434	maptile::activate ()	424	maptile::activate ()
435	{	425	{
		426	active = true;
		427
436	if (!spaces)	428	if (spaces)
437	return;
438
439	for (mapspace *ms = spaces + size (); ms-- > spaces; )	429	for (mapspace *ms = spaces + size (); ms-- > spaces; )
440	for (object *op = ms->bot; op; op = op->above)	430	for (object *op = ms->bot; op; op = op->above)
441	op->activate_recursive ();	431	op->activate_recursive ();
442	}	432	}
443		433
444	void	434	void
445	maptile::deactivate ()	435	maptile::deactivate ()
446	{	436	{
		437	active = false;
		438
447	if (!spaces)	439	if (spaces)
448	return;
449
450	for (mapspace *ms = spaces + size (); ms-- > spaces; )	440	for (mapspace *ms = spaces + size (); ms-- > spaces; )
451	for (object *op = ms->bot; op; op = op->above)	441	for (object *op = ms->bot; op; op = op->above)
452	op->deactivate_recursive ();	442	op->deactivate_recursive ();
453	}	443	}
454		444
455	bool	445	bool
456	maptile::_save_objects (object_freezer &f, int flags)	446	maptile::_save_objects (object_freezer &f, int flags)
457	{	447	{
458	coroapi::cede ();	448	coroapi::cede_to_tick ();
459		449
460	if (flags & IO_HEADER)	450	if (flags & IO_HEADER)
461	_save_header (f);	451	_save_header (f);
462		452
463	if (!spaces)	453	if (!spaces)
…		…
482	else if (flags & IO_OBJECTS)	472	else if (flags & IO_OBJECTS)
483	op->write (f);	473	op->write (f);
484	}	474	}
485	}	475	}
486		476
487	coroapi::cede ();	477	coroapi::cede_to_tick ();
488		478
489	return true;	479	return true;
490	}	480	}
491		481
492	bool	482	bool
…		…
691	bool	681	bool
692	maptile::_load_header (object_thawer &thawer)	682	maptile::_load_header (object_thawer &thawer)
693	{	683	{
694	for (;;)	684	for (;;)
695	{	685	{
696	keyword kw = thawer.get_kv ();	686	thawer.next ();
697		687
698	switch (kw)	688	switch (thawer.kw)
699	{	689	{
700	case KW_msg:	690	case KW_msg:
701	thawer.get_ml (KW_endmsg, msg);	691	thawer.get_ml (KW_endmsg, msg);
702	break;	692	break;
703		693
…		…
735	case KW_winddir: thawer.get (winddir); break;	725	case KW_winddir: thawer.get (winddir); break;
736	case KW_sky: thawer.get (sky); break;	726	case KW_sky: thawer.get (sky); break;
737		727
738	case KW_per_player: thawer.get (per_player); break;	728	case KW_per_player: thawer.get (per_player); break;
739	case KW_per_party: thawer.get (per_party); break;	729	case KW_per_party: thawer.get (per_party); break;
		730	case KW_no_reset: thawer.get (no_reset); break;
740		731
741	case KW_region: default_region = region::find (thawer.get_str ()); break;	732	case KW_region: default_region = region::find (thawer.get_str ()); break;
742	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	733	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
743		734
744	// old names new names	735	// old names new names
…		…
797	object *above = op->above;	788	object *above = op->above;
798		789
799	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	790	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
800	unique = 1;	791	unique = 1;
801		792
802	if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	793	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))
803	{	794	{
804	op->destroy_inv (false);	795	op->destroy_inv (false);
805	op->destroy ();	796	op->destroy ();
806	}	797	}
807		798
…		…
821	if (name) MAP_OUT (name);	812	if (name) MAP_OUT (name);
822	MAP_OUT (swap_time);	813	MAP_OUT (swap_time);
823	MAP_OUT (reset_time);	814	MAP_OUT (reset_time);
824	MAP_OUT (reset_timeout);	815	MAP_OUT (reset_timeout);
825	MAP_OUT (fixed_resettime);	816	MAP_OUT (fixed_resettime);
		817	MAP_OUT (no_reset);
826	MAP_OUT (difficulty);	818	MAP_OUT (difficulty);
827		819
828	if (default_region) MAP_OUT2 (region, default_region->name);	820	if (default_region) MAP_OUT2 (region, default_region->name);
829		821
830	if (shopitems)	822	if (shopitems)
…		…
892	if (spaces)	884	if (spaces)
893	{	885	{
894	for (mapspace *ms = spaces + size (); ms-- > spaces; )	886	for (mapspace *ms = spaces + size (); ms-- > spaces; )
895	while (object *op = ms->bot)	887	while (object *op = ms->bot)
896	{	888	{
897	if (op->head)
898	op = op->head;	889	op = op->head_ ();
899
900	op->destroy_inv (false);	890	op->destroy_inv (false);
901	op->destroy ();	891	op->destroy ();
902	}	892	}
903		893
904	sfree (spaces, size ()), spaces = 0;	894	sfree (spaces, size ()), spaces = 0;
…		…
943	maptile::do_destroy ()	933	maptile::do_destroy ()
944	{	934	{
945	attachable::do_destroy ();	935	attachable::do_destroy ();
946		936
947	clear ();	937	clear ();
		938	}
		939
		940	/* decay and destroy perishable items in a map */
		941	void
		942	maptile::do_decay_objects ()
		943	{
		944	if (!spaces)
		945	return;
		946
		947	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		948	for (object above, op = ms->bot; op; op = above)
		949	{
		950	above = op->above;
		951
		952	bool destroy = 0;
		953
		954	// do not decay anything above unique floor tiles (yet :)
		955	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
		956	break;
		957
		958	if (QUERY_FLAG (op, FLAG_IS_FLOOR)
		959	\|\| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
		960	\|\| QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
		961	\|\| QUERY_FLAG (op, FLAG_UNIQUE)
		962	\|\| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
		963	\|\| QUERY_FLAG (op, FLAG_UNPAID)
		964	\|\| op->is_alive ())
		965	; // do not decay
		966	else if (op->is_weapon ())
		967	{
		968	op->stats.dam--;
		969	if (op->stats.dam < 0)
		970	destroy = 1;
		971	}
		972	else if (op->is_armor ())
		973	{
		974	op->stats.ac--;
		975	if (op->stats.ac < 0)
		976	destroy = 1;
		977	}
		978	else if (op->type == FOOD)
		979	{
		980	op->stats.food -= rndm (5, 20);
		981	if (op->stats.food < 0)
		982	destroy = 1;
		983	}
		984	else
		985	{
		986	int mat = op->materials;
		987
		988	if (mat & M_PAPER
		989	\|\| mat & M_LEATHER
		990	\|\| mat & M_WOOD
		991	\|\| mat & M_ORGANIC
		992	\|\| mat & M_CLOTH
		993	\|\| mat & M_LIQUID
		994	\|\| (mat & M_IRON && rndm (1, 5) == 1)
		995	\|\| (mat & M_GLASS && rndm (1, 2) == 1)
		996	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)
		997	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)
		998	\|\| (mat & M_ICE && temp > 32))
		999	destroy = 1;
		1000	}
		1001
		1002	/* adjust overall chance below */
		1003	if (destroy && rndm (0, 1))
		1004	op->destroy ();
		1005	}
948	}	1006	}
949		1007
950	/*	1008	/*
951	* Updates every button on the map (by calling update_button() for them).	1009	* Updates every button on the map (by calling update_button() for them).
952	*/	1010	*/
…		…
1000	if (QUERY_FLAG (op, FLAG_GENERATOR))	1058	if (QUERY_FLAG (op, FLAG_GENERATOR))
1001	{	1059	{
1002	total_exp += op->stats.exp;	1060	total_exp += op->stats.exp;
1003		1061
1004	if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))	1062	if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1005	total_exp += at->clone.stats.exp * 8;	1063	total_exp += at->stats.exp * 8;
1006		1064
1007	monster_cnt++;	1065	monster_cnt++;
1008	}	1066	}
1009	}	1067	}
1010		1068

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.99 by root, Mon Apr 16 06:23:39 2007 UTC vs. Revision 1.111 by elmex, Thu Jul 12 18:28:09 2007 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.99 by root, Mon Apr 16 06:23:39 2007 UTC vs.
Revision 1.111 by elmex, Thu Jul 12 18:28:09 2007 UTC