[ViewVC] Diff of: cvs/deliantra/server/server/c

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.69 by root, Tue Apr 22 07:01:47 2008 UTC vs.
Revision 1.119 by root, Sat Apr 10 04:54:09 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	/*
25	* Object (handling) commands	26	* Object (handling) commands
26	*/	27	*/
27		28
28	#include <global.h>	29	#include <global.h>
29	#include <loader.h>
30	#include <skills.h>	30	#include <skills.h>
31	#include <sproto.h>	31	#include <sproto.h>
32	#include <living.h>	32	#include <living.h>
33	#include <math.h>
34		33
35	/*	34	/*
36	* Object id parsing functions	35	* Object id parsing functions
37	*/	36	*/
38		37
133	{	132	{
134	new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");	133	new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");
135	return 0;	134	return 0;
136	}	135	}
137		136
138	skill = find_skill_by_name (pl, params);	137	skill = find_skill_by_name_fuzzy (pl, params);
139		138
140	if (!skill)	139	if (!skill)
141	{	140	{
142	new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params);	141	new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the %s skill.", params);
143	return 0;	142	return 0;
144	}	143	}
145		144
146	pl->change_skill (0);	145	pl->apply (skill);
147	apply_special (pl, skill, AP_APPLY);
148	return 1;	146	return 1;
149	}
150
151	/* These functions (command_search, command_disarm) are really just wrappers for
152	* things like 'use_skill ...'). In fact, they should really be obsoleted
153	* and replaced with those.
154	*/
155	int
156	command_search (object op, char params)
157	{
158	return use_skill (op, skill_names[SK_FIND_TRAPS]);
159	}
160
161	int
162	command_disarm (object op, char params)
163	{
164	return use_skill (op, skill_names[SK_DISARM_TRAPS]);
165	}	147	}
166		148
167	/* A little special because we do want to pass the full params along	149	/* A little special because we do want to pass the full params along
168	* as it includes the object to throw.	150	* as it includes the object to throw.
169	*/	151	*/
…		…
171	command_throw (object op, char params)	153	command_throw (object op, char params)
172	{	154	{
173	if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING]))	155	if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING]))
174	return do_skill (op, op, skop, op->facing, params);	156	return do_skill (op, op, skop, op->facing, params);
175	else	157	else
176	new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing.");	158	new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the throwing skill.");
177		159
178	return 0;	160	return 0;
179	}	161	}
180		162
181	int	163	int
…		…
207		189
208	while (*params == ' ')	190	while (*params == ' ')
209	params++;	191	params++;
210		192
211	if (object *inv = find_best_apply_object_match (op, params, aflag))	193	if (object *inv = find_best_apply_object_match (op, params, aflag))
212	player_apply (op, inv, aflag, 0);	194	op->apply (inv, aflag);
213	else	195	else
214	new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params);	196	op->failmsgf ("Could not find any match to the %s.", params);
215	}	197	}
216		198
217	return 0;	199	return 0;
218	}	200	}
219		201
…		…
241	return 0;	223	return 0;
242	}	224	}
243		225
244	if (sack->race && (sack->race != op->race \|\| op->type == CONTAINER \|\| (sack->stats.food && sack->stats.food != op->type)))	226	if (sack->race && (sack->race != op->race \|\| op->type == CONTAINER \|\| (sack->stats.food && sack->stats.food != op->type)))
245	{	227	{
246	new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack));	228	new_draw_info_format (NDI_UNIQUE, 0, pl, "You can only put objects of type '%s' into the %s.", &sack->race, query_name (sack));
247	return 0;	229	return 0;
248	}	230	}
249		231
250	if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)	232	if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
251	{	233	{
…		…
284	* (sack, luggage, etc), tmp->env->env then points to the player (nested	266	* (sack, luggage, etc), tmp->env->env then points to the player (nested
285	* containers not allowed as of now)	267	* containers not allowed as of now)
286	*/	268	*/
287	if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)	269	if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
288	{	270	{
289	new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!");	271	pl->failmsg ("You are levitating, you can't reach the ground! "
		272	"H<You have to stop levitating first, if you can, either by using your levitation skill, "
		273	"or waiting till the levitation effect wears off.>");
290	return;	274	return;
291	}	275	}
292		276
293	if (QUERY_FLAG (tmp, FLAG_NO_DROP))	277	if (QUERY_FLAG (tmp, FLAG_NO_DROP))
294	return;	278	return;
…		…
375	count = tmp->nrof;	359	count = tmp->nrof;
376		360
377	/* container is open, so use it */	361	/* container is open, so use it */
378	if (tmp->flag [FLAG_STARTEQUIP])	362	if (tmp->flag [FLAG_STARTEQUIP])
379	alt = op;	363	alt = op;
380	else if (op->container)	364	else if ((alt = op->container_ ()))
381	{	365	{
382	alt = op->container;
383	if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))	366	if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
384	goto leave;	367	goto leave;
385	}	368	}
386	else	369	else
387	{ /* non container pickup */	370	{ /* non container pickup */
…		…
441	int	424	int
442	command_take (object op, char params)	425	command_take (object op, char params)
443	{	426	{
444	object tmp, next;	427	object tmp, next;
445		428
446	if (op->container)	429	if (op->container_ ())
447	tmp = op->container->inv;	430	tmp = op->container_ ()->inv;
448	else	431	else
449	{	432	{
450	tmp = op->above;	433	tmp = op->above;
451	if (tmp)	434	if (tmp)
452	while (tmp->above)	435	while (tmp->above)
…		…
464		447
465	/* Makes processing easier */	448	/* Makes processing easier */
466	if (params && *params == '\0')	449	if (params && *params == '\0')
467	params = 0;	450	params = 0;
468		451
469	int cnt = MAX_ITEM_PER_DROP;	452	int cnt = MAX_ITEM_PER_ACTION;
470		453
471	while (tmp)	454	while (tmp)
472	{	455	{
473	next = tmp->below;	456	next = tmp->below;
474		457
…		…
482	* but that probably will make it more difficult to read, and	465	* but that probably will make it more difficult to read, and
483	* not make it any more efficient	466	* not make it any more efficient
484	*/	467	*/
485	if (params && item_matched_string (op, tmp, params))	468	if (params && item_matched_string (op, tmp, params))
486	{	469	{
		470	if (--cnt < 0) break;
487	pick_up (op, tmp);	471	pick_up (op, tmp);
488	if (--cnt <= 0) break;
489	}	472	}
490	else if (can_pick (op, tmp) && !params)	473	else if (can_pick (op, tmp) && !params)
491	{	474	{
		475	if (--cnt < 0) break;
492	pick_up (op, tmp);	476	pick_up (op, tmp);
493	break;	477	break;
494	}	478	}
495		479
496	tmp = next;	480	tmp = next;
497	}	481	}
498		482
499	if (cnt <= 0)	483	if (cnt < 0)
500	{	484	{
501	op->failmsg ("Couldn't pick up so many items at once.");	485	op->failmsg ("Couldn't pick up so many items at once.");
502	return 0;	486	return 0;
503	}	487	}
504		488
…		…
517		501
518	return 0;	502	return 0;
519	}	503	}
520		504
521	/*	505	/*
522	* This function was part of drop, now is own function.	506	* This function was part of drop, now is own function.
523	* Player 'op' tries to put object 'tmp' into sack 'sack',	507	* Player 'op' tries to put object 'tmp' into sack 'sack',
524	* if nrof is non zero, then nrof objects is tried to put into sack.	508	* if nrof is non zero, then nrof objects is tried to put into sack.
		509	*
525	* Note that the 'sack' in question can now be a transport,	510	* Note that the 'sack' in question can now be a transport,
526	* so this function isn't named very good anymore.	511	* so this function isn't named very good anymore.
527	*/	512	*/
528	void	513	void
529	put_object_in_sack (object op, object sack, object *tmp, uint32 nrof)	514	put_object_in_sack (object op, object sack, object *tmp, uint32 nrof)
…		…
532	char buf[MAX_BUF];	517	char buf[MAX_BUF];
533		518
534	if (sack == tmp)	519	if (sack == tmp)
535	return; /* Can't put an object in itself */	520	return; /* Can't put an object in itself */
536		521
537	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))	522	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP))
538	{	523	{
539	new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));	524	new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));
540	return;	525	return;
541	}	526	}
542		527
…		…
551		536
552	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)	537	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
553	{	538	{
554	tmp = tmp2->below;	539	tmp = tmp2->below;
555		540
556	if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof)))	541	if ((sack->type == CONTAINER && sack_can_hold (op, op->container_ (), tmp2, tmp2->nrof)))
557	put_object_in_sack (op, sack, tmp2, 0);	542	put_object_in_sack (op, sack, tmp2, 0);
558	else	543	else
559	{	544	{
560	sprintf (buf, "Your %s fills up.", query_name (sack));	545	sprintf (buf, "Your %s fills up.", query_name (sack));
561	new_draw_info (NDI_UNIQUE, 0, op, buf);	546	new_draw_info (NDI_UNIQUE, 0, op, buf);
…		…
571	*/	556	*/
572	if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof)))	557	if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof)))
573	return;	558	return;
574		559
575	if (QUERY_FLAG (tmp, FLAG_APPLIED))	560	if (QUERY_FLAG (tmp, FLAG_APPLIED))
576	if (apply_special (op, tmp, AP_UNAPPLY \| AP_NO_MERGE))	561	if (!op->apply (tmp, AP_UNAPPLY \| AP_NO_MERGE))
577	return;	562	return;
578		563
579	/* we want to put some portion of the item into the container */	564	/* we want to put some portion of the item into the container */
580	if (!can_split (op, tmp, nrof))	565	if (!can_split (op, tmp, nrof))
581	return;	566	return;
582		567
583	new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));	568	new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
584	sack->insert (tmp);	569	sack->insert (tmp);
		570	}
