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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.48 by root, Fri Jun 8 09:18:31 2007 UTC vs.
Revision 1.80 by root, Mon Oct 19 21:48:49 2009 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software; you can redistribute it and/or modify it	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* under the terms of the GNU General Public License as published by the Free	9	* the terms of the Affero GNU General Public License as published by the
10	* Software Foundation; either version 2 of the License, or (at your option)	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful, but	13	* This program is distributed in the hope that it will be useful,
14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* 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 along	18	* You should have received a copy of the Affero GNU General Public License
19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51	19	* and the GNU General Public License along with this program. If not, see
20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* The authors can be reached via e-mail to <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	23	*/
24		24
25	/**	25	/**
26	* \file	26	* \file
27	* Client/server logic.	27	* Client/server logic.
38	#include <sproto.h>	38	#include <sproto.h>
39		39
40	/** 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 */
41	#define MAXITEMLEN 300	41	#define MAXITEMLEN 300
42		42
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	/*******************************************************************************	43	/*******************************************************************************
184	*	44	*
185	* Functions related to sending object data to the client.	45	* Functions related to sending object data to the client.
186	*	46	*
187	******************************************************************************/	47	******************************************************************************/
…		…
194	query_flags (object *op)	54	query_flags (object *op)
195	{	55	{
196	unsigned int flags = 0;	56	unsigned int flags = 0;
197		57
198	if (QUERY_FLAG (op, FLAG_APPLIED))	58	if (QUERY_FLAG (op, FLAG_APPLIED))
199	{
200	switch (op->type)	59	switch (op->type)
201	{	60	{
202	case BOW:	61	case BOW:
203	case WAND:	62	case WAND:
204	case ROD:	63	case ROD:
205	case HORN:	64	case HORN:
206	flags = a_readied;	65	flags = a_readied;
207	break;	66	break;
208	case WEAPON:	67	case WEAPON:
209	flags = a_wielded;	68	flags = a_wielded;
210	break;	69	break;
211	case SKILL:	70	case SKILL:
212	case ARMOUR:	71	case ARMOUR:
213	case HELMET:	72	case HELMET:
214	case SHIELD:	73	case SHIELD:
215	case RING:	74	case RING:
216	case BOOTS:	75	case BOOTS:
217	case GLOVES:	76	case GLOVES:
218	case AMULET:	77	case AMULET:
219	case GIRDLE:	78	case GIRDLE:
220	case BRACERS:	79	case BRACERS:
221	case CLOAK:	80	case CLOAK:
222	flags = a_worn;	81	flags = a_worn;
223	break;	82	break;
224	case CONTAINER:	83	case CONTAINER:
225	flags = a_active;	84	flags = a_active;
226	break;	85	break;
227	default:	86	default:
228	flags = a_applied;	87	flags = a_applied;
229	break;	88	break;
230	}	89	}
231	}
232		90
233	if (op->type == CONTAINER && ((op->env && op->env->container == op) \|\| (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))	91	if (op->is_open_container ())
234	flags \|= F_OPEN;	92	flags \|= F_OPEN;
235		93
236	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))	94	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
237	{	95	{
238	if (QUERY_FLAG (op, FLAG_DAMNED))	96	if (QUERY_FLAG (op, FLAG_DAMNED))
…		…
256	* animation of face to the client.	114	* animation of face to the client.
257	*/	115	*/
258	static void	116	static void
259	add_object_to_socklist (client &ns, packet &sl, object *head)	117	add_object_to_socklist (client &ns, packet &sl, object *head)
260	{	118	{
261	int flags, len, anim_speed;
262	char item_n[MAX_BUF];	119	char item_n[MAX_BUF];
263	const char *item_p;	120	const char *item_p;
264		121
265	flags = query_flags (head);	122	int flags = query_flags (head);
266	if (QUERY_FLAG (head, FLAG_NO_PICK))	123	if (QUERY_FLAG (head, FLAG_NO_PICK))
267	flags \|= F_NOPICK;	124	flags \|= F_NOPICK;
268		125
269	ns.send_face (head->face);	126	ns.send_face (head->face, -50);
270	ns.flush_fx ();	127	ns.flush_fx ();
271		128
272	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])
273	ns.send_animation (head->animation_id);	130	ns.send_animation (head->animation_id);
274		131
275	sl << uint32 (head->count)	132	sl << uint32 (head->count)
276	<< uint32 (flags)	133	<< uint32 (flags)
277	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))	134	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
278	<< uint32 (head->face);	135	<< uint32 (head->face);
		136
		137	int len;
279		138
280	if (!head->custom_name)	139	if (!head->custom_name)
281	{	140	{
282	strncpy (item_n, query_base_name (head, 0), 127);	141	strncpy (item_n, query_base_name (head, 0), 127);
283	item_n[127] = 0;	142	item_n[127] = 0;
…		…
297	len += strlen (item_n + 1 + len) + 1;	156	len += strlen (item_n + 1 + len) + 1;
298		157
299	sl << data8 (item_n, len)	158	sl << data8 (item_n, len)
300	<< uint16 (head->animation_id);	159	<< uint16 (head->animation_id);
301		160
302	anim_speed = 0;	161	int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
303	if (QUERY_FLAG (head, FLAG_ANIMATE))	162	: head->anim_speed ? clamp (head->anim_speed, 1, 255)
304	{	163	: 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		164
321	sl << uint8 (anim_speed)	165	sl << uint8 (anim_speed)
322	<< uint32 (head->nrof);	166	<< uint32 (head->nrof);
323		167
324	if (ns.itemcmd == 2)	168	if (ns.itemcmd == 2)
325	sl << uint16 (head->client_type);	169	sl << uint16 (head->client_type);
326
327	SET_FLAG (head, FLAG_CLIENT_SENT);
328	}	170	}
		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"
329		185
330	/**	186	/**
331	* Send the look window. Don't need to do animations here	187	* 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	188	* This sends all the faces to the client, not just updates. This is
333	* because object ordering would otherwise be inconsistent.	189	* because object ordering would otherwise be inconsistent.
334	*/	190	*/
335	void	191	void
336	esrv_draw_look (player *pl)	192	esrv_draw_look (player *pl)
337	{	193	{
338	int got_one = 0, start_look = 0, end_look = 0;
339
340	object *ob = pl->ob;	194	object *ob = pl->ob;
341		195
342	if (!pl->ns->update_look)	196	if (!pl->ns->update_look)
343	{	197	{
344	LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);	198	LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
345	return;	199	return;
346	}	200	}
347	else	201
348	pl->ns->update_look = 0;	202	pl->ns->update_look = 0;
349		203
350	if (QUERY_FLAG (ob, FLAG_REMOVED)	204	if (QUERY_FLAG (ob, FLAG_REMOVED)
351	\|\| !ob->map	205	\|\| !ob->map
352	\|\| ob->map->in_memory != MAP_IN_MEMORY	206	\|\| ob->map->in_memory != MAP_ACTIVE
353	\|\| out_of_map (ob->map, ob->x, ob->y))	207	\|\| out_of_map (ob->map, ob->x, ob->y))
354	return;	208	return;
355		209
356	pl->ns->send_packet ("delinv 0");	210	pl->ns->send_packet ("delinv 0");
357		211
358	packet sl;	212	packet sl;
359	sl.printf ("item%d ", pl->ns->itemcmd);	213	sl.printf ("item%d ", pl->ns->itemcmd);
360		214
361	sl << uint32 (0);	215	sl << uint32 (0);
362		216
363	pl->ns->send_face (empty_face);	217	int start_pos = pl->ns->look_position;
364	pl->ns->flush_fx ();	218	bool dirty = false;
365		219
366	if (pl->ns->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	}
367	{	250	}
368	char buf[80];
369	snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
370		251
		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	*/
371	sl << uint32 (0x80000000 \| (pl->ns->look_position - FLOORBOX_PAGESIZE))	258	sl << uint32 (0x80000000 \| (start_pos + FLOORBOX_PAGESIZE))
372	<< uint32 (0)	259	<< uint32 (0)
373	<< sint32 (-1)	260	<< uint32 ((uint32) - 1)
374	<< uint32 (empty_face)	261	<< uint32 (need_face_now (pl, FINGER_DOWN))
375	<< data8 (buf)	262	<< data8 ("Apply this to see the items below")
376	<< uint16 (0)	263	<< uint16 (0)
377	<< uint8 (0)	264	<< uint8 (0)
378	<< uint32 (0);	265	<< uint32 (0);
379		266
380	if (pl->ns->itemcmd == 2)	267	if (pl->ns->itemcmd == 2)
381	sl << uint16 (0);	268	sl << uint16 (0);
382	}
383		269
384	object *tmp = ob->ms ().top;	270	dirty = true;
385	for (object *last = 0; tmp != last; tmp = tmp->below)
386	{	271	}
387	object *head;
388		272
389	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)
390	{	286	{
391	last = tmp->below; /* assumes double floor mode */	287	pl->ns->send_packet (sl);
392	if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))	288
393	last = last->below;	289	sl.reset ();
		290	sl.printf ("item%d ", pl->ns->itemcmd);
		291	sl << uint32 (0);
		292
		293	dirty = false;
394	}	294	}
395
396	if (tmp->client_visible ())
397	{
398	if (++start_look < pl->ns->look_position)
399	continue;
400
401	end_look++;
402
403	if (end_look > FLOORBOX_PAGESIZE)
404	{
405	/* What we basically do is make a 'fake' object - when the user applies it,
406	* we notice the special tag the object has, and act accordingly.
407	*/
408	sl << uint32 (0x80000000 \| (pl->ns->look_position + FLOORBOX_PAGESIZE))
409	<< uint32 (0)
410	<< uint32 ((uint32) - 1)
411	<< uint32 (empty_face)
412	<< data8 ("Apply this to see next group of items")
413	<< uint16 (0)
414	<< uint8 (0)
415	<< uint32 (0);
416
417	if (pl->ns->itemcmd == 2)
418	sl << uint16 (0);
419
420	break;
421	}
422
423	if (tmp->head)
424	head = tmp->head;
425	else
426	head = tmp;
427
428	add_object_to_socklist (*pl->ns, sl, head);
429	got_one++;
430
431	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
432	{
433	pl->ns->send_packet (sl);
434
435	sl.reset ();
436	sl.printf ("item%d ", pl->ns->itemcmd);
437	sl << uint32 (0);
438	got_one = 0;
439	}
440	}
441	}	295	}
442		296
443	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)
444	pl->ns->send_packet (sl);	315	pl->ns->send_packet (sl);
445
446	}	316	}
447		317
448	/**	318	/**
449	* Sends whole inventory.	319	* Sends whole inventory.
450	*/	320	*/
…		…
480		350
481	/* IT is possible for players to accumulate a huge amount of	351	/* IT is possible for players to accumulate a huge amount of
482	* items (especially with some of the bags out there) to	352	* items (especially with some of the bags out there) to
483	* overflow the buffer. IF so, send multiple item commands.	353	* overflow the buffer. IF so, send multiple item commands.
484	*/	354	*/
485	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))	355	if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
486	{	356	{
487	pl->contr->ns->send_packet (sl);	357	pl->contr->ns->send_packet (sl);
488		358
489	sl.reset ();	359	sl.reset ();
490	sl.printf ("item%d ", pl->contr->ns->itemcmd);	360	sl.printf ("item%d ", pl->contr->ns->itemcmd);
…		…
507	*/	377	*/
508	void	378	void
509	esrv_update_item (int flags, object pl, object op)	379	esrv_update_item (int flags, object pl, object op)
510	{	380	{
511	/* 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. */
512	if (op != pl)
513	{
514	if (!op->client_visible ())	382	if (op != pl && !op->client_visible ())
515	return;	383	return;
516	/* we remove the check for op->env, because in theory, the object
517	* is hopefully in the same place, so the client should preserve
518	* order.
519	*/
520	}
521		384
522	client *ns = pl->contr->ns;	385	client *ns = pl->contr->ns;
523	if (!ns)	386	if (!ns)
524	return;	387	return;
525		388
526	if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
527	{
528	/* FLAG_CLIENT_SENT is debug only. We are using it to see where
529	* this is happening - we can set a breakpoint here in the debugger
530	* and track back the call.
531	*/
532	LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
533	}
534
535	packet sl ("upditem");	389	packet sl ("upditem");
536		390
537	sl << uint8 (flags);	391	sl << uint8 (flags);
538		392
539	if (op->head)
540	op = op->head;	393	op = op->head_ ();
541		394
542	sl << uint32 (op->count);	395	sl << uint32 (op->count);
543		396
544	if (flags & UPD_LOCATION)	397	if (flags & UPD_LOCATION)
545	sl << uint32 (op->env ? op->env->count : 0);	398	sl << uint32 (op->env ? op->env->count : 0);
…		…
547	if (flags & UPD_FLAGS)	400	if (flags & UPD_FLAGS)
548	sl << uint32 (query_flags (op));	401	sl << uint32 (query_flags (op));
549		402
550	if (flags & UPD_WEIGHT)	403	if (flags & UPD_WEIGHT)
551	{	404	{
552	sint32 weight = WEIGHT (op);	405	sint32 weight = op->client_weight ();
553		406
554	sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);	407	if (op == pl)
555
556	if (pl == op)
557	ns->last_weight = weight;	408	ns->last_weight = weight;
		409
		410	sl << uint32 (weight);
558	}	411	}
559		412
560	if (flags & UPD_FACE)	413	if (flags & UPD_FACE)
561	{	414	{
562	ns->send_face (op->face);	415	ns->send_face (op->face, -50);
563	ns->flush_fx ();	416	ns->flush_fx ();
564	sl << uint32 (op->face);	417	sl << uint32 (op->face);
565	}	418	}
566		419
567	if (flags & UPD_NAME)	420	if (flags & UPD_NAME)
568	{	421	{
569	int len;	422	int len;
570	const char *item_p;	423	const char *item_p;
571	char item_n[MAX_BUF];	424	char item_n[127 * 2];
572		425
573	if (!op->custom_name)	426	if (!op->custom_name)
574	{	427	{
575	strncpy (item_n, query_base_name (op, 0), 127);	428	len = assign (item_n, query_base_name (op, 0), 127);
576	item_n[127] = 0;
577	len = strlen (item_n);
578	item_p = query_base_name (op, 1);	429	item_p = query_base_name (op, 1);
579	}	430	}
580	else	431	else
581	{	432	{
582	strncpy (item_n, op->custom_name, 127);	433	len = assign (item_n, &op->custom_name, 127);
583	item_n[127] = 0;
584	len = strlen (item_n);
585	item_p = op->custom_name;	434	item_p = &op->custom_name;
586	}	435	}
587		436
588	strncpy (item_n + len + 1, item_p, 127);	437	len += assign (item_n + len, item_p, 127);
589	item_n[254] = 0;
590	len += strlen (item_n + 1 + len) + 1;
591		438
592	sl << data8 (item_n, len);	439	sl << data8 (item_n, len);
593	}	440	}
594		441
595	if (flags & UPD_ANIM)	442	if (flags & UPD_ANIM)
…		…
633	esrv_send_item (object pl, object op)	480	esrv_send_item (object pl, object op)
634	{	481	{
635	if (!pl->contr->ns)	482	if (!pl->contr->ns)
636	return;	483	return;
637		484
638	/* If this is not the player object, do some more checks */
639	if (op != pl)
640	{
641	/* We only send 'visibile' objects to the client */	485	/* We only send 'visible' objects to the client, and sometimes the player */
642	if (!op->client_visible ())	486	if (!op->client_visible () && op->type != PLAYER)
643	return;	487	return;
644
645	/* if the item is on the ground, mark that the look needs to
646	* be updated.
647	*/
648	if (!op->env)
649	{
650	pl->contr->ns->floorbox_update ();
651	return;
652	}
653	}
654		488
655	packet sl;	489	packet sl;
656		490
657	sl.printf ("item%d ", pl->contr->ns->itemcmd);	491	sl.printf ("item%d ", pl->contr->ns->itemcmd);
658		492
659	if (op->head)
660	op = op->head;	493	op = op->head_ ();
661		494
662	sl << uint32 (op->env ? op->env->count : 0);	495	sl << uint32 (op->env ? op->env->count : 0);
663		496
664	add_object_to_socklist (*pl->contr->ns, sl, op);	497	add_object_to_socklist (*pl->contr->ns, sl, op);
665		498
666	pl->contr->ns->send_packet (sl);	499	pl->contr->ns->send_packet (sl);
667	SET_FLAG (op, FLAG_CLIENT_SENT);
668	}	500	}
669		501
670	/**	502	/**
671	* Tells the client to delete an item. Uses the item	503	* Tells the client to delete an item.
672	* command with a -1 location.
673	*/	504	*/
674	void	505	void
675	esrv_del_item (player *pl, int tag)	506	esrv_del_item (player *pl, int tag)
676	{	507	{
677	if (!pl->ns)	508	if (!pl->ns)
…		…
702	return pl;	533	return pl;
703		534
704	for (object *op = pl->inv; op; op = op->below)	535	for (object *op = pl->inv; op; op = op->below)
705	if (op->count == count)	536	if (op->count == count)
706	return op;	537	return op;
707	else if (op->type == CONTAINER && pl->container == op)	538	else if (op->type == CONTAINER && pl->container_ () == op)
708	for (object *tmp = op->inv; tmp; tmp = tmp->below)	539	for (object *tmp = op->inv; tmp; tmp = tmp->below)
709	if (tmp->count == count)	540	if (tmp->count == count)
710	return tmp;	541	return tmp;
711		542
712	for (object *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)
713	if (op->head && op->head->count == count)	544	if (op->head && op->head->count == count)
714	return op;	545	return op;
715	else if (op->count == count)	546	else if (op->count == count)
716	return op;	547	return op;
717	else if (op->type == CONTAINER && pl->container == op)	548	else if (op->type == CONTAINER && pl->container_ () == op)
718	for (object *tmp = op->inv; tmp; tmp = tmp->below)	549	for (object *tmp = op->inv; tmp; tmp = tmp->below)
719	if (tmp->count == count)	550	if (tmp->count == count)
720	return tmp;	551	return tmp;
721		552
722	#if 0	553	#if 0
…		…
732	void	563	void
733	ExamineCmd (char buf, int len, player pl)	564	ExamineCmd (char buf, int len, player pl)
734	{	565	{
735	tag_t tag = atoi (buf);	566	tag_t tag = atoi (buf);
736		567
		568	/* If the high bit is set, player applied a pseudo object. */
		569	if (tag & 0x80000000)
		570	{
		571	pl->ns->look_position = tag & 0x7fffffff;
		572	pl->ns->floorbox_update ();
		573	return;
		574	}
		575
737	object *op = esrv_get_ob_from_count (pl->ob, tag);	576	object *op = esrv_get_ob_from_count (pl->ob, tag);
738		577
739	if (!op)	578	if (!op)
740	{	579	{
741	LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);	580	LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
…		…
754	if (object *op = esrv_get_ob_from_count (pl->ob, tag))	593	if (object *op = esrv_get_ob_from_count (pl->ob, tag))
755	{	594	{
756	std::string s = op->describe (pl->ob);	595	std::string s = op->describe (pl->ob);
757		596
758	packet sl ("ex");	597	packet sl ("ex");
759	sl << ber32 (tag) << s.c_str ();	598	sl << ber32 (tag)
		599	<< data (*pl->expand_cfpod (s.c_str ()));
760		600
761	pl->ns->send_packet (sl);	601	pl->ns->send_packet (sl);
762	}	602	}
763	}	603	}
764		604
765	/** Client wants to apply some object. Lets do so. */	605	/** Client wants to apply some object. Lets do so. */
766	void	606	void
767	ApplyCmd (char buf, int len, player pl)	607	ApplyCmd (char buf, int len, player pl)
768	{	608	{
769	tag_t tag = atoi (buf);	609	tag_t tag = atoi (buf);
770
771	/* sort of a hack, but if the player saves and the player then manually
772	* applies a savebed (or otherwise tries to do stuff), we run into trouble.
773	*/
774	if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
775	return;
776		610
777	/* If the high bit is set, player applied a pseudo object. */	611	/* If the high bit is set, player applied a pseudo object. */
778	if (tag & 0x80000000)	612	if (tag & 0x80000000)
779	{	613	{
780	pl->ns->look_position = tag & 0x7fffffff;	614	pl->ns->look_position = tag & 0x7fffffff;
…		…
801	tag_t tag = net_uint32 ((uint8 *)data + 1);	635	tag_t tag = net_uint32 ((uint8 *)data + 1);
802	object *op = esrv_get_ob_from_count (pl->ob, tag);	636	object *op = esrv_get_ob_from_count (pl->ob, tag);
803		637
804	if (!op)	638	if (!op)
805	{	639	{
806	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");
807	return;	641	return;
808	}	642	}
809		643
810	if (!flag)	644	if (!flag)
811	CLEAR_FLAG (op, FLAG_INV_LOCKED);	645	CLEAR_FLAG (op, FLAG_INV_LOCKED);
…		…
822	tag_t tag = net_uint32 ((uint8 *)data);	656	tag_t tag = net_uint32 ((uint8 *)data);
823	object *op = esrv_get_ob_from_count (pl->ob, tag);	657	object *op = esrv_get_ob_from_count (pl->ob, tag);
824		658
825	if (!op)	659	if (!op)
826	{	660	{
827	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");	661	pl->failmsg ("Could not find object to mark");
828	return;	662	return;
829	}	663	}
830		664
831	pl->mark = op;	665	pl->mark = op;
832	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)));
833	}	667	}
834		668
835	/**	669	/**
836	* look_at prints items on the specified square.	670	* look_at prints items on the specified square.
837	*	671	*
…		…
839	* Tero.Haatanen@lut.fi ]	673	* Tero.Haatanen@lut.fi ]
840	*/	674	*/
841	static void	675	static void
842	look_at (player *pl, int dx, int dy)	676	look_at (player *pl, int dx, int dy)
843	{	677	{
		678	dynbuf_text &buf = msg_dynbuf; buf.clear ();
844	object *ob = pl->ob;	679	object *ob = pl->ob;
845		680
846	maptile *m = pl->observe->map;	681	if (!pl->observe->map)
847	sint16 x = pl->observe->x + dx;
848	sint16 y = pl->observe->y + dy;
849
850	if (!xy_normalise (m, x, y))
851	{
852	new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
853	return;	682	return;
		683
		684	bool wiz = ob->flag [FLAG_WIZ] \|\| ob->flag [FLAG_WIZLOOK];
		685
		686	mapxy pos (pl->observe);
		687	pos.move (dx, dy);
		688
		689	if (wiz)
854	}	690	{
855		691	if (pos.normalise ())
856	int flag = 0;
857
858	for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below)
859	{
860	if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
861	continue;
862
863	if (!flag)
864	{	692	{
865	if (dx \|\| dy)	693	mapspace &ms = *pos;
866	new_draw_info (NDI_UNIQUE, 0, ob, "There you see:");	694	ms.update ();
867	else
868	new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
869		695
870	flag = 1;	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	);
871	}	702	}
872
873	if (QUERY_FLAG (ob, FLAG_WIZ))
874	new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count);
875	else	703	else
876	new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp));	704	buf << "off-map\n\n";
		705	}
877		706
878	if (((tmp->inv != NULL \|\| (tmp->head && tmp->head->inv)) &&	707	int darkness = pl->blocked_los (dx, dy);
879	(tmp->type != CONTAINER && tmp->type != FLESH)) \|\| QUERY_FLAG (ob, FLAG_WIZ))
880	inventory (ob, tmp->head == NULL ? tmp : tmp->head);
881		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
882	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */	733	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !wiz) /* don't continue under the floor */
883	break;	734	break;
884	}	735	}
885
886	if (!flag)
887	{	736	}
888	if (dx \|\| dy)	737
889	new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");	738	if (buf.empty ())
890	else	739	buf << "You see nothing there.";
891	new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing.");	740
892	}	741	pl->infobox (MSG_CHANNEL ("lookat"), buf);
893	}	742	}
894		743
895	/** Client wants to look at some object. Lets do so. */	744	/** Client wants to look at some object. Lets do so. */
896	void	745	void
897	LookAt (char buf, int len, player pl)	746	LookAt (char buf, int len, player pl)
…		…
902	if (!(cp = strchr (buf, ' ')))	751	if (!(cp = strchr (buf, ' ')))
903	return;	752	return;
904		753
905	int dy = atoi (cp);	754	int dy = atoi (cp);
906		755
907	if (player *opl = pl->observe->contr)
908	if (client *ns = opl->ns)
909	{
910	if (fabs (dx) > ns->mapx / 2 \|\| fabs (dy) > ns->mapy / 2)
911	return;
912
913	if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
914	return;
915	}
916
917	look_at (pl, dx, dy);	756	look_at (pl, dx, dy);
918	}	757	}
919		758
920	/** Move an object to a new location */	759	/** Move an object to a new location */
921	void	760	void
922	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)
923	{	762	{
924	object op, env;
925
926	op = esrv_get_ob_from_count (pl, tag);	763	object *op = esrv_get_ob_from_count (pl, tag);
927	if (!op)	764	if (!op)
928	{	765	{
929	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);
930	return;	767	return;
931	}	768	}
…		…
938	/* 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
939	* in the container and not the container itself.	776	* in the container and not the container itself.
940	*/	777	*/
941	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))	778	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
942	{	779	{
943	object current, next;	780	int cnt = MAX_ITEM_PER_DROP;
944		781
945	for (current = op->inv; current != NULL; current = next)	782	for (object *current = op->inv; current && cnt--; )
946	{	783	{
947	next = current->below;	784	object *next = current->below;
948	drop_object (pl, current, 0);	785	drop_object (pl, current, 0);
		786	current = next;
949	}	787	}
950		788
951	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.");
952	}	791	}
953	else	792	else
954	drop_object (pl, op, nrof);	793	drop_object (pl, op, nrof);
955		794
956	return;	795	return;
…		…
964	pl->contr->count = nrof;	803	pl->contr->count = nrof;
965	pick_up (pl, op);	804	pick_up (pl, op);
966	return;	805	return;
967	}	806	}
968		807
969	env = esrv_get_ob_from_count (pl, to);	808	object *env = esrv_get_ob_from_count (pl, to);
970	if (!env)	809	if (!env)
971	{	810	{
972	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);
973	return;	812	return;
974	}	813	}
…		…
976	/* put_object_in_sack presumes that necessary sanity checking	815	/* put_object_in_sack presumes that necessary sanity checking
977	* 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
978	* 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
979	* 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.
980	*/	819	*/
981	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))
982	put_object_in_sack (pl, env, op, nrof);	823	put_object_in_sack (pl, env, op, nrof);
983	}	824	}
984		825

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.48 by root, Fri Jun 8 09:18:31 2007 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.48 by root, Fri Jun 8 09:18:31 2007 UTC vs.
Revision 1.80 by root, Mon Oct 19 21:48:49 2009 UTC