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

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.66 by root, Mon Apr 21 07:01:40 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 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
94	}	93	}
95		94
96	static bool	95	static bool
97	can_split (object pl, object &op, sint32 nrof)	96	can_split (object pl, object &op, sint32 nrof)
98	{	97	{
99	if (object *tmp = op->split (nrof))	98	if (object *tmp = op->split (nrof ? nrof : op->number_of ()))
100	{	99	{
101	op = tmp;	100	op = tmp;
102	return true;	101	return true;
103	}	102	}
104	else	103	else
105	{	104	{
		105	if (op->nrof > 1)
106	new_draw_info_format (NDI_UNIQUE, 0, pl, "There are only %d %ss.", op->number_of (), &op->name);	106	new_draw_info_format (NDI_UNIQUE, 0, pl, "There are only %d %s.", op->nrof, &op->name_pl);
		107	else
		108	new_draw_info_format (NDI_UNIQUE, 0, pl, "There is only one %s.", &op->name);
		109
107	return false;	110	return false;
108	}	111	}
109	}	112	}
110		113
111	int	114	int
…		…
129	{	132	{
130	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>");
131	return 0;	134	return 0;
132	}	135	}
133		136
134	skill = find_skill_by_name (pl, params);	137	skill = find_skill_by_name_fuzzy (pl, params);
135		138
136	if (!skill)	139	if (!skill)
137	{	140	{
138	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);
139	return 0;	142	return 0;
140	}	143	}
141		144
142	pl->change_skill (0);	145	pl->apply (skill);
143	apply_special (pl, skill, AP_APPLY);
144	return 1;	146	return 1;
145	}
146
147	/* These functions (command_search, command_disarm) are really just wrappers for
148	* things like 'use_skill ...'). In fact, they should really be obsoleted
149	* and replaced with those.
150	*/
151	int
152	command_search (object op, char params)
153	{
154	return use_skill (op, skill_names[SK_FIND_TRAPS]);
155	}
156
157	int
158	command_disarm (object op, char params)
159	{
160	return use_skill (op, skill_names[SK_DISARM_TRAPS]);
161	}	147	}
162		148
163	/* 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
164	* as it includes the object to throw.	150	* as it includes the object to throw.
165	*/	151	*/
…		…
167	command_throw (object op, char params)	153	command_throw (object op, char params)
168	{	154	{
169	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]))
170	return do_skill (op, op, skop, op->facing, params);	156	return do_skill (op, op, skop, op->facing, params);
171	else	157	else
172	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.");
173		159
174	return 0;	160	return 0;
175	}	161	}
176		162
177	int	163	int
…		…
203		189
204	while (*params == ' ')	190	while (*params == ' ')
205	params++;	191	params++;
206		192
207	if (object *inv = find_best_apply_object_match (op, params, aflag))	193	if (object *inv = find_best_apply_object_match (op, params, aflag))
208	player_apply (op, inv, aflag, 0);	194	op->apply (inv, aflag);
209	else	195	else
210	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);
211	}	197	}
212		198
213	return 0;	199	return 0;
214	}	200	}
215		201
…		…
237	return 0;	223	return 0;
238	}	224	}
239		225
240	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)))
241	{	227	{
242	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));
243	return 0;	229	return 0;
244	}	230	}
245		231
246	if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)	232	if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
247	{	233	{
…		…
280	* (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
281	* containers not allowed as of now)	267	* containers not allowed as of now)
282	*/	268	*/
283	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)
284	{	270	{
285	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.>");
286	return;	274	return;
287	}	275	}
288		276
289	if (QUERY_FLAG (tmp, FLAG_NO_DROP))	277	if (QUERY_FLAG (tmp, FLAG_NO_DROP))
290	return;	278	return;
291		279
292	if (nrof > tmp_nrof \|\| nrof == 0)	280	if (nrof > tmp_nrof \|\| nrof <= 0)
293	nrof = tmp_nrof;	281	nrof = tmp_nrof;
294		282
295	/* Figure out how much weight this object will add to the player */	283	/* Figure out how much weight this object will add to the player */
296	weight = tmp->weight * nrof;	284	weight = tmp->weight * nrof;
297	if (tmp->inv)	285	if (tmp->inv)
…		…
307		295
308	if (!can_split (pl, tmp, nrof))	296	if (!can_split (pl, tmp, nrof))
309	return;	297	return;
310		298
311	if (QUERY_FLAG (tmp, FLAG_UNPAID))	299	if (QUERY_FLAG (tmp, FLAG_UNPAID))
		300	{
		301	tmp->flag.reset (FLAG_UNPAID);
312	new_draw_info_format (NDI_UNIQUE, 0, pl, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY \| F_SHOP));	302	new_draw_info_format (NDI_UNIQUE, 0, pl, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY \| F_SHOP));
		303	tmp->flag.set (FLAG_UNPAID);
		304	}