585		571
586	// elmex: 2007-11-26: removed update_stats and replaced	572	/* In contrast to drop_object (op, tmp, nrof) above this function takes the
587	// it by update_after_inventory_change () in the caller	573	* already split off object, and feeds it to the event handlers and does
588	// of this function	574	* other magic with it.
		575	*
		576	* <droppper> is the object that dropped this object and <obj> is the
		577	* object that was dropped.
		578	*
		579	* Make sure to check what happened with <obj> after this function returns!
		580	* Otherwise you may leak this object.
		581	*/
		582	void
		583	drop_object (object dropper, object obj)
		584	{
		585	if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
		586	return;
		587
		588	if (obj->destroyed () \|\| obj->is_inserted ())
		589	return;
		590
		591	if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
		592	{
		593	dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
		594	dropper->statusmsg ("The god who lent it to you retrieves it.");
		595
		596	obj->destroy ();
		597	dropper->update_stats ();
		598	return;
		599	}
		600
		601	for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
		602	floor;
		603	floor = floor->above)
		604	if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
		605	return;
		606
		607	if (obj->destroyed () \|\| obj->is_inserted ())
		608	return;
		609
		610	if (dropper->is_in_shop () && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
		611	if (!sell_item (obj, dropper))
		612	return;
		613
		614	if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
		615	return;
		616
		617	/* If nothing special happened with this object, the default action is to
		618	* insert it below the dropper:
		619	*/
		620
		621	obj->x = dropper->x;
		622	obj->y = dropper->y;
		623
		624	insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
589	}	625	}
590		626
591	/*	627	/*
592	* This function was part of drop, now is own function.	628	* This function was part of drop, now is own function.
593	* Player 'op' tries to drop object 'tmp', if tmp is non zero, then	629	* Player 'op' tries to drop object 'tmp', if tmp is non zero, then
594	* nrof objects is tried to dropped.	630	* nrof objects are tried to drop.
595	* This is used when dropping objects onto the floor.	631	* This is used when dropping objects onto the floor.
596	*/	632	*/
597	void	633	void
598	drop_object (object op, object tmp, uint32 nrof)	634	drop_object (object op, object tmp, uint32 nrof)
599	{	635	{
600	if (QUERY_FLAG (tmp, FLAG_NO_DROP))	636	if (QUERY_FLAG (tmp, FLAG_NO_DROP))
601	return;	637	return;
602		638
603	if (QUERY_FLAG (tmp, FLAG_APPLIED))	639	if (QUERY_FLAG (tmp, FLAG_APPLIED))
604	if (apply_special (op, tmp, AP_UNAPPLY \| AP_NO_MERGE))	640	if (!op->apply (tmp, AP_UNAPPLY \| AP_NO_MERGE))
605	return; /* can't unapply it */	641	return; /* can't unapply it */
606
607	//fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
608		642
609	/* We are only dropping some of the items. We split the current object	643	/* We are only dropping some of the items. We split the current object
610	* off	644	* off
611	*/	645	*/
612	if (!can_split (op, tmp, nrof))	646	if (!can_split (op, tmp, nrof))
613
614	if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
615	return;	647	return;
616		648
617	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))	649	drop_object (op, tmp);
618	{
619	op->statusmsg (format ("You drop the %s.", query_name (tmp)));
620	op->statusmsg ("The gods who lent it to you retrieves it.");
621		650
622	tmp->destroy ();	651	if (!tmp->destroyed () && !tmp->is_inserted ())
623	op->update_stats ();
624	return;
625	}	652	{
626		653	// if nothing happened with the object we give it back
627	/* Call this before we update the various windows/players. At least	654	op->insert (tmp);
628	* that we, we know the weight is correct.
629	*/
630	// 2007-11-26: moved op->update_stats away and calling it later after
631	// all items of a drop command have been processed.
632
633	for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
634	if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
635	return;
636
637	if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
638	sell_item (tmp, op);
639
640	tmp->x = op->x;
641	tmp->y = op->y;
642
643	insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
644	}
645
646	void
647	update_after_inventory_change (object *op)
648	{
649	/* Call this before we update the various windows/players. At least
650	* that we, we know the weight is correct.
651	*/
652	op->update_stats ();
653
654	// elmex: kept this for now, i have no idea what happens when i remove it:
655	if (op->type == PLAYER)
656	{
657	/* Need to update the weight for the player */
658	esrv_send_item (op, op);
659	op->contr->ns->floorbox_update ();
660	}	655	}
661	}	656	}
662		657
663	void	658	void
664	drop (object op, object tmp)	659	drop (object op, object tmp)
…		…
674	if (tmp->env && tmp->env->type != PLAYER)	669	if (tmp->env && tmp->env->type != PLAYER)
675	{	670	{
676	/* Just toss the object - probably shouldn't be hanging	671	/* Just toss the object - probably shouldn't be hanging
677	* around anyways	672	* around anyways
678	*/	673	*/
679	tmp->remove ();
680	tmp->destroy ();	674	tmp->destroy ();
681	return;	675	return;
682	}	676	}
683	else	677	else
684	{
685	while (tmp != NULL && tmp->invisible)	678	while (tmp && tmp->invisible)
686	tmp = tmp->below;	679	tmp = tmp->below;
687	}
688	}	680	}
689		681
690	if (tmp == NULL)	682	if (!tmp)
691	{	683	{
692	new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");	684	new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
693	return;	685	return;
694	}	686	}
		687
