[ViewVC] Diff of: cvs/deliantra/server/socket/item.C

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.13 by root, Thu Dec 14 00:13:26 2006 UTC vs.
Revision 1.79 by root, Mon Oct 12 14:00:59 2009 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
8	it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
9	the Free Software Foundation; either version 2 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
10	(at your option) any later version.	11	* option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
18	along with this program; if not, write to the Free Software	19	* and the GNU General Public License along with this program. If not, see
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* <http://www.gnu.org/licenses/>.
20		21	*
21	The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	/**	25	/**
25	* \file	26	* \file
26	* Client/server logic.	27	* Client/server logic.
27	*	28	*
28	* \date 2003-12-02	29	* \date 2003-12-02
29	*	30	*
30	* This containes item logic for client/server. It doesn't contain	31	* This contains item logic for client/server. It doesn't contain
31	* the actual commands that send the data, but does contain	32	* the actual commands that send the data, but does contain
32	* the logic for what items should be sent.	33	* the logic for what items should be sent.
33	*/	34	*/
34		35
35
36	#include <global.h>	36	#include <global.h>
37	#include <object.h> /* LOOK_OBJ */
38	#include <newclient.h>	37	#include <object.h>
39	#include <newserver.h>
40	#include <sproto.h>	38	#include <sproto.h>
41		39
42	/** This is the maximum number of bytes we expect any one item to take up */	40	/** This is the maximum number of bytes we expect any one item to take up */
43	#define MAXITEMLEN 300	41	#define MAXITEMLEN 300
44		42
47	* Functions related to sending object data to the client.	45	* Functions related to sending object data to the client.
48	*	46	*
49	******************************************************************************/	47	******************************************************************************/
50		48
51	/**	49	/**
52	* Adds string to socklist.
53	*
54	* This is a simple function that we use a lot here. It basically
55	* adds the specified buffer into the socklist, but prepends a
56	* single byte in length. If the data is longer than that byte, it is
57	* truncated approprately.
58	*/
59	inline void
60	add_stringlen_to_sockbuf (const char buf, SockList sl)
61	{
62	int len;
63
64	len = strlen (buf);
65	if (len > 255)
66	len = 255;
67	SockList_AddChar (sl, (char) len);
68	strncpy ((char *) sl->buf + sl->len, buf, len);
69	sl->len += len;
70	}
71
72	/**
73	* This is a similar to query_name, but returns flags	50	* This is a similar to query_name, but returns flags
74	* to be sended to client.	51	* to be sent to client.
75	*/	52	*/
76	unsigned int	53	unsigned int
77	query_flags (object *op)	54	query_flags (object *op)
78	{	55	{
79	unsigned int flags = 0;	56	unsigned int flags = 0;
80		57
81	if (QUERY_FLAG (op, FLAG_APPLIED))	58	if (QUERY_FLAG (op, FLAG_APPLIED))
82	{
83	switch (op->type)	59	switch (op->type)
84	{	60	{
85	case BOW:	61	case BOW:
86	case WAND:	62	case WAND:
87	case ROD:	63	case ROD:
88	case HORN:	64	case HORN:
89	flags = a_readied;	65	flags = a_readied;
90	break;	66	break;
91	case WEAPON:	67	case WEAPON:
92	flags = a_wielded;	68	flags = a_wielded;
93	break;	69	break;
94	case SKILL:	70	case SKILL:
95	case ARMOUR:	71	case ARMOUR:
96	case HELMET:	72	case HELMET:
97	case SHIELD:	73	case SHIELD:
98	case RING:	74	case RING:
99	case BOOTS:	75	case BOOTS:
100	case GLOVES:	76	case GLOVES:
101	case AMULET:	77	case AMULET:
102	case GIRDLE:	78	case GIRDLE:
103	case BRACERS:	79	case BRACERS:
104	case CLOAK:	80	case CLOAK:
105	flags = a_worn;	81	flags = a_worn;
106	break;	82	break;
107	case CONTAINER:	83	case CONTAINER:
108	flags = a_active;	84	flags = a_active;
109	break;	85	break;
110	default:	86	default:
111	flags = a_applied;	87	flags = a_applied;
112	break;	88	break;
113	}	89	}
114	}	90
115	if (op->type == CONTAINER && ((op->env && op->env->container == op) \|\| (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))	91	if (op->type == CONTAINER && ((op->env && op->env->container == op) \|\| (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
116	flags \|= F_OPEN;	92	flags \|= F_OPEN;
117		93
118	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))	94	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
119	{	95	{
120	if (QUERY_FLAG (op, FLAG_DAMNED))	96	if (QUERY_FLAG (op, FLAG_DAMNED))
121	flags \|= F_DAMNED;	97	flags \|= F_DAMNED;
122	else if (QUERY_FLAG (op, FLAG_CURSED))	98	else if (QUERY_FLAG (op, FLAG_CURSED))
123	flags \|= F_CURSED;	99	flags \|= F_CURSED;
124	}	100	}
		101
125	if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))	102	if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
126	flags \|= F_MAGIC;	103	flags \|= F_MAGIC;
127	if (QUERY_FLAG (op, FLAG_UNPAID))	104	if (QUERY_FLAG (op, FLAG_UNPAID))
128	flags \|= F_UNPAID;	105	flags \|= F_UNPAID;
129	if (QUERY_FLAG (op, FLAG_INV_LOCKED))	106	if (QUERY_FLAG (op, FLAG_INV_LOCKED))
130	flags \|= F_LOCKED;	107	flags \|= F_LOCKED;
131		108
132	return flags;	109	return flags;
133	}	110	}
134		111
135	/* Used in the send_look to put object head into SockList	112	/* Used in the send_look to put object head into packet
136	* sl for socket ns. Need socket to know if we need to send	113	* sl for socket ns. Need socket to know if we need to send
137	* animation of face to the client.	114	* animation of face to the client.
138	*/	115	*/
139	static void	116	static void
140	add_object_to_socklist (NewSocket &ns, SockList &sl, object *head)	117	add_object_to_socklist (client &ns, packet &sl, object *head)
141	{	118	{
142	int flags, len, anim_speed;
143	char item_n[MAX_BUF];	119	char item_n[MAX_BUF];
144	const char *item_p;	120	const char *item_p;
145		121
146	flags = query_flags (head);	122	int flags = query_flags (head);
147	if (QUERY_FLAG (head, FLAG_NO_PICK))	123	if (QUERY_FLAG (head, FLAG_NO_PICK))
148	flags \|= F_NOPICK;	124	flags \|= F_NOPICK;
149		125
150	if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE))	126	ns.send_face (head->face, -50);
151	esrv_send_face (&ns, head->face->number, 0);	127	ns.flush_fx ();
152		128
153	if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])	129	if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
154	esrv_send_animation (&ns, head->animation_id);	130	ns.send_animation (head->animation_id);
155		131
156	sl << uint32 (head->count)	132	sl << uint32 (head->count)
157	<< uint32 (flags)	133	<< uint32 (flags)
158	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))	134	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
159	<< uint32 (head->face->number);	135	<< uint32 (head->face);
		136
		137	int len;
