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

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.80 by elmex, Sun Oct 5 12:40:21 2008 UTC vs.
Revision 1.97 by root, Mon Oct 12 14:00:59 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	/*
133	{	134	{
134	new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");	135	new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");
135	return 0;	136	return 0;
136	}	137	}
137		138
138	skill = find_skill_by_name (pl, params);	139	skill = find_skill_by_name_fuzzy (pl, params);
139		140
140	if (!skill)	141	if (!skill)
141	{	142	{
142	new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params);	143	new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params);
143	return 0;	144	return 0;
144	}	145	}
145		146
146	pl->change_skill (0);	147	pl->change_skill (0);
147	apply_special (pl, skill, AP_APPLY);	148	apply_special (pl, skill, AP_APPLY);
148	return 1;	149	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	}	150	}
166		151
167	/* A little special because we do want to pass the full params along	152	/* A little special because we do want to pass the full params along
168	* as it includes the object to throw.	153	* as it includes the object to throw.
169	*/	154	*/
…		…
520		505
521	return 0;	506	return 0;
522	}	507	}
523		508
524	/*	509	/*
525	* This function was part of drop, now is own function.	510	* This function was part of drop, now is own function.
526	* Player 'op' tries to put object 'tmp' into sack 'sack',	511	* 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.	512	* if nrof is non zero, then nrof objects is tried to put into sack.
		513	*
528	* Note that the 'sack' in question can now be a transport,	514	* Note that the 'sack' in question can now be a transport,
529	* so this function isn't named very good anymore.	515	* so this function isn't named very good anymore.
530	*/	516	*/
531	void	517	void
532	put_object_in_sack (object op, object sack, object *tmp, uint32 nrof)	518	put_object_in_sack (object op, object sack, object *tmp, uint32 nrof)
…		…
601		587
602	if (QUERY_FLAG (tmp, FLAG_APPLIED))	588	if (QUERY_FLAG (tmp, FLAG_APPLIED))
603	if (apply_special (op, tmp, AP_UNAPPLY \| AP_NO_MERGE))	589	if (apply_special (op, tmp, AP_UNAPPLY \| AP_NO_MERGE))
604	return; /* can't unapply it */	590	return; /* can't unapply it */
605		591
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	592	/* We are only dropping some of the items. We split the current object
609	* off	593	* off
610	*/	594	*/
611	if (!can_split (op, tmp, nrof))	595	if (!can_split (op, tmp, nrof))
612	return;	596	return;
613		597
		598	drop_object (op, tmp);
		599
		600	if (!tmp->destroyed () && !tmp->is_inserted ())
		601	{
		602	// if nothing happened with the object we give it back
		603	op->insert (tmp);
		604	}
		605	}
		606
		607	/* In contrast to drop_object (op, tmp, nrof) above this function takes the
		608	* already split off object, and feeds it to the event handlers and does
		609	* other magic with it.
		610	*
		611	* <droppper> is the object that dropped this object and <obj> is the
		612	* object that was dropped.
		613	*
		614	* Make sure to check what happened with <obj> after this function returns!
		615	* Otherwise you may leak this object.
		616	*/
		617	void
		618	drop_object (object dropper, object obj)
		619	{
614	if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))	620	if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
615	return;	621	return;
		622
		623	if (obj->destroyed () \|\| obj->is_inserted ())
		624	return;
