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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.10 by root, Wed Sep 27 00:36:09 2006 UTC vs.
Revision 1.42 by root, Wed Mar 14 00:04:59 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	ns.send_face (head->face);
151	esrv_send_face (ns, head->face->number, 0);
152		270
153	if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns->anims_sent[head->animation_id])	271	if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
154	esrv_send_animation (ns, head->animation_id);	272	ns.send_animation (head->animation_id);
155		273
156	SockList_AddInt (sl, head->count);	274	sl << uint32 (head->count)
157	SockList_AddInt (sl, flags);	275	<< uint32 (flags)
158	SockList_AddInt (sl, QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head));	276	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
159	SockList_AddInt (sl, head->face->number);	277	<< uint32 (head->face);
160		278
161	if (!head->custom_name)	279	if (!head->custom_name)
162	{	280	{
163	strncpy (item_n, query_base_name (head, 0), 127);	281	strncpy (item_n, query_base_name (head, 0), 127);
164	item_n[127] = 0;	282	item_n[127] = 0;
170	strncpy (item_n, head->custom_name, 127);	288	strncpy (item_n, head->custom_name, 127);
171	item_n[127] = 0;	289	item_n[127] = 0;
172	len = strlen (item_n);	290	len = strlen (item_n);
173	item_p = head->custom_name;	291	item_p = head->custom_name;
174	}	292	}
		293
175	strncpy (item_n + len + 1, item_p, 127);	294	strncpy (item_n + len + 1, item_p, 127);
176	item_n[254] = 0;	295	item_n[254] = 0;
177	len += strlen (item_n + 1 + len) + 1;	296	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		297
182	SockList_AddShort (sl, head->animation_id);	298	sl << data8 (item_n, len)
		299	<< uint16 (head->animation_id);
		300
183	anim_speed = 0;	301	anim_speed = 0;
184	if (QUERY_FLAG (head, FLAG_ANIMATE))	302	if (QUERY_FLAG (head, FLAG_ANIMATE))
185	{	303	{
186	if (head->anim_speed)	304	if (head->anim_speed)
187	anim_speed = head->anim_speed;	305	anim_speed = head->anim_speed;
188	else	306	else
189	{	307	{
190	if (FABS (head->speed) < 0.001)	308	if (fabs (head->speed) < 0.001)
191	anim_speed = 255;	309	anim_speed = 255;
192	else if (FABS (head->speed) >= 1.0)	310	else if (fabs (head->speed) >= 1.0)
193	anim_speed = 1;	311	anim_speed = 1;
194	else	312	else
195	anim_speed = (int) (1.0 / FABS (head->speed));	313	anim_speed = (int) (1.0 / fabs (head->speed));
196	}	314	}
		315
197	if (anim_speed > 255)	316	if (anim_speed > 255)
198	anim_speed = 255;	317	anim_speed = 255;
199	}	318	}
200	SockList_AddChar (sl, (char) anim_speed);
201	SockList_AddInt (sl, head->nrof);
202		319
		320	sl << uint8 (anim_speed)
		321	<< uint32 (head->nrof);
		322
203	if (ns->itemcmd == 2)	323	if (ns.itemcmd == 2)
204	SockList_AddShort (sl, head->client_type);	324	sl << uint16 (head->client_type);
205		325
206	SET_FLAG (head, FLAG_CLIENT_SENT);	326	SET_FLAG (head, FLAG_CLIENT_SENT);
207	}	327	}
208		328
209
210	/**	329	/**
211	* Send the look window. Don't need to do animations here	330	* 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	331	* This sends all the faces to the client, not just updates. This is
213	* because object ordering would otherwise be inconsistent	332	* because object ordering would otherwise be inconsistent.
214	*/	333	*/
215
216	void	334	void
217	esrv_draw_look (object *pl)	335	esrv_draw_look (object *pl)
218	{	336	{
219	object tmp, last;
220	int got_one = 0, start_look = 0, end_look = 0;	337	int got_one = 0, start_look = 0, end_look = 0;
221	SockList sl;
222	char buf[MAX_BUF];
223		338
224	if (!pl->contr->socket.update_look)	339	if (!pl->contr->ns->update_look)
225	{	340	{
226	LOG (llevDebug, "esrv_draw_look called when update_look was not set\n");	341	LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name);
227	return;	342	return;
228	}	343	}
229	else	344	else
230	{
231	pl->contr->socket.update_look = 0;	345	pl->contr->ns->update_look = 0;
232	}
233		346
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))	347	if (QUERY_FLAG (pl, FLAG_REMOVED)
		348	\|\| !pl->map
		349	\|\| pl->map->in_memory != MAP_IN_MEMORY
		350	\|\| out_of_map (pl->map, pl->x, pl->y))