695	if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))	688	if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
696	{	689	{
697	new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");	690	new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
698	return;	691	return;
699	}	692	}
		693
700	if (QUERY_FLAG (tmp, FLAG_NO_DROP))	694	if (QUERY_FLAG (tmp, FLAG_NO_DROP))
701	{	695	{
702	#if 0	696	#if 0
703	/* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */	697	/* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
704	new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");	698	new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
…		…
707	}	701	}
708		702
709	if (op->type == PLAYER && op->contr->last_used == tmp)	703	if (op->type == PLAYER && op->contr->last_used == tmp)
710	op->contr->last_used = tmp->below ? tmp->below	704	op->contr->last_used = tmp->below ? tmp->below
711	: tmp->above ? tmp->above	705	: tmp->above ? tmp->above
712	: 0;	706	: (object *)0;
713		707
714	if (op->container)	708	if (op->container_ ())
715	{	709	{
716	if (op->type == PLAYER)	710	if (op->type == PLAYER)
717	put_object_in_sack (op, op->container, tmp, op->contr->count);	711	put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
718	else	712	else
719	put_object_in_sack (op, op->container, tmp, 0);	713	put_object_in_sack (op, op->container_ (), tmp, 0);
720	}	714	}
721	else	715	else
722	{	716	{
723	if (op->type == PLAYER)	717	if (op->type == PLAYER)
724	drop_object (op, tmp, op->contr->count);	718	drop_object (op, tmp, op->contr->count);
…		…
728		722
729	if (op->type == PLAYER)	723	if (op->type == PLAYER)
730	op->contr->count = 0;	724	op->contr->count = 0;
731	}	725	}
732		726
733
734
735	/* Command will drop all items that have not been locked */	727	/* Command will drop all items that have not been locked */
736	int	728	int
737	command_dropall (object op, char params)	729	command_dropall (object op, char params)
738	{	730	{
739		731
740	object curinv, nextinv;
741
742	if (op->inv == NULL)	732	if (op->inv == NULL)
743	{	733	{
744	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");	734	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
745	return 0;	735	return 0;
746	}	736	}
747		737
748	curinv = op->inv;	738	object *curinv = op->inv;
		739	object *nextinv;
749		740
750	/*	741	/*
751	This is the default. Drops everything not locked or considered	742	This is the default. Drops everything not locked or considered
752	not something that should be dropped.	743	not something that should be dropped.
753	*/	744	*/
754	/*	745	/*
755	Care must be taken that the next item pointer is not to money as	746	Care must be taken that the next item pointer is not to money as
756	the drop() routine will do unknown things to it when dropping	747	the drop() routine will do unknown things to it when dropping
757	in a shop. --Tero.Pelander@utu.fi	748	in a shop. --Tero.Pelander@utu.fi
758	*/	749	*/
759
760	int cnt = MAX_ITEM_PER_DROP;	750	int cnt = MAX_ITEM_PER_ACTION;
761		751
762	if (params == NULL)	752	if (!params)
763	{	753	{
764	while (curinv != NULL)	754	while (curinv)
765	{	755	{
766	nextinv = curinv->below;	756	nextinv = curinv->below;
		757
767	while (nextinv && nextinv->type == MONEY)	758	while (nextinv && nextinv->type == MONEY)
768	nextinv = nextinv->below;	759	nextinv = nextinv->below;
		760
769	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&	761	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED)
770	curinv->type != FOOD && curinv->type != KEY &&	762	&& curinv->type != MONEY
771	curinv->type != SPECIAL_KEY && curinv->type != GEM &&	763	&& curinv->type != FOOD
		764	&& curinv->type != KEY
		765	&& curinv->type != SPECIAL_KEY
		766	&& curinv->type != GEM
		767	&& !curinv->invisible
772	!curinv->invisible && (curinv->type != CONTAINER \|\| op->container != curinv))	768	&& (curinv->type != CONTAINER \|\| op->container_ () != curinv))
773	{	769	{
774	drop (op, curinv);	770	drop (op, curinv);
775	if (--cnt <= 0) break;	771	if (--cnt <= 0) break;
776	}	772	}
		773
777	curinv = nextinv;	774	curinv = nextinv;
778	}	775	}
779	}	776	}
780
781	else if (strcmp (params, "weapons") == 0)	777	else if (strcmp (params, "weapons") == 0)
782	{	778	{
783	while (curinv != NULL)	779	while (curinv)
784	{	780	{
785	nextinv = curinv->below;	781	nextinv = curinv->below;
		782
786	while (nextinv && nextinv->type == MONEY)	783	while (nextinv && nextinv->type == MONEY)
787	nextinv = nextinv->below;	784	nextinv = nextinv->below;
		785
788	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) \|\| (curinv->type == BOW) \|\| (curinv->type == ARROW)))	786	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) \|\| (curinv->type == BOW) \|\| (curinv->type == ARROW)))
789	{	787	{
790	drop (op, curinv);	788	drop (op, curinv);
791	if (--cnt <= 0) break;	789	if (--cnt <= 0) break;
792	}	790	}
		791
