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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.62 by root, Wed Apr 23 07:49:57 2008 UTC vs.
Revision 1.89 by root, Sat Apr 3 02:27:24 2010 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra 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 <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	/**	25	/**
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	******************************************************************************/
187		48
188	/**	49	/**
189	* This is a similar to query_name, but returns flags	50	* This is a similar to query_name, but returns flags
190	* to be sent to client.	51	* to be sent to client.
191	*/	52	*/
192	unsigned int	53	static unsigned int
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->is_open_container ())
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))
236	{	95	{
237	if (QUERY_FLAG (op, FLAG_DAMNED))	96	if (QUERY_FLAG (op, FLAG_DAMNED))
…		…
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];
262	const char *item_p;
263
264	flags = query_flags (head);	119	int flags = query_flags (head);
		120
265	if (QUERY_FLAG (head, FLAG_NO_PICK))	121	if (QUERY_FLAG (head, FLAG_NO_PICK))
266	flags \|= F_NOPICK;	122	flags \|= F_NOPICK;
267		123
268	ns.send_face (head->face, -50);	124	ns.send_face (head->face, -50);
269	ns.flush_fx ();	125	ns.flush_fx ();
…		…
276	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())	132	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
277	<< uint32 (head->face);	133	<< uint32 (head->face);
278		134
279	if (!head->custom_name)	135	if (!head->custom_name)
280	{	136	{
281	strncpy (item_n, query_base_name (head, 0), 127);	137	const char *name;
282	item_n[127] = 0;	138	uint8 *len = sl.cur++; // patch up length later
283	len = strlen (item_n);	139
284	item_p = query_base_name (head, 1);	140	name = query_base_name (head, 0); sl << data (name, min (127, strlen (name)));
		141	sl << uint8 (0);
		142	name = query_base_name (head, 1); sl << data (name, min (127, strlen (name)));
		143
		144	*len = sl.cur - len - 1;
285	}	145	}
286	else	146	else
287	{	147	{
288	strncpy (item_n, head->custom_name, 127);	148	int len = min (head->custom_name.length (), 127);
289	item_n[127] = 0;
290	len = strlen (item_n);
291	item_p = head->custom_name;
292	}
293		149
294	strncpy (item_n + len + 1, item_p, 127);	150	sl << uint8 (len * 2 + 1)
295	item_n[254] = 0;	151	<< data (head->custom_name, len)
296	len += strlen (item_n + 1 + len) + 1;	152	<< uint8 (0)
		153	<< data (head->custom_name, len);
		154	}
297		155
298	sl << data8 (item_n, len)
299	<< uint16 (head->animation_id);	156	sl << uint16 (head->animation_id);
300		157
301	anim_speed = 0;	158	int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
302	if (QUERY_FLAG (head, FLAG_ANIMATE))	159	: head->anim_speed ? clamp (head->anim_speed, 1, 255)
303	{	160	: 1. / clamp (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		161
320	sl << uint8 (anim_speed)	162	sl << uint8 (anim_speed)
321	<< uint32 (head->nrof);	163	<< uint32 (head->nrof);
322		164
323	if (ns.itemcmd == 2)	165	if (ns.itemcmd == 2)
324	sl << uint16 (head->client_type);	166	sl << uint16 (head->client_type);
325
326	SET_FLAG (head, FLAG_CLIENT_SENT);
327	}	167	}
		168
		169	static faceidx
		170	need_face_now (player pl, const char name)
		171	{
		172	faceidx face = face_find (name, empty_face);
		173
		174	pl->ns->send_face (face, -50);
		175	pl->ns->flush_fx ();
		176
		177	return face;
		178	}
		179
		180	#define FINGER_UP "finger_up.x11"
		181	#define FINGER_DOWN "finger_down.x11"
