[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.71 by root, Mon Sep 8 11:27:25 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
44		41
48	*	45	*
49	******************************************************************************/	46	******************************************************************************/
50		47
51	/**	48	/**
52	* This is a similar to query_name, but returns flags	49	* This is a similar to query_name, but returns flags
53	* to be sended to client.	50	* to be sent to client.
54	*/	51	*/
55	unsigned int	52	unsigned int
56	query_flags (object *op)	53	query_flags (object *op)
57	{	54	{
58	unsigned int flags = 0;	55	unsigned int flags = 0;
59		56
60	if (QUERY_FLAG (op, FLAG_APPLIED))	57	if (QUERY_FLAG (op, FLAG_APPLIED))
61	{
62	switch (op->type)	58	switch (op->type)
63	{	59	{
64	case BOW:	60	case BOW:
65	case WAND:	61	case WAND:
66	case ROD:	62	case ROD:
67	case HORN:	63	case HORN:
68	flags = a_readied;	64	flags = a_readied;
69	break;	65	break;
70	case WEAPON:	66	case WEAPON:
71	flags = a_wielded;	67	flags = a_wielded;
72	break;	68	break;
73	case SKILL:	69	case SKILL:
74	case ARMOUR:	70	case ARMOUR:
75	case HELMET:	71	case HELMET:
76	case SHIELD:	72	case SHIELD:
77	case RING:	73	case RING:
78	case BOOTS:	74	case BOOTS:
79	case GLOVES:	75	case GLOVES:
80	case AMULET:	76	case AMULET:
81	case GIRDLE:	77	case GIRDLE:
82	case BRACERS:	78	case BRACERS:
83	case CLOAK:	79	case CLOAK:
84	flags = a_worn;	80	flags = a_worn;
85	break;	81	break;
86	case CONTAINER:	82	case CONTAINER:
87	flags = a_active;	83	flags = a_active;
88	break;	84	break;
89	default:	85	default:
90	flags = a_applied;	86	flags = a_applied;
91	break;	87	break;
92	}	88	}
93	}	89
94	if (op->type == CONTAINER && ((op->env && op->env->container == op) \|\| (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))	90	if (op->type == CONTAINER && ((op->env && op->env->container == op) \|\| (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
95	flags \|= F_OPEN;	91	flags \|= F_OPEN;
96		92
97	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))	93	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
98	{	94	{
99	if (QUERY_FLAG (op, FLAG_DAMNED))	95	if (QUERY_FLAG (op, FLAG_DAMNED))
100	flags \|= F_DAMNED;	96	flags \|= F_DAMNED;
101	else if (QUERY_FLAG (op, FLAG_CURSED))	97	else if (QUERY_FLAG (op, FLAG_CURSED))
102	flags \|= F_CURSED;	98	flags \|= F_CURSED;
103	}	99	}
		100
104	if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))	101	if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
105	flags \|= F_MAGIC;	102	flags \|= F_MAGIC;
106	if (QUERY_FLAG (op, FLAG_UNPAID))	103	if (QUERY_FLAG (op, FLAG_UNPAID))
107	flags \|= F_UNPAID;	104	flags \|= F_UNPAID;
108	if (QUERY_FLAG (op, FLAG_INV_LOCKED))	105	if (QUERY_FLAG (op, FLAG_INV_LOCKED))
…		…
114	/* Used in the send_look to put object head into packet	111	/* 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	112	* sl for socket ns. Need socket to know if we need to send
116	* animation of face to the client.	113	* animation of face to the client.
117	*/	114	*/
118	static void	115	static void
119	add_object_to_socklist (client_socket &ns, packet &sl, object *head)	116	add_object_to_socklist (client &ns, packet &sl, object *head)
120	{	117	{
121	int flags, len, anim_speed;
122	char item_n[MAX_BUF];	118	char item_n[MAX_BUF];
123	const char *item_p;	119	const char *item_p;
124		120
125	flags = query_flags (head);	121	int flags = query_flags (head);
126	if (QUERY_FLAG (head, FLAG_NO_PICK))	122	if (QUERY_FLAG (head, FLAG_NO_PICK))
127	flags \|= F_NOPICK;	123	flags \|= F_NOPICK;
128		124
129	if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE))	125	ns.send_face (head->face, -50);
130	esrv_send_face (&ns, head->face->number, 0);	126	ns.flush_fx ();
131		127
132	if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])	128	if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
133	esrv_send_animation (&ns, head->animation_id);	129	ns.send_animation (head->animation_id);
134		130
135	sl << uint32 (head->count)	131	sl << uint32 (head->count)
136	<< uint32 (flags)	132	<< uint32 (flags)
137	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))	133	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
138	<< uint32 (head->face->number);	134	<< uint32 (head->face);
		135
		136	int len;
