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

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.72 by root, Tue May 6 16:32:34 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	{
…		…
377	count = tmp->nrof;	359	count = tmp->nrof;
378		360
379	/* container is open, so use it */	361	/* container is open, so use it */
380	if (tmp->flag [FLAG_STARTEQUIP])	362	if (tmp->flag [FLAG_STARTEQUIP])
381	alt = op;	363	alt = op;
382	else if (op->container)	364	else if ((alt = op->container_ ()))
383	{	365	{
384	alt = op->container;
385	if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))	366	if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
386	goto leave;	367	goto leave;
387	}	368	}
388	else	369	else
389	{ /* non container pickup */	370	{ /* non container pickup */
…		…
443	int	424	int
444	command_take (object op, char params)	425	command_take (object op, char params)
445	{	426	{
446	object tmp, next;	427	object tmp, next;
447		428
448	if (op->container)	429	if (op->container_ ())
449	tmp = op->container->inv;	430	tmp = op->container_ ()->inv;
450	else	431	else
451	{	432	{
452	tmp = op->above;	433	tmp = op->above;
453	if (tmp)	434	if (tmp)
454	while (tmp->above)	435	while (tmp->above)
…		…
466		447
467	/* Makes processing easier */	448	/* Makes processing easier */
468	if (params && *params == '\0')	449	if (params && *params == '\0')
469	params = 0;	450	params = 0;
470		451
471	int cnt = MAX_ITEM_PER_DROP;	452	int cnt = MAX_ITEM_PER_ACTION;
472		453
473	while (tmp)	454	while (tmp)
474	{	455	{
475	next = tmp->below;	456	next = tmp->below;
476		457
…		…
484	* but that probably will make it more difficult to read, and	465	* but that probably will make it more difficult to read, and
485	* not make it any more efficient	466	* not make it any more efficient
486	*/	467	*/
487	if (params && item_matched_string (op, tmp, params))	468	if (params && item_matched_string (op, tmp, params))
488	{	469	{
		470	if (--cnt < 0) break;
489	pick_up (op, tmp);	471	pick_up (op, tmp);
490	if (--cnt <= 0) break;
491	}	472	}
492	else if (can_pick (op, tmp) && !params)	473	else if (can_pick (op, tmp) && !params)
493	{	474	{
		475	if (--cnt < 0) break;
494	pick_up (op, tmp);	476	pick_up (op, tmp);
495	break;	477	break;
496	}	478	}
497		479
498	tmp = next;	480	tmp = next;
499	}	481	}
500		482
501	if (cnt <= 0)	483	if (cnt < 0)
502	{	484	{
503	op->failmsg ("Couldn't pick up so many items at once.");	485	op->failmsg ("Couldn't pick up so many items at once.");
504	return 0;	486	return 0;
505	}	487	}
506		488
…		…
519		501
520	return 0;	502	return 0;
521	}	503	}
522		504
523	/*	505	/*
524	* This function was part of drop, now is own function.	506	* This function was part of drop, now is own function.
525	* Player 'op' tries to put object 'tmp' into sack 'sack',	507	* Player 'op' tries to put object 'tmp' into sack 'sack',
526	* 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	*
527	* Note that the 'sack' in question can now be a transport,	510	* Note that the 'sack' in question can now be a transport,
528	* so this function isn't named very good anymore.	511	* so this function isn't named very good anymore.
529	*/	512	*/
530	void	513	void
531	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)
…		…
534	char buf[MAX_BUF];	517	char buf[MAX_BUF];
535		518
536	if (sack == tmp)	519	if (sack == tmp)
537	return; /* Can't put an object in itself */	520	return; /* Can't put an object in itself */
538		521
539	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))	522	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP))
540	{	523	{
541	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));
542	return;	525	return;
543	}	526	}
544		527
…		…
553		536
554	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)	537	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
555	{	538	{
556	tmp = tmp2->below;	539	tmp = tmp2->below;
557		540
558	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)))
559	put_object_in_sack (op, sack, tmp2, 0);	542	put_object_in_sack (op, sack, tmp2, 0);
560	else	543	else
561	{	544	{
562	sprintf (buf, "Your %s fills up.", query_name (sack));	545	sprintf (buf, "Your %s fills up.", query_name (sack));
563	new_draw_info (NDI_UNIQUE, 0, op, buf);	546	new_draw_info (NDI_UNIQUE, 0, op, buf);
…		…
573	*/	556	*/
574	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)))
575	return;	558	return;
576		559
577	if (QUERY_FLAG (tmp, FLAG_APPLIED))	560	if (QUERY_FLAG (tmp, FLAG_APPLIED))
578	if (apply_special (op, tmp, AP_UNAPPLY \| AP_NO_MERGE))	561	if (!op->apply (tmp, AP_UNAPPLY \| AP_NO_MERGE))
579	return;	562	return;
580		563
581	/* 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 */
582	if (!can_split (op, tmp, nrof))	565	if (!can_split (op, tmp, nrof))
583	return;	566	return;
584		567
585	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));
586	sack->insert (tmp);	569	sack->insert (tmp);
587	}	570	}
588		571
		572	/* In contrast to drop_object (op, tmp, nrof) above this function takes the
		573	* already split off object, and feeds it to the event handlers and does
		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);
		625	}
		626
589	/*	627	/*
590	* This function was part of drop, now is own function.	628	* This function was part of drop, now is own function.
591	* 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
592	* nrof objects is tried to dropped.	630	* nrof objects are tried to drop.
593	* This is used when dropping objects onto the floor.	631	* This is used when dropping objects onto the floor.
594	*/	632	*/
595	void	633	void
596	drop_object (object op, object tmp, uint32 nrof)	634	drop_object (object op, object tmp, uint32 nrof)
597	{	635	{
598	if (QUERY_FLAG (tmp, FLAG_NO_DROP))	636	if (QUERY_FLAG (tmp, FLAG_NO_DROP))
599	return;	637	return;
600		638
601	if (QUERY_FLAG (tmp, FLAG_APPLIED))	639	if (QUERY_FLAG (tmp, FLAG_APPLIED))
602	if (apply_special (op, tmp, AP_UNAPPLY \| AP_NO_MERGE))	640	if (!op->apply (tmp, AP_UNAPPLY \| AP_NO_MERGE))
603	return; /* can't unapply it */	641	return; /* can't unapply it */
604
605	//fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
606		642
607	/* 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
608	* off	644	* off
609	*/	645	*/
610	if (!can_split (op, tmp, nrof))	646	if (!can_split (op, tmp, nrof))
611
612	if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
613	return;	647	return;
614		648
615	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))	649	drop_object (op, tmp);
616	{
617	op->statusmsg (format ("You drop the %s.", query_name (tmp)));
618	op->statusmsg ("The gods who lent it to you retrieves it.");
619		650
620	tmp->destroy ();	651	if (!tmp->destroyed () && !tmp->is_inserted ())
621	op->update_stats ();
622	return;
623	}	652	{
624		653	// if nothing happened with the object we give it back
625	/* Call this before we update the various windows/players. At least	654	op->insert (tmp);
626	* that we, we know the weight is correct.
627	*/
628	// 2007-11-26: moved op->update_stats away and calling it later after
629	// all items of a drop command have been processed.
630
631	for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
632	if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
633	return;
634
635	if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
636	{	655	}
637	if (!sell_item (tmp, op))
638	return; // if we can't sell it we don't drop it
639	}
640
641	tmp->x = op->x;
642	tmp->y = op->y;
643
644	insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
645	}	656	}
646		657
647	void	658	void
648	drop (object op, object tmp)	659	drop (object op, object tmp)
649	{	660	{
…		…
658	if (tmp->env && tmp->env->type != PLAYER)	669	if (tmp->env && tmp->env->type != PLAYER)
659	{	670	{
660	/* Just toss the object - probably shouldn't be hanging	671	/* Just toss the object - probably shouldn't be hanging
661	* around anyways	672	* around anyways
662	*/	673	*/
663	tmp->remove ();
664	tmp->destroy ();	674	tmp->destroy ();
665	return;	675	return;
666	}	676	}
667	else	677	else
668	{
669	while (tmp && tmp->invisible)	678	while (tmp && tmp->invisible)
670	tmp = tmp->below;	679	tmp = tmp->below;
671	}
672	}	680	}
673		681
674	if (tmp == NULL)	682	if (!tmp)
675	{	683	{
676	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.");
677	return;	685	return;
678	}	686	}
679		687
…		…
693	}	701	}
694		702
695	if (op->type == PLAYER && op->contr->last_used == tmp)	703	if (op->type == PLAYER && op->contr->last_used == tmp)
696	op->contr->last_used = tmp->below ? tmp->below	704	op->contr->last_used = tmp->below ? tmp->below
697	: tmp->above ? tmp->above	705	: tmp->above ? tmp->above
698	: 0;	706	: (object *)0;
699		707
700	if (op->container)	708	if (op->container_ ())
701	{	709	{
702	if (op->type == PLAYER)	710	if (op->type == PLAYER)
703	put_object_in_sack (op, op->container, tmp, op->contr->count);	711	put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
704	else	712	else
705	put_object_in_sack (op, op->container, tmp, 0);	713	put_object_in_sack (op, op->container_ (), tmp, 0);
706	}	714	}
707	else	715	else
708	{	716	{
709	if (op->type == PLAYER)	717	if (op->type == PLAYER)
710	drop_object (op, tmp, op->contr->count);	718	drop_object (op, tmp, op->contr->count);
…		…
737	/*	745	/*
738	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
739	the drop() routine will do unknown things to it when dropping	747	the drop() routine will do unknown things to it when dropping
740	in a shop. --Tero.Pelander@utu.fi	748	in a shop. --Tero.Pelander@utu.fi
741	*/	749	*/
742
743	int cnt = MAX_ITEM_PER_DROP;	750	int cnt = MAX_ITEM_PER_ACTION;
744		751
745	if (!params)	752	if (!params)
746	{	753	{
747	while (curinv)	754	while (curinv)
748	{	755	{
749	nextinv = curinv->below;	756	nextinv = curinv->below;
750		757
751	while (nextinv && nextinv->type == MONEY)	758	while (nextinv && nextinv->type == MONEY)
752	nextinv = nextinv->below;	759	nextinv = nextinv->below;
753		760
754	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&	761	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED)
755	curinv->type != FOOD && curinv->type != KEY &&	762	&& curinv->type != MONEY
756	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
757	!curinv->invisible && (curinv->type != CONTAINER \|\| op->container != curinv))	768	&& (curinv->type != CONTAINER \|\| op->container_ () != curinv))
758	{	769	{
759	drop (op, curinv);	770	drop (op, curinv);
760	if (--cnt <= 0) break;	771	if (--cnt <= 0) break;
761	}	772	}
762		773
…		…
848		859
849	/* draw_look(op);*/	860	/* draw_look(op);*/
850	return 0;	861	return 0;
851	}	862	}
852		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
853	/* 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
854	* comma seperated list.	890	* comma seperated list.
855	*/	891	*/
856	int	892	int
857	command_drop (object op, char params)	893	command_drop (object op, char params)
…		…
864	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");	900	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
865	return 0;	901	return 0;
866	}	902	}
867	else	903	else
868	{	904	{
869	int cnt = MAX_ITEM_PER_DROP;	905	vector<object *> matched_objs;
870		906
871	for (tmp = op->inv; tmp; tmp = next)	907	for (tmp = op->inv; tmp; tmp = next)
872	{	908	{
873	next = tmp->below;	909	next = tmp->below;
874	if (QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| tmp->invisible)	910	if (QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| tmp->invisible)
875	continue;	911	continue;
876		912
877	if (item_matched_string (op, tmp, params))	913	if (item_matched_string (op, tmp, params))
878	{	914	matched_objs.push_back (tmp);
879	drop (op, tmp);
880	if (--cnt <= 0) break;
881	did_one = 1;
882	}	915	}
883	}
884		916
885	if (!did_one)	917	int cnt = MAX_ITEM_PER_ACTION;
		918
		919	if (!drop_vector (op, matched_objs, &cnt))
886	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");	920	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
887		921
888	if (cnt <= 0)	922	if (cnt <= 0)
889	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.");
890	}	924	}
…		…
969	dynbuf_text buf (512, 512);	1003	dynbuf_text buf (512, 512);
970		1004
971	object *mon = head ? head : this;	1005	object *mon = head ? head : this;
972		1006
973	if (QUERY_FLAG (mon, FLAG_UNDEAD))	1007	if (QUERY_FLAG (mon, FLAG_UNDEAD))
974	buf << "It is an undead force.\n";	1008	buf << "It is an undead force.\r";
975		1009
976	if (mon->level > who->level)	1010	if (mon->level > who->level)
977	buf << "It is likely more powerful than you.\n";	1011	buf << "It is likely more powerful than you.\r";
978	else if (mon->level < who->level)	1012	else if (mon->level < who->level)
979	buf << "It is likely less powerful than you.\n";	1013	buf << "It is likely less powerful than you.\r";
980	else	1014	else
981	buf << "It is probably as powerful as you.\n";	1015	buf << "It is probably as powerful as you.\r";
982		1016
983	if (mon->attacktype & AT_ACID)	1017	if (mon->attacktype & AT_ACID)
984	buf << "You seem to smell an acrid odor.\n";	1018	buf << "You seem to smell an acrid odor.\r";
985		1019
986	/* 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
987	* maxhp field? This seems that it should give more accurate results.	1021	* maxhp field? This seems that it should give more accurate results.
988	*/	1022	*/
989	switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))	1023	switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
990	{ /* From 1-4 */	1024	{ /* From 1-4 */
991	case 1:	1025	case 1:
992	buf << "It is in a bad shape.\n";	1026	buf << "It is in a bad shape.\r";
993	break;	1027	break;
994	case 2:	1028	case 2:
995	buf << "It is hurt.\n";	1029	buf << "It is hurt.\r";
996	break;	1030	break;
997	case 3:	1031	case 3:
998	buf << "It is somewhat hurt.\n";	1032	buf << "It is somewhat hurt.\r";
999	break;	1033	break;
1000	case 4:	1034	case 4:
1001	buf << "It is in excellent shape.\n";	1035	buf << "It is in excellent shape.\r";
1002	break;	1036	break;
1003	}	1037	}
1004		1038
1005	if (present_in_ob (POISONING, mon))	1039	if (present_in_ob (POISONING, mon))
1006	buf << "It looks very ill.\n";	1040	buf << "It looks very ill.\r";
		1041
		1042	buf << '\n';
