[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.72 by root, Tue Oct 28 12:48:23 2008 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 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,2007 Mark Wedel & Crossfire Development Team
11	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 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
14	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
15	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
16	(at your option) any later version.	11	* (at your 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 GNU General Public License
24	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
25	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
26		21	* The authors can be reached via e-mail to <support@deliantra.net>
27	The author can be reached via e-mail to crossfire-devel@real-time.com
28	*/	22	*/
29		23
30	/**	24	/**
31	* \file	25	* \file
32	* Client/server logic.	26	* Client/server logic.
33	*	27	*
34	* \date 2003-12-02	28	* \date 2003-12-02
35	*	29	*
36	* This containes item logic for client/server. It doesn't contain	30	* This contains item logic for client/server. It doesn't contain
37	* the actual commands that send the data, but does contain	31	* the actual commands that send the data, but does contain
38	* the logic for what items should be sent.	32	* the logic for what items should be sent.
39	*/	33	*/
40		34
41
42	#include <global.h>	35	#include <global.h>
43	#include <object.h> /* LOOK_OBJ */
44	#include <newclient.h>	36	#include <object.h>
45	#include <newserver.h>
46	#include <sproto.h>	37	#include <sproto.h>
47		38
48	/** This is the maximum number of bytes we expect any one item to take up */	39	/** This is the maximum number of bytes we expect any one item to take up */
49	#define MAXITEMLEN 300	40	#define MAXITEMLEN 300
50		41
53	* Functions related to sending object data to the client.	44	* Functions related to sending object data to the client.
54	*	45	*
55	******************************************************************************/	46	******************************************************************************/
56		47
57	/**	48	/**
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	49	* This is a similar to query_name, but returns flags
80	* to be sended to client.	50	* to be sent to client.
81	*/	51	*/
82	unsigned int	52	unsigned int
83	query_flags (object *op)	53	query_flags (object *op)
84	{	54	{
85	unsigned int flags = 0;	55	unsigned int flags = 0;
86		56
87	if (QUERY_FLAG (op, FLAG_APPLIED))	57	if (QUERY_FLAG (op, FLAG_APPLIED))
88	{
89	switch (op->type)	58	switch (op->type)
90	{	59	{
91	case BOW:	60	case BOW:
92	case WAND:	61	case WAND:
93	case ROD:	62	case ROD:
94	case HORN:	63	case HORN:
95	flags = a_readied;	64	flags = a_readied;
96	break;	65	break;
97	case WEAPON:	66	case WEAPON:
98	flags = a_wielded;	67	flags = a_wielded;
99	break;	68	break;
100	case SKILL:	69	case SKILL:
101	case ARMOUR:	70	case ARMOUR:
102	case HELMET:	71	case HELMET:
103	case SHIELD:	72	case SHIELD:
104	case RING:	73	case RING:
105	case BOOTS:	74	case BOOTS:
106	case GLOVES:	75	case GLOVES:
107	case AMULET:	76	case AMULET:
108	case GIRDLE:	77	case GIRDLE:
109	case BRACERS:	78	case BRACERS:
110	case CLOAK:	79	case CLOAK:
111	flags = a_worn;	80	flags = a_worn;
112	break;	81	break;
113	case CONTAINER:	82	case CONTAINER:
114	flags = a_active;	83	flags = a_active;
115	break;	84	break;
116	default:	85	default:
117	flags = a_applied;	86	flags = a_applied;
118	break;	87	break;
119	}	88	}
120	}	89
121	if (op->type == CONTAINER && ((op->env && op->env->container == op) \|\| (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))	90	if (op->type == CONTAINER && ((op->env && op->env->container == op) \|\| (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
122	flags \|= F_OPEN;	91	flags \|= F_OPEN;
123		92
124	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))	93	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
125	{	94	{
126	if (QUERY_FLAG (op, FLAG_DAMNED))	95	if (QUERY_FLAG (op, FLAG_DAMNED))
127	flags \|= F_DAMNED;	96	flags \|= F_DAMNED;
128	else if (QUERY_FLAG (op, FLAG_CURSED))	97	else if (QUERY_FLAG (op, FLAG_CURSED))
129	flags \|= F_CURSED;	98	flags \|= F_CURSED;
130	}	99	}
		100
131	if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))	101	if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
132	flags \|= F_MAGIC;	102	flags \|= F_MAGIC;
133	if (QUERY_FLAG (op, FLAG_UNPAID))	103	if (QUERY_FLAG (op, FLAG_UNPAID))
134	flags \|= F_UNPAID;	104	flags \|= F_UNPAID;
135	if (QUERY_FLAG (op, FLAG_INV_LOCKED))	105	if (QUERY_FLAG (op, FLAG_INV_LOCKED))
136	flags \|= F_LOCKED;	106	flags \|= F_LOCKED;
137		107
138	return flags;	108	return flags;
139	}	109	}
140		110
141	/* Used in the send_look to put object head into SockList	111	/* 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	112	* sl for socket ns. Need socket to know if we need to send
143	* animation of face to the client.	113	* animation of face to the client.
144	*/	114	*/
145	static void	115	static void
146	add_object_to_socklist (NewSocket * ns, SockList * sl, object *head)	116	add_object_to_socklist (client &ns, packet &sl, object *head)
147	{	117	{
148	int flags, len, anim_speed;
149	char item_n[MAX_BUF];	118	char item_n[MAX_BUF];
150	const char *item_p;	119	const char *item_p;
151		120
152	flags = query_flags (head);	121	int flags = query_flags (head);
153	if (QUERY_FLAG (head, FLAG_NO_PICK))	122	if (QUERY_FLAG (head, FLAG_NO_PICK))
154	flags \|= F_NOPICK;	123	flags \|= F_NOPICK;
155		124
156	if (!(ns->faces_sent[head->face->number] & NS_FACESENT_FACE))	125	ns.send_face (head->face, -50);
157	esrv_send_face (ns, head->face->number, 0);	126	ns.flush_fx ();
158		127
159	if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns->anims_sent[head->animation_id])	128	if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
160	esrv_send_animation (ns, head->animation_id);	129	ns.send_animation (head->animation_id);
161		130
162	SockList_AddInt (sl, head->count);	131	sl << uint32 (head->count)
163	SockList_AddInt (sl, flags);	132	<< uint32 (flags)
164	SockList_AddInt (sl, QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head));	133	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
165	SockList_AddInt (sl, head->face->number);	134	<< uint32 (head->face);
		135
		136	int len;
166		137
167	if (!head->custom_name)	138	if (!head->custom_name)
168	{	139	{
169	strncpy (item_n, query_base_name (head, 0), 127);	140	strncpy (item_n, query_base_name (head, 0), 127);
170	item_n[127] = 0;	141	item_n[127] = 0;
…		…
176	strncpy (item_n, head->custom_name, 127);	147	strncpy (item_n, head->custom_name, 127);
177	item_n[127] = 0;	148	item_n[127] = 0;
178	len = strlen (item_n);	149	len = strlen (item_n);
179	item_p = head->custom_name;	150	item_p = head->custom_name;
180	}	151	}
		152
181	strncpy (item_n + len + 1, item_p, 127);	153	strncpy (item_n + len + 1, item_p, 127);
182	item_n[254] = 0;	154	item_n[254] = 0;
183	len += strlen (item_n + 1 + len) + 1;	155	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		156
188	SockList_AddShort (sl, head->animation_id);	157	sl << data8 (item_n, len)
189	anim_speed = 0;	158	<< uint16 (head->animation_id);
190	if (QUERY_FLAG (head, FLAG_ANIMATE))	159
		160	int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
		161	: head->anim_speed ? clamp (head->anim_speed, 1, 255)
		162	: 1. / clamp (fabs (head->speed), 1./255., 1./1.);
		163
		164	sl << uint8 (anim_speed)
		165	<< uint32 (head->nrof);
		166
		167	if (ns.itemcmd == 2)
		168	sl << uint16 (head->client_type);
		169	}
		170
		171	static faceidx
		172	need_face_now (player pl, const char name)
		173	{
		174	faceidx face = face_find (name, empty_face);
		175
		176	pl->ns->send_face (face, -50);
		177	pl->ns->flush_fx ();
		178
		179	return face;
		180	}
		181
		182	#define FINGER_UP "finger_up.x11"
		183	#define FINGER_DOWN "finger_down.x11"
		184
		185	/**
		186	* Send the look window. Don't need to do animations here
		187	* This sends all the faces to the client, not just updates. This is
		188	* because object ordering would otherwise be inconsistent.
		189	*/
		190	void
		191	esrv_draw_look (player *pl)
		192	{
		193	object *ob = pl->ob;
		194
		195	if (!pl->ns->update_look)
		196	{
		197	LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
		198	return;
191	{	199	}
192	if (head->anim_speed)	200
193	anim_speed = head->anim_speed;	201	pl->ns->update_look = 0;
194	else	202
		203	if (QUERY_FLAG (ob, FLAG_REMOVED)
		204	\|\| !ob->map
		205	\|\| ob->map->in_memory != MAP_ACTIVE
		206	\|\| out_of_map (ob->map, ob->x, ob->y))
		207	return;
		208
		209	pl->ns->send_packet ("delinv 0");
		210
		211	packet sl;
		212	sl.printf ("item%d ", pl->ns->itemcmd);
		213
		214	sl << uint32 (0);
		215
		216	int start_pos = pl->ns->look_position;
		217	bool dirty = false;
		218
		219	mapspace &ms = ob->ms ();
		220
		221	// manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
		222	// start from the top
		223	object *items [FLOORBOX_PAGESIZE];
		224	int item_idx = 0, item_cnt = 0;
		225	int pos = 0;
		226
		227	// find our items by walking down
		228	object *item = ms.top;
		229
		230	for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
		231	{
		232	if (!item->client_visible ())
		233	continue;
		234
		235	if (++pos < start_pos)
		236	continue;
		237
		238	// record item
		239	items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
		240	item_cnt++;
		241
		242	// stop at first floor
		243	if (item->flag [FLAG_IS_FLOOR])
195	{	244	{
196	if (FABS (head->speed) < 0.001)	245	// we are finished, don't append "next group of items"
197	anim_speed = 255;	246	// by setting item to ms.bot it becomes zero which is checked after the while loop
198	else if (FABS (head->speed) >= 1.0)	247	item = ms.bot;
199	anim_speed = 1;
200	else
201	anim_speed = (int) (1.0 / FABS (head->speed));
202	}	248	}
203	if (anim_speed > 255)	249	}
204	anim_speed = 255;	250
		251	// see if there are more if we cared - we ignore invisible objects
		252	if (item)
205	}	253	{
206	SockList_AddChar (sl, (char) anim_speed);	254	/* What we basically do is make a 'fake' object - when the user applies it,
207	SockList_AddInt (sl, head->nrof);	255	* we notice the special tag the object has, and act accordingly.
		256	*/
		257	sl << uint32 (0x80000000 \| (start_pos + FLOORBOX_PAGESIZE))
		258	<< uint32 (0)
		259	<< uint32 ((uint32) - 1)
		260	<< uint32 (need_face_now (pl, FINGER_DOWN))
		261	<< data8 ("Apply this to see the items below")
		262	<< uint16 (0)
		263	<< uint8 (0)
		264	<< uint32 (0);
208		265
209	if (ns->itemcmd == 2)	266	if (pl->ns->itemcmd == 2)
210	SockList_AddShort (sl, head->client_type);	267	sl << uint16 (0);
211		268
212	SET_FLAG (head, FLAG_CLIENT_SENT);	269	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	{	270	}
232	LOG (llevDebug, "esrv_draw_look called when update_look was not set\n");	271
233	return;	272	// now send out all items in the ring buffer in reverse order
		273	while (item_cnt)
234	}	274	{
235	else	275	--item_cnt;
236	{	276	item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
237	pl->contr->socket.update_look = 0;	277	object *item = items [item_idx];
238	}
239		278
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))	279	add_object_to_socklist (*pl->ns, sl, item->head_ ());
241	return;
242		280
243	for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above);	281	dirty = true;
244		282
245	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	283	// if packet got too large, send it and begin a new one
246		284	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	{	285	{
277	last = tmp->below; /* assumes double floor mode */	286	pl->ns->send_packet (sl);
278	if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))	287
279	last = last->below;	288	sl.reset ();
		289	sl.printf ("item%d ", pl->ns->itemcmd);
		290	sl << uint32 (0);
		291
		292	dirty = false;
