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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.108 by root, Sun Jan 7 02:39:13 2007 UTC vs.
Revision 1.133 by root, Fri Feb 16 19:43:40 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
4	Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
7		7	*
8	This program is free software; you can redistribute it and/or modify	8	* This program 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 2 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, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		21	*
22	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	23	*/
24		24
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
27	variable. */	27	variable. */
28	#include <global.h>	28	#include <global.h>
357	/*	357	/*
358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359	* Some error messages.	359	* Some error messages.
360	* The result of the dump is stored in the static global errmsg array.	360	* The result of the dump is stored in the static global errmsg array.
361	*/	361	*/
362
363	char *	362	char *
364	dump_object (object *op)	363	dump_object (object *op)
365	{	364	{
366	if (!op)	365	if (!op)
367	return strdup ("[NULLOBJ]");	366	return strdup ("[NULLOBJ]");
368		367
369	object_freezer freezer;	368	object_freezer freezer;
370	save_object (freezer, op, 1);	369	op->write (freezer);
371	return freezer.as_string ();	370	return freezer.as_string ();
372	}	371	}
373		372
374	/*	373	/*
375	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
395	* Returns the object which has the count-variable equal to the argument.	394	* Returns the object which has the count-variable equal to the argument.
396	*/	395	*/
397	object *	396	object *
398	find_object (tag_t i)	397	find_object (tag_t i)
399	{	398	{
400	return ((unsigned int)i) < objects.size ()	399	for_all_objects (op)
401	? objects [i]	400	if (op->count == i)
402	: 0;	401	return op;
		402
		403	return 0;
403	}	404	}
404		405
405	/*	406	/*
406	* Returns the first object which has a name equal to the argument.	407	* Returns the first object which has a name equal to the argument.
407	* Used only by the patch command, but not all that useful.	408	* Used only by the patch command, but not all that useful.
…		…
487		488
488	if (is_removed)	489	if (is_removed)
489	SET_FLAG (dst, FLAG_REMOVED);	490	SET_FLAG (dst, FLAG_REMOVED);
490		491
491	if (speed < 0)	492	if (speed < 0)
492	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;	493	dst->speed_left = speed_left - rndm ();
493		494
494	/* Copy over key_values, if any. */	495	/* Copy over key_values, if any. */
495	if (key_values)	496	if (key_values)
496	{	497	{
497	key_value *tail = 0;	498	key_value *tail = 0;
…		…
520	}	521	}
521	}	522	}
522	}	523	}
523		524
524	dst->set_speed (dst->speed);	525	dst->set_speed (dst->speed);
		526	}
		527
		528	void
		529	object::instantiate ()
		530	{
		531	if (!uuid.seq) // HACK
		532	uuid = gen_uuid ();
		533
		534	speed_left = -0.1f;
		535	/* copy the body_info to the body_used - this is only really
		536	* need for monsters, but doesn't hurt to do it for everything.
		537	* by doing so, when a monster is created, it has good starting
		538	* values for the body_used info, so when items are created
		539	* for it, they can be properly equipped.
		540	*/
		541	memcpy (body_used, body_info, sizeof (body_used));
		542
		543	attachable::instantiate ();
525	}	544	}
526		545
527	object *	546	object *
528	object::clone ()	547	object::clone ()
529	{	548	{
…		…
658		677
659	if (op->more)	678	if (op->more)
660	update_object (op->more, action);	679	update_object (op->more, action);
661	}	680	}
662		681
663	object *object::first;
664
665	object::object ()	682	object::object ()
666	{	683	{
667	SET_FLAG (this, FLAG_REMOVED);	684	SET_FLAG (this, FLAG_REMOVED);
668		685
669	expmul = 1.0;	686	expmul = 1.0;
670	face = blank_face;	687	face = blank_face;
671	}	688	}
672		689
673	object::~object ()	690	object::~object ()
674	{	691	{
		692	unlink ();
		693
675	free_key_values (this);	694	free_key_values (this);
676	}	695	}
677		696
		697	static int object_count;
		698
