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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.18 by root, Thu Dec 14 02:37:37 2006 UTC vs.
Revision 1.51 by root, Tue Jul 24 04:55:35 2007 UTC

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

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.18 by root, Thu Dec 14 02:37:37 2006 UTC vs. Revision 1.51 by root, Tue Jul 24 04:55:35 2007 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.18 by root, Thu Dec 14 02:37:37 2006 UTC vs.
Revision 1.51 by root, Tue Jul 24 04:55:35 2007 UTC