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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.1 by elmex, Sun Aug 13 17:16:06 2006 UTC vs.
Revision 1.65 by root, Tue May 6 16:32:34 2008 UTC

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

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.1 by elmex, Sun Aug 13 17:16:06 2006 UTC vs. Revision 1.65 by root, Tue May 6 16:32:34 2008 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.1 by elmex, Sun Aug 13 17:16:06 2006 UTC vs.
Revision 1.65 by root, Tue May 6 16:32:34 2008 UTC