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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.20 by root, Thu Dec 14 20:39:54 2006 UTC vs.
Revision 1.63 by root, Thu Apr 24 00:30:52 2008 UTC

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

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.20 by root, Thu Dec 14 20:39:54 2006 UTC vs. Revision 1.63 by root, Thu Apr 24 00:30:52 2008 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.20 by root, Thu Dec 14 20:39:54 2006 UTC vs.
Revision 1.63 by root, Thu Apr 24 00:30:52 2008 UTC