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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.41 by root, Sun Mar 11 02:12:45 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	if (!(ns.faces_sent[head->face] & NS_FACESENT_FACE))
270	esrv_send_face (&ns, head->face, 0);	125	ns.send_face (head->face, -50);
		126	ns.flush_fx ();
271		127
272	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])
273	esrv_send_animation (&ns, head->animation_id);	129	ns.send_animation (head->animation_id);
274		130
275	sl << uint32 (head->count)	131	sl << uint32 (head->count)
276	<< uint32 (flags)	132	<< uint32 (flags)
277	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))	133	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
278	<< uint32 (head->face);	134	<< uint32 (head->face);
		135
		136	int len;
279		137
280	if (!head->custom_name)	138	if (!head->custom_name)
281	{	139	{
282	strncpy (item_n, query_base_name (head, 0), 127);	140	strncpy (item_n, query_base_name (head, 0), 127);
283	item_n[127] = 0;	141	item_n[127] = 0;
…		…
297	len += strlen (item_n + 1 + len) + 1;	155	len += strlen (item_n + 1 + len) + 1;
298		156
299	sl << data8 (item_n, len)	157	sl << data8 (item_n, len)
300	<< uint16 (head->animation_id);	158	<< uint16 (head->animation_id);
301		159
302	anim_speed = 0;	160	int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
303	if (QUERY_FLAG (head, FLAG_ANIMATE))	161	: head->anim_speed ? clamp (head->anim_speed, 1, 255)
304	{	162	: 1. / clamp (fabs (head->speed), 1./255., 1./1.);
305	if (head->anim_speed)
306	anim_speed = head->anim_speed;
307	else
308	{
309	if (fabs (head->speed) < 0.001)
310	anim_speed = 255;
311	else if (fabs (head->speed) >= 1.0)
312	anim_speed = 1;
313	else
314	anim_speed = (int) (1.0 / fabs (head->speed));
315	}
316
317	if (anim_speed > 255)
318	anim_speed = 255;
319	}
320		163
321	sl << uint8 (anim_speed)	164	sl << uint8 (anim_speed)
322	<< uint32 (head->nrof);	165	<< uint32 (head->nrof);
323		166
324	if (ns.itemcmd == 2)	167	if (ns.itemcmd == 2)
325	sl << uint16 (head->client_type);	168	sl << uint16 (head->client_type);
326		169
327	SET_FLAG (head, FLAG_CLIENT_SENT);	170	SET_FLAG (head, FLAG_CLIENT_SENT);
328	}	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"
329		186
330	/**	187	/**
331	* Send the look window. Don't need to do animations here	188	* Send the look window. Don't need to do animations here
332	* 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
333	* because object ordering would otherwise be inconsistent.	190	* because object ordering would otherwise be inconsistent.
334	*/	191	*/
335	void	192	void
336	esrv_draw_look (object *pl)	193	esrv_draw_look (player *pl)
337	{	194	{
338	int got_one = 0, start_look = 0, end_look = 0;	195	object *ob = pl->ob;
339		196
340	if (!pl->contr->ns->update_look)	197	if (!pl->ns->update_look)
341	{	198	{
342	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);
343	return;	200	return;
344	}	201	}
345	else	202
346	pl->contr->ns->update_look = 0;	203	pl->ns->update_look = 0;
347		204
348	if (QUERY_FLAG (pl, FLAG_REMOVED)	205	if (QUERY_FLAG (ob, FLAG_REMOVED)
349	\|\| !pl->map	206	\|\| !ob->map
350	\|\| pl->map->in_memory != MAP_IN_MEMORY	207	\|\| ob->map->in_memory != MAP_ACTIVE
351	\|\| out_of_map (pl->map, pl->x, pl->y))	208	\|\| out_of_map (ob->map, ob->x, ob->y))
352	return;	209	return;
353		210
354	pl->contr->ns->send_packet ("delinv 0");	211	pl->ns->send_packet ("delinv 0");
355		212
356	packet sl;	213	packet sl;
357	sl.printf ("item%d ", pl->contr->ns->itemcmd);	214	sl.printf ("item%d ", pl->ns->itemcmd);
358		215
359	sl << uint32 (0);	216	sl << uint32 (0);
360		217
361	if (!(pl->contr->ns->faces_sent[empty_face] & NS_FACESENT_FACE))	218	int start_pos = pl->ns->look_position;
362	esrv_send_face (pl->contr->ns, empty_face, 0);	219	bool dirty = false;
363		220
364	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	}
365	{	251	}
366	char buf[80];
367	snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
368		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	*/
369	sl << uint32 (0x80000000 \| (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))	259	sl << uint32 (0x80000000 \| (start_pos + FLOORBOX_PAGESIZE))
370	<< uint32 (0)	260	<< uint32 (0)
371	<< sint32 (-1)	261	<< uint32 ((uint32) - 1)
372	<< uint32 (empty_face)	262	<< uint32 (need_face_now (pl, FINGER_DOWN))
373	<< data8 (buf)	263	<< data8 ("Apply this to see the items below")
374	<< uint16 (0)	264	<< uint16 (0)
375	<< uint8 (0)	265	<< uint8 (0)
376	<< uint32 (0);	266	<< uint32 (0);
377		267
378	if (pl->contr->ns->itemcmd == 2)	268	if (pl->ns->itemcmd == 2)
379	sl << uint16 (0);	269	sl << uint16 (0);
380	}
381		270
382	object *tmp = pl->ms ().top;	271	dirty = true;
383	for (object *last = 0; tmp != last; tmp = tmp->below)
384	{	272	}
385	object *head;
386		273
387	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)
388	{	287	{
389	last = tmp->below; /* assumes double floor mode */	288	pl->ns->send_packet (sl);
390	if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))	289
391	last = last->below;	290	sl.reset ();
		291	sl.printf ("item%d ", pl->ns->itemcmd);
		292	sl << uint32 (0);
		293
		294	dirty = false;