160		138
161	if (!head->custom_name)	139	if (!head->custom_name)
162	{	140	{
163	strncpy (item_n, query_base_name (head, 0), 127);	141	strncpy (item_n, query_base_name (head, 0), 127);
164	item_n[127] = 0;	142	item_n[127] = 0;
…		…
178	len += strlen (item_n + 1 + len) + 1;	156	len += strlen (item_n + 1 + len) + 1;
179		157
180	sl << data8 (item_n, len)	158	sl << data8 (item_n, len)
181	<< uint16 (head->animation_id);	159	<< uint16 (head->animation_id);
182		160
183	anim_speed = 0;	161	int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
184	if (QUERY_FLAG (head, FLAG_ANIMATE))	162	: head->anim_speed ? clamp (head->anim_speed, 1, 255)
185	{	163	: 1. / clamp (fabs (head->speed), 1./255., 1./1.);
186	if (head->anim_speed)
187	anim_speed = head->anim_speed;
188	else
189	{
190	if (FABS (head->speed) < 0.001)
191	anim_speed = 255;
192	else if (FABS (head->speed) >= 1.0)
193	anim_speed = 1;
194	else
195	anim_speed = (int) (1.0 / FABS (head->speed));
196	}
197
198	if (anim_speed > 255)
199	anim_speed = 255;
200	}
201		164
202	sl << uint8 (anim_speed)	165	sl << uint8 (anim_speed)
203	<< uint32 (head->nrof);	166	<< uint32 (head->nrof);
204		167
205	if (ns.itemcmd == 2)	168	if (ns.itemcmd == 2)
206	sl << uint16 (head->client_type);	169	sl << uint16 (head->client_type);
207
208	SET_FLAG (head, FLAG_CLIENT_SENT);
209	}	170	}
210		171
		172	static faceidx
		173	need_face_now (player pl, const char name)
		174	{
		175	faceidx face = face_find (name, empty_face);
		176
		177	pl->ns->send_face (face, -50);
		178	pl->ns->flush_fx ();
		179
		180	return face;
		181	}
		182
		183	#define FINGER_UP "finger_up.x11"
		184	#define FINGER_DOWN "finger_down.x11"
