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

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

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.27 by root, Wed Dec 20 01:19:11 2006 UTC vs. Revision 1.64 by root, Mon May 5 22:03:22 2008 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.27 by root, Wed Dec 20 01:19:11 2006 UTC vs.
Revision 1.64 by root, Mon May 5 22:03:22 2008 UTC