392	}	295	}
393
394	if (tmp->client_visible ())
395	{
396	if (++start_look < pl->contr->ns->look_position)
397	continue;
398
399	end_look++;
400
401	if (end_look > FLOORBOX_PAGESIZE)
402	{
403	/* What we basically do is make a 'fake' object - when the user applies it,
404	* we notice the special tag the object has, and act accordingly.
405	*/
406	sl << uint32 (0x80000000 \| (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
407	<< uint32 (0)
408	<< uint32 ((uint32) - 1)
409	<< uint32 (empty_face)
410	<< data8 ("Apply this to see next group of items")
411	<< uint16 (0)
412	<< uint8 (0)
413	<< uint32 (0);
414
415	if (pl->contr->ns->itemcmd == 2)
416	sl << uint16 (0);
417
418	break;
419	}
420
421	if (tmp->head)
422	head = tmp->head;
423	else
424	head = tmp;
425
426	add_object_to_socklist (*pl->contr->ns, sl, head);
427	got_one++;
428
429	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
430	{
431	pl->contr->ns->send_packet (sl);
432
433	sl.reset ();
434	sl.printf ("item%d ", pl->contr->ns->itemcmd);
435	sl << uint32 (0);
436	got_one = 0;
437	}
438	}
439	}	296	}
440		297
441	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)
442	pl->contr->ns->send_packet (sl);	316	pl->ns->send_packet (sl);
443
444	}	317	}
445		318
446	/**	319	/**
447	* Sends whole inventory.	320	* Sends whole inventory.
448	*/	321	*/
…		…
478		351
479	/* IT is possible for players to accumulate a huge amount of	352	/* IT is possible for players to accumulate a huge amount of
480	* items (especially with some of the bags out there) to	353	* items (especially with some of the bags out there) to
481	* overflow the buffer. IF so, send multiple item commands.	354	* overflow the buffer. IF so, send multiple item commands.
482	*/	355	*/
483	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))	356	if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
484	{	357	{
485	pl->contr->ns->send_packet (sl);	358	pl->contr->ns->send_packet (sl);
486		359
487	sl.reset ();	360	sl.reset ();
488	sl.printf ("item%d ", pl->contr->ns->itemcmd);	361	sl.printf ("item%d ", pl->contr->ns->itemcmd);
…		…
505	*/	378	*/
506	void	379	void
507	esrv_update_item (int flags, object pl, object op)	380	esrv_update_item (int flags, object pl, object op)
508	{	381	{
509	/* 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. */
510	if (op != pl)
511	{
512	if (!op->client_visible ())	383	if (op != pl && !op->client_visible ())
513	return;	384	return;
514	/* we remove the check for op->env, because in theory, the object
515	* is hopefully in the same place, so the client should preserve
516	* order.
517	*/
518	}
519		385
520	client *ns = pl->contr->ns;	386	client *ns = pl->contr->ns;
521	if (!ns)	387	if (!ns)
522	return;	388	return;
523		389
524	if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))	390	if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
525	{
526	/* 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
527	* 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
528	* and track back the call.	393	* and track back the call.
529	*/	394	*/
530	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);
531	}
532		396
533	packet sl ("upditem");	397	packet sl ("upditem");
534		398
535	sl << uint8 (flags);	399	sl << uint8 (flags);
536		400
537	if (op->head)
538	op = op->head;	401	op = op->head_ ();
539		402
540	sl << uint32 (op->count);	403	sl << uint32 (op->count);
541		404
542	if (flags & UPD_LOCATION)	405	if (flags & UPD_LOCATION)
543	sl << uint32 (op->env ? op->env->count : 0);	406	sl << uint32 (op->env ? op->env->count : 0);
…		…
545	if (flags & UPD_FLAGS)	408	if (flags & UPD_FLAGS)
546	sl << uint32 (query_flags (op));	409	sl << uint32 (query_flags (op));
547		410
548	if (flags & UPD_WEIGHT)	411	if (flags & UPD_WEIGHT)
549	{	412	{
550	sint32 weight = WEIGHT (op);	413	sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
551		414
552	sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
553
554	if (pl == op)	415	if (op)
555	ns->last_weight = weight;	416	ns->last_weight = weight;
		417
		418	sl << uint32 (weight);
556	}	419	}
557		420
558	if (flags & UPD_FACE)	421	if (flags & UPD_FACE)
559	{	422	{
560	if (!(ns->faces_sent[op->face] & NS_FACESENT_FACE))
561	esrv_send_face (ns, op->face, 0);	423	ns->send_face (op->face, -50);
562		424	ns->flush_fx ();
563	sl << uint32 (op->face);	425	sl << uint32 (op->face);
564	}	426	}
565		427
566	if (flags & UPD_NAME)	428	if (flags & UPD_NAME)
567	{	429	{
…		…
632	esrv_send_item (object pl, object op)	494	esrv_send_item (object pl, object op)
633	{	495	{
634	if (!pl->contr->ns)	496	if (!pl->contr->ns)
635	return;	497	return;
636		498
637	/* If this is not the player object, do some more checks */
638	if (op != pl)
639	{
640	/* We only send 'visibile' objects to the client */	499	/* We only send 'visible' objects to the client, and sometimes the player */
641	if (!op->client_visible ())	500	if (!op->client_visible () && op->type != PLAYER)
642	return;	501	return;
643
644	/* if the item is on the ground, mark that the look needs to
645	* be updated.
646	*/
647	if (!op->env)
648	{
649	pl->contr->ns->floorbox_update ();
650	return;
651	}
652	}
653		502
654	packet sl;	503	packet sl;
655		504
656	sl.printf ("item%d ", pl->contr->ns->itemcmd);	505	sl.printf ("item%d ", pl->contr->ns->itemcmd);
657		506
658	if (op->head)
659	op = op->head;	507	op = op->head_ ();
660		508
661	sl << uint32 (op->env ? op->env->count : 0);	509	sl << uint32 (op->env ? op->env->count : 0);
662		510
663	add_object_to_socklist (*pl->contr->ns, sl, op);	511	add_object_to_socklist (*pl->contr->ns, sl, op);
664		512
665	pl->contr->ns->send_packet (sl);	513	pl->contr->ns->send_packet (sl);
666	SET_FLAG (op, FLAG_CLIENT_SENT);	514	SET_FLAG (op, FLAG_CLIENT_SENT);
667	}	515	}
668		516
669	/**	517	/**
670	* Tells the client to delete an item. Uses the item	518	* Tells the client to delete an item.
671	* command with a -1 location.
672	*/	519	*/
673	void	520	void
674	esrv_del_item (player *pl, int tag)	521	esrv_del_item (player *pl, int tag)
675	{	522	{
676	if (!pl->ns)	523	if (!pl->ns)
…		…
692		539
693	/**	540	/**
694	* 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
695	* pointer, or null if it can't be found.	542	* pointer, or null if it can't be found.
696	*/	543	*/
697
698	object *	544	object *
699	esrv_get_ob_from_count (object *pl, tag_t count)	545	esrv_get_ob_from_count (object *pl, tag_t count)
700	{	546	{
701	object op, tmp;
702
703	if (pl->count == count)	547	if (pl->count == count)
704	return pl;	548	return pl;
705		549
706	for (op = pl->inv; op; op = op->below)	550	for (object *op = pl->inv; op; op = op->below)
707	if (op->count == count)	551	if (op->count == count)
708	return op;	552	return op;
709	else if (op->type == CONTAINER && pl->container == op)	553	else if (op->type == CONTAINER && pl->container == op)
710	for (tmp = op->inv; tmp; tmp = tmp->below)	554	for (object *tmp = op->inv; tmp; tmp = tmp->below)
711	if (tmp->count == count)	555	if (tmp->count == count)
712	return tmp;	556	return tmp;
713		557
714	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)
715	if (op->head && op->head->count == count)	559	if (op->head && op->head->count == count)
716	return op;	560	return op;
717	else if (op->count == count)	561	else if (op->count == count)
718	return op;	562	return op;
719	else if (op->type == CONTAINER && pl->container == op)	563	else if (op->type == CONTAINER && pl->container == op)
720	for (tmp = op->inv; tmp; tmp = tmp->below)	564	for (object *tmp = op->inv; tmp; tmp = tmp->below)
721	if (tmp->count == count)	565	if (tmp->count == count)
722	return tmp;	566	return tmp;
723		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
724	return 0;	574	return 0;
725	}	575	}
726		576
727
728	/** Client wants to examine some object. So lets do so. */	577	/** Client wants to examine some object. So lets do so. */
729	void	578	void
730	ExamineCmd (char buf, int len, player pl)	579	ExamineCmd (char buf, int len, player pl)
731	{	580	{
732	tag_t tag = atoi (buf);	581	tag_t tag = atoi (buf);
733		582
734	/* If the high bit is set, player examined a pseudo object. */	583	/* If the high bit is set, player applied a pseudo object. */
735	if (tag & 0x80000000)	584	if (tag & 0x80000000)
		585	{
		586	pl->ns->look_position = tag & 0x7fffffff;
		587	pl->ns->floorbox_update ();
736	return;	588	return;
		589	}
737		590
738	object *op = esrv_get_ob_from_count (pl->ob, tag);	591	object *op = esrv_get_ob_from_count (pl->ob, tag);
739		592
740	if (!op)	593	if (!op)
741	{	594	{
…		…
744	}	597	}
745		598
746	examine (pl->ob, op);	599	examine (pl->ob, op);
747	}	600	}
748		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
749	/** Client wants to apply some object. Lets do so. */	622	/** Client wants to apply some object. Lets do so. */
750	void	623	void
751	ApplyCmd (char buf, int len, player pl)	624	ApplyCmd (char buf, int len, player pl)
752	{	625	{
753	tag_t tag = atoi (buf);	626	tag_t tag = atoi (buf);
754
755	/* sort of a hack, but if the player saves and the player then manually
756	* applies a savebed (or otherwise tries to do stuff), we run into trouble.
757	*/
758	if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
759	return;
760		627
761	/* If the high bit is set, player applied a pseudo object. */	628	/* If the high bit is set, player applied a pseudo object. */
762	if (tag & 0x80000000)	629	if (tag & 0x80000000)
763	{	630	{
764	pl->ns->look_position = tag & 0x7fffffff;	631	pl->ns->look_position = tag & 0x7fffffff;
…		…
785	tag_t tag = net_uint32 ((uint8 *)data + 1);	652	tag_t tag = net_uint32 ((uint8 *)data + 1);
786	object *op = esrv_get_ob_from_count (pl->ob, tag);	653	object *op = esrv_get_ob_from_count (pl->ob, tag);
787		654
788	if (!op)	655	if (!op)
789	{	656	{
790	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");
791	return;	658	return;
792	}	659	}
793		660
794	if (!flag)	661	if (!flag)
795	CLEAR_FLAG (op, FLAG_INV_LOCKED);	662	CLEAR_FLAG (op, FLAG_INV_LOCKED);
…		…
806	tag_t tag = net_uint32 ((uint8 *)data);	673	tag_t tag = net_uint32 ((uint8 *)data);
807	object *op = esrv_get_ob_from_count (pl->ob, tag);	674	object *op = esrv_get_ob_from_count (pl->ob, tag);
808		675
809	if (!op)	676	if (!op)
810	{	677	{
811	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");	678	pl->failmsg ("Could not find object to mark");
812	return;	679	return;
813	}	680	}
814		681
815	pl->mark = op;	682	pl->mark = op;
816	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)));
817	}	684	}
818		685
819	/**	686	/**
820	* look_at prints items on the specified square.	687	* look_at prints items on the specified square.
821	*	688	*
822	* [ removed EARTHWALL check and added check for containers inventory.	689	* [ removed EARTHWALL check and added check for containers inventory.
823	* Tero.Haatanen@lut.fi ]	690	* Tero.Haatanen@lut.fi ]
824	*/	691	*/
825	void	692	static void
826	look_at (object *op, int dx, int dy)	693	look_at (player *pl, int dx, int dy)
827	{	694	{
828	object *tmp;	695	dynbuf_text buf;
829	int flag = 0;	696	object *ob = pl->ob;
830	sint16 x, y;
831	maptile *m;
832		697
833	x = op->x + dx;	698	if (!pl->observe->map)
834	y = op->y + dy;
835
836	if (out_of_map (op->map, x, y))
837	return;	699	return;
838		700
839	m = get_map_from_coord (op->map, &x, &y);	701	mapxy pos (pl->observe);
840	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, ' ')))
841	return;	740	return;
842		741
843	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
844
845	for (; tmp != NULL; tmp = tmp->below)
846	{
847	if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
848	continue;
849
850	if (!flag)
851	{
852	if (dx \|\| dy)
853	new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
854	else
855	{
856	clear_win_info (op);
857	new_draw_info (NDI_UNIQUE, 0, op, "You see:");
858	}
859	flag = 1;
860	}
861
862	if (QUERY_FLAG (op, FLAG_WIZ))
863	new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
864	else
865	new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
866
867	if (((tmp->inv != NULL \|\| (tmp->head && tmp->head->inv)) &&
868	(tmp->type != CONTAINER && tmp->type != FLESH)) \|\| QUERY_FLAG (op, FLAG_WIZ))
869	inventory (op, tmp->head == NULL ? tmp : tmp->head);
870
871	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
872	break;
873	}
874
875	if (!flag)
876	{
877	if (dx \|\| dy)
878	new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
879	else
880	new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
881	}
882	}
883
884	/** Client wants to look at some object. Lets do so. */
885	void
886	LookAt (char buf, int len, player pl)
887	{
888	int dx, dy;
889	char *cp;
890
891	dx = atoi (buf);
892	if (!(cp = strchr (buf, ' ')))
893	{
894	return;
895	}
896	dy = atoi (cp);	742	int dy = atoi (cp);
897		743
		744	if (player *opl = pl->observe->contr)
		745	if (client *ns = opl->ns)
		746	{
898	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)
899	return;	748	return;
900		749
901	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])
902	return;	751	return;
		752	}