616		625
617	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))	626	if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
618	{	627	{
619	op->statusmsg (format ("You drop the %s.", query_name (tmp)));	628	dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
620	op->statusmsg ("The god who lent it to you retrieves it.");	629	dropper->statusmsg ("The god who lent it to you retrieves it.");
621		630
622	tmp->destroy ();	631	obj->destroy ();
623	op->update_stats ();	632	dropper->update_stats ();
624	return;	633	return;
625	}	634	}
626		635
627	/* Call this before we update the various windows/players. At least	636	for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
628	* that we, we know the weight is correct.	637	floor;
		638	floor = floor->above)
		639	if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
		640	return;
		641
		642	if (obj->destroyed () \|\| obj->is_inserted ())
		643	return;
		644
		645	if (is_in_shop (dropper) && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
		646	if (!sell_item (obj, dropper))
		647	return;
		648
		649	/* If nothing special happened with this object, the default action is to
		650	* insert it below the dropper:
629	*/	651	*/
630	// 2007-11-26: moved op->update_stats away and calling it later after
631	// all items of a drop command have been processed.
632		652
633	for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)	653	obj->x = dropper->x;
634	if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))	654	obj->y = dropper->y;
635	return;
636		655
637	if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
638	{
639	if (!sell_item (tmp, op))
640	{
641	// if we can't sell it we don't drop it, so give it back to the seller
642	op->insert (tmp);
643	return;
644	}
645	}
646
647	tmp->x = op->x;
648	tmp->y = op->y;
649
650	insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);	656	insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
651	}	657	}
652		658
653	void	659	void
654	drop (object op, object tmp)	660	drop (object op, object tmp)
655	{	661	{
…		…
698	}	704	}
699		705
700	if (op->type == PLAYER && op->contr->last_used == tmp)	706	if (op->type == PLAYER && op->contr->last_used == tmp)
701	op->contr->last_used = tmp->below ? tmp->below	707	op->contr->last_used = tmp->below ? tmp->below
702	: tmp->above ? tmp->above	708	: tmp->above ? tmp->above
703	: 0;	709	: (object *)0;
704		710
705	if (op->container)	711	if (op->container)
706	{	712	{
707	if (op->type == PLAYER)	713	if (op->type == PLAYER)
708	put_object_in_sack (op, op->container, tmp, op->contr->count);	714	put_object_in_sack (op, op->container, tmp, op->contr->count);
…		…
853		859
854	/* draw_look(op);*/	860	/* draw_look(op);*/
855	return 0;	861	return 0;
856	}	862	}
857		863
		864
		865	/* This function tries to drop all objects in the <objs> vector.
		866	* <dropper> is the object that wants to drop them.
		867	* <cnt> can be a 0 pointer or a pointer to the maximum number of
		868	* drop operations to perform.
		869	*
		870	* Returns true if at least one item was dropped.
		871	*/
		872	bool
		873	drop_vector (object dropper, vector<object > &objs, int *cnt)
		874	{
		875	vector<object *>::iterator i;
		876
		877	bool did_one = false;
		878
		879	for (i = objs.begin (); i != objs.end (); i++)
		880	{
		881	drop (dropper, *i);
		882	if (cnt && --*cnt <= 0) break;
		883	did_one = true;
		884	}
		885
		886	return did_one;
		887	}
		888
