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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.140 by root, Tue Apr 24 12:32:14 2007 UTC vs.
Revision 1.189 by root, Thu Sep 13 16:23:01 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	}
…		…
324	sum_weight (object *op)	324	sum_weight (object *op)
325	{	325	{
326	long sum;	326	long sum;
327	object *inv;	327	object *inv;
328		328
329	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	329	for (sum = 0, inv = op->inv; inv; inv = inv->below)
330	{	330	{
331	if (inv->inv)	331	if (inv->inv)
332	sum_weight (inv);	332	sum_weight (inv);
		333
333	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334	}	335	}
335		336
336	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
337	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
373	/*	374	/*
374	* 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
375	* multi-object 1 which is closest to the second object.	376	* multi-object 1 which is closest to the second object.
376	* If it's not a multi-object, it is returned.	377	* If it's not a multi-object, it is returned.
377	*/	378	*/
378
379	object *	379	object *
380	get_nearest_part (object op, const object pl)	380	get_nearest_part (object op, const object pl)
381	{	381	{
382	object tmp, closest;	382	object tmp, closest;
383	int last_dist, i;	383	int last_dist, i;
…		…
428	}	428	}
429		429
430	/*	430	/*
431	* 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
432	* skill and experience objects.	432	* skill and experience objects.
		433	* ACTUALLY NO! investigate! TODO
433	*/	434	*/
434	void	435	void
435	object::set_owner (object *owner)	436	object::set_owner (object *owner)
436	{	437	{
		438	// allow objects which own objects
437	if (!owner)	439	if (owner)
438	return;
439
440	/* next line added to allow objects which own objects */
441	/* Add a check for ownercounts in here, as I got into an endless loop
442	* with the fireball owning a poison cloud which then owned the
443	* fireball. I believe that was caused by one of the objects getting
444	* freed and then another object replacing it. Since the ownercounts
445	* didn't match, this check is valid and I believe that cause is valid.
446	*/
447	while (owner->owner)	440	while (owner->owner)
448	owner = owner->owner;	441	owner = owner->owner;
449		442
450	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;
451	}	510	}
452		511
453	/* Zero the key_values on op, decrementing the shared-string	512	/* Zero the key_values on op, decrementing the shared-string
454	* refcounts and freeing the links.	513	* refcounts and freeing the links.
455	*/	514	*/
…		…
519	object::copy_to (object *dst)	578	object::copy_to (object *dst)
520	{	579	{
521	dst = this;	580	dst = this;
522		581
523	if (speed < 0)	582	if (speed < 0)
524	dst->speed_left = speed_left - rndm ();	583	dst->speed_left -= rndm ();
525		584
526	dst->set_speed (dst->speed);	585	dst->set_speed (dst->speed);
527	}	586	}
528		587
529	void	588	void
…		…
537	* 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.
538	* 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
539	* values for the body_used info, so when items are created	598	* values for the body_used info, so when items are created
540	* for it, they can be properly equipped.	599	* for it, they can be properly equipped.
541	*/	600	*/
542	memcpy (body_used, body_info, sizeof (body_used));	601	for (int i = NUM_BODY_LOCATIONS; i--; )
		602	slot[i].used = slot[i].info;
543		603
544	attachable::instantiate ();	604	attachable::instantiate ();
545	}	605	}
546		606
547	object *	607	object *
…		…
855		915
856	if (!freed_map)	916	if (!freed_map)
857	{	917	{
858	freed_map = new maptile;	918	freed_map = new maptile;
859		919
		920	freed_map->path = "<freed objects map>";
860	freed_map->name = "/internal/freed_objects_map";	921	freed_map->name = "/internal/freed_objects_map";
861	freed_map->width = 3;	922	freed_map->width = 3;
862	freed_map->height = 3;	923	freed_map->height = 3;
863		924
864	freed_map->alloc ();	925	freed_map->alloc ();
…		…
868	map = freed_map;	929	map = freed_map;
869	x = 1;	930	x = 1;
870	y = 1;	931	y = 1;
871	}	932	}
872		933
873	head = 0;
874
875	if (more)	934	if (more)
876	{	935	{
877	more->destroy ();	936	more->destroy ();
878	more = 0;	937	more = 0;
879	}	938	}
880		939
		940	head = 0;
		941
881	// clear those pointers that likely might have circular references to us	942	// clear those pointers that likely might cause circular references
882	owner = 0;	943	owner = 0;
883	enemy = 0;	944	enemy = 0;
884	attacked_by = 0;	945	attacked_by = 0;
		946	current_weapon = 0;
