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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.248 by root, Mon Jul 14 23:47:06 2008 UTC vs.
Revision 1.268 by root, Fri Dec 26 13:33:22 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
…		…
235	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	232	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
236	return 0;	233	return 0;
237		234
238	if ((ob1->flag ^ ob2->flag)	235	if ((ob1->flag ^ ob2->flag)
239	.reset (FLAG_INV_LOCKED)	236	.reset (FLAG_INV_LOCKED)
240	.reset (FLAG_CLIENT_SENT)
241	.reset (FLAG_REMOVED)	237	.reset (FLAG_REMOVED)
242	.any ())	238	.any ())
243	return 0;	239	return 0;
244		240
245	/* This is really a spellbook check - we should in general	241	/* This is really a spellbook check - we should in general
…		…
640	}	636	}
641		637
642	if (speed < 0)	638	if (speed < 0)
643	dst->speed_left -= rndm ();	639	dst->speed_left -= rndm ();
644		640
645	dst->set_speed (dst->speed);	641	dst->activate ();
646	}	642	}
647		643
648	void	644	void
649	object::instantiate ()	645	object::instantiate ()
650	{	646	{
…		…
770	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	766	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
771	\|\| (m.move_on \| op->move_on ) != m.move_on	767	\|\| (m.move_on \| op->move_on ) != m.move_on
772	\|\| (m.move_off \| op->move_off ) != m.move_off	768	\|\| (m.move_off \| op->move_off ) != m.move_off
773	\|\| (m.move_slow \| op->move_slow) != m.move_slow	769	\|\| (m.move_slow \| op->move_slow) != m.move_slow
774	/* 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
775	* to have move_allow right now.	771	* have move_allow right now.
776	*/	772	*/
777	\|\| ((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
778	\|\| 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)
779	m.flags_ = 0;	775	m.invalidate ();
780	}	776	}
781	/* if the object is being removed, we can't make intelligent	777	/* if the object is being removed, we can't make intelligent
782	* decisions, because remove_ob can't really pass the object	778	* decisions, because remove_ob can't really pass the object
783	* that is being removed.	779	* that is being removed.
784	*/	780	*/
785	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	781	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
786	m.flags_ = 0;	782	m.invalidate ();
787	else if (action == UP_OBJ_FACE)	783	else if (action == UP_OBJ_FACE)
788	/* Nothing to do for that case */ ;	784	/* Nothing to do for that case */ ;
789	else	785	else
790	LOG (llevError, "update_object called with invalid action: %d\n", action);	786	LOG (llevError, "update_object called with invalid action: %d\n", action);
791		787
…		…
833	object::activate ()	829	object::activate ()
834	{	830	{
835	/* If already on active list, don't do anything */	831	/* If already on active list, don't do anything */
836	if (active)	832	if (active)
837	return;	833	return;
		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
838		837
839	if (has_active_speed ())	838	if (has_active_speed ())
840	actives.insert (this);	839	actives.insert (this);
841	}	840	}
842		841
…		…
910	\|\| map->in_memory != MAP_ACTIVE	909	\|\| map->in_memory != MAP_ACTIVE
911	\|\| map->no_drop	910	\|\| map->no_drop
912	\|\| ms ().move_block == MOVE_ALL)	911	\|\| ms ().move_block == MOVE_ALL)
913	{	912	{
914	while (inv)	913	while (inv)
915	{
916	inv->destroy_inv (false);
917	inv->destroy ();	914	inv->destroy ();
918	}
919	}	915	}
920	else	916	else
921	{ /* Put objects in inventory onto this space */	917	{ /* Put objects in inventory onto this space */
922	while (inv)	918	while (inv)
923	{	919	{
…		…
927	\|\| op->flag [FLAG_NO_DROP]	923	\|\| op->flag [FLAG_NO_DROP]
928	\|\| op->type == RUNE	924	\|\| op->type == RUNE
929	\|\| op->type == TRAP	925	\|\| op->type == TRAP
930	\|\| op->flag [FLAG_IS_A_TEMPLATE]	926	\|\| op->flag [FLAG_IS_A_TEMPLATE]
931	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	927	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
932	op->destroy (true);	928	op->destroy ();
933	else	929	else
934	map->insert (op, x, y);	930	map->insert (op, x, y);
935	}	931	}
936	}	932	}
937	}	933	}
…		…
1001	attacked_by = 0;	997	attacked_by = 0;
1002	current_weapon = 0;	998	current_weapon = 0;
1003	}	999	}
1004		1000
1005	void	1001	void
1006	object::destroy (bool destroy_inventory)	1002	object::destroy ()
1007	{	1003	{
1008	if (destroyed ())	1004	if (destroyed ())
1009	return;	1005	return;
1010		1006
1011	if (!is_head () && !head->destroyed ())	1007	if (!is_head () && !head->destroyed ())
1012	{	1008	{
1013	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1009	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1014	head->destroy (destroy_inventory);	1010	head->destroy ();
1015	return;	1011	return;
1016	}	1012	}
1017		1013
1018	destroy_inv (!destroy_inventory);	1014	destroy_inv (false);
1019		1015
1020	if (is_head ())	1016	if (is_head ())
1021	if (sound_destroy)	1017	if (sound_destroy)
1022	play_sound (sound_destroy);	1018	play_sound (sound_destroy);
1023	else if (flag [FLAG_MONSTER])	1019	else if (flag [FLAG_MONSTER])
…		…
1059	if (object *pl = visible_to ())	1055	if (object *pl = visible_to ())
1060	esrv_del_item (pl->contr, count);	1056	esrv_del_item (pl->contr, count);
1061	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
1062		1058
1063	adjust_weight (env, -total_weight ());	1059	adjust_weight (env, -total_weight ());
		1060
		1061	object *pl = in_player ();
1064		1062
1065	/* we set up values so that it could be inserted into	1063	/* we set up values so that it could be inserted into
1066	* the map, but we don't actually do that - it is up	1064	* the map, but we don't actually do that - it is up
1067	* to the caller to decide what we want to do.	1065	* to the caller to decide what we want to do.
1068	*/	1066	*/
…		…
1080		1078
1081	/* NO_FIX_PLAYER is set when a great many changes are being	1079	/* NO_FIX_PLAYER is set when a great many changes are being
1082	* made to players inventory. If set, avoiding the call	1080	* made to players inventory. If set, avoiding the call
1083	* to save cpu time.	1081	* to save cpu time.
1084	*/	1082	*/
1085	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1083	if (pl)
		1084	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1085	{
1086	otmp->update_stats ();	1086	pl->update_stats ();
		1087
		1088	if (glow_radius && pl->is_on_map () && pl->map->darklevel () > 0)
		1089	update_all_los (pl->map, pl->x, pl->y);
		1090	}
1087	}	1091	}
1088	else if (map)	1092	else if (map)
1089	{	1093	{
1090	map->dirty = true;	1094	map->dirty = true;
1091	mapspace &ms = this->ms ();	1095	mapspace &ms = this->ms ();
…		…
1118	*(below ? &below->above : &ms.bot) = above;	1122	*(below ? &below->above : &ms.bot) = above;
1119		1123
1120	above = 0;	1124	above = 0;
1121	below = 0;	1125	below = 0;
1122		1126
		1127	ms.invalidate ();
		1128
1123	if (map->in_memory == MAP_SAVING)	1129	if (map->in_memory == MAP_SAVING)
1124	return;	1130	return;
1125		1131
1126	int check_walk_off = !flag [FLAG_NO_APPLY];	1132	int check_walk_off = !flag [FLAG_NO_APPLY];
1127		1133
…		…
1159	}	1165	}
1160		1166
1161	last = tmp;	1167	last = tmp;
1162	}	1168	}
1163		1169
1164	/* last == NULL if there are no objects on this space */	1170	if (affect_los () && map->darklevel () > 0)
1165	//TODO: this makes little sense, why only update the topmost object?
1166	if (!last)
1167	map->at (x, y).flags_ = 0;
1168	else
1169	update_object (last, UP_OBJ_REMOVE);
1170
1171	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1172	update_all_los (map, x, y);	1171	update_all_los (map, x, y);
1173	}	1172	}
1174	}	1173	}
1175		1174
1176	/*	1175	/*
…		…
1200	esrv_update_item (UPD_NROF, pl, top);	1199	esrv_update_item (UPD_NROF, pl, top);
1201		1200
1202	op->weight = 0; // cancel the addition above	1201	op->weight = 0; // cancel the addition above
1203	op->carrying = 0; // must be 0 already	1202	op->carrying = 0; // must be 0 already
1204		1203
1205	op->destroy (1);	1204	op->destroy ();
1206		1205
1207	return top;	1206	return top;
1208	}	1207	}
1209		1208
1210	return 0;	1209	return 0;
…		…
1272	* just 'op' otherwise	1271	* just 'op' otherwise
1273	*/	1272	*/
1274	object *	1273	object *
1275	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1274	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1276	{	1275	{
1277	if (op->is_on_map ())
1278	{
1279	LOG (llevError, "insert_ob_in_map called for object already on map");
1280	abort ();
1281	}
1282
1283	if (op->env)
1284	{
1285	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1286	op->remove ();	1276	op->remove ();
1287	}
1288		1277
1289	if (op->face && !face_info (op->face))//D TODO: remove soon	1278	if (m == &freed_map)//D TODO: remove soon
1290	{//D	1279	{//D
1291	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D	1280	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1292	op->face = 1;//D
1293	}//D	1281	}//D
1294		1282
1295	/* Ideally, the caller figures this out. However, it complicates a lot	1283	/* Ideally, the caller figures this out. However, it complicates a lot
1296	* of areas of callers (eg, anything that uses find_free_spot would now	1284	* of areas of callers (eg, anything that uses find_free_spot would now
1297	* need extra work	1285	* need extra work
1298	*/	1286	*/
1299	if (!xy_normalise (m, op->x, op->y))	1287	if (!xy_normalise (m, op->x, op->y))
1300	{	1288	{
1301	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1289	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1302	return 0;	1290	return 0;
1303	}	1291	}
1304		1292
1305	if (object *more = op->more)	1293	if (object *more = op->more)
1306	if (!insert_ob_in_map (more, m, originator, flag))	1294	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1319	{	1307	{
1320	// TODO: we actually want to update tmp, not op,	1308	// TODO: we actually want to update tmp, not op,
1321	// but some caller surely breaks when we return tmp	1309	// but some caller surely breaks when we return tmp
1322	// from here :/	1310	// from here :/
1323	op->nrof += tmp->nrof;	1311	op->nrof += tmp->nrof;
1324	tmp->destroy (1);	1312	tmp->destroy ();
1325	}	1313	}
1326		1314
1327	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1315	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1328	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1316	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1329		1317
…		…
1459	* be far away from this change and not affected in any way -	1447	* be far away from this change and not affected in any way -
1460	* this should get redone to only look for players within range,	1448	* this should get redone to only look for players within range,
1461	* or just updating the P_UPTODATE for spaces within this area	1449	* or just updating the P_UPTODATE for spaces within this area
1462	* of effect may be sufficient.	1450	* of effect may be sufficient.
1463	*/	1451	*/
1464	if (op->map->darkness && (op->glow_radius != 0))	1452	if (op->affects_los () && op->map->darklevel () > 0)
		1453	{
		1454	op->ms ().invalidate ();
1465	update_all_los (op->map, op->x, op->y);	1455	update_all_los (op->map, op->x, op->y);
		1456	}
1466		1457
1467	/* updates flags (blocked, alive, no magic, etc) for this map space */	1458	/* updates flags (blocked, alive, no magic, etc) for this map space */
1468	update_object (op, UP_OBJ_INSERT);	1459	update_object (op, UP_OBJ_INSERT);
1469		1460
1470	INVOKE_OBJECT (INSERT, op);	1461	INVOKE_OBJECT (INSERT, op);
…		…
1504	{	1495	{
1505	/* first search for itself and remove any old instances */	1496	/* first search for itself and remove any old instances */
1506		1497
1507	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1498	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1508	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1499	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1509	tmp->destroy (1);	1500	tmp->destroy ();
1510		1501
1511	object *tmp = arch_to_object (archetype::find (arch_string));	1502	object *tmp = arch_to_object (archetype::find (arch_string));
1512		1503
1513	tmp->x = op->x;	1504	tmp->x = op->x;
1514	tmp->y = op->y;	1505	tmp->y = op->y;
…		…
1538	if (!nr)	1529	if (!nr)
1539	return true;	1530	return true;
1540		1531
1541	nr = min (nr, nrof);	1532	nr = min (nr, nrof);
1542		1533
		1534	if (nrof > nr)
		1535	{
1543	nrof -= nr;	1536	nrof -= nr;
1544
1545	if (nrof)
1546	{
1547	adjust_weight (env, -weight * max (1, nr)); // carrying == 0	1537	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1548		1538
1549	if (object *pl = visible_to ())	1539	if (object *pl = visible_to ())
1550	esrv_update_item (UPD_NROF, pl, this);	1540	esrv_update_item (UPD_NROF, pl, this);
1551		1541
1552	return true;	1542	return true;
1553	}	1543	}
1554	else	1544	else
1555	{	1545	{
1556	destroy (1);	1546	destroy ();
1557	return false;	1547	return false;
1558	}	1548	}
1559	}	1549	}
1560		1550
1561	/*	1551	/*
…		…
1638	if (object *pl = tmp->visible_to ())	1628	if (object *pl = tmp->visible_to ())
1639	esrv_update_item (UPD_NROF, pl, tmp);	1629	esrv_update_item (UPD_NROF, pl, tmp);
1640		1630
1641	adjust_weight (this, op->total_weight ());	1631	adjust_weight (this, op->total_weight ());
1642		1632
1643	op->destroy (1);	1633	op->destroy ();
1644	op = tmp;	1634	op = tmp;
1645	goto inserted;	1635	goto inserted;
1646	}	1636	}
1647		1637
1648	op->owner = 0; // it's his/hers now. period.	1638	op->owner = 0; // it's his/hers now. period.
…		…
1666		1656
1667	adjust_weight (this, op->total_weight ());	1657	adjust_weight (this, op->total_weight ());
1668		1658
1669	inserted:	1659	inserted:
1670	/* reset the light list and los of the players on the map */	1660	/* reset the light list and los of the players on the map */
1671	if (op->glow_radius && map && map->darkness)	1661	if (op->glow_radius && is_on_map () && map->darklevel () > 0)
		1662	{
		1663	update_stats ();
1672	update_all_los (map, x, y);	1664	update_all_los (map, x, y);
1673		1665	}
		1666	else if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1674	// if this is a player's inventory, update stats	1667	// if this is a player's inventory, update stats
1675	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1676	update_stats ();	1668	update_stats ();
1677		1669
1678	INVOKE_OBJECT (INSERT, this);	1670	INVOKE_OBJECT (INSERT, this);
1679		1671
1680	return op;	1672	return op;
…		…
1982	* head of the object should correspond for the entire object.	1974	* head of the object should correspond for the entire object.
1983	*/	1975	*/
1984	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1976	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1985	continue;	1977	continue;
1986		1978
1987	if (ob->blocked (m, pos.x, pos.y))	1979	if (ob->blocked (pos.m, pos.x, pos.y))
1988	continue;	1980	continue;
1989		1981
1990	altern [index++] = i;	1982	altern [index++] = i;
1991	}	1983	}
1992		1984
…		…
2559	return splay (tmp);	2551	return splay (tmp);
2560		2552
2561	return 0;	2553	return 0;
2562	}	2554	}
2563		2555
2564	void	2556	object *
2565	object::force_add (const shstr name, int duration)	2557	object::force_add (const shstr name, int duration)
2566	{	2558	{
2567	if (object *force = force_find (name))	2559	if (object *force = force_find (name))
2568	force->destroy ();	2560	force->destroy ();
2569		2561
…		…
2575		2567
2576	force->set_speed (duration ? 1.f / duration : 0.f);	2568	force->set_speed (duration ? 1.f / duration : 0.f);
2577	force->flag [FLAG_IS_USED_UP] = true;	2569	force->flag [FLAG_IS_USED_UP] = true;
2578	force->flag [FLAG_APPLIED] = true;	2570	force->flag [FLAG_APPLIED] = true;
2579		2571
2580	insert (force);	2572	return insert (force);
2581	}	2573	}
2582		2574
2583	void	2575	void
2584	object::play_sound (faceidx sound)	2576	object::play_sound (faceidx sound)
2585	{	2577	{
…		…
2596	}	2588	}
2597	else	2589	else
2598	map->play_sound (sound, x, y);	2590	map->play_sound (sound, x, y);
2599	}	2591	}
2600		2592
		2593	void
		2594	object::make_noise ()
		2595	{
		2596	// we do not model noise in the map, so instead put
		2597	// a temporary light into the noise source
		2598	// could use the map instead, but that's less reliable for our
		2599	// goal, which is to make invisibility a bit harder to exploit
		2600
		2601	// currently only works sensibly for players
		2602	if (!is_player ())
		2603	return;
		2604
		2605	// find old force, or create new one
		2606	object *force = force_find (shstr_noise_force);
		2607
		2608	if (force)
		2609	force->speed = 1.f / 4; // patch old speed up
		2610	else
		2611	force_add (shstr_noise_force, 4);
		2612	}
		2613

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.248 by root, Mon Jul 14 23:47:06 2008 UTC vs. Revision 1.268 by root, Fri Dec 26 13:33:22 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.248 by root, Mon Jul 14 23:47:06 2008 UTC vs.
Revision 1.268 by root, Fri Dec 26 13:33:22 2008 UTC