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

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

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.13 by root, Thu Dec 14 00:13:26 2006 UTC vs. Revision 1.94 by root, Sun Apr 11 23:48:57 2010 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.13 by root, Thu Dec 14 00:13:26 2006 UTC vs.
Revision 1.94 by root, Sun Apr 11 23:48:57 2010 UTC