139		137
140	if (!head->custom_name)	138	if (!head->custom_name)
141	{	139	{
142	strncpy (item_n, query_base_name (head, 0), 127);	140	strncpy (item_n, query_base_name (head, 0), 127);
143	item_n[127] = 0;	141	item_n[127] = 0;
…		…
157	len += strlen (item_n + 1 + len) + 1;	155	len += strlen (item_n + 1 + len) + 1;
158		156
159	sl << data8 (item_n, len)	157	sl << data8 (item_n, len)
160	<< uint16 (head->animation_id);	158	<< uint16 (head->animation_id);
161		159
162	anim_speed = 0;	160	int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
163	if (QUERY_FLAG (head, FLAG_ANIMATE))	161	: head->anim_speed ? clamp (head->anim_speed, 1, 255)
164	{	162	: 1. / clamp (fabs (head->speed), 1./255., 1./1.);
165	if (head->anim_speed)
166	anim_speed = head->anim_speed;
167	else
168	{
169	if (FABS (head->speed) < 0.001)
170	anim_speed = 255;
171	else if (FABS (head->speed) >= 1.0)
172	anim_speed = 1;
173	else
174	anim_speed = (int) (1.0 / FABS (head->speed));
175	}
176
177	if (anim_speed > 255)
178	anim_speed = 255;
179	}
180		163
181	sl << uint8 (anim_speed)	164	sl << uint8 (anim_speed)
182	<< uint32 (head->nrof);	165	<< uint32 (head->nrof);
183		166
184	if (ns.itemcmd == 2)	167	if (ns.itemcmd == 2)
185	sl << uint16 (head->client_type);	168	sl << uint16 (head->client_type);
186
187	SET_FLAG (head, FLAG_CLIENT_SENT);
188	}	169	}
189		170
		171	static faceidx
		172	need_face_now (player pl, const char name)
		173	{
		174	faceidx face = face_find (name, empty_face);
		175
		176	pl->ns->send_face (face, -50);
		177	pl->ns->flush_fx ();
		178
		179	return face;
		180	}
		181
		182	#define FINGER_UP "finger_up.x11"
		183	#define FINGER_DOWN "finger_down.x11"
