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

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

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.17 by root, Thu Dec 14 01:59:10 2006 UTC vs. Revision 1.67 by root, Tue May 6 19:47:56 2008 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.17 by root, Thu Dec 14 01:59:10 2006 UTC vs.
Revision 1.67 by root, Tue May 6 19:47:56 2008 UTC