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

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

Diff Legend

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

Comparing deliantra/server/server/c_object.C (file contents): Revision 1.72 by root, Tue May 6 16:32:34 2008 UTC vs. Revision 1.89 by elmex, Mon Jan 12 00:17:23 2009 UTC

Diff Legend

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.72 by root, Tue May 6 16:32:34 2008 UTC vs.
Revision 1.89 by elmex, Mon Jan 12 00:17:23 2009 UTC