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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.5 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.92 by root, Sun Apr 11 00:34:07 2010 UTC

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

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.5 by root, Sun Sep 10 13:43:33 2006 UTC vs. Revision 1.92 by root, Sun Apr 11 00:34:07 2010 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.5 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.92 by root, Sun Apr 11 00:34:07 2010 UTC