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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.142 by root, Mon Apr 30 04:25:29 2007 UTC vs.
Revision 1.191 by root, Sun Sep 30 20:22:15 2007 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
29	#include <stdio.h>	28	#include <stdio.h>
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
		33	#include <sproto.h>
34	#include <loader.h>	34	#include <loader.h>
35		35
36	#include <bitset>	36	#include <bitset>
37		37
38	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
…		…
299	return 0;	299	return 0;
300	else if (!compare_ob_value_lists (ob1, ob2))	300	else if (!compare_ob_value_lists (ob1, ob2))
301	return 0;	301	return 0;
302	}	302	}
303		303
304	//TODO: generate an event or call into perl for additional checks
305	if (ob1->self \|\| ob2->self)	304	if (ob1->self \|\| ob2->self)
306	{	305	{
307	ob1->optimise ();	306	ob1->optimise ();
308	ob2->optimise ();	307	ob2->optimise ();
309		308
310	if (ob1->self \|\| ob2->self)	309	if (ob1->self \|\| ob2->self)
		310	if (!cfperl_can_merge (ob1, ob2))
311	return 0;	311	return 0;
312	}	312	}
313		313
314	/* Everything passes, must be OK. */	314	/* Everything passes, must be OK. */
315	return 1;	315	return 1;
316	}	316	}
…		…
374	/*	374	/*
375	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
376	* multi-object 1 which is closest to the second object.	376	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.	377	* If it's not a multi-object, it is returned.
378	*/	378	*/
379
380	object *	379	object *
381	get_nearest_part (object op, const object pl)	380	get_nearest_part (object op, const object pl)
382	{	381	{
383	object tmp, closest;	382	object tmp, closest;
384	int last_dist, i;	383	int last_dist, i;
…		…
429	}	428	}
430		429
431	/*	430	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	431	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	432	* skill and experience objects.
		433	* ACTUALLY NO! investigate! TODO
434	*/	434	*/
435	void	435	void
436	object::set_owner (object *owner)	436	object::set_owner (object *owner)
437	{	437	{
		438	// allow objects which own objects
438	if (!owner)	439	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)	440	while (owner->owner)
449	owner = owner->owner;	441	owner = owner->owner;
450		442
451	this->owner = owner;	443	this->owner = owner;
		444	}
		445
		446	int
		447	object::slottype () const
		448	{
		449	if (type == SKILL)
		450	{
		451	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		452	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		453	}
		454	else
		455	{
		456	if (slot [body_combat].info) return slot_combat;
		457	if (slot [body_range ].info) return slot_ranged;
		458	}
		459
		460	return slot_none;
		461	}
		462
		463	bool
		464	object::change_weapon (object *ob)
		465	{
		466	if (current_weapon == ob)
		467	return true;
		468
		469	if (chosen_skill)
		470	chosen_skill->flag [FLAG_APPLIED] = false;
		471
		472	current_weapon = ob;
		473	chosen_skill = !ob \|\| ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		474
		475	if (chosen_skill)
		476	chosen_skill->flag [FLAG_APPLIED] = true;
		477
		478	update_stats ();
		479
		480	if (ob)
		481	{
		482	// now check wether any body locations became invalid, in which case
		483	// we cannot apply the weapon at the moment.
		484	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		485	if (slot[i].used < 0)
		486	{
		487	current_weapon = chosen_skill = 0;
		488	update_stats ();
		489
		490	new_draw_info_format (NDI_UNIQUE, 0, this,
		491	"You try to balance all your items at once, "
		492	"but the %s is just too much for your body. "
		493	"[You need to unapply some items first.]", &ob->name);
		494	return false;
		495	}
		496
		497	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		498	}
		499	else
		500	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		501
		502	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		503	{
		504	LOG (llevError \| logBacktrace, "%s changed to unapplied weapon %s",
		505	&name, ob->debug_desc ());
		506	return false;
		507	}
		508
		509	return true;
452	}	510	}
453		511
454	/* Zero the key_values on op, decrementing the shared-string	512	/* Zero the key_values on op, decrementing the shared-string
455	* refcounts and freeing the links.	513	* refcounts and freeing the links.
456	*/	514	*/
…		…
520	object::copy_to (object *dst)	578	object::copy_to (object *dst)
521	{	579	{
522	dst = this;	580	dst = this;
523		581
524	if (speed < 0)	582	if (speed < 0)
525	dst->speed_left = speed_left - rndm ();	583	dst->speed_left -= rndm ();
526		584
527	dst->set_speed (dst->speed);	585	dst->set_speed (dst->speed);
528	}	586	}
529		587
530	void	588	void
…		…
538	* need for monsters, but doesn't hurt to do it for everything.	596	* need for monsters, but doesn't hurt to do it for everything.
539	* by doing so, when a monster is created, it has good starting	597	* by doing so, when a monster is created, it has good starting
540	* values for the body_used info, so when items are created	598	* values for the body_used info, so when items are created
541	* for it, they can be properly equipped.	599	* for it, they can be properly equipped.
542	*/	600	*/
543	memcpy (body_used, body_info, sizeof (body_used));	601	for (int i = NUM_BODY_LOCATIONS; i--; )
		602	slot[i].used = slot[i].info;
