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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.144 by root, Thu May 3 10:39:46 2007 UTC vs.
Revision 1.192 by root, Fri Oct 12 19:13:25 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	{
		311	int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0;
		312	int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0;
		313
		314	if (k1 != k2)
311	return 0;	315	return 0;
		316	else if (k1 == 0)
		317	return 1;
		318	else if (!cfperl_can_merge (ob1, ob2))
		319	return 0;
		320	}
312	}	321	}
313		322
314	/* Everything passes, must be OK. */	323	/* Everything passes, must be OK. */
315	return 1;	324	return 1;
316	}	325	}
…		…
374	/*	383	/*
375	* get_nearest_part(multi-object, object 2) returns the part of the	384	* get_nearest_part(multi-object, object 2) returns the part of the
376	* multi-object 1 which is closest to the second object.	385	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.	386	* If it's not a multi-object, it is returned.
378	*/	387	*/
379
380	object *	388	object *
381	get_nearest_part (object op, const object pl)	389	get_nearest_part (object op, const object pl)
382	{	390	{
383	object tmp, closest;	391	object tmp, closest;
384	int last_dist, i;	392	int last_dist, i;
…		…
429	}	437	}
430		438
431	/*	439	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	440	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	441	* skill and experience objects.
		442	* ACTUALLY NO! investigate! TODO
434	*/	443	*/
435	void	444	void
436	object::set_owner (object *owner)	445	object::set_owner (object *owner)
437	{	446	{
		447	// allow objects which own objects
438	if (!owner)	448	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)	449	while (owner->owner)
449	owner = owner->owner;	450	owner = owner->owner;
450		451
451	this->owner = owner;	452	this->owner = owner;
452	}	453	}
453		454
454	void	455	int
		456	object::slottype () const
		457	{
		458	if (type == SKILL)
		459	{
		460	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		461	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		462	}
		463	else
		464	{
		465	if (slot [body_combat].info) return slot_combat;
		466	if (slot [body_range ].info) return slot_ranged;
		467	}
		468
		469	return slot_none;
		470	}
		471
		472	bool
455	object::set_weapon (object *ob)	473	object::change_weapon (object *ob)
456	{	474	{
457	if (current_weapon == ob)	475	if (current_weapon == ob)
458	return;	476	return true;
		477
		478	if (chosen_skill)
		479	chosen_skill->flag [FLAG_APPLIED] = false;
459		480
460	current_weapon = ob;	481	current_weapon = ob;
461	new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	482	chosen_skill = !ob \|\| ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		483
		484	if (chosen_skill)
		485	chosen_skill->flag [FLAG_APPLIED] = true;
		486
462	update_stats ();	487	update_stats ();
		488
		489	if (ob)
		490	{
		491	// now check wether any body locations became invalid, in which case
		492	// we cannot apply the weapon at the moment.
		493	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		494	if (slot[i].used < 0)
		495	{
		496	current_weapon = chosen_skill = 0;
		497	update_stats ();
		498
		499	new_draw_info_format (NDI_UNIQUE, 0, this,
		500	"You try to balance all your items at once, "
		501	"but the %s is just too much for your body. "
		502	"[You need to unapply some items first.]", &ob->name);
		503	return false;
		504	}
		505
		506	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		507	}
		508	else
		509	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		510
		511	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		512	{
		513	LOG (llevError \| logBacktrace, "%s changed to unapplied weapon %s",
		514	&name, ob->debug_desc ());
		515	return false;
		516	}
		517
		518	return true;
463	}	519	}
464		520
465	/* Zero the key_values on op, decrementing the shared-string	521	/* Zero the key_values on op, decrementing the shared-string
466	* refcounts and freeing the links.	522	* refcounts and freeing the links.
467	*/	523	*/
…		…
531	object::copy_to (object *dst)	587	object::copy_to (object *dst)
532	{	588	{
533	dst = this;	589	dst = this;
534		590
535	if (speed < 0)	591	if (speed < 0)
536	dst->speed_left = speed_left - rndm ();	592	dst->speed_left -= rndm ();
537		593
538	dst->set_speed (dst->speed);	594	dst->set_speed (dst->speed);
539	}	595	}
540		596
541	void	597	void
…		…
549	* need for monsters, but doesn't hurt to do it for everything.	605	* need for monsters, but doesn't hurt to do it for everything.
550	* by doing so, when a monster is created, it has good starting	606	* by doing so, when a monster is created, it has good starting
551	* values for the body_used info, so when items are created	607	* values for the body_used info, so when items are created
552	* for it, they can be properly equipped.	608	* for it, they can be properly equipped.
553	*/	609	*/
554	memcpy (body_used, body_info, sizeof (body_used));	610	for (int i = NUM_BODY_LOCATIONS; i--; )
		611	slot[i].used = slot[i].info;
