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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.10 by root, Wed Sep 27 00:36:09 2006 UTC vs.
Revision 1.68 by root, Thu May 8 20:03:50 2008 UTC

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

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.10 by root, Wed Sep 27 00:36:09 2006 UTC vs. Revision 1.68 by root, Thu May 8 20:03:50 2008 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.10 by root, Wed Sep 27 00:36:09 2006 UTC vs.
Revision 1.68 by root, Thu May 8 20:03:50 2008 UTC