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

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

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.24 by root, Sat Dec 16 22:14:42 2006 UTC vs. Revision 1.80 by root, Mon Oct 19 21:48:49 2009 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.24 by root, Sat Dec 16 22:14:42 2006 UTC vs.
Revision 1.80 by root, Mon Oct 19 21:48:49 2009 UTC