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

Comparing deliantra/server/common/map.C (file contents):
Revision 1.74 by root, Sun Jan 14 23:35:03 2007 UTC vs.
Revision 1.110 by root, Sun Jul 1 05:00:17 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.	20	*
21
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 <global.h>
26	#include <funcpoint.h>
27
28	#include <loader.h>
29	#include <unistd.h>	24	#include <unistd.h>
		25
		26	#include "global.h"
		27	#include "funcpoint.h"
		28
		29	#include "loader.h"
30		30
31	#include "path.h"	31	#include "path.h"
32		32
33	/*	33	/*
34	* This makes a path absolute outside the world of Crossfire.	34	* This makes a path absolute outside the world of Crossfire.
67	char *endbuf;	67	char *endbuf;
68	struct stat statbuf;	68	struct stat statbuf;
69	int mode = 0;	69	int mode = 0;
70		70
71	if (prepend_dir)	71	if (prepend_dir)
72	strcpy (buf, create_pathname (name));	72	assign (buf, create_pathname (name));
73	else	73	else
74	strcpy (buf, name);	74	assign (buf, name);
75		75
76	/* old method (strchr(buf, '\0')) seemd very odd to me -	76	/* old method (strchr(buf, '\0')) seemd very odd to me -
77	* this method should be equivalant and is clearer.	77	* this method should be equivalant and is clearer.
78	* Can not use strcat because we need to cycle through	78	* Can not use strcat because we need to cycle through
79	* all the names.	79	* all the names.
…		…
173	* let the player through (inventory checkers for example)	173	* let the player through (inventory checkers for example)
174	*/	174	*/
175	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))	175	if (!(mflags & P_IS_ALIVE) && !OB_TYPE_MOVE_BLOCK (ob, blocked))
176	return 0;	176	return 0;
177		177
178	if (ob->head != NULL)
179	ob = ob->head;	178	ob = ob->head_ ();
180		179
181	/* 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
182	* 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
183	* true. If we get through the entire stack, that must mean	182	* true. If we get through the entire stack, that must mean
184	* ob is blocking it, so return 0.	183	* ob is blocking it, so return 0.
…		…
214	else	213	else
215	{	214	{
216	/* Broke apart a big nasty if into several here to make	215	/* Broke apart a big nasty if into several here to make
217	* this more readable. first check - if the space blocks	216	* this more readable. first check - if the space blocks
218	* movement, can't move here.	217	* movement, can't move here.
219	* 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
220	* hidden dm	219	* hidden dm
221	*/	220	*/
222	if (OB_MOVE_BLOCK (ob, tmp))	221	if (OB_MOVE_BLOCK (ob, tmp))
223	return 1;	222	return 1;
224	if (QUERY_FLAG (tmp, FLAG_ALIVE) && tmp->head != ob && tmp != ob &&	223
225	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))
226	return 1;	229	return 1;
227	}	230	}
228		231
229	}	232	}
230	return 0;	233	return 0;
231	}	234	}
232
233		235
234	/*	236	/*
235	* Returns true if the given object can't fit in the given spot.	237	* Returns true if the given object can't fit in the given spot.
236	* This is meant for multi space objects - for single space objecs,	238	* This is meant for multi space objects - for single space objecs,
237	* just calling get_map_blocked and checking that against movement type	239	* just calling get_map_blocked and checking that against movement type
…		…
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;
…		…
344	}	346	}
345		347
346	/* link_multipart_objects go through all the objects on the map looking	348	/* link_multipart_objects go through all the objects on the map looking
347	* for objects whose arch says they are multipart yet according to the	349	* for objects whose arch says they are multipart yet according to the
348	* info we have, they only have the head (as would be expected when	350	* info we have, they only have the head (as would be expected when
349	* they are saved). We do have to look for the old maps that did save	351	* they are saved).
350	* the more sections and not re-add sections for them.
351	*/	352	*/
352	void	353	void
353	maptile::link_multipart_objects ()	354	maptile::link_multipart_objects ()
354	{	355	{
355	if (!spaces)	356	if (!spaces)
356	return;	357	return;
357		358
358	for (mapspace *ms = spaces + size (); ms-- > spaces; )	359	for (mapspace *ms = spaces + size (); ms-- > spaces; )
359	for (object *tmp = ms->bot; tmp; )	360	for (object *op = ms->bot; op; op = op->above)
360	{	361	{
361	object *above = tmp->above;
362
363	/* already multipart - don't do anything more */	362	/* already multipart - don't do anything more */
364	if (!tmp->head && !tmp->more)	363	if (op->head_ () == op && !op->more && op->arch->more)
365	{	364	{
366	/* If there is nothing more to this object, this for loop	365	op->remove ();
367	* won't do anything.	366	op->expand_tail ();
368	*/
369	archetype *at;
370	object last, op;
371	for (at = tmp->arch->more, last = tmp;
372	at;
373	at = at->more, last = op)
374	{
375	op = arch_to_object (at);
376
377	/* update x,y coordinates */
378	op->x += tmp->x;
379	op->y += tmp->y;
380	op->head = tmp;
381	op->map = this;
382	last->more = op;
383	op->name = tmp->name;
384	op->title = tmp->title;
385
386	/* we could link all the parts onto tmp, and then just
387	* call insert_ob_in_map once, but the effect is the same,
388	* as insert_ob_in_map will call itself with each part, and
389	* the coding is simpler to just to it here with each part.
390	*/
391	insert_ob_in_map (op, op->map, tmp, INS_NO_MERGE \| INS_ABOVE_FLOOR_ONLY \| INS_NO_WALK_ON);	367	insert (op, op->x, op->y, 0, INS_NO_MERGE \| INS_ABOVE_FLOOR_ONLY \| INS_NO_WALK_ON);
392	}
393	}	368	}
394
395	tmp = above;
396	}	369	}
397	}	370	}
398		371
399	/*	372	/*
400	* Loads (ands parses) the objects into a given map from the specified	373	* Loads (ands parses) the objects into a given map from the specified
401	* file pointer.	374	* file pointer.
402	* mapflags is the same as we get with load_original_map
403	*/	375	*/
404	bool	376	bool
405	maptile::_load_objects (object_thawer &thawer)	377	maptile::_load_objects (object_thawer &f)
406	{	378	{
407	int unique;	379	for (;;)
408	object op, prev = NULL, last_more = NULL, otmp;
409
410	op = object::create ();
411	op->map = this; /* To handle buttons correctly */
412
413	while (int i = load_object (thawer, op, 0))
414	{	380	{
415	/* if the archetype for the object is null, means that we	381	coroapi::cede_to_tick_every (100); // cede once in a while
416	* got an invalid object. Don't do anything with it - the game	382
417	* or editor will not be able to do anything with it either.	383	switch (f.kw)
418	*/
419	if (op->arch == NULL)
420	{	384	{
421	LOG (llevDebug, "Discarding object without arch: %s\n", op->name ? (const char *) op->name : "(null)");	385	case KW_arch:
422	continue;	386	if (object *op = object::read (f, this))
423	}
424
425	switch (i)
426	{	387	{
427	case LL_NORMAL:	388	if (op->inv)
		389	sum_weight (op);
		390
428	insert_ob_in_map (op, this, op, INS_NO_MERGE \| INS_NO_WALK_ON \| INS_ON_TOP \| INS_MAP_LOAD);	391	insert_ob_in_map (op, this, op, INS_NO_MERGE \| INS_NO_WALK_ON \| INS_ON_TOP \| INS_MAP_LOAD);
		392	}
429		393
430	if (op->inv)	394	continue;
431	sum_weight (op);
432		395
433	prev = op, last_more = op;
434	break;
435
436	case LL_MORE:	396	case KW_EOF:
437	insert_ob_in_map (op, this, op, INS_NO_MERGE \| INS_NO_WALK_ON \| INS_ABOVE_FLOOR_ONLY);	397	return true;
438	op->head = prev, last_more->more = op, last_more = op;	398
		399	default:
		400	if (!f.parse_error ("map file"))
		401	return false;
439	break;	402	break;
440	}	403	}
441		404
442	op = object::create ();	405	f.next ();
443	op->map = this;
444	}
445
446	op->destroy ();
447
448	#if 0
449	for (i = 0; i < width; i++)
450	for (j = 0; j < height; j++)
451	{
452	unique = 0;
453	/* check for unique items, or unique squares */
454	for (otmp = GET_MAP_OB (m, i, j); otmp; otmp = otmp->above)
455	{
456	if (QUERY_FLAG (otmp, FLAG_UNIQUE) \|\| QUERY_FLAG (otmp, FLAG_OBJ_SAVE_ON_OVL))
457	unique = 1;
458
459	if (!(mapflags & (MAP_OVERLAY \| MAP_PLAYER_UNIQUE) \|\| unique))
460	SET_FLAG (otmp, FLAG_OBJ_ORIGINAL);
461	}
462	}	406	}
463	#endif
464		407
465	return true;	408	return true;
466	}	409	}
467		410
468	void	411	void
469	maptile::activate ()	412	maptile::activate ()
470	{	413	{
		414	active = true;
		415
471	if (!spaces)	416	if (spaces)
472	return;
473
474	for (mapspace *ms = spaces + size (); ms-- > spaces; )	417	for (mapspace *ms = spaces + size (); ms-- > spaces; )
475	for (object *op = ms->bot; op; op = op->above)	418	for (object *op = ms->bot; op; op = op->above)
476	op->activate_recursive ();	419	op->activate_recursive ();
477	}	420	}
478		421
479	void	422	void
480	maptile::deactivate ()	423	maptile::deactivate ()
481	{	424	{
		425	active = false;
		426
482	if (!spaces)	427	if (spaces)
483	return;
484
485	for (mapspace *ms = spaces + size (); ms-- > spaces; )	428	for (mapspace *ms = spaces + size (); ms-- > spaces; )
486	for (object *op = ms->bot; op; op = op->above)	429	for (object *op = ms->bot; op; op = op->above)
487	op->deactivate_recursive ();	430	op->deactivate_recursive ();
488	}	431	}
489		432
490	bool	433	bool
491	maptile::_save_objects (object_freezer &freezer, int flags)	434	maptile::_save_objects (object_freezer &f, int flags)
492	{	435	{
493	static int cede_count = 0;	436	coroapi::cede_to_tick ();
494		437
495	if (flags & IO_HEADER)	438	if (flags & IO_HEADER)
496	_save_header (freezer);	439	_save_header (f);
497		440
498	if (!spaces)	441	if (!spaces)
499	return false;	442	return false;
500		443
501	for (int i = 0; i < size (); ++i)	444	for (int i = 0; i < size (); ++i)
502	{	445	{
503	#if 0 // temporarily disabled for improved(?) stability, schmorp #TODO#d#//D
504	if (cede_count >= 500)
505	{
506	cede_count = 0;
507	coroapi::cede ();
508	}
509	#endif
510
511	int unique = 0;	446	int unique = 0;
512	for (object *op = spaces [i].bot; op; op = op->above)	447	for (object *op = spaces [i].bot; op; op = op->above)
513	{	448	{
514	// count per-object, but cede only when modification-safe
515	cede_count++;
516
517	if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])	449	if (op->flag [FLAG_UNIQUE] && op->flag [FLAG_IS_FLOOR])
518	unique = 1;	450	unique = 1;
519		451
520	if (!op->can_map_save ())	452	if (!op->can_map_save ())
521	continue;	453	continue;
522		454
523	if (unique \|\| op->flag [FLAG_UNIQUE])	455	if (unique \|\| op->flag [FLAG_UNIQUE])
524	{	456	{
525	if (flags & IO_UNIQUES)	457	if (flags & IO_UNIQUES)
526	save_object (freezer, op, 1);	458	op->write (f);
527	}	459	}
528	else if (flags & IO_OBJECTS)	460	else if (flags & IO_OBJECTS)
529	save_object (freezer, op, 1);	461	op->write (f);
530	}	462	}
531	}	463	}
		464
		465	coroapi::cede_to_tick ();