235	return;	351	return;
236		352
237	for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above);	353	pl->contr->ns->send_packet ("delinv 0");
238		354
239	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	355	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);	356	sl.printf ("item%d ", pl->contr->ns->itemcmd);
243	sl.len = strlen ((char *) sl.buf);
244		357
245	SockList_AddInt (&sl, 0);	358	sl << uint32 (0);
246		359
247	if (!(pl->contr->socket.faces_sent[empty_face->number] & NS_FACESENT_FACE))	360	pl->contr->ns->send_face (empty_face);
248	esrv_send_face (&pl->contr->socket, empty_face->number, 0);
249		361
250	if (pl->contr->socket.look_position)	362	if (pl->contr->ns->look_position)
251	{	363	{
252	SockList_AddInt (&sl, 0x80000000 \| (pl->contr->socket.look_position - NUM_LOOK_OBJECTS));	364	char buf[80];
253	SockList_AddInt (&sl, 0);	365	snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
254	SockList_AddInt (&sl, (uint32) - 1);	366
255	SockList_AddInt (&sl, empty_face->number);	367	sl << uint32 (0x80000000 \| (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
256	sprintf (buf, "Click here to see %d previous items", NUM_LOOK_OBJECTS);	368	<< uint32 (0)
257	add_stringlen_to_sockbuf (buf, &sl);	369	<< sint32 (-1)
258	SockList_AddShort (&sl, 0);	370	<< uint32 (empty_face)
259	SockList_AddChar (&sl, 0);	371	<< data8 (buf)
260	SockList_AddInt (&sl, 0);	372	<< uint16 (0)
		373	<< uint8 (0)
		374	<< uint32 (0);
		375
261	if (pl->contr->socket.itemcmd == 2)	376	if (pl->contr->ns->itemcmd == 2)
262	SockList_AddShort (&sl, 0);	377	sl << uint16 (0);
263	}	378	}
264		379
		380	object *tmp = pl->ms ().top;
265	for (last = NULL; tmp != last; tmp = tmp->below)	381	for (object *last = 0; tmp != last; tmp = tmp->below)
266	{	382	{
267	object *head;	383	object *head;
268		384
269	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)	385	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
270	{	386	{
271	last = tmp->below; /* assumes double floor mode */	387	last = tmp->below; /* assumes double floor mode */
272	if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))	388	if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
273	last = last->below;	389	last = last->below;
274	}	390	}
275	if (LOOK_OBJ (tmp))	391
		392	if (tmp->client_visible ())
276	{	393	{
277	if (++start_look < pl->contr->socket.look_position)	394	if (++start_look < pl->contr->ns->look_position)
278	continue;	395	continue;
		396
279	end_look++;	397	end_look++;
		398
280	if (end_look > NUM_LOOK_OBJECTS)	399	if (end_look > FLOORBOX_PAGESIZE)
281	{	400	{
282	/* What we basically do is make a 'fake' object - when the user applies it,	401	/* 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.	402	* we notice the special tag the object has, and act accordingly.
284	*/	403	*/
285	SockList_AddInt (&sl, 0x80000000 \| (pl->contr->socket.look_position + NUM_LOOK_OBJECTS));	404	sl << uint32 (0x80000000 \| (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
286	SockList_AddInt (&sl, 0);	405	<< uint32 (0)
287	SockList_AddInt (&sl, (uint32) - 1);	406	<< uint32 ((uint32) - 1)
288	SockList_AddInt (&sl, empty_face->number);	407	<< uint32 (empty_face)
289	sprintf (buf, "Click here to see next group of items");	408	<< data8 ("Apply this to see next group of items")
290	add_stringlen_to_sockbuf (buf, &sl);	409	<< uint16 (0)
291	SockList_AddShort (&sl, 0);	410	<< uint8 (0)
292	SockList_AddChar (&sl, 0);	411	<< uint32 (0);
293	SockList_AddInt (&sl, 0);	412
294	if (pl->contr->socket.itemcmd == 2)	413	if (pl->contr->ns->itemcmd == 2)
295	SockList_AddShort (&sl, 0);	414	sl << uint16 (0);
		415
296	break;	416	break;
297	}	417	}
		418
298	if (tmp->head)	419	if (tmp->head)
299	head = tmp->head;	420	head = tmp->head;
300	else	421	else
301	head = tmp;	422	head = tmp;
302		423
303	add_object_to_socklist (&pl->contr->socket, &sl, head);	424	add_object_to_socklist (*pl->contr->ns, sl, head);
304	got_one++;	425	got_one++;
305		426
306	if (sl.len >= (MAXSOCKBUF - MAXITEMLEN))	427	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
307	{	428	{
308	Send_With_Handling (&pl->contr->socket, &sl);	429	pl->contr->ns->send_packet (sl);
		430
		431	sl.reset ();
309	sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd);	432	sl.printf ("item%d ", pl->contr->ns->itemcmd);
310	sl.len = strlen ((char *) sl.buf);	433	sl << uint32 (0);
311	SockList_AddInt (&sl, 0);
312	got_one = 0;	434	got_one = 0;
313	}	435	}
314	} /* If LOOK_OBJ() */	436	}
315	}	437	}
		438