211		185
212	/**	186	/**
213	* Send the look window. Don't need to do animations here	187	* Send the look window. Don't need to do animations here
214	* This sends all the faces to the client, not just updates. This is	188	* This sends all the faces to the client, not just updates. This is
215	* because object ordering would otherwise be inconsistent	189	* because object ordering would otherwise be inconsistent.
216	*/	190	*/
217
218	void	191	void
219	esrv_draw_look (object *pl)	192	esrv_draw_look (player *pl)
220	{	193	{
221	object tmp, last;	194	object *ob = pl->ob;
222	int got_one = 0, start_look = 0, end_look = 0;
223	char buf[MAX_BUF];
224		195
225	if (!pl->contr->socket.update_look)	196	if (!pl->ns->update_look)
226	{	197	{
227	LOG (llevDebug, "esrv_draw_look called when update_look was not set\n");	198	LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
228	return;	199	return;
229	}	200	}
230	else	201
231	pl->contr->socket.update_look = 0;	202	pl->ns->update_look = 0;
232		203
233	if (QUERY_FLAG (pl, FLAG_REMOVED)	204	if (QUERY_FLAG (ob, FLAG_REMOVED)
234	\|\| !pl->map	205	\|\| !ob->map
235	\|\| pl->map->in_memory != MAP_IN_MEMORY	206	\|\| ob->map->in_memory != MAP_ACTIVE
236	\|\| out_of_map (pl->map, pl->x, pl->y))	207	\|\| out_of_map (ob->map, ob->x, ob->y))
237	return;	208	return;
238		209
239	for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above);	210	pl->ns->send_packet ("delinv 0");
240		211
241	SockList sl (MAXSOCKBUF);	212	packet sl;
242
243	Write_String_To_Socket (&pl->contr->socket, "delinv 0", sizeof ("delinv 0") - 1);
244
245	sl.printf ("item%d ", pl->contr->socket.itemcmd);	213	sl.printf ("item%d ", pl->ns->itemcmd);
246		214
247	sl << uint32 (0);	215	sl << uint32 (0);
248		216
249	if (!(pl->contr->socket.faces_sent[empty_face->number] & NS_FACESENT_FACE))	217	int start_pos = pl->ns->look_position;
250	esrv_send_face (&pl->contr->socket, empty_face->number, 0);	218	bool dirty = false;
251		219
252	if (pl->contr->socket.look_position)	220	mapspace &ms = ob->ms ();
		221
		222	// manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
		223	// start from the top
		224	object *items [FLOORBOX_PAGESIZE];
		225	int item_idx = 0, item_cnt = 0;
		226	int pos = 0;
		227
		228	// find our items by walking down
		229	object *item = ms.top;
		230
		231	for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
		232	{
		233	if (!item->client_visible ())
		234	continue;
		235
		236	if (++pos < start_pos)
		237	continue;
		238
		239	// record item
		240	items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
		241	item_cnt++;
		242
		243	// stop at first floor
		244	if (item->flag [FLAG_IS_FLOOR])
		245	{
		246	// we are finished, don't append "next group of items"
		247	// by setting item to ms.bot it becomes zero which is checked after the while loop
		248	item = ms.bot;
		249	}
253	{	250	}
254	sl << uint32 (0x80000000 \| (pl->contr->socket.look_position - NUM_LOOK_OBJECTS))	251
		252	// see if there are more if we cared - we ignore invisible objects
		253	if (item)
		254	{
		255	/* What we basically do is make a 'fake' object - when the user applies it,
		256	* we notice the special tag the object has, and act accordingly.
		257	*/
		258	sl << uint32 (0x80000000 \| (start_pos + FLOORBOX_PAGESIZE))
		259	<< uint32 (0)
		260	<< uint32 ((uint32) - 1)
		261	<< uint32 (need_face_now (pl, FINGER_DOWN))
		262	<< data8 ("Apply this to see the items below")
		263	<< uint16 (0)
		264	<< uint8 (0)
		265	<< uint32 (0);
		266
		267	if (pl->ns->itemcmd == 2)
		268	sl << uint16 (0);
		269
		270	dirty = true;
		271	}
		272
		273	// now send out all items in the ring buffer in reverse order
		274	while (item_cnt)
		275	{
		276	--item_cnt;
		277	item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
		278	object *item = items [item_idx];
		279
		280	add_object_to_socklist (*pl->ns, sl, item->head_ ());
		281
		282	dirty = true;
		283
		284	// if packet got too large, send it and begin a new one
		285	if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
		286	{
		287	pl->ns->send_packet (sl);
		288
		289	sl.reset ();
		290	sl.printf ("item%d ", pl->ns->itemcmd);
		291	sl << uint32 (0);
		292
		293	dirty = false;
		294	}
		295	}
		296
		297	if (start_pos)
		298	{
		299	sl << uint32 (0x80000000 \| (start_pos - FLOORBOX_PAGESIZE))
255	<< uint32 (0)	300	<< uint32 (0)
256	<< sint32 (-1)	301	<< sint32 (-1)
257	<< uint32 (empty_face->number);	302	<< uint32 (need_face_now (pl, FINGER_UP))
258		303	<< data8 ("Apply this to see the items higher up")
259	sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS);
260
261	sl << uint16 (0)	304	<< uint16 (0)
262	<< uint8 (0)	305	<< uint8 (0)
263	<< uint32 (0);	306	<< uint32 (0);
264		307
265	if (pl->contr->socket.itemcmd == 2)	308	if (pl->ns->itemcmd == 2)
266	sl << uint16 (0);	309	sl << uint16 (0);
267	}
268		310
269	for (last = NULL; tmp != last; tmp = tmp->below)	311	dirty = true;
270	{	312	}
271	object *head;
272		313
273	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)	314	if (dirty)
274	{	315	pl->ns->send_packet (sl);
275	last = tmp->below; /* assumes double floor mode */
276	if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
277	last = last->below;
278	}
279
280	if (LOOK_OBJ (tmp))
281	{
282	if (++start_look < pl->contr->socket.look_position)
283	continue;
284
285	end_look++;
286
287	if (end_look > NUM_LOOK_OBJECTS)
288	{
289	/* What we basically do is make a 'fake' object - when the user applies it,
290	* we notice the special tag the object has, and act accordingly.
291	*/
292	SockList_AddInt (&sl, 0x80000000 \| (pl->contr->socket.look_position + NUM_LOOK_OBJECTS));
293	SockList_AddInt (&sl, 0);
294	SockList_AddInt (&sl, (uint32) - 1);
295	SockList_AddInt (&sl, empty_face->number);
296	sprintf (buf, "Click here to see next group of items");
297	add_stringlen_to_sockbuf (buf, &sl);
298	SockList_AddShort (&sl, 0);
299	SockList_AddChar (&sl, 0);
300	SockList_AddInt (&sl, 0);
301	if (pl->contr->socket.itemcmd == 2)
302	SockList_AddShort (&sl, 0);
303	break;
304	}
305	if (tmp->head)
306	head = tmp->head;
307	else
308	head = tmp;
309
310	add_object_to_socklist (pl->contr->socket, sl, head);
311	got_one++;
312
313	if (sl.len >= (MAXSOCKBUF - MAXITEMLEN))
314	{
315	Send_With_Handling (&pl->contr->socket, &sl);
316	sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd);
317	sl.len = strlen ((char *) sl.buf);
318	SockList_AddInt (&sl, 0);
319	got_one = 0;
320	}
321	} /* If LOOK_OBJ() */
322	}
323
324	if (got_one)
325	Send_With_Handling (&pl->contr->socket, &sl);
326
327	sl.free ();
328	}	316	}
329		317
330	/**	318	/**
331	* Sends whole inventory.	319	* Sends whole inventory.
332	*/	320	*/
333	void	321	void
334	esrv_send_inventory (object pl, object op)	322	esrv_send_inventory (object pl, object op)
335	{	323	{
336	object *tmp;	324	if (!pl->contr->ns)//D
		325	return;
		326
337	int got_one = 0;	327	int got_one = 0;
338	SockList sl;
339		328
340	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	329	pl->contr->ns->send_packet_printf ("delinv %d", op->count);
341		330
342	sprintf ((char *) sl.buf, "delinv %d", op->count);	331	packet sl;
343	sl.len = strlen ((char *) sl.buf);
344	Send_With_Handling (&pl->contr->socket, &sl);
345
346	sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd);	332	sl.printf ("item%d ", pl->contr->ns->itemcmd);
347	sl.len = strlen ((char *) sl.buf);
348		333
349	SockList_AddInt (&sl, op->count);	334	sl << uint32 (op->count);
350		335
351	for (tmp = op->inv; tmp; tmp = tmp->below)	336	for (object *tmp = op->inv; tmp; tmp = tmp->below)
352	{	337	{
353	object *head;	338	object *head;
354		339
355	if (tmp->head)	340	if (tmp->head)
356	head = tmp->head;	341	head = tmp->head;
357	else	342	else
358	head = tmp;	343	head = tmp;
359		344
360	if (LOOK_OBJ (head))	345	if (head->client_visible ())
361	{	346	{
362	add_object_to_socklist (pl->contr->socket, sl, head);	347	add_object_to_socklist (*pl->contr->ns, sl, head);
363		348
364	got_one++;	349	got_one++;
365		350
366	/* IT is possible for players to accumulate a huge amount of	351	/* IT is possible for players to accumulate a huge amount of
367	* items (especially with some of the bags out there) to	352	* items (especially with some of the bags out there) to
368	* overflow the buffer. IF so, send multiple item commands.	353	* overflow the buffer. IF so, send multiple item commands.
369	*/	354	*/
370	if (sl.len >= (MAXSOCKBUF - MAXITEMLEN))	355	if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
371	{	356	{
372	Send_With_Handling (&pl->contr->socket, &sl);	357	pl->contr->ns->send_packet (sl);
		358
		359	sl.reset ();
373	sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd);	360	sl.printf ("item%d ", pl->contr->ns->itemcmd);
374	sl.len = strlen ((char *) sl.buf);	361	sl << uint32 (op->count);
375	SockList_AddInt (&sl, op->count);
376	got_one = 0;	362	got_one = 0;
377	}	363	}
378	} /* If LOOK_OBJ() */	364	}
379	}	365	}
		366
