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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.44 by root, Mon Apr 23 19:10:17 2007 UTC vs.
Revision 1.64 by root, Mon May 5 22:03:22 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))
…		…
264		261
265	flags = query_flags (head);	262	flags = query_flags (head);
266	if (QUERY_FLAG (head, FLAG_NO_PICK))	263	if (QUERY_FLAG (head, FLAG_NO_PICK))
267	flags \|= F_NOPICK;	264	flags \|= F_NOPICK;
268		265
269	ns.send_face (head->face);	266	ns.send_face (head->face, -50);
270	ns.flush_fx ();	267	ns.flush_fx ();
271		268
272	if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])	269	if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
273	ns.send_animation (head->animation_id);	270	ns.send_animation (head->animation_id);
274		271
275	sl << uint32 (head->count)	272	sl << uint32 (head->count)
276	<< uint32 (flags)	273	<< uint32 (flags)
277	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))	274	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
278	<< uint32 (head->face);	275	<< uint32 (head->face);
279		276
280	if (!head->custom_name)	277	if (!head->custom_name)
281	{	278	{
282	strncpy (item_n, query_base_name (head, 0), 127);	279	strncpy (item_n, query_base_name (head, 0), 127);
…		…
325	sl << uint16 (head->client_type);	322	sl << uint16 (head->client_type);
326		323
327	SET_FLAG (head, FLAG_CLIENT_SENT);	324	SET_FLAG (head, FLAG_CLIENT_SENT);
328	}	325	}
329		326
		327	static faceidx
		328	need_face_now (player pl, const char name)
		329	{
		330	faceidx face = face_find (name, empty_face);
		331
		332	pl->ns->send_face (face, -50);
		333	pl->ns->flush_fx ();
		334
		335	return face;
		336	}
		337
		338	#define FINGER_UP "finger_up.x11"
		339	#define FINGER_DOWN "finger_down.x11"
		340