903		753
904	look_at (pl->ob, dx, dy);	754	look_at (pl, dx, dy);
905	}	755	}
906		756
907	/** Move an object to a new location */	757	/** Move an object to a new location */
908	void	758	void
909	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)
910	{	760	{
911	object op, env;
912
913	op = esrv_get_ob_from_count (pl, tag);	761	object *op = esrv_get_ob_from_count (pl, tag);
914	if (!op)	762	if (!op)
915	{	763	{
916	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);
917	return;	765	return;
918	}	766	}
…		…
925	/* 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
926	* in the container and not the container itself.	774	* in the container and not the container itself.
927	*/	775	*/
928	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))	776	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
929	{	777	{
930	object current, next;	778	int cnt = MAX_ITEM_PER_DROP;
931		779
932	for (current = op->inv; current != NULL; current = next)	780	for (object *current = op->inv; current && cnt--; )
933	{	781	{
934	next = current->below;	782	object *next = current->below;
935	drop_object (pl, current, 0);	783	drop_object (pl, current, 0);
		784	current = next;
936	}	785	}
937		786
938	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.");
939	}	789	}
940	else	790	else
941	drop_object (pl, op, nrof);	791	drop_object (pl, op, nrof);
942		792
943	return;	793	return;
…		…
951	pl->contr->count = nrof;	801	pl->contr->count = nrof;
952	pick_up (pl, op);	802	pick_up (pl, op);
953	return;	803	return;
954	}	804	}
955		805
956	env = esrv_get_ob_from_count (pl, to);	806	object *env = esrv_get_ob_from_count (pl, to);
957	if (!env)	807	if (!env)
958	{	808	{
959	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);
960	return;	810	return;
961	}	811	}
…		…
963	/* put_object_in_sack presumes that necessary sanity checking	813	/* put_object_in_sack presumes that necessary sanity checking
964	* 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
965	* 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
966	* 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.
967	*/	817	*/
968	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))
969	put_object_in_sack (pl, env, op, nrof);	821	put_object_in_sack (pl, env, op, nrof);
970	}	822	}
971		823

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.41 by root, Sun Mar 11 02:12:45 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.41 by root, Sun Mar 11 02:12:45 2007 UTC vs.
Revision 1.69 by root, Mon Jul 14 23:47:06 2008 UTC