280	}	293	}
281	if (LOOK_OBJ (tmp))	294	}
282	{	295
283	if (++start_look < pl->contr->socket.look_position)	296	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	}	297	{
322	if (got_one)	298	sl << uint32 (0x80000000 \| (start_pos - FLOORBOX_PAGESIZE))
323	Send_With_Handling (&pl->contr->socket, &sl);	299	<< uint32 (0)
		300	<< sint32 (-1)
		301	<< uint32 (need_face_now (pl, FINGER_UP))
		302	<< data8 ("Apply this to see the items higher up")
		303	<< uint16 (0)
		304	<< uint8 (0)
		305	<< uint32 (0);
324		306
325	free (sl.buf);	307	if (pl->ns->itemcmd == 2)
		308	sl << uint16 (0);
		309
		310	dirty = true;
		311	}
		312
		313	if (dirty)
		314	pl->ns->send_packet (sl);
326	}	315	}
327		316
328	/**	317	/**
329	* Sends whole inventory.	318	* Sends whole inventory.
330	*/	319	*/
331	void	320	void
332	esrv_send_inventory (object pl, object op)	321	esrv_send_inventory (object pl, object op)
333	{	322	{
334	object *tmp;	323	if (!pl->contr->ns)//D
		324	return;
		325
335	int got_one = 0;	326	int got_one = 0;
336	SockList sl;
337		327
338	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	328	pl->contr->ns->send_packet_printf ("delinv %d", op->count);
339		329
340	sprintf ((char *) sl.buf, "delinv %d", op->count);	330	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);	331	sl.printf ("item%d ", pl->contr->ns->itemcmd);
345	sl.len = strlen ((char *) sl.buf);
346		332
347	SockList_AddInt (&sl, op->count);	333	sl << uint32 (op->count);
348		334
349	for (tmp = op->inv; tmp; tmp = tmp->below)	335	for (object *tmp = op->inv; tmp; tmp = tmp->below)
350	{	336	{
351	object *head;	337	object *head;
352		338
353	if (tmp->head)	339	if (tmp->head)
354	head = tmp->head;	340	head = tmp->head;
355	else	341	else
356	head = tmp;	342	head = tmp;
357		343
358	if (LOOK_OBJ (head))	344	if (head->client_visible ())
359	{	345	{
360	add_object_to_socklist (&pl->contr->socket, &sl, head);	346	add_object_to_socklist (*pl->contr->ns, sl, head);
361		347
362	got_one++;	348	got_one++;
363		349
364	/* IT is possible for players to accumulate a huge amount of	350	/* IT is possible for players to accumulate a huge amount of
365	* items (especially with some of the bags out there) to	351	* items (especially with some of the bags out there) to
366	* overflow the buffer. IF so, send multiple item commands.	352	* overflow the buffer. IF so, send multiple item commands.
367	*/	353	*/
368	if (sl.len >= (MAXSOCKBUF - MAXITEMLEN))	354	if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
369	{	355	{
370	Send_With_Handling (&pl->contr->socket, &sl);	356	pl->contr->ns->send_packet (sl);
		357
		358	sl.reset ();
371	sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd);	359	sl.printf ("item%d ", pl->contr->ns->itemcmd);
372	sl.len = strlen ((char *) sl.buf);	360	sl << uint32 (op->count);
373	SockList_AddInt (&sl, op->count);
374	got_one = 0;	361	got_one = 0;
375	}	362	}
376	} /* If LOOK_OBJ() */	363	}
377	}	364	}
		365