380	if (got_one)	367	if (got_one)
381	Send_With_Handling (&pl->contr->socket, &sl);	368	pl->contr->ns->send_packet (sl);
382	sl.free ();
383	}	369	}
384		370
385	/**	371	/**
386	* Updates object op for player pl.	372	* Updates object op for player pl.
387	*	373	*
388	* flags is a list of values to update	374	* flags is a list of values to update
389	* to the client (as defined in newclient.h - might as well use the	375	* to the client (as defined in newclient.h - might as well use the
390	* same value both places.	376	* same value both places.
391	*/	377	*/
392
393	void	378	void
394	esrv_update_item (int flags, object pl, object op)	379	esrv_update_item (int flags, object pl, object op)
395	{	380	{
396	SockList sl;
397
398	/* If we have a request to send the player item, skip a few checks. */	381	/* If we have a request to send the player item, skip a few checks. */
399	if (op != pl)	382	if (op != pl && !op->client_visible ())
400	{
401	if (!LOOK_OBJ (op))
402	return;	383	return;
403	/* we remove the check for op->env, because in theory, the object
404	* is hopefully in the same place, so the client should preserve
405	* order.
406	*/
407	}
408		384
409	if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))	385	client *ns = pl->contr->ns;
410	{	386	if (!ns)
411	/* FLAG_CLIENT_SENT is debug only. We are using it to see where	387	return;
412	* this is happening - we can set a breakpoint here in the debugger
413	* and track back the call.
414	*/
415	LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
416	}
417		388
418	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	389	packet sl ("upditem");
419		390
420	strcpy ((char *) sl.buf, "upditem ");	391	sl << uint8 (flags);
421	sl.len = strlen ((char *) sl.buf);
422		392
423	SockList_AddChar (&sl, (char) flags);
424
425	if (op->head)
426	op = op->head;	393	op = op->head_ ();
427		394
428	SockList_AddInt (&sl, op->count);	395	sl << uint32 (op->count);
429		396
430	if (flags & UPD_LOCATION)	397	if (flags & UPD_LOCATION)
431	SockList_AddInt (&sl, op->env ? op->env->count : 0);	398	sl << uint32 (op->env ? op->env->count : 0);
432		399
433	if (flags & UPD_FLAGS)	400	if (flags & UPD_FLAGS)
434	SockList_AddInt (&sl, query_flags (op));	401	sl << uint32 (query_flags (op));
435		402
436	if (flags & UPD_WEIGHT)	403	if (flags & UPD_WEIGHT)
437	{	404	{
438	sint32 weight = WEIGHT (op);	405	sint32 weight = op->client_weight ();
439		406
440	SockList_AddInt (&sl, QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);	407	if (op == pl)
441	if (pl == op)
442	{
443	op->contr->last_weight = weight;	408	ns->last_weight = weight;
444	}	409
		410	sl << uint32 (weight);
445	}	411	}
446		412
447	if (flags & UPD_FACE)	413	if (flags & UPD_FACE)
448	{	414	{
449	if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE))	415	ns->send_face (op->face, -50);
450	esrv_send_face (&pl->contr->socket, op->face->number, 0);	416	ns->flush_fx ();
451	SockList_AddInt (&sl, op->face->number);	417	sl << uint32 (op->face);
452	}	418	}
453		419
454	if (flags & UPD_NAME)	420	if (flags & UPD_NAME)
455	{	421	{
456	int len;	422	int len;
457	const char *item_p;	423	const char *item_p;
458	char item_n[MAX_BUF];	424	char item_n[127 * 2];
459		425
460	if (!op->custom_name)	426	if (!op->custom_name)
461	{	427	{
462	strncpy (item_n, query_base_name (op, 0), 127);	428	len = assign (item_n, query_base_name (op, 0), 127);
463	item_n[127] = 0;
464	len = strlen (item_n);
465	item_p = query_base_name (op, 1);	429	item_p = query_base_name (op, 1);
466	}	430	}
467	else	431	else
468	{	432	{
469	strncpy (item_n, op->custom_name, 127);	433	len = assign (item_n, &op->custom_name, 127);
470	item_n[127] = 0;
471	len = strlen (item_n);
472	item_p = op->custom_name;	434	item_p = &op->custom_name;
473	}	435	}
474		436
475	strncpy (item_n + len + 1, item_p, 127);	437	len += assign (item_n + len, item_p, 127);
476	item_n[254] = 0;	438
477	len += strlen (item_n + 1 + len) + 1;	439	sl << data8 (item_n, len);
478	SockList_AddChar (&sl, (char) len);
479	memcpy (sl.buf + sl.len, item_n, len);
480	sl.len += len;
481	}	440	}
482		441
483	if (flags & UPD_ANIM)	442	if (flags & UPD_ANIM)
484	SockList_AddShort (&sl, op->animation_id);	443	sl << uint16 (op->animation_id);
485		444
486	if (flags & UPD_ANIMSPEED)	445	if (flags & UPD_ANIMSPEED)
487	{	446	{
488	int anim_speed = 0;	447	int anim_speed = 0;
489		448
…		…
491	{	450	{
492	if (op->anim_speed)	451	if (op->anim_speed)
493	anim_speed = op->anim_speed;	452	anim_speed = op->anim_speed;
494	else	453	else
495	{	454	{
496	if (FABS (op->speed) < 0.001)	455	if (fabs (op->speed) < 0.001)
497	anim_speed = 255;	456	anim_speed = 255;
498	else if (FABS (op->speed) >= 1.0)	457	else if (fabs (op->speed) >= 1.0)
499	anim_speed = 1;	458	anim_speed = 1;
500	else	459	else
501	anim_speed = (int) (1.0 / FABS (op->speed));	460	anim_speed = (int) (1.0 / fabs (op->speed));
502	}	461	}
		462
503	if (anim_speed > 255)	463	if (anim_speed > 255)
504	anim_speed = 255;	464	anim_speed = 255;
505	}	465	}
506	SockList_AddChar (&sl, (char) anim_speed);	466
		467	sl << uint8 (anim_speed);
507	}	468	}
		469