1007		1043
1008	return buf;	1044	return buf;
1009	}	1045	}
1010		1046
1011	/* 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. */
…		…
1018	}	1054	}
1019		1055
1020	std::string	1056	std::string
1021	object::long_desc (object *who)	1057	object::long_desc (object *who)
1022	{	1058	{
1023	std::string buf (query_name (this));	1059	std::string buf (query_name ());
1024		1060
1025	switch (type)	1061	switch (type)
1026	{	1062	{
1027	case RING:	1063	case RING:
1028	case SKILL:	1064	case SKILL:
…		…
1040	case CLOAK:	1076	case CLOAK:
1041	case FOOD:	1077	case FOOD:
1042	case DRINK:	1078	case DRINK:
1043	case FLESH:	1079	case FLESH:
1044	case SKILL_TOOL:	1080	case SKILL_TOOL:
		1081	case LAMP:
1045	case POWER_CRYSTAL:	1082	case POWER_CRYSTAL:
1046	{	1083	{
1047	const char *cp = ::describe_item (this, who);	1084	const char *cp = ::describe_item (this, who);
1048		1085
1049	if (*cp)	1086	if (*cp)
…		…
1064	examine_monster (object op, object tmp)	1101	examine_monster (object op, object tmp)
1065	{	1102	{
1066	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 ());
1067	}	1104	}
1068		1105
1069	std::string
1070	object::describe (object *who)
1071	{
1072	dynbuf_text buf (1024, 1024);
1073
1074	buf.printf ("That is: %s.\n", long_desc (who).c_str ());
1075
1076	if (custom_name)
1077	buf.printf ("You call it %s\n", &custom_name);
1078
1079	switch (type)
1080	{
1081	case SPELLBOOK:
1082	if (flag [FLAG_IDENTIFIED] && inv)
1083	buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
1084	break;
1085
1086	case BOOK:
1087	if (msg)
1088	buf << "Something is written in it.\n";
1089	break;
1090
1091	case CONTAINER:
1092	if (race != NULL)
1093	{
1094	if (weight_limit && stats.Str < 100)
1095	buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",
1096	&race, weight_limit / (10.0 * (100 - stats.Str)));
1097	else
1098	buf.printf ("It can hold only %s.\n", &race);
1099	}
1100	else if (weight_limit && stats.Str < 100)
1101	buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));
1102	break;
1103
1104	case WAND:
1105	if (flag [FLAG_IDENTIFIED])
1106	buf.printf ("It has %d charges left.\n", stats.food);
1107	break;
1108	}
1109
1110	if (materialname && !msg)
1111	buf.printf ("It is made of: %s.\n", &materialname);
1112
1113	if (who)
1114	/* Where to wear this item */
1115	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1116	if (slot[i].info)
1117	{
1118	buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1119
1120	if (slot[i].info < -1 && who->slot[i].info)
1121	buf.printf ("(%d)", -slot[i].info);
1122
1123	buf << ".\n";
1124	}
1125
1126	if (weight)
1127	buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0);
1128
1129	if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1130	{
1131	buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE \| F_APPROX));
1132
1133	if (is_in_shop (who))
1134	{
1135	if (flag [FLAG_UNPAID])
1136	buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY \| F_SHOP));
1137	else
1138	buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1139	}
1140	}
1141
1142	if (flag [FLAG_MONSTER])
1143	buf << describe_monster (who);
1144
1145	/* Is this item buildable? */
1146	if (flag [FLAG_IS_BUILDABLE])
1147	buf << "This is a buildable item.\n";
1148
1149	/* Does the object have a message? Don't show message for all object
1150	* types - especially if the first entry is a match
1151	*/
1152	if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && *msg != '@')
1153	{
1154	/* This is just a hack so when identifying the items, we print
1155	* out the extra message
1156	*/
1157	if (need_identify (this) && flag [FLAG_IDENTIFIED])
1158	buf << "The object has a story:\n";
1159
1160	buf << msg << '\n';
1161	}
1162
1163	buf << '\n';
1164
1165	return std::string (buf.linearise (), buf.size ());
1166	}
1167
1168	static void	1106	static void
1169	display_new_pickup (object *op)	1107	display_new_pickup (object *op)
1170	{	1108	{
1171	int i = op->contr->mode;	1109	int i = op->contr->mode;
1172		1110
1173	if (!(i & PU_NEWMODE))
1174	return;
1175
1176	new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1177	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);
1178	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);
1179	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);
1180		1114
1181	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);
…		…
1232	};	1166	};
1233		1167
1234	if (!params)	1168	if (!params)
1235	{	1169	{
1236	/* if the new mode is used, just print the settings */	1170	/* if the new mode is used, just print the settings */
1237	if (op->contr->mode & PU_NEWMODE)
1238	{
1239	display_new_pickup (op);	1171	display_new_pickup (op);
1240	return 1;
1241	}
1242	if (1)
1243	LOG (llevDebug, "command_pickup: !params\n");
1244	set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1245	return 0;	1172	return 0;
1246	}	1173	}
1247		1174
1248	while (params == ' ' && params)	1175	while (params == ' ' && params)
1249	params++;	1176	params++;
…		…
1255	for (mode = 0; names[mode]; mode++)	1182	for (mode = 0; names[mode]; mode++)
1256	{	1183	{
1257	if (!strcmp (names[mode], params + 1))	1184	if (!strcmp (names[mode], params + 1))
1258	{	1185	{
1259	i = op->contr->mode;	1186	i = op->contr->mode;
1260	if (!(i & PU_NEWMODE))	1187
1261	i = PU_NEWMODE;
1262	if (*params == '+')	1188	if (*params == '+')
1263	i = i \| modes[mode];	1189	i = i \| modes[mode];
1264	else	1190	else
1265	i = i & ~modes[mode];	1191	i = i & ~modes[mode];
		1192
1266	op->contr->mode = i;	1193	op->contr->mode = i;
1267	display_new_pickup (op);	1194	display_new_pickup (op);
1268	return 1;	1195	return 1;
1269	}	1196	}
1270	}	1197	}
…		…
1272	return 1;	1199	return 1;
1273	}	1200	}
1274		1201
1275	if (sscanf (params, "%u", &i) != 1)	1202	if (sscanf (params, "%u", &i) != 1)
1276	{	1203	{
1277	if (1)
1278	LOG (llevDebug, "command_pickup: params==NULL\n");
1279	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.");
1280	return 1;	1205	return 1;
1281	}	1206	}
1282	set_pickup_mode (op, i);	1207
		1208	if (i <= PU_RATIO)
		1209	i \|= op->contr->mode & ~PU_RATIO;
		1210
		1211	op->contr->mode = i;