793	curinv = nextinv;	792	curinv = nextinv;
794	}	793	}
795	}	794	}
796
797	else if (strcmp (params, "armor") == 0 \|\| strcmp (params, "armour") == 0)	795	else if (strcmp (params, "armor") == 0 \|\| strcmp (params, "armour") == 0)
798	{	796	{
799	while (curinv != NULL)	797	while (curinv)
800	{	798	{
801	nextinv = curinv->below;	799	nextinv = curinv->below;
		800
802	while (nextinv && nextinv->type == MONEY)	801	while (nextinv && nextinv->type == MONEY)
803	nextinv = nextinv->below;	802	nextinv = nextinv->below;
		803
804	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) \|\| curinv->type == SHIELD \|\| curinv->type == HELMET))	804	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) \|\| curinv->type == SHIELD \|\| curinv->type == HELMET))
805	{	805	{
806	drop (op, curinv);	806	drop (op, curinv);
807	if (--cnt <= 0) break;	807	if (--cnt <= 0) break;
808	}	808	}
		809
809	curinv = nextinv;	810	curinv = nextinv;
810	}	811	}
811	}	812	}
812
813	else if (strcmp (params, "misc") == 0)	813	else if (strcmp (params, "misc") == 0)
814	{	814	{
815	while (curinv != NULL)	815	while (curinv)
816	{	816	{
817	nextinv = curinv->below;	817	nextinv = curinv->below;
		818
818	while (nextinv && nextinv->type == MONEY)	819	while (nextinv && nextinv->type == MONEY)
819	nextinv = nextinv->below;	820	nextinv = nextinv->below;
		821
820	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))	822	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
821	{	823	{
822	switch (curinv->type)	824	switch (curinv->type)
823	{	825	{
824	case HORN:	826	case HORN:
…		…
842	break;	844	break;
843	default:	845	default:
844	curinv = nextinv;	846	curinv = nextinv;
845	break;	847	break;
846	}	848	}
		849
847	if (--cnt <= 0) break;	850	if (--cnt <= 0) break;
848	}	851	}
		852
849	curinv = nextinv;	853	curinv = nextinv;
850	}	854	}
851	}	855	}
852		856
853	if (cnt <= 0)	857	if (cnt <= 0)
854	op->failmsg ("Only dropped some items, can't drop that many items at once.");	858	op->failmsg ("Only dropped some items, can't drop that many items at once.");
855		859
856	update_after_inventory_change (op);
857
858	/* draw_look(op);*/	860	/* draw_look(op);*/
859	return 0;	861	return 0;
860	}	862	}
861		863
		864
		865	/* This function tries to drop all objects in the <objs> vector.
		866	* <dropper> is the object that wants to drop them.
		867	* <cnt> can be a 0 pointer or a pointer to the maximum number of
		868	* drop operations to perform.
		869	*
		870	* Returns true if at least one item was dropped.
		871	*/
		872	static bool
		873	drop_vector (object dropper, vector<object > &objs, int *cnt)
		874	{
		875	vector<object *>::iterator i;
		876
		877	bool did_one = false;
		878
		879	for (i = objs.begin (); i != objs.end (); i++)
		880	{
		881	drop (dropper, *i);
		882	if (cnt && --*cnt <= 0) break;
		883	did_one = true;
		884	}
		885
		886	return did_one;
		887	}
		888