313	else	305	else
314	new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));	306	new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
315		307
316	tmp = insert_ob_in_ob (tmp, op);	308	op->insert (tmp);
317
318	/* All the stuff below deals with client/server code, and is only
319	* usable by players
320	*/
321	if (pl->contr)
322	{
323	esrv_send_item (pl, tmp);
324
325	/* These are needed to update the weight for the container we
326	* are putting the object in.
327	*/
328	if (op != pl)
329	{
330	esrv_update_item (UPD_WEIGHT, pl, op);
331	esrv_send_item (pl, pl);
332	}
333
334	/* Update the container the object was in */
335	if (env && env != pl && env != op)
336	esrv_update_item (UPD_WEIGHT, pl, env);
337	}
338	}	309	}
339		310
340	/* modified slightly to allow monsters use this -b.t. 5-31-95 */	311	/* modified slightly to allow monsters use this -b.t. 5-31-95 */
341	void	312	void
342	pick_up (object op, object alt)	313	pick_up (object op, object alt)
…		…
388	count = tmp->nrof;	359	count = tmp->nrof;
389		360
390	/* container is open, so use it */	361	/* container is open, so use it */
391	if (tmp->flag [FLAG_STARTEQUIP])	362	if (tmp->flag [FLAG_STARTEQUIP])
392	alt = op;	363	alt = op;
393	else if (op->container)	364	else if ((alt = op->container_ ()))
394	{	365	{
395	alt = op->container;
396	if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))	366	if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
397	goto leave;	367	goto leave;
398	}	368	}
399	else	369	else
400	{ /* non container pickup */	370	{ /* non container pickup */
…		…
454	int	424	int
455	command_take (object op, char params)	425	command_take (object op, char params)
456	{	426	{
457	object tmp, next;	427	object tmp, next;
458		428
459	if (op->container)	429	if (op->container_ ())
460	tmp = op->container->inv;	430	tmp = op->container_ ()->inv;
461	else	431	else
462	{	432	{
463	tmp = op->above;	433	tmp = op->above;
464	if (tmp)	434	if (tmp)
465	while (tmp->above)	435	while (tmp->above)
…		…
477		447
478	/* Makes processing easier */	448	/* Makes processing easier */
479	if (params && *params == '\0')	449	if (params && *params == '\0')
480	params = 0;	450	params = 0;
481		451
482	int cnt = MAX_ITEM_PER_DROP;	452	int cnt = MAX_ITEM_PER_ACTION;
483		453
484	while (tmp)	454	while (tmp)
485	{	455	{
486	next = tmp->below;	456	next = tmp->below;
487		457
…		…
495	* but that probably will make it more difficult to read, and	465	* but that probably will make it more difficult to read, and
496	* not make it any more efficient	466	* not make it any more efficient
497	*/	467	*/
498	if (params && item_matched_string (op, tmp, params))	468	if (params && item_matched_string (op, tmp, params))
499	{	469	{
		470	if (--cnt < 0) break;
500	pick_up (op, tmp);	471	pick_up (op, tmp);
501	if (--cnt <= 0) break;
502	}	472	}
503	else if (can_pick (op, tmp) && !params)	473	else if (can_pick (op, tmp) && !params)
504	{	474	{
		475	if (--cnt < 0) break;
505	pick_up (op, tmp);	476	pick_up (op, tmp);
506	break;	477	break;
507	}	478	}
508		479
509	tmp = next;	480	tmp = next;
510	}	481	}
511		482
512	if (cnt <= 0)	483	if (cnt < 0)
513	{	484	{
514	op->failmsg ("Couldn't pick up so many items at once.");	485	op->failmsg ("Couldn't pick up so many items at once.");
515	return 0;	486	return 0;
516	}	487	}
517		488
…		…
530		501
531	return 0;	502	return 0;
532	}	503	}
533		504
534	/*	505	/*
535	* This function was part of drop, now is own function.	506	* This function was part of drop, now is own function.
536	* Player 'op' tries to put object 'tmp' into sack 'sack',	507	* Player 'op' tries to put object 'tmp' into sack 'sack',
537	* 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	*
538	* Note that the 'sack' in question can now be a transport,	510	* Note that the 'sack' in question can now be a transport,
539	* so this function isn't named very good anymore.	511	* so this function isn't named very good anymore.
540	*/	512	*/
541	void	513	void
542	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)
…		…
545	char buf[MAX_BUF];	517	char buf[MAX_BUF];
546		518
547	if (sack == tmp)	519	if (sack == tmp)
548	return; /* Can't put an object in itself */	520	return; /* Can't put an object in itself */
549		521
550	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))	522	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP))
551	{	523	{
552	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));
553	return;	525	return;
554	}	526	}
555		527
…		…
564		536
565	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)	537	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
566	{	538	{
567	tmp = tmp2->below;	539	tmp = tmp2->below;
568		540
569	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)))
570	{
571	put_object_in_sack (op, sack, tmp2, 0);	542	put_object_in_sack (op, sack, tmp2, 0);
572	}
573	else	543	else
574	{	544	{
575	sprintf (buf, "Your %s fills up.", query_name (sack));	545	sprintf (buf, "Your %s fills up.", query_name (sack));
576	new_draw_info (NDI_UNIQUE, 0, op, buf);	546	new_draw_info (NDI_UNIQUE, 0, op, buf);
577	break;	547	break;
578	}	548	}
579	}	549	}
580		550
581	esrv_update_item (UPD_WEIGHT, op, sack2);
582	return;	551	return;
583	}	552	}
584		553
585	/* Don't worry about this for containers - our caller should have	554	/* Don't worry about this for containers - our caller should have
586	* already checked this.	555	* already checked this.
587	*/	556	*/
588	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)))
589	return;	558	return;
590		559
591	if (QUERY_FLAG (tmp, FLAG_APPLIED))	560	if (QUERY_FLAG (tmp, FLAG_APPLIED))
592	if (apply_special (op, tmp, AP_UNAPPLY \| AP_NO_MERGE))	561	if (!op->apply (tmp, AP_UNAPPLY \| AP_NO_MERGE))
593	return;	562	return;
594		563
595	/* 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 */
596	if (nrof && tmp->nrof != nrof)
597	{
598	if (!can_split (op, tmp, nrof))	565	if (!can_split (op, tmp, nrof))
599	return;	566	return;
600	}
601	else
602	tmp->remove ();
603		567
604	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));
605	tmp2 = insert_ob_in_ob (tmp, sack);	569	sack->insert (tmp);
		570	}
