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

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.76 by root, Sun Sep 7 21:31:23 2008 UTC vs.
Revision 1.110 by root, Fri Mar 26 00:59:22 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 skill %s", params);
143	return 0;	142	return 0;
144	}	143	}
145		144
146	pl->change_skill (0);	145	pl->change_skill (0);
147	apply_special (pl, skill, AP_APPLY);	146	apply_special (pl, skill, AP_APPLY);
148	return 1;	147	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	}	148	}
166		149
167	/* A little special because we do want to pass the full params along	150	/* A little special because we do want to pass the full params along
168	* as it includes the object to throw.	151	* as it includes the object to throw.
169	*/	152	*/
…		…
241	return 0;	224	return 0;
242	}	225	}
243		226
244	if (sack->race && (sack->race != op->race \|\| op->type == CONTAINER \|\| (sack->stats.food && sack->stats.food != op->type)))	227	if (sack->race && (sack->race != op->race \|\| op->type == CONTAINER \|\| (sack->stats.food && sack->stats.food != op->type)))
245	{	228	{
246	new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack));	229	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;	230	return 0;
248	}	231	}
249		232
250	if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)	233	if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
251	{	234	{
…		…
377	count = tmp->nrof;	360	count = tmp->nrof;
378		361
379	/* container is open, so use it */	362	/* container is open, so use it */
380	if (tmp->flag [FLAG_STARTEQUIP])	363	if (tmp->flag [FLAG_STARTEQUIP])
381	alt = op;	364	alt = op;
382	else if (op->container)	365	else if ((alt = op->container_ ()))
383	{	366	{
384	alt = op->container;
385	if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))	367	if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
386	goto leave;	368	goto leave;
387	}	369	}
388	else	370	else
389	{ /* non container pickup */	371	{ /* non container pickup */
…		…
443	int	425	int
444	command_take (object op, char params)	426	command_take (object op, char params)
445	{	427	{
446	object tmp, next;	428	object tmp, next;
447		429
448	if (op->container)	430	if (op->container_ ())
449	tmp = op->container->inv;	431	tmp = op->container_ ()->inv;
450	else	432	else
451	{	433	{
452	tmp = op->above;	434	tmp = op->above;
453	if (tmp)	435	if (tmp)
454	while (tmp->above)	436	while (tmp->above)
…		…
466		448
467	/* Makes processing easier */	449	/* Makes processing easier */
468	if (params && *params == '\0')	450	if (params && *params == '\0')
469	params = 0;	451	params = 0;
470		452
471	int cnt = MAX_ITEM_PER_DROP;	453	int cnt = MAX_ITEM_PER_ACTION;
472		454
473	while (tmp)	455	while (tmp)
474	{	456	{
475	next = tmp->below;	457	next = tmp->below;
476		458
…		…
520		502
521	return 0;	503	return 0;
522	}	504	}
523		505
524	/*	506	/*
525	* This function was part of drop, now is own function.	507	* This function was part of drop, now is own function.
526	* Player 'op' tries to put object 'tmp' into sack 'sack',	508	* Player 'op' tries to put object 'tmp' into sack 'sack',
527	* if nrof is non zero, then nrof objects is tried to put into sack.	509	* if nrof is non zero, then nrof objects is tried to put into sack.
		510	*
528	* Note that the 'sack' in question can now be a transport,	511	* Note that the 'sack' in question can now be a transport,
529	* so this function isn't named very good anymore.	512	* so this function isn't named very good anymore.
530	*/	513	*/
531	void	514	void
532	put_object_in_sack (object op, object sack, object *tmp, uint32 nrof)	515	put_object_in_sack (object op, object sack, object *tmp, uint32 nrof)
…		…
535	char buf[MAX_BUF];	518	char buf[MAX_BUF];
536		519
537	if (sack == tmp)	520	if (sack == tmp)
538	return; /* Can't put an object in itself */	521	return; /* Can't put an object in itself */
539		522
540	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))	523	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP))
541	{	524	{
542	new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));	525	new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));
543	return;	526	return;
544	}	527	}
545		528
…		…
554		537
555	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)	538	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
556	{	539	{
557	tmp = tmp2->below;	540	tmp = tmp2->below;
558		541
559	if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof)))	542	if ((sack->type == CONTAINER && sack_can_hold (op, op->container_ (), tmp2, tmp2->nrof)))
560	put_object_in_sack (op, sack, tmp2, 0);	543	put_object_in_sack (op, sack, tmp2, 0);
561	else	544	else
562	{	545	{
563	sprintf (buf, "Your %s fills up.", query_name (sack));	546	sprintf (buf, "Your %s fills up.", query_name (sack));
564	new_draw_info (NDI_UNIQUE, 0, op, buf);	547	new_draw_info (NDI_UNIQUE, 0, op, buf);
…		…
585		568
586	new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));	569	new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
587	sack->insert (tmp);	570	sack->insert (tmp);
588	}	571	}
589		572
		573	/* In contrast to drop_object (op, tmp, nrof) above this function takes the
		574	* already split off object, and feeds it to the event handlers and does
		575	* other magic with it.
		576	*
		577	* <droppper> is the object that dropped this object and <obj> is the
		578	* object that was dropped.
		579	*
		580	* Make sure to check what happened with <obj> after this function returns!
		581	* Otherwise you may leak this object.
		582	*/
		583	void
		584	drop_object (object dropper, object obj)
		585	{
		586	if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
		587	return;
		588
		589	if (obj->destroyed () \|\| obj->is_inserted ())
		590	return;
		591
		592	if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
		593	{
		594	dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
		595	dropper->statusmsg ("The god who lent it to you retrieves it.");
		596
		597	obj->destroy ();
		598	dropper->update_stats ();
		599	return;
		600	}
		601
		602	for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
		603	floor;
		604	floor = floor->above)
		605	if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
		606	return;
		607
		608	if (obj->destroyed () \|\| obj->is_inserted ())
		609	return;
		610
		611	if (is_in_shop (dropper) && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
		612	if (!sell_item (obj, dropper))
		613	return;
		614
		615	if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
		616	return;
		617
		618	/* If nothing special happened with this object, the default action is to
		619	* insert it below the dropper:
		620	*/
		621
		622	obj->x = dropper->x;
		623	obj->y = dropper->y;
		624
		625	insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
		626	}
		627