190		184
191	/**	185	/**
192	* Send the look window. Don't need to do animations here	186	* 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	187	* This sends all the faces to the client, not just updates. This is
194	* because object ordering would otherwise be inconsistent	188	* because object ordering would otherwise be inconsistent.
195	*/	189	*/
196
197	void	190	void
198	esrv_draw_look (object *pl)	191	esrv_draw_look (player *pl)
199	{	192	{
200	object tmp, last;	193	object *ob = pl->ob;
201	int got_one = 0, start_look = 0, end_look = 0;
202	char buf[MAX_BUF];
203		194
204	if (!pl->contr->socket->update_look)	195	if (!pl->ns->update_look)
205	{	196	{
206	LOG (llevDebug, "esrv_draw_look called when update_look was not set\n");	197	LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
207	return;	198	return;
208	}	199	}
209	else	200
210	pl->contr->socket->update_look = 0;	201	pl->ns->update_look = 0;
211		202
212	if (QUERY_FLAG (pl, FLAG_REMOVED)	203	if (QUERY_FLAG (ob, FLAG_REMOVED)
213	\|\| !pl->map	204	\|\| !ob->map
214	\|\| pl->map->in_memory != MAP_IN_MEMORY	205	\|\| ob->map->in_memory != MAP_ACTIVE
215	\|\| out_of_map (pl->map, pl->x, pl->y))	206	\|\| out_of_map (ob->map, ob->x, ob->y))
216	return;	207	return;
217		208
218	for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)	209	pl->ns->send_packet ("delinv 0");
219	;
220		210
221	packet sl;	211	packet sl;
222
223	pl->contr->socket->send_packet ("delinv 0");
224
225	sl.printf ("item%d ", pl->contr->socket->itemcmd);	212	sl.printf ("item%d ", pl->ns->itemcmd);
226		213
227	sl << uint32 (0);	214	sl << uint32 (0);
228		215
229	if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE))	216	int start_pos = pl->ns->look_position;
230	esrv_send_face (pl->contr->socket, empty_face->number, 0);	217	bool dirty = false;
231		218
232	if (pl->contr->socket->look_position)	219	mapspace &ms = ob->ms ();
		220
		221	// manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
		222	// start from the top
		223	object *items [FLOORBOX_PAGESIZE];
		224	int item_idx = 0, item_cnt = 0;
		225	int pos = 0;
		226
		227	// find our items by walking down
		228	object *item = ms.top;
		229
		230	for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
		231	{
		232	if (!item->client_visible ())
		233	continue;
		234
		235	if (++pos < start_pos)
		236	continue;
		237
		238	// record item
		239	items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
		240	item_cnt++;
		241
		242	// stop at first floor
		243	if (item->flag [FLAG_IS_FLOOR])
		244	{
		245	// we are finished, don't append "next group of items"
		246	// by setting item to ms.bot it becomes zero which is checked after the while loop
		247	item = ms.bot;
		248	}
233	{	249	}
234	sl << uint32 (0x80000000 \| (pl->contr->socket->look_position - NUM_LOOK_OBJECTS))	250
		251	// see if there are more if we cared - we ignore invisible objects
		252	if (item)
		253	{
		254	/* What we basically do is make a 'fake' object - when the user applies it,
		255	* we notice the special tag the object has, and act accordingly.
		256	*/
		257	sl << uint32 (0x80000000 \| (start_pos + FLOORBOX_PAGESIZE))
		258	<< uint32 (0)
		259	<< uint32 ((uint32) - 1)
		260	<< uint32 (need_face_now (pl, FINGER_DOWN))
		261	<< data8 ("Apply this to see the items below")
		262	<< uint16 (0)
		263	<< uint8 (0)
		264	<< uint32 (0);
		265
		266	if (pl->ns->itemcmd == 2)
		267	sl << uint16 (0);
		268
		269	dirty = true;
		270	}
		271
		272	// now send out all items in the ring buffer in reverse order
		273	while (item_cnt)
		274	{
		275	--item_cnt;
		276	item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
		277	object *item = items [item_idx];
		278
		279	add_object_to_socklist (*pl->ns, sl, item->head_ ());
		280
		281	dirty = true;
		282
		283	// if packet got too large, send it and begin a new one
		284	if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
		285	{
		286	pl->ns->send_packet (sl);
		287
		288	sl.reset ();
		289	sl.printf ("item%d ", pl->ns->itemcmd);
		290	sl << uint32 (0);
		291
		292	dirty = false;
		293	}
		294	}
		295
		296	if (start_pos)
		297	{
		298	sl << uint32 (0x80000000 \| (start_pos - FLOORBOX_PAGESIZE))
235	<< uint32 (0)	299	<< uint32 (0)
236	<< sint32 (-1)	300	<< sint32 (-1)
237	<< uint32 (empty_face->number);	301	<< uint32 (need_face_now (pl, FINGER_UP))
238		302	<< data8 ("Apply this to see the items higher up")
239	sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS);
240
241	sl << uint16 (0)	303	<< uint16 (0)
242	<< uint8 (0)	304	<< uint8 (0)
243	<< uint32 (0);	305	<< uint32 (0);
244		306
245	if (pl->contr->socket->itemcmd == 2)	307	if (pl->ns->itemcmd == 2)
246	sl << uint16 (0);	308	sl << uint16 (0);
247	}
248		309
249	for (last = NULL; tmp != last; tmp = tmp->below)	310	dirty = true;
250	{	311	}
251	object *head;
252		312
253	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)	313	if (dirty)
254	{
255	last = tmp->below; /* assumes double floor mode */
256	if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
257	last = last->below;
258	}
259
260	if (LOOK_OBJ (tmp))
261	{
262	if (++start_look < pl->contr->socket->look_position)
263	continue;
264
265	end_look++;
266
267	if (end_look > NUM_LOOK_OBJECTS)
268	{
269	/* 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.
271	*/
272	sl << uint32 (0x80000000 \| (pl->contr->socket->look_position + NUM_LOOK_OBJECTS))
273	<< uint32 (0)
274	<< uint32 ((uint32) - 1)
275	<< uint32 (empty_face->number);
276
277	sl.printf ("Click here to see next group of items");
278
279	sl << uint16 (0)
280	<< uint8 (0)
281	<< uint32 (0);
282
283	if (pl->contr->socket->itemcmd == 2)
284	sl << uint16 (0);
285
286	break;
287	}
288
289	if (tmp->head)
290	head = tmp->head;
291	else
292	head = tmp;
293
294	add_object_to_socklist (*pl->contr->socket, sl, head);
295	got_one++;
296
297	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
298	{
299	pl->contr->socket->send_packet (sl);
300
301	sl.reset ();
302	sl.printf ("item%d ", pl->contr->socket->itemcmd);
303	sl << uint32 (0);
304	got_one = 0;
305	}
306	} /* If LOOK_OBJ() */
307	}
308
309	if (got_one)
310	pl->contr->socket->send_packet (sl);	314	pl->ns->send_packet (sl);
311
312	}	315	}
313		316
314	/**	317	/**
315	* Sends whole inventory.	318	* Sends whole inventory.
316	*/	319	*/
317	void	320	void
318	esrv_send_inventory (object pl, object op)	321	esrv_send_inventory (object pl, object op)
319	{	322	{
320	object *tmp;	323	if (!pl->contr->ns)//D
		324	return;
		325
321	int got_one = 0;	326	int got_one = 0;
322		327
		328	pl->contr->ns->send_packet_printf ("delinv %d", op->count);
		329
323	packet sl;	330	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);	331	sl.printf ("item%d ", pl->contr->ns->itemcmd);
330		332
331	sl << uint32 (op->count);	333	sl << uint32 (op->count);
332		334
333	for (tmp = op->inv; tmp; tmp = tmp->below)	335	for (object *tmp = op->inv; tmp; tmp = tmp->below)
334	{	336	{
335	object *head;	337	object *head;
336		338
337	if (tmp->head)	339	if (tmp->head)
338	head = tmp->head;	340	head = tmp->head;
339	else	341	else
340	head = tmp;	342	head = tmp;
341		343
342	if (LOOK_OBJ (head))	344	if (head->client_visible ())
343	{	345	{
344	add_object_to_socklist (*pl->contr->socket, sl, head);	346	add_object_to_socklist (*pl->contr->ns, sl, head);
345		347
346	got_one++;	348	got_one++;
347		349
348	/* IT is possible for players to accumulate a huge amount of	350	/* IT is possible for players to accumulate a huge amount of
349	* items (especially with some of the bags out there) to	351	* items (especially with some of the bags out there) to
350	* overflow the buffer. IF so, send multiple item commands.	352	* overflow the buffer. IF so, send multiple item commands.
351	*/	353	*/
352	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))	354	if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
353	{	355	{
354	pl->contr->socket->send_packet (sl);	356	pl->contr->ns->send_packet (sl);
355		357
356	sl.reset ();	358	sl.reset ();
357	sl.printf ("item%d ", pl->contr->socket->itemcmd);	359	sl.printf ("item%d ", pl->contr->ns->itemcmd);
358	sl << uint32 (op->count);	360	sl << uint32 (op->count);
359	got_one = 0;	361	got_one = 0;
360	}	362	}
361	} /* If LOOK_OBJ() */	363	}
362	}	364	}
363		365
364	if (got_one)	366	if (got_one)
365	pl->contr->socket->send_packet (sl);	367	pl->contr->ns->send_packet (sl);
366
367	}	368	}
368		369
369	/**	370	/**
370	* Updates object op for player pl.	371	* Updates object op for player pl.
371	*	372	*
372	* flags is a list of values to update	373	* flags is a list of values to update
373	* to the client (as defined in newclient.h - might as well use the	374	* to the client (as defined in newclient.h - might as well use the
374	* same value both places.	375	* same value both places.
375	*/	376	*/
376
377	void	377	void
378	esrv_update_item (int flags, object pl, object op)	378	esrv_update_item (int flags, object pl, object op)
379	{	379	{
380	/* If we have a request to send the player item, skip a few checks. */	380	/* If we have a request to send the player item, skip a few checks. */
381	if (op != pl)	381	if (op != pl && !op->client_visible ())
382	{
383	if (!LOOK_OBJ (op))
384	return;	382	return;
385	/* we remove the check for op->env, because in theory, the object
386	* is hopefully in the same place, so the client should preserve
387	* order.
388	*/
389	}
390		383
391	if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))	384	client *ns = pl->contr->ns;
392	{	385	if (!ns)
393	/* FLAG_CLIENT_SENT is debug only. We are using it to see where	386	return;
394	* this is happening - we can set a breakpoint here in the debugger
395	* and track back the call.
396	*/
397	LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
398	}
399		387
400	packet sl;	388	packet sl ("upditem");
401		389
402	sl << "upditem "
403	<< uint8 (flags);	390	sl << uint8 (flags);
404		391
405	if (op->head)
406	op = op->head;	392	op = op->head_ ();
407		393
408	sl << uint32 (op->count);	394	sl << uint32 (op->count);
409		395
410	if (flags & UPD_LOCATION)	396	if (flags & UPD_LOCATION)
411	sl << uint32 (op->env ? op->env->count : 0);	397	sl << uint32 (op->env ? op->env->count : 0);
…		…
413	if (flags & UPD_FLAGS)	399	if (flags & UPD_FLAGS)
414	sl << uint32 (query_flags (op));	400	sl << uint32 (query_flags (op));
415		401
416	if (flags & UPD_WEIGHT)	402	if (flags & UPD_WEIGHT)
417	{	403	{
418	sint32 weight = WEIGHT (op);	404	sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
419		405
420	sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
421
422	if (pl == op)	406	if (op)
423	op->contr->last_weight = weight;	407	ns->last_weight = weight;
		408
		409	sl << uint32 (weight);
424	}	410	}
425		411
426	if (flags & UPD_FACE)	412	if (flags & UPD_FACE)
427	{	413	{
428	if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE))	414	ns->send_face (op->face, -50);
429	esrv_send_face (pl->contr->socket, op->face->number, 0);	415	ns->flush_fx ();
430
431	sl << uint32 (op->face->number);	416	sl << uint32 (op->face);
432	}	417	}
433		418
434	if (flags & UPD_NAME)	419	if (flags & UPD_NAME)
435	{	420	{
436	int len;	421	int len;
…		…
470	{	455	{
471	if (op->anim_speed)	456	if (op->anim_speed)
472	anim_speed = op->anim_speed;	457	anim_speed = op->anim_speed;
473	else	458	else
474	{	459	{
475	if (FABS (op->speed) < 0.001)	460	if (fabs (op->speed) < 0.001)
476	anim_speed = 255;	461	anim_speed = 255;
477	else if (FABS (op->speed) >= 1.0)	462	else if (fabs (op->speed) >= 1.0)
478	anim_speed = 1;	463	anim_speed = 1;
479	else	464	else
480	anim_speed = (int) (1.0 / FABS (op->speed));	465	anim_speed = (int) (1.0 / fabs (op->speed));
481	}	466	}
482		467
483	if (anim_speed > 255)	468	if (anim_speed > 255)
484	anim_speed = 255;	469	anim_speed = 255;
485	}	470	}
…		…
488	}	473	}
489		474
490	if (flags & UPD_NROF)	475	if (flags & UPD_NROF)
491	sl << uint32 (op->nrof);	476	sl << uint32 (op->nrof);
492		477
493	pl->contr->socket->send_packet (sl);	478	pl->contr->ns->send_packet (sl);
494	}	479	}
495		480
496	/**	481	/**
497	* Sends item's info to player.	482	* Sends item's info to player.
498	*/	483	*/
499	void	484	void
500	esrv_send_item (object pl, object op)	485	esrv_send_item (object pl, object op)
501	{	486	{
502	/* If this is not the player object, do some more checks */	487	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;	488	return;
508	/* if the item is on the ground, mark that the look needs to	489
509	* be updated.	490	/* We only send 'visible' objects to the client, and sometimes the player */
510	*/	491	if (!op->client_visible () && op->type != PLAYER)
511	if (!op->env)
512	{
513	pl->contr->socket->update_look = 1;
514	return;	492	return;
515	}
516	}
517		493
518	packet sl;	494	packet sl;
519		495
520	sl.printf ("item%d ", pl->contr->socket->itemcmd);	496	sl.printf ("item%d ", pl->contr->ns->itemcmd);
521		497
522	if (op->head)
523	op = op->head;	498	op = op->head_ ();
524		499
525	sl << uint32 (op->env ? op->env->count : 0);	500	sl << uint32 (op->env ? op->env->count : 0);
526		501
527	add_object_to_socklist (*pl->contr->socket, sl, op);	502	add_object_to_socklist (*pl->contr->ns, sl, op);
528		503
529	pl->contr->socket->send_packet (sl);	504	pl->contr->ns->send_packet (sl);
530	SET_FLAG (op, FLAG_CLIENT_SENT);
531
532	}	505	}
533		506
534	/**	507	/**
535	* Tells the client to delete an item. Uses the item	508	* Tells the client to delete an item.
536	* command with a -1 location.
537	*/	509	*/
538
539	void	510	void
540	esrv_del_item (player *pl, int tag)	511	esrv_del_item (player *pl, int tag)
541	{	512	{
542	packet sl;	513	if (!pl->ns)
		514	return;
543		515
544	sl << "delitem "	516	packet sl ("delitem");
		517
545	<< uint32 (tag);	518	sl << uint32 (tag);
546		519
547	pl->socket->send_packet (sl);	520	pl->ns->send_packet (sl);
548	}	521	}
549		522
550		523
551	/*******************************************************************************	524	/*******************************************************************************
552	*	525	*
…		…
556		529
557	/**	530	/**
558	* Takes a player and object count (tag) and returns the actual object	531	* Takes a player and object count (tag) and returns the actual object
559	* pointer, or null if it can't be found.	532	* pointer, or null if it can't be found.
560	*/	533	*/
561
562	object *	534	object *
563	esrv_get_ob_from_count (object *pl, tag_t count)	535	esrv_get_ob_from_count (object *pl, tag_t count)
564	{	536	{
565	object op, tmp;
566
567	if (pl->count == count)	537	if (pl->count == count)
568	return pl;	538	return pl;
569		539
570	for (op = pl->inv; op; op = op->below)	540	for (object *op = pl->inv; op; op = op->below)
571	if (op->count == count)	541	if (op->count == count)
572	return op;	542	return op;
573	else if (op->type == CONTAINER && pl->container == op)	543	else if (op->type == CONTAINER && pl->container == op)
574	for (tmp = op->inv; tmp; tmp = tmp->below)	544	for (object *tmp = op->inv; tmp; tmp = tmp->below)
575	if (tmp->count == count)	545	if (tmp->count == count)
576	return tmp;	546	return tmp;
577		547
578	for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above)	548	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)	549	if (op->head && op->head->count == count)
580	return op;	550	return op;
581	else if (op->count == count)	551	else if (op->count == count)
582	return op;	552	return op;
583	else if (op->type == CONTAINER && pl->container == op)	553	else if (op->type == CONTAINER && pl->container == op)
584	for (tmp = op->inv; tmp; tmp = tmp->below)	554	for (object *tmp = op->inv; tmp; tmp = tmp->below)
585	if (tmp->count == count)	555	if (tmp->count == count)
586	return tmp;	556	return tmp;
587		557
		558	#if 0
		559	/* If the high bit is set, player examined a pseudo object. */
		560	if (count & 0x80000000)
		561	return 0;
		562	#endif
		563