316	if (got_one)	439	if (got_one)
317	Send_With_Handling (&pl->contr->socket, &sl);	440	pl->contr->ns->send_packet (sl);
318		441
319	free (sl.buf);
320	}	442	}
321		443
322	/**	444	/**
323	* Sends whole inventory.	445	* Sends whole inventory.
324	*/	446	*/
325	void	447	void
326	esrv_send_inventory (object pl, object op)	448	esrv_send_inventory (object pl, object op)
327	{	449	{
328	object *tmp;	450	if (!pl->contr->ns)//D
		451	return;
		452
329	int got_one = 0;	453	int got_one = 0;
330	SockList sl;
331		454
332	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	455	pl->contr->ns->send_packet_printf ("delinv %d", op->count);
333		456
334	sprintf ((char *) sl.buf, "delinv %d", op->count);	457	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);	458	sl.printf ("item%d ", pl->contr->ns->itemcmd);
339	sl.len = strlen ((char *) sl.buf);
340		459
341	SockList_AddInt (&sl, op->count);	460	sl << uint32 (op->count);
342		461
343	for (tmp = op->inv; tmp; tmp = tmp->below)	462	for (object *tmp = op->inv; tmp; tmp = tmp->below)
344	{	463	{
345	object *head;	464	object *head;
346		465
347	if (tmp->head)	466	if (tmp->head)
348	head = tmp->head;	467	head = tmp->head;
349	else	468	else
350	head = tmp;	469	head = tmp;
351		470
352	if (LOOK_OBJ (head))	471	if (head->client_visible ())
353	{	472	{
354	add_object_to_socklist (&pl->contr->socket, &sl, head);	473	add_object_to_socklist (*pl->contr->ns, sl, head);
355		474
356	got_one++;	475	got_one++;
357		476
358	/* IT is possible for players to accumulate a huge amount of	477	/* IT is possible for players to accumulate a huge amount of
359	* items (especially with some of the bags out there) to	478	* items (especially with some of the bags out there) to
360	* overflow the buffer. IF so, send multiple item commands.	479	* overflow the buffer. IF so, send multiple item commands.
361	*/	480	*/
362	if (sl.len >= (MAXSOCKBUF - MAXITEMLEN))	481	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
363	{	482	{
364	Send_With_Handling (&pl->contr->socket, &sl);	483	pl->contr->ns->send_packet (sl);
		484
		485	sl.reset ();
365	sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd);	486	sl.printf ("item%d ", pl->contr->ns->itemcmd);
366	sl.len = strlen ((char *) sl.buf);	487	sl << uint32 (op->count);
367	SockList_AddInt (&sl, op->count);
368	got_one = 0;	488	got_one = 0;
369	}	489	}
370	} /* If LOOK_OBJ() */	490	}
371	}	491	}
		492
