[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.93 by root, Wed Sep 16 22:50:50 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	*/
…		…
520		504
521	return 0;	505	return 0;
522	}	506	}
523		507
524	/*	508	/*
525	* This function was part of drop, now is own function.	509	* This function was part of drop, now is own function.
526	* Player 'op' tries to put object 'tmp' into sack 'sack',	510	* 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.	511	* if nrof is non zero, then nrof objects is tried to put into sack.
		512	*
528	* Note that the 'sack' in question can now be a transport,	513	* Note that the 'sack' in question can now be a transport,
529	* so this function isn't named very good anymore.	514	* so this function isn't named very good anymore.
530	*/	515	*/
531	void	516	void
532	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)
…		…
601		586
602	if (QUERY_FLAG (tmp, FLAG_APPLIED))	587	if (QUERY_FLAG (tmp, FLAG_APPLIED))
603	if (apply_special (op, tmp, AP_UNAPPLY \| AP_NO_MERGE))	588	if (apply_special (op, tmp, AP_UNAPPLY \| AP_NO_MERGE))
604	return; /* can't unapply it */	589	return; /* can't unapply it */
605		590
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	591	/* We are only dropping some of the items. We split the current object
609	* off	592	* off
610	*/	593	*/
611	if (!can_split (op, tmp, nrof))	594	if (!can_split (op, tmp, nrof))
612
613	if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
614	return;	595	return;
615		596
		597	drop_object (op, tmp);
		598
		599	if (!tmp->destroyed () && !tmp->is_inserted ())
		600	{
		601	// if nothing happened with the object we give it back
		602	op->insert (tmp);
		603	}
		604	}
		605
		606	/* In contrast to drop_object (op, tmp, nrof) above this function takes the
		607	* already split off object, and feeds it to the event handlers and does
		608	* other magic with it.
		609	*
		610	* <droppper> is the object that dropped this object and <obj> is the
		611	* object that was dropped.
		612	*
		613	* Make sure to check what happened with <obj> after this function returns!
		614	* Otherwise you may leak this object.
		615	*/
		616	void
		617	drop_object (object dropper, object obj)
		618	{
		619	if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
		620	return;
		621
		622	if (obj->destroyed () \|\| obj->is_inserted ())
		623	return;
		624
616	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))	625	if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
617	{	626	{
618	op->statusmsg (format ("You drop the %s.", query_name (tmp)));	627	dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
619	op->statusmsg ("The gods who lent it to you retrieves it.");	628	dropper->statusmsg ("The god who lent it to you retrieves it.");
620		629
621	tmp->destroy ();	630	obj->destroy ();
622	op->update_stats ();	631	dropper->update_stats ();
623	return;	632	return;
624	}	633	}
625		634
626	/* Call this before we update the various windows/players. At least	635	for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
627	* that we, we know the weight is correct.	636	floor;
		637	floor = floor->above)
		638	if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
		639	return;
		640
		641	if (obj->destroyed () \|\| obj->is_inserted ())
		642	return;
		643
		644	if (is_in_shop (dropper) && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
		645	if (!sell_item (obj, dropper))
		646	return;
		647
		648	/* If nothing special happened with this object, the default action is to
		649	* insert it below the dropper:
628	*/	650	*/
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		651
632	for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)	652	obj->x = dropper->x;
633	if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))	653	obj->y = dropper->y;
634	return;
635		654
636	if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
637	{
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);	655	insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
646	}	656	}
647		657
648	void	658	void
649	drop (object op, object tmp)	659	drop (object op, object tmp)
650	{	660	{
…		…
659	if (tmp->env && tmp->env->type != PLAYER)	669	if (tmp->env && tmp->env->type != PLAYER)
660	{	670	{
661	/* Just toss the object - probably shouldn't be hanging	671	/* Just toss the object - probably shouldn't be hanging
662	* around anyways	672	* around anyways
663	*/	673	*/
664	tmp->remove ();
665	tmp->destroy ();	674	tmp->destroy ();
666	return;	675	return;
667	}	676	}
668	else	677	else
669	{	678	{
…		…
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);
…		…
849		858
850	/* draw_look(op);*/	859	/* draw_look(op);*/
851	return 0;	860	return 0;
852	}	861	}
853		862
		863
		864	/* This function tries to drop all objects in the <objs> vector.
		865	* <dropper> is the object that wants to drop them.
		866	* <cnt> can be a 0 pointer or a pointer to the maximum number of
		867	* drop operations to perform.
		868	*
		869	* Returns true if at least one item was dropped.
		870	*/
		871	bool
		872	drop_vector (object dropper, vector<object > &objs, int *cnt)
		873	{
		874	vector<object *>::iterator i;
		875
		876	bool did_one = false;
		877
		878	for (i = objs.begin (); i != objs.end (); i++)
		879	{
		880	drop (dropper, *i);
		881	if (cnt && --*cnt <= 0) break;
		882	did_one = true;
		883	}
		884
		885	return did_one;
		886	}
		887
854	/* Object op wants to drop object(s) params. params can be a	888	/* Object op wants to drop object(s) params. params can be a
855	* comma seperated list.	889	* comma seperated list.
856	*/	890	*/
857	int	891	int
858	command_drop (object op, char params)	892	command_drop (object op, char params)
…		…
865	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");	899	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
866	return 0;	900	return 0;
867	}	901	}
868	else	902	else
869	{	903	{
870	int cnt = MAX_ITEM_PER_DROP;	904	vector<object *> matched_objs;
871		905
872	for (tmp = op->inv; tmp; tmp = next)	906	for (tmp = op->inv; tmp; tmp = next)
873	{	907	{
874	next = tmp->below;	908	next = tmp->below;
875	if (QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| tmp->invisible)	909	if (QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| tmp->invisible)
876	continue;	910	continue;
877		911
878	if (item_matched_string (op, tmp, params))	912	if (item_matched_string (op, tmp, params))
879	{	913	matched_objs.push_back (tmp);
880	drop (op, tmp);
881	if (--cnt <= 0) break;
882	did_one = 1;
883	}	914	}
884	}
885		915
886	if (!did_one)	916	int cnt = MAX_ITEM_PER_DROP;
		917
		918	if (!drop_vector (op, matched_objs, &cnt))
887	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");	919	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
888		920
889	if (cnt <= 0)	921	if (cnt <= 0)
890	op->failmsg ("Only dropped some items, can't drop that many items at once.");	922	op->failmsg ("Only dropped some items, can't drop that many items at once.");
891	}	923	}
…		…
970	dynbuf_text buf (512, 512);	1002	dynbuf_text buf (512, 512);
971		1003
972	object *mon = head ? head : this;	1004	object *mon = head ? head : this;
973		1005
974	if (QUERY_FLAG (mon, FLAG_UNDEAD))	1006	if (QUERY_FLAG (mon, FLAG_UNDEAD))
975	buf << " - It is an undead force.\n";	1007	buf << "It is an undead force.\r";
976		1008
977	if (mon->level > who->level)	1009	if (mon->level > who->level)
978	buf << " - It is likely more powerful than you.\n";	1010	buf << "It is likely more powerful than you.\r";
979	else if (mon->level < who->level)	1011	else if (mon->level < who->level)
980	buf << " - It is likely less powerful than you.\n";	1012	buf << "It is likely less powerful than you.\r";
981	else	1013	else
982	buf << " - It is probably as powerful as you.\n";	1014	buf << "It is probably as powerful as you.\r";
983		1015
984	if (mon->attacktype & AT_ACID)	1016	if (mon->attacktype & AT_ACID)
985	buf << " - You seem to smell an acrid odor.\n";	1017	buf << "You seem to smell an acrid odor.\r";
986		1018
987	/* Anyone know why this used to use the clone value instead of the	1019	/* 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.	1020	* maxhp field? This seems that it should give more accurate results.
989	*/	1021	*/
990	switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))	1022	switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
991	{ /* From 1-4 */	1023	{ /* From 1-4 */
992	case 1:	1024	case 1:
993	buf << " - It is in a bad shape.\n";	1025	buf << "It is in a bad shape.\r";
994	break;	1026	break;
995	case 2:	1027	case 2:
996	buf << " - It is hurt.\n";	1028	buf << "It is hurt.\r";
997	break;	1029	break;
998	case 3:	1030	case 3:
999	buf << " - It is somewhat hurt.\n";	1031	buf << "It is somewhat hurt.\r";
1000	break;	1032	break;
1001	case 4:	1033	case 4:
1002	buf << " - It is in excellent shape.\n";	1034	buf << "It is in excellent shape.\r";
1003	break;	1035	break;
1004	}	1036	}
1005		1037
1006	if (present_in_ob (POISONING, mon))	1038	if (present_in_ob (POISONING, mon))
1007	buf << " - It looks very ill.\n";	1039	buf << "It looks very ill.\r";
		1040
		1041	buf << '\n';
