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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.42 by root, Wed Mar 14 00:04:59 2007 UTC vs.
Revision 1.67 by root, Tue May 6 19:47:56 2008 UTC

…		…
1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The author can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	/**	24	/**
26	* \file	25	* \file
27	* Client/server logic.	26	* Client/server logic.
194	query_flags (object *op)	193	query_flags (object *op)
195	{	194	{
196	unsigned int flags = 0;	195	unsigned int flags = 0;
197		196
198	if (QUERY_FLAG (op, FLAG_APPLIED))	197	if (QUERY_FLAG (op, FLAG_APPLIED))
199	{
200	switch (op->type)	198	switch (op->type)
201	{	199	{
202	case BOW:	200	case BOW:
203	case WAND:	201	case WAND:
204	case ROD:	202	case ROD:
205	case HORN:	203	case HORN:
206	flags = a_readied;	204	flags = a_readied;
207	break;	205	break;
208	case WEAPON:	206	case WEAPON:
209	flags = a_wielded;	207	flags = a_wielded;
210	break;	208	break;
211	case SKILL:	209	case SKILL:
212	case ARMOUR:	210	case ARMOUR:
213	case HELMET:	211	case HELMET:
214	case SHIELD:	212	case SHIELD:
215	case RING:	213	case RING:
216	case BOOTS:	214	case BOOTS:
217	case GLOVES:	215	case GLOVES:
218	case AMULET:	216	case AMULET:
219	case GIRDLE:	217	case GIRDLE:
220	case BRACERS:	218	case BRACERS:
221	case CLOAK:	219	case CLOAK:
222	flags = a_worn;	220	flags = a_worn;
223	break;	221	break;
224	case CONTAINER:	222	case CONTAINER:
225	flags = a_active;	223	flags = a_active;
226	break;	224	break;
227	default:	225	default:
228	flags = a_applied;	226	flags = a_applied;
229	break;	227	break;
230	}	228	}
231	}
232		229
233	if (op->type == CONTAINER && ((op->env && op->env->container == op) \|\| (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))	230	if (op->type == CONTAINER && ((op->env && op->env->container == op) \|\| (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
234	flags \|= F_OPEN;	231	flags \|= F_OPEN;
235		232
236	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))	233	if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
…		…
256	* animation of face to the client.	253	* animation of face to the client.
257	*/	254	*/
258	static void	255	static void
259	add_object_to_socklist (client &ns, packet &sl, object *head)	256	add_object_to_socklist (client &ns, packet &sl, object *head)
260	{	257	{
261	int flags, len, anim_speed;
262	char item_n[MAX_BUF];	258	char item_n[MAX_BUF];
263	const char *item_p;	259	const char *item_p;
264		260
265	flags = query_flags (head);	261	int flags = query_flags (head);
266	if (QUERY_FLAG (head, FLAG_NO_PICK))	262	if (QUERY_FLAG (head, FLAG_NO_PICK))
267	flags \|= F_NOPICK;	263	flags \|= F_NOPICK;
268		264
269	ns.send_face (head->face);	265	ns.send_face (head->face, -50);
		266	ns.flush_fx ();
270		267
271	if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])	268	if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
272	ns.send_animation (head->animation_id);	269	ns.send_animation (head->animation_id);
273		270
274	sl << uint32 (head->count)	271	sl << uint32 (head->count)
275	<< uint32 (flags)	272	<< uint32 (flags)
276	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))	273	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
277	<< uint32 (head->face);	274	<< uint32 (head->face);
		275
		276	int len;