590	/*	628	/*
591	* This function was part of drop, now is own function.	629	* This function was part of drop, now is own function.
592	* Player 'op' tries to drop object 'tmp', if tmp is non zero, then	630	* Player 'op' tries to drop object 'tmp', if tmp is non zero, then
593	* nrof objects is tried to dropped.	631	* nrof objects are tried to drop.
594	* This is used when dropping objects onto the floor.	632	* This is used when dropping objects onto the floor.
595	*/	633	*/
596	void	634	void
597	drop_object (object op, object tmp, uint32 nrof)	635	drop_object (object op, object tmp, uint32 nrof)
598	{	636	{
…		…
601		639
602	if (QUERY_FLAG (tmp, FLAG_APPLIED))	640	if (QUERY_FLAG (tmp, FLAG_APPLIED))
603	if (apply_special (op, tmp, AP_UNAPPLY \| AP_NO_MERGE))	641	if (apply_special (op, tmp, AP_UNAPPLY \| AP_NO_MERGE))
604	return; /* can't unapply it */	642	return; /* can't unapply it */
605		643
606	//fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
607
608	/* We are only dropping some of the items. We split the current object	644	/* We are only dropping some of the items. We split the current object
609	* off	645	* off
610	*/	646	*/
611	if (!can_split (op, tmp, nrof))	647	if (!can_split (op, tmp, nrof))
612
613	if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
614	return;	648	return;
615		649
616	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))	650	drop_object (op, tmp);
617	{
618	op->statusmsg (format ("You drop the %s.", query_name (tmp)));
619	op->statusmsg ("The gods who lent it to you retrieves it.");
620		651
621	tmp->destroy ();	652	if (!tmp->destroyed () && !tmp->is_inserted ())
622	op->update_stats ();
623	return;
624	}	653	{
625		654	// if nothing happened with the object we give it back
626	/* Call this before we update the various windows/players. At least	655	op->insert (tmp);
627	* that we, we know the weight is correct.
628	*/
629	// 2007-11-26: moved op->update_stats away and calling it later after
630	// all items of a drop command have been processed.
631
632	for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
633	if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
634	return;
635
636	if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
637	{	656	}
638	if (!sell_item (tmp, op))
639	return; // if we can't sell it we don't drop it
640	}
641
642	tmp->x = op->x;
643	tmp->y = op->y;
644
645	insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
646	}	657	}
647		658
648	void	659	void
649	drop (object op, object tmp)	660	drop (object op, object tmp)
650	{	661	{
…		…
659	if (tmp->env && tmp->env->type != PLAYER)	670	if (tmp->env && tmp->env->type != PLAYER)
660	{	671	{
661	/* Just toss the object - probably shouldn't be hanging	672	/* Just toss the object - probably shouldn't be hanging
662	* around anyways	673	* around anyways
663	*/	674	*/
664	tmp->remove ();
665	tmp->destroy ();	675	tmp->destroy ();
666	return;	676	return;
667	}	677	}
668	else	678	else
669	{
670	while (tmp && tmp->invisible)	679	while (tmp && tmp->invisible)
671	tmp = tmp->below;	680	tmp = tmp->below;
672	}
673	}	681	}
674		682
675	if (tmp == NULL)	683	if (!tmp)
676	{	684	{
677	new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");	685	new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
678	return;	686	return;
679	}	687	}
680		688
…		…
694	}	702	}
695		703
696	if (op->type == PLAYER && op->contr->last_used == tmp)	704	if (op->type == PLAYER && op->contr->last_used == tmp)
697	op->contr->last_used = tmp->below ? tmp->below	705	op->contr->last_used = tmp->below ? tmp->below
698	: tmp->above ? tmp->above	706	: tmp->above ? tmp->above
699	: 0;	707	: (object *)0;
700		708
701	if (op->container)	709	if (op->container_ ())
702	{	710	{
703	if (op->type == PLAYER)	711	if (op->type == PLAYER)
704	put_object_in_sack (op, op->container, tmp, op->contr->count);	712	put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
705	else	713	else
706	put_object_in_sack (op, op->container, tmp, 0);	714	put_object_in_sack (op, op->container_ (), tmp, 0);
707	}	715	}
708	else	716	else
709	{	717	{
710	if (op->type == PLAYER)	718	if (op->type == PLAYER)
711	drop_object (op, tmp, op->contr->count);	719	drop_object (op, tmp, op->contr->count);
…		…
738	/*	746	/*
739	Care must be taken that the next item pointer is not to money as	747	Care must be taken that the next item pointer is not to money as
740	the drop() routine will do unknown things to it when dropping	748	the drop() routine will do unknown things to it when dropping
741	in a shop. --Tero.Pelander@utu.fi	749	in a shop. --Tero.Pelander@utu.fi
742	*/	750	*/
743
744	int cnt = MAX_ITEM_PER_DROP;	751	int cnt = MAX_ITEM_PER_ACTION;
745		752
746	if (!params)	753	if (!params)
747	{	754	{
748	while (curinv)	755	while (curinv)
749	{	756	{
750	nextinv = curinv->below;	757	nextinv = curinv->below;
751		758
752	while (nextinv && nextinv->type == MONEY)	759	while (nextinv && nextinv->type == MONEY)
753	nextinv = nextinv->below;	760	nextinv = nextinv->below;
754		761
755	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&	762	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED)
756	curinv->type != FOOD && curinv->type != KEY &&	763	&& curinv->type != MONEY
757	curinv->type != SPECIAL_KEY && curinv->type != GEM &&	764	&& curinv->type != FOOD
		765	&& curinv->type != KEY
		766	&& curinv->type != SPECIAL_KEY
		767	&& curinv->type != GEM
		768	&& !curinv->invisible
758	!curinv->invisible && (curinv->type != CONTAINER \|\| op->container != curinv))	769	&& (curinv->type != CONTAINER \|\| op->container_ () != curinv))
759	{	770	{
760	drop (op, curinv);	771	drop (op, curinv);
761	if (--cnt <= 0) break;	772	if (--cnt <= 0) break;
762	}	773	}
763		774
…		…
849		860
850	/* draw_look(op);*/	861	/* draw_look(op);*/
851	return 0;	862	return 0;
852	}	863	}
853		864
		865
		866	/* This function tries to drop all objects in the <objs> vector.
		867	* <dropper> is the object that wants to drop them.
		868	* <cnt> can be a 0 pointer or a pointer to the maximum number of
		869	* drop operations to perform.
		870	*
		871	* Returns true if at least one item was dropped.
		872	*/
		873	static bool
		874	drop_vector (object dropper, vector<object > &objs, int *cnt)
		875	{
		876	vector<object *>::iterator i;
		877
		878	bool did_one = false;
		879
		880	for (i = objs.begin (); i != objs.end (); i++)
		881	{
		882	drop (dropper, *i);
		883	if (cnt && --*cnt <= 0) break;
		884	did_one = true;
		885	}
		886
		887	return did_one;
		888	}
		889
854	/* Object op wants to drop object(s) params. params can be a	890	/* Object op wants to drop object(s) params. params can be a
855	* comma seperated list.	891	* comma seperated list.
856	*/	892	*/
857	int	893	int
858	command_drop (object op, char params)	894	command_drop (object op, char params)
…		…
865	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");	901	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
866	return 0;	902	return 0;
867	}	903	}
868	else	904	else
869	{	905	{
870	int cnt = MAX_ITEM_PER_DROP;	906	vector<object *> matched_objs;
871		907
872	for (tmp = op->inv; tmp; tmp = next)	908	for (tmp = op->inv; tmp; tmp = next)
873	{	909	{
874	next = tmp->below;	910	next = tmp->below;
875	if (QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| tmp->invisible)	911	if (QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| tmp->invisible)
876	continue;	912	continue;
877		913
878	if (item_matched_string (op, tmp, params))	914	if (item_matched_string (op, tmp, params))
879	{	915	matched_objs.push_back (tmp);
880	drop (op, tmp);
881	if (--cnt <= 0) break;
882	did_one = 1;
883	}	916	}
884	}
885		917
886	if (!did_one)	918	int cnt = MAX_ITEM_PER_ACTION;
		919
		920	if (!drop_vector (op, matched_objs, &cnt))
887	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");	921	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
888		922
889	if (cnt <= 0)	923	if (cnt <= 0)
890	op->failmsg ("Only dropped some items, can't drop that many items at once.");	924	op->failmsg ("Only dropped some items, can't drop that many items at once.");
891	}	925	}
…		…
970	dynbuf_text buf (512, 512);	1004	dynbuf_text buf (512, 512);
971		1005
972	object *mon = head ? head : this;	1006	object *mon = head ? head : this;
973		1007
974	if (QUERY_FLAG (mon, FLAG_UNDEAD))	1008	if (QUERY_FLAG (mon, FLAG_UNDEAD))
975	buf << " - It is an undead force.\n";	1009	buf << "It is an undead force.\r";
976		1010
977	if (mon->level > who->level)	1011	if (mon->level > who->level)
978	buf << " - It is likely more powerful than you.\n";	1012	buf << "It is likely more powerful than you.\r";
979	else if (mon->level < who->level)	1013	else if (mon->level < who->level)
980	buf << " - It is likely less powerful than you.\n";	1014	buf << "It is likely less powerful than you.\r";
981	else	1015	else
982	buf << " - It is probably as powerful as you.\n";	1016	buf << "It is probably as powerful as you.\r";
983		1017
984	if (mon->attacktype & AT_ACID)	1018	if (mon->attacktype & AT_ACID)
985	buf << " - You seem to smell an acrid odor.\n";	1019	buf << "You seem to smell an acrid odor.\r";
986		1020
987	/* Anyone know why this used to use the clone value instead of the	1021	/* Anyone know why this used to use the clone value instead of the
988	* maxhp field? This seems that it should give more accurate results.	1022	* maxhp field? This seems that it should give more accurate results.
989	*/	1023	*/
990	switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))	1024	switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
991	{ /* From 1-4 */	1025	{ /* From 1-4 */
992	case 1:	1026	case 1:
993	buf << " - It is in a bad shape.\n";	1027	buf << "It is in a bad shape.\r";
994	break;	1028	break;
995	case 2:	1029	case 2:
996	buf << " - It is hurt.\n";	1030	buf << "It is hurt.\r";
997	break;	1031	break;
998	case 3:	1032	case 3:
999	buf << " - It is somewhat hurt.\n";	1033	buf << "It is somewhat hurt.\r";
1000	break;	1034	break;
1001	case 4:	1035	case 4:
1002	buf << " - It is in excellent shape.\n";	1036	buf << "It is in excellent shape.\r";
1003	break;	1037	break;
1004	}	1038	}
1005		1039
1006	if (present_in_ob (POISONING, mon))	1040	if (present_in_ob (POISONING, mon))
1007	buf << " - It looks very ill.\n";	1041	buf << "It looks very ill.\r";
		1042
		1043	buf << '\n';