885	}	947	}
886		948
887	void	949	void
888	object::destroy (bool destroy_inventory)	950	object::destroy (bool destroy_inventory)
889	{	951	{
890	if (destroyed ())	952	if (destroyed ())
891	return;	953	return;
892		954
893	if (destroy_inventory)	955	if (destroy_inventory)
894	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
895		963
896	attachable::destroy ();	964	attachable::destroy ();
897	}	965	}
898		966
899	/*	967	/*
…		…
1014	if (map->in_memory == MAP_SAVING)	1082	if (map->in_memory == MAP_SAVING)
1015	return;	1083	return;
1016		1084
1017	int check_walk_off = !flag [FLAG_NO_APPLY];	1085	int check_walk_off = !flag [FLAG_NO_APPLY];
1018		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
1019	for (tmp = ms.bot; tmp; tmp = tmp->above)	1099	for (tmp = ms.bot; tmp; tmp = tmp->above)
1020	{	1100	{
1021	/* 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
1022	* being removed.	1102	* being removed.
1023	*/	1103	*/
1024
1025	if (tmp->type == PLAYER && tmp != this)
1026	{
1027	/* If a container that the player is currently using somehow gets
1028	* removed (most likely destroyed), update the player view
1029	* appropriately.
1030	*/
1031	if (tmp->container == this)
1032	{
1033	flag [FLAG_APPLIED] = 0;
1034	tmp->container = 0;
1035	}
1036
1037	if (tmp->contr->ns)
1038	tmp->contr->ns->floorbox_update ();
1039	}
1040		1104
1041	/* See if object moving off should effect something */	1105	/* See if object moving off should effect something */
1042	if (check_walk_off	1106	if (check_walk_off
1043	&& ((move_type & tmp->move_off)	1107	&& ((move_type & tmp->move_off)
1044	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1108	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1047		1111
1048	if (destroyed ())	1112	if (destroyed ())
1049	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 ());
1050	}	1114	}
1051		1115
1052	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1053	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1054	if (tmp->above == tmp)
1055	tmp->above = 0;
1056
1057	last = tmp;	1116	last = tmp;
1058	}	1117	}
1059		1118
1060	/* last == NULL if there are no objects on this space */	1119	/* last == NULL if there are no objects on this space */
1061	//TODO: this makes little sense, why only update the topmost object?	1120	//TODO: this makes little sense, why only update the topmost object?
…		…
1112	if (more)	1171	if (more)
1113	return;	1172	return;
1114		1173
1115	object *prev = this;	1174	object *prev = this;
1116		1175
1117	for (archetype *at = arch->more; at; at = at->more)	1176	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
1118	{	1177	{
1119	object *op = arch_to_object (at);	1178	object *op = arch_to_object (at);
1120		1179
1121	op->name = name;	1180	op->name = name;
1122	op->name_pl = name_pl;	1181	op->name_pl = name_pl;
…		…
1136	object *	1195	object *
1137	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)
1138	{	1197	{
1139	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1198	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1140	{	1199	{
1141	tmp->x = x + tmp->arch->clone.x;	1200	tmp->x = x + tmp->arch->x;
1142	tmp->y = y + tmp->arch->clone.y;	1201	tmp->y = y + tmp->arch->y;
1143	}	1202	}
1144		1203
1145	return insert_ob_in_map (op, m, originator, flag);	1204	return insert_ob_in_map (op, m, originator, flag);
1146	}	1205	}
1147		1206
…		…
1168	object *	1227	object *
1169	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)
1170	{	1229	{
1171	assert (!op->flag [FLAG_FREED]);	1230	assert (!op->flag [FLAG_FREED]);
1172		1231
1173	object tmp, top, *floor = NULL;	1232	object top, floor = NULL;
1174		1233
1175	op->remove ();	1234	op->remove ();
1176
1177	#if 0
1178	if (!m->active != !op->active)
1179	if (m->active)
1180	op->activate_recursive ();
1181	else
1182	op->deactivate_recursive ();
1183	#endif
1184
1185	if (out_of_map (m, op->x, op->y))
1186	{
1187	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1188	#ifdef MANY_CORES
1189	/* Better to catch this here, as otherwise the next use of this object
1190	* is likely to cause a crash. Better to find out where it is getting
1191	* improperly inserted.
1192	*/
1193	abort ();
1194	#endif
1195	return op;
1196	}
1197
1198	if (object *more = op->more)
1199	{
1200	if (!insert_ob_in_map (more, m, originator, flag))
1201	{
1202	if (!op->head)
1203	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1204
1205	return 0;
1206	}
1207	}
1208
1209	CLEAR_FLAG (op, FLAG_REMOVED);
1210		1235
1211	/* Ideally, the caller figures this out. However, it complicates a lot	1236	/* Ideally, the caller figures this out. However, it complicates a lot
1212	* 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
1213	* need extra work	1238	* need extra work
1214	*/	1239	*/
1215	if (!xy_normalise (m, op->x, op->y))	1240	if (!xy_normalise (m, op->x, op->y))
		1241	{
		1242	op->destroy ();
1216	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);
1217		1251
1218	op->map = m;	1252	op->map = m;
1219	mapspace &ms = op->ms ();	1253	mapspace &ms = op->ms ();
1220		1254
1221	/* this has to be done after we translate the coordinates.	1255	/* this has to be done after we translate the coordinates.
1222	*/	1256	*/
1223	if (op->nrof && !(flag & INS_NO_MERGE))	1257	if (op->nrof && !(flag & INS_NO_MERGE))
1224	for (tmp = ms.bot; tmp; tmp = tmp->above)	1258	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1225	if (object::can_merge (op, tmp))	1259	if (object::can_merge (op, tmp))
1226	{	1260	{
1227	op->nrof += tmp->nrof;	1261	op->nrof += tmp->nrof;
1228	tmp->destroy ();	1262	tmp->destroy ();
1229	}	1263	}
…		…
1318	*/	1352	*/
1319	if (last && last->below && last != floor)	1353	if (last && last->below && last != floor)
1320	top = last->below;	1354	top = last->below;
1321	}	1355	}
1322	} /* If objects on this space */	1356	} /* If objects on this space */
1323
1324	if (flag & INS_MAP_LOAD)	1357	if (flag & INS_MAP_LOAD)
1325	top = ms.top;	1358	top = ms.top;
1326		1359
1327	if (flag & INS_ABOVE_FLOOR_ONLY)	1360	if (flag & INS_ABOVE_FLOOR_ONLY)
1328	top = floor;	1361	top = floor;
…		…
1363	op->map->touch ();	1396	op->map->touch ();
1364	}	1397	}
1365		1398
1366	op->map->dirty = true;	1399	op->map->dirty = true;
1367		1400
1368	/* If we have a floor, we know the player, if any, will be above
1369	* it, so save a few ticks and start from there.
1370	*/
1371	if (!(flag & INS_MAP_LOAD))	1401	if (!(flag & INS_MAP_LOAD))
1372	if (object *pl = ms.player ())	1402	if (object *pl = ms.player ())
1373	if (pl->contr->ns)
1374	pl->contr->ns->floorbox_update ();	1403	pl->contr->ns->floorbox_update ();
1375		1404
1376	/* If this object glows, it may affect lighting conditions that are	1405	/* If this object glows, it may affect lighting conditions that are
1377	* visible to others on this map. But update_all_los is really	1406	* visible to others on this map. But update_all_los is really
1378	* an inefficient way to do this, as it means los for all players	1407	* an inefficient way to do this, as it means los for all players
1379	* on the map will get recalculated. The players could very well	1408	* on the map will get recalculated. The players could very well
…		…
1398	* blocked() and wall() work properly), and these flags are updated by	1427	* blocked() and wall() work properly), and these flags are updated by
1399	* update_object().	1428	* update_object().
1400	*/	1429	*/
1401		1430
1402	/* if this is not the head or flag has been passed, don't check walk on status */	1431	/* if this is not the head or flag has been passed, don't check walk on status */
1403	if (!(flag & INS_NO_WALK_ON) && !op->head)	1432	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1404	{	1433	{
1405	if (check_move_on (op, originator))	1434	if (check_move_on (op, originator))
1406	return 0;	1435	return 0;
1407		1436
1408	/* If we are a multi part object, lets work our way through the check	1437	/* If we are a multi part object, lets work our way through the check
1409	* walk on's.	1438	* walk on's.
1410	*/	1439	*/
1411	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1440	for (object *tmp = op->more; tmp; tmp = tmp->more)
1412	if (check_move_on (tmp, originator))	1441	if (check_move_on (tmp, originator))
1413	return 0;	1442	return 0;
1414	}	1443	}
1415		1444
1416	return op;	1445	return op;
…		…
1426	object tmp, tmp1;	1455	object tmp, tmp1;
1427		1456
1428	/* first search for itself and remove any old instances */	1457	/* first search for itself and remove any old instances */
1429		1458
1430	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1459	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1431	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1460	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1432	tmp->destroy ();	1461	tmp->destroy ();
1433		1462
1434	tmp1 = arch_to_object (archetype::find (arch_string));	1463	tmp1 = arch_to_object (archetype::find (arch_string));
1435		1464
1436	tmp1->x = op->x;	1465	tmp1->x = op->x;
…		…
1597	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1626	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1598	free (dump);	1627	free (dump);
1599	return op;	1628	return op;
1600	}	1629	}
1601		1630
1602	if (where->head)	1631	if (where->head_ () != where)
1603	{	1632	{
1604	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1633	LOG (llevError \| logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1605	where = where->head;	1634	where = where->head;
1606	}	1635	}
1607		1636
1608	return where->insert (op);	1637	return where->insert (op);
1609	}	1638	}
…		…
1617	* be != op, if items are merged. -Tero	1646	* be != op, if items are merged. -Tero
1618	*/	1647	*/
1619	object *	1648	object *
1620	object::insert (object *op)	1649	object::insert (object *op)
1621	{	1650	{
1622	object tmp, otmp;
1623
1624	if (!QUERY_FLAG (op, FLAG_REMOVED))	1651	if (!QUERY_FLAG (op, FLAG_REMOVED))
1625	op->remove ();	1652	op->remove ();
1626		1653
1627	if (op->more)	1654	if (op->more)
1628	{	1655	{
…		…
1630	return op;	1657	return op;
1631	}	1658	}
1632		1659
1633	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1660	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1634	CLEAR_FLAG (op, FLAG_REMOVED);	1661	CLEAR_FLAG (op, FLAG_REMOVED);
		1662
1635	if (op->nrof)	1663	if (op->nrof)
1636	{	1664	{
1637	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1665	for (object *tmp = inv; tmp; tmp = tmp->below)
1638	if (object::can_merge (tmp, op))	1666	if (object::can_merge (tmp, op))
1639	{	1667	{
1640	/* return the original object and remove inserted object	1668	/* return the original object and remove inserted object
1641	(client needs the original object) */	1669	(client needs the original object) */
1642	tmp->nrof += op->nrof;	1670	tmp->nrof += op->nrof;
…		…
1661	add_weight (this, op->weight * op->nrof);	1689	add_weight (this, op->weight * op->nrof);
1662	}	1690	}
1663	else	1691	else
1664	add_weight (this, (op->weight + op->carrying));	1692	add_weight (this, (op->weight + op->carrying));
1665		1693
1666	otmp = this->in_player ();	1694	if (object *otmp = this->in_player ())
1667	if (otmp && otmp->contr)
1668	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1695	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1669	otmp->update_stats ();	1696	otmp->update_stats ();
1670		1697
		1698	op->owner = 0; // its his/hers now. period.
1671	op->map = 0;	1699	op->map = 0;
1672	op->env = this;	1700	op->env = this;
1673	op->above = 0;	1701	op->above = 0;
1674	op->below = 0;	1702	op->below = 0;
1675	op->x = 0, op->y = 0;	1703	op->x = op->y = 0;
1676		1704
1677	/* reset the light list and los of the players on the map */	1705	/* reset the light list and los of the players on the map */
1678	if ((op->glow_radius != 0) && map)	1706	if (op->glow_radius && map)
1679	{	1707	{
1680	#ifdef DEBUG_LIGHTS	1708	#ifdef DEBUG_LIGHTS
1681	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1709	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1682	#endif /* DEBUG_LIGHTS */	1710	#endif /* DEBUG_LIGHTS */
1683	if (map->darkness)	1711	if (map->darkness)
…		…
1937	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1965	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1938	{	1966	{
1939	CLEAR_FLAG (tmp, flag);	1967	CLEAR_FLAG (tmp, flag);
1940	unflag_inv (tmp, flag);	1968	unflag_inv (tmp, flag);
1941	}	1969	}
1942	}
1943
1944	/*
1945	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1946	* all it's inventory (recursively).
1947	* If checksums are used, a player will get set_cheat called for
1948	* him/her-self and all object carried by a call to this function.
1949	*/
1950	void
1951	set_cheat (object *op)
1952	{
1953	SET_FLAG (op, FLAG_WAS_WIZ);
1954	flag_inv (op, FLAG_WAS_WIZ);
1955	}	1970	}
1956		1971
1957	/*	1972	/*
1958	* find_free_spot(object, map, x, y, start, stop) will search for	1973	* find_free_spot(object, map, x, y, start, stop) will search for
1959	* a spot at the given map and coordinates which will be able to contain	1974	* a spot at the given map and coordinates which will be able to contain
…		…
1981	int index = 0, flag;	1996	int index = 0, flag;
1982	int altern[SIZEOFFREE];	1997	int altern[SIZEOFFREE];
1983		1998
1984	for (int i = start; i < stop; i++)	1999	for (int i = start; i < stop; i++)
1985	{	2000	{
1986	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2001	mapxy pos (m, x, y); pos.move (i);
1987	if (!flag)	2002
1988	altern [index++] = i;	2003	if (!pos.normalise ())
		2004	continue;
		2005
		2006	mapspace &ms = *pos;
		2007
		2008	if (ms.flags () & P_IS_ALIVE)
		2009	continue;
		2010
		2011	/* However, often
		2012	* ob doesn't have any move type (when used to place exits)
		2013	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2014	*/
		2015	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2016	continue;
1989		2017
1990	/* 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.
1991	* 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.
1992	* 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 -
1993	* 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
1994	* 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
1995	* to only the spaces immediately surrounding the target area, and	2023	* to only the spaces immediately surrounding the target area, and
1996	* won't look 2 spaces south of the target space.	2024	* won't look 2 spaces south of the target space.
1997	*/	2025	*/
1998	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2026	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2027	{
1999	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;
2000	}	2039	}
2001		2040
2002	if (!index)	2041	if (!index)
2003	return -1;	2042	return -1;
2004		2043
…		…
2013	*/	2052	*/
2014	int	2053	int
2015	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)
2016	{	2055	{
2017	for (int i = 0; i < SIZEOFFREE; i++)	2056	for (int i = 0; i < SIZEOFFREE; i++)
2018	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]))
2019	return i;	2058	return i;
2020		2059
2021	return -1;	2060	return -1;
2022	}	2061	}
2023		2062
…		…
2077	object *tmp;	2116	object *tmp;
2078	maptile *mp;	2117	maptile *mp;
2079		2118
2080	MoveType blocked, move_type;	2119	MoveType blocked, move_type;
2081		2120
2082	if (exclude && exclude->head)	2121	if (exclude && exclude->head_ () != exclude)
2083	{	2122	{
2084	exclude = exclude->head;	2123	exclude = exclude->head;
2085	move_type = exclude->move_type;	2124	move_type = exclude->move_type;
2086	}	2125	}
2087	else	2126	else
…		…
2110	max = maxfree[i];	2149	max = maxfree[i];
2111	else if (mflags & P_IS_ALIVE)	2150	else if (mflags & P_IS_ALIVE)
2112	{	2151	{
2113	for (tmp = ms.bot; tmp; tmp = tmp->above)	2152	for (tmp = ms.bot; tmp; tmp = tmp->above)
2114	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2153	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)
2115	&& (tmp != exclude \|\| (tmp->head && tmp->head != exclude)))	2154	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2116	break;	2155	break;
2117		2156
2118	if (tmp)	2157	if (tmp)
2119	return freedir[i];	2158	return freedir[i];
2120	}	2159	}
…		…
2300	* 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
2301	* core dumps if they do.	2340	* core dumps if they do.
2302	*	2341	*
2303	* 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)
2304	*/	2343	*/
2305
2306	int	2344	int
2307	can_pick (const object who, const object item)	2345	can_pick (const object who, const object item)
2308	{	2346	{
2309	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2347	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2310	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2348	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2315	* create clone from object to another	2353	* create clone from object to another
2316	*/	2354	*/
2317	object *	2355	object *
2318	object_create_clone (object *asrc)	2356	object_create_clone (object *asrc)
2319	{	2357	{
2320	object dst = 0, tmp, src, part, prev, item;	2358	object dst = 0, tmp, src, prev, *item;
2321		2359
2322	if (!asrc)	2360	if (!asrc)
2323	return 0;	2361	return 0;
2324		2362
2325	src = asrc;
2326	if (src->head)
2327	src = src->head;	2363	src = asrc->head_ ();
2328		2364
2329	prev = 0;	2365	prev = 0;
2330	for (part = src; part; part = part->more)	2366	for (object *part = src; part; part = part->more)
2331	{	2367	{
2332	tmp = part->clone ();	2368	tmp = part->clone ();
2333	tmp->x -= src->x;	2369	tmp->x -= src->x;
2334	tmp->y -= src->y;	2370	tmp->y -= src->y;
2335		2371
…		…
2448	/* Basically, if the archetype has this key set,	2484	/* Basically, if the archetype has this key set,
2449	* we need to store the null value so when we save	2485	* we need to store the null value so when we save
2450	* it, we save the empty value so that when we load,	2486	* it, we save the empty value so that when we load,
2451	* we get this value back again.	2487	* we get this value back again.
2452	*/	2488	*/
2453	if (get_ob_key_link (&op->arch->clone, canonical_key))	2489	if (get_ob_key_link (op->arch, canonical_key))
2454	field->value = 0;	2490	field->value = 0;
2455	else	2491	else
2456	{	2492	{
2457	if (last)	2493	if (last)
2458	last->next = field->next;	2494	last->next = field->next;
…		…
2527	}	2563	}
2528	else	2564	else
2529	item = item->env;	2565	item = item->env;
2530	}	2566	}
2531		2567
2532
2533	const char *	2568	const char *
2534	object::flag_desc (char *desc, int len) const	2569	object::flag_desc (char *desc, int len) const
2535	{	2570	{
2536	char *p = desc;	2571	char *p = desc;
2537	bool first = true;	2572	bool first = true;
…		…
2571	&name,	2606	&name,
2572	title ? "\",title:\"" : "",	2607	title ? "\",title:\"" : "",
2573	title ? (const char *)title : "",	2608	title ? (const char *)title : "",
2574	flag_desc (flagdesc, 512), type);	2609	flag_desc (flagdesc, 512), type);
2575		2610
2576	if (env)	2611	if (!this->flag[FLAG_REMOVED] && env)
2577	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2612	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2578		2613
2579	if (map)	2614	if (map)
2580	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);
2581		2616
…		…
2583	}	2618	}
2584		2619
2585	const char *	2620	const char *
2586	object::debug_desc () const	2621	object::debug_desc () const
2587	{	2622	{
2588	static char info[256 * 4];	2623	static char info[3][256 * 4];
		2624	static int info_idx;
		2625
2589	return debug_desc (info);	2626	return debug_desc (info [++info_idx % 3]);
2590	}
2591
2592	const char *
2593	object::debug_desc2 () const
2594	{
2595	static char info[256 * 4];
2596	return debug_desc (info);
2597	}	2627	}
2598		2628
2599	struct region *	2629	struct region *
2600	object::region () const	2630	object::region () const
2601	{	2631	{
…		…
2604	}	2634	}
2605		2635
2606	const materialtype_t *	2636	const materialtype_t *
2607	object::dominant_material () const	2637	object::dominant_material () const
2608	{	2638	{
2609	if (materialtype_t *mat = name_to_material (materialname))	2639	if (materialtype_t *mt = name_to_material (materialname))
2610	return mat;	2640	return mt;
2611		2641
2612	// omfg this is slow, this has to be temporary :)
2613	shstr unknown ("unknown");
2614
2615	return name_to_material (unknown);	2642	return name_to_material (shstr_unknown);
2616	}	2643	}
2617		2644
2618	void	2645	void
2619	object::open_container (object *new_container)	2646	object::open_container (object *new_container)
2620	{	2647	{
…		…
2636	old_container->flag [FLAG_APPLIED] = 0;	2663	old_container->flag [FLAG_APPLIED] = 0;
2637	container = 0;	2664	container = 0;
2638		2665
2639	esrv_update_item (UPD_FLAGS, this, old_container);	2666	esrv_update_item (UPD_FLAGS, this, old_container);
2640	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"));
2641	}	2669	}
2642		2670
2643	if (new_container)	2671	if (new_container)
2644	{	2672	{
2645	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2673	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2661	new_container->flag [FLAG_APPLIED] = 1;	2689	new_container->flag [FLAG_APPLIED] = 1;
2662	container = new_container;	2690	container = new_container;
2663		2691
2664	esrv_update_item (UPD_FLAGS, this, new_container);	2692	esrv_update_item (UPD_FLAGS, this, new_container);
2665	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)
2666	}	2740	{
		2741	if (object *pl = in_player ())
		2742	pl->contr->play_sound (sound);
		2743	}
		2744	else
		2745	map->play_sound (sound, x, y);
2667	}	2746	}
2668		2747
2669

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.140 by root, Tue Apr 24 12:32:14 2007 UTC vs. Revision 1.189 by root, Thu Sep 13 16:23:01 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.140 by root, Tue Apr 24 12:32:14 2007 UTC vs.
Revision 1.189 by root, Thu Sep 13 16:23:01 2007 UTC