532		466
533	return true;	467	return true;
534	}	468	}
535		469
536	bool	470	bool
537	maptile::_load_objects (const char *path, bool skip_header)	471	maptile::_load_objects (const char *path, bool skip_header)
538	{	472	{
539	object_thawer thawer (path);	473	object_thawer f (path);
540		474
541	if (!thawer)	475	if (!f)
542	return false;	476	return false;
		477
		478	f.next ();
543		479
544	if (skip_header)	480	if (skip_header)
545	for (;;)	481	for (;;)
546	{	482	{
547	keyword kw = thawer.get_kv ();	483	keyword kw = f.kw;
548		484	f.skip ();
549	if (kw == KW_end)	485	if (kw == KW_end)
550	break;	486	break;
551
552	thawer.skip_kv (kw);
553	}	487	}
554		488
555	return _load_objects (thawer);	489	return _load_objects (f);
556	}	490	}
557		491
558	bool	492	bool
559	maptile::_save_objects (const char *path, int flags)	493	maptile::_save_objects (const char *path, int flags)
560	{	494	{
…		…
569	maptile::maptile ()	503	maptile::maptile ()
570	{	504	{
571	in_memory = MAP_SWAPPED;	505	in_memory = MAP_SWAPPED;
572		506
573	/* The maps used to pick up default x and y values from the	507	/* The maps used to pick up default x and y values from the
574	* map archetype. Mimic that behaviour.	508	* map archetype. Mimic that behaviour.
575	*/	509	*/
576	width = 16;	510	width = 16;
577	height = 16;	511	height = 16;
578	reset_timeout = 0;
579	timeout = 300;	512	timeout = 300;
580	enter_x = 0;	513	max_nrof = 1000; // 1000 items of anything
581	enter_y = 0;	514	max_volume = 2000000; // 2m³
582	}	515	}
583		516
584	maptile::maptile (int w, int h)	517	maptile::maptile (int w, int h)
585	{	518	{
586	in_memory = MAP_SWAPPED;	519	in_memory = MAP_SWAPPED;
…		…
736	bool	669	bool
737	maptile::_load_header (object_thawer &thawer)	670	maptile::_load_header (object_thawer &thawer)
738	{	671	{
739	for (;;)	672	for (;;)
740	{	673	{
741	keyword kw = thawer.get_kv ();	674	thawer.next ();
742		675
743	switch (kw)	676	switch (thawer.kw)
744	{	677	{
745	case KW_EOF:
746	LOG (llevError, "%s: end of file while reading map header, aborting header load.\n", &path);
747	return false;
748
749	case KW_end:
750	return true;
751
752	default:
753	case KW_ERROR:
754	LOG (llevError, "%s: skipping errornous line (%s) while reading map header.\n", &path, thawer.last_keyword);
755	break;
756
757	case KW_msg:	678	case KW_msg:
758	thawer.get_ml (KW_endmsg, msg);	679	thawer.get_ml (KW_endmsg, msg);
759	break;	680	break;
760		681
761	case KW_lore: // CF+ extension	682	case KW_lore: // CF+ extension
…		…
792	case KW_winddir: thawer.get (winddir); break;	713	case KW_winddir: thawer.get (winddir); break;
793	case KW_sky: thawer.get (sky); break;	714	case KW_sky: thawer.get (sky); break;
794		715
795	case KW_per_player: thawer.get (per_player); break;	716	case KW_per_player: thawer.get (per_player); break;
796	case KW_per_party: thawer.get (per_party); break;	717	case KW_per_party: thawer.get (per_party); break;
		718	case KW_no_reset: thawer.get (no_reset); break;
797		719
798	case KW_region: get_region_by_name (thawer.get_str ()); break;	720	case KW_region: default_region = region::find (thawer.get_str ()); break;
799	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;	721	case KW_shopitems: shopitems = parse_shop_string (thawer.get_str ()); break;
800		722
801	// old names new names	723	// old names new names
802	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;	724	case KW_hp: case KW_enter_x: thawer.get (enter_x); break;
803	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;	725	case KW_sp: case KW_enter_y: thawer.get (enter_y); break;
…		…
811		733
812	case KW_tile_path_1: thawer.get (tile_path [0]); break;	734	case KW_tile_path_1: thawer.get (tile_path [0]); break;
813	case KW_tile_path_2: thawer.get (tile_path [1]); break;	735	case KW_tile_path_2: thawer.get (tile_path [1]); break;
814	case KW_tile_path_3: thawer.get (tile_path [2]); break;	736	case KW_tile_path_3: thawer.get (tile_path [2]); break;
815	case KW_tile_path_4: thawer.get (tile_path [3]); break;	737	case KW_tile_path_4: thawer.get (tile_path [3]); break;
		738
		739	case KW_end:
		740	return true;
		741
		742	default:
		743	if (!thawer.parse_error ("map", 0))
		744	return false;
		745	break;
816	}	746	}
817	}	747	}
818		748
819	abort ();	749	abort ();
820	}	750	}
…		…
846	object *above = op->above;	776	object *above = op->above;
847		777
848	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))	778	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
849	unique = 1;	779	unique = 1;
850		780
851	if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))	781	if (op->head_ () == op && (QUERY_FLAG (op, FLAG_UNIQUE) \|\| unique))
852	{	782	{
853	op->destroy_inv (false);	783	op->destroy_inv (false);
854	op->destroy ();	784	op->destroy ();
855	}	785	}
856		786
…		…
870	if (name) MAP_OUT (name);	800	if (name) MAP_OUT (name);
871	MAP_OUT (swap_time);	801	MAP_OUT (swap_time);
872	MAP_OUT (reset_time);	802	MAP_OUT (reset_time);
873	MAP_OUT (reset_timeout);	803	MAP_OUT (reset_timeout);
874	MAP_OUT (fixed_resettime);	804	MAP_OUT (fixed_resettime);
		805	MAP_OUT (no_reset);
