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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.24 by root, Sat Dec 16 22:14:42 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)	365	pl->ns->send_packet ("delinv 0");
217	;
218		366
219	packet sl;	367	packet sl;
220
221	pl->contr->socket->send_packet ("delinv 0");
222
223	sl.printf ("item%d ", pl->contr->socket->itemcmd);	368	sl.printf ("item%d ", pl->ns->itemcmd);
224		369
225	sl << uint32 (0);	370	sl << uint32 (0);
226		371
227	if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE))	372	int start_pos = pl->ns->look_position;
228	esrv_send_face (pl->contr->socket, empty_face->number, 0);	373	bool dirty = false;
229		374
230	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	}
231	{	405	}
232	char buf[80];
233	snprintf (buf, 80, "Apply this to see %d previous items", NUM_LOOK_OBJECTS);
234		406
235	sl << uint32 (0x80000000 \| (pl->contr->socket->look_position - NUM_LOOK_OBJECTS))	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	*/
		413	sl << uint32 (0x80000000 \| (start_pos + FLOORBOX_PAGESIZE))
236	<< uint32 (0)	414	<< uint32 (0)
237	<< sint32 (-1)	415	<< uint32 ((uint32) - 1)
238	<< uint32 (empty_face->number)	416	<< uint32 (need_face_now (pl, FINGER_DOWN))
239	<< data8 (buf)	417	<< data8 ("Apply this to see the items below")
240	<< uint16 (0)	418	<< uint16 (0)
241	<< uint8 (0)	419	<< uint8 (0)
242	<< uint32 (0);	420	<< uint32 (0);
243		421
244	if (pl->contr->socket->itemcmd == 2)	422	if (pl->ns->itemcmd == 2)
245	sl << uint16 (0);	423	sl << uint16 (0);
246	}
247		424
248	for (last = NULL; tmp != last; tmp = tmp->below)	425	dirty = true;
249	{	426	}
250	object *head;
251		427
252	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)
253	{	441	{
254	last = tmp->below; /* assumes double floor mode */	442	pl->ns->send_packet (sl);
255	if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))	443
256	last = last->below;	444	sl.reset ();
		445	sl.printf ("item%d ", pl->ns->itemcmd);
		446	sl << uint32 (0);
		447
		448	dirty = false;
