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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.167 by root, Sat Jul 21 18:01:25 2007 UTC vs.
Revision 1.204 by root, Fri Apr 11 17:01:52 2008 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software: you can redistribute it and/or modify	8	* Deliantra 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 3 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,
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, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
26	variable. */	26	variable. */
…		…
33	#include <sproto.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	UUID UUID::cur;
39	static UUID uuid;	39	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	40	static const uint64 UUID_GAP = 1<<19;
41		41
42	objectvec objects;	42	objectvec objects;
43	activevec actives;	43	activevec actives;
44		44
45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = {
		46	0,
		47	0, 1, 1, 1, 0, -1, -1, -1,
		48	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	49	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47	};	50	};
48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	51	short freearr_y[SIZEOFFREE] = {
		52	0,
		53	-1, -1, 0, 1, 1, 1, 0, -1,
		54	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	55	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50	};	56	};
51	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,	57	int maxfree[SIZEOFFREE] = {
		58	0,
		59	9, 10, 13, 14, 17, 18, 21, 22,
		60	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
52	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	61	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53	};	62	};
54	int freedir[SIZEOFFREE] = {	63	int freedir[SIZEOFFREE] = {
55	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	64	0,
		65	1, 2, 3, 4, 5, 6, 7, 8,
		66	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	67	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57	};	68	};
58		69
59	static void	70	static void
60	write_uuid (void)	71	write_uuid (uval64 skip, bool sync)
61	{	72	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	73	CALL_BEGIN (2);
63		74	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	75	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	76	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		77	CALL_END;
67	FILE *fp;
68
69	if (!(fp = fopen (filename2, "w")))
70	{
71	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72	return;
73	}
74
75	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76	fclose (fp);
77	rename (filename2, filename1);
78	}	78	}
79		79
80	static void	80	static void
81	read_uuid (void)	81	read_uuid (void)
82	{	82	{
83	char filename[MAX_BUF];	83	char filename[MAX_BUF];
84		84
85	sprintf (filename, "%s/uuid", settings.localdir);	85	sprintf (filename, "%s/uuid", settings.localdir);
86		86
		87	seq_next_save = 0;
		88
87	FILE *fp;	89	FILE *fp;
88		90
89	if (!(fp = fopen (filename, "r")))	91	if (!(fp = fopen (filename, "r")))
90	{	92	{
91	if (errno == ENOENT)	93	if (errno == ENOENT)
92	{	94	{
93	LOG (llevInfo, "RESET uid to 1\n");	95	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	96	UUID::cur.seq = 0;
95	write_uuid ();	97	write_uuid (UUID_GAP, true);
96	return;	98	return;
97	}	99	}
98		100
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	101	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	102	_exit (1);
101	}	103	}
102		104
103	int version;	105	UUID::BUF buf;
104	unsigned long long uid;	106	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) \|\| version != 1)	107	fgets (buf, sizeof (buf), fp);
		108
		109	if (!UUID::cur.parse (buf))
