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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.49 by root, Fri Jun 8 09:20:20 2007 UTC vs.
Revision 1.66 by root, Tue May 6 19:42:53 2008 UTC

…		…
1	/*	1	/*
2	* This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software; you can redistribute it and/or modify it	8	* Deliantra is free software: you can redistribute it and/or modify
9	* under the terms of the GNU General Public License as published by the Free	9	* it under the terms of the GNU General Public License as published by
10	* Software Foundation; either version 2 of the License, or (at your option)	10	* the Free Software Foundation, either version 3 of the License, or
11	* 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, but	13	* This program is distributed in the hope that it will be useful,
14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License along	18	* You should have received a copy of the GNU General Public License
19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	*	20	*
22	* The authors 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);
270	ns.flush_fx ();	266	ns.flush_fx ();
271		267
272	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])
273	ns.send_animation (head->animation_id);	269	ns.send_animation (head->animation_id);
274		270
275	sl << uint32 (head->count)	271	sl << uint32 (head->count)
276	<< uint32 (flags)	272	<< uint32 (flags)
277	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))	273	<< uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
278	<< uint32 (head->face);	274	<< uint32 (head->face);
		275
		276	int len;
279		277
280	if (!head->custom_name)	278	if (!head->custom_name)
281	{	279	{
282	strncpy (item_n, query_base_name (head, 0), 127);	280	strncpy (item_n, query_base_name (head, 0), 127);
283	item_n[127] = 0;	281	item_n[127] = 0;
…		…
297	len += strlen (item_n + 1 + len) + 1;	295	len += strlen (item_n + 1 + len) + 1;
298		296
299	sl << data8 (item_n, len)	297	sl << data8 (item_n, len)
300	<< uint16 (head->animation_id);	298	<< uint16 (head->animation_id);
301		299
302	anim_speed = 0;	300	int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
303	if (QUERY_FLAG (head, FLAG_ANIMATE))	301	: head->anim_speed ? clamp (head->anim_speed, 1, 255)
304	{	302	: 1. / clamp (fabs (head->speed), 1./255., 1./1.);
305	if (head->anim_speed)
306	anim_speed = head->anim_speed;
307	else
308	{
309	if (fabs (head->speed) < 0.001)
310	anim_speed = 255;
311	else if (fabs (head->speed) >= 1.0)
312	anim_speed = 1;
313	else
314	anim_speed = (int) (1.0 / fabs (head->speed));
315	}
316
317	if (anim_speed > 255)
318	anim_speed = 255;
319	}
320		303
321	sl << uint8 (anim_speed)	304	sl << uint8 (anim_speed)
322	<< uint32 (head->nrof);	305	<< uint32 (head->nrof);
323		306
324	if (ns.itemcmd == 2)	307	if (ns.itemcmd == 2)
325	sl << uint16 (head->client_type);	308	sl << uint16 (head->client_type);
326		309
327	SET_FLAG (head, FLAG_CLIENT_SENT);	310	SET_FLAG (head, FLAG_CLIENT_SENT);
328	}	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"
329		326
330	/**	327	/**
331	* Send the look window. Don't need to do animations here	328	* 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	329	* This sends all the faces to the client, not just updates. This is
333	* because object ordering would otherwise be inconsistent.	330	* because object ordering would otherwise be inconsistent.
334	*/	331	*/
335	void	332	void
336	esrv_draw_look (player *pl)	333	esrv_draw_look (player *pl)
337	{	334	{
338	int got_one = 0, start_look = 0, end_look = 0;
339
340	object *ob = pl->ob;	335	object *ob = pl->ob;
341		336
342	if (!pl->ns->update_look)	337	if (!pl->ns->update_look)
343	{	338	{
344	LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);	339	LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
345	return;	340	return;
346	}	341	}
347	else	342
348	pl->ns->update_look = 0;	343	pl->ns->update_look = 0;
349		344
350	if (QUERY_FLAG (ob, FLAG_REMOVED)	345	if (QUERY_FLAG (ob, FLAG_REMOVED)
351	\|\| !ob->map	346	\|\| !ob->map
352	\|\| ob->map->in_memory != MAP_IN_MEMORY	347	\|\| ob->map->in_memory != MAP_ACTIVE
353	\|\| out_of_map (ob->map, ob->x, ob->y))	348	\|\| out_of_map (ob->map, ob->x, ob->y))
354	return;	349	return;
355		350
356	pl->ns->send_packet ("delinv 0");	351	pl->ns->send_packet ("delinv 0");
357		352
358	packet sl;	353	packet sl;
359	sl.printf ("item%d ", pl->ns->itemcmd);	354	sl.printf ("item%d ", pl->ns->itemcmd);
360		355
361	sl << uint32 (0);	356	sl << uint32 (0);
362		357
363	pl->ns->send_face (empty_face);	358	int start_pos = pl->ns->look_position;
364	pl->ns->flush_fx ();	359	bool dirty = false;
365		360
366	if (pl->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	}
367	{	391	}
368	char buf[80];
369	snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
370		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	*/
371	sl << uint32 (0x80000000 \| (pl->ns->look_position - FLOORBOX_PAGESIZE))	399	sl << uint32 (0x80000000 \| (start_pos + FLOORBOX_PAGESIZE))
372	<< uint32 (0)	400	<< uint32 (0)
373	<< sint32 (-1)	401	<< uint32 ((uint32) - 1)
374	<< uint32 (empty_face)	402	<< uint32 (need_face_now (pl, FINGER_DOWN))
375	<< data8 (buf)	403	<< data8 ("Apply this to see the items below")
376	<< uint16 (0)	404	<< uint16 (0)
377	<< uint8 (0)	405	<< uint8 (0)
378	<< uint32 (0);	406	<< uint32 (0);
379		407
380	if (pl->ns->itemcmd == 2)	408	if (pl->ns->itemcmd == 2)
381	sl << uint16 (0);	409	sl << uint16 (0);
382	}
383		410
384	object *tmp = ob->ms ().top;	411	dirty = true;
385	for (object *last = 0; tmp != last; tmp = tmp->below)
386	{	412	}
387	object *head;
388		413
389	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)
390	{	427	{
391	last = tmp->below; /* assumes double floor mode */	428	pl->ns->send_packet (sl);
392	if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))	429
393	last = last->below;	430	sl.reset ();
		431	sl.printf ("item%d ", pl->ns->itemcmd);
		432	sl << uint32 (0);
		433
		434	dirty = false;