606		571
607	// elmex: 2007-11-26: removed update_stats and replaced	572	/* In contrast to drop_object (op, tmp, nrof) above this function takes the
608	// it by update_after_inventory_change () in the caller	573	* already split off object, and feeds it to the event handlers and does
609	// 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;
610		590
611	/* If an object merged (and thus, different object), we need to	591	if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
612	* delete the original.	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:
613	*/	619	*/
614	if (tmp2 != tmp)
615	esrv_del_item (op->contr, tmp->count);
616		620
617	esrv_send_item (op, tmp2);	621	obj->x = dropper->x;
		622	obj->y = dropper->y;
618		623
619	/* update the sacks weight */	624	insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
620	esrv_update_item (UPD_WEIGHT, op, sack);
621	}	625	}
622		626
623	/*	627	/*
624	* This function was part of drop, now is own function.	628	* This function was part of drop, now is own function.
625	* 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
626	* nrof objects is tried to dropped.	630	* nrof objects are tried to drop.
627	* This is used when dropping objects onto the floor.	631	* This is used when dropping objects onto the floor.
628	*/	632	*/
629	void	633	void
630	drop_object (object op, object tmp, uint32 nrof)	634	drop_object (object op, object tmp, uint32 nrof)
631	{	635	{
632	object *floor;
633
634	if (QUERY_FLAG (tmp, FLAG_NO_DROP))	636	if (QUERY_FLAG (tmp, FLAG_NO_DROP))
635	return;	637	return;
636		638
637	if (QUERY_FLAG (tmp, FLAG_APPLIED))	639	if (QUERY_FLAG (tmp, FLAG_APPLIED))
638	if (apply_special (op, tmp, AP_UNAPPLY \| AP_NO_MERGE))	640	if (!op->apply (tmp, AP_UNAPPLY \| AP_NO_MERGE))
639	return; /* can't unapply it */	641	return; /* can't unapply it */
640
641	//fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
642		642
643	/* 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
644	* off	644	* off
645	*/	645	*/
646	if (nrof && tmp->nrof != nrof)
647	{
648	if (!can_split (op, tmp, nrof))	646	if (!can_split (op, tmp, nrof))
649	return;
650	}
651	else
652	tmp->remove ();
653
654	if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
655	return;	647	return;
656		648
657	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))	649	drop_object (op, tmp);
658	{
659	op->statusmsg (format ("You drop the %s.", query_name (tmp)));
660	op->statusmsg ("The gods who lent it to you retrieves it.");
661		650
662	if (op->type == PLAYER)	651	if (!tmp->destroyed () && !tmp->is_inserted ())
663	esrv_del_item (op->contr, tmp->count);
664
665	tmp->destroy ();
666	op->update_stats ();
667	return;
668	}	652	{
669		653	// if nothing happened with the object we give it back
670	if (op->type == PLAYER)	654	op->insert (tmp);
671	esrv_del_item (op->contr, tmp->count);
672
673	/* Call this before we update the various windows/players. At least
674	* that we, we know the weight is correct.
675	*/
676	// 2007-11-26: moved op->update_stats away and calling it later after
677	// all items of a drop command have been processed.
678
679	for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
680	if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
681	return;
682
683	if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
684	sell_item (tmp, op);
685
686	tmp->x = op->x;
687	tmp->y = op->y;
688
689	insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
690	}
691
692	void update_after_inventory_change (object *op)
693	{
694	/* Call this before we update the various windows/players. At least
695	* that we, we know the weight is correct.
696	*/
697	op->update_stats ();
698
699	// elmex: kept this for now, i have no idea what happens when i remove it:
700	if (op->type == PLAYER)
701	{
702	/* Need to update the weight for the player */
703	esrv_send_item (op, op);
704	op->contr->ns->floorbox_update ();
705	}	655	}
706	}	656	}
707		657
708	void	658	void
709	drop (object op, object tmp)	659	drop (object op, object tmp)
…		…
719	if (tmp->env && tmp->env->type != PLAYER)	669	if (tmp->env && tmp->env->type != PLAYER)
720	{	670	{
721	/* Just toss the object - probably shouldn't be hanging	671	/* Just toss the object - probably shouldn't be hanging
722	* around anyways	672	* around anyways
723	*/	673	*/
724	tmp->remove ();
725	tmp->destroy ();	674	tmp->destroy ();
726	return;	675	return;
727	}	676	}
728	else	677	else
729	{
730	while (tmp != NULL && tmp->invisible)	678	while (tmp && tmp->invisible)
731	tmp = tmp->below;	679	tmp = tmp->below;
732	}
733	}	680	}
734		681
735	if (tmp == NULL)	682	if (!tmp)
736	{	683	{
737	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.");
738	return;	685	return;
739	}	686	}
		687