555		612
556	attachable::instantiate ();	613	attachable::instantiate ();
557	}	614	}
558		615
559	object *	616	object *
…		…
867		924
868	if (!freed_map)	925	if (!freed_map)
869	{	926	{
870	freed_map = new maptile;	927	freed_map = new maptile;
871		928
		929	freed_map->path = "<freed objects map>";
872	freed_map->name = "/internal/freed_objects_map";	930	freed_map->name = "/internal/freed_objects_map";
873	freed_map->width = 3;	931	freed_map->width = 3;
874	freed_map->height = 3;	932	freed_map->height = 3;
875		933
876	freed_map->alloc ();	934	freed_map->alloc ();
…		…
880	map = freed_map;	938	map = freed_map;
881	x = 1;	939	x = 1;
882	y = 1;	940	y = 1;
883	}	941	}
884		942
885	head = 0;
886
887	if (more)	943	if (more)
888	{	944	{
889	more->destroy ();	945	more->destroy ();
890	more = 0;	946	more = 0;
891	}	947	}
892		948
		949	head = 0;
		950
893	// clear those pointers that likely might have circular references to us	951	// clear those pointers that likely might cause circular references
894	owner = 0;	952	owner = 0;
895	enemy = 0;	953	enemy = 0;
896	attacked_by = 0;	954	attacked_by = 0;
		955	current_weapon = 0;
897	}	956	}
898		957
899	void	958	void
900	object::destroy (bool destroy_inventory)	959	object::destroy (bool destroy_inventory)
901	{	960	{
902	if (destroyed ())	961	if (destroyed ())
903	return;	962	return;
904		963
905	if (destroy_inventory)	964	if (destroy_inventory)
906	destroy_inv (false);	965	destroy_inv (false);
		966
		967	if (is_head ())
		968	if (sound_destroy)
		969	play_sound (sound_destroy);
		970	else if (flag [FLAG_MONSTER])
		971	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
907		972
908	attachable::destroy ();	973	attachable::destroy ();
909	}	974	}
910		975
911	/*	976	/*
…		…
1026	if (map->in_memory == MAP_SAVING)	1091	if (map->in_memory == MAP_SAVING)
1027	return;	1092	return;
1028		1093
1029	int check_walk_off = !flag [FLAG_NO_APPLY];	1094	int check_walk_off = !flag [FLAG_NO_APPLY];
1030		1095
		1096	if (object *pl = ms.player ())
		1097	{
		1098	if (pl->container == this)
		1099	/* If a container that the player is currently using somehow gets
		1100	* removed (most likely destroyed), update the player view
		1101	* appropriately.
		1102	*/
		1103	pl->close_container ();
		1104
		1105	pl->contr->ns->floorbox_update ();
		1106	}
		1107