328		182
329	/**	183	/**
330	* Send the look window. Don't need to do animations here	184	* 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	185	* This sends all the faces to the client, not just updates. This is
332	* because object ordering would otherwise be inconsistent.	186	* because object ordering would otherwise be inconsistent.
333	*/	187	*/
334	void	188	void
335	esrv_draw_look (player *pl)	189	esrv_draw_look (player *pl)
336	{	190	{
337	int got_one = 0, start_look = 0, end_look = 0;
338
339	object *ob = pl->ob;	191	object *ob = pl->ob;
340		192
341	if (!pl->ns->update_look)	193	if (!pl->ns->update_look)
342	{	194	{
343	LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);	195	LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
344	return;	196	return;
345	}	197	}
346	else	198
347	pl->ns->update_look = 0;	199	pl->ns->update_look = 0;
348		200
349	if (QUERY_FLAG (ob, FLAG_REMOVED)	201	if (QUERY_FLAG (ob, FLAG_REMOVED)
350	\|\| !ob->map	202	\|\| !ob->map
351	\|\| ob->map->in_memory != MAP_ACTIVE	203	\|\| ob->map->in_memory != MAP_ACTIVE
352	\|\| out_of_map (ob->map, ob->x, ob->y))	204	\|\| out_of_map (ob->map, ob->x, ob->y))
…		…
357	packet sl;	209	packet sl;
358	sl.printf ("item%d ", pl->ns->itemcmd);	210	sl.printf ("item%d ", pl->ns->itemcmd);
359		211
360	sl << uint32 (0);	212	sl << uint32 (0);
361		213
362	pl->ns->send_face (empty_face, -50);	214	int start_pos = pl->ns->look_position;
363	pl->ns->flush_fx ();	215	bool dirty = false;
364		216
365	if (pl->ns->look_position)	217	mapspace &ms = ob->ms ();
		218
		219	// manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
		220	// start from the top
		221	object *items [FLOORBOX_PAGESIZE];
		222	int item_idx = 0, item_cnt = 0;
		223	int pos = 0;
		224
		225	// find our items by walking down
		226	object *item = ms.top;
		227
		228	for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
		229	{
		230	if (!item->client_visible ())
		231	continue;
		232
		233	if (++pos < start_pos)
		234	continue;
		235
		236	// record item
		237	items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
		238	item_cnt++;
		239
		240	// stop at first floor
		241	if (item->flag [FLAG_IS_FLOOR])
		242	{
		243	// we are finished, don't append "next group of items"
		244	// by setting item to ms.bot it becomes zero which is checked after the while loop
		245	item = ms.bot;
		246	}
366	{	247	}
367	char buf[80];
368	snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
369		248
		249	// see if there are more if we cared - we ignore invisible objects
		250	if (item)
		251	{
		252	/* What we basically do is make a 'fake' object - when the user applies it,
		253	* we notice the special tag the object has, and act accordingly.
		254	*/
370	sl << uint32 (0x80000000 \| (pl->ns->look_position - FLOORBOX_PAGESIZE))	255	sl << uint32 (0x80000000 \| (start_pos + FLOORBOX_PAGESIZE))
371	<< uint32 (0)	256	<< uint32 (0)
372	<< sint32 (-1)	257	<< uint32 ((uint32) - 1)
373	<< uint32 (empty_face)	258	<< uint32 (need_face_now (pl, FINGER_DOWN))
374	<< data8 (buf)	259	<< data8 ("Apply this to see the items below")
375	<< uint16 (0)	260	<< uint16 (0)
376	<< uint8 (0)	261	<< uint8 (0)
377	<< uint32 (0);	262	<< uint32 (0);
378		263
379	if (pl->ns->itemcmd == 2)	264	if (pl->ns->itemcmd == 2)
380	sl << uint16 (0);	265	sl << uint16 (0);
381	}
382		266
383	object *tmp = ob->ms ().top;	267	dirty = true;
384	for (object *last = 0; tmp != last; tmp = tmp->below)
385	{	268	}
386	object *head;
387		269
388	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)	270	// now send out all items in the ring buffer in reverse order
		271	while (item_cnt)
		272	{
		273	--item_cnt;
		274	item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
		275	object *item = items [item_idx];
		276
		277	add_object_to_socklist (*pl->ns, sl, item->head_ ());
		278
		279	dirty = true;
		280
		281	// if packet got too large, send it and begin a new one
		282	if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
389	{	283	{
390	last = tmp->below; /* assumes double floor mode */	284	pl->ns->send_packet (sl);
391	if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))	285
392	last = last->below;	286	sl.reset ();
		287	sl.printf ("item%d ", pl->ns->itemcmd);
		288	sl << uint32 (0);
		289
		290	dirty = false;
393	}	291	}
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	}	292	}
441		293
442	if (got_one)	294	if (start_pos)
		295	{
		296	sl << uint32 (0x80000000 \| (start_pos - FLOORBOX_PAGESIZE))
		297	<< uint32 (0)
		298	<< sint32 (-1)
		299	<< uint32 (need_face_now (pl, FINGER_UP))
		300	<< data8 ("Apply this to see the items higher up")
		301	<< uint16 (0)
		302	<< uint8 (0)
		303	<< uint32 (0);
		304
		305	if (pl->ns->itemcmd == 2)
		306	sl << uint16 (0);
		307
		308	dirty = true;
		309	}
		310
		311	if (dirty)