1008		1042
1009	return buf;	1043	return buf;
1010	}	1044	}
1011		1045
1012	/* tmp is the object being described, pl is who is examing it. */	1046	/* tmp is the object being described, pl is who is examing it. */
…		…
1019	}	1053	}
1020		1054
1021	std::string	1055	std::string
1022	object::long_desc (object *who)	1056	object::long_desc (object *who)
1023	{	1057	{
1024	std::string buf (query_name (this));	1058	std::string buf (query_name ());
1025		1059
1026	switch (type)	1060	switch (type)
1027	{	1061	{
1028	case RING:	1062	case RING:
1029	case SKILL:	1063	case SKILL:
…		…
1041	case CLOAK:	1075	case CLOAK:
1042	case FOOD:	1076	case FOOD:
1043	case DRINK:	1077	case DRINK:
1044	case FLESH:	1078	case FLESH:
1045	case SKILL_TOOL:	1079	case SKILL_TOOL:
		1080	case LAMP:
1046	case POWER_CRYSTAL:	1081	case POWER_CRYSTAL:
1047	{	1082	{
1048	const char *cp = ::describe_item (this, who);	1083	const char *cp = ::describe_item (this, who);
1049		1084
1050	if (*cp)	1085	if (*cp)
…		…
1070	std::string	1105	std::string
1071	object::describe (object *who)	1106	object::describe (object *who)
1072	{	1107	{
1073	dynbuf_text buf (1024, 1024);	1108	dynbuf_text buf (1024, 1024);
1074		1109
1075	buf.printf ("That is: %s.\n\n", long_desc (who).c_str ());	1110	buf.printf ("That is: %s.\r", long_desc (who).c_str ());
1076		1111
1077	if (custom_name)	1112	if (custom_name)
1078	buf.printf ("You call it %s.\n\n", &custom_name);	1113	buf.printf ("You call it %s.\r", &custom_name);
1079		1114
1080	switch (type)	1115	switch (type)
1081	{	1116	{
1082	case SPELLBOOK:	1117	case SPELLBOOK:
1083	if (flag [FLAG_IDENTIFIED] && inv)	1118	if (flag [FLAG_IDENTIFIED] && inv)
1084	buf.printf ("%s is a %s %s spell.\n", &inv->name, get_levelnumber (inv->level), &inv->skill);	1119	buf.printf ("%s is a level %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1085	break;	1120	break;
1086		1121
1087	case BOOK:	1122	case BOOK:
1088	if (msg)	1123	if (msg)
1089	buf << "Something is written in it.\n";	1124	buf << "Something is written in it.\r";
1090	break;	1125	break;
1091		1126
1092	case CONTAINER:	1127	case CONTAINER:
1093	if (race != NULL)	1128	if (race)
1094	{	1129	{
1095	if (weight_limit && stats.Str < 100)	1130	if (weight_limit && stats.Str < 100)
1096	buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",	1131	buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
1097	&race, weight_limit / (10.0 * (100 - stats.Str)));	1132	&race, weight_limit / (10.0 * (100 - stats.Str)));
1098	else	1133	else
1099	buf.printf ("It can hold only %s.\n", &race);	1134	buf.printf ("It can hold only %s.\r", &race);
1100	}	1135	}
1101	else if (weight_limit && stats.Str < 100)	1136	else if (weight_limit && stats.Str < 100)
1102	buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));	1137	buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1103	break;	1138	break;
1104		1139
1105	case WAND:	1140	case WAND:
1106	if (flag [FLAG_IDENTIFIED])	1141	if (flag [FLAG_IDENTIFIED])
1107	buf.printf ("It has %d charges left.\n", stats.food);	1142	buf.printf ("It has %d charges left.\r", stats.food);
1108	break;	1143	break;
1109	}	1144	}
1110		1145
1111	if (materialname && !msg)	1146	if (materialname && !msg)
1112	buf.printf ("It is made of: %s.\n", &materialname);	1147	buf << (nrof > 1 ? "They are made of " : "It is made of ")
		1148	<< materialname
		1149	<< '\r';
1113		1150
1114	if (who)	1151	if (who)
1115	/* Where to wear this item */	1152	/* Where to wear this item */
1116	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)	1153	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1117	if (slot[i].info)	1154	if (slot[i].info)
…		…
1119	buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);	1156	buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
1120		1157
1121	if (slot[i].info < -1 && who->slot[i].info)	1158	if (slot[i].info < -1 && who->slot[i].info)
1122	buf.printf ("(%d)", -slot[i].info);	1159	buf.printf ("(%d)", -slot[i].info);
1123		1160
1124	buf << ".\n";	1161	buf << ".\r";
1125	}	1162	}
1126		1163
1127	if (weight)	1164	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);	1165	buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
1129		1166
1130	if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)	1167	if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1131	{	1168	{
1132	buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE \| F_APPROX));	1169	buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE \| F_APPROX));
1133		1170
1134	if (is_in_shop (who))	1171	if (is_in_shop (who))
1135	{	1172	{
1136	if (flag [FLAG_UNPAID])	1173	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));	1174	buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY \| F_SHOP));
1138	else	1175	else
1139	buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");	1176	buf.printf ("You are offered %s for %s.\r", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1140	}	1177	}
1141	}	1178	}
1142		1179
1143	if (flag [FLAG_MONSTER])	1180	if (flag [FLAG_MONSTER])
1144	buf << describe_monster (who);	1181	buf << describe_monster (who);
1145		1182
1146	/* Is this item buildable? */	1183	/* Is this item buildable? */
1147	if (flag [FLAG_IS_BUILDABLE])	1184	if (flag [FLAG_IS_BUILDABLE])
1148	buf << "This is a buildable item.\n";	1185	buf << "This is a buildable item.\r";
1149		1186
1150	/* Does the object have a message? Don't show message for all object	1187	/* Does the object have a message? Don't show message for all object
1151	* types - especially if the first entry is a match	1188	* types - especially if the first entry is a match
1152	*/	1189	*/
		1190	if (msg)
		1191	{
1153	if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())	1192	if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1154	{	1193	{
		1194	buf << '\r';
		1195
1155	/* This is just a hack so when identifying the items, we print	1196	/* This is just a hack so when identifying the items, we print
1156	* out the extra message	1197	* out the extra message
1157	*/	1198	*/
1158	if (need_identify (this) && flag [FLAG_IDENTIFIED])	1199	if (need_identify (this) && flag [FLAG_IDENTIFIED])
1159	buf << "The object has a story:\n\n";	1200	buf << "The object has a story:\r";
1160		1201
1161	buf << msg << '\n';	1202	buf << msg << '\n';
		1203	}
1162	}	1204	}
		1205	else if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
		1206	&& (type == SPELLBOOK \|\| type == ROD \|\| type == WAND
		1207	\|\| type == ROD \|\| type == POTION \|\| type == SCROLL))
		1208	// for spellbooks and other stuff that conatisn spells, print the spell message,
		1209	// unless the object has a custom message
		1210	buf << '\r' << inv->msg << '\n';