544		603
545	attachable::instantiate ();	604	attachable::instantiate ();
546	}	605	}
547		606
548	object *	607	object *
…		…
856		915
857	if (!freed_map)	916	if (!freed_map)
858	{	917	{
859	freed_map = new maptile;	918	freed_map = new maptile;
860		919
		920	freed_map->path = "<freed objects map>";
861	freed_map->name = "/internal/freed_objects_map";	921	freed_map->name = "/internal/freed_objects_map";
862	freed_map->width = 3;	922	freed_map->width = 3;
863	freed_map->height = 3;	923	freed_map->height = 3;
864		924
865	freed_map->alloc ();	925	freed_map->alloc ();
…		…
869	map = freed_map;	929	map = freed_map;
870	x = 1;	930	x = 1;
871	y = 1;	931	y = 1;
872	}	932	}
873		933
874	head = 0;
875
876	if (more)	934	if (more)
877	{	935	{
878	more->destroy ();	936	more->destroy ();
879	more = 0;	937	more = 0;
880	}	938	}
881		939
		940	head = 0;
		941
882	// clear those pointers that likely might have circular references to us	942	// clear those pointers that likely might cause circular references
883	owner = 0;	943	owner = 0;
884	enemy = 0;	944	enemy = 0;
885	attacked_by = 0;	945	attacked_by = 0;
		946	current_weapon = 0;
886	}	947	}
887		948
888	void	949	void
889	object::destroy (bool destroy_inventory)	950	object::destroy (bool destroy_inventory)
890	{	951	{
891	if (destroyed ())	952	if (destroyed ())
892	return;	953	return;
893		954
894	if (destroy_inventory)	955	if (destroy_inventory)
895	destroy_inv (false);	956	destroy_inv (false);
		957
		958	if (is_head ())
		959	if (sound_destroy)
		960	play_sound (sound_destroy);
		961	else if (flag [FLAG_MONSTER])
		962	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
896		963
897	attachable::destroy ();	964	attachable::destroy ();
898	}	965	}
899		966
900	/*	967	/*
…		…
1015	if (map->in_memory == MAP_SAVING)	1082	if (map->in_memory == MAP_SAVING)
1016	return;	1083	return;
1017		1084
1018	int check_walk_off = !flag [FLAG_NO_APPLY];	1085	int check_walk_off = !flag [FLAG_NO_APPLY];
1019		1086
		1087	if (object *pl = ms.player ())
		1088	{
		1089	if (pl->container == this)
		1090	/* If a container that the player is currently using somehow gets
		1091	* removed (most likely destroyed), update the player view
		1092	* appropriately.
		1093	*/
		1094	pl->close_container ();
		1095
		1096	pl->contr->ns->floorbox_update ();
		1097	}
		1098
