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

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

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.23 by root, Fri Dec 15 19:59:20 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.23 by root, Fri Dec 15 19:59:20 2006 UTC vs.
Revision 1.67 by root, Tue May 6 19:47:56 2008 UTC