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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.25 by root, Mon Sep 11 01:16:20 2006 UTC vs.
Revision 1.29 by root, Mon Sep 11 12:38:36 2006 UTC

…		…
1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.25 2006/09/11 01:16:20 root Exp $";
5	*/
6		1
7	/*	2	/*
8	CrossFire, A Multiplayer game for X-windows	3	CrossFire, A Multiplayer game for X-windows
9		4
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
29		24
30	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
32	variable. */	27	variable. */
33	#include <global.h>	28	#include <global.h>
34	#ifndef WIN32 /* ---win32 exclude headers */
35	# include <stdio.h>	29	#include <stdio.h>
36	# include <sys/types.h>	30	#include <sys/types.h>
37	# include <sys/uio.h>	31	#include <sys/uio.h>
38	#endif /* win32 */
39	#include <object.h>	32	#include <object.h>
40	#include <funcpoint.h>	33	#include <funcpoint.h>
41	#include <skills.h>	34	#include <skills.h>
42	#include <loader.h>	35	#include <loader.h>
		36
43	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
44		38
45	object objects; / Pointer to the list of used objects */	39	object objects; / Pointer to the list of used objects */
46	object active_objects; / List of active objects that need to be processed */	40	object active_objects; / List of active objects that need to be processed */
47		41
…		…
214	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	208	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
215	return 0;	209	return 0;
216		210
217	switch (ob1->type)	211	switch (ob1->type)
218	{	212	{
219	case SCROLL:	213	case SCROLL:
220	if (ob1->level != ob2->level)	214	if (ob1->level != ob2->level)
221	return 0;	215	return 0;
222	break;	216	break;
223	}	217	}
224		218
225	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)	219	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)
226	{	220	{
227	/* At least one of these has key_values. */	221	/* At least one of these has key_values. */
…		…
249	/*	243	/*
250	* sum_weight() is a recursive function which calculates the weight	244	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	245	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	246	* containers are carrying, and sums it up.
253	*/	247	*/
254	signed long	248	long
255	sum_weight (object *op)	249	sum_weight (object *op)
256	{	250	{
257	signed long sum;	251	long sum;
258	object *inv;	252	object *inv;
259		253
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	254	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	255	{
262	if (inv->inv)	256	if (inv->inv)
…		…
891	/* if the object is being removed, we can't make intelligent	885	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	886	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	887	* that is being removed.
894	*/	888	*/
895	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	889	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
896	{
897	update_now = 1;	890	update_now = 1;
898	}
899	else if (action == UP_OBJ_FACE)	891	else if (action == UP_OBJ_FACE)
900	{
901	/* Nothing to do for that case */	892	/* Nothing to do for that case */ ;
902	}
903	else	893	else
904	{
905	LOG (llevError, "update_object called with invalid action: %d\n", action);	894	LOG (llevError, "update_object called with invalid action: %d\n", action);
906	}
907		895
908	if (update_now)	896	if (update_now)
909	{	897	{
910	SET_MAP_FLAGS (op->map, op->x, op->y, flags \| P_NO_ERROR \| P_NEED_UPDATE);	898	SET_MAP_FLAGS (op->map, op->x, op->y, flags \| P_NO_ERROR \| P_NEED_UPDATE);
911	update_position (op->map, op->x, op->y);	899	update_position (op->map, op->x, op->y);
…		…
913		901
914	if (op->more != NULL)	902	if (op->more != NULL)
915	update_object (op->more, action);	903	update_object (op->more, action);
916	}	904	}
917		905
918	static unordered_vector<object *> mortals;	906	static unordered_vector < object *>mortals;
919	static std::vector<object *> freed;	907	static
		908	std::vector < object *>
		909	freed;
920		910
921	void object::free_mortals ()	911	void object::free_mortals ()
922	{	912	{
923	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	913	for (unordered_vector < object *>::iterator i = mortals.begin (); i != mortals.end ();)
924	if (!(*i)->refcount)	914	if (!(*i)->refcount)
925	{	915	{
926	freed.push_back (*i);	916	freed.push_back (*i);
927	mortals.erase (i);	917	mortals.erase (i);
928	}	918	}
…		…
978	objects = next;	968	objects = next;
979	}	969	}
980		970
981	object *object::create ()	971	object *object::create ()
982	{	972	{
983	object *op;	973	object *
		974	op;
984		975
985	if (freed.empty ())	976	if (freed.empty ())
986	op = new object;	977	op = new object;
		978
987	else	979	else
988	{	980	{
989	// highly annoying, but the only way to get it stable right now	981	// highly annoying, but the only way to get it stable right now
990	op = freed.back (); freed.pop_back ();	982	op = freed.back ();
		983	freed.pop_back ();
991	op->~object ();	984	op->~object ();
992	new ((void *)op) object;	985	new ((void *) op) object;
993	}	986	}
994		987
995	op->link ();	988	op->link ();
996	return op;	989	return op;
997	}	990	}
…		…
1006	* If free_inventory is set, free inventory as well. Else drop items in	999	* If free_inventory is set, free inventory as well. Else drop items in
1007	* inventory to the ground.	1000	* inventory to the ground.
1008	*/	1001	*/
1009	void object::free (bool free_inventory)	1002	void object::free (bool free_inventory)
1010	{	1003	{
		1004	if (QUERY_FLAG (this, FLAG_FREED))
		1005	return;
		1006
1011	if (!QUERY_FLAG (this, FLAG_REMOVED))	1007	if (!QUERY_FLAG (this, FLAG_REMOVED))
1012	{	1008	remove_ob (this);
1013	LOG (llevDebug, "Free object called with non removed object\n");
1014	dump_object (this);
1015	#ifdef MANY_CORES
1016	abort ();
1017	#endif
1018	}
1019		1009
1020	if (QUERY_FLAG (this, FLAG_FRIENDLY))	1010	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021	{
1022	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1023	remove_friendly_object (this);	1011	remove_friendly_object (this);
1024	}
1025		1012
1026	if (QUERY_FLAG (this, FLAG_FREED))	1013	SET_FLAG (this, FLAG_FREED);
1027	{
1028	dump_object (this);
1029	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1030	return;
1031	}
1032		1014
1033	if (more)	1015	if (more)
1034	{	1016	{
1035	more->free (free_inventory);	1017	more->free (free_inventory);
1036	more = 0;	1018	more = 0;
…		…
1042	* if some form of movement is allowed, let objects	1024	* if some form of movement is allowed, let objects
1043	* drop on that space.	1025	* drop on that space.
1044	*/	1026	*/
1045	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	1027	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))
1046	{	1028	{
1047	object *	1029	object *op = inv;
1048	op = inv;
1049		1030
1050	while (op)	1031	while (op)
1051	{	1032	{
1052	object *
1053	tmp = op->below;	1033	object *tmp = op->below;
1054
1055	remove_ob (op);
1056	op->free (free_inventory);	1034	op->free (free_inventory);
1057	op = tmp;	1035	op = tmp;
1058	}	1036	}
1059	}	1037	}
1060	else	1038	else
1061	{ /* Put objects in inventory onto this space */	1039	{ /* Put objects in inventory onto this space */
1062	object *	1040	object *op = inv;
1063	op = inv;
1064		1041
1065	while (op)	1042	while (op)
1066	{	1043	{
1067	object *
1068	tmp = op->below;	1044	object *tmp = op->below;
1069		1045
1070	remove_ob (op);	1046	remove_ob (op);
1071		1047
1072	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	1048	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1073	\|\| QUERY_FLAG (op, FLAG_NO_DROP) \|\| op->type == RUNE \|\| op->type == TRAP \|\| QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	1049	\|\| QUERY_FLAG (op, FLAG_NO_DROP) \|\| op->type == RUNE \|\| op->type == TRAP \|\| QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1090	speed = 0;	1066	speed = 0;
1091	update_ob_speed (this);	1067	update_ob_speed (this);
1092		1068
1093	unlink ();	1069	unlink ();
1094		1070
1095	SET_FLAG (this, FLAG_FREED);
1096
1097	mortals.push_back (this);	1071	mortals.push_back (this);
1098	}	1072	}
1099		1073
1100	/*	1074	/*
1101	* sub_weight() recursively (outwards) subtracts a number from the	1075	* sub_weight() recursively (outwards) subtracts a number from the
…		…
1131	object *	1105	object *
1132	tmp, *	1106	tmp, *
1133	last = NULL;	1107	last = NULL;
1134	object *	1108	object *
1135	otmp;	1109	otmp;
		1110
1136	tag_t	1111	tag_t
1137	tag;	1112	tag;
1138	int	1113	int
1139	check_walk_off;	1114	check_walk_off;
1140	mapstruct *	1115	mapstruct *
1141	m;	1116	m;
		1117
1142	sint16	1118	sint16
1143	x,	1119	x,
1144	y;	1120	y;
1145		1121
1146
1147	if (QUERY_FLAG (op, FLAG_REMOVED))	1122	if (QUERY_FLAG (op, FLAG_REMOVED))
1148	{	1123	return;
1149	dump_object (op);
1150	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1151		1124
1152	/* Changed it to always dump core in this case. As has been learned	1125	SET_FLAG (op, FLAG_REMOVED);
1153	* in the past, trying to recover from errors almost always	1126
1154	* make things worse, and this is a real error here - something
1155	* that should not happen.
1156	* Yes, if this was a mission critical app, trying to do something
1157	* to recover may make sense, but that is because failure of the app
1158	* may have other disastrous problems. Cf runs out of a script
1159	* so is easily enough restarted without any real problems.
1160	* MSW 2001-07-01
1161	*/
1162	abort ();
1163	}
1164	if (op->more != NULL)	1127	if (op->more != NULL)
1165	remove_ob (op->more);	1128	remove_ob (op->more);
1166
1167	SET_FLAG (op, FLAG_REMOVED);
1168		1129
1169	/*	1130	/*
1170	* In this case, the object to be removed is in someones	1131	* In this case, the object to be removed is in someones
1171	* inventory.	1132	* inventory.
1172	*/	1133	*/
…		…
1198	*/	1159	*/
1199	op->x = op->env->x, op->y = op->env->y;	1160	op->x = op->env->x, op->y = op->env->y;
1200	op->map = op->env->map;	1161	op->map = op->env->map;
1201	op->above = NULL, op->below = NULL;	1162	op->above = NULL, op->below = NULL;
1202	op->env = NULL;	1163	op->env = NULL;
1203	return;	1164	}
		1165	else if (op->map)
1204	}	1166	{
1205
1206	/* If we get here, we are removing it from a map */
1207	if (op->map == NULL)
1208	return;
1209
1210	x = op->x;	1167	x = op->x;
1211	y = op->y;	1168	y = op->y;
1212	m = get_map_from_coord (op->map, &x, &y);	1169	m = get_map_from_coord (op->map, &x, &y);
1213		1170
1214	if (!m)	1171	if (!m)
1215	{	1172	{
1216	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1173	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1217	op->map->path, op->x, op->y);	1174	op->map->path, op->x, op->y);
1218	/* in old days, we used to set x and y to 0 and continue.	1175	/* in old days, we used to set x and y to 0 and continue.
1219	* it seems if we get into this case, something is probablye	1176	* it seems if we get into this case, something is probablye
1220	* screwed up and should be fixed.	1177	* screwed up and should be fixed.
		1178	*/
		1179	abort ();
		1180	}
		1181
		1182	if (op->map != m)
		1183	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1184	op->map->path, m->path, op->x, op->y, x, y);
		1185
		1186	/* Re did the following section of code - it looks like it had
		1187	* lots of logic for things we no longer care about
1221	*/	1188	*/
1222	abort ();
1223	}
1224	if (op->map != m)
1225	{
1226	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1227	op->map->path, m->path, op->x, op->y, x, y);
1228	}
1229		1189
1230	/* Re did the following section of code - it looks like it had
1231	* lots of logic for things we no longer care about
1232	*/
1233
1234	/* link the object above us */	1190	/* link the object above us */
1235	if (op->above)	1191	if (op->above)
1236	op->above->below = op->below;	1192	op->above->below = op->below;
1237	else	1193	else
1238	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1194	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1239		1195
1240	/* Relink the object below us, if there is one */	1196	/* Relink the object below us, if there is one */
1241	if (op->below)	1197	if (op->below)
1242	{
1243	op->below->above = op->above;	1198	op->below->above = op->above;
1244	}
1245	else	1199	else
1246	{	1200	{
1247	/* Nothing below, which means we need to relink map object for this space	1201	/* Nothing below, which means we need to relink map object for this space
1248	* use translated coordinates in case some oddness with map tiling is	1202	* use translated coordinates in case some oddness with map tiling is
1249	* evident	1203	* evident
1250	*/
1251	if (GET_MAP_OB (m, x, y) != op)
1252	{
1253	dump_object (op);
1254	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n",
1255	errmsg);
1256	dump_object (GET_MAP_OB (m, x, y));
1257	LOG (llevError, "%s\n", errmsg);
1258	}
1259	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1260	}
1261	op->above = NULL;
1262	op->below = NULL;
1263
1264	if (op->map->in_memory == MAP_SAVING)
1265	return;
1266
1267	tag = op->count;
1268	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1269	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1270	{
1271	/* No point updating the players look faces if he is the object
1272	* being removed.
1273	*/
1274
1275	if (tmp->type == PLAYER && tmp != op)
1276	{
1277	/* If a container that the player is currently using somehow gets
1278	* removed (most likely destroyed), update the player view
1279	* appropriately.
1280	*/	1204	*/
1281	if (tmp->container == op)	1205	if (GET_MAP_OB (m, x, y) != op)
1282	{	1206	{
1283	CLEAR_FLAG (op, FLAG_APPLIED);	1207	dump_object (op);
1284	tmp->container = NULL;	1208	LOG (llevError,
		1209	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);
		1210	dump_object (GET_MAP_OB (m, x, y));
		1211	LOG (llevError, "%s\n", errmsg);
1285	}	1212	}
1286	tmp->contr->socket.update_look = 1;	1213
1287	}	1214	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1288	/* See if player moving off should effect something */
1289	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1290	{	1215	}
1291		1216
1292	move_apply (tmp, op, NULL);	1217	op->above = 0;
1293	if (was_destroyed (op, tag))	1218	op->below = 0;
		1219
		1220	if (op->map->in_memory == MAP_SAVING)
		1221	return;
		1222
		1223	tag = op->count;
		1224	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1225
		1226	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1227	{
		1228	/* No point updating the players look faces if he is the object
		1229	* being removed.
		1230	*/
		1231
		1232	if (tmp->type == PLAYER && tmp != op)
1294	{	1233	{
1295	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1234	/* If a container that the player is currently using somehow gets
		1235	* removed (most likely destroyed), update the player view
		1236	* appropriately.
		1237	*/
		1238	if (tmp->container == op)
		1239	{
		1240	CLEAR_FLAG (op, FLAG_APPLIED);
		1241	tmp->container = NULL;
		1242	}
		1243
		1244	tmp->contr->socket.update_look = 1;
1296	}	1245	}
		1246
		1247	/* See if player moving off should effect something */
		1248	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1249	{
		1250	move_apply (tmp, op, NULL);
		1251
		1252	if (was_destroyed (op, tag))
		1253	{
		1254	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
		1255	}
1297	}	1256	}
1298		1257
1299	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1258	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1300		1259
1301	if (tmp->above == tmp)	1260	if (tmp->above == tmp)
1302	tmp->above = NULL;	1261	tmp->above = NULL;
		1262
1303	last = tmp;	1263	last = tmp;
1304	}	1264	}
		1265
1305	/* last == NULL of there are no objects on this space */	1266	/* last == NULL of there are no objects on this space */
1306	if (last == NULL)	1267	if (last == NULL)
1307	{	1268	{
1308	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1269	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1309	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1270	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1310	* those out anyways, and if there are any flags set right now, they won't	1271	* those out anyways, and if there are any flags set right now, they won't
1311	* be correct anyways.	1272	* be correct anyways.
1312	*/	1273	*/
1313	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1274	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1314	update_position (op->map, op->x, op->y);	1275	update_position (op->map, op->x, op->y);
1315	}	1276	}
1316	else	1277	else
1317	update_object (last, UP_OBJ_REMOVE);	1278	update_object (last, UP_OBJ_REMOVE);
1318		1279
1319	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))	1280	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))
1320	update_all_los (op->map, op->x, op->y);	1281	update_all_los (op->map, op->x, op->y);
1321		1282	}
1322	}	1283	}
1323		1284
1324	/*	1285	/*
1325	* merge_ob(op,top):	1286	* merge_ob(op,top):
1326	*	1287	*
…		…
1333	object *	1294	object *
1334	merge_ob (object op, object top)	1295	merge_ob (object op, object top)
1335	{	1296	{
1336	if (!op->nrof)	1297	if (!op->nrof)
1337	return 0;	1298	return 0;
		1299
1338	if (top == NULL)	1300	if (top == NULL)
1339	for (top = op; top != NULL && top->above != NULL; top = top->above);	1301	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1302
1340	for (; top != NULL; top = top->below)	1303	for (; top != NULL; top = top->below)
1341	{	1304	{
1342	if (top == op)	1305	if (top == op)
1343	continue;	1306	continue;
1344	if (CAN_MERGE (op, top))	1307	if (CAN_MERGE (op, top))
…		…
1350	remove_ob (op);	1313	remove_ob (op);
1351	free_object (op);	1314	free_object (op);
1352	return top;	1315	return top;
1353	}	1316	}
1354	}	1317	}
		1318
1355	return NULL;	1319	return NULL;
1356	}	1320	}
1357		1321
1358	/*	1322	/*
1359	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1323	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1360	* job preparing multi-part monsters	1324	* job preparing multi-part monsters
1361	*/	1325	*/
1362	object *	1326	object *
1363	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)	1327	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)
1364	{	1328	{
1365	object *	1329	object *tmp;
1366	tmp;
1367		1330
1368	if (op->head)	1331	if (op->head)
1369	op = op->head;	1332	op = op->head;
		1333
1370	for (tmp = op; tmp; tmp = tmp->more)	1334	for (tmp = op; tmp; tmp = tmp->more)
1371	{	1335	{
1372	tmp->x = x + tmp->arch->clone.x;	1336	tmp->x = x + tmp->arch->clone.x;
1373	tmp->y = y + tmp->arch->clone.y;	1337	tmp->y = y + tmp->arch->clone.y;
1374	}	1338	}
		1339
1375	return insert_ob_in_map (op, m, originator, flag);	1340	return insert_ob_in_map (op, m, originator, flag);
1376	}	1341	}
1377		1342
1378	/*	1343	/*
1379	* insert_ob_in_map (op, map, originator, flag):	1344	* insert_ob_in_map (op, map, originator, flag):
…		…
1438		1403
1439	if (op->more != NULL)	1404	if (op->more != NULL)
1440	{	1405	{
1441	/* The part may be on a different map. */	1406	/* The part may be on a different map. */
1442		1407
1443	object *
1444	more = op->more;	1408	object *more = op->more;
1445		1409
1446	/* We really need the caller to normalize coordinates - if	1410	/* We really need the caller to normalize coordinates - if
1447	* we set the map, that doesn't work if the location is within	1411	* we set the map, that doesn't work if the location is within
1448	* a map and this is straddling an edge. So only if coordinate	1412	* a map and this is straddling an edge. So only if coordinate
1449	* is clear wrong do we normalize it.	1413	* is clear wrong do we normalize it.
1450	*/	1414	*/
1451	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1415	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1452	{
1453	more->map = get_map_from_coord (m, &more->x, &more->y);	1416	more->map = get_map_from_coord (m, &more->x, &more->y);
1454	}
1455	else if (!more->map)	1417	else if (!more->map)
1456	{	1418	{
1457	/* For backwards compatibility - when not dealing with tiled maps,	1419	/* For backwards compatibility - when not dealing with tiled maps,
1458	* more->map should always point to the parent.	1420	* more->map should always point to the parent.
1459	*/	1421	*/
…		…
1462		1424
1463	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1425	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1464	{	1426	{
1465	if (!op->head)	1427	if (!op->head)
1466	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1428	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1429
1467	return NULL;	1430	return NULL;
1468	}	1431	}
1469	}	1432	}
1470		1433
1471	CLEAR_FLAG (op, FLAG_REMOVED);	1434	CLEAR_FLAG (op, FLAG_REMOVED);
…		…
1536		1499
1537	while (top != NULL)	1500	while (top != NULL)
1538	{	1501	{
1539	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1502	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1540	floor = top;	1503	floor = top;
		1504
1541	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1505	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1542	{	1506	{
1543	/* We insert above top, so we want this object below this */	1507	/* We insert above top, so we want this object below this */
1544	top = top->below;	1508	top = top->below;
1545	break;	1509	break;
1546	}	1510	}
		1511
1547	last = top;	1512	last = top;
1548	top = top->above;	1513	top = top->above;
1549	}	1514	}
		1515
