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

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

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.29 by root, Thu Dec 21 23:37:06 2006 UTC vs. Revision 1.69 by root, Mon Jul 14 23:47:06 2008 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.29 by root, Thu Dec 21 23:37:06 2006 UTC vs.
Revision 1.69 by root, Mon Jul 14 23:47:06 2008 UTC