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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.254 by root, Sun Aug 31 01:17:11 2008 UTC vs.
Revision 1.267 by root, Tue Dec 23 01:51:27 2008 UTC

…		…
232	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	232	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
233	return 0;	233	return 0;
234		234
235	if ((ob1->flag ^ ob2->flag)	235	if ((ob1->flag ^ ob2->flag)
236	.reset (FLAG_INV_LOCKED)	236	.reset (FLAG_INV_LOCKED)
237	.reset (FLAG_CLIENT_SENT)
238	.reset (FLAG_REMOVED)	237	.reset (FLAG_REMOVED)
239	.any ())	238	.any ())
240	return 0;	239	return 0;
241		240
242	/* This is really a spellbook check - we should in general	241	/* This is really a spellbook check - we should in general
…		…
637	}	636	}
638		637
639	if (speed < 0)	638	if (speed < 0)
640	dst->speed_left -= rndm ();	639	dst->speed_left -= rndm ();
641		640
642	dst->set_speed (dst->speed);	641	dst->activate ();
643	}	642	}
644		643
645	void	644	void
646	object::instantiate ()	645	object::instantiate ()
647	{	646	{
…		…
771	/* 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
772	* have move_allow right now.	771	* have move_allow right now.
773	*/	772	*/
774	\|\| ((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
775	\|\| 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)
776	m.flags_ = 0;	775	m.invalidate ();
777	}	776	}
778	/* if the object is being removed, we can't make intelligent	777	/* if the object is being removed, we can't make intelligent
779	* decisions, because remove_ob can't really pass the object	778	* decisions, because remove_ob can't really pass the object
780	* that is being removed.	779	* that is being removed.
781	*/	780	*/
782	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	781	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
783	m.flags_ = 0;	782	m.invalidate ();
784	else if (action == UP_OBJ_FACE)	783	else if (action == UP_OBJ_FACE)
785	/* Nothing to do for that case */ ;	784	/* Nothing to do for that case */ ;
786	else	785	else
787	LOG (llevError, "update_object called with invalid action: %d\n", action);	786	LOG (llevError, "update_object called with invalid action: %d\n", action);
788		787
…		…
830	object::activate ()	829	object::activate ()
831	{	830	{
832	/* If already on active list, don't do anything */	831	/* If already on active list, don't do anything */
833	if (active)	832	if (active)
834	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
835		837
836	if (has_active_speed ())	838	if (has_active_speed ())
837	actives.insert (this);	839	actives.insert (this);
838	}	840	}
839		841
…		…
907	\|\| map->in_memory != MAP_ACTIVE	909	\|\| map->in_memory != MAP_ACTIVE
908	\|\| map->no_drop	910	\|\| map->no_drop
909	\|\| ms ().move_block == MOVE_ALL)	911	\|\| ms ().move_block == MOVE_ALL)
910	{	912	{
911	while (inv)	913	while (inv)
912	inv->destroy (true);	914	inv->destroy ();
913	}	915	}
914	else	916	else
915	{ /* Put objects in inventory onto this space */	917	{ /* Put objects in inventory onto this space */
916	while (inv)	918	while (inv)
917	{	919	{
…		…
921	\|\| op->flag [FLAG_NO_DROP]	923	\|\| op->flag [FLAG_NO_DROP]
922	\|\| op->type == RUNE	924	\|\| op->type == RUNE
923	\|\| op->type == TRAP	925	\|\| op->type == TRAP
924	\|\| op->flag [FLAG_IS_A_TEMPLATE]	926	\|\| op->flag [FLAG_IS_A_TEMPLATE]
925	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	927	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
926	op->destroy (true);	928	op->destroy ();
927	else	929	else
928	map->insert (op, x, y);	930	map->insert (op, x, y);
929	}	931	}
930	}	932	}
931	}	933	}
…		…
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 ());
		1060
		1061	object *pl = in_player ();
1058		1062
1059	/* we set up values so that it could be inserted into	1063	/* we set up values so that it could be inserted into
1060	* 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
1061	* to the caller to decide what we want to do.	1065	* to the caller to decide what we want to do.
1062	*/	1066	*/
…		…
1074		1078
1075	/* 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
1076	* made to players inventory. If set, avoiding the call	1080	* made to players inventory. If set, avoiding the call
1077	* to save cpu time.	1081	* to save cpu time.
1078	*/	1082	*/
1079	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	{
1080	otmp->update_stats ();	1086	pl->update_stats ();
		1087
		1088	if (glow_radius && pl->is_on_map () && pl->map->darkness)
		1089	update_all_los (pl->map, pl->x, pl->y);
		1090	}