372	if (got_one)	493	if (got_one)
373	Send_With_Handling (&pl->contr->socket, &sl);	494	pl->contr->ns->send_packet (sl);
374	free (sl.buf);
375	}	495	}
376		496
377	/**	497	/**
378	* Updates object op for player pl.	498	* Updates object op for player pl.
379	*	499	*
380	* flags is a list of values to update	500	* flags is a list of values to update
381	* to the client (as defined in newclient.h - might as well use the	501	* to the client (as defined in newclient.h - might as well use the
382	* same value both places.	502	* same value both places.
383	*/	503	*/
384
385	void	504	void
386	esrv_update_item (int flags, object pl, object op)	505	esrv_update_item (int flags, object pl, object op)
387	{	506	{
388	SockList sl;
389
390	/* If we have a request to send the player item, skip a few checks. */	507	/* If we have a request to send the player item, skip a few checks. */
391	if (op != pl)	508	if (op != pl)
392	{	509	{
393	if (!LOOK_OBJ (op))	510	if (!op->client_visible ())
394	return;	511	return;
395	/* we remove the check for op->env, because in theory, the object	512	/* we remove the check for op->env, because in theory, the object
396	* is hopefully in the same place, so the client should preserve	513	* is hopefully in the same place, so the client should preserve
397	* order.	514	* order.
398	*/	515	*/
399	}	516	}
		517
		518	client *ns = pl->contr->ns;
		519	if (!ns)
		520	return;
		521
400	if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))	522	if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
401	{	523	{
402	/* FLAG_CLIENT_SENT is debug only. We are using it to see where	524	/* 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	525	* this is happening - we can set a breakpoint here in the debugger
404	* and track back the call.	526	* and track back the call.
405	*/	527	*/
406	LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);	528	LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
407	}	529	}
408	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
409		530
410	strcpy ((char *) sl.buf, "upditem ");	531	packet sl ("upditem");
411	sl.len = strlen ((char *) sl.buf);
412		532
413	SockList_AddChar (&sl, (char) flags);	533	sl << uint8 (flags);
414		534
415	if (op->head)	535	if (op->head)
416	op = op->head;	536	op = op->head;
417		537
418	SockList_AddInt (&sl, op->count);	538	sl << uint32 (op->count);
419		539
420	if (flags & UPD_LOCATION)	540	if (flags & UPD_LOCATION)
421	SockList_AddInt (&sl, op->env ? op->env->count : 0);	541	sl << uint32 (op->env ? op->env->count : 0);
422		542
423	if (flags & UPD_FLAGS)	543	if (flags & UPD_FLAGS)
424	SockList_AddInt (&sl, query_flags (op));	544	sl << uint32 (query_flags (op));
425		545
426	if (flags & UPD_WEIGHT)	546	if (flags & UPD_WEIGHT)
427	{	547	{
428	sint32 weight = WEIGHT (op);	548	sint32 weight = WEIGHT (op);
429		549
430	SockList_AddInt (&sl, QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);	550	sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
		551
431	if (pl == op)	552	if (pl == op)
432	{
433	op->contr->last_weight = weight;	553	ns->last_weight = weight;
434	}
435	}	554	}
436		555
437	if (flags & UPD_FACE)	556	if (flags & UPD_FACE)
438	{	557	{
439	if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE))	558	ns->send_face (op->face);
440	esrv_send_face (&pl->contr->socket, op->face->number, 0);	559	sl << uint32 (op->face);
441	SockList_AddInt (&sl, op->face->number);
442	}	560	}
		561
