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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.232 by root, Tue May 6 18:09:42 2008 UTC vs.
Revision 1.262 by elmex, Wed Oct 22 19:51:41 2008 UTC

…		…
186	\|\| ob1->speed != ob2->speed	186	\|\| ob1->speed != ob2->speed
187	\|\| ob1->value != ob2->value	187	\|\| ob1->value != ob2->value
188	\|\| ob1->name != ob2->name)	188	\|\| ob1->name != ob2->name)
189	return 0;	189	return 0;
190		190
191	/* Do not merge objects if nrof would overflow. First part checks	191	/* Do not merge objects if nrof would overflow, assume nrof
192	* for unsigned overflow (2c), second part checks whether the result	192	* is always 0 .. 2*31-1 /
193	* would fit into a 32 bit signed int, which is often used to hold	193	if (ob1->nrof > 0x7fffffff - ob2->nrof)
194	* nrof values.
195	*/
196	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
197	return 0;	194	return 0;
198		195
199	/* If the objects have been identified, set the BEEN_APPLIED flag.	196	/* If the objects have been identified, set the BEEN_APPLIED flag.
200	* This is to the comparison of the flags below will be OK. We	197	* This is to the comparison of the flags below will be OK. We
201	* just can't ignore the been applied or identified flags, as they	198	* just can't ignore the been applied or identified flags, as they
…		…
206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	203	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
207		204
208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	205	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
210		207
211	if (ob1->arch->name != ob2->arch->name	208	if (ob1->arch->archname != ob2->arch->archname
212	\|\| ob1->name != ob2->name	209	\|\| ob1->name != ob2->name
213	\|\| ob1->title != ob2->title	210	\|\| ob1->title != ob2->title
214	\|\| ob1->msg != ob2->msg	211	\|\| ob1->msg != ob2->msg
215	\|\| ob1->weight != ob2->weight	212	\|\| ob1->weight != ob2->weight
216	\|\| ob1->attacktype != ob2->attacktype	213	\|\| ob1->attacktype != ob2->attacktype
217	\|\| ob1->magic != ob2->magic	214	\|\| ob1->magic != ob2->magic
218	\|\| ob1->slaying != ob2->slaying	215	\|\| ob1->slaying != ob2->slaying
219	\|\| ob1->skill != ob2->skill	216	\|\| ob1->skill != ob2->skill
220	\|\| ob1->value != ob2->value	217	\|\| ob1->value != ob2->value
221	\|\| ob1->animation_id != ob2->animation_id	218	\|\| ob1->animation_id != ob2->animation_id
		219	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
222	\|\| ob1->client_type != ob2->client_type	220	\|\| ob1->client_type != ob2->client_type
223	\|\| ob1->materialname != ob2->materialname	221	\|\| ob1->materialname != ob2->materialname
224	\|\| ob1->lore != ob2->lore	222	\|\| ob1->lore != ob2->lore
225	\|\| ob1->subtype != ob2->subtype	223	\|\| ob1->subtype != ob2->subtype
226	\|\| ob1->move_type != ob2->move_type	224	\|\| ob1->move_type != ob2->move_type
…		…
234	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	232	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
235	return 0;	233	return 0;
236		234
237	if ((ob1->flag ^ ob2->flag)	235	if ((ob1->flag ^ ob2->flag)
238	.reset (FLAG_INV_LOCKED)	236	.reset (FLAG_INV_LOCKED)
239	.reset (FLAG_CLIENT_SENT)
240	.reset (FLAG_REMOVED)	237	.reset (FLAG_REMOVED)
241	.any ())	238	.any ())
242	return 0;	239	return 0;
243		240
244	/* This is really a spellbook check - we should in general	241	/* This is really a spellbook check - we should in general
…		…
344	else	341	else
345	{	342	{
346	// maybe there is a player standing on the same mapspace	343	// maybe there is a player standing on the same mapspace
347	// this will catch the case where "this" is a player	344	// this will catch the case where "this" is a player
348	if (object *pl = ms ().player ())	345	if (object *pl = ms ().player ())
		346	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
349	if (!pl->container \|\| this == pl->container)	347	\|\| this == pl->container)
350	return pl;	348	return pl;
351	}	349	}
352	}	350	}
353		351
354	return 0;	352	return 0;
355	}	353	}
356		354
357	// adjust weight per container type ("of holding")	355	// adjust weight per container type ("of holding")
358	static sint32	356	static sint32
359	weight_adjust (object *op, sint32 weight)	357	weight_adjust_for (object *op, sint32 weight)
360	{	358	{
361	return op->type == CONTAINER	359	return op->type == CONTAINER
362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	360	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
363	: weight;	361	: weight;
364	}	362	}
…		…
370	static void	368	static void
371	adjust_weight (object *op, sint32 weight)	369	adjust_weight (object *op, sint32 weight)
372	{	370	{
373	while (op)	371	while (op)
374	{	372	{
		373	// adjust by actual difference to account for rounding errors
		374	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
375	weight = weight_adjust (op, weight);	375	weight = weight_adjust_for (op, op->carrying)
		376	- weight_adjust_for (op, op->carrying - weight);
376		377
377	if (!weight)	378	if (!weight)
378	return;	379	return;
379		380
380	op->carrying += weight;	381	op->carrying += weight;
…		…
403	op->update_weight ();	404	op->update_weight ();
404		405
405	sum += op->total_weight ();	406	sum += op->total_weight ();
406	}	407	}
407		408
408	sum = weight_adjust (this, sum);	409	sum = weight_adjust_for (this, sum);
409		410
410	if (sum != carrying)	411	if (sum != carrying)
411	{	412	{
412	carrying = sum;	413	carrying = sum;
413		414
…		…
475	*/	476	*/
476	object *	477	object *
477	find_object_name (const char *str)	478	find_object_name (const char *str)
478	{	479	{
479	shstr_cmp str_ (str);	480	shstr_cmp str_ (str);
480	object *op;
481		481
		482	if (str_)
482	for_all_objects (op)	483	for_all_objects (op)
483	if (op->name == str_)	484	if (op->name == str_)
484	break;	485	return op;
485		486
486	return op;	487	return 0;
487	}	488	}
488		489
489	/*	490	/*
490	* Sets the owner and sets the skill and exp pointers to owner's current	491	* Sets the owner and sets the skill and exp pointers to owner's current
491	* skill and experience objects.	492	* skill and experience objects.
…		…
635	}	636	}
636		637
637	if (speed < 0)	638	if (speed < 0)
638	dst->speed_left -= rndm ();	639	dst->speed_left -= rndm ();
639		640
640	dst->set_speed (dst->speed);	641	dst->activate ();
641	}	642	}
642		643
643	void	644	void
644	object::instantiate ()	645	object::instantiate ()
645	{	646	{
…		…
765	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	766	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
766	\|\| (m.move_on \| op->move_on ) != m.move_on	767	\|\| (m.move_on \| op->move_on ) != m.move_on
767	\|\| (m.move_off \| op->move_off ) != m.move_off	768	\|\| (m.move_off \| op->move_off ) != m.move_off
768	\|\| (m.move_slow \| op->move_slow) != m.move_slow	769	\|\| (m.move_slow \| op->move_slow) != m.move_slow
769	/* This isn't perfect, but I don't expect a lot of objects to	770	/* This isn't perfect, but I don't expect a lot of objects to
770	* to have move_allow right now.	771	* have move_allow right now.
771	*/	772	*/
772	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	773	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
773	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	774	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
774	m.flags_ = 0;	775	m.flags_ = 0;
775	}	776	}
…		…
829	{	830	{
830	/* If already on active list, don't do anything */	831	/* If already on active list, don't do anything */
831	if (active)	832	if (active)
832	return;	833	return;
833		834
		835	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		836	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError \| logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
		837
834	if (has_active_speed ())	838	if (has_active_speed ())
835	actives.insert (this);	839	actives.insert (this);
836	}	840	}
837		841
838	void	842	void
…		…
901	* drop on that space.	905	* drop on that space.
902	*/	906	*/
903	if (!drop_to_ground	907	if (!drop_to_ground
904	\|\| !map	908	\|\| !map
905	\|\| map->in_memory != MAP_ACTIVE	909	\|\| map->in_memory != MAP_ACTIVE
906	\|\| map->nodrop	910	\|\| map->no_drop
907	\|\| ms ().move_block == MOVE_ALL)	911	\|\| ms ().move_block == MOVE_ALL)
908	{	912	{
909	while (inv)	913	while (inv)
910	{
911	inv->destroy_inv (false);
912	inv->destroy ();	914	inv->destroy ();
913	}
914	}	915	}
915	else	916	else
916	{ /* Put objects in inventory onto this space */	917	{ /* Put objects in inventory onto this space */
917	while (inv)	918	while (inv)
918	{	919	{
…		…
922	\|\| op->flag [FLAG_NO_DROP]	923	\|\| op->flag [FLAG_NO_DROP]
923	\|\| op->type == RUNE	924	\|\| op->type == RUNE
924	\|\| op->type == TRAP	925	\|\| op->type == TRAP
925	\|\| op->flag [FLAG_IS_A_TEMPLATE]	926	\|\| op->flag [FLAG_IS_A_TEMPLATE]
926	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	927	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
927	op->destroy (true);	928	op->destroy ();
928	else	929	else
929	map->insert (op, x, y);	930	map->insert (op, x, y);
930	}	931	}
931	}	932	}
932	}	933	}
…		…
940		941
941	static struct freed_map : maptile	942	static struct freed_map : maptile
942	{	943	{
943	freed_map ()	944	freed_map ()
944	{	945	{
945	path = "<freed objects map>";	946	path = "<freed objects map>";
946	name = "/internal/freed_objects_map";	947	name = "/internal/freed_objects_map";
947	width = 3;	948	width = 3;
948	height = 3;	949	height = 3;
949	nodrop = 1;	950	no_drop = 1;
		951	no_reset = 1;
950		952
951	alloc ();	953	alloc ();
952	in_memory = MAP_ACTIVE;	954	in_memory = MAP_ACTIVE;
953	}	955	}
954		956
…		…
995	attacked_by = 0;	997	attacked_by = 0;
996	current_weapon = 0;	998	current_weapon = 0;
997	}	999	}
998		1000
999	void	1001	void
1000	object::destroy (bool destroy_inventory)	1002	object::destroy ()
1001	{	1003	{
1002	if (destroyed ())	1004	if (destroyed ())
1003	return;	1005	return;
1004		1006
1005	if (!is_head () && !head->destroyed ())	1007	if (!is_head () && !head->destroyed ())
1006	{	1008	{
1007	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1009	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1008	head->destroy (destroy_inventory);	1010	head->destroy ();
1009	return;	1011	return;
1010	}	1012	}
1011		1013
1012	destroy_inv (!destroy_inventory);	1014	destroy_inv (false);
1013		1015
1014	if (is_head ())	1016	if (is_head ())
1015	if (sound_destroy)	1017	if (sound_destroy)
1016	play_sound (sound_destroy);	1018	play_sound (sound_destroy);
1017	else if (flag [FLAG_MONSTER])	1019	else if (flag [FLAG_MONSTER])
…		…
1053	if (object *pl = visible_to ())	1055	if (object *pl = visible_to ())
1054	esrv_del_item (pl->contr, count);	1056	esrv_del_item (pl->contr, count);
1055	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1057	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1056		1058
1057	adjust_weight (env, -total_weight ());	1059	adjust_weight (env, -total_weight ());
1058
1059	*(above ? &above->below : &env->inv) = below;
1060
1061	if (below)
1062	below->above = above;
1063		1060
1064	/* we set up values so that it could be inserted into	1061	/* we set up values so that it could be inserted into
1065	* the map, but we don't actually do that - it is up	1062	* the map, but we don't actually do that - it is up
1066	* to the caller to decide what we want to do.	1063	* to the caller to decide what we want to do.
1067	*/	1064	*/
1068	map = env->map;	1065	map = env->map;
1069	x = env->x;	1066	x = env->x;
1070	y = env->y;	1067	y = env->y;
		1068
		1069	// make sure cmov optimisation is applicable
		1070	*(above ? &above->below : &env->inv) = below;
		1071	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1072
1071	above = 0;	1073	above = 0;
1072	below = 0;	1074	below = 0;
1073	env = 0;	1075	env = 0;
1074		1076
1075	/* NO_FIX_PLAYER is set when a great many changes are being	1077	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1105		1107
1106	esrv_del_item (pl->contr, count);	1108	esrv_del_item (pl->contr, count);
1107	}	1109	}
1108		1110
1109	/* link the object above us */	1111	/* link the object above us */
1110	if (above)	1112	// re-link, make sure compiler can easily use cmove
1111	above->below = below;	1113	*(above ? &above->below : &ms.top) = below;
1112	else	1114	*(below ? &below->above : &ms.bot) = above;
1113	ms.top = below; /* we were top, set new top */
1114
1115	/* Relink the object below us, if there is one */
1116	if (below)
1117	below->above = above;
1118	else
1119	{
1120	/* Nothing below, which means we need to relink map object for this space
1121	* use translated coordinates in case some oddness with map tiling is
1122	* evident
1123	*/
1124	if (GET_MAP_OB (map, x, y) != this)
1125	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 ());
1126
1127	ms.bot = above; /* goes on above it. */
1128	}
1129		1115
1130	above = 0;	1116	above = 0;
1131	below = 0;	1117	below = 0;
		1118
		1119	ms.flags_ = 0;
1132		1120
1133	if (map->in_memory == MAP_SAVING)	1121	if (map->in_memory == MAP_SAVING)
1134	return;	1122	return;
1135		1123
1136	int check_walk_off = !flag [FLAG_NO_APPLY];	1124	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1169	}	1157	}
1170		1158
1171	last = tmp;	1159	last = tmp;
1172	}	1160	}
1173		1161
1174	/* last == NULL if there are no objects on this space */
1175	//TODO: this makes little sense, why only update the topmost object?
1176	if (!last)
1177	map->at (x, y).flags_ = 0;
1178	else
1179	update_object (last, UP_OBJ_REMOVE);
1180
1181	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1162	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1182	update_all_los (map, x, y);	1163	update_all_los (map, x, y);
1183	}	1164	}
1184	}	1165	}
1185		1166
…		…
1210	esrv_update_item (UPD_NROF, pl, top);	1191	esrv_update_item (UPD_NROF, pl, top);
1211		1192
1212	op->weight = 0; // cancel the addition above	1193	op->weight = 0; // cancel the addition above
1213	op->carrying = 0; // must be 0 already	1194	op->carrying = 0; // must be 0 already
1214		1195
1215	op->destroy (1);	1196	op->destroy ();
1216		1197
1217	return top;	1198	return top;
1218	}	1199	}
1219		1200
1220	return 0;	1201	return 0;
…		…
1248	* job preparing multi-part monsters.	1229	* job preparing multi-part monsters.
1249	*/	1230	*/
1250	object *	1231	object *
1251	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1232	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1252	{	1233	{
		1234	op->remove ();
		1235
1253	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1236	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1254	{	1237	{
1255	tmp->x = x + tmp->arch->x;	1238	tmp->x = x + tmp->arch->x;
1256	tmp->y = y + tmp->arch->y;	1239	tmp->y = y + tmp->arch->y;
1257	}	1240	}
…		…
1280	* just 'op' otherwise	1263	* just 'op' otherwise
1281	*/	1264	*/
1282	object *	1265	object *
1283	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1266	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1284	{	1267	{
1285	assert (!op->flag [FLAG_FREED]);
1286
1287	op->remove ();	1268	op->remove ();
		1269
		1270	if (m == &freed_map)//D TODO: remove soon
		1271	{//D
		1272	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1273	}//D
1288		1274
1289	/* Ideally, the caller figures this out. However, it complicates a lot	1275	/* Ideally, the caller figures this out. However, it complicates a lot
1290	* of areas of callers (eg, anything that uses find_free_spot would now	1276	* of areas of callers (eg, anything that uses find_free_spot would now
1291	* need extra work	1277	* need extra work
1292	*/	1278	*/
1293	if (!xy_normalise (m, op->x, op->y))	1279	if (!xy_normalise (m, op->x, op->y))
1294	{	1280	{
1295	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1281	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1296	return 0;	1282	return 0;
1297	}	1283	}
1298		1284
1299	if (object *more = op->more)	1285	if (object *more = op->more)
1300	if (!insert_ob_in_map (more, m, originator, flag))	1286	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1309	*/	1295	*/
1310	if (op->nrof && !(flag & INS_NO_MERGE))	1296	if (op->nrof && !(flag & INS_NO_MERGE))
1311	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1297	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1312	if (object::can_merge (op, tmp))	1298	if (object::can_merge (op, tmp))
1313	{	1299	{
1314	// TODO: we atcually want to update tmp, not op,	1300	// TODO: we actually want to update tmp, not op,
1315	// but some caller surely breaks when we return tmp	1301	// but some caller surely breaks when we return tmp
1316	// from here :/	1302	// from here :/
1317	op->nrof += tmp->nrof;	1303	op->nrof += tmp->nrof;
1318	tmp->destroy (1);	1304	tmp->destroy ();
1319	}	1305	}
1320		1306
1321	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1307	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1322	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1308	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1323		1309
…		…
1330	{	1316	{
1331	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1317	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1332	abort ();	1318	abort ();
1333	}	1319	}
1334		1320
		1321	if (!originator->is_on_map ())
		1322	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1323	op->debug_desc (), originator->debug_desc ());
		1324
1335	op->above = originator;	1325	op->above = originator;
1336	op->below = originator->below;	1326	op->below = originator->below;
1337
1338	if (op->below)
1339	op->below->above = op;
1340	else
1341	ms.bot = op;
1342
1343	/* since below originator, no need to update top */
1344	originator->below = op;	1327	originator->below = op;
		1328
		1329	*(op->below ? &op->below->above : &ms.bot) = op;
1345	}	1330	}
1346	else	1331	else
1347	{	1332	{
1348	object top, floor = NULL;	1333	object *floor = 0;
1349		1334	object *top = ms.top;
1350	top = ms.bot;
1351		1335
1352	/* If there are other objects, then */	1336	/* If there are other objects, then */
1353	if (top)	1337	if (top)
1354	{	1338	{
1355	object *last = 0;
1356
1357	/*	1339	/*
1358	* If there are multiple objects on this space, we do some trickier handling.	1340	* If there are multiple objects on this space, we do some trickier handling.
1359	* We've already dealt with merging if appropriate.	1341	* We've already dealt with merging if appropriate.
1360	* Generally, we want to put the new object on top. But if	1342	* Generally, we want to put the new object on top. But if
1361	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1343	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1364	* once we get to them. This reduces the need to traverse over all of	1346	* once we get to them. This reduces the need to traverse over all of
1365	* them when adding another one - this saves quite a bit of cpu time	1347	* them when adding another one - this saves quite a bit of cpu time
1366	* when lots of spells are cast in one area. Currently, it is presumed	1348	* when lots of spells are cast in one area. Currently, it is presumed
1367	* that flying non pickable objects are spell objects.	1349	* that flying non pickable objects are spell objects.
1368	*/	1350	*/
1369	for (top = ms.bot; top; top = top->above)	1351	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1370	{	1352	{
1371	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1353	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1372	floor = top;	1354	floor = tmp;
1373		1355
1374	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1356	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1375	{	1357	{
1376	/* We insert above top, so we want this object below this */	1358	/* We insert above top, so we want this object below this */
1377	top = top->below;	1359	top = tmp->below;
1378	break;	1360	break;
1379	}	1361	}
1380		1362
1381	last = top;	1363	top = tmp;
1382	}	1364	}
1383
1384	/* Don't want top to be NULL, so set it to the last valid object */
1385	top = last;
1386		1365
1387	/* We let update_position deal with figuring out what the space	1366	/* We let update_position deal with figuring out what the space
1388	* looks like instead of lots of conditions here.	1367	* looks like instead of lots of conditions here.
1389	* makes things faster, and effectively the same result.	1368	* makes things faster, and effectively the same result.
1390	*/	1369	*/
…		…
1397	*/	1376	*/
1398	if (!(flag & INS_ON_TOP)	1377	if (!(flag & INS_ON_TOP)
1399	&& ms.flags () & P_BLOCKSVIEW	1378	&& ms.flags () & P_BLOCKSVIEW
1400	&& (op->face && !faces [op->face].visibility))	1379	&& (op->face && !faces [op->face].visibility))
1401	{	1380	{
		1381	object *last;
		1382
1402	for (last = top; last != floor; last = last->below)	1383	for (last = top; last != floor; last = last->below)
1403	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1384	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1404	break;	1385	break;
1405		1386
1406	/* Check to see if we found the object that blocks view,	1387	/* Check to see if we found the object that blocks view,
…		…
1414	} /* If objects on this space */	1395	} /* If objects on this space */
1415		1396
1416	if (flag & INS_ABOVE_FLOOR_ONLY)	1397	if (flag & INS_ABOVE_FLOOR_ONLY)
1417	top = floor;	1398	top = floor;
1418		1399
1419	/* Top is the object that our object (op) is going to get inserted above.	1400	// insert object above top, or bottom-most if top = 0
1420	*/
1421
1422	/* First object on this space */
1423	if (!top)	1401	if (!top)
1424	{	1402	{
		1403	op->below = 0;
1425	op->above = ms.bot;	1404	op->above = ms.bot;
1426
1427	if (op->above)
1428	op->above->below = op;
1429
1430	op->below = 0;
1431	ms.bot = op;	1405	ms.bot = op;
		1406
		1407	*(op->above ? &op->above->below : &ms.top) = op;
1432	}	1408	}
1433	else	1409	else
1434	{ /* get inserted into the stack above top */	1410	{
1435	op->above = top->above;	1411	op->above = top->above;
1436
1437	if (op->above)
1438	op->above->below = op;	1412	top->above = op;
1439		1413
1440	op->below = top;	1414	op->below = top;
1441	top->above = op;	1415	*(op->above ? &op->above->below : &ms.top) = op;
1442	}	1416	}
1443		1417	}
1444	if (!op->above)
1445	ms.top = op;
1446	} /* else not INS_BELOW_ORIGINATOR */
1447		1418
1448	if (op->type == PLAYER)	1419	if (op->type == PLAYER)
1449	{	1420	{
1450	op->contr->do_los = 1;	1421	op->contr->do_los = 1;
1451	++op->map->players;	1422	++op->map->players;
…		…
1513	{	1484	{
1514	/* first search for itself and remove any old instances */	1485	/* first search for itself and remove any old instances */
1515		1486
1516	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1487	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1517	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1488	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1518	tmp->destroy (1);	1489	tmp->destroy ();
1519		1490
1520	object *tmp = arch_to_object (archetype::find (arch_string));	1491	object *tmp = arch_to_object (archetype::find (arch_string));
1521		1492
1522	tmp->x = op->x;	1493	tmp->x = op->x;
1523	tmp->y = op->y;	1494	tmp->y = op->y;
…		…
1547	if (!nr)	1518	if (!nr)
1548	return true;	1519	return true;
1549		1520
1550	nr = min (nr, nrof);	1521	nr = min (nr, nrof);
1551		1522
		1523	if (nrof > nr)
		1524	{
1552	nrof -= nr;	1525	nrof -= nr;
1553
1554	if (nrof)
1555	{
1556	adjust_weight (env, -weight * nr); // carrying == 0	1526	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1557		1527
1558	if (object *pl = visible_to ())	1528	if (object *pl = visible_to ())
1559	esrv_update_item (UPD_NROF, pl, this);	1529	esrv_update_item (UPD_NROF, pl, this);
1560		1530
1561	return true;	1531	return true;
1562	}	1532	}
1563	else	1533	else
1564	{	1534	{
1565	destroy (1);	1535	destroy ();
1566	return false;	1536	return false;
1567	}	1537	}
1568	}	1538	}
1569		1539
1570	/*	1540	/*
…		…
1647	if (object *pl = tmp->visible_to ())	1617	if (object *pl = tmp->visible_to ())
1648	esrv_update_item (UPD_NROF, pl, tmp);	1618	esrv_update_item (UPD_NROF, pl, tmp);
1649		1619
1650	adjust_weight (this, op->total_weight ());	1620	adjust_weight (this, op->total_weight ());
1651		1621
1652	op->destroy (1);	1622	op->destroy ();
1653	op = tmp;	1623	op = tmp;
1654	goto inserted;	1624	goto inserted;
1655	}	1625	}
1656		1626
1657	op->owner = 0; // it's his/hers now. period.	1627	op->owner = 0; // it's his/hers now. period.
…		…
1991	* head of the object should correspond for the entire object.	1961	* head of the object should correspond for the entire object.
1992	*/	1962	*/
1993	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1963	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1994	continue;	1964	continue;
1995		1965
1996	if (ob->blocked (m, pos.x, pos.y))	1966	if (ob->blocked (pos.m, pos.x, pos.y))
1997	continue;	1967	continue;
1998		1968
1999	altern [index++] = i;	1969	altern [index++] = i;
2000	}	1970	}
2001		1971
…		…
2446	{	2416	{
2447	char flagdesc[512];	2417	char flagdesc[512];
2448	char info2[256 * 4];	2418	char info2[256 * 4];
2449	char *p = info;	2419	char *p = info;
2450		2420
2451	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2421	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2452	count,	2422	count,
2453	uuid.c_str (),	2423	uuid.c_str (),
2454	&name,	2424	&name,
2455	title ? "\",title:\"" : "",	2425	title ? ",title:\"" : "",
2456	title ? (const char *)title : "",	2426	title ? (const char *)title : "",
		2427	title ? "\"" : "",
2457	flag_desc (flagdesc, 512), type);	2428	flag_desc (flagdesc, 512), type);
2458		2429
2459	if (!flag[FLAG_REMOVED] && env)	2430	if (!flag[FLAG_REMOVED] && env)
2460	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2431	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2461		2432

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.232 by root, Tue May 6 18:09:42 2008 UTC vs. Revision 1.262 by elmex, Wed Oct 22 19:51:41 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.232 by root, Tue May 6 18:09:42 2008 UTC vs.
Revision 1.262 by elmex, Wed Oct 22 19:51:41 2008 UTC