678	void object::link ()	699	void object::link ()
679	{	700	{
		701	assert (!index);//D
680	uuid = gen_uuid ();	702	uuid = gen_uuid ();
		703	count = ++object_count;
681		704
		705	refcnt_inc ();
682	objects.insert (this);	706	objects.insert (this);
683	}	707	}
684		708
685	void object::unlink ()	709	void object::unlink ()
686	{	710	{
		711	if (!index)
		712	return;
		713
687	objects.erase (this);	714	objects.erase (this);
		715	refcnt_dec ();
688	}	716	}
689		717
690	void	718	void
691	object::activate ()	719	object::activate ()
692	{	720	{
…		…
764	* drop on that space.	792	* drop on that space.
765	*/	793	*/
766	if (!drop_to_ground	794	if (!drop_to_ground
767	\|\| !map	795	\|\| !map
768	\|\| map->in_memory != MAP_IN_MEMORY	796	\|\| map->in_memory != MAP_IN_MEMORY
		797	\|\| map->nodrop
769	\|\| ms ().move_block == MOVE_ALL)	798	\|\| ms ().move_block == MOVE_ALL)
770	{	799	{
771	while (inv)	800	while (inv)
772	{	801	{
773	inv->destroy_inv (drop_to_ground);	802	inv->destroy_inv (drop_to_ground);
…		…
782		811
783	if (op->flag [FLAG_STARTEQUIP]	812	if (op->flag [FLAG_STARTEQUIP]
784	\|\| op->flag [FLAG_NO_DROP]	813	\|\| op->flag [FLAG_NO_DROP]
785	\|\| op->type == RUNE	814	\|\| op->type == RUNE
786	\|\| op->type == TRAP	815	\|\| op->type == TRAP
787	\|\| op->flag [FLAG_IS_A_TEMPLATE])	816	\|\| op->flag [FLAG_IS_A_TEMPLATE]
		817	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
788	op->destroy ();	818	op->destroy ();
789	else	819	else
790	map->insert (op, x, y);	820	map->insert (op, x, y);
791	}	821	}
792	}	822	}
…		…
800	}	830	}
801		831
802	void	832	void
803	object::do_destroy ()	833	object::do_destroy ()
804	{	834	{
		835	attachable::do_destroy ();
		836
805	if (flag [FLAG_IS_LINKED])	837	if (flag [FLAG_IS_LINKED])
806	remove_button_link (this);	838	remove_button_link (this);
807		839
808	if (flag [FLAG_FRIENDLY])	840	if (flag [FLAG_FRIENDLY])
		841	{
809	remove_friendly_object (this);	842	remove_friendly_object (this);
		843
		844	if (type == GOLEM
		845	&& owner
		846	&& owner->type == PLAYER
		847	&& owner->contr->ranges[range_golem] == this)
		848	owner->contr->ranges[range_golem] = 0;
		849	}
810		850
811	if (!flag [FLAG_REMOVED])	851	if (!flag [FLAG_REMOVED])
812	remove ();	852	remove ();
813		853
814	if (flag [FLAG_FREED])	854	destroy_inv (true);
815	return;
816		855
817	set_speed (0);	856	deactivate ();
		857	unlink ();
818		858
819	flag [FLAG_FREED] = 1;	859	flag [FLAG_FREED] = 1;
820
821	attachable::do_destroy ();
822
823	destroy_inv (true);
824	unlink ();
825		860
826	// hack to ensure that freed objects still have a valid map	861	// hack to ensure that freed objects still have a valid map
827	{	862	{
828	static maptile *freed_map; // freed objects are moved here to avoid crashes	863	static maptile *freed_map; // freed objects are moved here to avoid crashes
829		864
…		…
891	* This function removes the object op from the linked list of objects	926	* This function removes the object op from the linked list of objects
892	* which it is currently tied to. When this function is done, the	927	* which it is currently tied to. When this function is done, the
893	* object will have no environment. If the object previously had an	928	* object will have no environment. If the object previously had an
894	* environment, the x and y coordinates will be updated to	929	* environment, the x and y coordinates will be updated to
895	* the previous environment.	930	* the previous environment.
896	* Beware: This function is called from the editor as well!
897	*/	931	*/
898	void	932	void
899	object::remove ()	933	object::do_remove ()
900	{	934	{
901	object tmp, last = 0;	935	object tmp, last = 0;
902	object *otmp;	936	object *otmp;
903		937
904	if (QUERY_FLAG (this, FLAG_REMOVED))	938	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
947	}	981	}
948	else if (map)	982	else if (map)
949	{	983	{
950	if (type == PLAYER)	984	if (type == PLAYER)
951	{	985	{
		986	// leaving a spot always closes any open container on the ground
		987	if (container && !container->env)
		988	// this causes spurious floorbox updates, but it ensures
		989	// that the CLOSE event is being sent.
		990	close_container ();
		991
952	--map->players;	992	--map->players;
953	map->touch ();	993	map->touch ();
954	}	994	}
955		995
956	map->dirty = true;	996	map->dirty = true;
		997	mapspace &ms = this->ms ();
957		998
958	/* link the object above us */	999	/* link the object above us */
959	if (above)	1000	if (above)
960	above->below = below;	1001	above->below = below;
961	else	1002	else
962	map->at (x, y).top = below; /* we were top, set new top */	1003	ms.top = below; /* we were top, set new top */
963		1004
964	/* Relink the object below us, if there is one */	1005	/* Relink the object below us, if there is one */
965	if (below)	1006	if (below)
966	below->above = above;	1007	below->above = above;
967	else	1008	else
…		…
969	/* Nothing below, which means we need to relink map object for this space	1010	/* Nothing below, which means we need to relink map object for this space
970	* use translated coordinates in case some oddness with map tiling is	1011	* use translated coordinates in case some oddness with map tiling is
971	* evident	1012	* evident
972	*/	1013	*/
973	if (GET_MAP_OB (map, x, y) != this)	1014	if (GET_MAP_OB (map, x, y) != this)
974	{
975	char *dump = dump_object (this);
976	LOG (llevError,
977	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);	1015	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
978	free (dump);
979	dump = dump_object (GET_MAP_OB (map, x, y));
980	LOG (llevError, "%s\n", dump);
981	free (dump);
982	}
983		1016
984	map->at (x, y).bot = above; /* goes on above it. */	1017	ms.bot = above; /* goes on above it. */
985	}	1018	}
986		1019
987	above = 0;	1020	above = 0;
988	below = 0;	1021	below = 0;
989		1022
990	if (map->in_memory == MAP_SAVING)	1023	if (map->in_memory == MAP_SAVING)
991	return;	1024	return;
992		1025
993	int check_walk_off = !flag [FLAG_NO_APPLY];	1026	int check_walk_off = !flag [FLAG_NO_APPLY];
994		1027
995	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1028	for (tmp = ms.bot; tmp; tmp = tmp->above)
996	{	1029	{
997	/* No point updating the players look faces if he is the object	1030	/* No point updating the players look faces if he is the object
998	* being removed.	1031	* being removed.
999	*/	1032	*/
1000		1033
…		…
1081		1114
1082	return 0;	1115	return 0;
1083	}	1116	}
1084		1117
1085	/*	1118	/*
1086	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1119	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1087	* job preparing multi-part monsters	1120	* job preparing multi-part monsters.
1088	*/	1121	*/
1089	object *	1122	object *
1090	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1123	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1091	{	1124	{
1092	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1125	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
…		…
1120	*/	1153	*/
1121	object *	1154	object *
1122	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1155	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1123	{	1156	{
1124	object tmp, top, *floor = NULL;	1157	object tmp, top, *floor = NULL;
1125	sint16 x, y;
1126		1158
1127	if (QUERY_FLAG (op, FLAG_FREED))	1159	if (QUERY_FLAG (op, FLAG_FREED))
1128	{	1160	{
1129	LOG (llevError, "Trying to insert freed object!\n");	1161	LOG (llevError, "Trying to insert freed object!\n");
1130	return NULL;	1162	return NULL;
1131	}	1163	}
		1164
		1165	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1166	LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
		1167
		1168	op->remove ();
1132		1169
1133	if (!m)	1170	if (!m)
1134	{	1171	{
1135	char *dump = dump_object (op);	1172	char *dump = dump_object (op);
1136	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1173	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
…		…
1151	#endif	1188	#endif
1152	free (dump);	1189	free (dump);
1153	return op;	1190	return op;
1154	}	1191	}
1155		1192
1156	if (!QUERY_FLAG (op, FLAG_REMOVED))
1157	{
1158	char *dump = dump_object (op);
1159	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1160	free (dump);
1161	return op;
1162	}
1163
1164	if (op->more)
1165	{
1166	/* The part may be on a different map. */
1167
1168	object *more = op->more;	1193	if (object *more = op->more)
1169		1194	{
1170	/* We really need the caller to normalise coordinates - if
1171	* we set the map, that doesn't work if the location is within
1172	* a map and this is straddling an edge. So only if coordinate
1173	* is clear wrong do we normalise it.
1174	*/
1175	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1176	more->map = get_map_from_coord (m, &more->x, &more->y);
1177	else if (!more->map)
1178	{
1179	/* For backwards compatibility - when not dealing with tiled maps,
1180	* more->map should always point to the parent.
1181	*/
1182	more->map = m;
1183	}
1184
1185	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1195	if (!insert_ob_in_map (more, m, originator, flag))
1186	{	1196	{
1187	if (!op->head)	1197	if (!op->head)
1188	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1198	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1189		1199
1190	return 0;	1200	return 0;
…		…
1195		1205
1196	/* Ideally, the caller figures this out. However, it complicates a lot	1206	/* Ideally, the caller figures this out. However, it complicates a lot
1197	* of areas of callers (eg, anything that uses find_free_spot would now	1207	* of areas of callers (eg, anything that uses find_free_spot would now
1198	* need extra work	1208	* need extra work
1199	*/	1209	*/
1200	op->map = get_map_from_coord (m, &op->x, &op->y);	1210	if (!xy_normalise (m, op->x, op->y))
1201	x = op->x;	1211	return 0;
1202	y = op->y;	1212
		1213	op->map = m;
		1214	mapspace &ms = op->ms ();
1203		1215
1204	/* this has to be done after we translate the coordinates.	1216	/* this has to be done after we translate the coordinates.
1205	*/	1217	*/
1206	if (op->nrof && !(flag & INS_NO_MERGE))	1218	if (op->nrof && !(flag & INS_NO_MERGE))
1207	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1219	for (tmp = ms.bot; tmp; tmp = tmp->above)
1208	if (object::can_merge (op, tmp))	1220	if (object::can_merge (op, tmp))
1209	{	1221	{
1210	op->nrof += tmp->nrof;	1222	op->nrof += tmp->nrof;
1211	tmp->destroy ();	1223	tmp->destroy ();
1212	}	1224	}
…		…
1229	op->below = originator->below;	1241	op->below = originator->below;
1230		1242
1231	if (op->below)	1243	if (op->below)
1232	op->below->above = op;	1244	op->below->above = op;
1233	else	1245	else
1234	op->ms ().bot = op;	1246	ms.bot = op;
1235		1247
1236	/* since below originator, no need to update top */	1248	/* since below originator, no need to update top */
1237	originator->below = op;	1249	originator->below = op;
1238	}	1250	}
1239	else	1251	else
1240	{	1252	{
		1253	top = ms.bot;
		1254
1241	/* If there are other objects, then */	1255	/* If there are other objects, then */
1242	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1256	if ((!(flag & INS_MAP_LOAD)) && top)
1243	{	1257	{
1244	object *last = 0;	1258	object *last = 0;
1245		1259
1246	/*	1260	/*
1247	* If there are multiple objects on this space, we do some trickier handling.	1261	* If there are multiple objects on this space, we do some trickier handling.
…		…
1253	* once we get to them. This reduces the need to traverse over all of	1267	* once we get to them. This reduces the need to traverse over all of
1254	* them when adding another one - this saves quite a bit of cpu time	1268	* them when adding another one - this saves quite a bit of cpu time
1255	* when lots of spells are cast in one area. Currently, it is presumed	1269	* when lots of spells are cast in one area. Currently, it is presumed
1256	* that flying non pickable objects are spell objects.	1270	* that flying non pickable objects are spell objects.
1257	*/	1271	*/
1258	while (top)	1272	for (top = ms.bot; top; top = top->above)
1259	{	1273	{
1260	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1274	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1261	floor = top;	1275	floor = top;
1262		1276
1263	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1277	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1266	top = top->below;	1280	top = top->below;
1267	break;	1281	break;
1268	}	1282	}
1269		1283
1270	last = top;	1284	last = top;
1271	top = top->above;
1272	}	1285	}
1273		1286
1274	/* Don't want top to be NULL, so set it to the last valid object */	1287	/* Don't want top to be NULL, so set it to the last valid object */
1275	top = last;	1288	top = last;
1276		1289
…		…
1283	* Unless those objects are exits, type 66	1296	* Unless those objects are exits, type 66
1284	* If INS_ON_TOP is used, don't do this processing	1297	* If INS_ON_TOP is used, don't do this processing
1285	* Need to find the object that in fact blocks view, otherwise	1298	* Need to find the object that in fact blocks view, otherwise
1286	* stacking is a bit odd.	1299	* stacking is a bit odd.
1287	*/	1300	*/
1288	if (!(flag & INS_ON_TOP) &&	1301	if (!(flag & INS_ON_TOP)
1289	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1302	&& ms.flags () & P_BLOCKSVIEW
		1303	&& (op->face && !op->face->visibility))
1290	{	1304	{
1291	for (last = top; last != floor; last = last->below)	1305	for (last = top; last != floor; last = last->below)
1292	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1306	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1293	break;	1307	break;
		1308
1294	/* Check to see if we found the object that blocks view,	1309	/* Check to see if we found the object that blocks view,
1295	* and make sure we have a below pointer for it so that	1310	* and make sure we have a below pointer for it so that
1296	* we can get inserted below this one, which requires we	1311	* we can get inserted below this one, which requires we
1297	* set top to the object below us.	1312	* set top to the object below us.
1298	*/	1313	*/
…		…
1300	top = last->below;	1315	top = last->below;
1301	}	1316	}
1302	} /* If objects on this space */	1317	} /* If objects on this space */
1303		1318
1304	if (flag & INS_MAP_LOAD)	1319	if (flag & INS_MAP_LOAD)
1305	top = GET_MAP_TOP (op->map, op->x, op->y);	1320	top = ms.top;
1306		1321
1307	if (flag & INS_ABOVE_FLOOR_ONLY)	1322	if (flag & INS_ABOVE_FLOOR_ONLY)
1308	top = floor;	1323	top = floor;
1309		1324
1310	/* Top is the object that our object (op) is going to get inserted above.	1325	/* Top is the object that our object (op) is going to get inserted above.
1311	*/	1326	*/
1312		1327
1313	/* First object on this space */	1328	/* First object on this space */
1314	if (!top)	1329	if (!top)
1315	{	1330	{
1316	op->above = GET_MAP_OB (op->map, op->x, op->y);	1331	op->above = ms.bot;
1317		1332
1318	if (op->above)	1333	if (op->above)
1319	op->above->below = op;	1334	op->above->below = op;
1320		1335
1321	op->below = 0;	1336	op->below = 0;
1322	op->ms ().bot = op;	1337	ms.bot = op;
1323	}	1338	}
1324	else	1339	else
1325	{ /* get inserted into the stack above top */	1340	{ /* get inserted into the stack above top */
1326	op->above = top->above;	1341	op->above = top->above;
1327		1342
…		…
1331	op->below = top;	1346	op->below = top;
1332	top->above = op;	1347	top->above = op;
1333	}	1348	}
1334		1349
1335	if (!op->above)	1350	if (!op->above)
1336	op->ms ().top = op;	1351	ms.top = op;
1337	} /* else not INS_BELOW_ORIGINATOR */	1352	} /* else not INS_BELOW_ORIGINATOR */
1338		1353
1339	if (op->type == PLAYER)	1354	if (op->type == PLAYER)
1340	{	1355	{
1341	op->contr->do_los = 1;	1356	op->contr->do_los = 1;
…		…
1347		1362
1348	/* If we have a floor, we know the player, if any, will be above	1363	/* If we have a floor, we know the player, if any, will be above
1349	* it, so save a few ticks and start from there.	1364	* it, so save a few ticks and start from there.
1350	*/	1365	*/
1351	if (!(flag & INS_MAP_LOAD))	1366	if (!(flag & INS_MAP_LOAD))
1352	if (object *pl = op->ms ().player ())	1367	if (object *pl = ms.player ())
1353	if (pl->contr->ns)	1368	if (pl->contr->ns)
1354	pl->contr->ns->floorbox_update ();	1369	pl->contr->ns->floorbox_update ();
1355		1370
1356	/* If this object glows, it may affect lighting conditions that are	1371	/* If this object glows, it may affect lighting conditions that are
1357	* visible to others on this map. But update_all_los is really	1372	* visible to others on this map. But update_all_los is really
…		…
1766	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1781	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1767	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1782	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1768	{	1783	{
1769		1784
1770	float	1785	float
1771	diff = tmp->move_slow_penalty * FABS (op->speed);	1786	diff = tmp->move_slow_penalty * fabs (op->speed);
1772		1787
1773	if (op->type == PLAYER)	1788	if (op->type == PLAYER)
1774	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1789	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1775	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1790	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1776	diff /= 4.0;	1791	diff /= 4.0;
…		…
1983	}	1998	}
1984		1999
1985	if (!index)	2000	if (!index)
1986	return -1;	2001	return -1;
1987		2002
1988	return altern[RANDOM () % index];	2003	return altern [rndm (index)];
1989	}	2004	}
1990		2005
1991	/*	2006	/*
1992	* find_first_free_spot(archetype, maptile, x, y) works like	2007	* find_first_free_spot(archetype, maptile, x, y) works like
1993	* find_free_spot(), but it will search max number of squares.	2008	* find_free_spot(), but it will search max number of squares.
…		…
2014	{	2029	{
2015	arr += begin;	2030	arr += begin;
2016	end -= begin;	2031	end -= begin;
2017		2032
2018	while (--end)	2033	while (--end)
2019	swap (arr [end], arr [RANDOM () % (end + 1)]);	2034	swap (arr [end], arr [rndm (end + 1)]);
2020	}	2035	}
2021		2036
2022	/* new function to make monster searching more efficient, and effective!	2037	/* new function to make monster searching more efficient, and effective!
2023	* This basically returns a randomized array (in the passed pointer) of	2038	* This basically returns a randomized array (in the passed pointer) of
2024	* the spaces to find monsters. In this way, it won't always look for	2039	* the spaces to find monsters. In this way, it won't always look for
…		…
2158		2173
2159	return 3;	2174	return 3;
2160	}	2175	}
2161		2176
2162	/*	2177	/*
2163	* absdir(int): Returns a number between 1 and 8, which represent
2164	* the "absolute" direction of a number (it actually takes care of
2165	* "overflow" in previous calculations of a direction).
2166	*/
2167
2168	int
2169	absdir (int d)
2170	{
2171	while (d < 1)
2172	d += 8;
2173
2174	while (d > 8)
2175	d -= 8;
2176
2177	return d;
2178	}
2179
2180	/*
2181	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2178	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2182	* between two directions (which are expected to be absolute (see absdir())	2179	* between two directions (which are expected to be absolute (see absdir())
2183	*/	2180	*/
2184
2185	int	2181	int
2186	dirdiff (int dir1, int dir2)	2182	dirdiff (int dir1, int dir2)
2187	{	2183	{
2188	int d;	2184	int d;
2189		2185
…		…
2355	insert_ob_in_ob (object_create_clone (item), dst);	2351	insert_ob_in_ob (object_create_clone (item), dst);
2356		2352
2357	return dst;	2353	return dst;
2358	}	2354	}
2359		2355
2360	/* GROS - Creates an object using a string representing its content. */
2361	/* Basically, we save the content of the string to a temp file, then call */
2362	/* load_object on it. I admit it is a highly inefficient way to make things, */
2363	/* but it was simple to make and allows reusing the load_object function. */
2364	/* Remember not to use load_object_str in a time-critical situation. */
2365	/* Also remember that multiparts objects are not supported for now. */
2366	object *
2367	load_object_str (const char *obstr)
2368	{
2369	object *op;
2370	char filename[MAX_BUF];
2371
2372	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2373
2374	FILE *tempfile = fopen (filename, "w");
2375
2376	if (tempfile == NULL)
2377	{
2378	LOG (llevError, "Error - Unable to access load object temp file\n");
2379	return NULL;
2380	}
2381
2382	fprintf (tempfile, obstr);
2383	fclose (tempfile);
2384
2385	op = object::create ();
2386
2387	object_thawer thawer (filename);
2388
2389	if (thawer)
2390	load_object (thawer, op, 0);
2391
2392	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2393	CLEAR_FLAG (op, FLAG_REMOVED);
2394
2395	return op;
2396	}
2397
2398	/* This returns the first object in who's inventory that	2356	/* This returns the first object in who's inventory that
2399	* has the same type and subtype match.	2357	* has the same type and subtype match.
2400	* returns NULL if no match.	2358	* returns NULL if no match.
2401	*/	2359	*/
2402	object *	2360	object *
…		…
2605	{	2563	{
2606	char flagdesc[512];	2564	char flagdesc[512];
2607	char info2[256 * 4];	2565	char info2[256 * 4];
2608	char *p = info;	2566	char *p = info;
2609		2567
2610	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2568	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2611	count, uuid.seq,	2569	count, uuid.seq,
2612	&name,	2570	&name,
2613	title ? "\",title:" : "",	2571	title ? "\",title:\"" : "",
2614	title ? (const char *)title : "",	2572	title ? (const char *)title : "",
2615	flag_desc (flagdesc, 512), type);	2573	flag_desc (flagdesc, 512), type);
2616		2574
2617	if (env)	2575	if (env)
2618	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2576	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
…		…
2628	{	2586	{
2629	static char info[256 * 4];	2587	static char info[256 * 4];
2630	return debug_desc (info);	2588	return debug_desc (info);
2631	}	2589	}
2632		2590
		2591	const char *
		2592	object::debug_desc2 () const
		2593	{
		2594	static char info[256 * 4];
		2595	return debug_desc (info);
		2596	}
		2597
		2598	struct region *
		2599	object::region () const
		2600	{
		2601	return map ? map->region (x, y)
		2602	: region::default_region ();
		2603	}
		2604
		2605	const materialtype_t *
		2606	object::dominant_material () const
		2607	{
		2608	if (materialtype_t *mat = name_to_material (materialname))
		2609	return mat;
		2610
		2611	// omfg this is slow, this has to be temporary :)
		2612	shstr unknown ("unknown");
		2613
		2614	return name_to_material (unknown);
		2615	}
		2616
		2617	void
		2618	object::open_container (object *new_container)
		2619	{
		2620	if (container == new_container)
		2621	return;
		2622
		2623	if (object *old_container = container)
		2624	{
		2625	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2626	return;
		2627
		2628	#if 0
		2629	// remove the "Close old_container" object.
		2630	if (object *closer = old_container->inv)
		2631	if (closer->type == CLOSE_CON)
		2632	closer->destroy ();
		2633	#endif
		2634
		2635	old_container->flag [FLAG_APPLIED] = 0;
		2636	container = 0;
		2637
		2638	esrv_update_item (UPD_FLAGS, this, old_container);
		2639	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2640	}
		2641
		2642	if (new_container)
		2643	{
		2644	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2645	return;
		2646
		2647	// TODO: this does not seem to serve any purpose anymore?
		2648	#if 0
		2649	// insert the "Close Container" object.
		2650	if (archetype *closer = new_container->other_arch)
		2651	{
		2652	object *closer = arch_to_object (new_container->other_arch);
		2653	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2654	new_container->insert (closer);
		2655	}
		2656	#endif
		2657
		2658	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2659
		2660	new_container->flag [FLAG_APPLIED] = 1;
		2661	container = new_container;
		2662
		2663	esrv_update_item (UPD_FLAGS, this, new_container);
		2664	esrv_send_inventory (this, new_container);
		2665	}
		2666	}
		2667
		2668

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.108 by root, Sun Jan 7 02:39:13 2007 UTC vs. Revision 1.133 by root, Fri Feb 16 19:43:40 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.108 by root, Sun Jan 7 02:39:13 2007 UTC vs.
Revision 1.133 by root, Fri Feb 16 19:43:40 2007 UTC