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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.21 by root, Fri Dec 15 00:34:17 2006 UTC vs.
Revision 1.48 by root, Fri Jun 8 09:18:31 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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	* Crossfire TRT is free software; you can redistribute it and/or modify it
8	it under the terms of the GNU General Public License as published by	9	* under the terms of the GNU General Public License as published by the Free
9	the Free Software Foundation; either version 2 of the License, or	10	* Software Foundation; either version 2 of the License, or (at your option)
10	(at your option) any later version.	11	* 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, but
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15	GNU General Public License for more details.	16	* 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 along
18	along with this program; if not, write to the Free Software	19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20		21	*
21	The author can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors 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
		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
44		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		188
51	/**	189	/**
52	* This is a similar to query_name, but returns flags	190	* This is a similar to query_name, but returns flags
53	* to be sended to client.	191	* to be sent to client.
54	*/	192	*/
55	unsigned int	193	unsigned int
56	query_flags (object *op)	194	query_flags (object *op)
57	{	195	{
58	unsigned int flags = 0;	196	unsigned int flags = 0;
59		197
60	if (QUERY_FLAG (op, FLAG_APPLIED))	198	if (QUERY_FLAG (op, FLAG_APPLIED))
61	{	199	{
62	switch (op->type)	200	switch (op->type)
63	{	201	{
64	case BOW:	202	case BOW:
65	case WAND:	203	case WAND:
66	case ROD:	204	case ROD:
67	case HORN:	205	case HORN:
68	flags = a_readied;	206	flags = a_readied;
69	break;	207	break;
70	case WEAPON:	208	case WEAPON:
71	flags = a_wielded;	209	flags = a_wielded;
72	break;	210	break;
73	case SKILL:	211	case SKILL:
74	case ARMOUR:	212	case ARMOUR:
75	case HELMET:	213	case HELMET:
76	case SHIELD:	214	case SHIELD:
77	case RING:	215	case RING:
78	case BOOTS:	216	case BOOTS:
79	case GLOVES:	217	case GLOVES:
80	case AMULET:	218	case AMULET:
81	case GIRDLE:	219	case GIRDLE:
82	case BRACERS:	220	case BRACERS:
83	case CLOAK:	221	case CLOAK:
84	flags = a_worn;	222	flags = a_worn;
85	break;	223	break;
86	case CONTAINER:	224	case CONTAINER:
87	flags = a_active;	225	flags = a_active;
88	break;	226	break;
89	default:	227	default:
90	flags = a_applied;	228	flags = a_applied;
91	break;	229	break;
92	}	230	}
93	}	231	}
		232
94	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))))
95	flags \|= F_OPEN;	234	flags \|= F_OPEN;
96		235
97	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))	236	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
98	{	237	{
99	if (QUERY_FLAG (op, FLAG_DAMNED))	238	if (QUERY_FLAG (op, FLAG_DAMNED))
100	flags \|= F_DAMNED;	239	flags \|= F_DAMNED;
101	else if (QUERY_FLAG (op, FLAG_CURSED))	240	else if (QUERY_FLAG (op, FLAG_CURSED))
102	flags \|= F_CURSED;	241	flags \|= F_CURSED;
103	}	242	}
		243