257	}	449	}
258
259	if (LOOK_OBJ (tmp))
260	{
261	if (++start_look < pl->contr->socket->look_position)
262	continue;
263
264	end_look++;
265
266	if (end_look > NUM_LOOK_OBJECTS)
267	{
268	/* What we basically do is make a 'fake' object - when the user applies it,
269	* we notice the special tag the object has, and act accordingly.
270	*/
271	sl << uint32 (0x80000000 \| (pl->contr->socket->look_position + NUM_LOOK_OBJECTS))
272	<< uint32 (0)
273	<< uint32 ((uint32) - 1)
274	<< uint32 (empty_face->number)
275	<< data8 ("Apply this to see next group of items")
276	<< uint16 (0)
277	<< uint8 (0)
278	<< uint32 (0);
279
280	if (pl->contr->socket->itemcmd == 2)
281	sl << uint16 (0);
282
283	break;
284	}
285
286	if (tmp->head)
287	head = tmp->head;
288	else
289	head = tmp;
290
291	add_object_to_socklist (*pl->contr->socket, sl, head);
292	got_one++;
293
294	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
295	{
296	pl->contr->socket->send_packet (sl);
297
298	sl.reset ();
299	sl.printf ("item%d ", pl->contr->socket->itemcmd);
300	sl << uint32 (0);
301	got_one = 0;
302	}
303	}
304	}	450	}
305		451
306	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)
307	pl->contr->socket->send_packet (sl);	470	pl->ns->send_packet (sl);
308
309	}	471	}
310		472
311	/**	473	/**
312	* Sends whole inventory.	474	* Sends whole inventory.
313	*/	475	*/
314	void	476	void
315	esrv_send_inventory (object pl, object op)	477	esrv_send_inventory (object pl, object op)
316	{	478	{
317	object *tmp;	479	if (!pl->contr->ns)//D
		480	return;
		481
318	int got_one = 0;	482	int got_one = 0;
319		483
		484	pl->contr->ns->send_packet_printf ("delinv %d", op->count);
		485
320	packet sl;	486	packet sl;
321
322	sl.printf ("delinv %d", op->count);
323	pl->contr->socket->send_packet (sl);
324
325	sl.reset ();
326	sl.printf ("item%d ", pl->contr->socket->itemcmd);	487	sl.printf ("item%d ", pl->contr->ns->itemcmd);
327		488
328	sl << uint32 (op->count);	489	sl << uint32 (op->count);
329		490
330	for (tmp = op->inv; tmp; tmp = tmp->below)	491	for (object *tmp = op->inv; tmp; tmp = tmp->below)
331	{	492	{
332	object *head;	493	object *head;
333		494
334	if (tmp->head)	495	if (tmp->head)
335	head = tmp->head;	496	head = tmp->head;
336	else	497	else
337	head = tmp;	498	head = tmp;
338		499
339	if (LOOK_OBJ (head))	500	if (head->client_visible ())
340	{	501	{
341	add_object_to_socklist (*pl->contr->socket, sl, head);	502	add_object_to_socklist (*pl->contr->ns, sl, head);
342		503
343	got_one++;	504	got_one++;
344		505
345	/* IT is possible for players to accumulate a huge amount of	506	/* IT is possible for players to accumulate a huge amount of
346	* items (especially with some of the bags out there) to	507	* items (especially with some of the bags out there) to
347	* overflow the buffer. IF so, send multiple item commands.	508	* overflow the buffer. IF so, send multiple item commands.
348	*/	509	*/
349	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))	510	if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
350	{	511	{
351	pl->contr->socket->send_packet (sl);	512	pl->contr->ns->send_packet (sl);
352		513
353	sl.reset ();	514	sl.reset ();
354	sl.printf ("item%d ", pl->contr->socket->itemcmd);	515	sl.printf ("item%d ", pl->contr->ns->itemcmd);
355	sl << uint32 (op->count);	516	sl << uint32 (op->count);
356	got_one = 0;	517	got_one = 0;
357	}	518	}
358	} /* If LOOK_OBJ() */	519	}
359	}	520	}
360		521
361	if (got_one)	522	if (got_one)
362	pl->contr->socket->send_packet (sl);	523	pl->contr->ns->send_packet (sl);
363	}	524	}
364		525
365	/**	526	/**
366	* Updates object op for player pl.	527	* Updates object op for player pl.
367	*	528	*
368	* flags is a list of values to update	529	* flags is a list of values to update
369	* 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
370	* same value both places.	531	* same value both places.
371	*/	532	*/
372
373	void	533	void
374	esrv_update_item (int flags, object pl, object op)	534	esrv_update_item (int flags, object pl, object op)
375	{	535	{
376	/* 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. */
377	if (op != pl)	537	if (op != pl && !op->client_visible ())
378	{
379	if (!LOOK_OBJ (op))
380	return;	538	return;
381	/* we remove the check for op->env, because in theory, the object	539
382	* is hopefully in the same place, so the client should preserve	540	client *ns = pl->contr->ns;
383	* order.	541	if (!ns)
384	*/	542	return;
385	}
386		543
387	if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))	544	if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
388	{	545	{
389	/* 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
390	* 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
391	* and track back the call.	548	* and track back the call.
392	*/	549	*/
393	LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);	550	LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
394	}	551	}
395		552
396	packet sl;	553	packet sl ("upditem");
397		554
398	sl << "upditem "
399	<< uint8 (flags);	555	sl << uint8 (flags);
400		556
401	if (op->head)
402	op = op->head;	557	op = op->head_ ();
403		558
404	sl << uint32 (op->count);	559	sl << uint32 (op->count);
405		560
406	if (flags & UPD_LOCATION)	561	if (flags & UPD_LOCATION)
407	sl << uint32 (op->env ? op->env->count : 0);	562	sl << uint32 (op->env ? op->env->count : 0);
…		…
409	if (flags & UPD_FLAGS)	564	if (flags & UPD_FLAGS)
410	sl << uint32 (query_flags (op));	565	sl << uint32 (query_flags (op));
411		566
412	if (flags & UPD_WEIGHT)	567	if (flags & UPD_WEIGHT)
413	{	568	{
414	sint32 weight = WEIGHT (op);	569	sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
415		570
416	sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
417
418	if (pl == op)	571	if (op)
419	op->contr->last_weight = weight;	572	ns->last_weight = weight;
		573
		574	sl << uint32 (weight);
420	}	575	}
421		576
422	if (flags & UPD_FACE)	577	if (flags & UPD_FACE)
423	{	578	{
424	if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE))	579	ns->send_face (op->face, -50);
425	esrv_send_face (pl->contr->socket, op->face->number, 0);	580	ns->flush_fx ();
426
427	sl << uint32 (op->face->number);	581	sl << uint32 (op->face);
428	}	582	}
429		583
430	if (flags & UPD_NAME)	584	if (flags & UPD_NAME)
431	{	585	{
432	int len;	586	int len;
…		…
466	{	620	{
467	if (op->anim_speed)	621	if (op->anim_speed)
468	anim_speed = op->anim_speed;	622	anim_speed = op->anim_speed;
469	else	623	else
470	{	624	{
471	if (FABS (op->speed) < 0.001)	625	if (fabs (op->speed) < 0.001)
472	anim_speed = 255;	626	anim_speed = 255;
473	else if (FABS (op->speed) >= 1.0)	627	else if (fabs (op->speed) >= 1.0)
474	anim_speed = 1;	628	anim_speed = 1;
475	else	629	else
476	anim_speed = (int) (1.0 / FABS (op->speed));	630	anim_speed = (int) (1.0 / fabs (op->speed));
477	}	631	}
478		632
479	if (anim_speed > 255)	633	if (anim_speed > 255)
480	anim_speed = 255;	634	anim_speed = 255;
481	}	635	}
…		…
484	}	638	}
485		639
486	if (flags & UPD_NROF)	640	if (flags & UPD_NROF)
487	sl << uint32 (op->nrof);	641	sl << uint32 (op->nrof);
488		642
489	pl->contr->socket->send_packet (sl);	643	pl->contr->ns->send_packet (sl);
490	}	644	}
491		645
492	/**	646	/**
493	* Sends item's info to player.	647	* Sends item's info to player.
494	*/	648	*/
495	void	649	void
496	esrv_send_item (object pl, object op)	650	esrv_send_item (object pl, object op)
497	{	651	{
498	/* If this is not the player object, do some more checks */	652	if (!pl->contr->ns)
499	if (op != pl)
500	{
501	/* We only send 'visibile' objects to the client */
502	if (!LOOK_OBJ (op))
503	return;	653	return;
504	/* if the item is on the ground, mark that the look needs to	654
505	* be updated.	655	/* We only send 'visible' objects to the client, and sometimes the player */
506	*/	656	if (!op->client_visible () && op->type != PLAYER)
507	if (!op->env)
508	{
509	pl->contr->socket->update_look = 1;
510	return;	657	return;
511	}
512	}
513		658
514	packet sl;	659	packet sl;
515		660
516	sl.printf ("item%d ", pl->contr->socket->itemcmd);	661	sl.printf ("item%d ", pl->contr->ns->itemcmd);
517		662
518	if (op->head)
519	op = op->head;	663	op = op->head_ ();
520		664
521	sl << uint32 (op->env ? op->env->count : 0);	665	sl << uint32 (op->env ? op->env->count : 0);
522		666
523	add_object_to_socklist (*pl->contr->socket, sl, op);	667	add_object_to_socklist (*pl->contr->ns, sl, op);
524		668
525	pl->contr->socket->send_packet (sl);	669	pl->contr->ns->send_packet (sl);
526	SET_FLAG (op, FLAG_CLIENT_SENT);	670	SET_FLAG (op, FLAG_CLIENT_SENT);
527	}	671	}
528		672
529	/**	673	/**
530	* Tells the client to delete an item. Uses the item	674	* Tells the client to delete an item.
531	* command with a -1 location.
532	*/	675	*/
533
534	void	676	void
535	esrv_del_item (player *pl, int tag)	677	esrv_del_item (player *pl, int tag)
536	{	678	{
537	packet sl;	679	if (!pl->ns)
		680	return;
538		681
539	sl << "delitem "	682	packet sl ("delitem");
		683
540	<< uint32 (tag);	684	sl << uint32 (tag);
541		685
542	pl->socket->send_packet (sl);	686	pl->ns->send_packet (sl);
543	}	687	}
544		688
545		689
546	/*******************************************************************************	690	/*******************************************************************************
547	*	691	*
…		…
551		695
552	/**	696	/**
553	* 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
554	* pointer, or null if it can't be found.	698	* pointer, or null if it can't be found.
555	*/	699	*/
556
557	object *	700	object *
558	esrv_get_ob_from_count (object *pl, tag_t count)	701	esrv_get_ob_from_count (object *pl, tag_t count)
559	{	702	{
560	object op, tmp;
561
562	if (pl->count == count)	703	if (pl->count == count)
563	return pl;	704	return pl;
564		705
565	for (op = pl->inv; op; op = op->below)	706	for (object *op = pl->inv; op; op = op->below)
566	if (op->count == count)	707	if (op->count == count)
567	return op;	708	return op;
568	else if (op->type == CONTAINER && pl->container == op)	709	else if (op->type == CONTAINER && pl->container == op)
569	for (tmp = op->inv; tmp; tmp = tmp->below)	710	for (object *tmp = op->inv; tmp; tmp = tmp->below)
570	if (tmp->count == count)	711	if (tmp->count == count)
571	return tmp;	712	return tmp;
572		713
573	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)
574	if (op->head && op->head->count == count)	715	if (op->head && op->head->count == count)
575	return op;	716	return op;
576	else if (op->count == count)	717	else if (op->count == count)
577	return op;	718	return op;
578	else if (op->type == CONTAINER && pl->container == op)	719	else if (op->type == CONTAINER && pl->container == op)
579	for (tmp = op->inv; tmp; tmp = tmp->below)	720	for (object *tmp = op->inv; tmp; tmp = tmp->below)
580	if (tmp->count == count)	721	if (tmp->count == count)
581	return tmp;	722	return tmp;
582		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
583	return 0;	730	return 0;
584	}	731	}
585		732
586
587	/** Client wants to examine some object. So lets do so. */	733	/** Client wants to examine some object. So lets do so. */
588	void	734	void
589	ExamineCmd (char buf, int len, player pl)	735	ExamineCmd (char buf, int len, player pl)
590	{	736	{
591	tag_t tag = atoi (buf);	737	tag_t tag = atoi (buf);
592
593	/* If the high bit is set, player examined a pseudo object. */
594	if (tag & 0x80000000)
595	return;
596
597	object *op = esrv_get_ob_from_count (pl->ob, tag);
598
599	if (!op)
600	{
601	LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
602	return;
603	}
604
605	examine (pl->ob, op);
606	}
607
608	/** Client wants to apply some object. Lets do so. */
609	void
610	ApplyCmd (char buf, int len, player pl)
611	{
612	tag_t tag = atoi (buf);
613
614	/* sort of a hack, but if the player saves and the player then manually
615	* applies a savebed (or otherwise tries to do stuff), we run into trouble.
616	*/
617	if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
618	return;
619		738
620	/* If the high bit is set, player applied a pseudo object. */	739	/* If the high bit is set, player applied a pseudo object. */
621	if (tag & 0x80000000)	740	if (tag & 0x80000000)
622	{	741	{
623	pl->socket->look_position = tag & 0x7fffffff;	742	pl->ns->look_position = tag & 0x7fffffff;
624	pl->socket->update_look = 1;	743	pl->ns->floorbox_update ();
625	return;	744	return;
626	}	745	}
627		746
628	object *op = esrv_get_ob_from_count (pl->ob, tag);	747	object *op = esrv_get_ob_from_count (pl->ob, tag);
629		748
630	if (!op)	749	if (!op)
631	{	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 ();
		786	return;
		787	}
		788
		789	object *op = esrv_get_ob_from_count (pl->ob, tag);
		790
		791	if (!op)
		792	{
632	LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);	793	LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
633	return;	794	return;
634	}	795	}
635		796
636	player_apply (pl->ob, op, 0, 0);	797	player_apply (pl->ob, op, 0, 0);
637	}	798	}
638		799
639	/** Client wants to apply some object. Lets do so. */	800	/** Client wants to lock some object. Lets do so. */
640	void	801	void
641	LockItem (char data, int len, player pl)	802	LockItem (char data, int len, player pl)
642	{	803	{
643	int flag = data[0];	804	int flag = data[0];
644	tag_t tag = net_uint32 ((uint8 *)data + 1);	805	tag_t tag = net_uint32 ((uint8 *)data + 1);
645	object *op = esrv_get_ob_from_count (pl->ob, tag);	806	object *op = esrv_get_ob_from_count (pl->ob, tag);
646		807
647	if (!op)	808	if (!op)
648	{	809	{
649	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");
650	return;	811	return;
651	}	812	}
652		813
653	if (!flag)	814	if (!flag)
654	CLEAR_FLAG (op, FLAG_INV_LOCKED);	815	CLEAR_FLAG (op, FLAG_INV_LOCKED);
…		…
656	SET_FLAG (op, FLAG_INV_LOCKED);	817	SET_FLAG (op, FLAG_INV_LOCKED);
657		818
658	esrv_update_item (UPD_FLAGS, pl->ob, op);	819	esrv_update_item (UPD_FLAGS, pl->ob, op);
659	}	820	}
660		821
661	/** Client wants to apply some object. Lets do so. */	822	/** Client wants to mark some object. Lets do so. */
662	void	823	void
663	MarkItem (char data, int len, player pl)	824	MarkItem (char data, int len, player pl)
664	{	825	{
665	tag_t tag = net_uint32 ((uint8 *)data);	826	tag_t tag = net_uint32 ((uint8 *)data);
666	object *op = esrv_get_ob_from_count (pl->ob, tag);	827	object *op = esrv_get_ob_from_count (pl->ob, tag);
667		828
668	if (!op)	829	if (!op)
669	{	830	{
670	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");	831	pl->failmsg ("Could not find object to mark");
671	return;	832	return;
672	}	833	}
673		834
674	pl->mark = op;	835	pl->mark = op;
675	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)));
676	}	837	}
677		838
678	/**	839	/**
679	* look_at prints items on the specified square.	840	* look_at prints items on the specified square.
680	*	841	*
681	* [ removed EARTHWALL check and added check for containers inventory.	842	* [ removed EARTHWALL check and added check for containers inventory.
682	* Tero.Haatanen@lut.fi ]	843	* Tero.Haatanen@lut.fi ]
683	*/	844	*/
684	void	845	static void
685	look_at (object *op, int dx, int dy)	846	look_at (player *pl, int dx, int dy)
686	{	847	{
687	object *tmp;	848	dynbuf_text buf;
688	int flag = 0;	849	object *ob = pl->ob;
689	sint16 x, y;
690	maptile *m;
691		850
692	x = op->x + dx;	851	if (!pl->observe->map)
693	y = op->y + dy;
694
695	if (out_of_map (op->map, x, y))
696	return;	852	return;
697		853
698	m = get_map_from_coord (op->map, &x, &y);	854	mapxy pos (pl->observe);
699	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, ' ')))
700	return;	893	return;
701		894
702	for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
703
704	for (; tmp != NULL; tmp = tmp->below)
705	{
706	if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
707	continue;
708
709	if (!flag)
710	{
711	if (dx \|\| dy)
712	new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
713	else
714	{
715	clear_win_info (op);
716	new_draw_info (NDI_UNIQUE, 0, op, "You see:");
717	}
718	flag = 1;
719	}
720
721	if (QUERY_FLAG (op, FLAG_WIZ))
722	new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
723	else
724	new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
725
726	if (((tmp->inv != NULL \|\| (tmp->head && tmp->head->inv)) &&
727	(tmp->type != CONTAINER && tmp->type != FLESH)) \|\| QUERY_FLAG (op, FLAG_WIZ))
728	inventory (op, tmp->head == NULL ? tmp : tmp->head);
729
730	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
731	break;
732	}
733
734	if (!flag)
735	{
736	if (dx \|\| dy)
737	new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
738	else
739	new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
740	}
741	}
742
743
744
745	/** Client wants to look at some object. Lets do so. */
746	void
747	LookAt (char buf, int len, player pl)
748	{
749	int dx, dy;
750	char *cp;
751
752	dx = atoi (buf);
753	if (!(cp = strchr (buf, ' ')))
754	{
755	return;
756	}
757	dy = atoi (cp);	895	int dy = atoi (cp);
758		896
759	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)
760	return;	901	return;
761		902
762	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])
763	return;	904	return;
		905	}