1283		1212
1284	return 1;	1213	return 1;
1285	}
1286
1287	void
1288	set_pickup_mode (object *op, int i)
1289	{
1290	switch (op->contr->mode = i)
1291	{
1292	case 0:
1293	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1294	break;
1295	case 1:
1296	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1297	break;
1298	case 2:
1299	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1300	break;
1301	case 3:
1302	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1303	break;
1304	case 4:
1305	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1306	break;
1307	case 5:
1308	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1309	break;
1310	case 6:
1311	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1312	break;
1313	case 7:
1314	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1315	break;
1316	}
1317	}	1214	}
1318		1215
1319	int	1216	int
1320	command_search_items (object op, char params)	1217	command_search_items (object op, char params)
1321	{	1218	{
1322	char buf[MAX_BUF];
1323
1324	if (settings.search_items == FALSE)
1325	return 1;
1326
1327	if (params == NULL)	1219	if (params == NULL)
1328	{	1220	{
1329	if (op->contr->search_str[0] == '\0')	1221	if (op->contr->search_str[0] == '\0')
1330	{	1222	{
1331	new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1");	1223	new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1332	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");
1333	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'.");
1334	return 1;	1226	return 1;
1335	}	1227	}
1336		1228
1337	op->contr->search_str[0] = '\0';	1229	op->contr->search_str[0] = '\0';
1338	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");	1230	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1339	op->update_stats ();	1231	op->contr->queue_stats_update ();
1340	return 1;	1232	return 1;
1341	}	1233	}
1342		1234
1343	if ((int) strlen (params) >= MAX_BUF)	1235	if (strlen (params) >= sizeof (op->contr->search_str))
1344	{	1236	{
1345	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");	1237	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1346	return 1;	1238	return 1;
1347	}	1239	}
1348		1240
1349	strcpy (op->contr->search_str, params);	1241	strcpy (op->contr->search_str, params);
1350	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));
1351	new_draw_info (NDI_UNIQUE, 0, op, buf);	1243	op->contr->queue_stats_update ();
1352	op->update_stats ();	1244
1353	return 1;	1245	return 1;
1354	}	1246	}
1355		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.72 by root, Tue May 6 16:32:34 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.72 by root, Tue May 6 16:32:34 2008 UTC vs.
Revision 1.119 by root, Sat Apr 10 04:54:09 2010 UTC