1020	for (tmp = ms.bot; tmp; tmp = tmp->above)	1099	for (tmp = ms.bot; tmp; tmp = tmp->above)
1021	{	1100	{
1022	/* No point updating the players look faces if he is the object	1101	/* No point updating the players look faces if he is the object
1023	* being removed.	1102	* being removed.
1024	*/	1103	*/
1025
1026	if (tmp->type == PLAYER && tmp != this)
1027	{
1028	/* If a container that the player is currently using somehow gets
1029	* removed (most likely destroyed), update the player view
1030	* appropriately.
1031	*/
1032	if (tmp->container == this)
1033	{
1034	flag [FLAG_APPLIED] = 0;
1035	tmp->container = 0;
1036	}
1037
1038	if (tmp->contr->ns)
1039	tmp->contr->ns->floorbox_update ();
1040	}
1041		1104
1042	/* See if object moving off should effect something */	1105	/* See if object moving off should effect something */
1043	if (check_walk_off	1106	if (check_walk_off
1044	&& ((move_type & tmp->move_off)	1107	&& ((move_type & tmp->move_off)
1045	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1108	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1048		1111
1049	if (destroyed ())	1112	if (destroyed ())
1050	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1113	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1051	}	1114	}
1052		1115
1053	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1054	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1055	if (tmp->above == tmp)
1056	tmp->above = 0;
1057
1058	last = tmp;	1116	last = tmp;
1059	}	1117	}
1060		1118
1061	/* last == NULL if there are no objects on this space */	1119	/* last == NULL if there are no objects on this space */
1062	//TODO: this makes little sense, why only update the topmost object?	1120	//TODO: this makes little sense, why only update the topmost object?
…		…
1113	if (more)	1171	if (more)
1114	return;	1172	return;
1115		1173
1116	object *prev = this;	1174	object *prev = this;
1117		1175
1118	for (archetype *at = arch->more; at; at = at->more)	1176	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
1119	{	1177	{
1120	object *op = arch_to_object (at);	1178	object *op = arch_to_object (at);
1121		1179
1122	op->name = name;	1180	op->name = name;
1123	op->name_pl = name_pl;	1181	op->name_pl = name_pl;
…		…
1137	object *	1195	object *
1138	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1196	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1139	{	1197	{
1140	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1198	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1141	{	1199	{
1142	tmp->x = x + tmp->arch->clone.x;	1200	tmp->x = x + tmp->arch->x;
1143	tmp->y = y + tmp->arch->clone.y;	1201	tmp->y = y + tmp->arch->y;
1144	}	1202	}
1145		1203
1146	return insert_ob_in_map (op, m, originator, flag);	1204	return insert_ob_in_map (op, m, originator, flag);
1147	}	1205	}
1148		1206
…		…
1169	object *	1227	object *
1170	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1228	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1171	{	1229	{
1172	assert (!op->flag [FLAG_FREED]);	1230	assert (!op->flag [FLAG_FREED]);
1173		1231
1174	object tmp, top, *floor = NULL;	1232	object top, floor = NULL;
1175		1233
1176	op->remove ();	1234	op->remove ();
1177
1178	#if 0
1179	if (!m->active != !op->active)
1180	if (m->active)
1181	op->activate_recursive ();
1182	else
1183	op->deactivate_recursive ();
1184	#endif
1185
1186	if (out_of_map (m, op->x, op->y))
1187	{
1188	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1189	#ifdef MANY_CORES
1190	/* Better to catch this here, as otherwise the next use of this object
1191	* is likely to cause a crash. Better to find out where it is getting
1192	* improperly inserted.
1193	*/
1194	abort ();
1195	#endif
1196	return op;
1197	}
1198
1199	if (object *more = op->more)
1200	{
1201	if (!insert_ob_in_map (more, m, originator, flag))
1202	{
1203	if (!op->head)
1204	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1205
1206	return 0;
1207	}
1208	}
1209
1210	CLEAR_FLAG (op, FLAG_REMOVED);
1211		1235
1212	/* Ideally, the caller figures this out. However, it complicates a lot	1236	/* Ideally, the caller figures this out. However, it complicates a lot
1213	* of areas of callers (eg, anything that uses find_free_spot would now	1237	* of areas of callers (eg, anything that uses find_free_spot would now
1214	* need extra work	1238	* need extra work
1215	*/	1239	*/
1216	if (!xy_normalise (m, op->x, op->y))	1240	if (!xy_normalise (m, op->x, op->y))
		1241	{
		1242	op->destroy ();
1217	return 0;	1243	return 0;
		1244	}
		1245
		1246	if (object *more = op->more)
		1247	if (!insert_ob_in_map (more, m, originator, flag))
		1248	return 0;
		1249
		1250	CLEAR_FLAG (op, FLAG_REMOVED);
1218		1251
1219	op->map = m;	1252	op->map = m;
1220	mapspace &ms = op->ms ();	1253	mapspace &ms = op->ms ();
1221		1254
1222	/* this has to be done after we translate the coordinates.	1255	/* this has to be done after we translate the coordinates.
1223	*/	1256	*/
1224	if (op->nrof && !(flag & INS_NO_MERGE))	1257	if (op->nrof && !(flag & INS_NO_MERGE))
1225	for (tmp = ms.bot; tmp; tmp = tmp->above)	1258	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1226	if (object::can_merge (op, tmp))	1259	if (object::can_merge (op, tmp))
1227	{	1260	{
1228	op->nrof += tmp->nrof;	1261	op->nrof += tmp->nrof;
1229	tmp->destroy ();	1262	tmp->destroy ();
1230	}	1263	}
…		…
1257	else	1290	else
1258	{	1291	{
1259	top = ms.bot;	1292	top = ms.bot;
1260		1293
1261	/* If there are other objects, then */	1294	/* If there are other objects, then */
1262	if ((!(flag & INS_MAP_LOAD)) && top)	1295	if (top)
1263	{	1296	{
1264	object *last = 0;	1297	object *last = 0;
1265		1298
1266	/*	1299	/*
1267	* If there are multiple objects on this space, we do some trickier handling.	1300	* If there are multiple objects on this space, we do some trickier handling.
…		…
1320	if (last && last->below && last != floor)	1353	if (last && last->below && last != floor)
1321	top = last->below;	1354	top = last->below;
1322	}	1355	}
1323	} /* If objects on this space */	1356	} /* If objects on this space */
1324		1357
1325	if (flag & INS_MAP_LOAD)
1326	top = ms.top;
1327
1328	if (flag & INS_ABOVE_FLOOR_ONLY)	1358	if (flag & INS_ABOVE_FLOOR_ONLY)
1329	top = floor;	1359	top = floor;
1330		1360
1331	/* Top is the object that our object (op) is going to get inserted above.	1361	/* Top is the object that our object (op) is going to get inserted above.
1332	*/	1362	*/
…		…
1364	op->map->touch ();	1394	op->map->touch ();
1365	}	1395	}
1366		1396
1367	op->map->dirty = true;	1397	op->map->dirty = true;
1368		1398
1369	/* If we have a floor, we know the player, if any, will be above
1370	* it, so save a few ticks and start from there.
1371	*/
1372	if (!(flag & INS_MAP_LOAD))
1373	if (object *pl = ms.player ())	1399	if (object *pl = ms.player ())
1374	if (pl->contr->ns)
1375	pl->contr->ns->floorbox_update ();	1400	pl->contr->ns->floorbox_update ();
1376		1401
1377	/* If this object glows, it may affect lighting conditions that are	1402	/* If this object glows, it may affect lighting conditions that are
1378	* visible to others on this map. But update_all_los is really	1403	* visible to others on this map. But update_all_los is really
1379	* an inefficient way to do this, as it means los for all players	1404	* an inefficient way to do this, as it means los for all players
1380	* on the map will get recalculated. The players could very well	1405	* on the map will get recalculated. The players could very well
…		…
1399	* blocked() and wall() work properly), and these flags are updated by	1424	* blocked() and wall() work properly), and these flags are updated by
1400	* update_object().	1425	* update_object().
1401	*/	1426	*/
1402		1427
1403	/* if this is not the head or flag has been passed, don't check walk on status */	1428	/* if this is not the head or flag has been passed, don't check walk on status */
1404	if (!(flag & INS_NO_WALK_ON) && !op->head)	1429	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1405	{	1430	{
1406	if (check_move_on (op, originator))	1431	if (check_move_on (op, originator))
1407	return 0;	1432	return 0;
1408		1433
1409	/* If we are a multi part object, lets work our way through the check	1434	/* If we are a multi part object, lets work our way through the check
1410	* walk on's.	1435	* walk on's.
1411	*/	1436	*/
1412	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1437	for (object *tmp = op->more; tmp; tmp = tmp->more)
1413	if (check_move_on (tmp, originator))	1438	if (check_move_on (tmp, originator))
1414	return 0;	1439	return 0;
1415	}	1440	}
1416		1441
1417	return op;	1442	return op;
…		…
1427	object tmp, tmp1;	1452	object tmp, tmp1;
1428		1453
1429	/* first search for itself and remove any old instances */	1454	/* first search for itself and remove any old instances */
1430		1455
1431	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1456	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1432	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1457	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1433	tmp->destroy ();	1458	tmp->destroy ();
1434		1459
1435	tmp1 = arch_to_object (archetype::find (arch_string));	1460	tmp1 = arch_to_object (archetype::find (arch_string));
1436		1461
1437	tmp1->x = op->x;	1462	tmp1->x = op->x;
…		…
1598	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1623	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1599	free (dump);	1624	free (dump);
1600	return op;	1625	return op;
1601	}	1626	}
1602		1627
1603	if (where->head)	1628	if (where->head_ () != where)
1604	{	1629	{
1605	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1630	LOG (llevError \| logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1606	where = where->head;	1631	where = where->head;
1607	}	1632	}
1608		1633
1609	return where->insert (op);	1634	return where->insert (op);
1610	}	1635	}
…		…
1618	* be != op, if items are merged. -Tero	1643	* be != op, if items are merged. -Tero
1619	*/	1644	*/
1620	object *	1645	object *
1621	object::insert (object *op)	1646	object::insert (object *op)
1622	{	1647	{
1623	object tmp, otmp;
1624
1625	if (!QUERY_FLAG (op, FLAG_REMOVED))	1648	if (!QUERY_FLAG (op, FLAG_REMOVED))
1626	op->remove ();	1649	op->remove ();
1627		1650
1628	if (op->more)	1651	if (op->more)
1629	{	1652	{
…		…
1631	return op;	1654	return op;
1632	}	1655	}
1633		1656
1634	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1657	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1635	CLEAR_FLAG (op, FLAG_REMOVED);	1658	CLEAR_FLAG (op, FLAG_REMOVED);
		1659
1636	if (op->nrof)	1660	if (op->nrof)
1637	{	1661	{
1638	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1662	for (object *tmp = inv; tmp; tmp = tmp->below)
1639	if (object::can_merge (tmp, op))	1663	if (object::can_merge (tmp, op))
1640	{	1664	{
1641	/* return the original object and remove inserted object	1665	/* return the original object and remove inserted object
1642	(client needs the original object) */	1666	(client needs the original object) */
1643	tmp->nrof += op->nrof;	1667	tmp->nrof += op->nrof;
…		…
1662	add_weight (this, op->weight * op->nrof);	1686	add_weight (this, op->weight * op->nrof);
1663	}	1687	}
1664	else	1688	else
1665	add_weight (this, (op->weight + op->carrying));	1689	add_weight (this, (op->weight + op->carrying));
1666		1690
1667	otmp = this->in_player ();	1691	if (object *otmp = this->in_player ())
1668	if (otmp && otmp->contr)
1669	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1692	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1670	otmp->update_stats ();	1693	otmp->update_stats ();
1671		1694
		1695	op->owner = 0; // its his/hers now. period.
1672	op->map = 0;	1696	op->map = 0;
1673	op->env = this;	1697	op->env = this;
1674	op->above = 0;	1698	op->above = 0;
1675	op->below = 0;	1699	op->below = 0;
1676	op->x = 0, op->y = 0;	1700	op->x = op->y = 0;
1677		1701
1678	/* reset the light list and los of the players on the map */	1702	/* reset the light list and los of the players on the map */
1679	if ((op->glow_radius != 0) && map)	1703	if (op->glow_radius && map)
1680	{	1704	{
1681	#ifdef DEBUG_LIGHTS	1705	#ifdef DEBUG_LIGHTS
1682	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1706	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1683	#endif /* DEBUG_LIGHTS */	1707	#endif /* DEBUG_LIGHTS */
1684	if (map->darkness)	1708	if (map->darkness)
…		…
1938	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1962	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1939	{	1963	{
1940	CLEAR_FLAG (tmp, flag);	1964	CLEAR_FLAG (tmp, flag);
1941	unflag_inv (tmp, flag);	1965	unflag_inv (tmp, flag);
1942	}	1966	}
1943	}
1944
1945	/*
1946	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1947	* all it's inventory (recursively).
1948	* If checksums are used, a player will get set_cheat called for
1949	* him/her-self and all object carried by a call to this function.
1950	*/
1951	void
1952	set_cheat (object *op)
1953	{
1954	SET_FLAG (op, FLAG_WAS_WIZ);
1955	flag_inv (op, FLAG_WAS_WIZ);
1956	}	1967	}
1957		1968
1958	/*	1969	/*
1959	* find_free_spot(object, map, x, y, start, stop) will search for	1970	* find_free_spot(object, map, x, y, start, stop) will search for
1960	* a spot at the given map and coordinates which will be able to contain	1971	* a spot at the given map and coordinates which will be able to contain
…		…
1977	* customized, changed states, etc.	1988	* customized, changed states, etc.
1978	*/	1989	*/
1979	int	1990	int
1980	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)	1991	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
1981	{	1992	{
		1993	int altern[SIZEOFFREE];
1982	int index = 0, flag;	1994	int index = 0, flag;
1983	int altern[SIZEOFFREE];
1984		1995
1985	for (int i = start; i < stop; i++)	1996	for (int i = start; i < stop; i++)
1986	{	1997	{
1987	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1998	mapxy pos (m, x, y); pos.move (i);
1988	if (!flag)	1999
		2000	if (!pos.normalise ())
		2001	continue;
		2002
		2003	mapspace &ms = *pos;
		2004
		2005	if (ms.flags () & P_IS_ALIVE)
		2006	continue;
		2007
		2008	/* However, often
		2009	* ob doesn't have any move type (when used to place exits)
		2010	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2011	*/
		2012	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2013	{
1989	altern [index++] = i;	2014	altern [index++] = i;
		2015	continue;
		2016	}
1990		2017
1991	/* Basically, if we find a wall on a space, we cut down the search size.	2018	/* Basically, if we find a wall on a space, we cut down the search size.
1992	* In this way, we won't return spaces that are on another side of a wall.	2019	* In this way, we won't return spaces that are on another side of a wall.
1993	* This mostly work, but it cuts down the search size in all directions -	2020	* This mostly work, but it cuts down the search size in all directions -
1994	* if the space being examined only has a wall to the north and empty	2021	* if the space being examined only has a wall to the north and empty
1995	* spaces in all the other directions, this will reduce the search space	2022	* spaces in all the other directions, this will reduce the search space
1996	* to only the spaces immediately surrounding the target area, and	2023	* to only the spaces immediately surrounding the target area, and
1997	* won't look 2 spaces south of the target space.	2024	* won't look 2 spaces south of the target space.
1998	*/	2025	*/
1999	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2026	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2027	{
2000	stop = maxfree[i];	2028	stop = maxfree[i];
		2029	continue;
		2030	}
		2031
		2032	/* Note it is intentional that we check ob - the movement type of the
		2033	* head of the object should correspond for the entire object.
		2034	*/
		2035	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2036	continue;
		2037
		2038	altern [index++] = i;
2001	}	2039	}
2002		2040
2003	if (!index)	2041	if (!index)
2004	return -1;	2042	return -1;
2005		2043
…		…
2014	*/	2052	*/
2015	int	2053	int
2016	find_first_free_spot (const object ob, maptile m, int x, int y)	2054	find_first_free_spot (const object ob, maptile m, int x, int y)
2017	{	2055	{
2018	for (int i = 0; i < SIZEOFFREE; i++)	2056	for (int i = 0; i < SIZEOFFREE; i++)
2019	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2057	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2020	return i;	2058	return i;
2021		2059
2022	return -1;	2060	return -1;
2023	}	2061	}
2024		2062
…		…
2078	object *tmp;	2116	object *tmp;
2079	maptile *mp;	2117	maptile *mp;
2080		2118
2081	MoveType blocked, move_type;	2119	MoveType blocked, move_type;
2082		2120
2083	if (exclude && exclude->head)	2121	if (exclude && exclude->head_ () != exclude)
2084	{	2122	{
2085	exclude = exclude->head;	2123	exclude = exclude->head;
2086	move_type = exclude->move_type;	2124	move_type = exclude->move_type;
2087	}	2125	}
2088	else	2126	else
…		…
2111	max = maxfree[i];	2149	max = maxfree[i];
2112	else if (mflags & P_IS_ALIVE)	2150	else if (mflags & P_IS_ALIVE)
2113	{	2151	{
2114	for (tmp = ms.bot; tmp; tmp = tmp->above)	2152	for (tmp = ms.bot; tmp; tmp = tmp->above)
2115	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2153	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)
2116	&& (tmp != exclude \|\| (tmp->head && tmp->head != exclude)))	2154	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2117	break;	2155	break;
2118		2156
2119	if (tmp)	2157	if (tmp)
2120	return freedir[i];	2158	return freedir[i];
2121	}	2159	}
…		…
2301	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2339	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2302	* core dumps if they do.	2340	* core dumps if they do.
2303	*	2341	*
2304	* Add a check so we can't pick up invisible objects (0.93.8)	2342	* Add a check so we can't pick up invisible objects (0.93.8)
2305	*/	2343	*/
2306
2307	int	2344	int
2308	can_pick (const object who, const object item)	2345	can_pick (const object who, const object item)
2309	{	2346	{
2310	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2347	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2311	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2348	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2316	* create clone from object to another	2353	* create clone from object to another
2317	*/	2354	*/
2318	object *	2355	object *
2319	object_create_clone (object *asrc)	2356	object_create_clone (object *asrc)
2320	{	2357	{
2321	object dst = 0, tmp, src, part, prev, item;	2358	object dst = 0, tmp, src, prev, *item;
2322		2359
2323	if (!asrc)	2360	if (!asrc)
2324	return 0;	2361	return 0;
2325		2362
2326	src = asrc;
2327	if (src->head)
2328	src = src->head;	2363	src = asrc->head_ ();
2329		2364
2330	prev = 0;	2365	prev = 0;
2331	for (part = src; part; part = part->more)	2366	for (object *part = src; part; part = part->more)
2332	{	2367	{
2333	tmp = part->clone ();	2368	tmp = part->clone ();
2334	tmp->x -= src->x;	2369	tmp->x -= src->x;
2335	tmp->y -= src->y;	2370	tmp->y -= src->y;
2336		2371
…		…
2449	/* Basically, if the archetype has this key set,	2484	/* Basically, if the archetype has this key set,
2450	* we need to store the null value so when we save	2485	* we need to store the null value so when we save
2451	* it, we save the empty value so that when we load,	2486	* it, we save the empty value so that when we load,
2452	* we get this value back again.	2487	* we get this value back again.
2453	*/	2488	*/
2454	if (get_ob_key_link (&op->arch->clone, canonical_key))	2489	if (get_ob_key_link (op->arch, canonical_key))
2455	field->value = 0;	2490	field->value = 0;
2456	else	2491	else
2457	{	2492	{
2458	if (last)	2493	if (last)
2459	last->next = field->next;	2494	last->next = field->next;
…		…
2528	}	2563	}
2529	else	2564	else
2530	item = item->env;	2565	item = item->env;
2531	}	2566	}
2532		2567
2533
2534	const char *	2568	const char *
2535	object::flag_desc (char *desc, int len) const	2569	object::flag_desc (char *desc, int len) const
2536	{	2570	{
2537	char *p = desc;	2571	char *p = desc;
2538	bool first = true;	2572	bool first = true;
…		…
2572	&name,	2606	&name,
2573	title ? "\",title:\"" : "",	2607	title ? "\",title:\"" : "",
2574	title ? (const char *)title : "",	2608	title ? (const char *)title : "",
2575	flag_desc (flagdesc, 512), type);	2609	flag_desc (flagdesc, 512), type);
2576		2610
2577	if (env)	2611	if (!this->flag[FLAG_REMOVED] && env)
2578	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2612	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2579		2613
2580	if (map)	2614	if (map)
2581	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2615	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2582		2616
…		…
2584	}	2618	}
2585		2619
2586	const char *	2620	const char *
2587	object::debug_desc () const	2621	object::debug_desc () const
2588	{	2622	{
2589	static char info[256 * 4];	2623	static char info[3][256 * 4];
		2624	static int info_idx;
		2625
2590	return debug_desc (info);	2626	return debug_desc (info [++info_idx % 3]);
2591	}
2592
2593	const char *
2594	object::debug_desc2 () const
2595	{
2596	static char info[256 * 4];
2597	return debug_desc (info);
2598	}	2627	}
2599		2628
2600	struct region *	2629	struct region *
2601	object::region () const	2630	object::region () const
2602	{	2631	{
…		…
2605	}	2634	}
2606		2635
2607	const materialtype_t *	2636	const materialtype_t *
2608	object::dominant_material () const	2637	object::dominant_material () const
2609	{	2638	{
2610	if (materialtype_t *mat = name_to_material (materialname))	2639	if (materialtype_t *mt = name_to_material (materialname))
2611	return mat;	2640	return mt;
2612		2641
2613	// omfg this is slow, this has to be temporary :)
2614	shstr unknown ("unknown");
2615
2616	return name_to_material (unknown);	2642	return name_to_material (shstr_unknown);
2617	}	2643	}
2618		2644
2619	void	2645	void
2620	object::open_container (object *new_container)	2646	object::open_container (object *new_container)
2621	{	2647	{
…		…
2637	old_container->flag [FLAG_APPLIED] = 0;	2663	old_container->flag [FLAG_APPLIED] = 0;
2638	container = 0;	2664	container = 0;
2639		2665
2640	esrv_update_item (UPD_FLAGS, this, old_container);	2666	esrv_update_item (UPD_FLAGS, this, old_container);
2641	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2667	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2668	play_sound (sound_find ("chest_close"));
2642	}	2669	}
2643		2670
2644	if (new_container)	2671	if (new_container)
2645	{	2672	{
2646	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2673	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2662	new_container->flag [FLAG_APPLIED] = 1;	2689	new_container->flag [FLAG_APPLIED] = 1;
2663	container = new_container;	2690	container = new_container;
2664		2691
2665	esrv_update_item (UPD_FLAGS, this, new_container);	2692	esrv_update_item (UPD_FLAGS, this, new_container);
2666	esrv_send_inventory (this, new_container);	2693	esrv_send_inventory (this, new_container);
		2694	play_sound (sound_find ("chest_open"));
		2695	}
		2696	}
		2697
		2698	object *
		2699	object::force_find (const shstr name)
		2700	{
		2701	/* cycle through his inventory to look for the MARK we want to
		2702	* place
		2703	*/
		2704	for (object *tmp = inv; tmp; tmp = tmp->below)
		2705	if (tmp->type == FORCE && tmp->slaying == name)
		2706	return splay (tmp);
		2707
		2708	return 0;
		2709	}
		2710
		2711	void
		2712	object::force_add (const shstr name, int duration)
		2713	{
		2714	if (object *force = force_find (name))
		2715	force->destroy ();
		2716
		2717	object *force = get_archetype (FORCE_NAME);
		2718
		2719	force->slaying = name;
		2720	force->stats.food = 1;
		2721	force->speed_left = -1.f;
		2722
		2723	force->set_speed (duration ? 1.f / duration : 0.f);
		2724	force->flag [FLAG_IS_USED_UP] = true;
		2725	force->flag [FLAG_APPLIED] = true;
		2726
		2727	insert (force);
		2728	}
		2729
		2730	void
		2731	object::play_sound (faceidx sound) const
		2732	{
		2733	if (!sound)
		2734	return;
		2735
		2736	if (flag [FLAG_REMOVED])
		2737	return;
		2738
		2739	if (env)
2667	}	2740	{
		2741	if (object *pl = in_player ())
		2742	pl->contr->play_sound (sound);
		2743	}
		2744	else
		2745	map->play_sound (sound, x, y);
2668	}	2746	}
2669		2747
2670

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.142 by root, Mon Apr 30 04:25:29 2007 UTC vs. Revision 1.191 by root, Sun Sep 30 20:22:15 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.142 by root, Mon Apr 30 04:25:29 2007 UTC vs.
Revision 1.191 by root, Sun Sep 30 20:22:15 2007 UTC