378	if (got_one)	366	if (got_one)
379	Send_With_Handling (&pl->contr->socket, &sl);	367	pl->contr->ns->send_packet (sl);
380	free (sl.buf);
381	}	368	}
382		369
383	/**	370	/**
384	* Updates object op for player pl.	371	* Updates object op for player pl.
385	*	372	*
386	* flags is a list of values to update	373	* flags is a list of values to update
387	* to the client (as defined in newclient.h - might as well use the	374	* to the client (as defined in newclient.h - might as well use the
388	* same value both places.	375	* same value both places.
389	*/	376	*/
390
391	void	377	void
392	esrv_update_item (int flags, object pl, object op)	378	esrv_update_item (int flags, object pl, object op)
393	{	379	{
394	SockList sl;
395
396	/* If we have a request to send the player item, skip a few checks. */	380	/* If we have a request to send the player item, skip a few checks. */
397	if (op != pl)	381	if (op != pl && !op->client_visible ())
398	{
399	if (!LOOK_OBJ (op))
400	return;	382	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		383
416	strcpy ((char *) sl.buf, "upditem ");	384	client *ns = pl->contr->ns;
417	sl.len = strlen ((char *) sl.buf);	385	if (!ns)
		386	return;
418		387
419	SockList_AddChar (&sl, (char) flags);	388	packet sl ("upditem");
420		389
421	if (op->head)	390	sl << uint8 (flags);
		391
422	op = op->head;	392	op = op->head_ ();
423		393
424	SockList_AddInt (&sl, op->count);	394	sl << uint32 (op->count);
425		395
426	if (flags & UPD_LOCATION)	396	if (flags & UPD_LOCATION)
427	SockList_AddInt (&sl, op->env ? op->env->count : 0);	397	sl << uint32 (op->env ? op->env->count : 0);
428		398
429	if (flags & UPD_FLAGS)	399	if (flags & UPD_FLAGS)
430	SockList_AddInt (&sl, query_flags (op));	400	sl << uint32 (query_flags (op));
431		401
432	if (flags & UPD_WEIGHT)	402	if (flags & UPD_WEIGHT)
433	{	403	{
434	sint32 weight = WEIGHT (op);	404	sint32 weight = op->client_weight ();
435		405
436	SockList_AddInt (&sl, QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);	406	if (op == pl)
437	if (pl == op)
438	{
439	op->contr->last_weight = weight;	407	ns->last_weight = weight;
440	}	408
		409	sl << uint32 (weight);
441	}	410	}
442		411
443	if (flags & UPD_FACE)	412	if (flags & UPD_FACE)
444	{	413	{
445	if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE))	414	ns->send_face (op->face, -50);
446	esrv_send_face (&pl->contr->socket, op->face->number, 0);	415	ns->flush_fx ();
447	SockList_AddInt (&sl, op->face->number);	416	sl << uint32 (op->face);
448	}	417	}
		418
449	if (flags & UPD_NAME)	419	if (flags & UPD_NAME)
450	{	420	{
451	int len;	421	int len;
452	const char *item_p;	422	const char *item_p;
453	char item_n[MAX_BUF];	423	char item_n[MAX_BUF];
…		…
468	}	438	}
469		439
470	strncpy (item_n + len + 1, item_p, 127);	440	strncpy (item_n + len + 1, item_p, 127);
471	item_n[254] = 0;	441	item_n[254] = 0;
472	len += strlen (item_n + 1 + len) + 1;	442	len += strlen (item_n + 1 + len) + 1;
473	SockList_AddChar (&sl, (char) len);	443
474	memcpy (sl.buf + sl.len, item_n, len);	444	sl << data8 (item_n, len);
475	sl.len += len;
476	}	445	}
		446