278		277
279	if (!head->custom_name)	278	if (!head->custom_name)
280	{	279	{
281	strncpy (item_n, query_base_name (head, 0), 127);	280	strncpy (item_n, query_base_name (head, 0), 127);
282	item_n[127] = 0;	281	item_n[127] = 0;
…		…
296	len += strlen (item_n + 1 + len) + 1;	295	len += strlen (item_n + 1 + len) + 1;
297		296
298	sl << data8 (item_n, len)	297	sl << data8 (item_n, len)
299	<< uint16 (head->animation_id);	298	<< uint16 (head->animation_id);
300		299
301	anim_speed = 0;	300	int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
302	if (QUERY_FLAG (head, FLAG_ANIMATE))	301	: head->anim_speed ? clamp (head->anim_speed, 1, 255)
303	{	302	: 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		303
320	sl << uint8 (anim_speed)	304	sl << uint8 (anim_speed)
321	<< uint32 (head->nrof);	305	<< uint32 (head->nrof);
322		306
323	if (ns.itemcmd == 2)	307	if (ns.itemcmd == 2)
324	sl << uint16 (head->client_type);	308	sl << uint16 (head->client_type);
325		309
326	SET_FLAG (head, FLAG_CLIENT_SENT);	310	SET_FLAG (head, FLAG_CLIENT_SENT);
327	}	311	}
		312
		313	static faceidx
		314	need_face_now (player pl, const char name)
		315	{
		316	faceidx face = face_find (name, empty_face);
		317
		318	pl->ns->send_face (face, -50);
		319	pl->ns->flush_fx ();
		320
		321	return face;
		322	}
		323
		324	#define FINGER_UP "finger_up.x11"
		325	#define FINGER_DOWN "finger_down.x11"
328		326
329	/**	327	/**
330	* Send the look window. Don't need to do animations here	328	* 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	329	* This sends all the faces to the client, not just updates. This is
332	* because object ordering would otherwise be inconsistent.	330	* because object ordering would otherwise be inconsistent.
333	*/	331	*/
334	void	332	void
335	esrv_draw_look (object *pl)	333	esrv_draw_look (player *pl)
336	{	334	{
337	int got_one = 0, start_look = 0, end_look = 0;	335	object *ob = pl->ob;
338		336
339	if (!pl->contr->ns->update_look)	337	if (!pl->ns->update_look)
340	{	338	{
341	LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name);	339	LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
342	return;	340	return;
343	}	341	}
344	else	342
345	pl->contr->ns->update_look = 0;	343	pl->ns->update_look = 0;
346		344
347	if (QUERY_FLAG (pl, FLAG_REMOVED)	345	if (QUERY_FLAG (ob, FLAG_REMOVED)
348	\|\| !pl->map	346	\|\| !ob->map
349	\|\| pl->map->in_memory != MAP_IN_MEMORY	347	\|\| ob->map->in_memory != MAP_ACTIVE
350	\|\| out_of_map (pl->map, pl->x, pl->y))	348	\|\| out_of_map (ob->map, ob->x, ob->y))
351	return;	349	return;
352		350
353	pl->contr->ns->send_packet ("delinv 0");	351	pl->ns->send_packet ("delinv 0");
354		352
355	packet sl;	353	packet sl;
356	sl.printf ("item%d ", pl->contr->ns->itemcmd);	354	sl.printf ("item%d ", pl->ns->itemcmd);
357		355
358	sl << uint32 (0);	356	sl << uint32 (0);
359		357
360	pl->contr->ns->send_face (empty_face);	358	int start_pos = pl->ns->look_position;
		359	bool dirty = false;
361		360
362	if (pl->contr->ns->look_position)	361	mapspace &ms = ob->ms ();
		362
		363	// manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
		364	// start from the top
		365	object *items [FLOORBOX_PAGESIZE];
		366	int item_idx = 0, item_cnt = 0;
		367	int pos = 0;
		368
		369	// find our items by walking down
		370	object *item = ms.top;
		371
		372	for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
		373	{
		374	if (!item->client_visible ())
		375	continue;
		376
		377	if (++pos < start_pos)
		378	continue;
		379
		380	// record item
		381	items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
		382	item_cnt++;
		383
		384	// stop at first floor
		385	if (item->flag [FLAG_IS_FLOOR])
		386	{
		387	// we are finished, don't append "next group of items"
		388	// by setting item to ms.bot it becomes zero which is checked after the while loop
		389	item = ms.bot;
		390	}
363	{	391	}
364	char buf[80];
365	snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
366		392
		393	// see if there are more if we cared - we ignore invisible objects
		394	if (item)
		395	{
		396	/* What we basically do is make a 'fake' object - when the user applies it,
		397	* we notice the special tag the object has, and act accordingly.
		398	*/
367	sl << uint32 (0x80000000 \| (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))	399	sl << uint32 (0x80000000 \| (start_pos + FLOORBOX_PAGESIZE))
368	<< uint32 (0)	400	<< uint32 (0)
369	<< sint32 (-1)	401	<< uint32 ((uint32) - 1)
370	<< uint32 (empty_face)	402	<< uint32 (need_face_now (pl, FINGER_DOWN))
371	<< data8 (buf)	403	<< data8 ("Apply this to see the items below")
372	<< uint16 (0)	404	<< uint16 (0)
373	<< uint8 (0)	405	<< uint8 (0)
374	<< uint32 (0);	406	<< uint32 (0);
375		407
376	if (pl->contr->ns->itemcmd == 2)	408	if (pl->ns->itemcmd == 2)
377	sl << uint16 (0);	409	sl << uint16 (0);
378	}
379		410
380	object *tmp = pl->ms ().top;	411	dirty = true;
381	for (object *last = 0; tmp != last; tmp = tmp->below)
382	{	412	}
383	object *head;
384		413
385	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)	414	// now send out all items in the ring buffer in reverse order
		415	while (item_cnt)
		416	{
		417	--item_cnt;
		418	item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
		419	object *item = items [item_idx];
		420
		421	add_object_to_socklist (*pl->ns, sl, item->head_ ());
		422
		423	dirty = true;
		424
		425	// if packet got too large, send it and begin a new one
		426	if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
386	{	427	{
387	last = tmp->below; /* assumes double floor mode */	428	pl->ns->send_packet (sl);
388	if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))	429
389	last = last->below;	430	sl.reset ();
		431	sl.printf ("item%d ", pl->ns->itemcmd);
		432	sl << uint32 (0);
		433
		434	dirty = false;
390	}	435	}
391
392	if (tmp->client_visible ())
393	{
394	if (++start_look < pl->contr->ns->look_position)
395	continue;
396
397	end_look++;
398
399	if (end_look > FLOORBOX_PAGESIZE)
400	{
401	/* What we basically do is make a 'fake' object - when the user applies it,
402	* we notice the special tag the object has, and act accordingly.
403	*/
404	sl << uint32 (0x80000000 \| (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
405	<< uint32 (0)
406	<< uint32 ((uint32) - 1)
407	<< uint32 (empty_face)
408	<< data8 ("Apply this to see next group of items")
409	<< uint16 (0)
410	<< uint8 (0)
411	<< uint32 (0);
412
413	if (pl->contr->ns->itemcmd == 2)
414	sl << uint16 (0);
415
416	break;
417	}
418
419	if (tmp->head)
420	head = tmp->head;
421	else
422	head = tmp;
423
424	add_object_to_socklist (*pl->contr->ns, sl, head);
425	got_one++;
426
427	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
428	{
429	pl->contr->ns->send_packet (sl);
430
431	sl.reset ();
432	sl.printf ("item%d ", pl->contr->ns->itemcmd);
433	sl << uint32 (0);
434	got_one = 0;
435	}
436	}
437	}	436	}
438		437
439	if (got_one)	438	if (start_pos)
		439	{
		440	sl << uint32 (0x80000000 \| (start_pos - FLOORBOX_PAGESIZE))
		441	<< uint32 (0)
		442	<< sint32 (-1)
		443	<< uint32 (need_face_now (pl, FINGER_UP))
		444	<< data8 ("Apply this to see the items higher up")
		445	<< uint16 (0)
		446	<< uint8 (0)
		447	<< uint32 (0);
		448
		449	if (pl->ns->itemcmd == 2)
		450	sl << uint16 (0);
		451
		452	dirty = true;
		453	}
		454
		455	if (dirty)
440	pl->contr->ns->send_packet (sl);	456	pl->ns->send_packet (sl);
441
442	}	457	}
443		458
444	/**	459	/**
445	* Sends whole inventory.	460	* Sends whole inventory.
446	*/	461	*/
…		…
476		491
477	/* IT is possible for players to accumulate a huge amount of	492	/* IT is possible for players to accumulate a huge amount of
478	* items (especially with some of the bags out there) to	493	* items (especially with some of the bags out there) to
479	* overflow the buffer. IF so, send multiple item commands.	494	* overflow the buffer. IF so, send multiple item commands.
480	*/	495	*/
481	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))	496	if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
482	{	497	{
483	pl->contr->ns->send_packet (sl);	498	pl->contr->ns->send_packet (sl);
484		499
485	sl.reset ();	500	sl.reset ();
486	sl.printf ("item%d ", pl->contr->ns->itemcmd);	501	sl.printf ("item%d ", pl->contr->ns->itemcmd);
…		…
503	*/	518	*/
504	void	519	void
505	esrv_update_item (int flags, object pl, object op)	520	esrv_update_item (int flags, object pl, object op)
506	{	521	{
507	/* If we have a request to send the player item, skip a few checks. */	522	/* If we have a request to send the player item, skip a few checks. */
508	if (op != pl)
509	{
510	if (!op->client_visible ())	523	if (op != pl && !op->client_visible ())
511	return;	524	return;
512	/* we remove the check for op->env, because in theory, the object
513	* is hopefully in the same place, so the client should preserve
514	* order.
515	*/
516	}
517		525
518	client *ns = pl->contr->ns;	526	client *ns = pl->contr->ns;
519	if (!ns)	527	if (!ns)
520	return;	528	return;
521		529
…		…
530		538
531	packet sl ("upditem");	539	packet sl ("upditem");
532		540
533	sl << uint8 (flags);	541	sl << uint8 (flags);
534		542
535	if (op->head)
536	op = op->head;	543	op = op->head_ ();
537		544
538	sl << uint32 (op->count);	545	sl << uint32 (op->count);
539		546
540	if (flags & UPD_LOCATION)	547	if (flags & UPD_LOCATION)
541	sl << uint32 (op->env ? op->env->count : 0);	548	sl << uint32 (op->env ? op->env->count : 0);
…		…
543	if (flags & UPD_FLAGS)	550	if (flags & UPD_FLAGS)
544	sl << uint32 (query_flags (op));	551	sl << uint32 (query_flags (op));
545		552
546	if (flags & UPD_WEIGHT)	553	if (flags & UPD_WEIGHT)
547	{	554	{
548	sint32 weight = WEIGHT (op);	555	sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
549		556
550	sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
551
552	if (pl == op)	557	if (op)
553	ns->last_weight = weight;	558	ns->last_weight = weight;
		559
		560	sl << uint32 (weight);
554	}	561	}
555		562
556	if (flags & UPD_FACE)	563	if (flags & UPD_FACE)
557	{	564	{
558	ns->send_face (op->face);	565	ns->send_face (op->face, -50);
		566	ns->flush_fx ();
559	sl << uint32 (op->face);	567	sl << uint32 (op->face);
560	}	568	}
561		569
562	if (flags & UPD_NAME)	570	if (flags & UPD_NAME)
563	{	571	{
…		…
628	esrv_send_item (object pl, object op)	636	esrv_send_item (object pl, object op)
629	{	637	{
630	if (!pl->contr->ns)	638	if (!pl->contr->ns)
631	return;	639	return;
632		640
633	/* If this is not the player object, do some more checks */
634	if (op != pl)
635	{
636	/* We only send 'visibile' objects to the client */	641	/* We only send 'visible' objects to the client, and sometimes the player */
637	if (!op->client_visible ())	642	if (!op->client_visible () && op->type != PLAYER)
638	return;	643	return;
639
640	/* if the item is on the ground, mark that the look needs to
641	* be updated.
642	*/
643	if (!op->env)
644	{
645	pl->contr->ns->floorbox_update ();
646	return;
647	}
648	}
649		644
650	packet sl;	645	packet sl;
651		646
652	sl.printf ("item%d ", pl->contr->ns->itemcmd);	647	sl.printf ("item%d ", pl->contr->ns->itemcmd);
653		648
654	if (op->head)
655	op = op->head;	649	op = op->head_ ();
656		650
657	sl << uint32 (op->env ? op->env->count : 0);	651	sl << uint32 (op->env ? op->env->count : 0);
658		652
659	add_object_to_socklist (*pl->contr->ns, sl, op);	653	add_object_to_socklist (*pl->contr->ns, sl, op);
660		654
661	pl->contr->ns->send_packet (sl);	655	pl->contr->ns->send_packet (sl);
662	SET_FLAG (op, FLAG_CLIENT_SENT);	656	SET_FLAG (op, FLAG_CLIENT_SENT);
663	}	657	}
664		658
665	/**	659	/**
666	* Tells the client to delete an item. Uses the item	660	* Tells the client to delete an item.
667	* command with a -1 location.
668	*/	661	*/
669	void	662	void
670	esrv_del_item (player *pl, int tag)	663	esrv_del_item (player *pl, int tag)
671	{	664	{
672	if (!pl->ns)	665	if (!pl->ns)
…		…
688		681
689	/**	682	/**
690	* Takes a player and object count (tag) and returns the actual object	683	* Takes a player and object count (tag) and returns the actual object
691	* pointer, or null if it can't be found.	684	* pointer, or null if it can't be found.
692	*/	685	*/
693
694	object *	686	object *
695	esrv_get_ob_from_count (object *pl, tag_t count)	687	esrv_get_ob_from_count (object *pl, tag_t count)
696	{	688	{
697	object op, tmp;
698
699	if (pl->count == count)	689	if (pl->count == count)
700	return pl;	690	return pl;
701		691
702	for (op = pl->inv; op; op = op->below)	692	for (object *op = pl->inv; op; op = op->below)
703	if (op->count == count)	693	if (op->count == count)
704	return op;	694	return op;
705	else if (op->type == CONTAINER && pl->container == op)	695	else if (op->type == CONTAINER && pl->container == op)
706	for (tmp = op->inv; tmp; tmp = tmp->below)	696	for (object *tmp = op->inv; tmp; tmp = tmp->below)
707	if (tmp->count == count)	697	if (tmp->count == count)
708	return tmp;	698	return tmp;
709		699
710	for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)	700	for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
711	if (op->head && op->head->count == count)	701	if (op->head && op->head->count == count)
712	return op;	702	return op;
713	else if (op->count == count)	703	else if (op->count == count)
714	return op;	704	return op;
715	else if (op->type == CONTAINER && pl->container == op)	705	else if (op->type == CONTAINER && pl->container == op)
716	for (tmp = op->inv; tmp; tmp = tmp->below)	706	for (object *tmp = op->inv; tmp; tmp = tmp->below)
717	if (tmp->count == count)	707	if (tmp->count == count)
718	return tmp;	708	return tmp;
719		709
		710	#if 0
		711	/* If the high bit is set, player examined a pseudo object. */
		712	if (count & 0x80000000)
		713	return 0;
		714	#endif
		715
720	return 0;	716	return 0;
721	}	717	}
722		718
723
724	/** Client wants to examine some object. So lets do so. */	719	/** Client wants to examine some object. So lets do so. */
725	void	720	void
726	ExamineCmd (char buf, int len, player pl)	721	ExamineCmd (char buf, int len, player pl)
727	{	722	{
728	tag_t tag = atoi (buf);	723	tag_t tag = atoi (buf);
729		724
730	/* If the high bit is set, player examined a pseudo object. */	725	/* If the high bit is set, player applied a pseudo object. */
731	if (tag & 0x80000000)	726	if (tag & 0x80000000)
		727	{
		728	pl->ns->look_position = tag & 0x7fffffff;
		729	pl->ns->floorbox_update ();
732	return;	730	return;
		731	}
733		732
734	object *op = esrv_get_ob_from_count (pl->ob, tag);	733	object *op = esrv_get_ob_from_count (pl->ob, tag);
735		734
736	if (!op)	735	if (!op)
737	{	736	{
…		…
740	}	739	}
741		740
742	examine (pl->ob, op);	741	examine (pl->ob, op);
743	}	742	}
744		743
		744	/** Client wants to examine some object. So lets do so. */
		745	void
		746	ExCmd (char buf, int len, player pl)
		747	{
		748	tag_t tag = atoi (buf);
		749
		750	if (object *op = esrv_get_ob_from_count (pl->ob, tag))
		751	{
		752	std::string s = op->describe (pl->ob);
		753
		754	packet sl ("ex");
		755	sl << ber32 (tag) << s.c_str ();
		756
		757	pl->ns->send_packet (sl);
		758	}
		759	}
		760
745	/** Client wants to apply some object. Lets do so. */	761	/** Client wants to apply some object. Lets do so. */
746	void	762	void
747	ApplyCmd (char buf, int len, player pl)	763	ApplyCmd (char buf, int len, player pl)
748	{	764	{
749	tag_t tag = atoi (buf);	765	tag_t tag = atoi (buf);
750
751	/* sort of a hack, but if the player saves and the player then manually
752	* applies a savebed (or otherwise tries to do stuff), we run into trouble.
753	*/
754	if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
755	return;
756		766
757	/* If the high bit is set, player applied a pseudo object. */	767	/* If the high bit is set, player applied a pseudo object. */
758	if (tag & 0x80000000)	768	if (tag & 0x80000000)
759	{	769	{
760	pl->ns->look_position = tag & 0x7fffffff;	770	pl->ns->look_position = tag & 0x7fffffff;
…		…
781	tag_t tag = net_uint32 ((uint8 *)data + 1);	791	tag_t tag = net_uint32 ((uint8 *)data + 1);
782	object *op = esrv_get_ob_from_count (pl->ob, tag);	792	object *op = esrv_get_ob_from_count (pl->ob, tag);
783		793
784	if (!op)	794	if (!op)
785	{	795	{
786	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");	796	pl->failmsg ("Could not find object to lock/unlock");
787	return;	797	return;
788	}	798	}
789		799
790	if (!flag)	800	if (!flag)
791	CLEAR_FLAG (op, FLAG_INV_LOCKED);	801	CLEAR_FLAG (op, FLAG_INV_LOCKED);
…		…
802	tag_t tag = net_uint32 ((uint8 *)data);	812	tag_t tag = net_uint32 ((uint8 *)data);
803	object *op = esrv_get_ob_from_count (pl->ob, tag);	813	object *op = esrv_get_ob_from_count (pl->ob, tag);
804		814
805	if (!op)	815	if (!op)
806	{	816	{
807	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");	817	pl->failmsg ("Could not find object to mark");
808	return;	818	return;
809	}	819	}
810		820
811	pl->mark = op;	821	pl->mark = op;
812	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op));	822	pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
813	}	823	}
814		824
815	/**	825	/**
816	* look_at prints items on the specified square.	826	* look_at prints items on the specified square.
817	*	827	*
818	* [ removed EARTHWALL check and added check for containers inventory.	828	* [ removed EARTHWALL check and added check for containers inventory.
819	* Tero.Haatanen@lut.fi ]	829	* Tero.Haatanen@lut.fi ]
820	*/	830	*/
821	void	831	static void
822	look_at (object *op, int dx, int dy)	832	look_at (player *pl, int dx, int dy)
823	{	833	{
824	object *tmp;	834	dynbuf_text buf;
825	int flag = 0;	835	object *ob = pl->ob;
826	sint16 x, y;
827	maptile *m;
828		836
829	x = op->x + dx;	837	if (!pl->observe->map)
830	y = op->y + dy;
831
832	if (out_of_map (op->map, x, y))
833	return;	838	return;
834		839
835	m = get_map_from_coord (op->map, &x, &y);	840	mapxy pos (pl->observe);
836	if (!m)	841	pos.move (dx, dy);
		842
		843	if (pos.normalise ())
		844	for (object *tmp = pos->top; tmp; tmp = tmp->below)
		845	{
		846	if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
		847	continue;
		848
		849	if (QUERY_FLAG (ob, FLAG_WIZ))
		850	buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
		851	else
		852	buf.printf ("- %s.\n", query_name (tmp));
		853
		854	object *head = tmp->head_ ();
		855
		856	if (head->inv)
		857	if ((head->type != CONTAINER && head->type != FLESH)
		858	\|\| QUERY_FLAG (ob, FLAG_WIZ))
		859	buf << head->query_inventory (ob, " ");
		860
		861	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
		862	break;
		863	}
		864
		865	if (buf.empty ())
		866	pl->failmsg ("You see nothing there.");
		867	else
		868	pl->infobox (MSG_CHANNEL ("lookat"), buf);
		869	}
		870
		871	/** Client wants to look at some object. Lets do so. */
		872	void
		873	LookAt (char buf, int len, player pl)
		874	{
		875	char *cp;
		876
		877	int dx = atoi (buf);
		878	if (!(cp = strchr (buf, ' ')))
837	return;	879	return;
838		880
839	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
840
841	for (; tmp != NULL; tmp = tmp->below)
842	{
843	if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
844	continue;
845
846	if (!flag)
847	{
848	if (dx \|\| dy)
849	new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
850	else
851	{
852	clear_win_info (op);
853	new_draw_info (NDI_UNIQUE, 0, op, "You see:");
854	}
855	flag = 1;
856	}
857
858	if (QUERY_FLAG (op, FLAG_WIZ))
859	new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
860	else
861	new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
862
863	if (((tmp->inv != NULL \|\| (tmp->head && tmp->head->inv)) &&
864	(tmp->type != CONTAINER && tmp->type != FLESH)) \|\| QUERY_FLAG (op, FLAG_WIZ))
865	inventory (op, tmp->head == NULL ? tmp : tmp->head);
866
867	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
868	break;
869	}
870
871	if (!flag)
872	{
873	if (dx \|\| dy)
874	new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
875	else
876	new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
877	}
878	}
879
880	/** Client wants to look at some object. Lets do so. */
881	void
882	LookAt (char buf, int len, player pl)
883	{
884	int dx, dy;
885	char *cp;
886
887	dx = atoi (buf);
888	if (!(cp = strchr (buf, ' ')))
889	{
890	return;
891	}
892	dy = atoi (cp);	881	int dy = atoi (cp);
893		882
		883	if (player *opl = pl->observe->contr)
		884	if (client *ns = opl->ns)
		885	{
894	if (fabs (dx) > pl->ns->mapx / 2 \|\| fabs (dy) > pl->ns->mapy / 2)	886	if (fabs (dx) > ns->mapx / 2 \|\| fabs (dy) > ns->mapy / 2)
895	return;	887	return;
896		888
897	if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])	889	if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
898	return;	890	return;
		891	}
899		892
900	look_at (pl->ob, dx, dy);	893	look_at (pl, dx, dy);
901	}	894	}
902		895
903	/** Move an object to a new location */	896	/** Move an object to a new location */
904	void	897	void
905	esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)	898	esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
906	{	899	{
907	object op, env;
908
909	op = esrv_get_ob_from_count (pl, tag);	900	object *op = esrv_get_ob_from_count (pl, tag);
910	if (!op)	901	if (!op)
911	{	902	{
912	LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);	903	LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
913	return;	904	return;
914	}	905	}
…		…
921	/* If it is an active container, then we should drop all objects	912	/* If it is an active container, then we should drop all objects
922	* in the container and not the container itself.	913	* in the container and not the container itself.
923	*/	914	*/
924	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))	915	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
925	{	916	{
926	object current, next;	917	int cnt = MAX_ITEM_PER_DROP;
927		918
928	for (current = op->inv; current != NULL; current = next)	919	for (object *current = op->inv; current && cnt--; )
929	{	920	{
930	next = current->below;	921	object *next = current->below;
931	drop_object (pl, current, 0);	922	drop_object (pl, current, 0);
		923	current = next;
932	}	924	}
933		925
934	esrv_update_item (UPD_WEIGHT, pl, op);	926	if (cnt <= 0)
		927	op->failmsg ("Only dropped some items, can't drop that many items at once.");
935	}	928	}
936	else	929	else
937	drop_object (pl, op, nrof);	930	drop_object (pl, op, nrof);
938		931
939	return;	932	return;
…		…
947	pl->contr->count = nrof;	940	pl->contr->count = nrof;
948	pick_up (pl, op);	941	pick_up (pl, op);
949	return;	942	return;
950	}	943	}
951		944
952	env = esrv_get_ob_from_count (pl, to);	945	object *env = esrv_get_ob_from_count (pl, to);
953	if (!env)	946	if (!env)
954	{	947	{
955	LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);	948	LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
956	return;	949	return;
957	}	950	}
…		…
959	/* put_object_in_sack presumes that necessary sanity checking	952	/* put_object_in_sack presumes that necessary sanity checking
960	* has already been done (eg, it can be picked up and fits in	953	* has already been done (eg, it can be picked up and fits in
961	* in a sack, so check for those things. We should also check	954	* in a sack, so check for those things. We should also check
962	* an make sure env is in fact a container for that matter.	955	* an make sure env is in fact a container for that matter.
963	*/	956	*/
964	if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))	957	if (env->type == CONTAINER
		958	&& can_pick (pl, op)
		959	&& sack_can_hold (pl, env, op, nrof))
965	put_object_in_sack (pl, env, op, nrof);	960	put_object_in_sack (pl, env, op, nrof);
966	}	961	}
967		962

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.42 by root, Wed Mar 14 00:04:59 2007 UTC vs. Revision 1.67 by root, Tue May 6 19:47:56 2008 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.42 by root, Wed Mar 14 00:04:59 2007 UTC vs.
Revision 1.67 by root, Tue May 6 19:47:56 2008 UTC