443	if (flags & UPD_NAME)	562	if (flags & UPD_NAME)
444	{	563	{
445	int len;	564	int len;
446	const char *item_p;	565	const char *item_p;
447	char item_n[MAX_BUF];	566	char item_n[MAX_BUF];
…		…
462	}	581	}
463		582
464	strncpy (item_n + len + 1, item_p, 127);	583	strncpy (item_n + len + 1, item_p, 127);
465	item_n[254] = 0;	584	item_n[254] = 0;
466	len += strlen (item_n + 1 + len) + 1;	585	len += strlen (item_n + 1 + len) + 1;
467	SockList_AddChar (&sl, (char) len);	586
468	memcpy (sl.buf + sl.len, item_n, len);	587	sl << data8 (item_n, len);
469	sl.len += len;
470	}	588	}
		589
471	if (flags & UPD_ANIM)	590	if (flags & UPD_ANIM)
472	SockList_AddShort (&sl, op->animation_id);	591	sl << uint16 (op->animation_id);
473		592
474	if (flags & UPD_ANIMSPEED)	593	if (flags & UPD_ANIMSPEED)
475	{	594	{
476	int anim_speed = 0;	595	int anim_speed = 0;
477		596
…		…
479	{	598	{
480	if (op->anim_speed)	599	if (op->anim_speed)
481	anim_speed = op->anim_speed;	600	anim_speed = op->anim_speed;
482	else	601	else
483	{	602	{
484	if (FABS (op->speed) < 0.001)	603	if (fabs (op->speed) < 0.001)
485	anim_speed = 255;	604	anim_speed = 255;
486	else if (FABS (op->speed) >= 1.0)	605	else if (fabs (op->speed) >= 1.0)
487	anim_speed = 1;	606	anim_speed = 1;
488	else	607	else
489	anim_speed = (int) (1.0 / FABS (op->speed));	608	anim_speed = (int) (1.0 / fabs (op->speed));
490	}	609	}
		610
491	if (anim_speed > 255)	611	if (anim_speed > 255)
492	anim_speed = 255;	612	anim_speed = 255;
493	}	613	}
494	SockList_AddChar (&sl, (char) anim_speed);	614
		615	sl << uint8 (anim_speed);
495	}	616	}
		617
