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

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

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.8 by root, Sat Sep 16 22:24:13 2006 UTC vs. Revision 1.82 by root, Fri Nov 6 13:07:28 2009 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.8 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.82 by root, Fri Nov 6 13:07:28 2009 UTC