740	if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))	688	if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
741	{	689	{
742	new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");	690	new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
743	return;	691	return;
744	}	692	}
		693
745	if (QUERY_FLAG (tmp, FLAG_NO_DROP))	694	if (QUERY_FLAG (tmp, FLAG_NO_DROP))
746	{	695	{
747	#if 0	696	#if 0
748	/* 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. */
749	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.");
…		…
752	}	701	}
753		702
754	if (op->type == PLAYER && op->contr->last_used == tmp)	703	if (op->type == PLAYER && op->contr->last_used == tmp)
755	op->contr->last_used = tmp->below ? tmp->below	704	op->contr->last_used = tmp->below ? tmp->below
756	: tmp->above ? tmp->above	705	: tmp->above ? tmp->above
757	: 0;	706	: (object *)0;
758		707
759	if (op->container)	708	if (op->container_ ())
760	{	709	{
761	if (op->type == PLAYER)	710	if (op->type == PLAYER)
762	put_object_in_sack (op, op->container, tmp, op->contr->count);	711	put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
763	else	712	else
764	put_object_in_sack (op, op->container, tmp, 0);	713	put_object_in_sack (op, op->container_ (), tmp, 0);
765	}	714	}
766	else	715	else
767	{	716	{
768	if (op->type == PLAYER)	717	if (op->type == PLAYER)
769	drop_object (op, tmp, op->contr->count);	718	drop_object (op, tmp, op->contr->count);
…		…
773		722
774	if (op->type == PLAYER)	723	if (op->type == PLAYER)
775	op->contr->count = 0;	724	op->contr->count = 0;
776	}	725	}
777		726
778
779
780	/* Command will drop all items that have not been locked */	727	/* Command will drop all items that have not been locked */
781	int	728	int
782	command_dropall (object op, char params)	729	command_dropall (object op, char params)
783	{	730	{
784		731
785	object curinv, nextinv;
786
787	if (op->inv == NULL)	732	if (op->inv == NULL)
788	{	733	{
789	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");	734	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
790	return 0;	735	return 0;
791	}	736	}
792		737
793	curinv = op->inv;	738	object *curinv = op->inv;
		739	object *nextinv;
794		740
795	/*	741	/*
796	This is the default. Drops everything not locked or considered	742	This is the default. Drops everything not locked or considered
797	not something that should be dropped.	743	not something that should be dropped.
798	*/	744	*/
799	/*	745	/*
800	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
801	the drop() routine will do unknown things to it when dropping	747	the drop() routine will do unknown things to it when dropping
802	in a shop. --Tero.Pelander@utu.fi	748	in a shop. --Tero.Pelander@utu.fi
803	*/	749	*/
804
805	int cnt = MAX_ITEM_PER_DROP;	750	int cnt = MAX_ITEM_PER_ACTION;
806		751
807	if (params == NULL)	752	if (!params)
808	{	753	{
809	while (curinv != NULL)	754	while (curinv)
810	{	755	{
811	nextinv = curinv->below;	756	nextinv = curinv->below;
		757
812	while (nextinv && nextinv->type == MONEY)	758	while (nextinv && nextinv->type == MONEY)
813	nextinv = nextinv->below;	759	nextinv = nextinv->below;
		760
814	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&	761	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED)
815	curinv->type != FOOD && curinv->type != KEY &&	762	&& curinv->type != MONEY
816	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
817	!curinv->invisible && (curinv->type != CONTAINER \|\| op->container != curinv))	768	&& (curinv->type != CONTAINER \|\| op->container_ () != curinv))
818	{	769	{
819	drop (op, curinv);	770	drop (op, curinv);
820	if (--cnt <= 0) break;	771	if (--cnt <= 0) break;
821	}	772	}
		773
822	curinv = nextinv;	774	curinv = nextinv;
823	}	775	}
824	}	776	}
825
826	else if (strcmp (params, "weapons") == 0)	777	else if (strcmp (params, "weapons") == 0)
827	{	778	{
828	while (curinv != NULL)	779	while (curinv)
829	{	780	{
830	nextinv = curinv->below;	781	nextinv = curinv->below;
		782
831	while (nextinv && nextinv->type == MONEY)	783	while (nextinv && nextinv->type == MONEY)
832	nextinv = nextinv->below;	784	nextinv = nextinv->below;
		785
833	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)))
834	{	787	{
835	drop (op, curinv);	788	drop (op, curinv);
836	if (--cnt <= 0) break;	789	if (--cnt <= 0) break;
837	}	790	}
		791
838	curinv = nextinv;	792	curinv = nextinv;
839	}	793	}
840	}	794	}
841
842	else if (strcmp (params, "armor") == 0 \|\| strcmp (params, "armour") == 0)	795	else if (strcmp (params, "armor") == 0 \|\| strcmp (params, "armour") == 0)
843	{	796	{
844	while (curinv != NULL)	797	while (curinv)
845	{	798	{
846	nextinv = curinv->below;	799	nextinv = curinv->below;
		800
847	while (nextinv && nextinv->type == MONEY)	801	while (nextinv && nextinv->type == MONEY)
848	nextinv = nextinv->below;	802	nextinv = nextinv->below;
		803
849	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))
850	{	805	{
851	drop (op, curinv);	806	drop (op, curinv);
852	if (--cnt <= 0) break;	807	if (--cnt <= 0) break;
853	}	808	}
		809
854	curinv = nextinv;	810	curinv = nextinv;
855	}	811	}
856	}	812	}
857
858	else if (strcmp (params, "misc") == 0)	813	else if (strcmp (params, "misc") == 0)
859	{	814	{
860	while (curinv != NULL)	815	while (curinv)
861	{	816	{
862	nextinv = curinv->below;	817	nextinv = curinv->below;
		818
863	while (nextinv && nextinv->type == MONEY)	819	while (nextinv && nextinv->type == MONEY)
864	nextinv = nextinv->below;	820	nextinv = nextinv->below;
		821
865	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))
866	{	823	{
867	switch (curinv->type)	824	switch (curinv->type)
868	{	825	{
869	case HORN:	826	case HORN:
…		…
887	break;	844	break;
888	default:	845	default:
889	curinv = nextinv;	846	curinv = nextinv;
890	break;	847	break;
891	}	848	}
		849
892	if (--cnt <= 0) break;	850	if (--cnt <= 0) break;
893	}	851	}
		852
894	curinv = nextinv;	853	curinv = nextinv;
895	}	854	}
896	}	855	}
897		856
898	if (cnt <= 0)	857	if (cnt <= 0)
899	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.");
900		859
901	update_after_inventory_change (op);
902
903	/* draw_look(op);*/	860	/* draw_look(op);*/
904	return 0;	861	return 0;
905	}	862	}
906		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
907	/* 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
908	* comma seperated list.	890	* comma seperated list.
909	*/	891	*/
910
911	int	892	int
912	command_drop (object op, char params)	893	command_drop (object op, char params)
913	{	894	{
914	object tmp, next;	895	object tmp, next;
915	int did_one = 0;	896	int did_one = 0;
…		…
919	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");	900	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
920	return 0;	901	return 0;
921	}	902	}
922	else	903	else
923	{	904	{
924	int cnt = MAX_ITEM_PER_DROP;	905	vector<object *> matched_objs;
925		906
926	for (tmp = op->inv; tmp; tmp = next)	907	for (tmp = op->inv; tmp; tmp = next)
927	{	908	{
928	next = tmp->below;	909	next = tmp->below;
929	if (QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| tmp->invisible)	910	if (QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| tmp->invisible)
930	continue;	911	continue;
931		912
932	if (item_matched_string (op, tmp, params))	913	if (item_matched_string (op, tmp, params))
933	{	914	matched_objs.push_back (tmp);
934	drop (op, tmp);
935	if (--cnt <= 0) break;
936	did_one = 1;
937	}	915	}
938	}
939		916
940	if (!did_one)	917	int cnt = MAX_ITEM_PER_ACTION;
		918
		919	if (!drop_vector (op, matched_objs, &cnt))
941	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");	920	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
942		921
943	if (cnt <= 0)	922	if (cnt <= 0)
944	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.");
945
946	update_after_inventory_change (op);
947	}	924	}
948		925
949	return 0;	926	return 0;
950	}	927	}
951		928
…		…
1026	dynbuf_text buf (512, 512);	1003	dynbuf_text buf (512, 512);
1027		1004
1028	object *mon = head ? head : this;	1005	object *mon = head ? head : this;
1029		1006
1030	if (QUERY_FLAG (mon, FLAG_UNDEAD))	1007	if (QUERY_FLAG (mon, FLAG_UNDEAD))
1031	buf << "It is an undead force.\n";	1008	buf << "It is an undead force.\r";
1032		1009
1033	if (mon->level > who->level)	1010	if (mon->level > who->level)
1034	buf << "It is likely more powerful than you.\n";	1011	buf << "It is likely more powerful than you.\r";
1035	else if (mon->level < who->level)	1012	else if (mon->level < who->level)
1036	buf << "It is likely less powerful than you.\n";	1013	buf << "It is likely less powerful than you.\r";
1037	else	1014	else
1038	buf << "It is probably as powerful as you.\n";	1015	buf << "It is probably as powerful as you.\r";
1039		1016
1040	if (mon->attacktype & AT_ACID)	1017	if (mon->attacktype & AT_ACID)
1041	buf << "You seem to smell an acrid odor.\n";	1018	buf << "You seem to smell an acrid odor.\r";
1042		1019
1043	/* 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
1044	* maxhp field? This seems that it should give more accurate results.	1021	* maxhp field? This seems that it should give more accurate results.
1045	*/	1022	*/
1046	switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))	1023	switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1047	{ /* From 1-4 */	1024	{ /* From 1-4 */
1048	case 1:	1025	case 1:
1049	buf << "It is in a bad shape.\n";	1026	buf << "It is in a bad shape.\r";
1050	break;	1027	break;
1051	case 2:	1028	case 2:
1052	buf << "It is hurt.\n";	1029	buf << "It is hurt.\r";
1053	break;	1030	break;
1054	case 3:	1031	case 3:
1055	buf << "It is somewhat hurt.\n";	1032	buf << "It is somewhat hurt.\r";
1056	break;	1033	break;
1057	case 4:	1034	case 4:
1058	buf << "It is in excellent shape.\n";	1035	buf << "It is in excellent shape.\r";
1059	break;	1036	break;
1060	}	1037	}
1061		1038
1062	if (present_in_ob (POISONING, mon))	1039	if (present_in_ob (POISONING, mon))
1063	buf << "It looks very ill.\n";	1040	buf << "It looks very ill.\r";
		1041
		1042	buf << '\n';
