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

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.70 by root, Wed Apr 23 07:49:57 2008 UTC vs.
Revision 1.89 by elmex, Mon Jan 12 00:17:23 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
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
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	*/
…		…
284	* (sack, luggage, etc), tmp->env->env then points to the player (nested	268	* (sack, luggage, etc), tmp->env->env then points to the player (nested
285	* containers not allowed as of now)	269	* containers not allowed as of now)
286	*/	270	*/
287	if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)	271	if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
288	{	272	{
289	new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!");	273	pl->failmsg ("You are levitating, you can't reach the ground! "
		274	"H<You have to stop levitating first, if you can, either by using your levitation skill, "
		275	"or waiting till the levitation effect wears off.>");
290	return;	276	return;
291	}	277	}
292		278
293	if (QUERY_FLAG (tmp, FLAG_NO_DROP))	279	if (QUERY_FLAG (tmp, FLAG_NO_DROP))
294	return;	280	return;
…		…
482	* but that probably will make it more difficult to read, and	468	* but that probably will make it more difficult to read, and
483	* not make it any more efficient	469	* not make it any more efficient
484	*/	470	*/
485	if (params && item_matched_string (op, tmp, params))	471	if (params && item_matched_string (op, tmp, params))
486	{	472	{
		473	if (--cnt < 0) break;
487	pick_up (op, tmp);	474	pick_up (op, tmp);
488	if (--cnt <= 0) break;
489	}	475	}
490	else if (can_pick (op, tmp) && !params)	476	else if (can_pick (op, tmp) && !params)
491	{	477	{
		478	if (--cnt < 0) break;
492	pick_up (op, tmp);	479	pick_up (op, tmp);
493	break;	480	break;
494	}	481	}
495		482
496	tmp = next;	483	tmp = next;
497	}	484	}
498		485
499	if (cnt <= 0)	486	if (cnt < 0)
500	{	487	{
501	op->failmsg ("Couldn't pick up so many items at once.");	488	op->failmsg ("Couldn't pick up so many items at once.");
502	return 0;	489	return 0;
503	}	490	}
504		491
…		…
517		504
518	return 0;	505	return 0;
519	}	506	}
520		507
521	/*	508	/*
522	* This function was part of drop, now is own function.	509	* This function was part of drop, now is own function.
523	* Player 'op' tries to put object 'tmp' into sack 'sack',	510	* Player 'op' tries to put object 'tmp' into sack 'sack',
524	* if nrof is non zero, then nrof objects is tried to put into sack.	511	* if nrof is non zero, then nrof objects is tried to put into sack.
		512	*
525	* Note that the 'sack' in question can now be a transport,	513	* Note that the 'sack' in question can now be a transport,
526	* so this function isn't named very good anymore.	514	* so this function isn't named very good anymore.
527	*/	515	*/
528	void	516	void
529	put_object_in_sack (object op, object sack, object *tmp, uint32 nrof)	517	put_object_in_sack (object op, object sack, object *tmp, uint32 nrof)
…		…
604		592
605	/* We are only dropping some of the items. We split the current object	593	/* We are only dropping some of the items. We split the current object
606	* off	594	* off
607	*/	595	*/
608	if (!can_split (op, tmp, nrof))	596	if (!can_split (op, tmp, nrof))
609
610	if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
611	return;	597	return;
612		598
		599	drop_object (op, tmp);
		600
		601	if (!tmp->destroyed () && !tmp->is_inserted ())
		602	{
		603	// if nothing happened with the object we give it back
		604	op->insert (tmp);
		605	}
		606	}
		607
		608	/* In contrast to drop_object (op, tmp, nrof) above this function takes the
		609	* already split off object, and feeds it to the event handlers and does
		610	* other magic with it.
		611	*
		612	* <droppper> is the object that dropped this object and <obj> is the
		613	* object that was dropped.
		614	*
		615	* Make sure to check what happened with <obj> after this function returns!
		616	* Otherwise you may leak this object.
		617	*/
		618
		619	void
		620	drop_object (object dropper, object obj)
		621	{
		622	if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
		623	return;
		624
		625	if (obj->destroyed () \|\| obj->is_inserted ())
		626	return;
		627
613	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))	628	if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
614	{	629	{
615	op->statusmsg (format ("You drop the %s.", query_name (tmp)));	630	dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
616	op->statusmsg ("The gods who lent it to you retrieves it.");	631	dropper->statusmsg ("The god who lent it to you retrieves it.");
617		632
618	tmp->destroy ();	633	obj->destroy ();
619	op->update_stats ();	634	dropper->update_stats ();
620	return;	635	return;
621	}	636	}
622		637
623	/* Call this before we update the various windows/players. At least	638	for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
624	* that we, we know the weight is correct.	639	floor;
		640	floor = floor->above)
		641	if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
		642	return;
		643
		644	if (obj->destroyed () \|\| obj->is_inserted ())
		645	return;
		646
		647	if (is_in_shop (dropper) && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
		648	if (!sell_item (obj, dropper))
		649	return;
		650
		651	/* If nothing special happened with this object, the default action is to
		652	* insert it below the dropper:
625	*/	653	*/
626	// 2007-11-26: moved op->update_stats away and calling it later after
627	// all items of a drop command have been processed.
628		654
629	for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)	655	obj->x = dropper->x;
630	if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))	656	obj->y = dropper->y;
631	return;
632		657
633	if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
634	sell_item (tmp, op);
635
636	tmp->x = op->x;
637	tmp->y = op->y;
638
639	insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);	658	insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
640	}	659	}
641		660
642	void	661	void
643	drop (object op, object tmp)	662	drop (object op, object tmp)
644	{	663	{
…		…
653	if (tmp->env && tmp->env->type != PLAYER)	672	if (tmp->env && tmp->env->type != PLAYER)
654	{	673	{
655	/* Just toss the object - probably shouldn't be hanging	674	/* Just toss the object - probably shouldn't be hanging
656	* around anyways	675	* around anyways
657	*/	676	*/
658	tmp->remove ();
659	tmp->destroy ();	677	tmp->destroy ();
660	return;	678	return;
661	}	679	}
662	else	680	else
663	{	681	{
…		…
843		861
844	/* draw_look(op);*/	862	/* draw_look(op);*/
845	return 0;	863	return 0;
846	}	864	}
847		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	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
848	/* 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
849	* comma seperated list.	892	* comma seperated list.
850	*/	893	*/
851	int	894	int
852	command_drop (object op, char params)	895	command_drop (object op, char params)
…		…
859	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");	902	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
860	return 0;	903	return 0;
861	}	904	}
862	else	905	else
863	{	906	{
864	int cnt = MAX_ITEM_PER_DROP;	907	vector<object *> matched_objs;
865		908
866	for (tmp = op->inv; tmp; tmp = next)	909	for (tmp = op->inv; tmp; tmp = next)
867	{	910	{
868	next = tmp->below;	911	next = tmp->below;
869	if (QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| tmp->invisible)	912	if (QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| tmp->invisible)
870	continue;	913	continue;
871		914
872	if (item_matched_string (op, tmp, params))	915	if (item_matched_string (op, tmp, params))
873	{	916	matched_objs.push_back (tmp);
874	drop (op, tmp);
875	if (--cnt <= 0) break;
876	did_one = 1;
877	}	917	}
878	}
879		918
880	if (!did_one)	919	int cnt = MAX_ITEM_PER_DROP;
		920
		921	if (!drop_vector (op, matched_objs, &cnt))
881	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");	922	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
882		923
883	if (cnt <= 0)	924	if (cnt <= 0)
884	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.");
885	}	926	}
…		…
964	dynbuf_text buf (512, 512);	1005	dynbuf_text buf (512, 512);
965		1006
966	object *mon = head ? head : this;	1007	object *mon = head ? head : this;
967		1008
968	if (QUERY_FLAG (mon, FLAG_UNDEAD))	1009	if (QUERY_FLAG (mon, FLAG_UNDEAD))
969	buf << "It is an undead force.\n";	1010	buf << "It is an undead force.\r";
970		1011
971	if (mon->level > who->level)	1012	if (mon->level > who->level)
972	buf << "It is likely more powerful than you.\n";	1013	buf << "It is likely more powerful than you.\r";
973	else if (mon->level < who->level)	1014	else if (mon->level < who->level)
974	buf << "It is likely less powerful than you.\n";	1015	buf << "It is likely less powerful than you.\r";
975	else	1016	else
976	buf << "It is probably as powerful as you.\n";	1017	buf << "It is probably as powerful as you.\r";
977		1018
978	if (mon->attacktype & AT_ACID)	1019	if (mon->attacktype & AT_ACID)
979	buf << "You seem to smell an acrid odor.\n";	1020	buf << "You seem to smell an acrid odor.\r";
980		1021
981	/* 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
982	* maxhp field? This seems that it should give more accurate results.	1023	* maxhp field? This seems that it should give more accurate results.
983	*/	1024	*/
984	switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))	1025	switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
985	{ /* From 1-4 */	1026	{ /* From 1-4 */
986	case 1:	1027	case 1:
987	buf << "It is in a bad shape.\n";	1028	buf << "It is in a bad shape.\r";
988	break;	1029	break;
989	case 2:	1030	case 2:
990	buf << "It is hurt.\n";	1031	buf << "It is hurt.\r";
991	break;	1032	break;
992	case 3:	1033	case 3:
993	buf << "It is somewhat hurt.\n";	1034	buf << "It is somewhat hurt.\r";
994	break;	1035	break;
995	case 4:	1036	case 4:
996	buf << "It is in excellent shape.\n";	1037	buf << "It is in excellent shape.\r";
997	break;	1038	break;
998	}	1039	}
999		1040
1000	if (present_in_ob (POISONING, mon))	1041	if (present_in_ob (POISONING, mon))
1001	buf << "It looks very ill.\n";	1042	buf << "It looks very ill.\r";
		1043
		1044	buf << '\n';