1008		1044
1009	return buf;	1045	return buf;
1010	}	1046	}
1011		1047
1012	/* tmp is the object being described, pl is who is examing it. */	1048	/* tmp is the object being described, pl is who is examing it. */
…		…
1019	}	1055	}
1020		1056
1021	std::string	1057	std::string
1022	object::long_desc (object *who)	1058	object::long_desc (object *who)
1023	{	1059	{
1024	std::string buf (query_name (this));	1060	std::string buf (query_name ());
1025		1061
1026	switch (type)	1062	switch (type)
1027	{	1063	{
1028	case RING:	1064	case RING:
1029	case SKILL:	1065	case SKILL:
…		…
1041	case CLOAK:	1077	case CLOAK:
1042	case FOOD:	1078	case FOOD:
1043	case DRINK:	1079	case DRINK:
1044	case FLESH:	1080	case FLESH:
1045	case SKILL_TOOL:	1081	case SKILL_TOOL:
		1082	case LAMP:
1046	case POWER_CRYSTAL:	1083	case POWER_CRYSTAL:
1047	{	1084	{
1048	const char *cp = ::describe_item (this, who);	1085	const char *cp = ::describe_item (this, who);
1049		1086
1050	if (*cp)	1087	if (*cp)
…		…
1065	examine_monster (object op, object tmp)	1102	examine_monster (object op, object tmp)
1066	{	1103	{
1067	new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());	1104	new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1068	}	1105	}
1069		1106
		1107	static void
		1108	describe_dump_object (dynbuf &buf, object *ob)
		1109	{
		1110	char *txt = dump_object (ob);
		1111	for (char p = txt; p; ++p) if (p == '\n') p = '\r';
		1112	buf << "\n" << txt << "\n";
		1113
		1114	if (!ob->is_arch ())
		1115	describe_dump_object (buf, ob->arch);
		1116	}
		1117
1070	std::string	1118	std::string
1071	object::describe (object *who)	1119	object::describe (object *who)
1072	{	1120	{
1073	dynbuf_text buf (1024, 1024);	1121	dynbuf_text buf (1024, 1024);
1074		1122
1075	buf.printf ("That is: %s.\n\n", long_desc (who).c_str ());	1123	buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1076		1124
1077	if (custom_name)	1125	if (custom_name)
1078	buf.printf ("You call it %s.\n\n", &custom_name);	1126	buf.printf ("You call it %s.\r", &custom_name);
1079		1127
1080	switch (type)	1128	switch (type)
1081	{	1129	{
1082	case SPELLBOOK:	1130	case SPELLBOOK:
1083	if (flag [FLAG_IDENTIFIED] && inv)	1131	if (flag [FLAG_IDENTIFIED] && inv)
1084	buf.printf ("%s is a %s %s spell.\n", &inv->name, get_levelnumber (inv->level), &inv->skill);	1132	buf.printf ("%s is a level %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1085	break;	1133	break;
1086		1134
1087	case BOOK:	1135	case BOOK:
1088	if (msg)	1136	if (msg)
1089	buf << "Something is written in it.\n";	1137	buf << "Something is written in it.\r";
1090	break;	1138	break;
1091		1139
1092	case CONTAINER:	1140	case CONTAINER:
1093	if (race != NULL)	1141	if (race)
1094	{	1142	{
1095	if (weight_limit && stats.Str < 100)	1143	if (weight_limit && stats.Str < 100)
1096	buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",	1144	buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1097	&race, weight_limit / (10.0 * (100 - stats.Str)));	1145	&race, weight_limit / (10.0 * (100 - stats.Str)));
1098	else	1146	else
1099	buf.printf ("It can hold only %s.\n", &race);	1147	buf.printf ("It can hold only %s.\r", &race);
1100	}	1148	}
1101	else if (weight_limit && stats.Str < 100)	1149	else if (weight_limit && stats.Str < 100)
1102	buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));	1150	buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1103	break;	1151	break;
1104		1152
1105	case WAND:	1153	case WAND:
1106	if (flag [FLAG_IDENTIFIED])	1154	if (flag [FLAG_IDENTIFIED])
1107	buf.printf ("It has %d charges left.\n", stats.food);	1155	buf.printf ("It has %d charges left.\r", stats.food);
1108	break;	1156	break;
1109	}	1157	}
1110		1158
1111	if (materialname && !msg)	1159	if (material != MATERIAL_NULL && !msg)
1112	buf.printf ("It is made of: %s.\n", &materialname);	1160	buf << (nrof > 1 ? "They are made of " : "It is made of ")
		1161	<< material->description
		1162	<< ".\r";
1113		1163
1114	if (who)	1164	if (who)
1115	/* Where to wear this item */	1165	/* Where to wear this item */
1116	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)	1166	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1117	if (slot[i].info)	1167	if (slot[i].info)
…		…
1119	buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);	1169	buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1120		1170
1121	if (slot[i].info < -1 && who->slot[i].info)	1171	if (slot[i].info < -1 && who->slot[i].info)
1122	buf.printf ("(%d)", -slot[i].info);	1172	buf.printf ("(%d)", -slot[i].info);
1123		1173
1124	buf << ".\n";	1174	buf << ".\r";
1125	}	1175	}
1126		1176
1127	if (weight)	1177	if (weight)
1128	buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0);	1178	buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
		1179
		1180	if (flag [FLAG_STARTEQUIP])
		1181	buf << (nrof > 1 ? "They were" : "It was")
		1182	<< " given by a god and will vanish when dropped.\r";
1129		1183
1130	if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)	1184	if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1131	{	1185	{
1132	buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE \| F_APPROX));	1186	buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE \| F_APPROX));
1133		1187
1134	if (is_in_shop (who))	1188	if (is_in_shop (who))
1135	{	1189	{
1136	if (flag [FLAG_UNPAID])	1190	if (flag [FLAG_UNPAID])
1137	buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY \| F_SHOP));	1191	buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY \| F_SHOP));
1138	else	1192	else
1139	buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");	1193	buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1140	}	1194	}
1141	}	1195	}
1142		1196
1143	if (flag [FLAG_MONSTER])	1197	if (flag [FLAG_MONSTER])
1144	buf << describe_monster (who);	1198	buf << describe_monster (who);
1145		1199
1146	/* Is this item buildable? */	1200	/* Is this item buildable? */
1147	if (flag [FLAG_IS_BUILDABLE])	1201	if (flag [FLAG_IS_BUILDABLE])
1148	buf << "This is a buildable item.\n";	1202	buf << "This is a buildable item.\r";
1149		1203
1150	/* Does the object have a message? Don't show message for all object	1204	/* Does the object have a message? Don't show message for all object
1151	* types - especially if the first entry is a match	1205	* types - especially if the first entry is a match
1152	*/	1206	*/
		1207	if (msg)
		1208	{
1153	if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())	1209	if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1154	{	1210	{
		1211	buf << '\r';
		1212
1155	/* This is just a hack so when identifying the items, we print	1213	/* This is just a hack so when identifying the items, we print
1156	* out the extra message	1214	* out the extra message
1157	*/	1215	*/
1158	if (need_identify (this) && flag [FLAG_IDENTIFIED])	1216	if (need_identify (this) && flag [FLAG_IDENTIFIED])
1159	buf << "The object has a story:\n\n";	1217	buf << "The object has a story:\r";
1160		1218
1161	buf << msg << '\n';	1219	buf << msg << '\n';
		1220	}
		1221	}
		1222	else if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
		1223	&& (type == SPELLBOOK \|\| type == ROD \|\| type == WAND
		1224	\|\| type == ROD \|\| type == POTION \|\| type == SCROLL))
		1225	// for spellbooks and other stuff that contains spells, print the spell message,
		1226	// unless the object has a custom message handled above.
		1227	buf << '\r' << inv->msg << '\n';
		1228
		1229	// try to display the duration for some potions and scrolls
		1230	// this includes change ability potions and group spells,
		1231	// but does not handle protection potions
		1232	if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
		1233	&& (type == POTION \|\| type == SCROLL))
		1234	{
		1235	object *spell = inv;
		1236
		1237	if (spell->subtype == SP_PARTY_SPELL)
		1238	spell = spell->other_arch;
		1239
		1240	if (spell->subtype == SP_CHANGE_ABILITY)
		1241	buf.printf ("\nH<The effect will last about %.10g seconds.>",
		1242	TICK2TIME (change_ability_duration (spell, this)));
		1243	}
		1244
		1245	// Display a hint about inscribable items [empty books]
		1246	// This includes the amount of text they can hold.
		1247	if (type == INSCRIBABLE)
		1248	{
		1249	if (other_arch && other_arch->type == SCROLL)
		1250	buf.printf ("\nH<You can use the inscription skill to inscribe a spell into it.>");
		1251	else
		1252	buf.printf ("\nH<You can use the inscription skill to inscribe text into it. It has room for up to %d characters.>",
		1253	weight_limit);
1162	}	1254	}
1163		1255
1164	buf << '\n';	1256	buf << '\n';
		1257
		1258	// the dungeon master additionally gets a complete dump
		1259	if (who && who->flag [FLAG_WIZLOOK])
		1260	{
		1261	buf << "\nT<Object>\n";
		1262	describe_dump_object (buf, this);
		1263
		1264	if (inv)
		1265	{
		1266	buf << "\nT<Top Inventory>\n";
		1267	describe_dump_object (buf, inv);
		1268	}
		1269	}
