[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.69 by root, Mon Jul 14 23:47:06 2008 UTC

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

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.69 by root, Mon Jul 14 23:47:06 2008 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.69 by root, Mon Jul 14 23:47:06 2008 UTC