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

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.103 by root, Sun Nov 8 20:55:39 2009 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.103 by root, Sun Nov 8 20:55:39 2009 UTC