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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.51 by root, Tue Jul 24 04:55:35 2007 UTC vs.
Revision 1.79 by root, Mon Oct 12 14:00:59 2009 UTC

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

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.51 by root, Tue Jul 24 04:55:35 2007 UTC vs. Revision 1.79 by root, Mon Oct 12 14:00:59 2009 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.51 by root, Tue Jul 24 04:55:35 2007 UTC vs.
Revision 1.79 by root, Mon Oct 12 14:00:59 2009 UTC