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

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

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.8 by root, Sat Sep 16 22:24:13 2006 UTC vs. Revision 1.63 by root, Thu Apr 24 00:30:52 2008 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.8 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.63 by root, Thu Apr 24 00:30:52 2008 UTC