858	/* Object op wants to drop object(s) params. params can be a	889	/* Object op wants to drop object(s) params. params can be a
859	* comma seperated list.	890	* comma seperated list.
860	*/	891	*/
861	int	892	int
862	command_drop (object op, char params)	893	command_drop (object op, char params)
…		…
869	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");	900	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
870	return 0;	901	return 0;
871	}	902	}
872	else	903	else
873	{	904	{
874	int cnt = MAX_ITEM_PER_DROP;	905	vector<object *> matched_objs;
875		906
876	for (tmp = op->inv; tmp; tmp = next)	907	for (tmp = op->inv; tmp; tmp = next)
877	{	908	{
878	next = tmp->below;	909	next = tmp->below;
879	if (QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| tmp->invisible)	910	if (QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| tmp->invisible)
880	continue;	911	continue;
881		912
882	if (item_matched_string (op, tmp, params))	913	if (item_matched_string (op, tmp, params))
883	{	914	matched_objs.push_back (tmp);
884	drop (op, tmp);
885	if (--cnt <= 0) break;
886	did_one = 1;
887	}	915	}
888	}
889		916
890	if (!did_one)	917	int cnt = MAX_ITEM_PER_DROP;
		918
		919	if (!drop_vector (op, matched_objs, &cnt))
891	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");	920	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
892		921
893	if (cnt <= 0)	922	if (cnt <= 0)
894	op->failmsg ("Only dropped some items, can't drop that many items at once.");	923	op->failmsg ("Only dropped some items, can't drop that many items at once.");
895	}	924	}
…		…
1025	}	1054	}
1026		1055
1027	std::string	1056	std::string
1028	object::long_desc (object *who)	1057	object::long_desc (object *who)
1029	{	1058	{
1030	std::string buf (query_name (this));	1059	std::string buf (query_name ());
1031		1060
1032	switch (type)	1061	switch (type)
1033	{	1062	{
1034	case RING:	1063	case RING:
1035	case SKILL:	1064	case SKILL:
…		…
1047	case CLOAK:	1076	case CLOAK:
1048	case FOOD:	1077	case FOOD:
1049	case DRINK:	1078	case DRINK:
1050	case FLESH:	1079	case FLESH:
1051	case SKILL_TOOL:	1080	case SKILL_TOOL:
		1081	case LAMP:
1052	case POWER_CRYSTAL:	1082	case POWER_CRYSTAL:
1053	{	1083	{
1054	const char *cp = ::describe_item (this, who);	1084	const char *cp = ::describe_item (this, who);
1055		1085
1056	if (*cp)	1086	if (*cp)
…		…
1071	examine_monster (object op, object tmp)	1101	examine_monster (object op, object tmp)
1072	{	1102	{
1073	new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());	1103	new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1074	}	1104	}
1075		1105
		1106	static void
		1107	describe_dump_object (dynbuf &buf, object *ob)
		1108	{
		1109	char *txt = dump_object (ob);
		1110	for (char p = txt; p; ++p) if (p == '\n') p = '\r';
		1111	buf << "\n" << txt << "\n";
		1112
		1113	if (!ob->is_arch ())
		1114	describe_dump_object (buf, ob->arch);
		1115	}
		1116
1076	std::string	1117	std::string
1077	object::describe (object *who)	1118	object::describe (object *who)
1078	{	1119	{
1079	dynbuf_text buf (1024, 1024);	1120	dynbuf_text buf (1024, 1024);
1080		1121
…		…
1085		1126
1086	switch (type)	1127	switch (type)
1087	{	1128	{
1088	case SPELLBOOK:	1129	case SPELLBOOK:
1089	if (flag [FLAG_IDENTIFIED] && inv)	1130	if (flag [FLAG_IDENTIFIED] && inv)
1090	buf.printf ("%s is a %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);	1131	buf.printf ("%s is a level %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
1091	break;	1132	break;
1092		1133
1093	case BOOK:	1134	case BOOK:
1094	if (msg)	1135	if (msg)
1095	buf << "Something is written in it.\r";	1136	buf << "Something is written in it.\r";
…		…
1113	buf.printf ("It has %d charges left.\r", stats.food);	1154	buf.printf ("It has %d charges left.\r", stats.food);
1114	break;	1155	break;
1115	}	1156	}
1116		1157
1117	if (materialname && !msg)	1158	if (materialname && !msg)
1118	buf.printf ("It is made of: %s.\r", &materialname);	1159	buf << (nrof > 1 ? "They are made of " : "It is made of ")
		1160	<< materialname
		1161	<< '\r';
1119		1162
1120	if (who)	1163	if (who)
1121	/* Where to wear this item */	1164	/* Where to wear this item */
1122	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)	1165	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1123	if (slot[i].info)	1166	if (slot[i].info)
…		…
1154	buf << "This is a buildable item.\r";	1197	buf << "This is a buildable item.\r";
1155		1198
1156	/* Does the object have a message? Don't show message for all object	1199	/* Does the object have a message? Don't show message for all object
1157	* types - especially if the first entry is a match	1200	* types - especially if the first entry is a match
1158	*/	1201	*/
		1202	if (msg)
		1203	{
1159	if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())	1204	if (type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1160	{	1205	{
		1206	buf << '\r';
		1207
1161	/* This is just a hack so when identifying the items, we print	1208	/* This is just a hack so when identifying the items, we print
1162	* out the extra message	1209	* out the extra message
1163	*/	1210	*/
1164	if (need_identify (this) && flag [FLAG_IDENTIFIED])	1211	if (need_identify (this) && flag [FLAG_IDENTIFIED])
1165	buf << "The object has a story:\r";	1212	buf << "The object has a story:\r";
1166		1213
1167	buf << msg << '\n';	1214	buf << msg << '\n';
		1215	}
		1216	}
		1217	else if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
		1218	&& (type == SPELLBOOK \|\| type == ROD \|\| type == WAND
		1219	\|\| type == ROD \|\| type == POTION \|\| type == SCROLL))
		1220	// for spellbooks and other stuff that contains spells, print the spell message,
		1221	// unless the object has a custom message handled above.
		1222	buf << '\r' << inv->msg << '\n';
		1223
		1224	// try to display the duration for some potions and scrolls
		1225	// this includes change ability potions and group spells,
		1226	// but does not handle protection potions
		1227	if (inv && inv->type == SPELL && flag [FLAG_IDENTIFIED]
		1228	&& (type == POTION \|\| type == SCROLL))
		1229	{
		1230	object *spell = inv;
		1231
		1232	if (spell->subtype == SP_PARTY_SPELL)
		1233	spell = spell->other_arch;
		1234
		1235	if (spell->subtype == SP_CHANGE_ABILITY)
		1236	buf.printf ("\nH<The effect will last about %.10g seconds.>",
		1237	TICK2TIME (change_ability_duration (spell, this)));
1168	}	1238	}
1169		1239
1170	buf << '\n';	1240	buf << '\n';
		1241
		1242	// the dungeon master additionally gets a complete dump
		1243	if (who && who->flag [FLAG_WIZLOOK])
		1244	{
		1245	buf << "\nT<Object>\n";
		1246	describe_dump_object (buf, this);
		1247
		1248	if (inv)
		1249	{
		1250	buf << "\nT<Top Inventory>\n";
		1251	describe_dump_object (buf, inv);
		1252	}
		1253	}
1171		1254
1172	return std::string (buf.linearise (), buf.size ());	1255	return std::string (buf.linearise (), buf.size ());
1173	}	1256	}
1174		1257
1175	static void	1258	static void
1176	display_new_pickup (object *op)	1259	display_new_pickup (object *op)
1177	{	1260	{
1178	int i = op->contr->mode;	1261	int i = op->contr->mode;
1179		1262
1180	if (!(i & PU_NEWMODE))
1181	return;
1182
1183	new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1184	new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);	1263	new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);
1185	new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);	1264	new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);
1186	new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);	1265	new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1187		1266
1188	new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);	1267	new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
…		…
1239	};	1318	};
1240		1319
1241	if (!params)	1320	if (!params)
1242	{	1321	{
1243	/* if the new mode is used, just print the settings */	1322	/* if the new mode is used, just print the settings */
1244	if (op->contr->mode & PU_NEWMODE)
1245	{
1246	display_new_pickup (op);	1323	display_new_pickup (op);
1247	return 1;
1248	}
1249	if (1)
1250	LOG (llevDebug, "command_pickup: !params\n");
1251	set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1252	return 0;	1324	return 0;
1253	}	1325	}
1254		1326
1255	while (params == ' ' && params)	1327	while (params == ' ' && params)
1256	params++;	1328	params++;
…		…
1262	for (mode = 0; names[mode]; mode++)	1334	for (mode = 0; names[mode]; mode++)
1263	{	1335	{
1264	if (!strcmp (names[mode], params + 1))	1336	if (!strcmp (names[mode], params + 1))
1265	{	1337	{
1266	i = op->contr->mode;	1338	i = op->contr->mode;
1267	if (!(i & PU_NEWMODE))	1339
1268	i = PU_NEWMODE;
1269	if (*params == '+')	1340	if (*params == '+')
1270	i = i \| modes[mode];	1341	i = i \| modes[mode];
1271	else	1342	else
1272	i = i & ~modes[mode];	1343	i = i & ~modes[mode];
		1344
1273	op->contr->mode = i;	1345	op->contr->mode = i;
1274	display_new_pickup (op);	1346	display_new_pickup (op);
1275	return 1;	1347	return 1;
1276	}	1348	}
1277	}	1349	}
…		…
1279	return 1;	1351	return 1;
1280	}	1352	}
1281		1353
1282	if (sscanf (params, "%u", &i) != 1)	1354	if (sscanf (params, "%u", &i) != 1)
1283	{	1355	{
1284	if (1)
1285	LOG (llevDebug, "command_pickup: params==NULL\n");
1286	new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <0-7> or <value_density> .");	1356	new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1287	return 1;	1357	return 1;
1288	}	1358	}
1289	set_pickup_mode (op, i);	1359
		1360	if (i <= PU_RATIO)
		1361	i \|= op->contr->mode & ~PU_RATIO;
		1362
		1363	op->contr->mode = i;