104	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))
105	flags \|= F_MAGIC;	245	flags \|= F_MAGIC;
106	if (QUERY_FLAG (op, FLAG_UNPAID))	246	if (QUERY_FLAG (op, FLAG_UNPAID))
107	flags \|= F_UNPAID;	247	flags \|= F_UNPAID;
108	if (QUERY_FLAG (op, FLAG_INV_LOCKED))	248	if (QUERY_FLAG (op, FLAG_INV_LOCKED))
114	/* Used in the send_look to put object head into packet	254	/* Used in the send_look to put object head into packet
115	* sl for socket ns. Need socket to know if we need to send	255	* sl for socket ns. Need socket to know if we need to send
116	* animation of face to the client.	256	* animation of face to the client.
117	*/	257	*/
118	static void	258	static void
119	add_object_to_socklist (client_socket &ns, packet &sl, object *head)	259	add_object_to_socklist (client &ns, packet &sl, object *head)
120	{	260	{
121	int flags, len, anim_speed;	261	int flags, len, anim_speed;
122	char item_n[MAX_BUF];	262	char item_n[MAX_BUF];
123	const char *item_p;	263	const char *item_p;
124		264
125	flags = query_flags (head);	265	flags = query_flags (head);
126	if (QUERY_FLAG (head, FLAG_NO_PICK))	266	if (QUERY_FLAG (head, FLAG_NO_PICK))
127	flags \|= F_NOPICK;	267	flags \|= F_NOPICK;
128		268
129	if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE))	269	ns.send_face (head->face);
130	esrv_send_face (&ns, head->face->number, 0);	270	ns.flush_fx ();
131		271
132	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])
133	esrv_send_animation (&ns, head->animation_id);	273	ns.send_animation (head->animation_id);
134		274
135	sl << uint32 (head->count)	275	sl << uint32 (head->count)
136	<< uint32 (flags)	276	<< uint32 (flags)
137	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))	277	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
138	<< uint32 (head->face->number);	278	<< uint32 (head->face);
139		279
140	if (!head->custom_name)	280	if (!head->custom_name)
141	{	281	{
142	strncpy (item_n, query_base_name (head, 0), 127);	282	strncpy (item_n, query_base_name (head, 0), 127);
143	item_n[127] = 0;	283	item_n[127] = 0;
…		…
164	{	304	{
165	if (head->anim_speed)	305	if (head->anim_speed)
166	anim_speed = head->anim_speed;	306	anim_speed = head->anim_speed;
167	else	307	else
168	{	308	{
169	if (FABS (head->speed) < 0.001)	309	if (fabs (head->speed) < 0.001)
170	anim_speed = 255;	310	anim_speed = 255;
171	else if (FABS (head->speed) >= 1.0)	311	else if (fabs (head->speed) >= 1.0)
172	anim_speed = 1;	312	anim_speed = 1;
173	else	313	else
174	anim_speed = (int) (1.0 / FABS (head->speed));	314	anim_speed = (int) (1.0 / fabs (head->speed));
175	}	315	}
176		316
177	if (anim_speed > 255)	317	if (anim_speed > 255)
178	anim_speed = 255;	318	anim_speed = 255;
179	}	319	}
…		…
185	sl << uint16 (head->client_type);	325	sl << uint16 (head->client_type);
186		326
187	SET_FLAG (head, FLAG_CLIENT_SENT);	327	SET_FLAG (head, FLAG_CLIENT_SENT);
188	}	328	}
189		329
190
191	/**	330	/**
192	* Send the look window. Don't need to do animations here	331	* Send the look window. Don't need to do animations here
193	* This sends all the faces to the client, not just updates. This is	332	* This sends all the faces to the client, not just updates. This is
194	* because object ordering would otherwise be inconsistent	333	* because object ordering would otherwise be inconsistent.
195	*/	334	*/
196
197	void	335	void
198	esrv_draw_look (object *pl)	336	esrv_draw_look (player *pl)
199	{	337	{
200	object tmp, last;
201	int got_one = 0, start_look = 0, end_look = 0;	338	int got_one = 0, start_look = 0, end_look = 0;
202	char buf[MAX_BUF];
203		339
		340	object *ob = pl->ob;
		341
204	if (!pl->contr->socket->update_look)	342	if (!pl->ns->update_look)
205	{	343	{
206	LOG (llevDebug, "esrv_draw_look called when update_look was not set\n");	344	LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
207	return;	345	return;
208	}	346	}
209	else	347	else
210	pl->contr->socket->update_look = 0;	348	pl->ns->update_look = 0;
211		349
212	if (QUERY_FLAG (pl, FLAG_REMOVED)	350	if (QUERY_FLAG (ob, FLAG_REMOVED)
213	\|\| !pl->map	351	\|\| !ob->map
214	\|\| pl->map->in_memory != MAP_IN_MEMORY	352	\|\| ob->map->in_memory != MAP_IN_MEMORY
215	\|\| out_of_map (pl->map, pl->x, pl->y))	353	\|\| out_of_map (ob->map, ob->x, ob->y))
216	return;	354	return;
217		355
218	for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)	356	pl->ns->send_packet ("delinv 0");
219	;
220		357
221	packet sl;	358	packet sl;
222
223	pl->contr->socket->send_packet ("delinv 0");
224
225	sl.printf ("item%d ", pl->contr->socket->itemcmd);	359	sl.printf ("item%d ", pl->ns->itemcmd);
226		360
227	sl << uint32 (0);	361	sl << uint32 (0);
228		362
229	if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE))	363	pl->ns->send_face (empty_face);
230	esrv_send_face (pl->contr->socket, empty_face->number, 0);	364	pl->ns->flush_fx ();
231		365
232	if (pl->contr->socket->look_position)	366	if (pl->ns->look_position)
233	{	367	{
234	char buf[80];	368	char buf[80];
235	snprintf (buf, 80, "Apply this to see %d previous items", NUM_LOOK_OBJECTS);	369	snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
236		370
237	sl << uint32 (0x80000000 \| (pl->contr->socket->look_position - NUM_LOOK_OBJECTS))	371	sl << uint32 (0x80000000 \| (pl->ns->look_position - FLOORBOX_PAGESIZE))
238	<< uint32 (0)	372	<< uint32 (0)
239	<< sint32 (-1)	373	<< sint32 (-1)
240	<< uint32 (empty_face->number)	374	<< uint32 (empty_face)
241	<< data8 (buf)	375	<< data8 (buf)
242	<< uint16 (0)	376	<< uint16 (0)
243	<< uint8 (0)	377	<< uint8 (0)
244	<< uint32 (0);	378	<< uint32 (0);
245		379
246	if (pl->contr->socket->itemcmd == 2)	380	if (pl->ns->itemcmd == 2)
247	sl << uint16 (0);	381	sl << uint16 (0);
248	}	382	}
249		383
		384	object *tmp = ob->ms ().top;