1064		1043
1065	return buf;	1044	return buf;
1066	}	1045	}
1067		1046
1068	/* 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. */
…		…
1075	}	1054	}
1076		1055
1077	std::string	1056	std::string
1078	object::long_desc (object *who)	1057	object::long_desc (object *who)
1079	{	1058	{
1080	std::string buf (query_name (this));	1059	std::string buf (query_name ());
1081		1060
1082	switch (type)	1061	switch (type)
1083	{	1062	{
1084	case RING:	1063	case RING:
1085	case SKILL:	1064	case SKILL:
…		…
1097	case CLOAK:	1076	case CLOAK:
1098	case FOOD:	1077	case FOOD:
1099	case DRINK:	1078	case DRINK:
1100	case FLESH:	1079	case FLESH:
1101	case SKILL_TOOL:	1080	case SKILL_TOOL:
		1081	case LAMP:
1102	case POWER_CRYSTAL:	1082	case POWER_CRYSTAL:
1103	{	1083	{
1104	const char *cp = ::describe_item (this, who);	1084	const char *cp = ::describe_item (this, who);
1105		1085
1106	if (*cp)	1086	if (*cp)
…		…
1121	examine_monster (object op, object tmp)	1101	examine_monster (object op, object tmp)
1122	{	1102	{
1123	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 ());
1124	}	1104	}
1125		1105
1126	std::string
1127	object::describe (object *who)
1128	{
1129	dynbuf_text buf (1024, 1024);
1130
1131	buf.printf ("That is: %s.\n", long_desc (who).c_str ());
1132
1133	if (custom_name)
1134	buf.printf ("You call it %s\n", &custom_name);
1135
1136	switch (type)
1137	{
1138	case SPELLBOOK:
1139	if (flag [FLAG_IDENTIFIED] && inv)
1140	buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
1141	break;
1142
1143	case BOOK:
1144	if (msg)
1145	buf << "Something is written in it.\n";
1146	break;
1147
1148	case CONTAINER:
1149	if (race != NULL)
1150	{
1151	if (weight_limit && stats.Str < 100)
1152	buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",
1153	&race, weight_limit / (10.0 * (100 - stats.Str)));
1154	else
1155	buf.printf ("It can hold only %s.\n", &race);
1156	}
1157	else if (weight_limit && stats.Str < 100)
1158	buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));
1159	break;
1160
1161	case WAND:
1162	if (flag [FLAG_IDENTIFIED])
1163	buf.printf ("It has %d charges left.\n", stats.food);
1164	break;
1165	}
1166
1167	if (materialname && !msg)
1168	buf.printf ("It is made of: %s.\n", &materialname);
1169
1170	if (who)
1171	/* Where to wear this item */
1172	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1173	if (slot[i].info)
1174	{
1175	buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1176
1177	if (slot[i].info < -1 && who->slot[i].info)
1178	buf.printf ("(%d)", -slot[i].info);
1179
1180	buf << ".\n";
1181	}
1182
1183	if (weight)
1184	buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0);
1185
1186	if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1187	{
1188	buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE \| F_APPROX));
1189
1190	if (is_in_shop (who))
1191	{
1192	if (flag [FLAG_UNPAID])
1193	buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY \| F_SHOP));
1194	else
1195	buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1196	}
1197	}
1198
1199	if (flag [FLAG_MONSTER])
1200	buf << describe_monster (who);
1201
1202	/* Is this item buildable? */
1203	if (flag [FLAG_IS_BUILDABLE])
1204	buf << "This is a buildable item.\n";
1205
1206	/* Does the object have a message? Don't show message for all object
1207	* types - especially if the first entry is a match
1208	*/
1209	if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && *msg != '@')
1210	{
1211	/* This is just a hack so when identifying the items, we print
1212	* out the extra message
1213	*/
1214	if (need_identify (this) && flag [FLAG_IDENTIFIED])
1215	buf << "The object has a story:\n";
1216
1217	buf << msg << '\n';
1218	}
1219
1220	buf << '\n';
1221
1222	return std::string (buf.linearise (), buf.size ());
1223	}
1224
1225	static void	1106	static void
1226	display_new_pickup (object *op)	1107	display_new_pickup (object *op)
1227	{	1108	{
1228	int i = op->contr->mode;	1109	int i = op->contr->mode;
1229		1110
1230	if (!(i & PU_NEWMODE))
1231	return;
1232
1233	new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1234	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);
1235	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);
1236	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);
1237		1114
1238	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);
…		…
1289	};	1166	};
1290		1167
1291	if (!params)	1168	if (!params)
1292	{	1169	{
1293	/* if the new mode is used, just print the settings */	1170	/* if the new mode is used, just print the settings */
1294	if (op->contr->mode & PU_NEWMODE)
1295	{
1296	display_new_pickup (op);	1171	display_new_pickup (op);
1297	return 1;
1298	}
1299	if (1)
1300	LOG (llevDebug, "command_pickup: !params\n");
1301	set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1302	return 0;	1172	return 0;
1303	}	1173	}
1304		1174
1305	while (params == ' ' && params)	1175	while (params == ' ' && params)
1306	params++;	1176	params++;
…		…
1312	for (mode = 0; names[mode]; mode++)	1182	for (mode = 0; names[mode]; mode++)
1313	{	1183	{
1314	if (!strcmp (names[mode], params + 1))	1184	if (!strcmp (names[mode], params + 1))
1315	{	1185	{
1316	i = op->contr->mode;	1186	i = op->contr->mode;
1317	if (!(i & PU_NEWMODE))	1187
1318	i = PU_NEWMODE;
1319	if (*params == '+')	1188	if (*params == '+')
1320	i = i \| modes[mode];	1189	i = i \| modes[mode];
1321	else	1190	else
1322	i = i & ~modes[mode];	1191	i = i & ~modes[mode];
		1192
1323	op->contr->mode = i;	1193	op->contr->mode = i;
1324	display_new_pickup (op);	1194	display_new_pickup (op);
1325	return 1;	1195	return 1;
1326	}	1196	}
1327	}	1197	}
…		…
1329	return 1;	1199	return 1;
1330	}	1200	}
1331		1201
1332	if (sscanf (params, "%u", &i) != 1)	1202	if (sscanf (params, "%u", &i) != 1)
1333	{	1203	{
1334	if (1)
1335	LOG (llevDebug, "command_pickup: params==NULL\n");
1336	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.");
1337	return 1;	1205	return 1;
1338	}	1206	}
1339	set_pickup_mode (op, i);	1207
		1208	if (i <= PU_RATIO)
		1209	i \|= op->contr->mode & ~PU_RATIO;
		1210
		1211	op->contr->mode = i;