588	return NULL;	564	return 0;
589	}	565	}
590
591		566
592	/** Client wants to examine some object. So lets do so. */	567	/** Client wants to examine some object. So lets do so. */
593	void	568	void
594	ExamineCmd (char buf, int len, player pl)	569	ExamineCmd (char buf, int len, player pl)
595	{	570	{
596	tag_t tag = atoi (buf);	571	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
602	object *op = esrv_get_ob_from_count (pl->ob, tag);
603
604	if (!op)
605	{
606	LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
607	return;
608	}
609
610	examine (pl->ob, op);
611	}
612
613	/** Client wants to apply some object. Lets do so. */
614	void
615	ApplyCmd (char buf, int len, player pl)
616	{
617	tag_t tag = atoi (buf);
618
619	/* sort of a hack, but if the player saves and the player then manually
620	* applies a savebed (or otherwise tries to do stuff), we run into trouble.
621	*/
622	if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
623	return;
624		572
625	/* If the high bit is set, player applied a pseudo object. */	573	/* If the high bit is set, player applied a pseudo object. */
626	if (tag & 0x80000000)	574	if (tag & 0x80000000)
627	{	575	{
628	pl->socket->look_position = tag & 0x7fffffff;	576	pl->ns->look_position = tag & 0x7fffffff;
629	pl->socket->update_look = 1;	577	pl->ns->floorbox_update ();
630	return;	578	return;
631	}	579	}
632		580
633	object *op = esrv_get_ob_from_count (pl->ob, tag);	581	object *op = esrv_get_ob_from_count (pl->ob, tag);
634		582
635	if (!op)	583	if (!op)
636	{	584	{
		585	LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
		586	return;
		587	}
		588
		589	examine (pl->ob, op);
		590	}
		591
		592	/** Client wants to examine some object. So lets do so. */
		593	void
		594	ExCmd (char buf, int len, player pl)
		595	{
		596	tag_t tag = atoi (buf);
		597
		598	if (object *op = esrv_get_ob_from_count (pl->ob, tag))
		599	{
		600	std::string s = op->describe (pl->ob);
		601
		602	packet sl ("ex");
		603	sl << ber32 (tag)
		604	<< data (*pl->expand_cfpod (s.c_str ()));
		605
		606	pl->ns->send_packet (sl);
		607	}
		608	}
		609
		610	/** Client wants to apply some object. Lets do so. */
		611	void
		612	ApplyCmd (char buf, int len, player pl)
		613	{
		614	tag_t tag = atoi (buf);
		615
		616	/* If the high bit is set, player applied a pseudo object. */
		617	if (tag & 0x80000000)
		618	{
		619	pl->ns->look_position = tag & 0x7fffffff;
		620	pl->ns->floorbox_update ();
		621	return;
		622	}
		623
		624	object *op = esrv_get_ob_from_count (pl->ob, tag);
		625
		626	if (!op)
		627	{
637	LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);	628	LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
638	return;	629	return;
639	}	630	}
640		631
641	player_apply (pl->ob, op, 0, 0);	632	player_apply (pl->ob, op, 0, 0);
642	}	633	}
643		634
644	/** Client wants to apply some object. Lets do so. */	635	/** Client wants to lock some object. Lets do so. */
645	void	636	void
646	LockItem (uint8 data, int len, player pl)	637	LockItem (char data, int len, player pl)
647	{	638	{
648	int flag = data[0];	639	int flag = data[0];
649	tag_t tag = net_uint32 (data + 1);	640	tag_t tag = net_uint32 ((uint8 *)data + 1);
650	object *op = esrv_get_ob_from_count (pl->ob, tag);	641	object *op = esrv_get_ob_from_count (pl->ob, tag);
651		642
652	if (!op)	643	if (!op)
653	{	644	{
654	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");	645	pl->failmsg ("Could not find object to lock/unlock");
655	return;	646	return;
656	}	647	}
657		648
658	if (!flag)	649	if (!flag)
659	CLEAR_FLAG (op, FLAG_INV_LOCKED);	650	CLEAR_FLAG (op, FLAG_INV_LOCKED);
…		…
661	SET_FLAG (op, FLAG_INV_LOCKED);	652	SET_FLAG (op, FLAG_INV_LOCKED);
662		653
663	esrv_update_item (UPD_FLAGS, pl->ob, op);	654	esrv_update_item (UPD_FLAGS, pl->ob, op);
664	}	655	}
665		656
666	/** Client wants to apply some object. Lets do so. */	657	/** Client wants to mark some object. Lets do so. */
667	void	658	void
668	MarkItem (uint8 * data, int len, player *pl)	659	MarkItem (char data, int len, player pl)
669	{	660	{
670	tag_t tag = net_uint32 (data);	661	tag_t tag = net_uint32 ((uint8 *)data);
671	object *op = esrv_get_ob_from_count (pl->ob, tag);	662	object *op = esrv_get_ob_from_count (pl->ob, tag);
672		663
673	if (!op)	664	if (!op)
674	{	665	{
675	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");	666	pl->failmsg ("Could not find object to mark");
676	return;	667	return;
677	}	668	}
678		669
679	pl->mark = op;	670	pl->mark = op;
680	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op));	671	pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
681	}	672	}
682		673
683	/**	674	/**
684	* look_at prints items on the specified square.	675	* look_at prints items on the specified square.
685	*	676	*
686	* [ removed EARTHWALL check and added check for containers inventory.	677	* [ removed EARTHWALL check and added check for containers inventory.
687	* Tero.Haatanen@lut.fi ]	678	* Tero.Haatanen@lut.fi ]
688	*/	679	*/
689	void	680	static void
690	look_at (object *op, int dx, int dy)	681	look_at (player *pl, int dx, int dy)
691	{	682	{
692	object *tmp;	683	dynbuf_text buf;
693	int flag = 0;	684	object *ob = pl->ob;
694	sint16 x, y;
695	maptile *m;
696		685
697	x = op->x + dx;	686	if (!pl->observe->map)
698	y = op->y + dy;
699
700	if (out_of_map (op->map, x, y))
701	return;	687	return;
702		688
703	m = get_map_from_coord (op->map, &x, &y);	689	mapxy pos (pl->observe);
704	if (!m)	690	pos.move (dx, dy);
		691
		692	if (pos.normalise ())
		693	for (object *tmp = pos->top; tmp; tmp = tmp->below)
		694	{
		695	if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
		696	continue;
		697
		698	if (QUERY_FLAG (ob, FLAG_WIZ))
		699	buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
		700	else
		701	buf.printf (" - %s.\n", query_name (tmp));
		702
		703	object *head = tmp->head_ ();
		704
		705	if (head->inv)
		706	if ((head->type != CONTAINER && head->type != FLESH)
		707	\|\| QUERY_FLAG (ob, FLAG_WIZ))
		708	buf << head->query_inventory (ob, " ");
		709
		710	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
		711	break;
		712	}
		713
		714	if (buf.empty ())
		715	pl->failmsg ("You see nothing there.");
		716	else
		717	pl->infobox (MSG_CHANNEL ("lookat"), buf);
		718	}
		719
		720	/** Client wants to look at some object. Lets do so. */
		721	void
		722	LookAt (char buf, int len, player pl)
		723	{
		724	char *cp;
		725
		726	int dx = atoi (buf);
		727	if (!(cp = strchr (buf, ' ')))
705	return;	728	return;
706		729
707	for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
708
709	for (; tmp != NULL; tmp = tmp->below)
710	{
711	if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
712	continue;
713
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))
727	new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
728	else
729	new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
730
731	if (((tmp->inv != NULL \|\| (tmp->head && tmp->head->inv)) &&
732	(tmp->type != CONTAINER && tmp->type != FLESH)) \|\| QUERY_FLAG (op, FLAG_WIZ))
733	inventory (op, tmp->head == NULL ? tmp : tmp->head);
734
735	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
736	break;
737	}
738
739	if (!flag)
740	{
741	if (dx \|\| dy)
742	new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
743	else
744	new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
745	}
746	}
747
748
749
750	/** Client wants to look at some object. Lets do so. */
751	void
752	LookAt (char buf, int len, player pl)
753	{
754	int dx, dy;
755	char *cp;
756
757	dx = atoi (buf);
758	if (!(cp = strchr (buf, ' ')))
759	{
760	return;
761	}
762	dy = atoi (cp);	730	int dy = atoi (cp);
763		731
764	if (FABS (dx) > pl->socket->mapx / 2 \|\| FABS (dy) > pl->socket->mapy / 2)	732	if (player *opl = pl->observe->contr)
		733	if (client *ns = opl->ns)
		734	{
		735	if (fabs (dx) > ns->mapx / 2 \|\| fabs (dy) > ns->mapy / 2)
765	return;	736	return;
766		737
767	if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2])	738	if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
768	return;	739	return;
		740	}