508	if (flags & UPD_NROF)	470	if (flags & UPD_NROF)
509	SockList_AddInt (&sl, op->nrof);	471	sl << uint32 (op->nrof);
510		472
511	Send_With_Handling (&pl->contr->socket, &sl);	473	pl->contr->ns->send_packet (sl);
512	sl.free ();
513	}	474	}
514		475
515	/**	476	/**
516	* Sends item's info to player.	477	* Sends item's info to player.
517	*/	478	*/
518	void	479	void
519	esrv_send_item (object pl, object op)	480	esrv_send_item (object pl, object op)
520	{	481	{
521	SockList sl;	482	if (!pl->contr->ns)
522
523	/* If this is not the player object, do some more checks */
524	if (op != pl)
525	{
526	/* We only send 'visibile' objects to the client */
527	if (!LOOK_OBJ (op))
528	return;	483	return;
529	/* if the item is on the ground, mark that the look needs to	484
530	* be updated.	485	/* We only send 'visible' objects to the client, and sometimes the player */
531	*/	486	if (!op->client_visible () && op->type != PLAYER)
532	if (!op->env)
533	{
534	pl->contr->socket.update_look = 1;
535	return;	487	return;
536	}
537	}
538		488
539	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	489	packet sl;
540		490
541	sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd);	491	sl.printf ("item%d ", pl->contr->ns->itemcmd);
542	sl.len = strlen ((char *) sl.buf);
543		492
544	if (op->head)
545	op = op->head;	493	op = op->head_ ();
546		494
547	SockList_AddInt (&sl, op->env ? op->env->count : 0);	495	sl << uint32 (op->env ? op->env->count : 0);
548		496
549	add_object_to_socklist (pl->contr->socket, sl, op);	497	add_object_to_socklist (*pl->contr->ns, sl, op);
550		498
551	Send_With_Handling (&pl->contr->socket, &sl);	499	pl->contr->ns->send_packet (sl);
552	SET_FLAG (op, FLAG_CLIENT_SENT);
553
554	sl.free ();
555	}	500	}
556		501
557	/**	502	/**
558	* Tells the client to delete an item. Uses the item	503	* Tells the client to delete an item.
559	* command with a -1 location.
560	*/	504	*/
561
562	void	505	void
563	esrv_del_item (player *pl, int tag)	506	esrv_del_item (player *pl, int tag)
564	{	507	{
565	SockList sl;	508	if (!pl->ns)
		509	return;
566		510
567	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	511	packet sl ("delitem");
568		512
569	strcpy ((char *) sl.buf, "delitem ");	513	sl << uint32 (tag);
570	sl.len = strlen ((char *) sl.buf);
571	SockList_AddInt (&sl, tag);
572		514
573	Send_With_Handling (&pl->socket, &sl);	515	pl->ns->send_packet (sl);
574	sl.free ();
575	}	516	}
576		517
577		518
578	/*******************************************************************************	519	/*******************************************************************************
579	*	520	*
…		…
583		524
584	/**	525	/**
585	* Takes a player and object count (tag) and returns the actual object	526	* Takes a player and object count (tag) and returns the actual object
586	* pointer, or null if it can't be found.	527	* pointer, or null if it can't be found.
587	*/	528	*/
588
589	object *	529	object *
590	esrv_get_ob_from_count (object *pl, tag_t count)	530	esrv_get_ob_from_count (object *pl, tag_t count)
591	{	531	{
592	object op, tmp;
593
594	if (pl->count == count)	532	if (pl->count == count)
595	return pl;	533	return pl;
596		534
597	for (op = pl->inv; op; op = op->below)	535	for (object *op = pl->inv; op; op = op->below)
598	if (op->count == count)	536	if (op->count == count)
599	return op;	537	return op;
600	else if (op->type == CONTAINER && pl->container == op)	538	else if (op->type == CONTAINER && pl->container == op)
601	for (tmp = op->inv; tmp; tmp = tmp->below)	539	for (object *tmp = op->inv; tmp; tmp = tmp->below)
602	if (tmp->count == count)	540	if (tmp->count == count)
603	return tmp;	541	return tmp;
604		542
605	for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above)	543	for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
606	if (op->head != NULL && op->head->count == count)	544	if (op->head && op->head->count == count)
607	return op;	545	return op;
608	else if (op->count == count)	546	else if (op->count == count)
609	return op;	547	return op;
610	else if (op->type == CONTAINER && pl->container == op)	548	else if (op->type == CONTAINER && pl->container == op)
611	for (tmp = op->inv; tmp; tmp = tmp->below)	549	for (object *tmp = op->inv; tmp; tmp = tmp->below)
612	if (tmp->count == count)	550	if (tmp->count == count)
613	return tmp;	551	return tmp;
614		552
		553	#if 0
		554	/* If the high bit is set, player examined a pseudo object. */
		555	if (count & 0x80000000)
		556	return 0;
		557	#endif
		558
615	return NULL;	559	return 0;
616	}	560	}
617
618		561
619	/** Client wants to examine some object. So lets do so. */	562	/** Client wants to examine some object. So lets do so. */
620	void	563	void
621	ExamineCmd (char buf, int len, player pl)	564	ExamineCmd (char buf, int len, player pl)
622	{	565	{
623	tag_t tag = atoi (buf);	566	tag_t tag = atoi (buf);
624
625	/* If the high bit is set, player examined a pseudo object. */
626	if (tag & 0x80000000)
627	return;
628
629	object *op = esrv_get_ob_from_count (pl->ob, tag);
630
631	if (!op)
632	{
633	LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
634	return;
635	}
636
637	examine (pl->ob, op);
638	}
639
640	/** Client wants to apply some object. Lets do so. */
641	void
642	ApplyCmd (char buf, int len, player pl)
643	{
644	tag_t tag = atoi (buf);
645
646	/* sort of a hack, but if the player saves and the player then manually
647	* applies a savebed (or otherwise tries to do stuff), we run into trouble.
648	*/
649	if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
650	return;
651		567
652	/* If the high bit is set, player applied a pseudo object. */	568	/* If the high bit is set, player applied a pseudo object. */
653	if (tag & 0x80000000)	569	if (tag & 0x80000000)
654	{	570	{
655	pl->socket.look_position = tag & 0x7fffffff;	571	pl->ns->look_position = tag & 0x7fffffff;
656	pl->socket.update_look = 1;	572	pl->ns->floorbox_update ();
657	return;	573	return;
658	}	574	}
659		575
660	object *op = esrv_get_ob_from_count (pl->ob, tag);	576	object *op = esrv_get_ob_from_count (pl->ob, tag);
661		577
662	if (!op)	578	if (!op)
663	{	579	{
		580	LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
		581	return;
		582	}
		583
		584	examine (pl->ob, op);
		585	}
		586
		587	/** Client wants to examine some object. So lets do so. */
		588	void
		589	ExCmd (char buf, int len, player pl)
		590	{
		591	tag_t tag = atoi (buf);
		592
		593	if (object *op = esrv_get_ob_from_count (pl->ob, tag))
		594	{
		595	std::string s = op->describe (pl->ob);
		596
		597	packet sl ("ex");
		598	sl << ber32 (tag)
		599	<< data (*pl->expand_cfpod (s.c_str ()));
		600
		601	pl->ns->send_packet (sl);
		602	}
		603	}
		604
		605	/** Client wants to apply some object. Lets do so. */
		606	void
		607	ApplyCmd (char buf, int len, player pl)
		608	{
		609	tag_t tag = atoi (buf);
		610
		611	/* If the high bit is set, player applied a pseudo object. */
		612	if (tag & 0x80000000)
		613	{
		614	pl->ns->look_position = tag & 0x7fffffff;
		615	pl->ns->floorbox_update ();
		616	return;
		617	}
		618
		619	object *op = esrv_get_ob_from_count (pl->ob, tag);
		620
		621	if (!op)
		622	{
664	LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);	623	LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
665	return;	624	return;
666	}	625	}
667		626
668	player_apply (pl->ob, op, 0, 0);	627	player_apply (pl->ob, op, 0, 0);
669	}	628	}
670		629
671	/** Client wants to apply some object. Lets do so. */	630	/** Client wants to lock some object. Lets do so. */
672	void	631	void
673	LockItem (uint8 data, int len, player pl)	632	LockItem (char data, int len, player pl)
674	{	633	{
675	int flag = data[0];	634	int flag = data[0];
676	tag_t tag = net_uint32 (data + 1);	635	tag_t tag = net_uint32 ((uint8 *)data + 1);
677	object *op = esrv_get_ob_from_count (pl->ob, tag);	636	object *op = esrv_get_ob_from_count (pl->ob, tag);
678		637
679	if (!op)	638	if (!op)
680	{	639	{
681	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");	640	pl->failmsg ("Could not find object to lock/unlock");
682	return;	641	return;
683	}	642	}
684		643
685	if (!flag)	644	if (!flag)
686	CLEAR_FLAG (op, FLAG_INV_LOCKED);	645	CLEAR_FLAG (op, FLAG_INV_LOCKED);
…		…
688	SET_FLAG (op, FLAG_INV_LOCKED);	647	SET_FLAG (op, FLAG_INV_LOCKED);
689		648
690	esrv_update_item (UPD_FLAGS, pl->ob, op);	649	esrv_update_item (UPD_FLAGS, pl->ob, op);
691	}	650	}
692		651
693	/** Client wants to apply some object. Lets do so. */	652	/** Client wants to mark some object. Lets do so. */
694	void	653	void
695	MarkItem (uint8 * data, int len, player *pl)	654	MarkItem (char data, int len, player pl)
696	{	655	{
697	tag_t tag = net_uint32 (data);	656	tag_t tag = net_uint32 ((uint8 *)data);
698	object *op = esrv_get_ob_from_count (pl->ob, tag);	657	object *op = esrv_get_ob_from_count (pl->ob, tag);
699		658
700	if (!op)	659	if (!op)
701	{	660	{
702	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");	661	pl->failmsg ("Could not find object to mark");
703	return;	662	return;
704	}	663	}
705		664
706	pl->mark = op;	665	pl->mark = op;
707	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op));	666	pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
708	}	667	}
709		668
710	/**	669	/**
711	* look_at prints items on the specified square.	670	* look_at prints items on the specified square.
712	*	671	*
713	* [ removed EARTHWALL check and added check for containers inventory.	672	* [ removed EARTHWALL check and added check for containers inventory.
714	* Tero.Haatanen@lut.fi ]	673	* Tero.Haatanen@lut.fi ]
715	*/	674	*/
716	void	675	static void
717	look_at (object *op, int dx, int dy)	676	look_at (player *pl, int dx, int dy)
718	{	677	{
719	object *tmp;	678	dynbuf_text &buf = msg_dynbuf; buf.clear ();
720	int flag = 0;	679	object *ob = pl->ob;
721	sint16 x, y;
722	maptile *m;
723		680
724	x = op->x + dx;	681	if (!pl->observe->map)
725	y = op->y + dy;
726
727	if (out_of_map (op->map, x, y))
728	return;	682	return;
729		683
730	m = get_map_from_coord (op->map, &x, &y);	684	bool wiz = ob->flag [FLAG_WIZ] \|\| ob->flag [FLAG_WIZLOOK];
731	if (!m)	685
		686	mapxy pos (pl->observe);
		687	pos.move (dx, dy);
		688
		689	if (wiz)
		690	{
		691	if (pos.normalise ())
		692	{
		693	mapspace &ms = *pos;
		694	ms.update ();
		695
		696	buf.printf (" map: %s%+d%+d (%+d%+d)\n"
		697	" smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; volume %lld\n\n",
		698	&pos.m->path, pos.x, pos.y, dx, dy,
		699	(unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
		700	ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (long long)ms.volume ()
		701	);
		702	}
		703	else
		704	buf << "off-map\n\n";
		705	}
		706
		707	int darkness = pl->blocked_los (dx, dy);
		708
		709	if (darkness == LOS_BLOCKED)
		710	buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
		711	else if (darkness == LOS_MAX)
		712	buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
		713	else
		714	{
		715	if (pos.normalise ())
		716	for (object *tmp = pos->top; tmp; tmp = tmp->below)
		717	{
		718	if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
		719	continue;
		720
		721	if (wiz)
		722	buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
		723	else
		724	buf.printf (" - %s.\n", query_name (tmp));
		725
		726	object *head = tmp->head_ ();
		727
		728	if (head->inv)
		729	if ((head->type != CONTAINER && head->type != FLESH)
		730	\|\| QUERY_FLAG (ob, FLAG_WIZ))
		731	buf << head->query_inventory (ob, " ");
		732
		733	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !wiz) /* don't continue under the floor */
		734	break;
		735	}
		736	}
		737
		738	if (buf.empty ())
		739	buf << "You see nothing there.";
		740
		741	pl->infobox (MSG_CHANNEL ("lookat"), buf);
		742	}
		743
		744	/** Client wants to look at some object. Lets do so. */
		745	void
		746	LookAt (char buf, int len, player pl)
		747	{
		748	char *cp;
		749
		750	int dx = atoi (buf);
		751	if (!(cp = strchr (buf, ' ')))
732	return;	752	return;
733		753
734	for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
735
736	for (; tmp != NULL; tmp = tmp->below)
737	{
738	if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
739	continue;
740
741	if (!flag)
742	{
743	if (dx \|\| dy)
744	new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
745	else
746	{
747	clear_win_info (op);
748	new_draw_info (NDI_UNIQUE, 0, op, "You see:");
749	}
750	flag = 1;
751	}
752
753	if (QUERY_FLAG (op, FLAG_WIZ))
754	new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
755	else
756	new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
757
758	if (((tmp->inv != NULL \|\| (tmp->head && tmp->head->inv)) &&
759	(tmp->type != CONTAINER && tmp->type != FLESH)) \|\| QUERY_FLAG (op, FLAG_WIZ))
760	inventory (op, tmp->head == NULL ? tmp : tmp->head);
761
762	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
763	break;
764	}
765
766	if (!flag)
767	{
768	if (dx \|\| dy)
769	new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
770	else
771	new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
772	}
773	}
774
775
776
777	/** Client wants to look at some object. Lets do so. */
778	void
779	LookAt (char buf, int len, player pl)
780	{
781	int dx, dy;
782	char *cp;
783
784	dx = atoi (buf);
785	if (!(cp = strchr (buf, ' ')))
786	{
787	return;
788	}
789	dy = atoi (cp);	754	int dy = atoi (cp);
790		755
791	if (FABS (dx) > pl->socket.mapx / 2 \|\| FABS (dy) > pl->socket.mapy / 2)
792	return;
793
794	if (pl->blocked_los[dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2])
795	return;
796
797	look_at (pl->ob, dx, dy);	756	look_at (pl, dx, dy);
798	}	757	}
799		758
800	/** Move an object to a new location */	759	/** Move an object to a new location */
801	void	760	void
802	esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)	761	esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
803	{	762	{
804	object op, env;
805
806	op = esrv_get_ob_from_count (pl, tag);	763	object *op = esrv_get_ob_from_count (pl, tag);
807	if (!op)	764	if (!op)
808	{	765	{
809	LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);	766	LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
810	return;	767	return;
811	}	768	}
812		769
813	if (!to)	770	if (!to)
814	{ /* drop it to the ground */	771	{ /* drop it to the ground */
815
816	/* LOG(llevDebug, "Drop it on the ground.\n");*/
817
818	if (op->map && !op->env)	772	if (op->map && !op->env)
819	{
820
821	/* LOG(llevDebug,"Dropping object to ground that is already on ground\n");*/
822	return;	773	return;
823	}	774
824	/* If it is an active container, then we should drop all objects	775	/* If it is an active container, then we should drop all objects
825	* in the container and not the container itself.	776	* in the container and not the container itself.
826	*/	777	*/
827	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))	778	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
828	{	779	{
829	object current, next;	780	int cnt = MAX_ITEM_PER_DROP;
830		781
831	for (current = op->inv; current != NULL; current = next)	782	for (object *current = op->inv; current && cnt--; )
832	{	783	{
833	next = current->below;	784	object *next = current->below;
834	drop_object (pl, current, 0);	785	drop_object (pl, current, 0);
		786	current = next;
835	}	787	}
836	esrv_update_item (UPD_WEIGHT, pl, op);	788
		789	if (cnt <= 0)
		790	op->failmsg ("Only dropped some items, can't drop that many items at once.");
837	}	791	}
838	else	792	else
839	{
840	drop_object (pl, op, nrof);	793	drop_object (pl, op, nrof);
841	}	794
842	return;	795	return;
843	}	796	}
844	else if (to == pl->count)	797	else if (to == pl->count)
845	{ /* pick it up to the inventory */	798	{ /* pick it up to the inventory */
846	/* return if player has already picked it up */	799	/* return if player has already picked it up */
…		…
849		802
850	pl->contr->count = nrof;	803	pl->contr->count = nrof;
851	pick_up (pl, op);	804	pick_up (pl, op);
852	return;	805	return;
853	}	806	}
		807