250	for (last = NULL; tmp != last; tmp = tmp->below)	385	for (object *last = 0; tmp != last; tmp = tmp->below)
251	{	386	{
252	object *head;	387	object *head;
253		388
254	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)	389	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
255	{	390	{
256	last = tmp->below; /* assumes double floor mode */	391	last = tmp->below; /* assumes double floor mode */
257	if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))	392	if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
258	last = last->below;	393	last = last->below;
259	}	394	}
260		395
261	if (LOOK_OBJ (tmp))	396	if (tmp->client_visible ())
262	{	397	{
263	if (++start_look < pl->contr->socket->look_position)	398	if (++start_look < pl->ns->look_position)
264	continue;	399	continue;
265		400
266	end_look++;	401	end_look++;
267		402
268	if (end_look > NUM_LOOK_OBJECTS)	403	if (end_look > FLOORBOX_PAGESIZE)
269	{	404	{
270	/* What we basically do is make a 'fake' object - when the user applies it,	405	/* What we basically do is make a 'fake' object - when the user applies it,
271	* we notice the special tag the object has, and act accordingly.	406	* we notice the special tag the object has, and act accordingly.
272	*/	407	*/
273	sl << uint32 (0x80000000 \| (pl->contr->socket->look_position + NUM_LOOK_OBJECTS))	408	sl << uint32 (0x80000000 \| (pl->ns->look_position + FLOORBOX_PAGESIZE))
274	<< uint32 (0)	409	<< uint32 (0)
275	<< uint32 ((uint32) - 1)	410	<< uint32 ((uint32) - 1)
276	<< uint32 (empty_face->number)	411	<< uint32 (empty_face)
277	<< data8 ("Apply this to see next group of items")	412	<< data8 ("Apply this to see next group of items")
278	<< uint16 (0)	413	<< uint16 (0)
279	<< uint8 (0)	414	<< uint8 (0)
280	<< uint32 (0);	415	<< uint32 (0);
281		416
282	if (pl->contr->socket->itemcmd == 2)	417	if (pl->ns->itemcmd == 2)
283	sl << uint16 (0);	418	sl << uint16 (0);
284		419
285	break;	420	break;
286	}	421	}
287		422
288	if (tmp->head)	423	if (tmp->head)
289	head = tmp->head;	424	head = tmp->head;
290	else	425	else
291	head = tmp;	426	head = tmp;
292		427
293	add_object_to_socklist (*pl->contr->socket, sl, head);	428	add_object_to_socklist (*pl->ns, sl, head);
294	got_one++;	429	got_one++;
295		430
296	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))	431	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
297	{	432	{
298	pl->contr->socket->send_packet (sl);	433	pl->ns->send_packet (sl);
299		434
300	sl.reset ();	435	sl.reset ();
301	sl.printf ("item%d ", pl->contr->socket->itemcmd);	436	sl.printf ("item%d ", pl->ns->itemcmd);
302	sl << uint32 (0);	437	sl << uint32 (0);
303	got_one = 0;	438	got_one = 0;
304	}	439	}
305	} /* If LOOK_OBJ() */	440	}
306	}	441	}
307		442
308	if (got_one)	443	if (got_one)
309	pl->contr->socket->send_packet (sl);	444	pl->ns->send_packet (sl);
310		445
311	}	446	}
312		447
313	/**	448	/**
314	* Sends whole inventory.	449	* Sends whole inventory.
315	*/	450	*/
316	void	451	void
317	esrv_send_inventory (object pl, object op)	452	esrv_send_inventory (object pl, object op)
318	{	453	{
319	object *tmp;	454	if (!pl->contr->ns)//D
		455	return;
		456
320	int got_one = 0;	457	int got_one = 0;
321		458
		459	pl->contr->ns->send_packet_printf ("delinv %d", op->count);
		460
322	packet sl;	461	packet sl;
323
324	sl.printf ("delinv %d", op->count);
325	pl->contr->socket->send_packet (sl);
326
327	sl.reset ();
328	sl.printf ("item%d ", pl->contr->socket->itemcmd);	462	sl.printf ("item%d ", pl->contr->ns->itemcmd);
329		463
330	sl << uint32 (op->count);	464	sl << uint32 (op->count);
331		465
332	for (tmp = op->inv; tmp; tmp = tmp->below)	466	for (object *tmp = op->inv; tmp; tmp = tmp->below)
333	{	467	{
334	object *head;	468	object *head;
335		469
336	if (tmp->head)	470	if (tmp->head)
337	head = tmp->head;	471	head = tmp->head;
338	else	472	else
339	head = tmp;	473	head = tmp;
340		474
341	if (LOOK_OBJ (head))	475	if (head->client_visible ())
342	{	476	{
343	add_object_to_socklist (*pl->contr->socket, sl, head);	477	add_object_to_socklist (*pl->contr->ns, sl, head);
344		478
345	got_one++;	479	got_one++;
346		480
347	/* IT is possible for players to accumulate a huge amount of	481	/* IT is possible for players to accumulate a huge amount of
348	* items (especially with some of the bags out there) to	482	* items (especially with some of the bags out there) to
349	* overflow the buffer. IF so, send multiple item commands.	483	* overflow the buffer. IF so, send multiple item commands.
350	*/	484	*/
351	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))	485	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
352	{	486	{
353	pl->contr->socket->send_packet (sl);	487	pl->contr->ns->send_packet (sl);
354		488
355	sl.reset ();	489	sl.reset ();
356	sl.printf ("item%d ", pl->contr->socket->itemcmd);	490	sl.printf ("item%d ", pl->contr->ns->itemcmd);
357	sl << uint32 (op->count);	491	sl << uint32 (op->count);
358	got_one = 0;	492	got_one = 0;
359	}	493	}
360	} /* If LOOK_OBJ() */	494	}
361	}	495	}
362		496
363	if (got_one)	497	if (got_one)
364	pl->contr->socket->send_packet (sl);	498	pl->contr->ns->send_packet (sl);
365
366	}	499	}
367		500
368	/**	501	/**
369	* Updates object op for player pl.	502	* Updates object op for player pl.
370	*	503	*
371	* flags is a list of values to update	504	* flags is a list of values to update
372	* to the client (as defined in newclient.h - might as well use the	505	* to the client (as defined in newclient.h - might as well use the
373	* same value both places.	506	* same value both places.
374	*/	507	*/
375
376	void	508	void
377	esrv_update_item (int flags, object pl, object op)	509	esrv_update_item (int flags, object pl, object op)
378	{	510	{
379	/* 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. */
380	if (op != pl)	512	if (op != pl)
381	{	513	{
382	if (!LOOK_OBJ (op))	514	if (!op->client_visible ())
383	return;	515	return;
384	/* 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
385	* is hopefully in the same place, so the client should preserve	517	* is hopefully in the same place, so the client should preserve
386	* order.	518	* order.
387	*/	519	*/
388	}	520	}
389		521
		522	client *ns = pl->contr->ns;
		523	if (!ns)
		524	return;
		525
390	if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))	526	if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
391	{	527	{
392	/* 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
393	* 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
394	* and track back the call.	530	* and track back the call.
395	*/	531	*/
396	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);
397	}	533	}
398		534
399	packet sl;	535	packet sl ("upditem");
400		536
401	sl << "upditem "
402	<< uint8 (flags);	537	sl << uint8 (flags);
403		538
404	if (op->head)	539	if (op->head)
405	op = op->head;	540	op = op->head;
406		541
407	sl << uint32 (op->count);	542	sl << uint32 (op->count);
…		…
417	sint32 weight = WEIGHT (op);	552	sint32 weight = WEIGHT (op);
418		553
419	sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);	554	sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
420		555
421	if (pl == op)	556	if (pl == op)
422	op->contr->last_weight = weight;	557	ns->last_weight = weight;
423	}	558	}
424		559
425	if (flags & UPD_FACE)	560	if (flags & UPD_FACE)
426	{	561	{
427	if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE))	562	ns->send_face (op->face);
428	esrv_send_face (pl->contr->socket, op->face->number, 0);	563	ns->flush_fx ();
429
430	sl << uint32 (op->face->number);	564	sl << uint32 (op->face);
431	}	565	}
432		566
433	if (flags & UPD_NAME)	567	if (flags & UPD_NAME)
434	{	568	{
435	int len;	569	int len;
…		…
469	{	603	{
470	if (op->anim_speed)	604	if (op->anim_speed)
471	anim_speed = op->anim_speed;	605	anim_speed = op->anim_speed;
472	else	606	else
473	{	607	{
474	if (FABS (op->speed) < 0.001)	608	if (fabs (op->speed) < 0.001)
475	anim_speed = 255;	609	anim_speed = 255;
476	else if (FABS (op->speed) >= 1.0)	610	else if (fabs (op->speed) >= 1.0)
477	anim_speed = 1;	611	anim_speed = 1;
478	else	612	else
479	anim_speed = (int) (1.0 / FABS (op->speed));	613	anim_speed = (int) (1.0 / fabs (op->speed));
480	}	614	}
481		615
482	if (anim_speed > 255)	616	if (anim_speed > 255)
483	anim_speed = 255;	617	anim_speed = 255;
484	}	618	}
…		…
487	}	621	}
488		622
489	if (flags & UPD_NROF)	623	if (flags & UPD_NROF)
490	sl << uint32 (op->nrof);	624	sl << uint32 (op->nrof);
491		625
492	pl->contr->socket->send_packet (sl);	626	pl->contr->ns->send_packet (sl);
493	}	627	}
494		628
495	/**	629	/**
496	* Sends item's info to player.	630	* Sends item's info to player.
497	*/	631	*/
498	void	632	void
499	esrv_send_item (object pl, object op)	633	esrv_send_item (object pl, object op)
500	{	634	{
		635	if (!pl->contr->ns)
		636	return;
		637
501	/* If this is not the player object, do some more checks */	638	/* If this is not the player object, do some more checks */
502	if (op != pl)	639	if (op != pl)
503	{	640	{
504	/* We only send 'visibile' objects to the client */	641	/* We only send 'visibile' objects to the client */
505	if (!LOOK_OBJ (op))	642	if (!op->client_visible ())
506	return;	643	return;
		644
507	/* if the item is on the ground, mark that the look needs to	645	/* if the item is on the ground, mark that the look needs to
508	* be updated.	646	* be updated.
509	*/	647	*/
510	if (!op->env)	648	if (!op->env)
511	{	649	{
512	pl->contr->socket->update_look = 1;	650	pl->contr->ns->floorbox_update ();
513	return;	651	return;
514	}	652	}
515	}	653	}
516		654
517	packet sl;	655	packet sl;
518		656
519	sl.printf ("item%d ", pl->contr->socket->itemcmd);	657	sl.printf ("item%d ", pl->contr->ns->itemcmd);
520		658
521	if (op->head)	659	if (op->head)
522	op = op->head;	660	op = op->head;
523		661
524	sl << uint32 (op->env ? op->env->count : 0);	662	sl << uint32 (op->env ? op->env->count : 0);
525		663
526	add_object_to_socklist (*pl->contr->socket, sl, op);	664	add_object_to_socklist (*pl->contr->ns, sl, op);
527		665
528	pl->contr->socket->send_packet (sl);	666	pl->contr->ns->send_packet (sl);
529	SET_FLAG (op, FLAG_CLIENT_SENT);	667	SET_FLAG (op, FLAG_CLIENT_SENT);
530
531	}	668	}
532		669
533	/**	670	/**
534	* Tells the client to delete an item. Uses the item	671	* Tells the client to delete an item. Uses the item
535	* command with a -1 location.	672	* command with a -1 location.
536	*/	673	*/
537
538	void	674	void
539	esrv_del_item (player *pl, int tag)	675	esrv_del_item (player *pl, int tag)
540	{	676	{
541	packet sl;	677	if (!pl->ns)
		678	return;
542		679
543	sl << "delitem "	680	packet sl ("delitem");
		681
544	<< uint32 (tag);	682	sl << uint32 (tag);
545		683
546	pl->socket->send_packet (sl);	684	pl->ns->send_packet (sl);
547	}	685	}
548		686
549		687
550	/*******************************************************************************	688	/*******************************************************************************
551	*	689	*
…		…
555		693
556	/**	694	/**
557	* Takes a player and object count (tag) and returns the actual object	695	* Takes a player and object count (tag) and returns the actual object
558	* pointer, or null if it can't be found.	696	* pointer, or null if it can't be found.
559	*/	697	*/
560
561	object *	698	object *
562	esrv_get_ob_from_count (object *pl, tag_t count)	699	esrv_get_ob_from_count (object *pl, tag_t count)
563	{	700	{
564	object op, tmp;
565
566	if (pl->count == count)	701	if (pl->count == count)
567	return pl;	702	return pl;
568		703
569	for (op = pl->inv; op; op = op->below)	704	for (object *op = pl->inv; op; op = op->below)
570	if (op->count == count)	705	if (op->count == count)
571	return op;	706	return op;
572	else if (op->type == CONTAINER && pl->container == op)	707	else if (op->type == CONTAINER && pl->container == op)
573	for (tmp = op->inv; tmp; tmp = tmp->below)	708	for (object *tmp = op->inv; tmp; tmp = tmp->below)
574	if (tmp->count == count)	709	if (tmp->count == count)
575	return tmp;	710	return tmp;
576		711
577	for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above)	712	for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
578	if (op->head != NULL && op->head->count == count)	713	if (op->head && op->head->count == count)
579	return op;	714	return op;
580	else if (op->count == count)	715	else if (op->count == count)
581	return op;	716	return op;
582	else if (op->type == CONTAINER && pl->container == op)	717	else if (op->type == CONTAINER && pl->container == op)
583	for (tmp = op->inv; tmp; tmp = tmp->below)	718	for (object *tmp = op->inv; tmp; tmp = tmp->below)
584	if (tmp->count == count)	719	if (tmp->count == count)
585	return tmp;	720	return tmp;
586		721
		722	#if 0
		723	/* If the high bit is set, player examined a pseudo object. */
		724	if (count & 0x80000000)
		725	return 0;
		726	#endif
		727
587	return NULL;	728	return 0;
588	}	729	}
589
590		730
591	/** Client wants to examine some object. So lets do so. */	731	/** Client wants to examine some object. So lets do so. */
592	void	732	void
593	ExamineCmd (char buf, int len, player pl)	733	ExamineCmd (char buf, int len, player pl)
594	{	734	{
595	tag_t tag = atoi (buf);	735	tag_t tag = atoi (buf);
596		736
597	/* If the high bit is set, player examined a pseudo object. */
598	if (tag & 0x80000000)
599	return;
600
601	object *op = esrv_get_ob_from_count (pl->ob, tag);	737	object *op = esrv_get_ob_from_count (pl->ob, tag);
602		738
603	if (!op)	739	if (!op)
604	{	740	{
605	LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);	741	LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
…		…
607	}	743	}
608		744
609	examine (pl->ob, op);	745	examine (pl->ob, op);
610	}	746	}
611		747
		748	/** Client wants to examine some object. So lets do so. */
		749	void
		750	ExCmd (char buf, int len, player pl)
		751	{
		752	tag_t tag = atoi (buf);
		753
		754	if (object *op = esrv_get_ob_from_count (pl->ob, tag))
		755	{
		756	std::string s = op->describe (pl->ob);
		757
		758	packet sl ("ex");
		759	sl << ber32 (tag) << s.c_str ();
		760
		761	pl->ns->send_packet (sl);
		762	}
		763	}
		764