1002		1045
1003	return buf;	1046	return buf;
1004	}	1047	}
1005		1048
1006	/* 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. */
…		…
1013	}	1056	}
1014		1057
1015	std::string	1058	std::string
1016	object::long_desc (object *who)	1059	object::long_desc (object *who)
1017	{	1060	{
1018	std::string buf (query_name (this));	1061	std::string buf (query_name ());
1019		1062
1020	switch (type)	1063	switch (type)
1021	{	1064	{
1022	case RING:	1065	case RING:
1023	case SKILL:	1066	case SKILL:
…		…
1035	case CLOAK:	1078	case CLOAK:
1036	case FOOD:	1079	case FOOD:
1037	case DRINK:	1080	case DRINK:
1038	case FLESH:	1081	case FLESH:
1039	case SKILL_TOOL:	1082	case SKILL_TOOL:
		1083	case LAMP:
1040	case POWER_CRYSTAL:	1084	case POWER_CRYSTAL:
1041	{	1085	{
1042	const char *cp = ::describe_item (this, who);	1086	const char *cp = ::describe_item (this, who);
1043		1087
1044	if (*cp)	1088	if (*cp)
…		…
1064	std::string	1108	std::string
1065	object::describe (object *who)	1109	object::describe (object *who)
1066	{	1110	{
1067	dynbuf_text buf (1024, 1024);	1111	dynbuf_text buf (1024, 1024);
1068		1112
1069	buf.printf ("That is: %s.\n", long_desc (who).c_str ());	1113	buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1070		1114
1071	if (custom_name)	1115	if (custom_name)
1072	buf.printf ("You call it %s\n", &custom_name);	1116	buf.printf ("You call it %s.\r", &custom_name);
1073		1117
1074	switch (type)	1118	switch (type)
1075	{	1119	{
1076	case SPELLBOOK:	1120	case SPELLBOOK:
1077	if (flag [FLAG_IDENTIFIED] && inv)	1121	if (flag [FLAG_IDENTIFIED] && inv)
1078	buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill);	1122	buf.printf ("%s is a level %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1079	break;	1123	break;
1080		1124
1081	case BOOK:	1125	case BOOK:
1082	if (msg)	1126	if (msg)
1083	buf << "Something is written in it.\n";	1127	buf << "Something is written in it.\r";
1084	break;	1128	break;
1085		1129
1086	case CONTAINER:	1130	case CONTAINER:
1087	if (race != NULL)	1131	if (race)
1088	{	1132	{
1089	if (weight_limit && stats.Str < 100)	1133	if (weight_limit && stats.Str < 100)
1090	buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",	1134	buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1091	&race, weight_limit / (10.0 * (100 - stats.Str)));	1135	&race, weight_limit / (10.0 * (100 - stats.Str)));
1092	else	1136	else
1093	buf.printf ("It can hold only %s.\n", &race);	1137	buf.printf ("It can hold only %s.\r", &race);
1094	}	1138	}
1095	else if (weight_limit && stats.Str < 100)	1139	else if (weight_limit && stats.Str < 100)
1096	buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));	1140	buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1097	break;	1141	break;
1098		1142
1099	case WAND:	1143	case WAND:
1100	if (flag [FLAG_IDENTIFIED])	1144	if (flag [FLAG_IDENTIFIED])
1101	buf.printf ("It has %d charges left.\n", stats.food);	1145	buf.printf ("It has %d charges left.\r", stats.food);
1102	break;	1146	break;
1103	}	1147	}
1104		1148
1105	if (materialname && !msg)	1149	if (materialname && !msg)
1106	buf.printf ("It is made of: %s.\n", &materialname);	1150	buf.printf ("It is made of: %s.\r", &materialname);
1107		1151
1108	if (who)	1152	if (who)
1109	/* Where to wear this item */	1153	/* Where to wear this item */
1110	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)	1154	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1111	if (slot[i].info)	1155	if (slot[i].info)
…		…
1113	buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);	1157	buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1114		1158
1115	if (slot[i].info < -1 && who->slot[i].info)	1159	if (slot[i].info < -1 && who->slot[i].info)
1116	buf.printf ("(%d)", -slot[i].info);	1160	buf.printf ("(%d)", -slot[i].info);
1117		1161
1118	buf << ".\n";	1162	buf << ".\r";
1119	}	1163	}
1120		1164
1121	if (weight)	1165	if (weight)
1122	buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0);	1166	buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1123		1167
1124	if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)	1168	if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1125	{	1169	{
1126	buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE \| F_APPROX));	1170	buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE \| F_APPROX));
1127		1171
1128	if (is_in_shop (who))	1172	if (is_in_shop (who))
1129	{	1173	{
1130	if (flag [FLAG_UNPAID])	1174	if (flag [FLAG_UNPAID])
1131	buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY \| F_SHOP));	1175	buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY \| F_SHOP));
1132	else	1176	else
1133	buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");	1177	buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1134	}	1178	}
1135	}	1179	}
1136		1180
1137	if (flag [FLAG_MONSTER])	1181	if (flag [FLAG_MONSTER])
1138	buf << describe_monster (who);	1182	buf << describe_monster (who);
1139		1183
1140	/* Is this item buildable? */	1184	/* Is this item buildable? */
1141	if (flag [FLAG_IS_BUILDABLE])	1185	if (flag [FLAG_IS_BUILDABLE])
1142	buf << "This is a buildable item.\n";	1186	buf << "This is a buildable item.\r";
1143		1187
1144	/* Does the object have a message? Don't show message for all object	1188	/* Does the object have a message? Don't show message for all object
1145	* types - especially if the first entry is a match	1189	* types - especially if the first entry is a match
1146	*/	1190	*/
1147	if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && *msg != '@')	1191	if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1148	{	1192	{
1149	/* This is just a hack so when identifying the items, we print	1193	/* This is just a hack so when identifying the items, we print
1150	* out the extra message	1194	* out the extra message
1151	*/	1195	*/
1152	if (need_identify (this) && flag [FLAG_IDENTIFIED])	1196	if (need_identify (this) && flag [FLAG_IDENTIFIED])
1153	buf << "The object has a story:\n";	1197	buf << "The object has a story:\r";
1154		1198
1155	buf << msg << '\n';	1199	buf << msg << '\n';
1156	}	1200	}
1157		1201
1158	buf << '\n';	1202	buf << '\n';
…		…
1163	static void	1207	static void
1164	display_new_pickup (object *op)	1208	display_new_pickup (object *op)
1165	{	1209	{
1166	int i = op->contr->mode;	1210	int i = op->contr->mode;
1167		1211
1168	if (!(i & PU_NEWMODE))
1169	return;
1170
1171	new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1172	new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);	1212	new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);
1173	new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);	1213	new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);
1174	new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);	1214	new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1175		1215
1176	new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);	1216	new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
…		…
1227	};	1267	};
1228		1268
1229	if (!params)	1269	if (!params)
1230	{	1270	{
1231	/* if the new mode is used, just print the settings */	1271	/* if the new mode is used, just print the settings */
1232	if (op->contr->mode & PU_NEWMODE)
1233	{
1234	display_new_pickup (op);	1272	display_new_pickup (op);
1235	return 1;
1236	}
1237	if (1)
1238	LOG (llevDebug, "command_pickup: !params\n");
1239	set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1240	return 0;	1273	return 0;
1241	}	1274	}
1242		1275
1243	while (params == ' ' && params)	1276	while (params == ' ' && params)
1244	params++;	1277	params++;
…		…
1250	for (mode = 0; names[mode]; mode++)	1283	for (mode = 0; names[mode]; mode++)
1251	{	1284	{
1252	if (!strcmp (names[mode], params + 1))	1285	if (!strcmp (names[mode], params + 1))
1253	{	1286	{
1254	i = op->contr->mode;	1287	i = op->contr->mode;
1255	if (!(i & PU_NEWMODE))	1288
1256	i = PU_NEWMODE;
1257	if (*params == '+')	1289	if (*params == '+')
1258	i = i \| modes[mode];	1290	i = i \| modes[mode];
1259	else	1291	else
1260	i = i & ~modes[mode];	1292	i = i & ~modes[mode];
		1293
1261	op->contr->mode = i;	1294	op->contr->mode = i;
1262	display_new_pickup (op);	1295	display_new_pickup (op);
1263	return 1;	1296	return 1;
1264	}	1297	}
1265	}	1298	}
…		…
1267	return 1;	1300	return 1;
1268	}	1301	}
1269		1302
1270	if (sscanf (params, "%u", &i) != 1)	1303	if (sscanf (params, "%u", &i) != 1)
1271	{	1304	{
1272	if (1)
1273	LOG (llevDebug, "command_pickup: params==NULL\n");
1274	new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <0-7> or <value_density> .");	1305	new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1275	return 1;	1306	return 1;
1276	}	1307	}
1277	set_pickup_mode (op, i);	1308
		1309	if (i <= PU_RATIO)
		1310	i \|= op->contr->mode & ~PU_RATIO;
		1311
		1312	op->contr->mode = i;