477	if (flags & UPD_ANIM)	447	if (flags & UPD_ANIM)
478	SockList_AddShort (&sl, op->animation_id);	448	sl << uint16 (op->animation_id);
479		449
480	if (flags & UPD_ANIMSPEED)	450	if (flags & UPD_ANIMSPEED)
481	{	451	{
482	int anim_speed = 0;	452	int anim_speed = 0;
483		453
…		…
485	{	455	{
486	if (op->anim_speed)	456	if (op->anim_speed)
487	anim_speed = op->anim_speed;	457	anim_speed = op->anim_speed;
488	else	458	else
489	{	459	{
490	if (FABS (op->speed) < 0.001)	460	if (fabs (op->speed) < 0.001)
491	anim_speed = 255;	461	anim_speed = 255;
492	else if (FABS (op->speed) >= 1.0)	462	else if (fabs (op->speed) >= 1.0)
493	anim_speed = 1;	463	anim_speed = 1;
494	else	464	else
495	anim_speed = (int) (1.0 / FABS (op->speed));	465	anim_speed = (int) (1.0 / fabs (op->speed));
496	}	466	}
		467
497	if (anim_speed > 255)	468	if (anim_speed > 255)
498	anim_speed = 255;	469	anim_speed = 255;
499	}	470	}
500	SockList_AddChar (&sl, (char) anim_speed);	471
		472	sl << uint8 (anim_speed);
501	}	473	}
		474