1290		1364
1291	return 1;	1365	return 1;
1292	}
1293
1294	void
1295	set_pickup_mode (object *op, int i)
1296	{
1297	switch (op->contr->mode = i)
1298	{
1299	case 0:
1300	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1301	break;
1302	case 1:
1303	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1304	break;
1305	case 2:
1306	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1307	break;
1308	case 3:
1309	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1310	break;
1311	case 4:
1312	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1313	break;
1314	case 5:
1315	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1316	break;
1317	case 6:
1318	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1319	break;
1320	case 7:
1321	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1322	break;
1323	}
1324	}	1366	}
1325		1367
1326	int	1368	int
1327	command_search_items (object op, char params)	1369	command_search_items (object op, char params)
1328	{	1370	{
1329	char buf[MAX_BUF];	1371	char buf[MAX_BUF];
1330		1372
1331	if (settings.search_items == FALSE)
1332	return 1;
1333
1334	if (params == NULL)	1373	if (params == NULL)
1335	{	1374	{
1336	if (op->contr->search_str[0] == '\0')	1375	if (op->contr->search_str[0] == '\0')
1337	{	1376	{
1338	new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1");	1377	new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1339	new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");	1378	new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1340	new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");	1379	new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1341	return 1;	1380	return 1;
1342	}	1381	}
1343		1382
…		…
1345	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");	1384	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1346	op->update_stats ();	1385	op->update_stats ();
1347	return 1;	1386	return 1;
1348	}	1387	}
1349		1388
1350	if ((int) strlen (params) >= MAX_BUF)	1389	if (strlen (params) >= MAX_BUF)
1351	{	1390	{
1352	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");	1391	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1353	return 1;	1392	return 1;
1354	}	1393	}
1355		1394
1356	strcpy (op->contr->search_str, params);	1395	strcpy (op->contr->search_str, params);
1357	sprintf (buf, "Searching for '%s'.", op->contr->search_str);	1396	sprintf (buf, "Now searching for '%s'.", op->contr->search_str);
1358	new_draw_info (NDI_UNIQUE, 0, op, buf);	1397	new_draw_info (NDI_UNIQUE, 0, op, buf);
1359	op->update_stats ();	1398	op->update_stats ();
		1399
1360	return 1;	1400	return 1;
1361	}	1401	}
1362		1402

Diff Legend

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

Comparing deliantra/server/server/c_object.C (file contents): Revision 1.80 by elmex, Sun Oct 5 12:40:21 2008 UTC vs. Revision 1.97 by root, Mon Oct 12 14:00:59 2009 UTC

Diff Legend

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.80 by elmex, Sun Oct 5 12:40:21 2008 UTC vs.
Revision 1.97 by root, Mon Oct 12 14:00:59 2009 UTC