1163		1211
1164	buf << '\n';	1212	buf << '\n';
1165		1213
1166	return std::string (buf.linearise (), buf.size ());	1214	return std::string (buf.linearise (), buf.size ());
1167	}	1215	}
…		…
1169	static void	1217	static void
1170	display_new_pickup (object *op)	1218	display_new_pickup (object *op)
1171	{	1219	{
1172	int i = op->contr->mode;	1220	int i = op->contr->mode;
1173		1221
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);	1222	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);	1223	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);	1224	new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1181		1225
1182	new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);	1226	new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
…		…
1233	};	1277	};
1234		1278
1235	if (!params)	1279	if (!params)
1236	{	1280	{
1237	/* if the new mode is used, just print the settings */	1281	/* if the new mode is used, just print the settings */
1238	if (op->contr->mode & PU_NEWMODE)
1239	{
1240	display_new_pickup (op);	1282	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;	1283	return 0;
1247	}	1284	}
1248		1285
1249	while (params == ' ' && params)	1286	while (params == ' ' && params)
1250	params++;	1287	params++;
…		…
1256	for (mode = 0; names[mode]; mode++)	1293	for (mode = 0; names[mode]; mode++)
1257	{	1294	{
1258	if (!strcmp (names[mode], params + 1))	1295	if (!strcmp (names[mode], params + 1))
1259	{	1296	{
1260	i = op->contr->mode;	1297	i = op->contr->mode;
1261	if (!(i & PU_NEWMODE))	1298
1262	i = PU_NEWMODE;
1263	if (*params == '+')	1299	if (*params == '+')
1264	i = i \| modes[mode];	1300	i = i \| modes[mode];
1265	else	1301	else
1266	i = i & ~modes[mode];	1302	i = i & ~modes[mode];
		1303
1267	op->contr->mode = i;	1304	op->contr->mode = i;
1268	display_new_pickup (op);	1305	display_new_pickup (op);
1269	return 1;	1306	return 1;
1270	}	1307	}
1271	}	1308	}
…		…
1273	return 1;	1310	return 1;
1274	}	1311	}
1275		1312
1276	if (sscanf (params, "%u", &i) != 1)	1313	if (sscanf (params, "%u", &i) != 1)
1277	{	1314	{
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> .");	1315	new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1281	return 1;	1316	return 1;
1282	}	1317	}
1283	set_pickup_mode (op, i);	1318
		1319	if (i <= PU_RATIO)
		1320	i \|= op->contr->mode & ~PU_RATIO;
		1321
		1322	op->contr->mode = i;