496	if (flags & UPD_NROF)	618	if (flags & UPD_NROF)
497	SockList_AddInt (&sl, op->nrof);	619	sl << uint32 (op->nrof);
498		620
499	Send_With_Handling (&pl->contr->socket, &sl);	621	pl->contr->ns->send_packet (sl);
500	free (sl.buf);
501	}	622	}
502		623
503	/**	624	/**
504	* Sends item's info to player.	625	* Sends item's info to player.
505	*/	626	*/
506	void	627	void
507	esrv_send_item (object pl, object op)	628	esrv_send_item (object pl, object op)
508	{	629	{
509	SockList sl;	630	if (!pl->contr->ns)
		631	return;
510		632
511	/* If this is not the player object, do some more checks */	633	/* If this is not the player object, do some more checks */
512	if (op != pl)	634	if (op != pl)
513	{	635	{
514	/* We only send 'visibile' objects to the client */	636	/* We only send 'visibile' objects to the client */
515	if (!LOOK_OBJ (op))	637	if (!op->client_visible ())
516	return;	638	return;
		639
517	/* if the item is on the ground, mark that the look needs to	640	/* if the item is on the ground, mark that the look needs to
518	* be updated.	641	* be updated.
519	*/	642	*/
520	if (!op->env)	643	if (!op->env)
521	{	644	{
522	pl->contr->socket.update_look = 1;	645	pl->contr->ns->floorbox_update ();
523	return;	646	return;
524	}	647	}
525	}	648	}
526		649
527	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	650	packet sl;
528		651
529	sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd);	652	sl.printf ("item%d ", pl->contr->ns->itemcmd);
530	sl.len = strlen ((char *) sl.buf);
531		653
532	if (op->head)	654	if (op->head)
533	op = op->head;	655	op = op->head;
534		656
535	SockList_AddInt (&sl, op->env ? op->env->count : 0);	657	sl << uint32 (op->env ? op->env->count : 0);
536		658
537	add_object_to_socklist (&pl->contr->socket, &sl, op);	659	add_object_to_socklist (*pl->contr->ns, sl, op);
538		660
539	Send_With_Handling (&pl->contr->socket, &sl);	661	pl->contr->ns->send_packet (sl);
540	SET_FLAG (op, FLAG_CLIENT_SENT);	662	SET_FLAG (op, FLAG_CLIENT_SENT);
541	free (sl.buf);
542	}	663	}
543		664
544	/**	665	/**
545	* Tells the client to delete an item. Uses the item	666	* Tells the client to delete an item. Uses the item
546	* command with a -1 location.	667	* command with a -1 location.
547	*/	668	*/
548
549	void	669	void
550	esrv_del_item (player *pl, int tag)	670	esrv_del_item (player *pl, int tag)
551	{	671	{
552	SockList sl;	672	if (!pl->ns)
		673	return;
553		674
554	sl.buf = (unsigned char *) malloc (MAXSOCKBUF);	675	packet sl ("delitem");
555		676
556	strcpy ((char *) sl.buf, "delitem ");	677	sl << uint32 (tag);
557	sl.len = strlen ((char *) sl.buf);
558	SockList_AddInt (&sl, tag);
559		678
560	Send_With_Handling (&pl->socket, &sl);	679	pl->ns->send_packet (sl);
561	free (sl.buf);
562	}	680	}
563		681
564		682
565	/*******************************************************************************	683	/*******************************************************************************
566	*	684	*
…		…
587	else if (op->type == CONTAINER && pl->container == op)	705	else if (op->type == CONTAINER && pl->container == op)
588	for (tmp = op->inv; tmp; tmp = tmp->below)	706	for (tmp = op->inv; tmp; tmp = tmp->below)
589	if (tmp->count == count)	707	if (tmp->count == count)
590	return tmp;	708	return tmp;
591		709
592	for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above)	710	for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
593	if (op->head != NULL && op->head->count == count)	711	if (op->head && op->head->count == count)
594	return op;	712	return op;
595	else if (op->count == count)	713	else if (op->count == count)
596	return op;	714	return op;
597	else if (op->type == CONTAINER && pl->container == op)	715	else if (op->type == CONTAINER && pl->container == op)
598	for (tmp = op->inv; tmp; tmp = tmp->below)	716	for (tmp = op->inv; tmp; tmp = tmp->below)
599	if (tmp->count == count)	717	if (tmp->count == count)
600	return tmp;	718	return tmp;
601		719
602	return NULL;	720	return 0;
603	}	721	}
604		722
605		723
606	/** Client wants to examine some object. So lets do so. */	724	/** Client wants to examine some object. So lets do so. */
607	void	725	void
…		…
622	}	740	}
623		741
624	examine (pl->ob, op);	742	examine (pl->ob, op);
625	}	743	}
626		744
627	/** Client wants to apply some object. Lets do so. */	745	/** Client wants to apply some object. Lets do so. */
628	void	746	void
629	ApplyCmd (char buf, int len, player pl)	747	ApplyCmd (char buf, int len, player pl)
630	{	748	{
631	tag_t tag = atoi (buf);	749	tag_t tag = atoi (buf);
632		750
…		…
637	return;	755	return;
638		756
639	/* If the high bit is set, player applied a pseudo object. */	757	/* If the high bit is set, player applied a pseudo object. */
640	if (tag & 0x80000000)	758	if (tag & 0x80000000)
641	{	759	{
642	pl->socket.look_position = tag & 0x7fffffff;	760	pl->ns->look_position = tag & 0x7fffffff;
643	pl->socket.update_look = 1;	761	pl->ns->floorbox_update ();
644	return;	762	return;
645	}	763	}
646		764
647	object *op = esrv_get_ob_from_count (pl->ob, tag);	765	object *op = esrv_get_ob_from_count (pl->ob, tag);
648		766
…		…
653	}	771	}
654		772
655	player_apply (pl->ob, op, 0, 0);	773	player_apply (pl->ob, op, 0, 0);
656	}	774	}
657		775
658	/** Client wants to apply some object. Lets do so. */	776	/** Client wants to lock some object. Lets do so. */
659	void	777	void
660	LockItem (uint8 * data, int len, player *pl)	778	LockItem (char data, int len, player pl)
661	{	779	{
662	int flag, tag;
663	object *op;
664
665	flag = data[0];	780	int flag = data[0];
666	tag = GetInt_String (data + 1);	781	tag_t tag = net_uint32 ((uint8 *)data + 1);
667	op = esrv_get_ob_from_count (pl->ob, tag);	782	object *op = esrv_get_ob_from_count (pl->ob, tag);
668		783
669	if (!op)	784	if (!op)
670	{	785	{
671	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");	786	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");
672	return;	787	return;
673	}	788	}
		789
674	if (!flag)	790	if (!flag)
675	CLEAR_FLAG (op, FLAG_INV_LOCKED);	791	CLEAR_FLAG (op, FLAG_INV_LOCKED);
676	else	792	else
677	SET_FLAG (op, FLAG_INV_LOCKED);	793	SET_FLAG (op, FLAG_INV_LOCKED);
		794
678	esrv_update_item (UPD_FLAGS, pl->ob, op);	795	esrv_update_item (UPD_FLAGS, pl->ob, op);
679	}	796	}
680		797
681	/** Client wants to apply some object. Lets do so. */	798	/** Client wants to mark some object. Lets do so. */
682	void	799	void
683	MarkItem (uint8 * data, int len, player *pl)	800	MarkItem (char data, int len, player pl)
684	{	801	{
685	int tag;	802	tag_t tag = net_uint32 ((uint8 *)data);
686	object *op;
687
688	tag = GetInt_String (data);
689	op = esrv_get_ob_from_count (pl->ob, tag);	803	object *op = esrv_get_ob_from_count (pl->ob, tag);
690		804
691	if (!op)	805	if (!op)
692	{	806	{
693	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");	807	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");
694	return;	808	return;
695	}	809	}
696		810
697	pl->mark = op;	811	pl->mark = op;
698	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op));	812	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op));
699	}	813	}
700
701		814
702	/**	815	/**
703	* look_at prints items on the specified square.	816	* look_at prints items on the specified square.
704	*	817	*
705	* [ removed EARTHWALL check and added check for containers inventory.	818	* [ removed EARTHWALL check and added check for containers inventory.
…		…
721		834
722	m = get_map_from_coord (op->map, &x, &y);	835	m = get_map_from_coord (op->map, &x, &y);
723	if (!m)	836	if (!m)
724	return;	837	return;
725		838
726	for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);	839	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
727		840
728	for (; tmp != NULL; tmp = tmp->below)	841	for (; tmp != NULL; tmp = tmp->below)
729	{	842	{
730	if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))	843	if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
731	continue;	844	continue;
…		…
762	else	875	else
763	new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");	876	new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
764	}	877	}
765	}	878	}
766		879
767
768
769	/** Client wants to look at some object. Lets do so. */	880	/** Client wants to look at some object. Lets do so. */
770	void	881	void
771	LookAt (char buf, int len, player pl)	882	LookAt (char buf, int len, player pl)
772	{	883	{
773	int dx, dy;	884	int dx, dy;
…		…
778	{	889	{
779	return;	890	return;
780	}	891	}
781	dy = atoi (cp);	892	dy = atoi (cp);
782		893
783	if (FABS (dx) > pl->socket.mapx / 2 \|\| FABS (dy) > pl->socket.mapy / 2)	894	if (fabs (dx) > pl->ns->mapx / 2 \|\| fabs (dy) > pl->ns->mapy / 2)
784	return;	895	return;
785		896
786	if (pl->blocked_los[dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2])	897	if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
787	return;	898	return;
788		899
789	look_at (pl->ob, dx, dy);	900	look_at (pl->ob, dx, dy);
790	}	901	}
791		902
…		…
802	return;	913	return;
803	}	914	}
804		915
805	if (!to)	916	if (!to)
806	{ /* drop it to the ground */	917	{ /* drop it to the ground */
807
808	/* LOG(llevDebug, "Drop it on the ground.\n");*/
809
810	if (op->map && !op->env)	918	if (op->map && !op->env)
811	{
812
813	/* LOG(llevDebug,"Dropping object to ground that is already on ground\n");*/
814	return;	919	return;
815	}	920
816	/* If it is an active container, then we should drop all objects	921	/* If it is an active container, then we should drop all objects
817	* in the container and not the container itself.	922	* in the container and not the container itself.
818	*/	923	*/
819	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))	924	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
820	{	925	{
…		…
823	for (current = op->inv; current != NULL; current = next)	928	for (current = op->inv; current != NULL; current = next)
824	{	929	{
825	next = current->below;	930	next = current->below;
826	drop_object (pl, current, 0);	931	drop_object (pl, current, 0);
827	}	932	}
		933
828	esrv_update_item (UPD_WEIGHT, pl, op);	934	esrv_update_item (UPD_WEIGHT, pl, op);
829	}	935	}
830	else	936	else
831	{
832	drop_object (pl, op, nrof);	937	drop_object (pl, op, nrof);
833	}	938
834	return;	939	return;
835	}	940	}
836	else if (to == pl->count)	941	else if (to == pl->count)
837	{ /* pick it up to the inventory */	942	{ /* pick it up to the inventory */
838	/* return if player has already picked it up */	943	/* return if player has already picked it up */
…		…
841		946
842	pl->contr->count = nrof;	947	pl->contr->count = nrof;
843	pick_up (pl, op);	948	pick_up (pl, op);
844	return;	949	return;
845	}	950	}
		951
846	env = esrv_get_ob_from_count (pl, to);	952	env = esrv_get_ob_from_count (pl, to);
847	if (!env)	953	if (!env)
848	{	954	{
849	LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);	955	LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
850	return;	956	return;
851	}	957	}
		958
852	/* put_object_in_sack presumes that necessary sanity checking	959	/* put_object_in_sack presumes that necessary sanity checking
853	* has already been done (eg, it can be picked up and fits in	960	* has already been done (eg, it can be picked up and fits in
854	* in a sack, so check for those things. We should also check	961	* in a sack, so check for those things. We should also check
855	* an make sure env is in fact a container for that matter.	962	* an make sure env is in fact a container for that matter.
856	*/	963	*/
857	if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))	964	if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
858	{
859	put_object_in_sack (pl, env, op, nrof);	965	put_object_in_sack (pl, env, op, nrof);
860	}
861	}	966	}
		967

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.10 by root, Wed Sep 27 00:36:09 2006 UTC vs. Revision 1.42 by root, Wed Mar 14 00:04:59 2007 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.10 by root, Wed Sep 27 00:36:09 2006 UTC vs.
Revision 1.42 by root, Wed Mar 14 00:04:59 2007 UTC