330	/**	341	/**
331	* Send the look window. Don't need to do animations here	342	* Send the look window. Don't need to do animations here
332	* This sends all the faces to the client, not just updates. This is	343	* This sends all the faces to the client, not just updates. This is
333	* because object ordering would otherwise be inconsistent.	344	* because object ordering would otherwise be inconsistent.
334	*/	345	*/
335	void	346	void
336	esrv_draw_look (object *pl)	347	esrv_draw_look (player *pl)
337	{	348	{
338	int got_one = 0, start_look = 0, end_look = 0;	349	object *ob = pl->ob;
339		350
340	if (!pl->contr->ns->update_look)	351	if (!pl->ns->update_look)
341	{	352	{
342	LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name);	353	LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
343	return;	354	return;
344	}	355	}
345	else	356
346	pl->contr->ns->update_look = 0;	357	pl->ns->update_look = 0;
347		358
348	if (QUERY_FLAG (pl, FLAG_REMOVED)	359	if (QUERY_FLAG (ob, FLAG_REMOVED)
349	\|\| !pl->map	360	\|\| !ob->map
350	\|\| pl->map->in_memory != MAP_IN_MEMORY	361	\|\| ob->map->in_memory != MAP_ACTIVE
351	\|\| out_of_map (pl->map, pl->x, pl->y))	362	\|\| out_of_map (ob->map, ob->x, ob->y))
352	return;	363	return;
353		364
354	pl->contr->ns->send_packet ("delinv 0");	365	pl->ns->send_packet ("delinv 0");
355		366
356	packet sl;	367	packet sl;
357	sl.printf ("item%d ", pl->contr->ns->itemcmd);	368	sl.printf ("item%d ", pl->ns->itemcmd);
358		369
359	sl << uint32 (0);	370	sl << uint32 (0);
360		371
361	pl->contr->ns->send_face (empty_face);	372	int start_pos = pl->ns->look_position;
362	pl->contr->ns->flush_fx ();	373	bool dirty = false;
363		374
364	if (pl->contr->ns->look_position)	375	mapspace &ms = ob->ms ();
		376
		377	// manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
		378	// start from the top
		379	object *items [FLOORBOX_PAGESIZE];
		380	int item_idx = 0, item_cnt = 0;
		381	int pos = 0;
		382
		383	// find our items by walking down
		384	object *item = ms.top;
		385
		386	for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
		387	{
		388	if (!item->client_visible ())
		389	continue;
		390
		391	if (++pos < start_pos)
		392	continue;
		393
		394	// record item
		395	items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
		396	item_cnt++;
		397
		398	// stop at first floor
		399	if (item->flag [FLAG_IS_FLOOR])
		400	{
		401	// we are finished, don't append "next group of items"
		402	// by setting item to ms.bot it becomes zero which is checked after the while loop
		403	item = ms.bot;
		404	}
365	{	405	}
366	char buf[80];
367	snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
368		406
		407	// see if there are more if we cared - we ignore invisible objects
		408	if (item)
		409	{
		410	/* What we basically do is make a 'fake' object - when the user applies it,
		411	* we notice the special tag the object has, and act accordingly.
		412	*/
369	sl << uint32 (0x80000000 \| (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))	413	sl << uint32 (0x80000000 \| (start_pos + FLOORBOX_PAGESIZE))
370	<< uint32 (0)	414	<< uint32 (0)
371	<< sint32 (-1)	415	<< uint32 ((uint32) - 1)
372	<< uint32 (empty_face)	416	<< uint32 (need_face_now (pl, FINGER_DOWN))
373	<< data8 (buf)	417	<< data8 ("Apply this to see the items below")
374	<< uint16 (0)	418	<< uint16 (0)
375	<< uint8 (0)	419	<< uint8 (0)
376	<< uint32 (0);	420	<< uint32 (0);
377		421
378	if (pl->contr->ns->itemcmd == 2)	422	if (pl->ns->itemcmd == 2)
379	sl << uint16 (0);	423	sl << uint16 (0);
380	}
381		424
382	object *tmp = pl->ms ().top;	425	dirty = true;
383	for (object *last = 0; tmp != last; tmp = tmp->below)
384	{	426	}
385	object *head;
386		427
387	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)	428	// now send out all items in the ring buffer in reverse order
		429	while (item_cnt)
		430	{
		431	--item_cnt;
		432	item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
		433	object *item = items [item_idx];
		434
		435	add_object_to_socklist (*pl->ns, sl, item->head_ ());
		436
		437	dirty = true;
		438
		439	// if packet got too large, send it and begin a new one
		440	if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
388	{	441	{
389	last = tmp->below; /* assumes double floor mode */	442	pl->ns->send_packet (sl);
390	if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))	443
391	last = last->below;	444	sl.reset ();
		445	sl.printf ("item%d ", pl->ns->itemcmd);
		446	sl << uint32 (0);
		447
		448	dirty = false;
392	}	449	}
393
394	if (tmp->client_visible ())
395	{
396	if (++start_look < pl->contr->ns->look_position)
397	continue;
398
399	end_look++;
400
401	if (end_look > FLOORBOX_PAGESIZE)
402	{
403	/* What we basically do is make a 'fake' object - when the user applies it,
404	* we notice the special tag the object has, and act accordingly.
405	*/
406	sl << uint32 (0x80000000 \| (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
407	<< uint32 (0)
408	<< uint32 ((uint32) - 1)
409	<< uint32 (empty_face)
410	<< data8 ("Apply this to see next group of items")
411	<< uint16 (0)
412	<< uint8 (0)
413	<< uint32 (0);
414
415	if (pl->contr->ns->itemcmd == 2)
416	sl << uint16 (0);
417
418	break;
419	}
420
421	if (tmp->head)
422	head = tmp->head;
423	else
424	head = tmp;
425
426	add_object_to_socklist (*pl->contr->ns, sl, head);
427	got_one++;
428
429	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
430	{
431	pl->contr->ns->send_packet (sl);
432
433	sl.reset ();
434	sl.printf ("item%d ", pl->contr->ns->itemcmd);
435	sl << uint32 (0);
436	got_one = 0;
437	}
438	}
439	}	450	}
440		451
441	if (got_one)	452	if (start_pos)
		453	{
		454	sl << uint32 (0x80000000 \| (start_pos - FLOORBOX_PAGESIZE))
		455	<< uint32 (0)
		456	<< sint32 (-1)
		457	<< uint32 (need_face_now (pl, FINGER_UP))
		458	<< data8 ("Apply this to see the items higher up")
		459	<< uint16 (0)
		460	<< uint8 (0)
		461	<< uint32 (0);
		462
		463	if (pl->ns->itemcmd == 2)
		464	sl << uint16 (0);
		465
		466	dirty = true;
		467	}
		468
		469	if (dirty)