1031	for (tmp = ms.bot; tmp; tmp = tmp->above)	1108	for (tmp = ms.bot; tmp; tmp = tmp->above)
1032	{	1109	{
1033	/* No point updating the players look faces if he is the object	1110	/* No point updating the players look faces if he is the object
1034	* being removed.	1111	* being removed.
1035	*/	1112	*/
1036
1037	if (tmp->type == PLAYER && tmp != this)
1038	{
1039	/* If a container that the player is currently using somehow gets
1040	* removed (most likely destroyed), update the player view
1041	* appropriately.
1042	*/
1043	if (tmp->container == this)
1044	{
1045	flag [FLAG_APPLIED] = 0;
1046	tmp->container = 0;
1047	}
1048
1049	if (tmp->contr->ns)
1050	tmp->contr->ns->floorbox_update ();
1051	}
1052		1113
1053	/* See if object moving off should effect something */	1114	/* See if object moving off should effect something */
1054	if (check_walk_off	1115	if (check_walk_off
1055	&& ((move_type & tmp->move_off)	1116	&& ((move_type & tmp->move_off)
1056	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1117	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1059		1120
1060	if (destroyed ())	1121	if (destroyed ())
1061	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1122	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1062	}	1123	}
1063		1124
1064	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1065	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1066	if (tmp->above == tmp)
1067	tmp->above = 0;
1068
1069	last = tmp;	1125	last = tmp;
1070	}	1126	}
1071		1127
1072	/* last == NULL if there are no objects on this space */	1128	/* last == NULL if there are no objects on this space */
1073	//TODO: this makes little sense, why only update the topmost object?	1129	//TODO: this makes little sense, why only update the topmost object?
…		…
1124	if (more)	1180	if (more)
1125	return;	1181	return;
1126		1182
1127	object *prev = this;	1183	object *prev = this;
1128		1184
1129	for (archetype *at = arch->more; at; at = at->more)	1185	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
1130	{	1186	{
1131	object *op = arch_to_object (at);	1187	object *op = arch_to_object (at);
1132		1188
1133	op->name = name;	1189	op->name = name;
1134	op->name_pl = name_pl;	1190	op->name_pl = name_pl;
…		…
1148	object *	1204	object *
1149	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1205	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1150	{	1206	{
1151	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1207	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1152	{	1208	{
1153	tmp->x = x + tmp->arch->clone.x;	1209	tmp->x = x + tmp->arch->x;
1154	tmp->y = y + tmp->arch->clone.y;	1210	tmp->y = y + tmp->arch->y;
1155	}	1211	}
1156		1212
1157	return insert_ob_in_map (op, m, originator, flag);	1213	return insert_ob_in_map (op, m, originator, flag);
1158	}	1214	}
1159		1215
…		…
1180	object *	1236	object *
1181	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1237	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1182	{	1238	{
1183	assert (!op->flag [FLAG_FREED]);	1239	assert (!op->flag [FLAG_FREED]);
1184		1240
1185	object tmp, top, *floor = NULL;	1241	object top, floor = NULL;
1186		1242
1187	op->remove ();	1243	op->remove ();
1188
1189	#if 0
1190	if (!m->active != !op->active)
1191	if (m->active)
1192	op->activate_recursive ();
1193	else
1194	op->deactivate_recursive ();
1195	#endif
1196
1197	if (out_of_map (m, op->x, op->y))
1198	{
1199	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1200	#ifdef MANY_CORES
1201	/* Better to catch this here, as otherwise the next use of this object
1202	* is likely to cause a crash. Better to find out where it is getting
1203	* improperly inserted.
1204	*/
1205	abort ();
1206	#endif
1207	return op;
1208	}
1209
1210	if (object *more = op->more)
1211	{
1212	if (!insert_ob_in_map (more, m, originator, flag))
1213	{
1214	if (!op->head)
1215	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1216
1217	return 0;
1218	}
1219	}
1220
1221	CLEAR_FLAG (op, FLAG_REMOVED);
1222		1244
1223	/* Ideally, the caller figures this out. However, it complicates a lot	1245	/* Ideally, the caller figures this out. However, it complicates a lot
1224	* of areas of callers (eg, anything that uses find_free_spot would now	1246	* of areas of callers (eg, anything that uses find_free_spot would now
1225	* need extra work	1247	* need extra work
1226	*/	1248	*/
1227	if (!xy_normalise (m, op->x, op->y))	1249	if (!xy_normalise (m, op->x, op->y))
		1250	{
		1251	op->destroy ();
1228	return 0;	1252	return 0;
		1253	}
		1254
		1255	if (object *more = op->more)
		1256	if (!insert_ob_in_map (more, m, originator, flag))
		1257	return 0;
		1258
		1259	CLEAR_FLAG (op, FLAG_REMOVED);
1229		1260
1230	op->map = m;	1261	op->map = m;
1231	mapspace &ms = op->ms ();	1262	mapspace &ms = op->ms ();
1232		1263
1233	/* this has to be done after we translate the coordinates.	1264	/* this has to be done after we translate the coordinates.
1234	*/	1265	*/
1235	if (op->nrof && !(flag & INS_NO_MERGE))	1266	if (op->nrof && !(flag & INS_NO_MERGE))
1236	for (tmp = ms.bot; tmp; tmp = tmp->above)	1267	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1237	if (object::can_merge (op, tmp))	1268	if (object::can_merge (op, tmp))
1238	{	1269	{
1239	op->nrof += tmp->nrof;	1270	op->nrof += tmp->nrof;
1240	tmp->destroy ();	1271	tmp->destroy ();
1241	}	1272	}
…		…
1268	else	1299	else
1269	{	1300	{
1270	top = ms.bot;	1301	top = ms.bot;
1271		1302
1272	/* If there are other objects, then */	1303	/* If there are other objects, then */
1273	if ((!(flag & INS_MAP_LOAD)) && top)	1304	if (top)
1274	{	1305	{
1275	object *last = 0;	1306	object *last = 0;
1276		1307
1277	/*	1308	/*
1278	* If there are multiple objects on this space, we do some trickier handling.	1309	* If there are multiple objects on this space, we do some trickier handling.
…		…
1331	if (last && last->below && last != floor)	1362	if (last && last->below && last != floor)
1332	top = last->below;	1363	top = last->below;
1333	}	1364	}
1334	} /* If objects on this space */	1365	} /* If objects on this space */
1335		1366
1336	if (flag & INS_MAP_LOAD)
1337	top = ms.top;
1338
1339	if (flag & INS_ABOVE_FLOOR_ONLY)	1367	if (flag & INS_ABOVE_FLOOR_ONLY)
1340	top = floor;	1368	top = floor;
1341		1369
1342	/* Top is the object that our object (op) is going to get inserted above.	1370	/* Top is the object that our object (op) is going to get inserted above.
1343	*/	1371	*/
…		…
1375	op->map->touch ();	1403	op->map->touch ();
1376	}	1404	}
1377		1405
1378	op->map->dirty = true;	1406	op->map->dirty = true;
1379		1407
1380	/* If we have a floor, we know the player, if any, will be above
1381	* it, so save a few ticks and start from there.
1382	*/
1383	if (!(flag & INS_MAP_LOAD))
1384	if (object *pl = ms.player ())	1408	if (object *pl = ms.player ())
1385	if (pl->contr->ns)
1386	pl->contr->ns->floorbox_update ();	1409	pl->contr->ns->floorbox_update ();
1387		1410
1388	/* If this object glows, it may affect lighting conditions that are	1411	/* If this object glows, it may affect lighting conditions that are
1389	* visible to others on this map. But update_all_los is really	1412	* visible to others on this map. But update_all_los is really
1390	* an inefficient way to do this, as it means los for all players	1413	* an inefficient way to do this, as it means los for all players
1391	* on the map will get recalculated. The players could very well	1414	* on the map will get recalculated. The players could very well
…		…
1410	* blocked() and wall() work properly), and these flags are updated by	1433	* blocked() and wall() work properly), and these flags are updated by
1411	* update_object().	1434	* update_object().
1412	*/	1435	*/
1413		1436
1414	/* if this is not the head or flag has been passed, don't check walk on status */	1437	/* if this is not the head or flag has been passed, don't check walk on status */
1415	if (!(flag & INS_NO_WALK_ON) && !op->head)	1438	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1416	{	1439	{
1417	if (check_move_on (op, originator))	1440	if (check_move_on (op, originator))
1418	return 0;	1441	return 0;
1419		1442
1420	/* If we are a multi part object, lets work our way through the check	1443	/* If we are a multi part object, lets work our way through the check
1421	* walk on's.	1444	* walk on's.
1422	*/	1445	*/
1423	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1446	for (object *tmp = op->more; tmp; tmp = tmp->more)
1424	if (check_move_on (tmp, originator))	1447	if (check_move_on (tmp, originator))
1425	return 0;	1448	return 0;
1426	}	1449	}
1427		1450
1428	return op;	1451	return op;
…		…
1438	object tmp, tmp1;	1461	object tmp, tmp1;
1439		1462
1440	/* first search for itself and remove any old instances */	1463	/* first search for itself and remove any old instances */
1441		1464
1442	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1465	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1443	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1466	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1444	tmp->destroy ();	1467	tmp->destroy ();
1445		1468
1446	tmp1 = arch_to_object (archetype::find (arch_string));	1469	tmp1 = arch_to_object (archetype::find (arch_string));
1447		1470
1448	tmp1->x = op->x;	1471	tmp1->x = op->x;
…		…
1609	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1632	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1610	free (dump);	1633	free (dump);
1611	return op;	1634	return op;
1612	}	1635	}
1613		1636
1614	if (where->head)	1637	if (where->head_ () != where)
1615	{	1638	{
1616	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1639	LOG (llevError \| logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1617	where = where->head;	1640	where = where->head;
1618	}	1641	}
1619		1642
1620	return where->insert (op);	1643	return where->insert (op);
1621	}	1644	}
…		…
1629	* be != op, if items are merged. -Tero	1652	* be != op, if items are merged. -Tero
1630	*/	1653	*/
1631	object *	1654	object *
1632	object::insert (object *op)	1655	object::insert (object *op)
1633	{	1656	{
1634	object tmp, otmp;
1635
1636	if (!QUERY_FLAG (op, FLAG_REMOVED))	1657	if (!QUERY_FLAG (op, FLAG_REMOVED))
1637	op->remove ();	1658	op->remove ();
1638		1659
1639	if (op->more)	1660	if (op->more)
1640	{	1661	{
…		…
1642	return op;	1663	return op;
1643	}	1664	}
1644		1665
1645	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1666	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1646	CLEAR_FLAG (op, FLAG_REMOVED);	1667	CLEAR_FLAG (op, FLAG_REMOVED);
		1668
1647	if (op->nrof)	1669	if (op->nrof)
1648	{	1670	{
1649	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1671	for (object *tmp = inv; tmp; tmp = tmp->below)
1650	if (object::can_merge (tmp, op))	1672	if (object::can_merge (tmp, op))
1651	{	1673	{
1652	/* return the original object and remove inserted object	1674	/* return the original object and remove inserted object
1653	(client needs the original object) */	1675	(client needs the original object) */
1654	tmp->nrof += op->nrof;	1676	tmp->nrof += op->nrof;
…		…
1673	add_weight (this, op->weight * op->nrof);	1695	add_weight (this, op->weight * op->nrof);
1674	}	1696	}
1675	else	1697	else
1676	add_weight (this, (op->weight + op->carrying));	1698	add_weight (this, (op->weight + op->carrying));
1677		1699
1678	otmp = this->in_player ();	1700	if (object *otmp = this->in_player ())
1679	if (otmp && otmp->contr)
1680	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1701	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1681	otmp->update_stats ();	1702	otmp->update_stats ();
1682		1703
		1704	op->owner = 0; // its his/hers now. period.
1683	op->map = 0;	1705	op->map = 0;
1684	op->env = this;	1706	op->env = this;
1685	op->above = 0;	1707	op->above = 0;
1686	op->below = 0;	1708	op->below = 0;
1687	op->x = 0, op->y = 0;	1709	op->x = op->y = 0;
1688		1710
1689	/* reset the light list and los of the players on the map */	1711	/* reset the light list and los of the players on the map */
1690	if ((op->glow_radius != 0) && map)	1712	if (op->glow_radius && map)
1691	{	1713	{
1692	#ifdef DEBUG_LIGHTS	1714	#ifdef DEBUG_LIGHTS
1693	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1715	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1694	#endif /* DEBUG_LIGHTS */	1716	#endif /* DEBUG_LIGHTS */
1695	if (map->darkness)	1717	if (map->darkness)
…		…
1949	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1971	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1950	{	1972	{
1951	CLEAR_FLAG (tmp, flag);	1973	CLEAR_FLAG (tmp, flag);
1952	unflag_inv (tmp, flag);	1974	unflag_inv (tmp, flag);
1953	}	1975	}
1954	}
1955
1956	/*
1957	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1958	* all it's inventory (recursively).
1959	* If checksums are used, a player will get set_cheat called for
1960	* him/her-self and all object carried by a call to this function.
1961	*/
1962	void
1963	set_cheat (object *op)
1964	{
1965	SET_FLAG (op, FLAG_WAS_WIZ);
1966	flag_inv (op, FLAG_WAS_WIZ);
1967	}	1976	}
1968		1977
1969	/*	1978	/*
1970	* find_free_spot(object, map, x, y, start, stop) will search for	1979	* find_free_spot(object, map, x, y, start, stop) will search for
1971	* a spot at the given map and coordinates which will be able to contain	1980	* a spot at the given map and coordinates which will be able to contain
…		…
1988	* customized, changed states, etc.	1997	* customized, changed states, etc.
1989	*/	1998	*/
1990	int	1999	int
1991	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)	2000	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
1992	{	2001	{
		2002	int altern[SIZEOFFREE];
1993	int index = 0, flag;	2003	int index = 0, flag;
1994	int altern[SIZEOFFREE];
1995		2004
1996	for (int i = start; i < stop; i++)	2005	for (int i = start; i < stop; i++)
1997	{	2006	{
1998	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2007	mapxy pos (m, x, y); pos.move (i);
1999	if (!flag)	2008
		2009	if (!pos.normalise ())
		2010	continue;
		2011
		2012	mapspace &ms = *pos;
		2013
		2014	if (ms.flags () & P_IS_ALIVE)
		2015	continue;
		2016
		2017	/* However, often
		2018	* ob doesn't have any move type (when used to place exits)
		2019	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2020	*/
		2021	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2022	{
2000	altern [index++] = i;	2023	altern [index++] = i;
		2024	continue;
		2025	}
2001		2026
2002	/* Basically, if we find a wall on a space, we cut down the search size.	2027	/* Basically, if we find a wall on a space, we cut down the search size.
2003	* In this way, we won't return spaces that are on another side of a wall.	2028	* In this way, we won't return spaces that are on another side of a wall.
2004	* This mostly work, but it cuts down the search size in all directions -	2029	* This mostly work, but it cuts down the search size in all directions -
2005	* if the space being examined only has a wall to the north and empty	2030	* if the space being examined only has a wall to the north and empty
2006	* spaces in all the other directions, this will reduce the search space	2031	* spaces in all the other directions, this will reduce the search space
2007	* to only the spaces immediately surrounding the target area, and	2032	* to only the spaces immediately surrounding the target area, and
2008	* won't look 2 spaces south of the target space.	2033	* won't look 2 spaces south of the target space.
2009	*/	2034	*/
2010	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2035	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2036	{
2011	stop = maxfree[i];	2037	stop = maxfree[i];
		2038	continue;
		2039	}
		2040
		2041	/* Note it is intentional that we check ob - the movement type of the
		2042	* head of the object should correspond for the entire object.
		2043	*/
		2044	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2045	continue;
		2046
		2047	altern [index++] = i;
2012	}	2048	}
2013		2049
2014	if (!index)	2050	if (!index)
2015	return -1;	2051	return -1;
2016		2052
…		…
2025	*/	2061	*/
2026	int	2062	int
2027	find_first_free_spot (const object ob, maptile m, int x, int y)	2063	find_first_free_spot (const object ob, maptile m, int x, int y)
2028	{	2064	{
2029	for (int i = 0; i < SIZEOFFREE; i++)	2065	for (int i = 0; i < SIZEOFFREE; i++)
2030	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2066	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2031	return i;	2067	return i;
2032		2068
2033	return -1;	2069	return -1;
2034	}	2070	}
2035		2071
…		…
2089	object *tmp;	2125	object *tmp;
2090	maptile *mp;	2126	maptile *mp;
2091		2127
2092	MoveType blocked, move_type;	2128	MoveType blocked, move_type;
2093		2129
2094	if (exclude && exclude->head)	2130	if (exclude && exclude->head_ () != exclude)
2095	{	2131	{
2096	exclude = exclude->head;	2132	exclude = exclude->head;
2097	move_type = exclude->move_type;	2133	move_type = exclude->move_type;
2098	}	2134	}
2099	else	2135	else
…		…
2122	max = maxfree[i];	2158	max = maxfree[i];
2123	else if (mflags & P_IS_ALIVE)	2159	else if (mflags & P_IS_ALIVE)
2124	{	2160	{
2125	for (tmp = ms.bot; tmp; tmp = tmp->above)	2161	for (tmp = ms.bot; tmp; tmp = tmp->above)
2126	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2162	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)
2127	&& (tmp != exclude \|\| (tmp->head && tmp->head != exclude)))	2163	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2128	break;	2164	break;
2129		2165
2130	if (tmp)	2166	if (tmp)
2131	return freedir[i];	2167	return freedir[i];
2132	}	2168	}
…		…
2312	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2348	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2313	* core dumps if they do.	2349	* core dumps if they do.
2314	*	2350	*
2315	* Add a check so we can't pick up invisible objects (0.93.8)	2351	* Add a check so we can't pick up invisible objects (0.93.8)
2316	*/	2352	*/
2317
2318	int	2353	int
2319	can_pick (const object who, const object item)	2354	can_pick (const object who, const object item)
2320	{	2355	{
2321	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2356	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2322	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2357	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2327	* create clone from object to another	2362	* create clone from object to another
2328	*/	2363	*/
2329	object *	2364	object *
2330	object_create_clone (object *asrc)	2365	object_create_clone (object *asrc)
2331	{	2366	{
2332	object dst = 0, tmp, src, part, prev, item;	2367	object dst = 0, tmp, src, prev, *item;
2333		2368
2334	if (!asrc)	2369	if (!asrc)
2335	return 0;	2370	return 0;
2336		2371
2337	src = asrc;
2338	if (src->head)
2339	src = src->head;	2372	src = asrc->head_ ();
2340		2373
2341	prev = 0;	2374	prev = 0;
2342	for (part = src; part; part = part->more)	2375	for (object *part = src; part; part = part->more)
2343	{	2376	{
2344	tmp = part->clone ();	2377	tmp = part->clone ();
2345	tmp->x -= src->x;	2378	tmp->x -= src->x;
2346	tmp->y -= src->y;	2379	tmp->y -= src->y;
2347		2380
…		…
2460	/* Basically, if the archetype has this key set,	2493	/* Basically, if the archetype has this key set,
2461	* we need to store the null value so when we save	2494	* we need to store the null value so when we save
2462	* it, we save the empty value so that when we load,	2495	* it, we save the empty value so that when we load,
2463	* we get this value back again.	2496	* we get this value back again.
2464	*/	2497	*/
2465	if (get_ob_key_link (&op->arch->clone, canonical_key))	2498	if (get_ob_key_link (op->arch, canonical_key))
2466	field->value = 0;	2499	field->value = 0;
2467	else	2500	else
2468	{	2501	{
2469	if (last)	2502	if (last)
2470	last->next = field->next;	2503	last->next = field->next;
…		…
2539	}	2572	}
2540	else	2573	else
2541	item = item->env;	2574	item = item->env;
2542	}	2575	}
2543		2576
2544
2545	const char *	2577	const char *
2546	object::flag_desc (char *desc, int len) const	2578	object::flag_desc (char *desc, int len) const
2547	{	2579	{
2548	char *p = desc;	2580	char *p = desc;
2549	bool first = true;	2581	bool first = true;
…		…
2583	&name,	2615	&name,
2584	title ? "\",title:\"" : "",	2616	title ? "\",title:\"" : "",
2585	title ? (const char *)title : "",	2617	title ? (const char *)title : "",
2586	flag_desc (flagdesc, 512), type);	2618	flag_desc (flagdesc, 512), type);
2587		2619
2588	if (env)	2620	if (!this->flag[FLAG_REMOVED] && env)
2589	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2621	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2590		2622
2591	if (map)	2623	if (map)
2592	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2624	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2593		2625
…		…
2611	}	2643	}
2612		2644
2613	const materialtype_t *	2645	const materialtype_t *
2614	object::dominant_material () const	2646	object::dominant_material () const
2615	{	2647	{
2616	if (materialtype_t *mat = name_to_material (materialname))	2648	if (materialtype_t *mt = name_to_material (materialname))
2617	return mat;	2649	return mt;
2618		2650
2619	// omfg this is slow, this has to be temporary :)
2620	shstr unknown ("unknown");
2621
2622	return name_to_material (unknown);	2651	return name_to_material (shstr_unknown);
2623	}	2652	}
2624		2653
2625	void	2654	void
2626	object::open_container (object *new_container)	2655	object::open_container (object *new_container)
2627	{	2656	{
…		…
2643	old_container->flag [FLAG_APPLIED] = 0;	2672	old_container->flag [FLAG_APPLIED] = 0;
2644	container = 0;	2673	container = 0;
2645		2674
2646	esrv_update_item (UPD_FLAGS, this, old_container);	2675	esrv_update_item (UPD_FLAGS, this, old_container);
2647	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2676	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2677	play_sound (sound_find ("chest_close"));
2648	}	2678	}
2649		2679
2650	if (new_container)	2680	if (new_container)
2651	{	2681	{
2652	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2682	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2668	new_container->flag [FLAG_APPLIED] = 1;	2698	new_container->flag [FLAG_APPLIED] = 1;
2669	container = new_container;	2699	container = new_container;
2670		2700
2671	esrv_update_item (UPD_FLAGS, this, new_container);	2701	esrv_update_item (UPD_FLAGS, this, new_container);
2672	esrv_send_inventory (this, new_container);	2702	esrv_send_inventory (this, new_container);
		2703	play_sound (sound_find ("chest_open"));
		2704	}
		2705	}
		2706
		2707	object *
		2708	object::force_find (const shstr name)
		2709	{
		2710	/* cycle through his inventory to look for the MARK we want to
		2711	* place
		2712	*/
		2713	for (object *tmp = inv; tmp; tmp = tmp->below)
		2714	if (tmp->type == FORCE && tmp->slaying == name)
		2715	return splay (tmp);
		2716
		2717	return 0;
		2718	}
		2719
		2720	void
		2721	object::force_add (const shstr name, int duration)
		2722	{
		2723	if (object *force = force_find (name))
		2724	force->destroy ();
		2725
		2726	object *force = get_archetype (FORCE_NAME);
		2727
		2728	force->slaying = name;
		2729	force->stats.food = 1;
		2730	force->speed_left = -1.f;
		2731
		2732	force->set_speed (duration ? 1.f / duration : 0.f);
		2733	force->flag [FLAG_IS_USED_UP] = true;
		2734	force->flag [FLAG_APPLIED] = true;
		2735
		2736	insert (force);
		2737	}
		2738
		2739	void
		2740	object::play_sound (faceidx sound) const
		2741	{
		2742	if (!sound)
		2743	return;
		2744
		2745	if (flag [FLAG_REMOVED])
		2746	return;
		2747
		2748	if (env)
2673	}	2749	{
		2750	if (object *pl = in_player ())
		2751	pl->contr->play_sound (sound);
		2752	}
		2753	else
		2754	map->play_sound (sound, x, y);
2674	}	2755	}
2675		2756
2676

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.144 by root, Thu May 3 10:39:46 2007 UTC vs. Revision 1.192 by root, Fri Oct 12 19:13:25 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.144 by root, Thu May 3 10:39:46 2007 UTC vs.
Revision 1.192 by root, Fri Oct 12 19:13:25 2007 UTC