106	{	110	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	111	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	112	_exit (1);
109	}	113	}
110		114
111	uuid.seq = uid;	115	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	116
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	117	write_uuid (UUID_GAP, true);
114	fclose (fp);	118	fclose (fp);
115	}	119	}
116		120
117	UUID	121	UUID
118	gen_uuid ()	122	UUID::gen ()
119	{	123	{
120	UUID uid;	124	UUID uid;
121		125
122	uid.seq = ++uuid.seq;	126	uid.seq = ++cur.seq;
123		127
124	if (!(uuid.seq & (UUID_SKIP - 1)))	128	if (expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	129	{
		130	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		131	write_uuid (UUID_GAP, false);
		132	}
		133
126		134
127	return uid;	135	return uid;
128	}	136	}
129		137
130	void	138	void
131	init_uuid ()	139	UUID::init ()
132	{	140	{
133	read_uuid ();	141	read_uuid ();
134	}	142	}
135		143
136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	144	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
…		…
254	/* This is really a spellbook check - really, we should	262	/* This is really a spellbook check - really, we should
255	* check all objects in the inventory.	263	* check all objects in the inventory.
256	*/	264	*/
257	if (ob1->inv \|\| ob2->inv)	265	if (ob1->inv \|\| ob2->inv)
258	{	266	{
259	/* if one object has inventory but the other doesn't, not equiv */	267	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) \|\| (ob2->inv && !ob1->inv))	268	return 0; /* inventories differ in length */
261	return 0;
262		269
263	/* Now check to see if the two inventory objects could merge */	270	if (ob1->inv->below \|\| ob2->inv->below)
		271	return 0; /* more than one object in inv */
		272
264	if (!object::can_merge (ob1->inv, ob2->inv))	273	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	274	return 0; /* inventory objexts differ */
266		275
267	/* inventory ok - still need to check rest of this object to see	276	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	277	* if it is valid.
269	*/	278	*/
270	}	279	}
…		…
305	{	314	{
306	ob1->optimise ();	315	ob1->optimise ();
307	ob2->optimise ();	316	ob2->optimise ();
308		317
309	if (ob1->self \|\| ob2->self)	318	if (ob1->self \|\| ob2->self)
310	if (!cfperl_can_merge (ob1, ob2))	319	{
		320	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		321	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		322
		323	if (k1 != k2)
311	return 0;	324	return 0;
		325	else if (k1 == 0)
		326	return 1;
		327	else if (!cfperl_can_merge (ob1, ob2))
		328	return 0;
		329	}
312	}	330	}
313		331
314	/* Everything passes, must be OK. */	332	/* Everything passes, must be OK. */
315	return 1;	333	return 1;
316	}	334	}
…		…
374	/*	392	/*
375	* get_nearest_part(multi-object, object 2) returns the part of the	393	* get_nearest_part(multi-object, object 2) returns the part of the
376	* multi-object 1 which is closest to the second object.	394	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.	395	* If it's not a multi-object, it is returned.
378	*/	396	*/
379
380	object *	397	object *
381	get_nearest_part (object op, const object pl)	398	get_nearest_part (object op, const object pl)
382	{	399	{
383	object tmp, closest;	400	object tmp, closest;
384	int last_dist, i;	401	int last_dist, i;
…		…
420	break;	437	break;
421		438
422	return op;	439	return op;
423	}	440	}
424		441
425	void
426	free_all_object_data ()
427	{
428	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429	}
430
431	/*	442	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	443	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	444	* skill and experience objects.
		445	* ACTUALLY NO! investigate! TODO
434	*/	446	*/
435	void	447	void
436	object::set_owner (object *owner)	448	object::set_owner (object *owner)
437	{	449	{
		450	// allow objects which own objects
438	if (!owner)	451	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)	452	while (owner->owner)
449	owner = owner->owner;	453	owner = owner->owner;
		454
		455	if (flag [FLAG_FREED])
		456	{
		457	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		458	return;
		459	}
450		460
451	this->owner = owner;	461	this->owner = owner;
452	}	462	}
453		463
454	int	464	int
…		…
586	object::copy_to (object *dst)	596	object::copy_to (object *dst)
587	{	597	{
588	dst = this;	598	dst = this;
589		599
590	if (speed < 0)	600	if (speed < 0)
591	dst->speed_left = speed_left - rndm ();	601	dst->speed_left -= rndm ();
592		602
593	dst->set_speed (dst->speed);	603	dst->set_speed (dst->speed);
594	}	604	}
595		605
596	void	606	void
597	object::instantiate ()	607	object::instantiate ()
598	{	608	{
599	if (!uuid.seq) // HACK	609	if (!uuid.seq) // HACK
600	uuid = gen_uuid ();	610	uuid = UUID::gen ();
601		611
602	speed_left = -0.1f;	612	speed_left = -0.1f;
603	/* copy the body_info to the body_used - this is only really	613	/* copy the body_info to the body_used - this is only really
604	* need for monsters, but doesn't hurt to do it for everything.	614	* need for monsters, but doesn't hurt to do it for everything.
605	* by doing so, when a monster is created, it has good starting	615	* by doing so, when a monster is created, it has good starting
…		…
764	static int object_count;	774	static int object_count;
765		775
766	void object::link ()	776	void object::link ()
767	{	777	{
768	assert (!index);//D	778	assert (!index);//D
769	uuid = gen_uuid ();	779	uuid = UUID::gen ();
770	count = ++object_count;	780	count = ++object_count;
771		781
772	refcnt_inc ();	782	refcnt_inc ();
773	objects.insert (this);	783	objects.insert (this);
774	}	784	}
…		…
923		933
924	if (!freed_map)	934	if (!freed_map)
925	{	935	{
926	freed_map = new maptile;	936	freed_map = new maptile;
927		937
		938	freed_map->path = "<freed objects map>";
928	freed_map->name = "/internal/freed_objects_map";	939	freed_map->name = "/internal/freed_objects_map";
929	freed_map->width = 3;	940	freed_map->width = 3;
930	freed_map->height = 3;	941	freed_map->height = 3;
		942	freed_map->nodrop = 1;
931		943
932	freed_map->alloc ();	944	freed_map->alloc ();
933	freed_map->in_memory = MAP_IN_MEMORY;	945	freed_map->in_memory = MAP_IN_MEMORY;
934	}	946	}
935		947
…		…
959	if (destroyed ())	971	if (destroyed ())
960	return;	972	return;
961		973
962	if (destroy_inventory)	974	if (destroy_inventory)
963	destroy_inv (false);	975	destroy_inv (false);
		976
		977	if (is_head ())
		978	if (sound_destroy)
		979	play_sound (sound_destroy);
		980	else if (flag [FLAG_MONSTER])
		981	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
964		982
965	attachable::destroy ();	983	attachable::destroy ();
966	}	984	}
967		985
968	/*	986	/*
…		…
1083	if (map->in_memory == MAP_SAVING)	1101	if (map->in_memory == MAP_SAVING)
1084	return;	1102	return;
1085		1103
1086	int check_walk_off = !flag [FLAG_NO_APPLY];	1104	int check_walk_off = !flag [FLAG_NO_APPLY];
1087		1105
		1106	if (object *pl = ms.player ())
		1107	{
		1108	if (pl->container == this)
		1109	/* If a container that the player is currently using somehow gets
		1110	* removed (most likely destroyed), update the player view
		1111	* appropriately.
		1112	*/
		1113	pl->close_container ();
		1114
		1115	pl->contr->ns->floorbox_update ();
		1116	}
		1117
1088	for (tmp = ms.bot; tmp; tmp = tmp->above)	1118	for (tmp = ms.bot; tmp; tmp = tmp->above)
1089	{	1119	{
1090	/* No point updating the players look faces if he is the object	1120	/* No point updating the players look faces if he is the object
1091	* being removed.	1121	* being removed.
1092	*/	1122	*/
1093
1094	if (tmp->type == PLAYER && tmp != this)
1095	{
1096	/* If a container that the player is currently using somehow gets
1097	* removed (most likely destroyed), update the player view
1098	* appropriately.
1099	*/
1100	if (tmp->container == this)
1101	{
1102	flag [FLAG_APPLIED] = 0;
1103	tmp->container = 0;
1104	}
1105
1106	if (tmp->contr->ns)
1107	tmp->contr->ns->floorbox_update ();
1108	}
1109		1123
1110	/* See if object moving off should effect something */	1124	/* See if object moving off should effect something */
1111	if (check_walk_off	1125	if (check_walk_off
1112	&& ((move_type & tmp->move_off)	1126	&& ((move_type & tmp->move_off)
1113	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1127	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1145	merge_ob (object op, object top)	1159	merge_ob (object op, object top)
1146	{	1160	{
1147	if (!op->nrof)	1161	if (!op->nrof)
1148	return 0;	1162	return 0;
1149		1163
1150	if (top)	1164	if (!top)
1151	for (top = op; top && top->above; top = top->above)	1165	for (top = op; top && top->above; top = top->above)
1152	;	1166	;
1153		1167
1154	for (; top; top = top->below)	1168	for (; top; top = top->below)
1155	{	1169	{
…		…
1236		1250
1237	object top, floor = NULL;	1251	object top, floor = NULL;
1238		1252
1239	op->remove ();	1253	op->remove ();
1240		1254
1241	#if 0
1242	if (!m->active != !op->active)
1243	if (m->active)
1244	op->activate_recursive ();
1245	else
1246	op->deactivate_recursive ();
1247	#endif
1248
1249	if (out_of_map (m, op->x, op->y))
1250	{
1251	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1252	#ifdef MANY_CORES
1253	/* Better to catch this here, as otherwise the next use of this object
1254	* is likely to cause a crash. Better to find out where it is getting
1255	* improperly inserted.
1256	*/
1257	abort ();
1258	#endif
1259	return op;
1260	}
1261
1262	if (object *more = op->more)
1263	if (!insert_ob_in_map (more, m, originator, flag))
1264	return 0;
1265
1266	CLEAR_FLAG (op, FLAG_REMOVED);
1267
1268	/* Ideally, the caller figures this out. However, it complicates a lot	1255	/* Ideally, the caller figures this out. However, it complicates a lot
1269	* of areas of callers (eg, anything that uses find_free_spot would now	1256	* of areas of callers (eg, anything that uses find_free_spot would now
1270	* need extra work	1257	* need extra work
1271	*/	1258	*/
1272	if (!xy_normalise (m, op->x, op->y))	1259	if (!xy_normalise (m, op->x, op->y))
		1260	{
		1261	op->destroy ();
1273	return 0;	1262	return 0;
		1263	}
		1264
		1265	if (object *more = op->more)
		1266	if (!insert_ob_in_map (more, m, originator, flag))
		1267	return 0;
		1268
		1269	CLEAR_FLAG (op, FLAG_REMOVED);
1274		1270
1275	op->map = m;	1271	op->map = m;
1276	mapspace &ms = op->ms ();	1272	mapspace &ms = op->ms ();
1277		1273
1278	/* this has to be done after we translate the coordinates.	1274	/* this has to be done after we translate the coordinates.
…		…
1313	else	1309	else
1314	{	1310	{
1315	top = ms.bot;	1311	top = ms.bot;
1316		1312
1317	/* If there are other objects, then */	1313	/* If there are other objects, then */
1318	if ((!(flag & INS_MAP_LOAD)) && top)	1314	if (top)
1319	{	1315	{
1320	object *last = 0;	1316	object *last = 0;
1321		1317
1322	/*	1318	/*
1323	* If there are multiple objects on this space, we do some trickier handling.	1319	* If there are multiple objects on this space, we do some trickier handling.
…		…
1375	*/	1371	*/
1376	if (last && last->below && last != floor)	1372	if (last && last->below && last != floor)
1377	top = last->below;	1373	top = last->below;
1378	}	1374	}
1379	} /* If objects on this space */	1375	} /* If objects on this space */
1380	if (flag & INS_MAP_LOAD)
1381	top = ms.top;
1382		1376
1383	if (flag & INS_ABOVE_FLOOR_ONLY)	1377	if (flag & INS_ABOVE_FLOOR_ONLY)
1384	top = floor;	1378	top = floor;
1385		1379
1386	/* Top is the object that our object (op) is going to get inserted above.	1380	/* Top is the object that our object (op) is going to get inserted above.
…		…
1419	op->map->touch ();	1413	op->map->touch ();
1420	}	1414	}
1421		1415
1422	op->map->dirty = true;	1416	op->map->dirty = true;
1423		1417
1424	/* If we have a floor, we know the player, if any, will be above
1425	* it, so save a few ticks and start from there.
1426	*/
1427	if (!(flag & INS_MAP_LOAD))
1428	if (object *pl = ms.player ())	1418	if (object *pl = ms.player ())
1429	if (pl->contr->ns)
1430	pl->contr->ns->floorbox_update ();	1419	pl->contr->ns->floorbox_update ();
1431		1420
1432	/* If this object glows, it may affect lighting conditions that are	1421	/* If this object glows, it may affect lighting conditions that are
1433	* visible to others on this map. But update_all_los is really	1422	* visible to others on this map. But update_all_los is really
1434	* an inefficient way to do this, as it means los for all players	1423	* an inefficient way to do this, as it means los for all players
1435	* on the map will get recalculated. The players could very well	1424	* on the map will get recalculated. The players could very well
…		…
1673	* be != op, if items are merged. -Tero	1662	* be != op, if items are merged. -Tero
1674	*/	1663	*/
1675	object *	1664	object *
1676	object::insert (object *op)	1665	object::insert (object *op)
1677	{	1666	{
1678	object tmp, otmp;
1679
1680	if (!QUERY_FLAG (op, FLAG_REMOVED))	1667	if (!QUERY_FLAG (op, FLAG_REMOVED))
1681	op->remove ();	1668	op->remove ();
1682		1669
1683	if (op->more)	1670	if (op->more)
1684	{	1671	{
…		…
1686	return op;	1673	return op;
1687	}	1674	}
1688		1675
1689	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1676	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1690	CLEAR_FLAG (op, FLAG_REMOVED);	1677	CLEAR_FLAG (op, FLAG_REMOVED);
		1678
1691	if (op->nrof)	1679	if (op->nrof)
1692	{	1680	{
1693	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1681	for (object *tmp = inv; tmp; tmp = tmp->below)
1694	if (object::can_merge (tmp, op))	1682	if (object::can_merge (tmp, op))
1695	{	1683	{
1696	/* return the original object and remove inserted object	1684	/* return the original object and remove inserted object
1697	(client needs the original object) */	1685	(client needs the original object) */
1698	tmp->nrof += op->nrof;	1686	tmp->nrof += op->nrof;
…		…
1717	add_weight (this, op->weight * op->nrof);	1705	add_weight (this, op->weight * op->nrof);
1718	}	1706	}
1719	else	1707	else
1720	add_weight (this, (op->weight + op->carrying));	1708	add_weight (this, (op->weight + op->carrying));
1721		1709
1722	otmp = this->in_player ();	1710	if (object *otmp = this->in_player ())
1723	if (otmp && otmp->contr)
1724	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1711	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1725	otmp->update_stats ();	1712	otmp->update_stats ();
1726		1713
		1714	op->owner = 0; // its his/hers now. period.
1727	op->map = 0;	1715	op->map = 0;
1728	op->env = this;	1716	op->env = this;
1729	op->above = 0;	1717	op->above = 0;
1730	op->below = 0;	1718	op->below = 0;
1731	op->x = 0, op->y = 0;	1719	op->x = op->y = 0;
1732		1720
1733	/* reset the light list and los of the players on the map */	1721	/* reset the light list and los of the players on the map */
1734	if ((op->glow_radius != 0) && map)	1722	if (op->glow_radius && map)
1735	{	1723	{
1736	#ifdef DEBUG_LIGHTS	1724	#ifdef DEBUG_LIGHTS
1737	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1725	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1738	#endif /* DEBUG_LIGHTS */	1726	#endif /* DEBUG_LIGHTS */
1739	if (map->darkness)	1727	if (map->darkness)
…		…
1973	* activate recursively a flag on an object inventory	1961	* activate recursively a flag on an object inventory
1974	*/	1962	*/
1975	void	1963	void
1976	flag_inv (object *op, int flag)	1964	flag_inv (object *op, int flag)
1977	{	1965	{
1978	if (op->inv)
1979	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1966	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1980	{	1967	{
1981	SET_FLAG (tmp, flag);	1968	SET_FLAG (tmp, flag);
1982	flag_inv (tmp, flag);	1969	flag_inv (tmp, flag);
1983	}	1970	}
1984	}	1971	}
1985		1972
1986	/*	1973	/*
1987	* deactivate recursively a flag on an object inventory	1974	* deactivate recursively a flag on an object inventory
1988	*/	1975	*/
1989	void	1976	void
1990	unflag_inv (object *op, int flag)	1977	unflag_inv (object *op, int flag)
1991	{	1978	{
1992	if (op->inv)
1993	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1979	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1994	{	1980	{
1995	CLEAR_FLAG (tmp, flag);	1981	CLEAR_FLAG (tmp, flag);
1996	unflag_inv (tmp, flag);	1982	unflag_inv (tmp, flag);
1997	}	1983	}
1998	}	1984	}
1999		1985
2000	/*	1986	/*
2001	* find_free_spot(object, map, x, y, start, stop) will search for	1987	* find_free_spot(object, map, x, y, start, stop) will search for
2002	* a spot at the given map and coordinates which will be able to contain	1988	* a spot at the given map and coordinates which will be able to contain
…		…
2004	* to search (see the freearr_x/y[] definition).	1990	* to search (see the freearr_x/y[] definition).
2005	* It returns a random choice among the alternatives found.	1991	* It returns a random choice among the alternatives found.
2006	* start and stop are where to start relative to the free_arr array (1,9	1992	* start and stop are where to start relative to the free_arr array (1,9
2007	* does all 4 immediate directions). This returns the index into the	1993	* does all 4 immediate directions). This returns the index into the
2008	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1994	* array of the free spot, -1 if no spot available (dir 0 = x,y)
2009	* Note - this only checks to see if there is space for the head of the
2010	* object - if it is a multispace object, this should be called for all
2011	* pieces.
2012	* Note2: This function does correctly handle tiled maps, but does not	1995	* Note: This function does correctly handle tiled maps, but does not
2013	* inform the caller. However, insert_ob_in_map will update as	1996	* inform the caller. However, insert_ob_in_map will update as
2014	* necessary, so the caller shouldn't need to do any special work.	1997	* necessary, so the caller shouldn't need to do any special work.
2015	* Note - updated to take an object instead of archetype - this is necessary	1998	* Note - updated to take an object instead of archetype - this is necessary
2016	* because arch_blocked (now ob_blocked) needs to know the movement type	1999	* because arch_blocked (now ob_blocked) needs to know the movement type
2017	* to know if the space in question will block the object. We can't use	2000	* to know if the space in question will block the object. We can't use
…		…
2019	* customized, changed states, etc.	2002	* customized, changed states, etc.
2020	*/	2003	*/
2021	int	2004	int
2022	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)	2005	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2023	{	2006	{
		2007	int altern[SIZEOFFREE];
2024	int index = 0, flag;	2008	int index = 0, flag;
2025	int altern[SIZEOFFREE];
2026		2009
2027	for (int i = start; i < stop; i++)	2010	for (int i = start; i < stop; i++)
2028	{	2011	{
2029	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2012	mapxy pos (m, x, y); pos.move (i);
2030	if (!flag)	2013
		2014	if (!pos.normalise ())
		2015	continue;
		2016
		2017	mapspace &ms = *pos;
		2018
		2019	if (ms.flags () & P_IS_ALIVE)
		2020	continue;
		2021
		2022	/* However, often
		2023	* ob doesn't have any move type (when used to place exits)
		2024	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2025	*/
		2026	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2027	{
2031	altern [index++] = i;	2028	altern [index++] = i;
		2029	continue;
		2030	}
2032		2031
2033	/* Basically, if we find a wall on a space, we cut down the search size.	2032	/* Basically, if we find a wall on a space, we cut down the search size.
2034	* In this way, we won't return spaces that are on another side of a wall.	2033	* In this way, we won't return spaces that are on another side of a wall.
2035	* This mostly work, but it cuts down the search size in all directions -	2034	* This mostly work, but it cuts down the search size in all directions -
2036	* if the space being examined only has a wall to the north and empty	2035	* if the space being examined only has a wall to the north and empty
2037	* spaces in all the other directions, this will reduce the search space	2036	* spaces in all the other directions, this will reduce the search space
2038	* to only the spaces immediately surrounding the target area, and	2037	* to only the spaces immediately surrounding the target area, and
2039	* won't look 2 spaces south of the target space.	2038	* won't look 2 spaces south of the target space.
2040	*/	2039	*/
2041	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2040	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2041	{
2042	stop = maxfree[i];	2042	stop = maxfree[i];
		2043	continue;
		2044	}
		2045
		2046	/* Note it is intentional that we check ob - the movement type of the
		2047	* head of the object should correspond for the entire object.
		2048	*/
		2049	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2050	continue;
		2051
		2052	if (ob->blocked (m, pos.x, pos.y))
		2053	continue;
		2054
		2055	altern [index++] = i;
2043	}	2056	}
2044		2057
2045	if (!index)	2058	if (!index)
2046	return -1;	2059	return -1;
2047		2060
…		…
2056	*/	2069	*/
2057	int	2070	int
2058	find_first_free_spot (const object ob, maptile m, int x, int y)	2071	find_first_free_spot (const object ob, maptile m, int x, int y)
2059	{	2072	{
2060	for (int i = 0; i < SIZEOFFREE; i++)	2073	for (int i = 0; i < SIZEOFFREE; i++)
2061	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2074	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2062	return i;	2075	return i;
2063		2076
2064	return -1;	2077	return -1;
2065	}	2078	}
2066		2079
…		…
2343	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2356	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2344	* core dumps if they do.	2357	* core dumps if they do.
2345	*	2358	*
2346	* Add a check so we can't pick up invisible objects (0.93.8)	2359	* Add a check so we can't pick up invisible objects (0.93.8)
2347	*/	2360	*/
2348
2349	int	2361	int
2350	can_pick (const object who, const object item)	2362	can_pick (const object who, const object item)
2351	{	2363	{
2352	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2364	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2353	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2365	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2604	{	2616	{
2605	char flagdesc[512];	2617	char flagdesc[512];
2606	char info2[256 * 4];	2618	char info2[256 * 4];
2607	char *p = info;	2619	char *p = info;
2608		2620
2609	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2621	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2610	count, uuid.seq,	2622	count,
		2623	uuid.c_str (),
2611	&name,	2624	&name,
2612	title ? "\",title:\"" : "",	2625	title ? "\",title:\"" : "",
2613	title ? (const char *)title : "",	2626	title ? (const char *)title : "",
2614	flag_desc (flagdesc, 512), type);	2627	flag_desc (flagdesc, 512), type);
2615		2628
2616	if (env)	2629	if (!this->flag[FLAG_REMOVED] && env)
2617	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2630	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2618		2631
2619	if (map)	2632	if (map)
2620	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2633	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2621		2634
…		…
2668	old_container->flag [FLAG_APPLIED] = 0;	2681	old_container->flag [FLAG_APPLIED] = 0;
2669	container = 0;	2682	container = 0;
2670		2683
2671	esrv_update_item (UPD_FLAGS, this, old_container);	2684	esrv_update_item (UPD_FLAGS, this, old_container);
2672	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2685	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2686	play_sound (sound_find ("chest_close"));
2673	}	2687	}
2674		2688
2675	if (new_container)	2689	if (new_container)
2676	{	2690	{
2677	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2691	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2693	new_container->flag [FLAG_APPLIED] = 1;	2707	new_container->flag [FLAG_APPLIED] = 1;
2694	container = new_container;	2708	container = new_container;
2695		2709
2696	esrv_update_item (UPD_FLAGS, this, new_container);	2710	esrv_update_item (UPD_FLAGS, this, new_container);
2697	esrv_send_inventory (this, new_container);	2711	esrv_send_inventory (this, new_container);
		2712	play_sound (sound_find ("chest_open"));
2698	}	2713	}
2699	}	2714	}
2700		2715
2701	object *	2716	object *
2702	object::force_find (const shstr name)	2717	object::force_find (const shstr name)
…		…
2728	force->flag [FLAG_APPLIED] = true;	2743	force->flag [FLAG_APPLIED] = true;
2729		2744
2730	insert (force);	2745	insert (force);
2731	}	2746	}
2732		2747
		2748	void
		2749	object::play_sound (faceidx sound) const
		2750	{
		2751	if (!sound)
		2752	return;
2733		2753
		2754	if (flag [FLAG_REMOVED])
		2755	return;
		2756
		2757	if (env)
		2758	{
		2759	if (object *pl = in_player ())
		2760	pl->contr->play_sound (sound);
		2761	}
		2762	else
		2763	map->play_sound (sound, x, y);
		2764	}
		2765

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.167 by root, Sat Jul 21 18:01:25 2007 UTC vs. Revision 1.204 by root, Fri Apr 11 17:01:52 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.167 by root, Sat Jul 21 18:01:25 2007 UTC vs.
Revision 1.204 by root, Fri Apr 11 17:01:52 2008 UTC