1165		1270
1166	return std::string (buf.linearise (), buf.size ());	1271	return std::string (buf.linearise (), buf.size ());
1167	}	1272	}
1168		1273
1169	static void	1274	static void
1170	display_new_pickup (object *op)	1275	display_new_pickup (object *op)
1171	{	1276	{
1172	int i = op->contr->mode;	1277	int i = op->contr->mode;
1173		1278
1174	if (!(i & PU_NEWMODE))
1175	return;
1176
1177	new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1178	new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);	1279	new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);
1179	new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);	1280	new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);
1180	new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);	1281	new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1181		1282
1182	new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);	1283	new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
…		…
1233	};	1334	};
1234		1335
1235	if (!params)	1336	if (!params)
1236	{	1337	{
1237	/* if the new mode is used, just print the settings */	1338	/* if the new mode is used, just print the settings */
1238	if (op->contr->mode & PU_NEWMODE)
1239	{
1240	display_new_pickup (op);	1339	display_new_pickup (op);
1241	return 1;
1242	}
1243	if (1)
1244	LOG (llevDebug, "command_pickup: !params\n");
1245	set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1246	return 0;	1340	return 0;
1247	}	1341	}
1248		1342
1249	while (params == ' ' && params)	1343	while (params == ' ' && params)
1250	params++;	1344	params++;
…		…
1256	for (mode = 0; names[mode]; mode++)	1350	for (mode = 0; names[mode]; mode++)
1257	{	1351	{
1258	if (!strcmp (names[mode], params + 1))	1352	if (!strcmp (names[mode], params + 1))
1259	{	1353	{
1260	i = op->contr->mode;	1354	i = op->contr->mode;
1261	if (!(i & PU_NEWMODE))	1355
1262	i = PU_NEWMODE;
1263	if (*params == '+')	1356	if (*params == '+')
1264	i = i \| modes[mode];	1357	i = i \| modes[mode];
1265	else	1358	else
1266	i = i & ~modes[mode];	1359	i = i & ~modes[mode];
		1360
1267	op->contr->mode = i;	1361	op->contr->mode = i;
1268	display_new_pickup (op);	1362	display_new_pickup (op);
1269	return 1;	1363	return 1;
1270	}	1364	}
1271	}	1365	}
…		…
1273	return 1;	1367	return 1;
1274	}	1368	}
1275		1369
1276	if (sscanf (params, "%u", &i) != 1)	1370	if (sscanf (params, "%u", &i) != 1)
1277	{	1371	{
1278	if (1)
1279	LOG (llevDebug, "command_pickup: params==NULL\n");
1280	new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <0-7> or <value_density> .");	1372	new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1281	return 1;	1373	return 1;
1282	}	1374	}
1283	set_pickup_mode (op, i);	1375
		1376	if (i <= PU_RATIO)
		1377	i \|= op->contr->mode & ~PU_RATIO;
		1378
		1379	op->contr->mode = i;
