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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.175 by root, Fri Aug 10 01:47:52 2007 UTC vs.
Revision 1.193 by root, Mon Oct 15 17:50:27 2007 UTC

…		…
254	/* This is really a spellbook check - really, we should	254	/* This is really a spellbook check - really, we should
255	* check all objects in the inventory.	255	* check all objects in the inventory.
256	*/	256	*/
257	if (ob1->inv \|\| ob2->inv)	257	if (ob1->inv \|\| ob2->inv)
258	{	258	{
259	/* if one object has inventory but the other doesn't, not equiv */	259	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) \|\| (ob2->inv && !ob1->inv))	260	return 0; /* inventories differ in length */
261	return 0;
262		261
263	/* Now check to see if the two inventory objects could merge */	262	if (ob1->inv->below \|\| ob2->inv->below)
		263	return 0; /* more than one object in inv */
		264
264	if (!object::can_merge (ob1->inv, ob2->inv))	265	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	266	return 0; /* inventory objexts differ */
266		267
267	/* inventory ok - still need to check rest of this object to see	268	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	269	* if it is valid.
269	*/	270	*/
270	}	271	}
…		…
305	{	306	{
306	ob1->optimise ();	307	ob1->optimise ();
307	ob2->optimise ();	308	ob2->optimise ();
308		309
309	if (ob1->self \|\| ob2->self)	310	if (ob1->self \|\| ob2->self)
310	if (!cfperl_can_merge (ob1, ob2))	311	{
		312	int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0;
		313	int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0;
		314
		315	if (k1 != k2)
311	return 0;	316	return 0;
		317	else if (k1 == 0)
		318	return 1;
		319	else if (!cfperl_can_merge (ob1, ob2))
		320	return 0;
		321	}
312	}	322	}
313		323
314	/* Everything passes, must be OK. */	324	/* Everything passes, must be OK. */
315	return 1;	325	return 1;
316	}	326	}
…		…
374	/*	384	/*
375	* get_nearest_part(multi-object, object 2) returns the part of the	385	* get_nearest_part(multi-object, object 2) returns the part of the
376	* multi-object 1 which is closest to the second object.	386	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.	387	* If it's not a multi-object, it is returned.
378	*/	388	*/
379
380	object *	389	object *
381	get_nearest_part (object op, const object pl)	390	get_nearest_part (object op, const object pl)
382	{	391	{
383	object tmp, closest;	392	object tmp, closest;
384	int last_dist, i;	393	int last_dist, i;
…		…
429	}	438	}
430		439
431	/*	440	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	441	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	442	* skill and experience objects.
		443	* ACTUALLY NO! investigate! TODO
434	*/	444	*/
435	void	445	void
436	object::set_owner (object *owner)	446	object::set_owner (object *owner)
437	{	447	{
		448	// allow objects which own objects
438	if (!owner)	449	if (owner)
439	return;
440
441	/* next line added to allow objects which own objects */
442	/* Add a check for ownercounts in here, as I got into an endless loop
443	* with the fireball owning a poison cloud which then owned the
444	* fireball. I believe that was caused by one of the objects getting
445	* freed and then another object replacing it. Since the ownercounts
446	* didn't match, this check is valid and I believe that cause is valid.
447	*/
448	while (owner->owner)	450	while (owner->owner)
449	owner = owner->owner;	451	owner = owner->owner;
450		452
451	this->owner = owner;	453	this->owner = owner;
452	}	454	}
453		455
454	int	456	int
…		…
586	object::copy_to (object *dst)	588	object::copy_to (object *dst)
587	{	589	{
588	dst = this;	590	dst = this;
589		591
590	if (speed < 0)	592	if (speed < 0)
591	dst->speed_left = speed_left - rndm ();	593	dst->speed_left -= rndm ();
592		594
593	dst->set_speed (dst->speed);	595	dst->set_speed (dst->speed);
594	}	596	}
595		597
596	void	598	void
…		…
923		925
924	if (!freed_map)	926	if (!freed_map)
925	{	927	{
926	freed_map = new maptile;	928	freed_map = new maptile;
927		929
		930	freed_map->path = "<freed objects map>";
928	freed_map->name = "/internal/freed_objects_map";	931	freed_map->name = "/internal/freed_objects_map";
929	freed_map->width = 3;	932	freed_map->width = 3;
930	freed_map->height = 3;	933	freed_map->height = 3;
931		934
932	freed_map->alloc ();	935	freed_map->alloc ();
…		…
1238		1241
1239	object top, floor = NULL;	1242	object top, floor = NULL;
1240		1243
1241	op->remove ();	1244	op->remove ();
1242		1245
1243	#if 0
1244	if (!m->active != !op->active)
1245	if (m->active)
1246	op->activate_recursive ();
1247	else
1248	op->deactivate_recursive ();
1249	#endif
1250
1251	if (out_of_map (m, op->x, op->y))
1252	{
1253	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1254	#ifdef MANY_CORES
1255	/* Better to catch this here, as otherwise the next use of this object
1256	* is likely to cause a crash. Better to find out where it is getting
1257	* improperly inserted.
1258	*/
1259	abort ();
1260	#endif
1261	return op;
1262	}
1263
1264	if (object *more = op->more)
1265	if (!insert_ob_in_map (more, m, originator, flag))
1266	return 0;
1267
1268	CLEAR_FLAG (op, FLAG_REMOVED);
1269
1270	/* Ideally, the caller figures this out. However, it complicates a lot	1246	/* Ideally, the caller figures this out. However, it complicates a lot
1271	* of areas of callers (eg, anything that uses find_free_spot would now	1247	* of areas of callers (eg, anything that uses find_free_spot would now
1272	* need extra work	1248	* need extra work
1273	*/	1249	*/
1274	if (!xy_normalise (m, op->x, op->y))	1250	if (!xy_normalise (m, op->x, op->y))
		1251	{
		1252	op->destroy ();
1275	return 0;	1253	return 0;
		1254	}
		1255
		1256	if (object *more = op->more)
		1257	if (!insert_ob_in_map (more, m, originator, flag))
		1258	return 0;
		1259
		1260	CLEAR_FLAG (op, FLAG_REMOVED);
1276		1261
1277	op->map = m;	1262	op->map = m;
1278	mapspace &ms = op->ms ();	1263	mapspace &ms = op->ms ();
1279		1264
1280	/* this has to be done after we translate the coordinates.	1265	/* this has to be done after we translate the coordinates.
…		…
1315	else	1300	else
1316	{	1301	{
1317	top = ms.bot;	1302	top = ms.bot;
1318		1303
1319	/* If there are other objects, then */	1304	/* If there are other objects, then */
1320	if ((!(flag & INS_MAP_LOAD)) && top)	1305	if (top)
1321	{	1306	{
1322	object *last = 0;	1307	object *last = 0;
1323		1308
1324	/*	1309	/*
1325	* If there are multiple objects on this space, we do some trickier handling.	1310	* If there are multiple objects on this space, we do some trickier handling.
…		…
1377	*/	1362	*/
1378	if (last && last->below && last != floor)	1363	if (last && last->below && last != floor)
1379	top = last->below;	1364	top = last->below;
1380	}	1365	}
1381	} /* If objects on this space */	1366	} /* If objects on this space */
1382	if (flag & INS_MAP_LOAD)
1383	top = ms.top;
1384		1367
1385	if (flag & INS_ABOVE_FLOOR_ONLY)	1368	if (flag & INS_ABOVE_FLOOR_ONLY)
1386	top = floor;	1369	top = floor;
1387		1370
1388	/* Top is the object that our object (op) is going to get inserted above.	1371	/* Top is the object that our object (op) is going to get inserted above.
…		…
1421	op->map->touch ();	1404	op->map->touch ();
1422	}	1405	}
1423		1406
1424	op->map->dirty = true;	1407	op->map->dirty = true;
1425		1408
1426	/* If we have a floor, we know the player, if any, will be above
1427	* it, so save a few ticks and start from there.
1428	*/
1429	if (!(flag & INS_MAP_LOAD))
1430	if (object *pl = ms.player ())	1409	if (object *pl = ms.player ())
1431	pl->contr->ns->floorbox_update ();	1410	pl->contr->ns->floorbox_update ();
1432		1411
1433	/* If this object glows, it may affect lighting conditions that are	1412	/* If this object glows, it may affect lighting conditions that are
1434	* visible to others on this map. But update_all_los is really	1413	* visible to others on this map. But update_all_los is really
1435	* an inefficient way to do this, as it means los for all players	1414	* an inefficient way to do this, as it means los for all players
1436	* on the map will get recalculated. The players could very well	1415	* on the map will get recalculated. The players could very well
…		…
1674	* be != op, if items are merged. -Tero	1653	* be != op, if items are merged. -Tero
1675	*/	1654	*/
1676	object *	1655	object *
1677	object::insert (object *op)	1656	object::insert (object *op)
1678	{	1657	{
1679	object tmp, otmp;
1680
1681	if (!QUERY_FLAG (op, FLAG_REMOVED))	1658	if (!QUERY_FLAG (op, FLAG_REMOVED))
1682	op->remove ();	1659	op->remove ();
1683		1660
1684	if (op->more)	1661	if (op->more)
1685	{	1662	{
…		…
1687	return op;	1664	return op;
1688	}	1665	}
1689		1666
1690	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1667	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1691	CLEAR_FLAG (op, FLAG_REMOVED);	1668	CLEAR_FLAG (op, FLAG_REMOVED);
		1669
1692	if (op->nrof)	1670	if (op->nrof)
1693	{	1671	{
1694	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1672	for (object *tmp = inv; tmp; tmp = tmp->below)
1695	if (object::can_merge (tmp, op))	1673	if (object::can_merge (tmp, op))
1696	{	1674	{
1697	/* return the original object and remove inserted object	1675	/* return the original object and remove inserted object
1698	(client needs the original object) */	1676	(client needs the original object) */
1699	tmp->nrof += op->nrof;	1677	tmp->nrof += op->nrof;
…		…
1718	add_weight (this, op->weight * op->nrof);	1696	add_weight (this, op->weight * op->nrof);
1719	}	1697	}
1720	else	1698	else
1721	add_weight (this, (op->weight + op->carrying));	1699	add_weight (this, (op->weight + op->carrying));
1722		1700
1723	otmp = this->in_player ();	1701	if (object *otmp = this->in_player ())
1724	if (otmp && otmp->contr)
1725	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1702	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1726	otmp->update_stats ();	1703	otmp->update_stats ();
1727		1704
		1705	op->owner = 0; // its his/hers now. period.
1728	op->map = 0;	1706	op->map = 0;
1729	op->env = this;	1707	op->env = this;
1730	op->above = 0;	1708	op->above = 0;
1731	op->below = 0;	1709	op->below = 0;
1732	op->x = 0, op->y = 0;	1710	op->x = op->y = 0;
1733		1711
1734	/* reset the light list and los of the players on the map */	1712	/* reset the light list and los of the players on the map */
1735	if ((op->glow_radius != 0) && map)	1713	if (op->glow_radius && map)
1736	{	1714	{
1737	#ifdef DEBUG_LIGHTS	1715	#ifdef DEBUG_LIGHTS
1738	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1716	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1739	#endif /* DEBUG_LIGHTS */	1717	#endif /* DEBUG_LIGHTS */
1740	if (map->darkness)	1718	if (map->darkness)
…		…
2020	* customized, changed states, etc.	1998	* customized, changed states, etc.
2021	*/	1999	*/
2022	int	2000	int
2023	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)	2001	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2024	{	2002	{
		2003	int altern[SIZEOFFREE];
2025	int index = 0, flag;	2004	int index = 0, flag;
2026	int altern[SIZEOFFREE];
2027		2005
2028	for (int i = start; i < stop; i++)	2006	for (int i = start; i < stop; i++)
2029	{	2007	{
2030	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2008	mapxy pos (m, x, y); pos.move (i);
2031	if (!flag)	2009
		2010	if (!pos.normalise ())
		2011	continue;
		2012
		2013	mapspace &ms = *pos;
		2014
		2015	if (ms.flags () & P_IS_ALIVE)
		2016	continue;
		2017
		2018	/* However, often
		2019	* ob doesn't have any move type (when used to place exits)
		2020	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2021	*/
		2022	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2023	{
2032	altern [index++] = i;	2024	altern [index++] = i;
		2025	continue;
		2026	}
2033		2027
2034	/* Basically, if we find a wall on a space, we cut down the search size.	2028	/* Basically, if we find a wall on a space, we cut down the search size.
2035	* In this way, we won't return spaces that are on another side of a wall.	2029	* In this way, we won't return spaces that are on another side of a wall.
2036	* This mostly work, but it cuts down the search size in all directions -	2030	* This mostly work, but it cuts down the search size in all directions -
2037	* if the space being examined only has a wall to the north and empty	2031	* if the space being examined only has a wall to the north and empty
2038	* spaces in all the other directions, this will reduce the search space	2032	* spaces in all the other directions, this will reduce the search space
2039	* to only the spaces immediately surrounding the target area, and	2033	* to only the spaces immediately surrounding the target area, and
2040	* won't look 2 spaces south of the target space.	2034	* won't look 2 spaces south of the target space.
2041	*/	2035	*/
2042	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2036	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2037	{
2043	stop = maxfree[i];	2038	stop = maxfree[i];
		2039	continue;
		2040	}
		2041
		2042	/* Note it is intentional that we check ob - the movement type of the
		2043	* head of the object should correspond for the entire object.
		2044	*/
		2045	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2046	continue;
		2047
		2048	altern [index++] = i;
2044	}	2049	}
2045		2050
2046	if (!index)	2051	if (!index)
2047	return -1;	2052	return -1;
2048		2053
…		…
2057	*/	2062	*/
2058	int	2063	int
2059	find_first_free_spot (const object ob, maptile m, int x, int y)	2064	find_first_free_spot (const object ob, maptile m, int x, int y)
2060	{	2065	{
2061	for (int i = 0; i < SIZEOFFREE; i++)	2066	for (int i = 0; i < SIZEOFFREE; i++)
2062	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2067	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2063	return i;	2068	return i;
2064		2069
2065	return -1;	2070	return -1;
2066	}	2071	}
2067		2072
…		…
2344	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2349	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2345	* core dumps if they do.	2350	* core dumps if they do.
2346	*	2351	*
2347	* Add a check so we can't pick up invisible objects (0.93.8)	2352	* Add a check so we can't pick up invisible objects (0.93.8)
2348	*/	2353	*/
2349
2350	int	2354	int
2351	can_pick (const object who, const object item)	2355	can_pick (const object who, const object item)
2352	{	2356	{
2353	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2357	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2354	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2358	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2612	&name,	2616	&name,
2613	title ? "\",title:\"" : "",	2617	title ? "\",title:\"" : "",
2614	title ? (const char *)title : "",	2618	title ? (const char *)title : "",
2615	flag_desc (flagdesc, 512), type);	2619	flag_desc (flagdesc, 512), type);
2616		2620
2617	if (env)	2621	if (!this->flag[FLAG_REMOVED] && env)
2618	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2622	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2619		2623
2620	if (map)	2624	if (map)
2621	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2625	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2622		2626
…		…
2669	old_container->flag [FLAG_APPLIED] = 0;	2673	old_container->flag [FLAG_APPLIED] = 0;
2670	container = 0;	2674	container = 0;
2671		2675
2672	esrv_update_item (UPD_FLAGS, this, old_container);	2676	esrv_update_item (UPD_FLAGS, this, old_container);
2673	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2677	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2678	play_sound (sound_find ("chest_close"));
2674	}	2679	}
2675		2680
2676	if (new_container)	2681	if (new_container)
2677	{	2682	{
2678	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2683	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2694	new_container->flag [FLAG_APPLIED] = 1;	2699	new_container->flag [FLAG_APPLIED] = 1;
2695	container = new_container;	2700	container = new_container;
2696		2701
2697	esrv_update_item (UPD_FLAGS, this, new_container);	2702	esrv_update_item (UPD_FLAGS, this, new_container);
2698	esrv_send_inventory (this, new_container);	2703	esrv_send_inventory (this, new_container);
		2704	play_sound (sound_find ("chest_open"));
2699	}	2705	}
2700	}	2706	}
2701		2707
2702	object *	2708	object *
2703	object::force_find (const shstr name)	2709	object::force_find (const shstr name)
…		…
2729	force->flag [FLAG_APPLIED] = true;	2735	force->flag [FLAG_APPLIED] = true;
2730		2736
2731	insert (force);	2737	insert (force);
2732	}	2738	}
2733		2739
		2740	void
		2741	object::play_sound (faceidx sound) const
		2742	{
		2743	if (!sound)
		2744	return;
		2745
		2746	if (flag [FLAG_REMOVED])
		2747	return;
		2748
		2749	if (env)
		2750	{
		2751	if (object *pl = in_player ())
		2752	pl->contr->play_sound (sound);
		2753	}
		2754	else
		2755	map->play_sound (sound, x, y);
		2756	}
		2757

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.175 by root, Fri Aug 10 01:47:52 2007 UTC vs. Revision 1.193 by root, Mon Oct 15 17:50:27 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.175 by root, Fri Aug 10 01:47:52 2007 UTC vs.
Revision 1.193 by root, Mon Oct 15 17:50:27 2007 UTC