769		741
770	look_at (pl->ob, dx, dy);	742	look_at (pl, dx, dy);
771	}	743	}
772		744
773	/** Move an object to a new location */	745	/** Move an object to a new location */
774	void	746	void
775	esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)	747	esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
776	{	748	{
777	object op, env;
778
779	op = esrv_get_ob_from_count (pl, tag);	749	object *op = esrv_get_ob_from_count (pl, tag);
780	if (!op)	750	if (!op)
781	{	751	{
782	LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);	752	LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
783	return;	753	return;
784	}	754	}
…		…
791	/* If it is an active container, then we should drop all objects	761	/* If it is an active container, then we should drop all objects
792	* in the container and not the container itself.	762	* in the container and not the container itself.
793	*/	763	*/
794	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))	764	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
795	{	765	{
796	object current, next;	766	int cnt = MAX_ITEM_PER_DROP;
797		767
798	for (current = op->inv; current != NULL; current = next)	768	for (object *current = op->inv; current && cnt--; )
799	{	769	{
800	next = current->below;	770	object *next = current->below;
801	drop_object (pl, current, 0);	771	drop_object (pl, current, 0);
		772	current = next;
802	}	773	}
803		774
804	esrv_update_item (UPD_WEIGHT, pl, op);	775	if (cnt <= 0)
		776	op->failmsg ("Only dropped some items, can't drop that many items at once.");
805	}	777	}
806	else	778	else
807	{
808	drop_object (pl, op, nrof);	779	drop_object (pl, op, nrof);
809	}	780
810	return;	781	return;
811	}	782	}
812	else if (to == pl->count)	783	else if (to == pl->count)
813	{ /* pick it up to the inventory */	784	{ /* pick it up to the inventory */
814	/* return if player has already picked it up */	785	/* return if player has already picked it up */
…		…
818	pl->contr->count = nrof;	789	pl->contr->count = nrof;
819	pick_up (pl, op);	790	pick_up (pl, op);
820	return;	791	return;
821	}	792	}
822		793
823	env = esrv_get_ob_from_count (pl, to);	794	object *env = esrv_get_ob_from_count (pl, to);
824	if (!env)	795	if (!env)
825	{	796	{
826	LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);	797	LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
827	return;	798	return;
828	}	799	}
…		…
830	/* put_object_in_sack presumes that necessary sanity checking	801	/* put_object_in_sack presumes that necessary sanity checking
831	* has already been done (eg, it can be picked up and fits in	802	* 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	803	* 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.	804	* an make sure env is in fact a container for that matter.
834	*/	805	*/
835	if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))	806	if (env->type == CONTAINER
836	{	807	&& can_pick (pl, op)
		808	&& sack_can_hold (pl, env, op, nrof))
837	put_object_in_sack (pl, env, op, nrof);	809	put_object_in_sack (pl, env, op, nrof);
838	}
839	}	810	}
840		811

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.71 by root, Mon Sep 8 11:27:25 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.71 by root, Mon Sep 8 11:27:25 2008 UTC