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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.8 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.34 by root, Mon Jan 15 02:39:41 2007 UTC

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

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.8 by root, Sat Sep 16 22:24:13 2006 UTC vs. Revision 1.34 by root, Mon Jan 15 02:39:41 2007 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.8 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.34 by root, Mon Jan 15 02:39:41 2007 UTC