443	pl->ns->send_packet (sl);	312	pl->ns->send_packet (sl);
444
445	}	313	}
446		314
447	/**	315	/**
448	* Sends whole inventory.	316	* Sends whole inventory.
449	*/	317	*/
…		…
513		381
514	client *ns = pl->contr->ns;	382	client *ns = pl->contr->ns;
515	if (!ns)	383	if (!ns)
516	return;	384	return;
517		385
518	if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
519	{
520	/* FLAG_CLIENT_SENT is debug only. We are using it to see where
521	* this is happening - we can set a breakpoint here in the debugger
522	* and track back the call.
523	*/
524	LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
525	}
526
527	packet sl ("upditem");	386	packet sl ("upditem");
528		387
529	sl << uint8 (flags);	388	sl << uint8 (flags);
530		389
531	if (op->head)
532	op = op->head;	390	op = op->head_ ();
533		391
534	sl << uint32 (op->count);	392	sl << uint32 (op->count);
535		393
536	if (flags & UPD_LOCATION)	394	if (flags & UPD_LOCATION)
537	sl << uint32 (op->env ? op->env->count : 0);	395	sl << uint32 (op->env ? op->env->count : 0);
…		…
539	if (flags & UPD_FLAGS)	397	if (flags & UPD_FLAGS)
540	sl << uint32 (query_flags (op));	398	sl << uint32 (query_flags (op));
541		399
542	if (flags & UPD_WEIGHT)	400	if (flags & UPD_WEIGHT)
543	{	401	{
544	sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();	402	sint32 weight = op->client_weight ();
545		403
546	if (op)	404	if (op == pl)
547	ns->last_weight = weight;	405	ns->last_weight = weight;
548		406
549	sl << uint32 (weight);	407	sl << uint32 (weight);
550	}	408	}
551		409
…		…
558		416
559	if (flags & UPD_NAME)	417	if (flags & UPD_NAME)
560	{	418	{
561	int len;	419	int len;
562	const char *item_p;	420	const char *item_p;
563	char item_n[MAX_BUF];	421	char item_n[127 * 2];
564		422
565	if (!op->custom_name)	423	if (!op->custom_name)
566	{	424	{
567	strncpy (item_n, query_base_name (op, 0), 127);	425	len = assign (item_n, query_base_name (op, 0), 127);
568	item_n[127] = 0;
569	len = strlen (item_n);
570	item_p = query_base_name (op, 1);	426	item_p = query_base_name (op, 1);
571	}	427	}
572	else	428	else
573	{	429	{
574	strncpy (item_n, op->custom_name, 127);	430	len = assign (item_n, &op->custom_name, 127);
575	item_n[127] = 0;
576	len = strlen (item_n);
577	item_p = op->custom_name;	431	item_p = &op->custom_name;
578	}	432	}
579		433
580	strncpy (item_n + len + 1, item_p, 127);	434	len += assign (item_n + len, item_p, 127);
581	item_n[254] = 0;
582	len += strlen (item_n + 1 + len) + 1;
583		435
584	sl << data8 (item_n, len);	436	sl << data8 (item_n, len);
585	}	437	}
586		438
587	if (flags & UPD_ANIM)	439	if (flags & UPD_ANIM)
…		…
595	{	447	{
596	if (op->anim_speed)	448	if (op->anim_speed)
597	anim_speed = op->anim_speed;	449	anim_speed = op->anim_speed;
598	else	450	else
599	{	451	{
600	if (fabs (op->speed) < 0.001)	452	if (op->speed < 0.001)
601	anim_speed = 255;	453	anim_speed = 255;
602	else if (fabs (op->speed) >= 1.0)	454	else if (op->speed >= 1.0)
603	anim_speed = 1;	455	anim_speed = 1;
604	else	456	else
605	anim_speed = (int) (1.0 / fabs (op->speed));	457	anim_speed = 1. / op->speed;
606	}	458	}
607		459
608	if (anim_speed > 255)	460	if (anim_speed > 255)
609	anim_speed = 255;	461	anim_speed = 255;
610	}	462	}
…		…
625	esrv_send_item (object pl, object op)	477	esrv_send_item (object pl, object op)
626	{	478	{
627	if (!pl->contr->ns)	479	if (!pl->contr->ns)
628	return;	480	return;
629		481
630	/* If this is not the player object, do some more checks */
631	if (op != pl)
632	{
633	/* We only send 'visible' objects to the client */	482	/* We only send 'visible' objects to the client, and sometimes the player */
634	if (!op->client_visible ())	483	if (!op->client_visible () && op->type != PLAYER)
635	return;	484	return;
636
637	/* if the item is on the ground, mark that the look needs to
638	* be updated.
639	*/
640	if (!op->env)
641	{
642	pl->contr->ns->floorbox_update ();
643	return;
644	}
645	}
646		485
647	packet sl;	486	packet sl;
648		487
649	sl.printf ("item%d ", pl->contr->ns->itemcmd);	488	sl.printf ("item%d ", pl->contr->ns->itemcmd);
650		489
651	if (op->head)
652	op = op->head;	490	op = op->head_ ();
653		491
654	sl << uint32 (op->env ? op->env->count : 0);	492	sl << uint32 (op->env ? op->env->count : 0);
655		493
656	add_object_to_socklist (*pl->contr->ns, sl, op);	494	add_object_to_socklist (*pl->contr->ns, sl, op);
657		495
658	pl->contr->ns->send_packet (sl);	496	pl->contr->ns->send_packet (sl);
659	SET_FLAG (op, FLAG_CLIENT_SENT);
660	}	497	}
661		498
662	/**	499	/**
663	* Tells the client to delete an item.	500	* Tells the client to delete an item.
664	*/	501	*/
…		…
684		521
685	/**	522	/**
686	* Takes a player and object count (tag) and returns the actual object	523	* Takes a player and object count (tag) and returns the actual object
687	* pointer, or null if it can't be found.	524	* pointer, or null if it can't be found.
688	*/	525	*/
689	object *	526	static object *
690	esrv_get_ob_from_count (object *pl, tag_t count)	527	esrv_get_ob_from_count (object *pl, tag_t count)
691	{	528	{
692	if (pl->count == count)	529	if (pl->count == count)
693	return pl;	530	return pl;
694		531
695	for (object *op = pl->inv; op; op = op->below)	532	for (object *op = pl->inv; op; op = op->below)
696	if (op->count == count)	533	if (op->count == count)
697	return op;	534	return op;
698	else if (op->type == CONTAINER && pl->container == op)	535	else if (op->type == CONTAINER && pl->container_ () == op)
699	for (object *tmp = op->inv; tmp; tmp = tmp->below)	536	for (object *tmp = op->inv; tmp; tmp = tmp->below)
700	if (tmp->count == count)	537	if (tmp->count == count)
701	return tmp;	538	return tmp;
702		539
703	for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)	540	for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
704	if (op->head && op->head->count == count)	541	if (op->head && op->head->count == count)
705	return op;	542	return op;
706	else if (op->count == count)	543	else if (op->count == count)
707	return op;	544	return op;
708	else if (op->type == CONTAINER && pl->container == op)	545	else if (op->type == CONTAINER && pl->container_ () == op)
709	for (object *tmp = op->inv; tmp; tmp = tmp->below)	546	for (object *tmp = op->inv; tmp; tmp = tmp->below)
710	if (tmp->count == count)	547	if (tmp->count == count)
711	return tmp;	548	return tmp;
712		549
713	#if 0	550	#if 0
…		…
723	void	560	void
724	ExamineCmd (char buf, int len, player pl)	561	ExamineCmd (char buf, int len, player pl)
725	{	562	{
726	tag_t tag = atoi (buf);	563	tag_t tag = atoi (buf);
727		564
728	object *op = esrv_get_ob_from_count (pl->ob, tag);
729
730	if (!op)
731	{
732	LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
733	return;
734	}
735
736	examine (pl->ob, op);
737	}
738
739	/** Client wants to examine some object. So lets do so. */
740	void
741	ExCmd (char buf, int len, player pl)
742	{
743	tag_t tag = atoi (buf);
744
745	if (object *op = esrv_get_ob_from_count (pl->ob, tag))
746	{
747	std::string s = op->describe (pl->ob);
748
749	packet sl ("ex");
750	sl << ber32 (tag) << s.c_str ();
751
752	pl->ns->send_packet (sl);
753	}
754	}
755
756	/** Client wants to apply some object. Lets do so. */
757	void
758	ApplyCmd (char buf, int len, player pl)
759	{
760	tag_t tag = atoi (buf);
761
762	/* sort of a hack, but if the player saves and the player then manually
763	* applies a savebed (or otherwise tries to do stuff), we run into trouble.
764	*/
765	if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
766	return;
767
768	/* If the high bit is set, player applied a pseudo object. */	565	/* If the high bit is set, player applied a pseudo object. */
769	if (tag & 0x80000000)	566	if (tag & 0x80000000)
770	{	567	{
771	pl->ns->look_position = tag & 0x7fffffff;	568	pl->ns->look_position = tag & 0x7fffffff;
772	pl->ns->floorbox_update ();	569	pl->ns->floorbox_update ();
…		…
775		572
776	object *op = esrv_get_ob_from_count (pl->ob, tag);	573	object *op = esrv_get_ob_from_count (pl->ob, tag);
777		574
778	if (!op)	575	if (!op)
779	{	576	{
		577	LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
		578	return;
		579	}
		580
		581	examine (pl->ob, op);
		582	}
		583
		584	/** Client wants to examine some object. So lets do so. */
		585	void
		586	ExCmd (char buf, int len, player pl)
		587	{
		588	tag_t tag = atoi (buf);
		589
		590	if (object *op = esrv_get_ob_from_count (pl->ob, tag))
		591	{
		592	std::string s = op->describe (pl->ob);
		593
		594	packet sl ("ex");
		595	sl << ber32 (tag)
		596	<< data (*pl->expand_cfpod (s.c_str ()));
		597
		598	pl->ns->send_packet (sl);
		599	}
		600	}
		601
		602	/** Client wants to apply some object. Lets do so. */
		603	void
		604	ApplyCmd (char buf, int len, player pl)
		605	{
		606	tag_t tag = atoi (buf);
		607
		608	/* If the high bit is set, player applied a pseudo object. */
		609	if (tag & 0x80000000)
		610	{
		611	pl->ns->look_position = tag & 0x7fffffff;
		612	pl->ns->floorbox_update ();
		613	return;
		614	}
		615
		616	object *op = esrv_get_ob_from_count (pl->ob, tag);
		617
		618	if (!op)
		619	{
780	LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);	620	LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
781	return;	621	return;
782	}	622	}
783		623
784	player_apply (pl->ob, op, 0, 0);	624	pl->ob->apply (op);
785	}	625	}
786		626
787	/** Client wants to lock some object. Lets do so. */	627	/** Client wants to lock some object. Lets do so. */
788	void	628	void
789	LockItem (char data, int len, player pl)	629	LockItem (char data, int len, player pl)
…		…
830	* Tero.Haatanen@lut.fi ]	670	* Tero.Haatanen@lut.fi ]
831	*/	671	*/
832	static void	672	static void
833	look_at (player *pl, int dx, int dy)	673	look_at (player *pl, int dx, int dy)
834	{	674	{
835	dynbuf_text buf;	675	dynbuf_text &buf = msg_dynbuf; buf.clear ();
836	object *ob = pl->ob;	676	object *ob = pl->ob;
837		677
838	if (!pl->observe->map)	678	if (!pl->observe->map)
839	return;	679	return;
840		680
		681	bool wiz = ob->flag [FLAG_WIZ] \|\| ob->flag [FLAG_WIZLOOK];
		682
841	mapxy pos (pl->observe);	683	mapxy pos (pl->observe);
842	pos.move (dx, dy);	684	pos.move (dx, dy);
843		685
		686	if (wiz)
		687	{
844	if (pos.normalise ())	688	if (pos.normalise ())
		689	{
		690	mapspace &ms = *pos;
		691	ms.update ();
		692
		693	buf.printf (" map: %s%+d%+d (%+d%+d)\n"
		694	" smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; items %d, volume %lld\n\n",
		695	&pos.m->path, pos.x, pos.y, dx, dy,
		696	(unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
		697	ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume ()
		698	);
		699	}
		700	else
		701	buf << "off-map\n\n";
		702	}
		703
		704	int darkness = pl->blocked_los (dx, dy);
		705
		706	if (darkness == LOS_BLOCKED)
		707	buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
		708	else if (darkness == LOS_MAX)
		709	buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
		710	else
		711	{
		712	if (pos.normalise ())
845	for (object *tmp = pos->top; tmp; tmp = tmp->below)	713	for (object *tmp = pos->top; tmp; tmp = tmp->below)
846	{	714	{
847	if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))	715	if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
848	continue;	716	continue;
849		717
850	if (QUERY_FLAG (ob, FLAG_WIZ))	718	if (wiz)
851	buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);	719	buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ());
852	else	720	else
853	buf.printf ("- %s.\n", query_name (tmp));	721	buf.printf (" - %s.\n", query_name (tmp));
854		722
855	object *head = tmp->head_ ();	723	object *head = tmp->head_ ();
856		724
857	if (head->inv)	725	if (head->inv)
858	if ((head->type != CONTAINER && head->type != FLESH)	726	if ((head->type != CONTAINER && head->type != FLESH)
859	\|\| QUERY_FLAG (ob, FLAG_WIZ))	727	\|\| QUERY_FLAG (ob, FLAG_WIZ))
860	buf << head->query_inventory (ob, " ");	728	buf << head->query_inventory (ob, " ");
861		729
862	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */	730	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !wiz) /* don't continue under the floor */
863	break;	731	break;
		732	}