1081	}	1091	}
1082	else if (map)	1092	else if (map)
1083	{	1093	{
1084	map->dirty = true;	1094	map->dirty = true;
1085	mapspace &ms = this->ms ();	1095	mapspace &ms = this->ms ();
…		…
1112	*(below ? &below->above : &ms.bot) = above;	1122	*(below ? &below->above : &ms.bot) = above;
1113		1123
1114	above = 0;	1124	above = 0;
1115	below = 0;	1125	below = 0;
1116		1126
1117	ms.flags_ = 0;	1127	ms.invalidate ();
1118		1128
1119	if (map->in_memory == MAP_SAVING)	1129	if (map->in_memory == MAP_SAVING)
1120	return;	1130	return;
1121		1131
1122	int check_walk_off = !flag [FLAG_NO_APPLY];	1132	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1155	}	1165	}
1156		1166
1157	last = tmp;	1167	last = tmp;
1158	}	1168	}
1159		1169
1160	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1170	if (map->darkness && affects_los ())
1161	update_all_los (map, x, y);	1171	update_all_los (map, x, y);
1162	}	1172	}
1163	}	1173	}
1164		1174
1165	/*	1175	/*
…		…
1189	esrv_update_item (UPD_NROF, pl, top);	1199	esrv_update_item (UPD_NROF, pl, top);
1190		1200
1191	op->weight = 0; // cancel the addition above	1201	op->weight = 0; // cancel the addition above
1192	op->carrying = 0; // must be 0 already	1202	op->carrying = 0; // must be 0 already
1193		1203
1194	op->destroy (1);	1204	op->destroy ();
1195		1205
1196	return top;	1206	return top;
1197	}	1207	}
1198		1208
1199	return 0;	1209	return 0;
…		…
1261	* just 'op' otherwise	1271	* just 'op' otherwise
1262	*/	1272	*/
1263	object *	1273	object *
1264	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)
1265	{	1275	{
1266	if (op->is_on_map ())
1267	{
1268	LOG (llevError, "insert_ob_in_map called for object already on map");
1269	abort ();
1270	}
1271
1272	if (op->env)
1273	{
1274	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1275	op->remove ();	1276	op->remove ();
1276	}
1277		1277
1278	if (op->face && !face_info (op->face))//D TODO: remove soon	1278	if (m == &freed_map)//D TODO: remove soon
1279	{//D	1279	{//D
1280	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
1281	op->face = 1;//D
1282	}//D	1281	}//D
1283		1282
1284	/* Ideally, the caller figures this out. However, it complicates a lot	1283	/* Ideally, the caller figures this out. However, it complicates a lot
1285	* 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
1286	* need extra work	1285	* need extra work
1287	*/	1286	*/
1288	if (!xy_normalise (m, op->x, op->y))	1287	if (!xy_normalise (m, op->x, op->y))
1289	{	1288	{
1290	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1289	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1291	return 0;	1290	return 0;
1292	}	1291	}
1293		1292
1294	if (object *more = op->more)	1293	if (object *more = op->more)
1295	if (!insert_ob_in_map (more, m, originator, flag))	1294	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1308	{	1307	{
1309	// TODO: we actually want to update tmp, not op,	1308	// TODO: we actually want to update tmp, not op,
1310	// but some caller surely breaks when we return tmp	1309	// but some caller surely breaks when we return tmp
1311	// from here :/	1310	// from here :/
1312	op->nrof += tmp->nrof;	1311	op->nrof += tmp->nrof;
1313	tmp->destroy (1);	1312	tmp->destroy ();
1314	}	1313	}
1315		1314
1316	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 */
1317	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1316	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1318		1317
…		…
1448	* 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 -
1449	* this should get redone to only look for players within range,	1448	* this should get redone to only look for players within range,
1450	* or just updating the P_UPTODATE for spaces within this area	1449	* or just updating the P_UPTODATE for spaces within this area
1451	* of effect may be sufficient.	1450	* of effect may be sufficient.
1452	*/	1451	*/
1453	if (op->map->darkness && (op->glow_radius != 0))	1452	if (op->affects_los () && op->map->darkness)
		1453	{
		1454	op->ms ().invalidate ();
1454	update_all_los (op->map, op->x, op->y);	1455	update_all_los (op->map, op->x, op->y);
		1456	}
1455		1457
1456	/* updates flags (blocked, alive, no magic, etc) for this map space */	1458	/* updates flags (blocked, alive, no magic, etc) for this map space */
1457	update_object (op, UP_OBJ_INSERT);	1459	update_object (op, UP_OBJ_INSERT);
1458		1460
1459	INVOKE_OBJECT (INSERT, op);	1461	INVOKE_OBJECT (INSERT, op);
…		…
1493	{	1495	{
1494	/* first search for itself and remove any old instances */	1496	/* first search for itself and remove any old instances */
1495		1497
1496	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1498	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1497	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1499	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1498	tmp->destroy (1);	1500	tmp->destroy ();
1499		1501
1500	object *tmp = arch_to_object (archetype::find (arch_string));	1502	object *tmp = arch_to_object (archetype::find (arch_string));
1501		1503
1502	tmp->x = op->x;	1504	tmp->x = op->x;
1503	tmp->y = op->y;	1505	tmp->y = op->y;
…		…
1626	if (object *pl = tmp->visible_to ())	1628	if (object *pl = tmp->visible_to ())
1627	esrv_update_item (UPD_NROF, pl, tmp);	1629	esrv_update_item (UPD_NROF, pl, tmp);
1628		1630
1629	adjust_weight (this, op->total_weight ());	1631	adjust_weight (this, op->total_weight ());
1630		1632
1631	op->destroy (1);	1633	op->destroy ();
1632	op = tmp;	1634	op = tmp;
1633	goto inserted;	1635	goto inserted;
1634	}	1636	}
1635		1637
1636	op->owner = 0; // it's his/hers now. period.	1638	op->owner = 0; // it's his/hers now. period.
…		…
1654		1656
1655	adjust_weight (this, op->total_weight ());	1657	adjust_weight (this, op->total_weight ());
1656		1658
1657	inserted:	1659	inserted:
1658	/* 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 */
1659	if (op->glow_radius && map && map->darkness)	1661	if (op->glow_radius && is_on_map () && map->darkness)
		1662	{
		1663	update_stats ();
1660	update_all_los (map, x, y);	1664	update_all_los (map, x, y);
1661		1665	}
		1666	else if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1662	// if this is a player's inventory, update stats	1667	// if this is a player's inventory, update stats
1663	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1664	update_stats ();	1668	update_stats ();
1665		1669
1666	INVOKE_OBJECT (INSERT, this);	1670	INVOKE_OBJECT (INSERT, this);
1667		1671
1668	return op;	1672	return op;
…		…
1970	* head of the object should correspond for the entire object.	1974	* head of the object should correspond for the entire object.
1971	*/	1975	*/
1972	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1976	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1973	continue;	1977	continue;
1974		1978
1975	if (ob->blocked (m, pos.x, pos.y))	1979	if (ob->blocked (pos.m, pos.x, pos.y))
1976	continue;	1980	continue;
1977		1981
1978	altern [index++] = i;	1982	altern [index++] = i;
1979	}	1983	}
1980		1984
…		…
2547	return splay (tmp);	2551	return splay (tmp);
2548		2552
2549	return 0;	2553	return 0;
2550	}	2554	}
2551		2555
2552	void	2556	object *
2553	object::force_add (const shstr name, int duration)	2557	object::force_add (const shstr name, int duration)
2554	{	2558	{
2555	if (object *force = force_find (name))	2559	if (object *force = force_find (name))
2556	force->destroy ();	2560	force->destroy ();
2557		2561
…		…
2563		2567
2564	force->set_speed (duration ? 1.f / duration : 0.f);	2568	force->set_speed (duration ? 1.f / duration : 0.f);
2565	force->flag [FLAG_IS_USED_UP] = true;	2569	force->flag [FLAG_IS_USED_UP] = true;
2566	force->flag [FLAG_APPLIED] = true;	2570	force->flag [FLAG_APPLIED] = true;
2567		2571
2568	insert (force);	2572	return insert (force);
2569	}	2573	}
2570		2574
2571	void	2575	void
2572	object::play_sound (faceidx sound)	2576	object::play_sound (faceidx sound)
2573	{	2577	{
…		…
2584	}	2588	}
2585	else	2589	else
2586	map->play_sound (sound, x, y);	2590	map->play_sound (sound, x, y);
2587	}	2591	}
2588		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.254 by root, Sun Aug 31 01:17:11 2008 UTC vs. Revision 1.267 by root, Tue Dec 23 01:51:27 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.254 by root, Sun Aug 31 01:17:11 2008 UTC vs.
Revision 1.267 by root, Tue Dec 23 01:51:27 2008 UTC