862	/* Object op wants to drop object(s) params. params can be a	889	/* Object op wants to drop object(s) params. params can be a
863	* comma seperated list.	890	* comma seperated list.
864	*/	891	*/
865
866	int	892	int
867	command_drop (object op, char params)	893	command_drop (object op, char params)
868	{	894	{
869	object tmp, next;	895	object tmp, next;
870	int did_one = 0;	896	int did_one = 0;
…		…
874	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");	900	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
875	return 0;	901	return 0;
876	}	902	}
877	else	903	else
878	{	904	{
879	int cnt = MAX_ITEM_PER_DROP;	905	vector<object *> matched_objs;
880		906
881	for (tmp = op->inv; tmp; tmp = next)	907	for (tmp = op->inv; tmp; tmp = next)
882	{	908	{
883	next = tmp->below;	909	next = tmp->below;
884	if (QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| tmp->invisible)	910	if (QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| tmp->invisible)
885	continue;	911	continue;
886		912
887	if (item_matched_string (op, tmp, params))	913	if (item_matched_string (op, tmp, params))
888	{	914	matched_objs.push_back (tmp);
889	drop (op, tmp);
890	if (--cnt <= 0) break;
891	did_one = 1;
892	}	915	}
893	}
894		916
895	if (!did_one)	917	int cnt = MAX_ITEM_PER_ACTION;
		918
		919	if (!drop_vector (op, matched_objs, &cnt))
896	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");	920	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
897		921
898	if (cnt <= 0)	922	if (cnt <= 0)
899	op->failmsg ("Only dropped some items, can't drop that many items at once.");	923	op->failmsg ("Only dropped some items, can't drop that many items at once.");
900
901	update_after_inventory_change (op);
902	}	924	}
903		925
904	return 0;	926	return 0;
905	}	927	}
906		928
…		…
981	dynbuf_text buf (512, 512);	1003	dynbuf_text buf (512, 512);
982		1004
983	object *mon = head ? head : this;	1005	object *mon = head ? head : this;
984		1006
985	if (QUERY_FLAG (mon, FLAG_UNDEAD))	1007	if (QUERY_FLAG (mon, FLAG_UNDEAD))
986	buf << "It is an undead force.\n";	1008	buf << "It is an undead force.\r";
987		1009
988	if (mon->level > who->level)	1010	if (mon->level > who->level)
989	buf << "It is likely more powerful than you.\n";	1011	buf << "It is likely more powerful than you.\r";
990	else if (mon->level < who->level)	1012	else if (mon->level < who->level)
991	buf << "It is likely less powerful than you.\n";	1013	buf << "It is likely less powerful than you.\r";
992	else	1014	else
993	buf << "It is probably as powerful as you.\n";	1015	buf << "It is probably as powerful as you.\r";
994		1016
995	if (mon->attacktype & AT_ACID)	1017	if (mon->attacktype & AT_ACID)
996	buf << "You seem to smell an acrid odor.\n";	1018	buf << "You seem to smell an acrid odor.\r";
997		1019
998	/* Anyone know why this used to use the clone value instead of the	1020	/* Anyone know why this used to use the clone value instead of the
999	* maxhp field? This seems that it should give more accurate results.	1021	* maxhp field? This seems that it should give more accurate results.
1000	*/	1022	*/
1001	switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))	1023	switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1002	{ /* From 1-4 */	1024	{ /* From 1-4 */
1003	case 1:	1025	case 1:
1004	buf << "It is in a bad shape.\n";	1026	buf << "It is in a bad shape.\r";
1005	break;	1027	break;
1006	case 2:	1028	case 2:
1007	buf << "It is hurt.\n";	1029	buf << "It is hurt.\r";
1008	break;	1030	break;
1009	case 3:	1031	case 3:
1010	buf << "It is somewhat hurt.\n";	1032	buf << "It is somewhat hurt.\r";
1011	break;	1033	break;
1012	case 4:	1034	case 4:
1013	buf << "It is in excellent shape.\n";	1035	buf << "It is in excellent shape.\r";
1014	break;	1036	break;
1015	}	1037	}
1016		1038
1017	if (present_in_ob (POISONING, mon))	1039	if (present_in_ob (POISONING, mon))
1018	buf << "It looks very ill.\n";	1040	buf << "It looks very ill.\r";
		1041
		1042	buf << '\n';