764		906
765	look_at (pl->ob, dx, dy);	907	look_at (pl, dx, dy);
766	}	908	}
767		909
768	/** Move an object to a new location */	910	/** Move an object to a new location */
769	void	911	void
770	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)
…		…
786	/* 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
787	* in the container and not the container itself.	929	* in the container and not the container itself.
788	*/	930	*/
789	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))	931	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
790	{	932	{
791	object current, next;	933	int cnt = MAX_ITEM_PER_DROP;
792		934
793	for (current = op->inv; current != NULL; current = next)	935	for (object *current = op->inv; current; )
794	{	936	{
795	next = current->below;	937	object *next = current->below;
		938
796	drop_object (pl, current, 0);	939	drop_object (pl, current, 0);
		940
		941	if (--cnt <= 0) break;
		942
		943	current = next;
797	}	944	}
798		945
799	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.");
800	}	948	}
801	else	949	else
802	drop_object (pl, op, nrof);	950	drop_object (pl, op, nrof);
803		951
804	return;	952	return;
…		…
824	/* put_object_in_sack presumes that necessary sanity checking	972	/* put_object_in_sack presumes that necessary sanity checking
825	* 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
826	* 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
827	* 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.
828	*/	976	*/
829	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))
830	put_object_in_sack (pl, env, op, nrof);	980	put_object_in_sack (pl, env, op, nrof);
831	}	981	}
832		982

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.24 by root, Sat Dec 16 22:14:42 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.24 by root, Sat Dec 16 22:14:42 2006 UTC vs.
Revision 1.64 by root, Mon May 5 22:03:22 2008 UTC