1550	/* Don't want top to be NULL, so set it to the last valid object */	1516	/* Don't want top to be NULL, so set it to the last valid object */
1551	top = last;	1517	top = last;
1552		1518
1553	/* We let update_position deal with figuring out what the space	1519	/* We let update_position deal with figuring out what the space
1554	* looks like instead of lots of conditions here.	1520	* looks like instead of lots of conditions here.
…		…
1633	* of effect may be sufficient.	1599	* of effect may be sufficient.
1634	*/	1600	*/
1635	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1601	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1636	update_all_los (op->map, op->x, op->y);	1602	update_all_los (op->map, op->x, op->y);
1637		1603
1638
1639	/* updates flags (blocked, alive, no magic, etc) for this map space */	1604	/* updates flags (blocked, alive, no magic, etc) for this map space */
1640	update_object (op, UP_OBJ_INSERT);	1605	update_object (op, UP_OBJ_INSERT);
1641
1642		1606
1643	/* Don't know if moving this to the end will break anything. However,	1607	/* Don't know if moving this to the end will break anything. However,
1644	* we want to have update_look set above before calling this.	1608	* we want to have update_look set above before calling this.
1645	*	1609	*
1646	* check_move_on() must be after this because code called from	1610	* check_move_on() must be after this because code called from
…		…
1671	* op is the object to insert it under: supplies x and the map.	1635	* op is the object to insert it under: supplies x and the map.
1672	*/	1636	*/
1673	void	1637	void
1674	replace_insert_ob_in_map (const char arch_string, object op)	1638	replace_insert_ob_in_map (const char arch_string, object op)
1675	{	1639	{
1676	object *tmp;	1640	object *
		1641	tmp;
1677	object *tmp1;	1642	object *
		1643	tmp1;
1678		1644
1679	/* first search for itself and remove any old instances */	1645	/* first search for itself and remove any old instances */
1680		1646
1681	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1647	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1682	{	1648	{
…		…
1713	if (orig_ob->nrof < nr)	1679	if (orig_ob->nrof < nr)
1714	{	1680	{
1715	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1681	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1716	return NULL;	1682	return NULL;
1717	}	1683	}
		1684
1718	newob = object_create_clone (orig_ob);	1685	newob = object_create_clone (orig_ob);
		1686
1719	if ((orig_ob->nrof -= nr) < 1)	1687	if ((orig_ob->nrof -= nr) < 1)
1720	{	1688	{
1721	if (!is_removed)	1689	if (!is_removed)
1722	remove_ob (orig_ob);	1690	remove_ob (orig_ob);
1723	free_object2 (orig_ob, 1);	1691	free_object2 (orig_ob, 1);
…		…
1731	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1699	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1732	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1700	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1733	return NULL;	1701	return NULL;
1734	}	1702	}
1735	}	1703	}
		1704
1736	newob->nrof = nr;	1705	newob->nrof = nr;
1737		1706
1738	return newob;	1707	return newob;
1739	}	1708	}
1740		1709
…		…
1747	*/	1716	*/
1748		1717
1749	object *	1718	object *
1750	decrease_ob_nr (object *op, uint32 i)	1719	decrease_ob_nr (object *op, uint32 i)
1751	{	1720	{
1752	object *	1721	object *tmp;
1753	tmp;
1754	player *	1722	player *pl;
1755	pl;
1756		1723
1757	if (i == 0) /* objects with op->nrof require this check */	1724	if (i == 0) /* objects with op->nrof require this check */
1758	return op;	1725	return op;
1759		1726
1760	if (i > op->nrof)	1727	if (i > op->nrof)
1761	i = op->nrof;	1728	i = op->nrof;
1762		1729
1763	if (QUERY_FLAG (op, FLAG_REMOVED))	1730	if (QUERY_FLAG (op, FLAG_REMOVED))
1764	{
1765	op->nrof -= i;	1731	op->nrof -= i;
1766	}
1767	else if (op->env != NULL)	1732	else if (op->env != NULL)
1768	{	1733	{
1769	/* is this object in the players inventory, or sub container	1734	/* is this object in the players inventory, or sub container
1770	* therein?	1735	* therein?
1771	*/	1736	*/
…		…
1806	}	1771	}
1807	}	1772	}
1808	}	1773	}
1809	else	1774	else
1810	{	1775	{
1811	object *
1812	above = op->above;	1776	object *above = op->above;
1813		1777
1814	if (i < op->nrof)	1778	if (i < op->nrof)
1815	{
1816	op->nrof -= i;	1779	op->nrof -= i;
1817	}
1818	else	1780	else
1819	{	1781	{
1820	remove_ob (op);	1782	remove_ob (op);
1821	op->nrof = 0;	1783	op->nrof = 0;
1822	}	1784	}
		1785
1823	/* Since we just removed op, op->above is null */	1786	/* Since we just removed op, op->above is null */
1824	for (tmp = above; tmp != NULL; tmp = tmp->above)	1787	for (tmp = above; tmp != NULL; tmp = tmp->above)
1825	if (tmp->type == PLAYER)	1788	if (tmp->type == PLAYER)
1826	{	1789	{
1827	if (op->nrof)	1790	if (op->nrof)
…		…
1830	esrv_del_item (tmp->contr, op->count);	1793	esrv_del_item (tmp->contr, op->count);
1831	}	1794	}
1832	}	1795	}
1833		1796
1834	if (op->nrof)	1797	if (op->nrof)
1835	{
1836	return op;	1798	return op;
1837	}
1838	else	1799	else
1839	{	1800	{
1840	free_object (op);	1801	free_object (op);
1841	return NULL;	1802	return NULL;
1842	}	1803	}
…		…
1851	add_weight (object *op, signed long weight)	1812	add_weight (object *op, signed long weight)
1852	{	1813	{
1853	while (op != NULL)	1814	while (op != NULL)
1854	{	1815	{
1855	if (op->type == CONTAINER)	1816	if (op->type == CONTAINER)
1856	{
1857	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1817	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1858	}	1818
1859	op->carrying += weight;	1819	op->carrying += weight;
1860	op = op->env;	1820	op = op->env;
1861	}	1821	}
1862	}	1822	}
1863		1823
…		…
1886	{	1846	{
1887	dump_object (op);	1847	dump_object (op);
1888	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1848	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1889	return op;	1849	return op;
1890	}	1850	}
		1851
