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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.255 by root, Sun Aug 31 02:01:41 2008 UTC vs.
Revision 1.268 by root, Fri Dec 26 13:33:22 2008 UTC

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