394	}	435	}
395
396	if (tmp->client_visible ())
397	{
398	if (++start_look < pl->ns->look_position)
399	continue;
400
401	end_look++;
402
403	if (end_look > FLOORBOX_PAGESIZE)
404	{
405	/* What we basically do is make a 'fake' object - when the user applies it,
406	* we notice the special tag the object has, and act accordingly.
407	*/
408	sl << uint32 (0x80000000 \| (pl->ns->look_position + FLOORBOX_PAGESIZE))
409	<< uint32 (0)
410	<< uint32 ((uint32) - 1)
411	<< uint32 (empty_face)
412	<< data8 ("Apply this to see next group of items")
413	<< uint16 (0)
414	<< uint8 (0)
415	<< uint32 (0);
416
417	if (pl->ns->itemcmd == 2)
418	sl << uint16 (0);
419
420	break;
421	}
422
423	if (tmp->head)
424	head = tmp->head;
425	else
426	head = tmp;
427
428	add_object_to_socklist (*pl->ns, sl, head);
429	got_one++;
430
431	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
432	{
433	pl->ns->send_packet (sl);
434
435	sl.reset ();
436	sl.printf ("item%d ", pl->ns->itemcmd);
437	sl << uint32 (0);
438	got_one = 0;
439	}
440	}
441	}	436	}
442		437
443	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)
444	pl->ns->send_packet (sl);	456	pl->ns->send_packet (sl);
445
446	}	457	}
447		458
448	/**	459	/**
449	* Sends whole inventory.	460	* Sends whole inventory.
450	*/	461	*/
…		…
480		491
481	/* IT is possible for players to accumulate a huge amount of	492	/* IT is possible for players to accumulate a huge amount of
482	* items (especially with some of the bags out there) to	493	* items (especially with some of the bags out there) to
483	* overflow the buffer. IF so, send multiple item commands.	494	* overflow the buffer. IF so, send multiple item commands.
484	*/	495	*/
485	if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))	496	if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
486	{	497	{
487	pl->contr->ns->send_packet (sl);	498	pl->contr->ns->send_packet (sl);
488		499
489	sl.reset ();	500	sl.reset ();
490	sl.printf ("item%d ", pl->contr->ns->itemcmd);	501	sl.printf ("item%d ", pl->contr->ns->itemcmd);
…		…
507	*/	518	*/
508	void	519	void
509	esrv_update_item (int flags, object pl, object op)	520	esrv_update_item (int flags, object pl, object op)
510	{	521	{
511	/* 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. */
512	if (op != pl)
513	{
514	if (!op->client_visible ())	523	if (op != pl && !op->client_visible ())
515	return;	524	return;
516	/* we remove the check for op->env, because in theory, the object
517	* is hopefully in the same place, so the client should preserve
518	* order.
519	*/
520	}
521		525
522	client *ns = pl->contr->ns;	526	client *ns = pl->contr->ns;
523	if (!ns)	527	if (!ns)
524	return;	528	return;
525		529
…		…
534		538
535	packet sl ("upditem");	539	packet sl ("upditem");
536		540
537	sl << uint8 (flags);	541	sl << uint8 (flags);
538		542
539	if (op->head)
540	op = op->head;	543	op = op->head_ ();
541		544
542	sl << uint32 (op->count);	545	sl << uint32 (op->count);
543		546
544	if (flags & UPD_LOCATION)	547	if (flags & UPD_LOCATION)
545	sl << uint32 (op->env ? op->env->count : 0);	548	sl << uint32 (op->env ? op->env->count : 0);
…		…
547	if (flags & UPD_FLAGS)	550	if (flags & UPD_FLAGS)
548	sl << uint32 (query_flags (op));	551	sl << uint32 (query_flags (op));
549		552
550	if (flags & UPD_WEIGHT)	553	if (flags & UPD_WEIGHT)
551	{	554	{
552	sint32 weight = WEIGHT (op);	555	sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
553		556
554	sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
555
556	if (pl == op)	557	if (op)
557	ns->last_weight = weight;	558	ns->last_weight = weight;
		559
		560	sl << uint32 (weight);
558	}	561	}
559		562
560	if (flags & UPD_FACE)	563	if (flags & UPD_FACE)
561	{	564	{
562	ns->send_face (op->face);	565	ns->send_face (op->face, -50);
563	ns->flush_fx ();	566	ns->flush_fx ();
564	sl << uint32 (op->face);	567	sl << uint32 (op->face);
565	}	568	}
566		569
567	if (flags & UPD_NAME)	570	if (flags & UPD_NAME)
…		…
633	esrv_send_item (object pl, object op)	636	esrv_send_item (object pl, object op)
634	{	637	{
635	if (!pl->contr->ns)	638	if (!pl->contr->ns)
636	return;	639	return;
637		640
638	/* If this is not the player object, do some more checks */
639	if (op != pl)
640	{
641	/* We only send 'visibile' objects to the client */	641	/* We only send 'visible' objects to the client, and sometimes the player */
642	if (!op->client_visible ())	642	if (!op->client_visible () && op->type != PLAYER)
643	return;	643	return;
644
645	/* if the item is on the ground, mark that the look needs to
646	* be updated.
647	*/
648	if (!op->env)
649	{
650	pl->contr->ns->floorbox_update ();
651	return;
652	}
653	}
654		644
655	packet sl;	645	packet sl;
656		646
657	sl.printf ("item%d ", pl->contr->ns->itemcmd);	647	sl.printf ("item%d ", pl->contr->ns->itemcmd);
658		648
659	if (op->head)
660	op = op->head;	649	op = op->head_ ();
661		650
662	sl << uint32 (op->env ? op->env->count : 0);	651	sl << uint32 (op->env ? op->env->count : 0);
663		652
664	add_object_to_socklist (*pl->contr->ns, sl, op);	653	add_object_to_socklist (*pl->contr->ns, sl, op);
665		654
666	pl->contr->ns->send_packet (sl);	655	pl->contr->ns->send_packet (sl);
667	SET_FLAG (op, FLAG_CLIENT_SENT);	656	SET_FLAG (op, FLAG_CLIENT_SENT);
668	}	657	}
669		658
670	/**	659	/**
671	* Tells the client to delete an item. Uses the item	660	* Tells the client to delete an item.
672	* command with a -1 location.
673	*/	661	*/
674	void	662	void
675	esrv_del_item (player *pl, int tag)	663	esrv_del_item (player *pl, int tag)
676	{	664	{
677	if (!pl->ns)	665	if (!pl->ns)
…		…
732	void	720	void
733	ExamineCmd (char buf, int len, player pl)	721	ExamineCmd (char buf, int len, player pl)
734	{	722	{
735	tag_t tag = atoi (buf);	723	tag_t tag = atoi (buf);
736		724
		725	/* If the high bit is set, player applied a pseudo object. */
		726	if (tag & 0x80000000)
		727	{
		728	pl->ns->look_position = tag & 0x7fffffff;
		729	pl->ns->floorbox_update ();
		730	return;
		731	}
		732
737	object *op = esrv_get_ob_from_count (pl->ob, tag);	733	object *op = esrv_get_ob_from_count (pl->ob, tag);
738		734
739	if (!op)	735	if (!op)
740	{	736	{
741	LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);	737	LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
…		…
765	/** Client wants to apply some object. Lets do so. */	761	/** Client wants to apply some object. Lets do so. */
766	void	762	void
767	ApplyCmd (char buf, int len, player pl)	763	ApplyCmd (char buf, int len, player pl)
768	{	764	{
769	tag_t tag = atoi (buf);	765	tag_t tag = atoi (buf);
770
771	/* sort of a hack, but if the player saves and the player then manually
772	* applies a savebed (or otherwise tries to do stuff), we run into trouble.
773	*/
774	if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
775	return;
776		766
777	/* If the high bit is set, player applied a pseudo object. */	767	/* If the high bit is set, player applied a pseudo object. */
778	if (tag & 0x80000000)	768	if (tag & 0x80000000)
779	{	769	{
780	pl->ns->look_position = tag & 0x7fffffff;	770	pl->ns->look_position = tag & 0x7fffffff;
…		…
801	tag_t tag = net_uint32 ((uint8 *)data + 1);	791	tag_t tag = net_uint32 ((uint8 *)data + 1);
802	object *op = esrv_get_ob_from_count (pl->ob, tag);	792	object *op = esrv_get_ob_from_count (pl->ob, tag);
803		793
804	if (!op)	794	if (!op)
805	{	795	{
806	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");
807	return;	797	return;
808	}	798	}
809		799
810	if (!flag)	800	if (!flag)
811	CLEAR_FLAG (op, FLAG_INV_LOCKED);	801	CLEAR_FLAG (op, FLAG_INV_LOCKED);
…		…
822	tag_t tag = net_uint32 ((uint8 *)data);	812	tag_t tag = net_uint32 ((uint8 *)data);
823	object *op = esrv_get_ob_from_count (pl->ob, tag);	813	object *op = esrv_get_ob_from_count (pl->ob, tag);
824		814
825	if (!op)	815	if (!op)
826	{	816	{
827	new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");	817	pl->failmsg ("Could not find object to mark");
828	return;	818	return;
829	}	819	}
830		820
831	pl->mark = op;	821	pl->mark = op;
832	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)));
833	}	823	}
834		824
835	/**	825	/**
836	* look_at prints items on the specified square.	826	* look_at prints items on the specified square.
837	*	827	*
…		…
839	* Tero.Haatanen@lut.fi ]	829	* Tero.Haatanen@lut.fi ]
840	*/	830	*/
841	static void	831	static void
842	look_at (player *pl, int dx, int dy)	832	look_at (player *pl, int dx, int dy)
843	{	833	{
		834	dynbuf_text buf;
844	object *ob = pl->ob;	835	object *ob = pl->ob;
845		836
846	maptile *m = pl->observe->map;	837	if (!pl->observe->map)
847	sint16 x = pl->observe->x + dx;
848	sint16 y = pl->observe->y + dy;
849
850	if (!m)
851	return;	838	return;
852		839
853	if (!xy_normalise (m, x, y))	840	mapxy pos (pl->observe);
854	{	841	pos.move (dx, dy);
855	new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
856	return;
857	}
858		842
859	int flag = 0;	843	if (pos.normalise ())
860
861	for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below)	844	for (object *tmp = pos->top; tmp; tmp = tmp->below)
862	{	845	{
863	if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))	846	if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
864	continue;	847	continue;
865		848
866	if (!flag)
867	{
868	if (dx \|\| dy)
869	new_draw_info (NDI_UNIQUE, 0, ob, "There you see:");
870	else
871	new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
872
873	flag = 1;
874	}
875
876	if (QUERY_FLAG (ob, FLAG_WIZ))	849	if (QUERY_FLAG (ob, FLAG_WIZ))
877	new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count);	850	buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
878	else	851	else
879	new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp));	852	buf.printf ("- %s.\n", query_name (tmp));
880		853
881	if (((tmp->inv != NULL \|\| (tmp->head && tmp->head->inv)) &&	854	object *head = tmp->head_ ();
882	(tmp->type != CONTAINER && tmp->type != FLESH)) \|\| QUERY_FLAG (ob, FLAG_WIZ))
883	inventory (ob, tmp->head == NULL ? tmp : tmp->head);
884		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
885	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */	861	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
886	break;	862	break;
887	}	863	}
888		864
889	if (!flag)	865	if (buf.empty ())
890	{	866	pl->failmsg ("You see nothing there.");
891	if (dx \|\| dy)
892	new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
893	else	867	else
894	new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing.");	868	pl->infobox (MSG_CHANNEL ("lookat"), buf);
895	}
896	}	869	}
897		870
898	/** Client wants to look at some object. Lets do so. */	871	/** Client wants to look at some object. Lets do so. */
899	void	872	void
900	LookAt (char buf, int len, player pl)	873	LookAt (char buf, int len, player pl)
…		…
922		895
923	/** Move an object to a new location */	896	/** Move an object to a new location */
924	void	897	void
925	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)
926	{	899	{
927	object op, env;
928
929	op = esrv_get_ob_from_count (pl, tag);	900	object *op = esrv_get_ob_from_count (pl, tag);
930	if (!op)	901	if (!op)
931	{	902	{
932	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);
933	return;	904	return;
934	}	905	}
…		…
941	/* 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
942	* in the container and not the container itself.	913	* in the container and not the container itself.
943	*/	914	*/
944	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))	915	if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
945	{	916	{
946	object current, next;	917	int cnt = MAX_ITEM_PER_DROP;
947		918
948	for (current = op->inv; current != NULL; current = next)	919	for (object *current = op->inv; current && cnt--; )
949	{	920	{
950	next = current->below;	921	object *next = current->below;
951	drop_object (pl, current, 0);	922	drop_object (pl, current, 0);
		923	current = next;
952	}	924	}
953		925
954	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.");
955	}	928	}
956	else	929	else
957	drop_object (pl, op, nrof);	930	drop_object (pl, op, nrof);
958		931
959	return;	932	return;
…		…
979	/* put_object_in_sack presumes that necessary sanity checking	952	/* put_object_in_sack presumes that necessary sanity checking
980	* 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
981	* 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
982	* 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.
983	*/	956	*/
984	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))
985	put_object_in_sack (pl, env, op, nrof);	960	put_object_in_sack (pl, env, op, nrof);
986	}	961	}
987		962

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.49 by root, Fri Jun 8 09:20:20 2007 UTC vs. Revision 1.66 by root, Tue May 6 19:42:53 2008 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.49 by root, Fri Jun 8 09:20:20 2007 UTC vs.
Revision 1.66 by root, Tue May 6 19:42:53 2008 UTC