1891	if (where == NULL)	1852	if (where == NULL)
1892	{	1853	{
1893	dump_object (op);	1854	dump_object (op);
1894	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1855	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1895	return op;	1856	return op;
1896	}	1857	}
		1858
1897	if (where->head)	1859	if (where->head)
1898	{	1860	{
1899	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1861	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1900	where = where->head;	1862	where = where->head;
1901	}	1863	}
		1864
1902	if (op->more)	1865	if (op->more)
1903	{	1866	{
1904	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1867	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1905	return op;	1868	return op;
1906	}	1869	}
		1870
1907	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1871	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1908	CLEAR_FLAG (op, FLAG_REMOVED);	1872	CLEAR_FLAG (op, FLAG_REMOVED);
1909	if (op->nrof)	1873	if (op->nrof)
1910	{	1874	{
1911	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1875	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
2004	tag;	1968	tag;
2005	mapstruct *	1969	mapstruct *
2006	m = op->map;	1970	m = op->map;
2007	int	1971	int
2008	x = op->x, y = op->y;	1972	x = op->x, y = op->y;
		1973
2009	MoveType	1974	MoveType
2010	move_on,	1975	move_on,
2011	move_slow,	1976	move_slow,
2012	move_block;	1977	move_block;
2013		1978
…		…
2047	* we don't need to check all of them.	2012	* we don't need to check all of them.
2048	*/	2013	*/
2049	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	2014	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2050	break;	2015	break;
2051	}	2016	}
		2017