612	/** Client wants to apply some object. Lets do so. */	765	/** Client wants to apply some object. Lets do so. */
613	void	766	void
614	ApplyCmd (char buf, int len, player pl)	767	ApplyCmd (char buf, int len, player pl)
615	{	768	{
616	tag_t tag = atoi (buf);	769	tag_t tag = atoi (buf);
617		770
…		…
622	return;	775	return;
623		776
624	/* If the high bit is set, player applied a pseudo object. */	777	/* If the high bit is set, player applied a pseudo object. */
625	if (tag & 0x80000000)	778	if (tag & 0x80000000)
626	{	779	{
627	pl->socket->look_position = tag & 0x7fffffff;	780	pl->ns->look_position = tag & 0x7fffffff;
628	pl->socket->update_look = 1;	781	pl->ns->floorbox_update ();
629	return;	782	return;
630	}	783	}
631		784
632	object *op = esrv_get_ob_from_count (pl->ob, tag);	785	object *op = esrv_get_ob_from_count (pl->ob, tag);
633		786
…		…
638	}	791	}
639		792
640	player_apply (pl->ob, op, 0, 0);	793	player_apply (pl->ob, op, 0, 0);
641	}	794	}
642		795
643	/** Client wants to apply some object. Lets do so. */	796	/** Client wants to lock some object. Lets do so. */
644	void	797	void
645	LockItem (uint8 data, int len, player pl)	798	LockItem (char data, int len, player pl)
646	{	799	{
647	int flag = data[0];	800	int flag = data[0];
648	tag_t tag = net_uint32 (data + 1);	801	tag_t tag = net_uint32 ((uint8 *)data + 1);
649	object *op = esrv_get_ob_from_count (pl->ob, tag);	802	object *op = esrv_get_ob_from_count (pl->ob, tag);
650		803
651	if (!op)	804	if (!op)
652	{	805	{
653	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");	806	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");
…		…
660	SET_FLAG (op, FLAG_INV_LOCKED);	813	SET_FLAG (op, FLAG_INV_LOCKED);
661		814
662	esrv_update_item (UPD_FLAGS, pl->ob, op);	815	esrv_update_item (UPD_FLAGS, pl->ob, op);
663	}	816	}
664		817
665	/** Client wants to apply some object. Lets do so. */	818	/** Client wants to mark some object. Lets do so. */
666	void	819	void
667	MarkItem (uint8 * data, int len, player *pl)	820	MarkItem (char data, int len, player pl)
668	{	821	{
669	tag_t tag = net_uint32 (data);	822	tag_t tag = net_uint32 ((uint8 *)data);
670	object *op = esrv_get_ob_from_count (pl->ob, tag);	823	object *op = esrv_get_ob_from_count (pl->ob, tag);
671		824
672	if (!op)	825	if (!op)
673	{	826	{
674	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");	827	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");
…		…
683	* look_at prints items on the specified square.	836	* look_at prints items on the specified square.
684	*	837	*
685	* [ removed EARTHWALL check and added check for containers inventory.	838	* [ removed EARTHWALL check and added check for containers inventory.
686	* Tero.Haatanen@lut.fi ]	839	* Tero.Haatanen@lut.fi ]
687	*/	840	*/
688	void	841	static void
689	look_at (object *op, int dx, int dy)	842	look_at (player *pl, int dx, int dy)
690	{	843	{
691	object *tmp;	844	object *ob = pl->ob;
		845
		846	maptile *m = pl->observe->map;
		847	sint16 x = pl->observe->x + dx;
		848	sint16 y = pl->observe->y + dy;
		849
		850	if (!xy_normalise (m, x, y))
		851	{
		852	new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
		853	return;
		854	}
		855
692	int flag = 0;	856	int flag = 0;
693	sint16 x, y;
694	maptile *m;
695		857
696	x = op->x + dx;	858	for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below)
697	y = op->y + dy;	859	{
		860	if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
		861	continue;
698		862
699	if (out_of_map (op->map, x, y))	863	if (!flag)
		864	{
		865	if (dx \|\| dy)
		866	new_draw_info (NDI_UNIQUE, 0, ob, "There you see:");
		867	else
		868	new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
		869
		870	flag = 1;
		871	}
		872
		873	if (QUERY_FLAG (ob, FLAG_WIZ))
		874	new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count);
		875	else
		876	new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp));
		877
		878	if (((tmp->inv != NULL \|\| (tmp->head && tmp->head->inv)) &&
		879	(tmp->type != CONTAINER && tmp->type != FLESH)) \|\| QUERY_FLAG (ob, FLAG_WIZ))
		880	inventory (ob, tmp->head == NULL ? tmp : tmp->head);
		881
		882	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
		883	break;
		884	}
		885
		886	if (!flag)
		887	{
		888	if (dx \|\| dy)
		889	new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
		890	else
		891	new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing.");
		892	}
		893	}
		894
		895	/** Client wants to look at some object. Lets do so. */
		896	void
		897	LookAt (char buf, int len, player pl)
		898	{
		899	char *cp;
		900
		901	int dx = atoi (buf);
		902	if (!(cp = strchr (buf, ' ')))
700	return;	903	return;
701		904
702	m = get_map_from_coord (op->map, &x, &y);
703	if (!m)
704	return;
705
706	for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
707
708	for (; tmp != NULL; tmp = tmp->below)
709	{
710	if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
711	continue;
712
713	if (!flag)
714	{
715	if (dx \|\| dy)
716	new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
717	else
718	{
719	clear_win_info (op);
720	new_draw_info (NDI_UNIQUE, 0, op, "You see:");
721	}
722	flag = 1;
723	}
724
725	if (QUERY_FLAG (op, FLAG_WIZ))
726	new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
727	else
728	new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
729
730	if (((tmp->inv != NULL \|\| (tmp->head && tmp->head->inv)) &&
731	(tmp->type != CONTAINER && tmp->type != FLESH)) \|\| QUERY_FLAG (op, FLAG_WIZ))
732	inventory (op, tmp->head == NULL ? tmp : tmp->head);
733
734	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
735	break;
736	}
737
738	if (!flag)
739	{
740	if (dx \|\| dy)
741	new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
742	else
743	new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
744	}
745	}
746
747
748
749	/** Client wants to look at some object. Lets do so. */
750	void
751	LookAt (char buf, int len, player pl)
752	{
753	int dx, dy;
754	char *cp;
755
756	dx = atoi (buf);
757	if (!(cp = strchr (buf, ' ')))
758	{
759	return;
760	}
761	dy = atoi (cp);	905	int dy = atoi (cp);
762		906
763	if (FABS (dx) > pl->socket->mapx / 2 \|\| FABS (dy) > pl->socket->mapy / 2)	907	if (player *opl = pl->observe->contr)
		908	if (client *ns = opl->ns)
		909	{
		910	if (fabs (dx) > ns->mapx / 2 \|\| fabs (dy) > ns->mapy / 2)
764	return;	911	return;
765		912
766	if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2])	913	if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
767	return;	914	return;
		915	}