442	pl->contr->ns->send_packet (sl);	470	pl->ns->send_packet (sl);
443
444	}	471	}
445		472
446	/**	473	/**
447	* Sends whole inventory.	474	* Sends whole inventory.
448	*/	475	*/
…		…
478		505
479	/* IT is possible for players to accumulate a huge amount of	506	/* IT is possible for players to accumulate a huge amount of
480	* items (especially with some of the bags out there) to	507	* items (especially with some of the bags out there) to
481	* overflow the buffer. IF so, send multiple item commands.	508	* overflow the buffer. IF so, send multiple item commands.
482	*/	509	*/
483	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))	510	if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
484	{	511	{
485	pl->contr->ns->send_packet (sl);	512	pl->contr->ns->send_packet (sl);
486		513
487	sl.reset ();	514	sl.reset ();
488	sl.printf ("item%d ", pl->contr->ns->itemcmd);	515	sl.printf ("item%d ", pl->contr->ns->itemcmd);
…		…
505	*/	532	*/
506	void	533	void
507	esrv_update_item (int flags, object pl, object op)	534	esrv_update_item (int flags, object pl, object op)
508	{	535	{
509	/* If we have a request to send the player item, skip a few checks. */	536	/* If we have a request to send the player item, skip a few checks. */
510	if (op != pl)
511	{
512	if (!op->client_visible ())	537	if (op != pl && !op->client_visible ())
513	return;	538	return;
514	/* we remove the check for op->env, because in theory, the object
515	* is hopefully in the same place, so the client should preserve
516	* order.
517	*/
518	}
519		539
520	client *ns = pl->contr->ns;	540	client *ns = pl->contr->ns;
521	if (!ns)	541	if (!ns)
522	return;	542	return;
523		543
…		…
532		552
533	packet sl ("upditem");	553	packet sl ("upditem");
534		554
535	sl << uint8 (flags);	555	sl << uint8 (flags);
536		556
537	if (op->head)
538	op = op->head;	557	op = op->head_ ();
539		558
540	sl << uint32 (op->count);	559	sl << uint32 (op->count);
541		560
542	if (flags & UPD_LOCATION)	561	if (flags & UPD_LOCATION)
543	sl << uint32 (op->env ? op->env->count : 0);	562	sl << uint32 (op->env ? op->env->count : 0);
…		…
545	if (flags & UPD_FLAGS)	564	if (flags & UPD_FLAGS)
546	sl << uint32 (query_flags (op));	565	sl << uint32 (query_flags (op));
547		566
548	if (flags & UPD_WEIGHT)	567	if (flags & UPD_WEIGHT)
549	{	568	{
550	sint32 weight = WEIGHT (op);	569	sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
551		570
552	sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
553
554	if (pl == op)	571	if (op)
555	ns->last_weight = weight;	572	ns->last_weight = weight;
		573
		574	sl << uint32 (weight);
556	}	575	}
557		576
558	if (flags & UPD_FACE)	577	if (flags & UPD_FACE)
559	{	578	{
560	ns->send_face (op->face);	579	ns->send_face (op->face, -50);
561	ns->flush_fx ();	580	ns->flush_fx ();
562	sl << uint32 (op->face);	581	sl << uint32 (op->face);
563	}	582	}
564		583
565	if (flags & UPD_NAME)	584	if (flags & UPD_NAME)
…		…
631	esrv_send_item (object pl, object op)	650	esrv_send_item (object pl, object op)
632	{	651	{
633	if (!pl->contr->ns)	652	if (!pl->contr->ns)
634	return;	653	return;
635		654
636	/* If this is not the player object, do some more checks */
637	if (op != pl)
638	{
639	/* We only send 'visibile' objects to the client */	655	/* We only send 'visible' objects to the client, and sometimes the player */
640	if (!op->client_visible ())	656	if (!op->client_visible () && op->type != PLAYER)
641	return;	657	return;
642
643	/* if the item is on the ground, mark that the look needs to
644	* be updated.
645	*/
646	if (!op->env)
647	{
648	pl->contr->ns->floorbox_update ();
649	return;
650	}
651	}
652		658
653	packet sl;	659	packet sl;
654		660
655	sl.printf ("item%d ", pl->contr->ns->itemcmd);	661	sl.printf ("item%d ", pl->contr->ns->itemcmd);
656		662
657	if (op->head)
658	op = op->head;	663	op = op->head_ ();
659		664
660	sl << uint32 (op->env ? op->env->count : 0);	665	sl << uint32 (op->env ? op->env->count : 0);
661		666
662	add_object_to_socklist (*pl->contr->ns, sl, op);	667	add_object_to_socklist (*pl->contr->ns, sl, op);
663		668
664	pl->contr->ns->send_packet (sl);	669	pl->contr->ns->send_packet (sl);
665	SET_FLAG (op, FLAG_CLIENT_SENT);	670	SET_FLAG (op, FLAG_CLIENT_SENT);
666	}	671	}
667		672
668	/**	673	/**
669	* Tells the client to delete an item. Uses the item	674	* Tells the client to delete an item.
670	* command with a -1 location.
671	*/	675	*/
672	void	676	void
673	esrv_del_item (player *pl, int tag)	677	esrv_del_item (player *pl, int tag)
674	{	678	{
675	if (!pl->ns)	679	if (!pl->ns)
…		…
730	void	734	void
731	ExamineCmd (char buf, int len, player pl)	735	ExamineCmd (char buf, int len, player pl)
732	{	736	{
733	tag_t tag = atoi (buf);	737	tag_t tag = atoi (buf);
734		738
		739	/* If the high bit is set, player applied a pseudo object. */
		740	if (tag & 0x80000000)
		741	{
		742	pl->ns->look_position = tag & 0x7fffffff;
		743	pl->ns->floorbox_update ();
		744	return;
		745	}
		746
735	object *op = esrv_get_ob_from_count (pl->ob, tag);	747	object *op = esrv_get_ob_from_count (pl->ob, tag);
736		748
737	if (!op)	749	if (!op)
738	{	750	{
739	LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);	751	LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
…		…
763	/** Client wants to apply some object. Lets do so. */	775	/** Client wants to apply some object. Lets do so. */
764	void	776	void
765	ApplyCmd (char buf, int len, player pl)	777	ApplyCmd (char buf, int len, player pl)
766	{	778	{
767	tag_t tag = atoi (buf);	779	tag_t tag = atoi (buf);
768
769	/* sort of a hack, but if the player saves and the player then manually
770	* applies a savebed (or otherwise tries to do stuff), we run into trouble.
771	*/
772	if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
773	return;
774		780
775	/* If the high bit is set, player applied a pseudo object. */	781	/* If the high bit is set, player applied a pseudo object. */
776	if (tag & 0x80000000)	782	if (tag & 0x80000000)
777	{	783	{
778	pl->ns->look_position = tag & 0x7fffffff;	784	pl->ns->look_position = tag & 0x7fffffff;
…		…
799	tag_t tag = net_uint32 ((uint8 *)data + 1);	805	tag_t tag = net_uint32 ((uint8 *)data + 1);
800	object *op = esrv_get_ob_from_count (pl->ob, tag);	806	object *op = esrv_get_ob_from_count (pl->ob, tag);
801		807
802	if (!op)	808	if (!op)
803	{	809	{
804	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");	810	pl->failmsg ("Could not find object to lock/unlock");
805	return;	811	return;
806	}	812	}
807		813
808	if (!flag)	814	if (!flag)
809	CLEAR_FLAG (op, FLAG_INV_LOCKED);	815	CLEAR_FLAG (op, FLAG_INV_LOCKED);
…		…
820	tag_t tag = net_uint32 ((uint8 *)data);	826	tag_t tag = net_uint32 ((uint8 *)data);
821	object *op = esrv_get_ob_from_count (pl->ob, tag);	827	object *op = esrv_get_ob_from_count (pl->ob, tag);
822		828
823	if (!op)	829	if (!op)
824	{	830	{
825	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");	831	pl->failmsg ("Could not find object to mark");
826	return;	832	return;
827	}	833	}
828		834
829	pl->mark = op;	835	pl->mark = op;
830	new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op));	836	pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
831	}	837	}
832		838
833	/**	839	/**
834	* look_at prints items on the specified square.	840	* look_at prints items on the specified square.
835	*	841	*
836	* [ removed EARTHWALL check and added check for containers inventory.	842	* [ removed EARTHWALL check and added check for containers inventory.
837	* Tero.Haatanen@lut.fi ]	843	* Tero.Haatanen@lut.fi ]
838	*/	844	*/
839	void	845	static void
840	look_at (object *op, int dx, int dy)	846	look_at (player *pl, int dx, int dy)
841	{	847	{
842	object *tmp;	848	dynbuf_text buf;
843	int flag = 0;	849	object *ob = pl->ob;
844	sint16 x, y;
845	maptile *m;
846		850
847	x = op->x + dx;	851	if (!pl->observe->map)
848	y = op->y + dy;
849
850	if (out_of_map (op->map, x, y))
851	return;	852	return;
852		853
853	m = get_map_from_coord (op->map, &x, &y);	854	mapxy pos (pl->observe);
854	if (!m)	855	pos.move (dx, dy);
855	return;
856		856
857	for (tmp = GET_MAP_OB (m, x, y); tmp && tmp->above; tmp = tmp->above)	857	if (pos.normalise ())
858	;	858	for (object *tmp = pos->top; tmp; tmp = tmp->below)
859
860	for (; tmp; tmp = tmp->below)
861	{	859	{
862	if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))	860	if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
863	continue;	861	continue;
864		862
865	if (!flag)
866	{
867	if (dx \|\| dy)
868	new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
869	else
870	{
871	clear_win_info (op);
872	new_draw_info (NDI_UNIQUE, 0, op, "You see:");
873	}
874	flag = 1;
875	}
876
877	if (QUERY_FLAG (op, FLAG_WIZ))	863	if (QUERY_FLAG (ob, FLAG_WIZ))
878	new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);	864	buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
879	else	865	else
880	new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));	866	buf.printf ("- %s.\n", query_name (tmp));
881		867
882	if (((tmp->inv != NULL \|\| (tmp->head && tmp->head->inv)) &&	868	object *head = tmp->head_ ();
883	(tmp->type != CONTAINER && tmp->type != FLESH)) \|\| QUERY_FLAG (op, FLAG_WIZ))
884	inventory (op, tmp->head == NULL ? tmp : tmp->head);
885		869
		870	if (head->inv)
		871	if ((head->type != CONTAINER && head->type != FLESH)
		872	\|\| QUERY_FLAG (ob, FLAG_WIZ))
		873	buf << head->query_inventory (ob, " ");
		874
886	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */	875	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
887	break;	876	break;
888	}	877	}
889		878
890	if (!flag)	879	if (buf.empty ())
891	{	880	pl->failmsg ("You see nothing there.");
892	if (dx \|\| dy)
893	new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
894	else	881	else
895	new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");	882	pl->infobox (MSG_CHANNEL ("lookat"), buf);
896	}
897	}	883	}
898		884
899	/** Client wants to look at some object. Lets do so. */	885	/** Client wants to look at some object. Lets do so. */
900	void	886	void
901	LookAt (char buf, int len, player pl)	887	LookAt (char buf, int len, player pl)
902	{	888	{
903	int dx, dy;
904	char *cp;	889	char *cp;
905		890
906	dx = atoi (buf);	891	int dx = atoi (buf);
907	if (!(cp = strchr (buf, ' ')))	892	if (!(cp = strchr (buf, ' ')))
908	return;	893	return;
909		894
910	dy = atoi (cp);	895	int dy = atoi (cp);
		896
		897	if (player *opl = pl->observe->contr)
		898	if (client *ns = opl->ns)
		899	{
911	if (fabs (dx) > pl->ns->mapx / 2 \|\| fabs (dy) > pl->ns->mapy / 2)	900	if (fabs (dx) > ns->mapx / 2 \|\| fabs (dy) > ns->mapy / 2)
912	return;	901	return;
913		902
914	if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])	903	if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
915	return;	904	return;
		905	}
916		906
917	look_at (pl->ob, dx, dy);	907	look_at (pl, dx, dy);
918	}	908	}
919		909
920	/** Move an object to a new location */	910	/** Move an object to a new location */
921	void	911	void
922	esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)	912	esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
…		…
938	/* If it is an active container, then we should drop all objects	928	/* If it is an active container, then we should drop all objects
939	* in the container and not the container itself.	929	* in the container and not the container itself.
940	*/	930	*/
941	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))	931	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
942	{	932	{
943	object current, next;	933	int cnt = MAX_ITEM_PER_DROP;
944		934
945	for (current = op->inv; current != NULL; current = next)	935	for (object *current = op->inv; current; )
946	{	936	{
947	next = current->below;	937	object *next = current->below;
		938
948	drop_object (pl, current, 0);	939	drop_object (pl, current, 0);
		940
		941	if (--cnt <= 0) break;
		942
		943	current = next;
949	}	944	}
950		945
951	esrv_update_item (UPD_WEIGHT, pl, op);	946	if (cnt <= 0)
		947	op->failmsg ("Only dropped some items, can't drop that many items at once.");
952	}	948	}
953	else	949	else
954	drop_object (pl, op, nrof);	950	drop_object (pl, op, nrof);
955		951
956	return;	952	return;
…		…
976	/* put_object_in_sack presumes that necessary sanity checking	972	/* put_object_in_sack presumes that necessary sanity checking
977	* has already been done (eg, it can be picked up and fits in	973	* has already been done (eg, it can be picked up and fits in
978	* in a sack, so check for those things. We should also check	974	* in a sack, so check for those things. We should also check
979	* an make sure env is in fact a container for that matter.	975	* an make sure env is in fact a container for that matter.
980	*/	976	*/
981	if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))	977	if (env->type == CONTAINER
		978	&& can_pick (pl, op)
		979	&& sack_can_hold (pl, env, op, nrof))
982	put_object_in_sack (pl, env, op, nrof);	980	put_object_in_sack (pl, env, op, nrof);
983	}	981	}
984		982

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.44 by root, Mon Apr 23 19:10:17 2007 UTC vs. Revision 1.64 by root, Mon May 5 22:03:22 2008 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.44 by root, Mon Apr 23 19:10:17 2007 UTC vs.
Revision 1.64 by root, Mon May 5 22:03:22 2008 UTC