2052	for (; tmp != NULL; tmp = tmp->below)	2018	for (; tmp; tmp = tmp->below)
2053	{	2019	{
2054	if (tmp == op)	2020	if (tmp == op)
2055	continue; /* Can't apply yourself */	2021	continue; /* Can't apply yourself */
2056		2022
2057	/* Check to see if one of the movement types should be slowed down.	2023	/* Check to see if one of the movement types should be slowed down.
…		…
2065	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	2031	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
2066	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	2032	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2067	{	2033	{
2068		2034
2069	float	2035	float
2070	diff;
2071
2072	diff = tmp->move_slow_penalty * FABS (op->speed);	2036	diff = tmp->move_slow_penalty * FABS (op->speed);
		2037
2073	if (op->type == PLAYER)	2038	if (op->type == PLAYER)
2074	{
2075	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	2039	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
2076	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	2040	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2077	{
2078	diff /= 4.0;	2041	diff /= 4.0;
2079	}	2042
2080	}
2081	op->speed_left -= diff;	2043	op->speed_left -= diff;
2082	}	2044	}
2083	}	2045	}
2084		2046
2085	/* Basically same logic as above, except now for actual apply. */	2047	/* Basically same logic as above, except now for actual apply. */
2086	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	2048	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|
2087	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	2049	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2088	{	2050	{
2089
2090	move_apply (tmp, op, originator);	2051	move_apply (tmp, op, originator);
		2052
2091	if (was_destroyed (op, tag))	2053	if (was_destroyed (op, tag))
2092	return 1;	2054	return 1;
2093		2055
2094	/* what the person/creature stepped onto has moved the object	2056	/* what the person/creature stepped onto has moved the object
2095	* someplace new. Don't process any further - if we did,	2057	* someplace new. Don't process any further - if we did,
…		…
2097	*/	2059	*/
2098	if (op->map != m \|\| op->x != x \|\| op->y != y)	2060	if (op->map != m \|\| op->x != x \|\| op->y != y)
2099	return 0;	2061	return 0;
2100	}	2062	}
2101	}	2063	}
		2064
