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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.42 by root, Wed Mar 14 00:04:59 2007 UTC vs.
Revision 1.69 by root, Mon Jul 14 23:47:06 2008 UTC

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

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.42 by root, Wed Mar 14 00:04:59 2007 UTC vs. Revision 1.69 by root, Mon Jul 14 23:47:06 2008 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.42 by root, Wed Mar 14 00:04:59 2007 UTC vs.
Revision 1.69 by root, Mon Jul 14 23:47:06 2008 UTC