875	MAP_OUT (difficulty);	806	MAP_OUT (difficulty);
876		807
877	if (region) MAP_OUT2 (region, region->name);	808	if (default_region) MAP_OUT2 (region, default_region->name);
878		809
879	if (shopitems)	810	if (shopitems)
880	{	811	{
881	char shop[MAX_BUF];	812	char shop[MAX_BUF];
882	print_shop_string (this, shop);	813	print_shop_string (this, shop);
…		…
933	* Remove and free all objects in the given map.	864	* Remove and free all objects in the given map.
934	*/	865	*/
935	void	866	void
936	maptile::clear ()	867	maptile::clear ()
937	{	868	{
		869	sfree (regions, size ()), regions = 0;
		870	free (regionmap), regionmap = 0;
		871
938	if (!spaces)	872	if (spaces)
939	return;	873	{
940
941	for (mapspace *ms = spaces + size (); ms-- > spaces; )	874	for (mapspace *ms = spaces + size (); ms-- > spaces; )
942	while (object *op = ms->bot)	875	while (object *op = ms->bot)
943	{	876	{
944	if (op->head)
945	op = op->head;	877	op = op->head_ ();
946
947	op->destroy_inv (false);	878	op->destroy_inv (false);
948	op->destroy ();	879	op->destroy ();
949	}	880	}
950		881
951	sfree (spaces, size ()), spaces = 0;	882	sfree (spaces, size ()), spaces = 0;
		883	}
952		884
953	if (buttons)	885	if (buttons)
954	free_objectlinkpt (buttons), buttons = 0;	886	free_objectlinkpt (buttons), buttons = 0;
955	}	887	}
956		888
…		…
989	maptile::do_destroy ()	921	maptile::do_destroy ()
990	{	922	{
991	attachable::do_destroy ();	923	attachable::do_destroy ();
992		924
993	clear ();	925	clear ();
		926	}
		927
		928	/* decay and destroy perishable items in a map */
		929	void
		930	maptile::do_decay_objects ()
		931	{
		932	if (!spaces)
		933	return;
		934
		935	for (mapspace *ms = spaces + size (); ms-- > spaces; )
		936	for (object above, op = ms->bot; op; op = above)
		937	{
		938	above = op->above;
		939
		940	bool destroy = 0;
		941
		942	// do not decay anything above unique floor tiles (yet :)
		943	if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
		944	break;
		945
		946	if (QUERY_FLAG (op, FLAG_IS_FLOOR)
		947	\|\| QUERY_FLAG (op, FLAG_OBJ_ORIGINAL)
		948	\|\| QUERY_FLAG (op, FLAG_OBJ_SAVE_ON_OVL)
		949	\|\| QUERY_FLAG (op, FLAG_UNIQUE)
		950	\|\| QUERY_FLAG (op, FLAG_OVERLAY_FLOOR)
		951	\|\| QUERY_FLAG (op, FLAG_UNPAID)
		952	\|\| op->is_alive ())
		953	; // do not decay
		954	else if (op->is_weapon ())
		955	{
		956	op->stats.dam--;
		957	if (op->stats.dam < 0)
		958	destroy = 1;
		959	}
		960	else if (op->is_armor ())
		961	{
		962	op->stats.ac--;
		963	if (op->stats.ac < 0)
		964	destroy = 1;
		965	}
		966	else if (op->type == FOOD)
		967	{
		968	op->stats.food -= rndm (5, 20);
		969	if (op->stats.food < 0)
		970	destroy = 1;
		971	}
		972	else
		973	{
		974	int mat = op->materials;
		975
		976	if (mat & M_PAPER
		977	\|\| mat & M_LEATHER
		978	\|\| mat & M_WOOD
		979	\|\| mat & M_ORGANIC
		980	\|\| mat & M_CLOTH
		981	\|\| mat & M_LIQUID
		982	\|\| (mat & M_IRON && rndm (1, 5) == 1)
		983	\|\| (mat & M_GLASS && rndm (1, 2) == 1)
		984	\|\| ((mat & M_STONE \|\| mat & M_ADAMANT) && rndm (1, 10) == 1)
		985	\|\| ((mat & M_SOFT_METAL \|\| mat & M_BONE) && rndm (1, 3) == 1)
		986	\|\| (mat & M_ICE && temp > 32))
		987	destroy = 1;
		988	}
		989
		990	/* adjust overall chance below */
		991	if (destroy && rndm (0, 1))
		992	op->destroy ();
		993	}
994	}	994	}
995		995
996	/*	996	/*
997	* Updates every button on the map (by calling update_button() for them).	997	* Updates every button on the map (by calling update_button() for them).
998	*/	998	*/
…		…
1046	if (QUERY_FLAG (op, FLAG_GENERATOR))	1046	if (QUERY_FLAG (op, FLAG_GENERATOR))
1047	{	1047	{
1048	total_exp += op->stats.exp;	1048	total_exp += op->stats.exp;
1049		1049
1050	if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))	1050	if (archetype *at = type_to_archetype (GENERATE_TYPE (op)))
1051	total_exp += at->clone.stats.exp * 8;	1051	total_exp += at->stats.exp * 8;
1052		1052
1053	monster_cnt++;	1053	monster_cnt++;
1054	}	1054	}
1055	}	1055	}
1056		1056
…		…
1111	void	1111	void
1112	mapspace::update_ ()	1112	mapspace::update_ ()
1113	{	1113	{
1114	object tmp, last = 0;	1114	object tmp, last = 0;
1115	uint8 flags = P_UPTODATE, light = 0, anywhere = 0;	1115	uint8 flags = P_UPTODATE, light = 0, anywhere = 0;
1116	New_Face top, floor, *middle;
1117	object top_obj, floor_obj, *middle_obj;
1118	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;	1116	MoveType move_block = 0, move_slow = 0, move_on = 0, move_off = 0, move_allow = 0;
1119		1117
1120	middle = blank_face;	1118	//object *middle = 0;
1121	top = blank_face;	1119	//object *top = 0;
1122	floor = blank_face;	1120	//object *floor = 0;
1123		1121	// this seems to generate better code than using locals, above
1124	middle_obj = 0;	1122	object *&top = faces_obj[0] = 0;
1125	top_obj = 0;	1123	object *&middle = faces_obj[1] = 0;
1126	floor_obj = 0;	1124	object *&floor = faces_obj[2] = 0;
1127		1125
1128	for (tmp = bot; tmp; last = tmp, tmp = tmp->above)	1126	for (tmp = bot; tmp; last = tmp, tmp = tmp->above)
1129	{	1127	{
1130	/* This could be made additive I guess (two lights better than	1128	/* This could be made additive I guess (two lights better than
1131	* one). But if so, it shouldn't be a simple additive - 2	1129	* one). But if so, it shouldn't be a simple additive - 2
…		…
1144	* Always put the player down for drawing.	1142	* Always put the player down for drawing.
1145	*/	1143	*/
1146	if (!tmp->invisible)	1144	if (!tmp->invisible)
1147	{	1145	{
1148	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))	1146	if ((tmp->type == PLAYER \|\| QUERY_FLAG (tmp, FLAG_MONSTER)))
1149	{
1150	top = tmp->face;
1151	top_obj = tmp;	1147	top = tmp;
1152	}
1153	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1148	else if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1154	{	1149	{
1155	/* If we got a floor, that means middle and top were below it,	1150	/* If we got a floor, that means middle and top were below it,
1156	* so should not be visible, so we clear them.	1151	* so should not be visible, so we clear them.
1157	*/	1152	*/
1158	middle = blank_face;	1153	middle = 0;
1159	top = blank_face;	1154	top = 0;
1160	floor = tmp->face;
1161	floor_obj = tmp;	1155	floor = tmp;
1162	}	1156	}
1163	/* Flag anywhere have high priority */	1157	/* Flag anywhere have high priority */
1164	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))	1158	else if (QUERY_FLAG (tmp, FLAG_SEE_ANYWHERE))
1165	{	1159	{
1166	middle = tmp->face;
1167
1168	middle_obj = tmp;	1160	middle = tmp;
1169	anywhere = 1;	1161	anywhere = 1;
1170	}	1162	}
1171	/* Find the highest visible face around. If equal	1163	/* Find the highest visible face around. If equal
1172	* visibilities, we still want the one nearer to the	1164	* visibilities, we still want the one nearer to the
1173	* top	1165	* top
1174	*/	1166	*/
1175	else if (middle == blank_face \|\| (tmp->face->visibility > middle->visibility && !anywhere))	1167	else if (!middle \|\| (::faces [tmp->face].visibility > ::faces [middle->face].visibility && !anywhere))
1176	{
1177	middle = tmp->face;
1178	middle_obj = tmp;	1168	middle = tmp;
1179	}
1180	}	1169	}
1181		1170
1182	if (tmp == tmp->above)	1171	if (tmp == tmp->above)
1183	{	1172	{
1184	LOG (llevError, "Error in structure of map\n");	1173	LOG (llevError, "Error in structure of map\n");
…		…
1219	* middle face. This should not happen, as we already have the	1208	* middle face. This should not happen, as we already have the
1220	* else statement above so middle should not get set. OTOH, it	1209	* else statement above so middle should not get set. OTOH, it
1221	* may be possible for the faces to match but be different objects.	1210	* may be possible for the faces to match but be different objects.
1222	*/	1211	*/
1223	if (top == middle)	1212	if (top == middle)
1224	middle = blank_face;	1213	middle = 0;
1225		1214
1226	/* There are three posibilities at this point:	1215	/* There are three posibilities at this point:
1227	* 1) top face is set, need middle to be set.	1216	* 1) top face is set, need middle to be set.
1228	* 2) middle is set, need to set top.	1217	* 2) middle is set, need to set top.
1229	* 3) neither middle or top is set - need to set both.	1218	* 3) neither middle or top is set - need to set both.
…		…
1234	/* Once we get to a floor, stop, since we already have a floor object */	1223	/* Once we get to a floor, stop, since we already have a floor object */
1235	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1224	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1236	break;	1225	break;
1237		1226
1238	/* If two top faces are already set, quit processing */	1227	/* If two top faces are already set, quit processing */
1239	if ((top != blank_face) && (middle != blank_face))	1228	if (top && middle)
1240	break;	1229	break;
1241		1230
1242	/* Only show visible faces */	1231	/* Only show visible faces */
1243	if (!tmp->invisible)	1232	if (!tmp->invisible)
1244	{	1233	{
1245	/* Fill in top if needed */	1234	/* Fill in top if needed */
1246	if (top == blank_face)	1235	if (!top)
1247	{	1236	{
1248	top = tmp->face;
1249	top_obj = tmp;	1237	top = tmp;
1250	if (top == middle)	1238	if (top == middle)
1251	middle = blank_face;	1239	middle = 0;
1252	}	1240	}
1253	else	1241	else
1254	{	1242	{
1255	/* top is already set - we should only get here if	1243	/* top is already set - we should only get here if
1256	* middle is not set	1244	* middle is not set
1257	*	1245	*
1258	* Set the middle face and break out, since there is nothing	1246	* Set the middle face and break out, since there is nothing
1259	* more to fill in. We don't check visiblity here, since	1247	* more to fill in. We don't check visiblity here, since
1260	*	1248	*
1261	*/	1249	*/
1262	if (tmp->face != top)	1250	if (tmp != top)
1263	{	1251	{
1264	middle = tmp->face;
1265	middle_obj = tmp;	1252	middle = tmp;
1266	break;	1253	break;
1267	}	1254	}
1268	}	1255	}
1269	}	1256	}
1270	}	1257	}
1271		1258
1272	if (middle == floor)	1259	if (middle == floor)
1273	middle = blank_face;	1260	middle = 0;
1274		1261
1275	if (top == middle)	1262	if (top == middle)
1276	middle = blank_face;	1263	middle = 0;
1277		1264
1278	faces [0] = top; faces_obj [0] = top != blank_face ? top_obj : 0;	1265	#if 0
1279	faces [1] = middle; faces_obj [1] = middle != blank_face ? middle_obj : 0;	1266	faces_obj [0] = top;
1280	faces [2] = floor; faces_obj [2] = floor != blank_face ? floor_obj : 0;	1267	faces_obj [1] = middle;
		1268	faces_obj [2] = floor;
		1269	#endif
		1270	}
		1271
		1272	uint64
		1273	mapspace::volume () const
		1274	{
		1275	uint64 vol = 0;
		1276
		1277	for (object *op = top; op && !op->flag [FLAG_NO_PICK]; op = op->below)
		1278	vol += op->volume ();
		1279
		1280	return vol;
1281	}	1281	}
1282		1282
1283	/* this updates the orig_map->tile_map[tile_num] value after finding	1283	/* this updates the orig_map->tile_map[tile_num] value after finding
1284	* the map. It also takes care of linking back the freshly found	1284	* the map. It also takes care of linking back the freshly found
1285	* maps tile_map values if it tiles back to this one. It returns	1285	* maps tile_map values if it tiles back to this one. It returns
…		…
1450		1450
1451	/**	1451	/**
1452	* Return whether map2 is adjacent to map1. If so, store the distance from	1452	* Return whether map2 is adjacent to map1. If so, store the distance from
1453	* map1 to map2 in dx/dy.	1453	* map1 to map2 in dx/dy.
1454	*/	1454	*/
1455	static int	1455	int
1456	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)	1456	adjacent_map (const maptile map1, const maptile map2, int dx, int dy)
1457	{	1457	{
1458	if (!map1 \|\| !map2)	1458	if (!map1 \|\| !map2)
1459	return 0;	1459	return 0;
1460		1460
…		…
1551	/* From map.c	1551	/* From map.c
1552	* This is used by get_player to determine where the other	1552	* This is used by get_player to determine where the other
1553	* creature is. get_rangevector takes into account map tiling,	1553	* creature is. get_rangevector takes into account map tiling,
1554	* so you just can not look the the map coordinates and get the	1554	* so you just can not look the the map coordinates and get the
1555	* righte value. distance_x/y are distance away, which	1555	* righte value. distance_x/y are distance away, which
1556	* can be negativbe. direction is the crossfire direction scheme	1556	* can be negative. direction is the crossfire direction scheme
1557	* that the creature should head. part is the part of the	1557	* that the creature should head. part is the part of the
1558	* monster that is closest.	1558	* monster that is closest.
1559	*	1559	*
1560	* get_rangevector looks at op1 and op2, and fills in the	1560	* get_rangevector looks at op1 and op2, and fills in the
1561	* structure for op1 to get to op2.	1561	* structure for op1 to get to op2.
…		…
1572	get_rangevector (object op1, object op2, rv_vector * retval, int flags)	1572	get_rangevector (object op1, object op2, rv_vector * retval, int flags)
1573	{	1573	{
1574	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))	1574	if (!adjacent_map (op1->map, op2->map, &retval->distance_x, &retval->distance_y))
1575	{	1575	{
1576	/* be conservative and fill in _some_ data */	1576	/* be conservative and fill in _some_ data */
1577	retval->distance = 100000;	1577	retval->distance = 10000;
1578	retval->distance_x = 32767;	1578	retval->distance_x = 10000;
1579	retval->distance_y = 32767;	1579	retval->distance_y = 10000;
1580	retval->direction = 0;	1580	retval->direction = 0;
1581	retval->part = 0;	1581	retval->part = 0;
1582	}	1582	}
1583	else	1583	else
1584	{	1584	{
…		…
1589		1589
1590	best = op1;	1590	best = op1;
1591	/* If this is multipart, find the closest part now */	1591	/* If this is multipart, find the closest part now */
1592	if (!(flags & 0x1) && op1->more)	1592	if (!(flags & 0x1) && op1->more)
1593	{	1593	{
1594	object *tmp;
1595	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;	1594	int best_distance = retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y, tmpi;
1596		1595
1597	/* we just take the offset of the piece to head to figure	1596	/* we just take the offset of the piece to head to figure
1598	* distance instead of doing all that work above again	1597	* distance instead of doing all that work above again
1599	* since the distance fields we set above are positive in the	1598	* since the distance fields we set above are positive in the
1600	* same axis as is used for multipart objects, the simply arithmetic	1599	* same axis as is used for multipart objects, the simply arithmetic
1601	* below works.	1600	* below works.
1602	*/	1601	*/
1603	for (tmp = op1->more; tmp != NULL; tmp = tmp->more)	1602	for (object *tmp = op1->more; tmp; tmp = tmp->more)
1604	{	1603	{
1605	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +	1604	tmpi = (op1->x - tmp->x + retval->distance_x) * (op1->x - tmp->x + retval->distance_x) +
1606	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);	1605	(op1->y - tmp->y + retval->distance_y) * (op1->y - tmp->y + retval->distance_y);
1607	if (tmpi < best_distance)	1606	if (tmpi < best_distance)
1608	{	1607	{
1609	best_distance = tmpi;	1608	best_distance = tmpi;
1610	best = tmp;	1609	best = tmp;
1611	}	1610	}
1612	}	1611	}
		1612
1613	if (best != op1)	1613	if (best != op1)
1614	{	1614	{
1615	retval->distance_x += op1->x - best->x;	1615	retval->distance_x += op1->x - best->x;
1616	retval->distance_y += op1->y - best->y;	1616	retval->distance_y += op1->y - best->y;
1617	}	1617	}
1618	}	1618	}
		1619
1619	retval->part = best;	1620	retval->part = best;
1620	retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y);	1621	retval->distance = upos_max (abs (retval->distance_x), abs (retval->distance_y));
1621	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1622	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1622	}	1623	}
1623	}	1624	}
1624		1625
1625	/* this is basically the same as get_rangevector above, but instead of	1626	/* this is basically the same as get_rangevector above, but instead of
…		…
1630	* flags has no meaning for this function at this time - I kept it in to	1631	* flags has no meaning for this function at this time - I kept it in to
1631	* be more consistant with the above function and also in case they are needed	1632	* be more consistant with the above function and also in case they are needed
1632	* for something in the future. Also, since no object is pasted, the best	1633	* for something in the future. Also, since no object is pasted, the best
1633	* field of the rv_vector is set to NULL.	1634	* field of the rv_vector is set to NULL.
1634	*/	1635	*/
1635
1636	void	1636	void
1637	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector * retval, int flags)	1637	get_rangevector_from_mapcoord (const maptile m, int x, int y, const object op2, rv_vector *retval, int flags)
1638	{	1638	{
1639	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))	1639	if (!adjacent_map (m, op2->map, &retval->distance_x, &retval->distance_y))
1640	{	1640	{
1641	/* be conservative and fill in _some_ data */	1641	/* be conservative and fill in _some_ data */
1642	retval->distance = 100000;	1642	retval->distance = 100000;
…		…
1649	{	1649	{
1650	retval->distance_x += op2->x - x;	1650	retval->distance_x += op2->x - x;
1651	retval->distance_y += op2->y - y;	1651	retval->distance_y += op2->y - y;
1652		1652
1653	retval->part = NULL;	1653	retval->part = NULL;
1654	retval->distance = isqrt (retval->distance_x * retval->distance_x + retval->distance_y * retval->distance_y);	1654	retval->distance = idistance (retval->distance_x, retval->distance_y);
1655	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);	1655	retval->direction = find_dir_2 (-retval->distance_x, -retval->distance_y);
1656	}	1656	}
1657	}	1657	}
1658		1658
1659	/* Returns true of op1 and op2 are effectively on the same map	1659	/* Returns true of op1 and op2 are effectively on the same map
…		…
1679	op->remove ();	1679	op->remove ();
1680		1680
1681	return insert_ob_in_map_at (op, this, originator, flags, x, y);	1681	return insert_ob_in_map_at (op, this, originator, flags, x, y);
1682	}	1682	}
1683		1683
		1684	region *
		1685	maptile::region (int x, int y) const
		1686	{
		1687	if (regions
		1688	&& regionmap
		1689	&& !OUT_OF_REAL_MAP (this, x, y))
		1690	if (struct region reg = regionmap [regions [y width + x]])
		1691	return reg;
		1692
		1693	if (default_region)
		1694	return default_region;
		1695
		1696	return ::region::default_region ();
		1697	}
		1698
		1699	/* picks a random object from a style map.
		1700	* Redone by MSW so it should be faster and not use static
		1701	* variables to generate tables.
		1702	*/
		1703	object *
		1704	maptile::pick_random_object () const
		1705	{
		1706	/* while returning a null object will result in a crash, that
		1707	* is actually preferable to an infinite loop. That is because
		1708	* most servers will automatically restart in case of crash.
		1709	* Change the logic on getting the random space - shouldn't make
		1710	* any difference, but this seems clearer to me.
		1711	*/
		1712	for (int i = 1000; --i;)
		1713	{
		1714	object *pick = at (rndm (width), rndm (height)).bot;
		1715
		1716	// do not prefer big monsters just because they are big.
		1717	if (pick && pick->head_ () == pick)
		1718	return pick->head_ ();
		1719	}
		1720
		1721	// instead of crashing in the unlikely(?) case, try to return something
		1722	return get_archetype ("blocked");
		1723	}
		1724

Diff Legend

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

Comparing deliantra/server/common/map.C (file contents): Revision 1.74 by root, Sun Jan 14 23:35:03 2007 UTC vs. Revision 1.110 by root, Sun Jul 1 05:00:17 2007 UTC

Diff Legend

Comparing deliantra/server/common/map.C (file contents):
Revision 1.74 by root, Sun Jan 14 23:35:03 2007 UTC vs.
Revision 1.110 by root, Sun Jul 1 05:00:17 2007 UTC