1284		1380
1285	return 1;	1381	return 1;
1286	}
1287
1288	void
1289	set_pickup_mode (object *op, int i)
1290	{
1291	switch (op->contr->mode = i)
1292	{
1293	case 0:
1294	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1295	break;
1296	case 1:
1297	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1298	break;
1299	case 2:
1300	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1301	break;
1302	case 3:
1303	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1304	break;
1305	case 4:
1306	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1307	break;
1308	case 5:
1309	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1310	break;
1311	case 6:
1312	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1313	break;
1314	case 7:
1315	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1316	break;
1317	}
1318	}	1382	}
1319		1383
1320	int	1384	int
1321	command_search_items (object op, char params)	1385	command_search_items (object op, char params)
1322	{	1386	{
1323	char buf[MAX_BUF];
1324
1325	if (settings.search_items == FALSE)
1326	return 1;
1327
1328	if (params == NULL)	1387	if (params == NULL)
1329	{	1388	{
1330	if (op->contr->search_str[0] == '\0')	1389	if (op->contr->search_str[0] == '\0')
1331	{	1390	{
1332	new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1");	1391	new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1333	new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");	1392	new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1334	new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");	1393	new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1335	return 1;	1394	return 1;
1336	}	1395	}
1337		1396
1338	op->contr->search_str[0] = '\0';	1397	op->contr->search_str[0] = '\0';
1339	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");	1398	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1340	op->update_stats ();	1399	op->contr->queue_stats_update ();
1341	return 1;	1400	return 1;
1342	}	1401	}
1343		1402
1344	if ((int) strlen (params) >= MAX_BUF)	1403	if (strlen (params) >= sizeof (op->contr->search_str))
1345	{	1404	{
1346	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");	1405	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1347	return 1;	1406	return 1;
1348	}	1407	}
1349		1408
1350	strcpy (op->contr->search_str, params);	1409	strcpy (op->contr->search_str, params);
1351	sprintf (buf, "Searching for '%s'.", op->contr->search_str);	1410	new_draw_info (NDI_UNIQUE, 0, op, format ("Now searching for '%s'.", op->contr->search_str));
1352	new_draw_info (NDI_UNIQUE, 0, op, buf);	1411	op->contr->queue_stats_update ();
1353	op->update_stats ();	1412
1354	return 1;	1413	return 1;
1355	}	1414	}
1356		1415
		1416	int
		1417	command_unlock (object op, char params)
		1418	{
		1419	/* if the unlock command typed with nothing, unlock everything,
		1420	* this might be bad
		1421	*/
		1422	if (params == NULL)
		1423	{
		1424	for (object *item = op->inv; item; item = item->below)
		1425	{
		1426	CLEAR_FLAG(item, FLAG_INV_LOCKED);
		1427	//d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with null param.");
		1428	esrv_update_item (UPD_FLAGS, op, item);
		1429	}
		1430	return 0;
		1431	}
		1432
		1433	/* if the unlock command is used with a param,
		1434	* unlock what matches. i.e. unlock material, should unlock all the materials
		1435	*/
		1436	for (object *item = op->inv; item; item = item->below)
		1437	if (item->name.contains (params))
		1438	{
		1439	CLEAR_FLAG (item, FLAG_INV_LOCKED);
		1440	//d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with a param.");
		1441	esrv_update_item (UPD_FLAGS, op, item);
		1442	}
		1443
		1444	return 0;
		1445	}
		1446
		1447	int
		1448	command_lock (object op, char params)
		1449	{
		1450	/* if the lock command is typed by itself, lock everything
		1451	*/
		1452	if (params == NULL)
		1453	{
		1454	for (object *item = op->inv; item; item = item->below)
		1455	{
		1456	SET_FLAG (item, FLAG_INV_LOCKED);
		1457	//d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with null param.");
		1458	esrv_update_item (UPD_FLAGS, op, item);
		1459	}
		1460	return 0;
		1461	}
		1462
		1463	/* if the lock command is used with a param, lock what matches.
		1464	* i.e. lock material, should lock all the materials
		1465	*/
		1466	for (object *item = op->inv; item; item = item->below)
		1467	if (item->name.contains (params))
		1468	{
		1469	SET_FLAG (item, FLAG_INV_LOCKED);
		1470	//d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with param.");
		1471	esrv_update_item (UPD_FLAGS, op, item);
		1472	}
		1473
		1474	return 0;
		1475	}

Diff Legend

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

Comparing deliantra/server/server/c_object.C (file contents): Revision 1.76 by root, Sun Sep 7 21:31:23 2008 UTC vs. Revision 1.110 by root, Fri Mar 26 00:59:22 2010 UTC

Diff Legend

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.76 by root, Sun Sep 7 21:31:23 2008 UTC vs.
Revision 1.110 by root, Fri Mar 26 00:59:22 2010 UTC