1019		1043
1020	return buf;	1044	return buf;
1021	}	1045	}
1022		1046
1023	/* tmp is the object being described, pl is who is examing it. */	1047	/* tmp is the object being described, pl is who is examing it. */
…		…
1030	}	1054	}
1031		1055
1032	std::string	1056	std::string
1033	object::long_desc (object *who)	1057	object::long_desc (object *who)
1034	{	1058	{
1035	std::string buf (query_name (this));	1059	std::string buf (query_name ());
1036		1060
1037	switch (type)	1061	switch (type)
1038	{	1062	{
1039	case RING:	1063	case RING:
1040	case SKILL:	1064	case SKILL:
…		…
1052	case CLOAK:	1076	case CLOAK:
1053	case FOOD:	1077	case FOOD:
1054	case DRINK:	1078	case DRINK:
1055	case FLESH:	1079	case FLESH:
1056	case SKILL_TOOL:	1080	case SKILL_TOOL:
		1081	case LAMP:
1057	case POWER_CRYSTAL:	1082	case POWER_CRYSTAL:
1058	{	1083	{
1059	const char *cp = ::describe_item (this, who);	1084	const char *cp = ::describe_item (this, who);
1060		1085
1061	if (*cp)	1086	if (*cp)
…		…
1076	examine_monster (object op, object tmp)	1101	examine_monster (object op, object tmp)
1077	{	1102	{
1078	new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());	1103	new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1079	}	1104	}
1080		1105
1081	std::string
1082	object::describe (object *who)
1083	{
1084	dynbuf_text buf (1024, 1024);
1085
1086	buf.printf ("That is: %s.\n", long_desc (who).c_str ());
1087
1088	if (custom_name)
1089	buf.printf ("You call it %s\n", &custom_name);
1090
1091	switch (type)
1092	{
1093	case SPELLBOOK:
1094	if (flag [FLAG_IDENTIFIED] && inv)
1095	buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
1096	break;
1097
1098	case BOOK:
1099	if (msg)
1100	buf << "Something is written in it.\n";
1101	break;
1102
1103	case CONTAINER:
1104	if (race != NULL)
1105	{
1106	if (weight_limit && stats.Str < 100)
1107	buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",
1108	&race, weight_limit / (10.0 * (100 - stats.Str)));
1109	else
1110	buf.printf ("It can hold only %s.\n", &race);
1111	}
1112	else if (weight_limit && stats.Str < 100)
1113	buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));
1114	break;
1115
1116	case WAND:
1117	if (flag [FLAG_IDENTIFIED])
1118	buf.printf ("It has %d charges left.\n", stats.food);
1119	break;
1120	}
1121
1122	if (materialname && !msg)
1123	buf.printf ("It is made of: %s.\n", &materialname);
1124
1125	if (who)
1126	/* Where to wear this item */
1127	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1128	if (slot[i].info)
1129	{
1130	buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1131
1132	if (slot[i].info < -1 && who->slot[i].info)
1133	buf.printf ("(%d)", -slot[i].info);
1134
1135	buf << ".\n";
1136	}
1137
1138	if (weight)
1139	buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0);
1140
1141	if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1142	{
1143	buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE \| F_APPROX));
1144
1145	if (is_in_shop (who))
1146	{
1147	if (flag [FLAG_UNPAID])
1148	buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY \| F_SHOP));
1149	else
1150	buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1151	}
1152	}
1153
1154	if (flag [FLAG_MONSTER])
1155	buf << describe_monster (who);
1156
1157	/* Is this item buildable? */
1158	if (flag [FLAG_IS_BUILDABLE])
1159	buf << "This is a buildable item.\n";
1160
1161	/* Does the object have a message? Don't show message for all object
1162	* types - especially if the first entry is a match
1163	*/
1164	if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && *msg != '@')
1165	{
1166	/* This is just a hack so when identifying the items, we print
1167	* out the extra message
1168	*/
1169	if (need_identify (this) && flag [FLAG_IDENTIFIED])
1170	buf << "The object has a story:\n";
1171
1172	buf << msg << '\n';
1173	}
1174
1175	buf << '\n';
1176
1177	return std::string (buf.linearise (), buf.size ());
1178	}
1179
1180	static void	1106	static void
1181	display_new_pickup (object *op)	1107	display_new_pickup (object *op)
1182	{	1108	{
1183	int i = op->contr->mode;	1109	int i = op->contr->mode;
1184		1110
1185	if (!(i & PU_NEWMODE))
1186	return;
1187
1188	new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1189	new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);	1111	new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);
1190	new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);	1112	new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);
1191	new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);	1113	new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1192		1114
1193	new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);	1115	new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
…		…
1244	};	1166	};
1245		1167
1246	if (!params)	1168	if (!params)
1247	{	1169	{
1248	/* if the new mode is used, just print the settings */	1170	/* if the new mode is used, just print the settings */
1249	if (op->contr->mode & PU_NEWMODE)
1250	{
1251	display_new_pickup (op);	1171	display_new_pickup (op);
1252	return 1;
1253	}
1254	if (1)
1255	LOG (llevDebug, "command_pickup: !params\n");
1256	set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1257	return 0;	1172	return 0;
1258	}	1173	}
1259		1174
1260	while (params == ' ' && params)	1175	while (params == ' ' && params)
1261	params++;	1176	params++;
…		…
1267	for (mode = 0; names[mode]; mode++)	1182	for (mode = 0; names[mode]; mode++)
1268	{	1183	{
1269	if (!strcmp (names[mode], params + 1))	1184	if (!strcmp (names[mode], params + 1))
1270	{	1185	{
1271	i = op->contr->mode;	1186	i = op->contr->mode;
1272	if (!(i & PU_NEWMODE))	1187
1273	i = PU_NEWMODE;
1274	if (*params == '+')	1188	if (*params == '+')
1275	i = i \| modes[mode];	1189	i = i \| modes[mode];
1276	else	1190	else
1277	i = i & ~modes[mode];	1191	i = i & ~modes[mode];
		1192
1278	op->contr->mode = i;	1193	op->contr->mode = i;
1279	display_new_pickup (op);	1194	display_new_pickup (op);
1280	return 1;	1195	return 1;
1281	}	1196	}
1282	}	1197	}
…		…
1284	return 1;	1199	return 1;
1285	}	1200	}
1286		1201
1287	if (sscanf (params, "%u", &i) != 1)	1202	if (sscanf (params, "%u", &i) != 1)
1288	{	1203	{
1289	if (1)
1290	LOG (llevDebug, "command_pickup: params==NULL\n");
1291	new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <0-7> or <value_density> .");	1204	new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1292	return 1;	1205	return 1;
1293	}	1206	}
1294	set_pickup_mode (op, i);	1207
		1208	if (i <= PU_RATIO)
		1209	i \|= op->contr->mode & ~PU_RATIO;
		1210
		1211	op->contr->mode = i;