1278		1313
1279	return 1;	1314	return 1;
1280	}
1281
1282	void
1283	set_pickup_mode (object *op, int i)
1284	{
1285	switch (op->contr->mode = i)
1286	{
1287	case 0:
1288	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1289	break;
1290	case 1:
1291	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1292	break;
1293	case 2:
1294	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1295	break;
1296	case 3:
1297	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1298	break;
1299	case 4:
1300	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1301	break;
1302	case 5:
1303	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1304	break;
1305	case 6:
1306	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1307	break;
1308	case 7:
1309	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1310	break;
1311	}
1312	}	1315	}
1313		1316
1314	int	1317	int
1315	command_search_items (object op, char params)	1318	command_search_items (object op, char params)
1316	{	1319	{
1317	char buf[MAX_BUF];	1320	char buf[MAX_BUF];
1318		1321
1319	if (settings.search_items == FALSE)
1320	return 1;
1321
1322	if (params == NULL)	1322	if (params == NULL)
1323	{	1323	{
1324	if (op->contr->search_str[0] == '\0')	1324	if (op->contr->search_str[0] == '\0')
1325	{	1325	{
1326	new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1");	1326	new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1327	new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");	1327	new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1328	new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");	1328	new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1329	return 1;	1329	return 1;
1330	}	1330	}
1331		1331
…		…
1333	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");	1333	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1334	op->update_stats ();	1334	op->update_stats ();
1335	return 1;	1335	return 1;
1336	}	1336	}
1337		1337
1338	if ((int) strlen (params) >= MAX_BUF)	1338	if (strlen (params) >= MAX_BUF)
1339	{	1339	{
1340	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");	1340	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1341	return 1;	1341	return 1;
1342	}	1342	}
1343		1343
1344	strcpy (op->contr->search_str, params);	1344	strcpy (op->contr->search_str, params);
1345	sprintf (buf, "Searching for '%s'.", op->contr->search_str);	1345	sprintf (buf, "Now searching for '%s'.", op->contr->search_str);
1346	new_draw_info (NDI_UNIQUE, 0, op, buf);	1346	new_draw_info (NDI_UNIQUE, 0, op, buf);
1347	op->update_stats ();	1347	op->update_stats ();
		1348
1348	return 1;	1349	return 1;
1349	}	1350	}
1350		1351

Diff Legend

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

Comparing deliantra/server/server/c_object.C (file contents): Revision 1.70 by root, Wed Apr 23 07:49:57 2008 UTC vs. Revision 1.89 by elmex, Mon Jan 12 00:17:23 2009 UTC

Diff Legend

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.70 by root, Wed Apr 23 07:49:57 2008 UTC vs.
Revision 1.89 by elmex, Mon Jan 12 00:17:23 2009 UTC