2102	return 0;	2065	return 0;
2103	}	2066	}
2104		2067
2105	/*	2068	/*
2106	* present_arch(arch, map, x, y) searches for any objects with	2069	* present_arch(arch, map, x, y) searches for any objects with
…		…
2397	find_dir (mapstruct m, int x, int y, object exclude)	2360	find_dir (mapstruct m, int x, int y, object exclude)
2398	{	2361	{
2399	int	2362	int
2400	i,	2363	i,
2401	max = SIZEOFFREE, mflags;	2364	max = SIZEOFFREE, mflags;
2402	sint16	2365
2403	nx,	2366	sint16 nx, ny;
2404	ny;
2405	object *	2367	object *
2406	tmp;	2368	tmp;
2407	mapstruct *	2369	mapstruct *
2408	mp;	2370	mp;
2409	MoveType	2371
2410	blocked,	2372	MoveType blocked, move_type;
2411	move_type;
2412		2373
2413	if (exclude && exclude->head)	2374	if (exclude && exclude->head)
2414	{	2375	{
2415	exclude = exclude->head;	2376	exclude = exclude->head;
2416	move_type = exclude->move_type;	2377	move_type = exclude->move_type;
…		…
2623		2584
2624		2585
2625	int	2586	int
2626	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2587	can_see_monsterP (mapstruct *m, int x, int y, int dir)
2627	{	2588	{
2628	sint16	2589	sint16 dx, dy;
2629	dx,
2630	dy;
2631	int	2590	int
2632	mflags;	2591	mflags;
2633		2592
2634	if (dir < 0)	2593	if (dir < 0)
2635	return 0; /* exit condition: invalid direction */	2594	return 0; /* exit condition: invalid direction */
…		…
2766	fprintf (tempfile, obstr);	2725	fprintf (tempfile, obstr);
2767	fclose (tempfile);	2726	fclose (tempfile);
2768		2727
2769	op = get_object ();	2728	op = get_object ();
2770		2729
2771	object_thawer	2730	object_thawer thawer (filename);
2772	thawer (filename);
2773		2731
2774	if (thawer)	2732	if (thawer)
2775	load_object (thawer, op, 0);	2733	load_object (thawer, op, 0);
2776		2734
2777	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2735	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2901	if (last)	2859	if (last)
2902	last->next = field->next;	2860	last->next = field->next;
2903	else	2861	else
2904	op->key_values = field->next;	2862	op->key_values = field->next;
2905		2863
2906	delete
2907	field;	2864	delete field;
2908	}	2865	}
2909	}	2866	}
2910	return TRUE;	2867	return TRUE;
2911	}	2868	}
2912	/* IF we get here, key doesn't exist */	2869	/* IF we get here, key doesn't exist */
…		…
2947	* Returns TRUE on success.	2904	* Returns TRUE on success.
2948	*/	2905	*/
2949	int	2906	int
2950	set_ob_key_value (object op, const char key, const char *value, int add_key)	2907	set_ob_key_value (object op, const char key, const char *value, int add_key)
2951	{	2908	{
2952	shstr
2953	key_ (key);	2909	shstr key_ (key);
2954		2910
2955	return set_ob_key_value_s (op, key_, value, add_key);	2911	return set_ob_key_value_s (op, key_, value, add_key);
2956	}	2912	}

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.25 by root, Mon Sep 11 01:16:20 2006 UTC vs. Revision 1.29 by root, Mon Sep 11 12:38:36 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.25 by root, Mon Sep 11 01:16:20 2006 UTC vs.
Revision 1.29 by root, Mon Sep 11 12:38:36 2006 UTC