864	}	733	}
865		734
866	if (buf.empty ())	735	if (buf.empty ())
867	pl->failmsg ("You see nothing there.");	736	buf << "You see nothing there.";
868	else	737
869	pl->infobox (MSG_CHANNEL ("lookat"), buf);	738	pl->infobox (MSG_CHANNEL ("lookat"), buf);
870	}	739	}
871		740
872	/** Client wants to look at some object. Lets do so. */	741	/** Client wants to look at some object. Lets do so. */
873	void	742	void
874	LookAt (char buf, int len, player pl)	743	LookAt (char buf, int len, player pl)
…		…
879	if (!(cp = strchr (buf, ' ')))	748	if (!(cp = strchr (buf, ' ')))
880	return;	749	return;
881		750
882	int dy = atoi (cp);	751	int dy = atoi (cp);
883		752
884	if (player *opl = pl->observe->contr)
885	if (client *ns = opl->ns)
886	{
887	if (fabs (dx) > ns->mapx / 2 \|\| fabs (dy) > ns->mapy / 2)
888	return;
889
890	if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
891	return;
892	}
893
894	look_at (pl, dx, dy);	753	look_at (pl, dx, dy);
895	}	754	}
896		755
897	/** Move an object to a new location */	756	/** Move an object to a new location */
898	void	757	void
899	esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)	758	esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
900	{	759	{
901	object op, env;
902
903	op = esrv_get_ob_from_count (pl, tag);	760	object *op = esrv_get_ob_from_count (pl, tag);
904	if (!op)	761	if (!op)
905	{	762	{
906	LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);	763	LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
907	return;	764	return;
908	}	765	}
…		…
915	/* If it is an active container, then we should drop all objects	772	/* If it is an active container, then we should drop all objects
916	* in the container and not the container itself.	773	* in the container and not the container itself.
917	*/	774	*/
918	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))	775	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
919	{	776	{
920	int cnt = MAX_ITEM_PER_DROP;	777	int cnt = MAX_ITEM_PER_ACTION;
921		778
922	for (object *current = op->inv; current; )	779	for (object *current = op->inv; current && cnt--; )
923	{	780	{
924	object *next = current->below;	781	object *next = current->below;
925
926	drop_object (pl, current, 0);	782	drop_object (pl, current, 0);
927
928	if (--cnt <= 0) break;
929
930	current = next;	783	current = next;
931	}	784	}
932		785
933	if (cnt <= 0)	786	if (cnt <= 0)
934	op->failmsg ("Only dropped some items, can't drop that many items at once.");	787	op->failmsg ("Only dropped some items, can't drop that many items at once.");
…		…
947	pl->contr->count = nrof;	800	pl->contr->count = nrof;
948	pick_up (pl, op);	801	pick_up (pl, op);
949	return;	802	return;
950	}	803	}
951		804
952	env = esrv_get_ob_from_count (pl, to);	805	object *env = esrv_get_ob_from_count (pl, to);
953	if (!env)	806	if (!env)
954	{	807	{
955	LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);	808	LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
956	return;	809	return;
957	}	810	}

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.62 by root, Wed Apr 23 07:49:57 2008 UTC vs. Revision 1.89 by root, Sat Apr 3 02:27:24 2010 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.62 by root, Wed Apr 23 07:49:57 2008 UTC vs.
Revision 1.89 by root, Sat Apr 3 02:27:24 2010 UTC