502	if (flags & UPD_NROF)	475	if (flags & UPD_NROF)
503	SockList_AddInt (&sl, op->nrof);	476	sl << uint32 (op->nrof);
504		477
505	Send_With_Handling (&pl->contr->socket, &sl);	478	pl->contr->ns->send_packet (sl);
506	free (sl.buf);
507	}	479	}
508		480
509	/**	481	/**
510	* Sends item's info to player.	482	* Sends item's info to player.
511	*/	483	*/
512	void	484	void
513	esrv_send_item (object pl, object op)	485	esrv_send_item (object pl, object op)
514	{	486	{
515	SockList sl;	487	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;	488	return;
523	/* if the item is on the ground, mark that the look needs to	489
524	* be updated.	490	/* We only send 'visible' objects to the client, and sometimes the player */
525	*/	491	if (!op->client_visible () && op->type != PLAYER)
526	if (!op->env)
527	{
528	pl->contr->socket.update_look = 1;
529	return;	492	return;
530	}
531	}
532		493
533	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	494	packet sl;
534		495
535	sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd);	496	sl.printf ("item%d ", pl->contr->ns->itemcmd);
536	sl.len = strlen ((char *) sl.buf);
537		497
538	if (op->head)
539	op = op->head;	498	op = op->head_ ();
540		499
541	SockList_AddInt (&sl, op->env ? op->env->count : 0);	500	sl << uint32 (op->env ? op->env->count : 0);
542		501
543	add_object_to_socklist (&pl->contr->socket, &sl, op);	502	add_object_to_socklist (*pl->contr->ns, sl, op);
544		503
545	Send_With_Handling (&pl->contr->socket, &sl);	504	pl->contr->ns->send_packet (sl);
546	SET_FLAG (op, FLAG_CLIENT_SENT);
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
582	object *	534	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	}
		631