1340		1212
1341	return 1;	1213	return 1;
1342	}
1343
1344	void
1345	set_pickup_mode (object *op, int i)
1346	{
1347	switch (op->contr->mode = i)
1348	{
1349	case 0:
1350	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1351	break;
1352	case 1:
1353	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1354	break;
1355	case 2:
1356	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1357	break;
1358	case 3:
1359	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1360	break;
1361	case 4:
1362	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1363	break;
1364	case 5:
1365	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1366	break;
1367	case 6:
1368	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1369	break;
1370	case 7:
1371	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1372	break;
1373	}
1374	}	1214	}
1375		1215
1376	int	1216	int
1377	command_search_items (object op, char params)	1217	command_search_items (object op, char params)
1378	{	1218	{
1379	char buf[MAX_BUF];
1380
1381	if (settings.search_items == FALSE)
1382	return 1;
1383
1384	if (params == NULL)	1219	if (params == NULL)
1385	{	1220	{
1386	if (op->contr->search_str[0] == '\0')	1221	if (op->contr->search_str[0] == '\0')
1387	{	1222	{
1388	new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1");	1223	new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1389	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");
1390	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'.");
1391	return 1;	1226	return 1;
1392	}	1227	}
1393		1228
1394	op->contr->search_str[0] = '\0';	1229	op->contr->search_str[0] = '\0';
1395	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");	1230	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1396	op->update_stats ();	1231	op->contr->queue_stats_update ();
1397	return 1;	1232	return 1;
1398	}	1233	}
1399		1234
1400	if ((int) strlen (params) >= MAX_BUF)	1235	if (strlen (params) >= sizeof (op->contr->search_str))
1401	{	1236	{
1402	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");	1237	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1403	return 1;	1238	return 1;
1404	}	1239	}
1405		1240
1406	strcpy (op->contr->search_str, params);	1241	strcpy (op->contr->search_str, params);
1407	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));
1408	new_draw_info (NDI_UNIQUE, 0, op, buf);	1243	op->contr->queue_stats_update ();
1409	op->update_stats ();	1244
1410	return 1;	1245	return 1;
1411	}	1246	}
1412		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.66 by root, Mon Apr 21 07:01:40 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.66 by root, Mon Apr 21 07:01:40 2008 UTC vs.
Revision 1.119 by root, Sat Apr 10 04:54:09 2010 UTC