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

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.99 by root, Tue Jan 3 11:25:37 2012 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.99 by root, Tue Jan 3 11:25:37 2012 UTC