1284		1323
1285	return 1;	1324	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	}	1325	}
1319		1326
1320	int	1327	int
1321	command_search_items (object op, char params)	1328	command_search_items (object op, char params)
1322	{	1329	{
1323	char buf[MAX_BUF];	1330	char buf[MAX_BUF];
1324		1331
1325	if (settings.search_items == FALSE)
1326	return 1;
1327
1328	if (params == NULL)	1332	if (params == NULL)
1329	{	1333	{
1330	if (op->contr->search_str[0] == '\0')	1334	if (op->contr->search_str[0] == '\0')
1331	{	1335	{
1332	new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1");	1336	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");	1337	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'.");	1338	new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1335	return 1;	1339	return 1;
1336	}	1340	}
1337		1341
…		…
1339	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");	1343	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1340	op->update_stats ();	1344	op->update_stats ();
1341	return 1;	1345	return 1;
1342	}	1346	}
1343		1347
1344	if ((int) strlen (params) >= MAX_BUF)	1348	if (strlen (params) >= MAX_BUF)
1345	{	1349	{
1346	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");	1350	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1347	return 1;	1351	return 1;
1348	}	1352	}
1349		1353
1350	strcpy (op->contr->search_str, params);	1354	strcpy (op->contr->search_str, params);
1351	sprintf (buf, "Searching for '%s'.", op->contr->search_str);	1355	sprintf (buf, "Now searching for '%s'.", op->contr->search_str);
1352	new_draw_info (NDI_UNIQUE, 0, op, buf);	1356	new_draw_info (NDI_UNIQUE, 0, op, buf);
1353	op->update_stats ();	1357	op->update_stats ();
		1358
1354	return 1;	1359	return 1;
1355	}	1360	}
1356		1361

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.93 by root, Wed Sep 16 22:50:50 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.93 by root, Wed Sep 16 22:50:50 2009 UTC