653	player_apply (pl->ob, op, 0, 0);	632	player_apply (pl->ob, op, 0, 0);
654	}	633	}
655		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	CLEAR_FLAG (op, FLAG_INV_LOCKED);
674	else	651	else
675	SET_FLAG (op, FLAG_INV_LOCKED);	652	SET_FLAG (op, 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;
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	mapxy pos (pl->observe);
720	if (!m)	690	pos.move (dx, dy);
		691
		692	if (pos.normalise ())
		693	for (object *tmp = pos->top; tmp; tmp = tmp->below)
		694	{
		695	if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
		696	continue;
		697
		698	if (QUERY_FLAG (ob, FLAG_WIZ))
		699	buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
		700	else
		701	buf.printf (" - %s.\n", query_name (tmp));
		702
		703	object *head = tmp->head_ ();
		704
		705	if (head->inv)
		706	if ((head->type != CONTAINER && head->type != FLESH)
		707	\|\| QUERY_FLAG (ob, FLAG_WIZ))
		708	buf << head->query_inventory (ob, " ");
		709
		710	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
		711	break;
		712	}
		713
		714	if (buf.empty ())
		715	pl->failmsg ("You see nothing there.");
		716	else
		717	pl->infobox (MSG_CHANNEL ("lookat"), buf);
		718	}
		719
		720	/** Client wants to look at some object. Lets do so. */
		721	void
		722	LookAt (char buf, int len, player pl)
		723	{
		724	char *cp;
		725
		726	int dx = atoi (buf);
		727	if (!(cp = strchr (buf, ' ')))
721	return;	728	return;
722		729
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);	730	int dy = atoi (cp);
779		731
780	if (FABS (dx) > pl->socket.mapx / 2 \|\| FABS (dy) > pl->socket.mapy / 2)	732	if (player *opl = pl->observe->contr)
		733	if (client *ns = opl->ns)
		734	{
		735	if (fabs (dx) > ns->mapx / 2 \|\| fabs (dy) > ns->mapy / 2)
781	return;	736	return;
782		737
783	if (pl->blocked_los[dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2])	738	if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
784	return;	739	return;
		740	}