1295		1212
1296	return 1;	1213	return 1;
1297	}
1298
1299	void
1300	set_pickup_mode (object *op, int i)
1301	{
1302	switch (op->contr->mode = i)
1303	{
1304	case 0:
1305	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1306	break;
1307	case 1:
1308	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1309	break;
1310	case 2:
1311	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1312	break;
1313	case 3:
1314	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1315	break;
1316	case 4:
1317	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1318	break;
1319	case 5:
1320	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1321	break;
1322	case 6:
1323	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1324	break;
1325	case 7:
1326	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1327	break;
1328	}
1329	}	1214	}
1330		1215
1331	int	1216	int
1332	command_search_items (object op, char params)	1217	command_search_items (object op, char params)
1333	{	1218	{
1334	char buf[MAX_BUF];
1335
1336	if (settings.search_items == FALSE)
1337	return 1;
1338
1339	if (params == NULL)	1219	if (params == NULL)
1340	{	1220	{
1341	if (op->contr->search_str[0] == '\0')	1221	if (op->contr->search_str[0] == '\0')
1342	{	1222	{
1343	new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1");	1223	new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1344	new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");	1224	new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1345	new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");	1225	new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1346	return 1;	1226	return 1;
1347	}	1227	}
1348		1228
1349	op->contr->search_str[0] = '\0';	1229	op->contr->search_str[0] = '\0';
1350	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");	1230	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1351	op->update_stats ();	1231	op->contr->queue_stats_update ();
1352	return 1;	1232	return 1;
1353	}	1233	}
1354		1234
1355	if ((int) strlen (params) >= MAX_BUF)	1235	if (strlen (params) >= sizeof (op->contr->search_str))
1356	{	1236	{
1357	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");	1237	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1358	return 1;	1238	return 1;
1359	}	1239	}
1360		1240
1361	strcpy (op->contr->search_str, params);	1241	strcpy (op->contr->search_str, params);
1362	sprintf (buf, "Searching for '%s'.", op->contr->search_str);	1242	new_draw_info (NDI_UNIQUE, 0, op, format ("Now searching for '%s'.", op->contr->search_str));
1363	new_draw_info (NDI_UNIQUE, 0, op, buf);	1243	op->contr->queue_stats_update ();
1364	op->update_stats ();	1244
1365	return 1;	1245	return 1;
1366	}	1246	}
1367		1247
		1248	int
		1249	command_unlock (object op, char params)
		1250	{
		1251	/* if the unlock command typed with nothing, unlock everything,
		1252	* this might be bad
		1253	*/
		1254	if (params == NULL)
		1255	{
		1256	for (object *item = op->inv; item; item = item->below)
		1257	{
		1258	CLEAR_FLAG(item, FLAG_INV_LOCKED);
		1259	//d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with null param.");
		1260	esrv_update_item (UPD_FLAGS, op, item);
		1261	}
		1262	return 0;
		1263	}
		1264
		1265	/* if the unlock command is used with a param,
		1266	* unlock what matches. i.e. unlock material, should unlock all the materials
		1267	*/
		1268	for (object *item = op->inv; item; item = item->below)
		1269	if (item->name.contains (params))
		1270	{
		1271	CLEAR_FLAG (item, FLAG_INV_LOCKED);
		1272	//d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with a param.");
		1273	esrv_update_item (UPD_FLAGS, op, item);
		1274	}
		1275
		1276	return 0;
		1277	}
		1278
		1279	int
		1280	command_lock (object op, char params)
		1281	{
		1282	/* if the lock command is typed by itself, lock everything
		1283	*/
		1284	if (params == NULL)
		1285	{
		1286	for (object *item = op->inv; item; item = item->below)
		1287	{
		1288	SET_FLAG (item, FLAG_INV_LOCKED);
		1289	//d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with null param.");
		1290	esrv_update_item (UPD_FLAGS, op, item);
		1291	}
		1292	return 0;
		1293	}
		1294
		1295	/* if the lock command is used with a param, lock what matches.
		1296	* i.e. lock material, should lock all the materials
		1297	*/
		1298	for (object *item = op->inv; item; item = item->below)
		1299	if (item->name.contains (params))
		1300	{
		1301	SET_FLAG (item, FLAG_INV_LOCKED);
		1302	//d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with param.");
		1303	esrv_update_item (UPD_FLAGS, op, item);
		1304	}
		1305
		1306	return 0;
		1307	}
		1308
		1309	/* op should be a player, params is any params.
		1310	* If no params given, we print out the currently marked object.
		1311	* otherwise, try to find a matching object - try best match first.
		1312	*/
		1313	int
		1314	command_mark (object op, char params)
		1315	{
		1316	if (!params)
		1317	{
		1318	if (object *mark = find_marked_object (op))
		1319	op->statusmsg (format ("%s is marked.", query_name (mark)));
		1320	else
		1321	op->failmsg ("You have no marked object.");
		1322	}
		1323	else
		1324	{
		1325	if (object *mark = find_best_object_match (op, params))
		1326	{
		1327	op->contr->mark = mark;
		1328	op->statusmsg (format ("Marked item %s", query_name (mark)));
		1329	}
		1330	else
		1331	op->failmsgf ("Could not find an object that matches %s", params);
		1332	}
		1333
		1334	return 0; /shouldnt get here /
		1335	}
		1336

Diff Legend

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

Comparing deliantra/server/server/c_object.C (file contents): Revision 1.69 by root, Tue Apr 22 07:01:47 2008 UTC vs. Revision 1.119 by root, Sat Apr 10 04:54:09 2010 UTC

Diff Legend

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.69 by root, Tue Apr 22 07:01:47 2008 UTC vs.
Revision 1.119 by root, Sat Apr 10 04:54:09 2010 UTC