768		916
769	look_at (pl->ob, dx, dy);	917	look_at (pl, dx, dy);
770	}	918	}
771		919
772	/** Move an object to a new location */	920	/** Move an object to a new location */
773	void	921	void
774	esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)	922	esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
…		…
801	}	949	}
802		950
803	esrv_update_item (UPD_WEIGHT, pl, op);	951	esrv_update_item (UPD_WEIGHT, pl, op);
804	}	952	}
805	else	953	else
806	{
807	drop_object (pl, op, nrof);	954	drop_object (pl, op, nrof);
808	}	955
809	return;	956	return;
810	}	957	}
811	else if (to == pl->count)	958	else if (to == pl->count)
812	{ /* pick it up to the inventory */	959	{ /* pick it up to the inventory */
813	/* return if player has already picked it up */	960	/* return if player has already picked it up */
…		…
830	* has already been done (eg, it can be picked up and fits in	977	* has already been done (eg, it can be picked up and fits in
831	* in a sack, so check for those things. We should also check	978	* in a sack, so check for those things. We should also check
832	* an make sure env is in fact a container for that matter.	979	* an make sure env is in fact a container for that matter.
833	*/	980	*/
834	if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))	981	if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
835	{
836	put_object_in_sack (pl, env, op, nrof);	982	put_object_in_sack (pl, env, op, nrof);
837	}
838	}	983	}
839		984

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.21 by root, Fri Dec 15 00:34:17 2006 UTC vs. Revision 1.48 by root, Fri Jun 8 09:18:31 2007 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.21 by root, Fri Dec 15 00:34:17 2006 UTC vs.
Revision 1.48 by root, Fri Jun 8 09:18:31 2007 UTC