785		741
786	look_at (pl->ob, dx, dy);	742	look_at (pl, dx, dy);
787	}	743	}
788		744
789	/** Move an object to a new location */	745	/** Move an object to a new location */
790	void	746	void
791	esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)	747	esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
792	{	748	{
793	object op, env;
794
795	op = esrv_get_ob_from_count (pl, tag);	749	object *op = esrv_get_ob_from_count (pl, tag);
796	if (!op)	750	if (!op)
797	{	751	{
798	LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);	752	LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
799	return;	753	return;
800	}	754	}
801		755
802	if (!to)	756	if (!to)
803	{ /* drop it to the ground */	757	{ /* drop it to the ground */
804
805	/* LOG(llevDebug, "Drop it on the ground.\n");*/
806
807	if (op->map && !op->env)	758	if (op->map && !op->env)
808	{
809
810	/* LOG(llevDebug,"Dropping object to ground that is already on ground\n");*/
811	return;	759	return;
812	}	760
813	/* If it is an active container, then we should drop all objects	761	/* If it is an active container, then we should drop all objects
814	* in the container and not the container itself.	762	* in the container and not the container itself.
815	*/	763	*/
816	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))	764	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
817	{	765	{
818	object current, next;	766	int cnt = MAX_ITEM_PER_DROP;
819		767
820	for (current = op->inv; current != NULL; current = next)	768	for (object *current = op->inv; current && cnt--; )
821	{	769	{
822	next = current->below;	770	object *next = current->below;
823	drop_object (pl, current, 0);	771	drop_object (pl, current, 0);
		772	current = next;
824	}	773	}
825	esrv_update_item (UPD_WEIGHT, pl, op);	774
		775	if (cnt <= 0)
		776	op->failmsg ("Only dropped some items, can't drop that many items at once.");
826	}	777	}
827	else	778	else
828	{
829	drop_object (pl, op, nrof);	779	drop_object (pl, op, nrof);
830	}	780
831	return;	781	return;
832	}	782	}
833	else if (to == pl->count)	783	else if (to == pl->count)
834	{ /* pick it up to the inventory */	784	{ /* pick it up to the inventory */
835	/* return if player has already picked it up */	785	/* return if player has already picked it up */
…		…
838		788
839	pl->contr->count = nrof;	789	pl->contr->count = nrof;
840	pick_up (pl, op);	790	pick_up (pl, op);
841	return;	791	return;
842	}	792	}
		793
843	env = esrv_get_ob_from_count (pl, to);	794	object *env = esrv_get_ob_from_count (pl, to);
844	if (!env)	795	if (!env)
845	{	796	{
846	LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);	797	LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
847	return;	798	return;
848	}	799	}
		800
849	/* put_object_in_sack presumes that necessary sanity checking	801	/* put_object_in_sack presumes that necessary sanity checking
850	* has already been done (eg, it can be picked up and fits in	802	* 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	803	* 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.	804	* an make sure env is in fact a container for that matter.
853	*/	805	*/
854	if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))	806	if (env->type == CONTAINER
855	{	807	&& can_pick (pl, op)
		808	&& sack_can_hold (pl, env, op, nrof))
856	put_object_in_sack (pl, env, op, nrof);	809	put_object_in_sack (pl, env, op, nrof);
857	}
858	}	810	}
		811

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.72 by root, Tue Oct 28 12:48:23 2008 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.72 by root, Tue Oct 28 12:48:23 2008 UTC