854	env = esrv_get_ob_from_count (pl, to);	808	object *env = esrv_get_ob_from_count (pl, to);
855	if (!env)	809	if (!env)
856	{	810	{
857	LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);	811	LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
858	return;	812	return;
859	}	813	}
		814
860	/* put_object_in_sack presumes that necessary sanity checking	815	/* put_object_in_sack presumes that necessary sanity checking
861	* has already been done (eg, it can be picked up and fits in	816	* has already been done (eg, it can be picked up and fits in
862	* in a sack, so check for those things. We should also check	817	* in a sack, so check for those things. We should also check
863	* an make sure env is in fact a container for that matter.	818	* an make sure env is in fact a container for that matter.
864	*/	819	*/
865	if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))	820	if (env->type == CONTAINER
866	{	821	&& can_pick (pl, op)
		822	&& sack_can_hold (pl, env, op, nrof))
867	put_object_in_sack (pl, env, op, nrof);	823	put_object_in_sack (pl, env, op, nrof);
868	}
869	}	824	}
		825

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.13 by root, Thu Dec 14 00:13:26 2006 UTC vs. Revision 1.79 by root, Mon Oct 12 14:00:59 2009 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.13 by root, Thu Dec 14 00:13:26 2006 UTC vs.
Revision 1.79 by root, Mon Oct 12 14:00:59 2009 UTC