ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/server/c_object.C

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.25 by root, Tue Dec 12 21:39:57 2006 UTC vs.
Revision 1.89 by elmex, Mon Jan 12 00:17:23 2009 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
8	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
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
		21	* The authors can be reached via e-mail to <support@deliantra.net>
		22	*/
20		23
21	The author can be reached via e-mail to <crossfire@schmorp.de>	24	/*
22
23	Object (handling) commands	25	* Object (handling) commands
24	*/	26	*/
25		27
26	#include <global.h>	28	#include <global.h>
27	#include <loader.h>	29	#include <loader.h>
28	#include <skills.h>	30	#include <skills.h>
29	#ifndef __CEXTRACT__
30	# include <sproto.h>	31	#include <sproto.h>
31	#endif
32	#include <living.h>	32	#include <living.h>
33	#include <math.h>	33	#include <math.h>
34		34
35	/*	35	/*
36	* Object id parsing functions	36	* Object id parsing functions
…		…
56	* only unapply applied, or apply unapplied objects	56	* only unapply applied, or apply unapplied objects
57	**/	57	**/
58	static object *	58	static object *
59	find_best_apply_object_match (object *pl, const char *params, enum apply_flag aflag)	59	find_best_apply_object_match (object *pl, const char *params, enum apply_flag aflag)
60	{	60	{
61	object *tmp, *best = NULL;	61	object *best = 0;
62	int match_val = 0, tmpmatch;	62	int match_val = 0;
63		63
64	for (tmp = pl->inv; tmp; tmp = tmp->below)	64	for (object *tmp = pl->inv; tmp; tmp = tmp->below)
65	{	65	{
66	if (tmp->invisible)	66	if (tmp->invisible)
67	continue;	67	continue;
		68
68	if ((tmpmatch = item_matched_string (pl, tmp, params)) > match_val)	69	int tmpmatch = item_matched_string (pl, tmp, params);
		70
		71	if (tmpmatch > match_val)
69	{	72	{
70	if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED)))	73	if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED)))
71	continue;	74	continue;
		75
72	if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED)))	76	if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED)))
73	continue;	77	continue;
		78
74	match_val = tmpmatch;	79	match_val = tmpmatch;
75	best = tmp;	80	best = tmp;
76	}	81	}
77	}	82	}
		83
78	return best;	84	return best;
79	}	85	}
80		86
81	/**	87	/**
82	* Shortcut to find_best_apply_object_match(pl, params, AF_NULL);	88	* Shortcut to find_best_apply_object_match(pl, params, AF_NULL);
83	**/	89	**/
84	object *	90	object *
85	find_best_object_match (object *pl, const char *params)	91	find_best_object_match (object *pl, const char *params)
86	{	92	{
87	return find_best_apply_object_match (pl, params, AP_NULL);	93	return find_best_apply_object_match (pl, params, AP_TOGGLE);
		94	}
		95
		96	static bool
		97	can_split (object *pl, object *&op, sint32 nrof)
		98	{
		99	if (object *tmp = op->split (nrof ? nrof : op->number_of ()))
		100	{
		101	op = tmp;
		102	return true;
		103	}
		104	else
		105	{
		106	if (op->nrof > 1)
		107	new_draw_info_format (NDI_UNIQUE, 0, pl, "There are only %d %s.", op->nrof, &op->name_pl);
		108	else
		109	new_draw_info_format (NDI_UNIQUE, 0, pl, "There is only one %s.", &op->name);
		110
		111	return false;
		112	}
88	}	113	}
89		114
90	int	115	int
91	command_uskill (object *pl, char *params)	116	command_uskill (object *pl, char *params)
92	{	117	{
93	if (!params)	118	if (!params)
94	{	119	{
95	new_draw_info (NDI_UNIQUE, 0, pl, "Usage: use_skill <skill name>");	120	new_draw_info (NDI_UNIQUE, 0, pl, "Usage: use_skill <skill name>");
96	return 0;	121	return 0;
97	}	122	}
		123
98	return use_skill (pl, params);	124	return use_skill (pl, params);
99	}	125	}
100		126
101	int	127	int
102	command_rskill (object *pl, char *params)	128	command_rskill (object *pl, char *params)
…		…
106	if (!params)	132	if (!params)
107	{	133	{
108	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>");
109	return 0;	135	return 0;
110	}	136	}
		137
111	skill = find_skill_by_name (pl, params);	138	skill = find_skill_by_name_fuzzy (pl, params);
112		139
113	if (!skill)	140	if (!skill)
114	{	141	{
115	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);
116	return 0;	143	return 0;
117	}	144	}
118	return change_skill (pl, skill, 0);
119	}
120		145
121		146	pl->change_skill (0);
122	/* These functions (command_search, command_disarm) are really just wrappers for	147	apply_special (pl, skill, AP_APPLY);
123	* things like 'use_skill ...'). In fact, they should really be obsoleted	148	return 1;
124	* and replaced with those.
125	*/
126	int
127	command_search (object *op, char *params)
128	{
129	return use_skill (op, skill_names[SK_FIND_TRAPS]);
130	}	149	}
131
132	int
133	command_disarm (object *op, char *params)
134	{
135	return use_skill (op, skill_names[SK_DISARM_TRAPS]);
136	}
137
138		150
139	/* 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
140	* as it includes the object to throw.	152	* as it includes the object to throw.
141	*/	153	*/
142	int	154	int
143	command_throw (object *op, char *params)	155	command_throw (object *op, char *params)
144	{	156	{
145	object *skop;
146
147	skop = find_skill_by_name (op, skill_names[SK_THROWING]);	157	if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING]))
148	if (skop)
149	return do_skill (op, op, skop, op->facing, params);	158	return do_skill (op, op, skop, op->facing, params);
150	else	159	else
151	{
152	new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing.");	160	new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing.");
153	}	161
154	return 0;	162	return 0;
155	}	163	}
156
157		164
158	int	165	int
159	command_apply (object *op, char *params)	166	command_apply (object *op, char *params)
160	{	167	{
161	if (!params)	168	if (!params)
…		…
163	player_apply_below (op);	170	player_apply_below (op);
164	return 0;	171	return 0;
165	}	172	}
166	else	173	else
167	{	174	{
168	apply_flag aflag = (apply_flag) 0;	175	apply_flag aflag = (apply_flag)0;
169	object *inv;
170		176
171	while (*params == ' ')	177	while (*params == ' ')
172	params++;	178	params++;
		179
173	if (!strncmp (params, "-a ", 3))	180	if (!strncmp (params, "-a ", 3))
174	{	181	{
175	aflag = AP_APPLY;	182	aflag = AP_APPLY;
176	params += 3;	183	params += 3;
177	}	184	}
		185
178	if (!strncmp (params, "-u ", 3))	186	if (!strncmp (params, "-u ", 3))
179	{	187	{
180	aflag = AP_UNAPPLY;	188	aflag = AP_UNAPPLY;
181	params += 3;	189	params += 3;
182	}	190	}
		191
183	while (*params == ' ')	192	while (*params == ' ')
184	params++;	193	params++;
185		194
186	inv = find_best_apply_object_match (op, params, aflag);	195	if (object *inv = find_best_apply_object_match (op, params, aflag))
187	if (inv)
188	{
189	player_apply (op, inv, aflag, 0);	196	player_apply (op, inv, aflag, 0);
190	}
191	else	197	else
192	new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params);	198	new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params);
193	}	199	}
		200
194	return 0;	201	return 0;
195	}	202	}
196		203
197	/*	204	/*
198	* Check if an item op can be put into a sack. If pl exists then tell	205	* Check if an item op can be put into a sack. If pl exists then tell
…		…
204	* not need to use split_ob and stuff.	211	* not need to use split_ob and stuff.
205	*/	212	*/
206	int	213	int
207	sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)	214	sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
208	{	215	{
209
210	if (!QUERY_FLAG (sack, FLAG_APPLIED))	216	if (!QUERY_FLAG (sack, FLAG_APPLIED))
211	{	217	{
212	new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack));	218	new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack));
213	return 0;	219	return 0;
214	}	220	}
		221
215	if (sack == op)	222	if (sack == op)
216	{	223	{
217	new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack));	224	new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack));
218	return 0;	225	return 0;
219	}	226	}
		227
220	if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type)))	228	if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type)))
221	{	229	{
222	new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack));	230	new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack));
223	return 0;	231	return 0;
224	}	232	}
		233
225	if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)	234	if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
226	{	235	{
227	new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack));	236	new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack));
228	return 0;	237	return 0;
229	}	238	}
		239
230	if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) *	240	if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) *
231	(op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))	241	(op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
232	* (100 - sack->stats.Str) / 100) > sack->weight_limit)	242	* (100 - sack->stats.Str) / 100) > sack->weight_limit)
233	{	243	{
234	new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));	244	new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));
235	return 0;	245	return 0;
236	}	246	}
		247
237	/* All other checks pass, must be OK */	248	/* All other checks pass, must be OK */
238	return 1;	249	return 1;
239	}	250	}
240		251
241	/* Pick up commands follow */	252	/* Pick up commands follow */
…		…
246	* pick up (0 means all of them)	257	* pick up (0 means all of them)
247	*/	258	*/
248	static void	259	static void
249	pick_up_object (object *pl, object *op, object *tmp, int nrof)	260	pick_up_object (object *pl, object *op, object *tmp, int nrof)
250	{	261	{
251	/* buf needs to be big (more than 256 chars) because you can get
252	* very long item names.
253	*/
254	char buf[HUGE_BUF];
255	object *env = tmp->env;	262	object *env = tmp->env;
256	uint32 weight, effective_weight_limit;	263	uint32 weight, effective_weight_limit;
257	int tmp_nrof = tmp->nrof ? tmp->nrof : 1;	264	int tmp_nrof = tmp->number_of ();
258		265
259	/* IF the player is flying & trying to take the item out of a container	266	/* IF the player is flying & trying to take the item out of a container
260	* that is in his inventory, let him. tmp->env points to the container	267	* that is in his inventory, let him. tmp->env points to the container
261	* (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
262	* containers not allowed as of now)	269	* containers not allowed as of now)
263	*/	270	*/
264	if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && is_player_inv (tmp) != pl)	271	if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
265	{	272	{
266	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.>");
267	return;	276	return;
268	}	277	}
269		278
270	if (QUERY_FLAG (tmp, FLAG_NO_DROP))	279	if (QUERY_FLAG (tmp, FLAG_NO_DROP))
271	return;	280	return;
272		281
273	if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
274	{
275	new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff of smoke!");
276	new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
277
278	if (pl->type == PLAYER)
279	esrv_del_item (pl->contr, tmp->count);
280
281	tmp->destroy ();
282	return;
283	}
284
285	if (nrof > tmp_nrof || nrof == 0)	282	if (nrof > tmp_nrof || nrof <= 0)
286	nrof = tmp_nrof;	283	nrof = tmp_nrof;
287		284
288	/* Figure out how much weight this object will add to the player */	285	/* Figure out how much weight this object will add to the player */
289	weight = tmp->weight * nrof;	286	weight = tmp->weight * nrof;
290	if (tmp->inv)	287	if (tmp->inv)
291	weight += tmp->carrying * (100 - tmp->stats.Str) / 100;	288	weight += tmp->carrying * (100 - tmp->stats.Str) / 100;
292		289
293	if (pl->stats.Str <= MAX_STAT)
294	effective_weight_limit = weight_limit[pl->stats.Str];	290	effective_weight_limit = weight_limit [min (MAX_STAT, pl->stats.Str)];
295	else
296	effective_weight_limit = weight_limit[MAX_STAT];
297		291
298	if ((pl->weight + pl->carrying + weight) > effective_weight_limit)	292	if ((pl->weight + pl->carrying + weight) > effective_weight_limit)
299	{	293	{
300	new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");	294	new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");
301	return;	295	return;
302	}	296	}
303		297
304	if (settings.real_wiz == FALSE && QUERY_FLAG (pl, FLAG_WAS_WIZ))	298	if (!can_split (pl, tmp, nrof))
305	SET_FLAG (tmp, FLAG_WAS_WIZ);
306
307	if (nrof != tmp_nrof)
308	{
309	object *tmp2 = tmp;
310
311	tmp = get_split_ob (tmp, nrof);
312	if (!tmp)
313	{
314	new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
315	return;	299	return;
316	}
317		300
318	/* Tell a client what happened rest of objects */	301	if (QUERY_FLAG (tmp, FLAG_UNPAID))
319	if (pl->type == PLAYER)	302	{
320	{	303	tmp->flag.reset (FLAG_UNPAID);
321	if (tmp2->destroyed ())	304	new_draw_info_format (NDI_UNIQUE, 0, pl, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
322	esrv_del_item (pl->contr, tmp2->count);	305	tmp->flag.set (FLAG_UNPAID);
323	else
324	esrv_send_item (pl, tmp2);
325	}
326	}	306	}
327	else	307	else
328	{	308	new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
329	/* If the object is in a container, send a delete to the client.
330	* - we are moving all the items from the container to elsewhere,
331	* so it needs to be deleted.
332	*/
333	if (!QUERY_FLAG (tmp, FLAG_REMOVED))
334	{
335	if (tmp->env && pl->type == PLAYER)
336	esrv_del_item (pl->contr, tmp->count);
337	tmp->remove (); /* Unlink it */
338	}
339	}
340	if (QUERY_FLAG (tmp, FLAG_UNPAID))
341	(void) sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
342	else
343	(void) sprintf (buf, "You pick up the %s.", query_name (tmp));
344	new_draw_info (NDI_UNIQUE, 0, pl, buf);
345		309
346	tmp = insert_ob_in_ob (tmp, op);	310	op->insert (tmp);
347
348	/* All the stuff below deals with client/server code, and is only
349	* usable by players
350	*/
351	if (pl->type != PLAYER)
352	return;
353
354	esrv_send_item (pl, tmp);
355	/* These are needed to update the weight for the container we
356	* are putting the object in.
357	*/
358	if (op != pl)
359	{
360	esrv_update_item (UPD_WEIGHT, pl, op);
361	esrv_send_item (pl, pl);
362	}
363
364	/* Update the container the object was in */
365	if (env && env != pl && env != op)
366	esrv_update_item (UPD_WEIGHT, pl, env);
367	}	311	}
368		312
369	/* modified slightly to allow monsters use this -b.t. 5-31-95 */	313	/* modified slightly to allow monsters use this -b.t. 5-31-95 */
370	void	314	void
371	pick_up (object *op, object *alt)	315	pick_up (object *op, object *alt)
…		…
381	if (!can_pick (op, alt))	325	if (!can_pick (op, alt))
382	{	326	{
383	new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name);	327	new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name);
384	goto leave;	328	goto leave;
385	}	329	}
		330
386	tmp = alt;	331	tmp = alt;
387	}	332	}
388	else	333	else
389	{	334	{
390	if (op->below == NULL || !can_pick (op, op->below))	335	if (op->below == NULL || !can_pick (op, op->below))
…		…
399	/* Try to catch it. */	344	/* Try to catch it. */
400	tmp_map = tmp->map;	345	tmp_map = tmp->map;
401	tmp = stop_item (tmp);	346	tmp = stop_item (tmp);
402	if (tmp == NULL)	347	if (tmp == NULL)
403	goto leave;	348	goto leave;
		349
404	need_fix_tmp = 1;	350	need_fix_tmp = 1;
405	if (!can_pick (op, tmp))	351	if (!can_pick (op, tmp))
406	goto leave;	352	goto leave;
407		353
408	if (op->type == PLAYER)	354	if (op->type == PLAYER)
…		…
413	}	359	}
414	else	360	else
415	count = tmp->nrof;	361	count = tmp->nrof;
416		362
417	/* container is open, so use it */	363	/* container is open, so use it */
		364	if (tmp->flag [FLAG_STARTEQUIP])
		365	alt = op;
418	if (op->container)	366	else if (op->container)
419	{	367	{
420	alt = op->container;	368	alt = op->container;
421	if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))	369	if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
422	goto leave;	370	goto leave;
423	}	371	}
…		…
430		378
431	if (!alt)	379	if (!alt)
432	for (alt = op->inv; alt; alt = alt->below)	380	for (alt = op->inv; alt; alt = alt->below)
433	if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count))	381	if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count))
434	break; /* General container comes next */	382	break; /* General container comes next */
		383
435	if (!alt)	384	if (!alt)
436	alt = op; /* No free containers */	385	alt = op; /* No free containers */
437	}	386	}
438		387
439	if (tmp->env == alt)	388	if (tmp->env == alt)
…		…
441	/* here it could be possible to check rent,	390	/* here it could be possible to check rent,
442	* if someone wants to implement it	391	* if someone wants to implement it
443	*/	392	*/
444	alt = op;	393	alt = op;
445	}	394	}
		395
446	#ifdef PICKUP_DEBUG	396	#ifdef PICKUP_DEBUG
447	LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);	397	LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
448	#endif	398	#endif
449		399
450	/* startequip items are not allowed to be put into containers: */	400	/* startequip items are not allowed to be put into containers: */
…		…
466		416
467	leave:	417	leave:
468	if (need_fix_tmp)	418	if (need_fix_tmp)
469	fix_stopped_item (tmp, tmp_map, op);	419	fix_stopped_item (tmp, tmp_map, op);
470	}	420	}
471
472		421
473	/* This takes (picks up) and item. op is the player	422	/* This takes (picks up) and item. op is the player
474	* who issued the command. params is a string to	423	* who issued the command. params is a string to
475	* match against the item name. Basically, always	424	* match against the item name. Basically, always
476	* returns zero, but that should be improved.	425	* returns zero, but that should be improved.
…		…
491		440
492	if (!tmp)	441	if (!tmp)
493	tmp = op->below;	442	tmp = op->below;
494	}	443	}
495		444
496	if (tmp == NULL)	445	if (!tmp)
497	{	446	{
498	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!");	447	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!");
499	return 0;	448	return 0;
500	}	449	}
501		450
502	/* Makes processing easier */	451	/* Makes processing easier */
503	if (params && *params == '\0')	452	if (params && *params == '\0')
504	params = NULL;	453	params = 0;
		454
		455	int cnt = MAX_ITEM_PER_DROP;
505		456
506	while (tmp)	457	while (tmp)
507	{	458	{
508	next = tmp->below;	459	next = tmp->below;
509		460
510	if (tmp->invisible)	461	if (tmp->invisible)
511	{	462	{
512	tmp = next;	463	tmp = next;
513	continue;	464	continue;
514	}	465	}
		466
515	/* This following two if and else if could be merged into line	467	/* This following two if and else if could be merged into line
516	* but that probably will make it more difficult to read, and	468	* but that probably will make it more difficult to read, and
517	* not make it any more efficient	469	* not make it any more efficient
518	*/	470	*/
519	if (params && item_matched_string (op, tmp, params))	471	if (params && item_matched_string (op, tmp, params))
520	{	472	{
		473	if (--cnt < 0) break;
521	pick_up (op, tmp);	474	pick_up (op, tmp);
522	}	475	}
523	else if (can_pick (op, tmp) && !params)	476	else if (can_pick (op, tmp) && !params)
524	{	477	{
		478	if (--cnt < 0) break;
525	pick_up (op, tmp);	479	pick_up (op, tmp);
526	break;	480	break;
527	}	481	}
		482
528	tmp = next;	483	tmp = next;
529	/* Might as well just skip over the player immediately -	484	}
530	* we know it can't be picked up	485
531	*/	486	if (cnt < 0)
532	if (tmp == op)
533	tmp = tmp->below;
534	}	487	{
		488	op->failmsg ("Couldn't pick up so many items at once.");
		489	return 0;
		490	}
		491
535	if (!params && !tmp)	492	if (!params && !tmp)
536	{	493	{
537	for (tmp = op->below; tmp != NULL; tmp = tmp->next)	494	for (tmp = op->below; tmp; tmp = tmp->below)
538	if (!tmp->invisible)	495	if (!tmp->invisible)
539	{	496	{
540	char buf[MAX_BUF];
541
542	sprintf (buf, "You can't pick up a %s.", &tmp->name);	497	new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up a %s.", &tmp->name);
543	new_draw_info (NDI_UNIQUE, 0, op, buf);
544	break;	498	break;
545	}	499	}
		500
546	if (!tmp)	501	if (!tmp)
547	new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");	502	new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");
548	}	503	}
		504
549	return 0;	505	return 0;
550	}	506	}
551		507
552
553	/*	508	/*
554	* This function was part of drop, now is own function.	509	* This function was part of drop, now is own function.
555	* Player 'op' tries to put object 'tmp' into sack 'sack',	510	* Player 'op' tries to put object 'tmp' into sack 'sack',
556	* 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	*
557	* Note that the 'sack' in question can now be a transport,	513	* Note that the 'sack' in question can now be a transport,
558	* so this function isn't named very good anymore.	514	* so this function isn't named very good anymore.
559	*/	515	*/
560	void	516	void
561	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)
…		…
572	return;	528	return;
573	}	529	}
574		530
575	if (tmp->type == CONTAINER && tmp->inv)	531	if (tmp->type == CONTAINER && tmp->inv)
576	{	532	{
577
578	/* Eneq(@csd.uu.se): If the object to be dropped is a container	533	/* Eneq(@csd.uu.se): If the object to be dropped is a container
579	* we instead move the contents of that container into the active	534	* we instead move the contents of that container into the active
580	* container, this is only done if the object has something in it.	535	* container, this is only done if the object has something in it.
581	*/	536	*/
582	sack2 = tmp;	537	sack2 = tmp;
…		…
585	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)	540	for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
586	{	541	{
587	tmp = tmp2->below;	542	tmp = tmp2->below;
588		543
589	if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof)))	544	if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof)))
590	{
591	put_object_in_sack (op, sack, tmp2, 0);	545	put_object_in_sack (op, sack, tmp2, 0);
592	}
593	else	546	else
594	{	547	{
595	sprintf (buf, "Your %s fills up.", query_name (sack));	548	sprintf (buf, "Your %s fills up.", query_name (sack));
596	new_draw_info (NDI_UNIQUE, 0, op, buf);	549	new_draw_info (NDI_UNIQUE, 0, op, buf);
597	break;	550	break;
598	}	551	}
599	}	552	}
600		553
601	esrv_update_item (UPD_WEIGHT, op, sack2);
602	return;	554	return;
603	}	555	}
604		556
605	/* Don't worry about this for containers - our caller should have	557	/* Don't worry about this for containers - our caller should have
606	* already checked this.	558	* already checked this.
…		…
611	if (QUERY_FLAG (tmp, FLAG_APPLIED))	563	if (QUERY_FLAG (tmp, FLAG_APPLIED))
612	if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))	564	if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
613	return;	565	return;
614		566
615	/* we want to put some portion of the item into the container */	567	/* we want to put some portion of the item into the container */
616	if (nrof && tmp->nrof != nrof)	568	if (!can_split (op, tmp, nrof))
617	{
618	object *tmp2 = tmp;
619
620	tmp = get_split_ob (tmp, nrof);
621
622	if (!tmp)
623	{
624	new_draw_info (NDI_UNIQUE, 0, op, errmsg);
625	return;	569	return;
626	}
627	/* Tell a client what happened other objects */
628	if (tmp2->destroyed ())
629	esrv_del_item (op->contr, tmp2->count);
630	else /* this can proably be replaced with an update */
631	esrv_send_item (op, tmp2);
632	}
633	else
634	tmp->remove ();
635		570
636	new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));	571	new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
637	tmp2 = insert_ob_in_ob (tmp, sack);	572	sack->insert (tmp);
638	fix_player (op); /* This is overkill, fix_player() is called somewhere */
639	/* in object.c */
640
641	/* If an object merged (and thus, different object), we need to
642	* delete the original.
643	*/
644	if (tmp2 != tmp)
645	esrv_del_item (op->contr, tmp->count);
646
647	esrv_send_item (op, tmp2);
648
649	/* update the sacks weight */
650	esrv_update_item (UPD_WEIGHT, op, sack);
651	}	573	}
652		574
653	/*	575	/*
654	* This function was part of drop, now is own function.	576	* This function was part of drop, now is own function.
655	* Player 'op' tries to drop object 'tmp', if tmp is non zero, then	577	* Player 'op' tries to drop object 'tmp', if tmp is non zero, then
…		…
657	* This is used when dropping objects onto the floor.	579	* This is used when dropping objects onto the floor.
658	*/	580	*/
659	void	581	void
660	drop_object (object *op, object *tmp, uint32 nrof)	582	drop_object (object *op, object *tmp, uint32 nrof)
661	{	583	{
662	char buf[MAX_BUF];
663	object *floor;
664
665	if (QUERY_FLAG (tmp, FLAG_NO_DROP))	584	if (QUERY_FLAG (tmp, FLAG_NO_DROP))
666	return;	585	return;
667		586
668	if (QUERY_FLAG (tmp, FLAG_APPLIED))	587	if (QUERY_FLAG (tmp, FLAG_APPLIED))
669	if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))	588	if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
670	return; /* can't unapply it */	589	return; /* can't unapply it */
671		590
		591	//fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
		592
672	/* 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
673	* off	594	* off
674	*/	595	*/
675	if (nrof && tmp->nrof != nrof)	596	if (!can_split (op, tmp, nrof))
676	{
677	object *tmp2 = tmp;
678
679	tmp = get_split_ob (tmp, nrof);
680	if (!tmp)
681	{
682	new_draw_info (NDI_UNIQUE, 0, op, errmsg);
683	return;
684	}
685	/* Tell a client what happened rest of objects. tmp2 is now the
686	* original object
687	*/
688	if (op->type == PLAYER)
689	{
690	if (tmp2->destroyed ())
691	esrv_del_item (op->contr, tmp2->count);
692	else
693	esrv_send_item (op, tmp2);
694	}
695	}
696	else
697	tmp->remove ();
698
699	if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
700	return;	597	return;
701		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
702	if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))	628	if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
703	{	629	{
704	sprintf (buf, "You drop the %s.", query_name (tmp));	630	dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
705	new_draw_info (NDI_UNIQUE, 0, op, buf);	631	dropper->statusmsg ("The god who lent it to you retrieves it.");
706	new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it.");	632
707	if (op->type == PLAYER)
708	esrv_del_item (op->contr, tmp->count);
709	tmp->destroy ();	633	obj->destroy ();
710	fix_player (op);	634	dropper->update_stats ();
711	return;	635	return;
712	}	636	}
713		637
714	/* If SAVE_INTERVAL is commented out, we never want to save	638	for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
715	* the player here.	639	floor;
716	*/	640	floor = floor->above)
717	#ifdef SAVE_INTERVAL	641	if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
718	/* I'm not sure why there is a value check - since the save	642	return;
719	* is done every SAVE_INTERVAL seconds, why care the value	643
720	* of what he is dropping?	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:
721	*/	653	*/
722	if (op->type == PLAYER && !QUERY_FLAG (tmp, FLAG_UNPAID) &&
723	(tmp->nrof ? tmp->value * tmp->nrof : tmp->value > 2000) && (op->contr->last_save_time + SAVE_INTERVAL) <= time (NULL))
724	{
725	save_player (op, 1);
726	op->contr->last_save_time = time (NULL);
727	}
728	#endif /* SAVE_INTERVAL */
729		654
730	if (op->type == PLAYER)	655	obj->x = dropper->x;
731	esrv_del_item (op->contr, tmp->count);	656	obj->y = dropper->y;
732		657
733	/* Call this before we update the various windows/players. At least
734	* that we, we know the weight is correct.
735	*/
736	fix_player (op); /* This is overkill, fix_player() is called somewhere */
737	/* in object.c */
738
739	if (op->type == PLAYER)
740	{
741	op->contr->socket.update_look = 1;
742	/* Need to update the weight for the player */
743	esrv_send_item (op, op);
744	}
745
746	for (floor = get_map_ob (op->map, op->x, op->y); floor; floor = floor->above)
747	if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
748	return;
749
750	if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
751	sell_item (tmp, op);
752
753	tmp->x = op->x;
754	tmp->y = op->y;
755
756	insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);	658	insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
757	}	659	}
758		660
759	void	661	void
760	drop (object *op, object *tmp)	662	drop (object *op, object *tmp)
761	{	663	{
…		…
770	if (tmp->env && tmp->env->type != PLAYER)	672	if (tmp->env && tmp->env->type != PLAYER)
771	{	673	{
772	/* Just toss the object - probably shouldn't be hanging	674	/* Just toss the object - probably shouldn't be hanging
773	* around anyways	675	* around anyways
774	*/	676	*/
775	tmp->remove ();
776	tmp->destroy ();	677	tmp->destroy ();
777	return;	678	return;
778	}	679	}
779	else	680	else
780	{	681	{
781	while (tmp != NULL && tmp->invisible)	682	while (tmp && tmp->invisible)
782	tmp = tmp->below;	683	tmp = tmp->below;
783	}	684	}
784	}	685	}
785		686
786	if (tmp == NULL)	687	if (tmp == NULL)
787	{	688	{
788	new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");	689	new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
789	return;	690	return;
790	}	691	}
		692
791	if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))	693	if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
792	{	694	{
793	new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");	695	new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
794	return;	696	return;
795	}	697	}
		698
796	if (QUERY_FLAG (tmp, FLAG_NO_DROP))	699	if (QUERY_FLAG (tmp, FLAG_NO_DROP))
797	{	700	{
798	#if 0	701	#if 0
799	/* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */	702	/* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
800	new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");	703	new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
801	#endif	704	#endif
802	return;	705	return;
803	}	706	}
804		707
805	if (op->type == PLAYER)	708	if (op->type == PLAYER && op->contr->last_used == tmp)
806	{	709	op->contr->last_used = tmp->below ? tmp->below
807	if (op->contr->last_used == tmp && op->contr->last_used_id == tmp->count)	710	: tmp->above ? tmp->above
808	{	711	: 0;
809	object *n = NULL;
810
811	if (tmp->below != NULL)
812	n = tmp->below;
813	else if (tmp->above != NULL)
814	n = tmp->above;
815	op->contr->last_used = n;
816	if (n != NULL)
817	op->contr->last_used_id = n->count;
818	else
819	op->contr->last_used_id = 0;
820	}
821	};
822		712
823	if (op->container)	713	if (op->container)
824	{	714	{
825	if (op->type == PLAYER)	715	if (op->type == PLAYER)
826	{
827	put_object_in_sack (op, op->container, tmp, op->contr->count);	716	put_object_in_sack (op, op->container, tmp, op->contr->count);
828	}
829	else	717	else
830	{
831	put_object_in_sack (op, op->container, tmp, 0);	718	put_object_in_sack (op, op->container, tmp, 0);
832	};
833	}	719	}
834	else	720	else
835	{	721	{
836	if (op->type == PLAYER)	722	if (op->type == PLAYER)
837	{
838	drop_object (op, tmp, op->contr->count);	723	drop_object (op, tmp, op->contr->count);
839	}
840	else	724	else
841	{
842	drop_object (op, tmp, 0);	725	drop_object (op, tmp, 0);
843	};
844	}	726	}
		727
845	if (op->type == PLAYER)	728	if (op->type == PLAYER)
846	op->contr->count = 0;	729	op->contr->count = 0;
847	}	730	}
848
849
850		731
851	/* Command will drop all items that have not been locked */	732	/* Command will drop all items that have not been locked */
852	int	733	int
853	command_dropall (object *op, char *params)	734	command_dropall (object *op, char *params)
854	{	735	{
855		736
856	object *curinv, *nextinv;
857
858	if (op->inv == NULL)	737	if (op->inv == NULL)
859	{	738	{
860	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");	739	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
861	return 0;	740	return 0;
862	}	741	}
863		742
864	curinv = op->inv;	743	object *curinv = op->inv;
		744	object *nextinv;
865		745
866	/*	746	/*
867	This is the default. Drops everything not locked or considered	747	This is the default. Drops everything not locked or considered
868	not something that should be dropped.	748	not something that should be dropped.
869	*/	749	*/
…		…
871	Care must be taken that the next item pointer is not to money as	751	Care must be taken that the next item pointer is not to money as
872	the drop() routine will do unknown things to it when dropping	752	the drop() routine will do unknown things to it when dropping
873	in a shop. --Tero.Pelander@utu.fi	753	in a shop. --Tero.Pelander@utu.fi
874	*/	754	*/
875		755
876	if (params == NULL)	756	int cnt = MAX_ITEM_PER_DROP;
		757
		758	if (!params)
877	{	759	{
878	while (curinv != NULL)	760	while (curinv)
879	{	761	{
880	nextinv = curinv->below;	762	nextinv = curinv->below;
		763
881	while (nextinv && nextinv->type == MONEY)	764	while (nextinv && nextinv->type == MONEY)
882	nextinv = nextinv->below;	765	nextinv = nextinv->below;
		766
883	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&	767	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
884	curinv->type != FOOD && curinv->type != KEY &&	768	curinv->type != FOOD && curinv->type != KEY &&
885	curinv->type != SPECIAL_KEY && curinv->type != GEM &&	769	curinv->type != SPECIAL_KEY && curinv->type != GEM &&
886	!curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))	770	!curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
887	{	771	{
888	drop (op, curinv);	772	drop (op, curinv);
		773	if (--cnt <= 0) break;
889	}	774	}
		775
890	curinv = nextinv;	776	curinv = nextinv;
891	}	777	}
892	}	778	}
893
894	else if (strcmp (params, "weapons") == 0)	779	else if (strcmp (params, "weapons") == 0)
895	{	780	{
896	while (curinv != NULL)	781	while (curinv)
897	{	782	{
898	nextinv = curinv->below;	783	nextinv = curinv->below;
		784
899	while (nextinv && nextinv->type == MONEY)	785	while (nextinv && nextinv->type == MONEY)
900	nextinv = nextinv->below;	786	nextinv = nextinv->below;
		787
901	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))	788	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
902	{	789	{
903	drop (op, curinv);	790	drop (op, curinv);
		791	if (--cnt <= 0) break;
904	}	792	}
		793
905	curinv = nextinv;	794	curinv = nextinv;
906	}	795	}
907	}	796	}
908
909	else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)	797	else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
910	{	798	{
911	while (curinv != NULL)	799	while (curinv)
912	{	800	{
913	nextinv = curinv->below;	801	nextinv = curinv->below;
		802
914	while (nextinv && nextinv->type == MONEY)	803	while (nextinv && nextinv->type == MONEY)
915	nextinv = nextinv->below;	804	nextinv = nextinv->below;
		805
916	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))	806	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
917	{	807	{
918	drop (op, curinv);	808	drop (op, curinv);
		809	if (--cnt <= 0) break;
919	}	810	}
		811
920	curinv = nextinv;	812	curinv = nextinv;
921	}	813	}
922	}	814	}
923
924	else if (strcmp (params, "misc") == 0)	815	else if (strcmp (params, "misc") == 0)
925	{	816	{
926	while (curinv != NULL)	817	while (curinv)
927	{	818	{
928	nextinv = curinv->below;	819	nextinv = curinv->below;
		820
929	while (nextinv && nextinv->type == MONEY)	821	while (nextinv && nextinv->type == MONEY)
930	nextinv = nextinv->below;	822	nextinv = nextinv->below;
		823
931	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))	824	if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
932	{	825	{
933	switch (curinv->type)	826	switch (curinv->type)
934	{	827	{
935	case HORN:	828	case HORN:
…		…
953	break;	846	break;
954	default:	847	default:
955	curinv = nextinv;	848	curinv = nextinv;
956	break;	849	break;
957	}	850	}
		851
		852	if (--cnt <= 0) break;
958	}	853	}
		854
959	curinv = nextinv;	855	curinv = nextinv;
960	}	856	}
961	}	857	}
962	op->contr->socket.update_look = 1;	858
		859	if (cnt <= 0)
		860	op->failmsg ("Only dropped some items, can't drop that many items at once.");
963		861
964	/* draw_look(op);*/	862	/* draw_look(op);*/
965	return 0;	863	return 0;
		864	}
		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;
966	}	889	}
967		890
968	/* 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
969	* comma seperated list.	892	* comma seperated list.
970	*/	893	*/
971
972	int	894	int
973	command_drop (object *op, char *params)	895	command_drop (object *op, char *params)
974	{	896	{
975	object *tmp, *next;	897	object *tmp, *next;
976	int did_one = 0;	898	int did_one = 0;
…		…
980	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");	902	new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
981	return 0;	903	return 0;
982	}	904	}
983	else	905	else
984	{	906	{
		907	vector<object *> matched_objs;
		908
985	for (tmp = op->inv; tmp; tmp = next)	909	for (tmp = op->inv; tmp; tmp = next)
986	{	910	{
987	next = tmp->below;	911	next = tmp->below;
988	if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)	912	if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
989	continue;	913	continue;
		914
990	if (item_matched_string (op, tmp, params))	915	if (item_matched_string (op, tmp, params))
991	{	916	matched_objs.push_back (tmp);
992	drop (op, tmp);
993	did_one = 1;
994	}	917	}
995	}	918
996	if (!did_one)	919	int cnt = MAX_ITEM_PER_DROP;
		920
		921	if (!drop_vector (op, matched_objs, &cnt))
997	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");	922	new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
998	}	923
999	if (op->type == PLAYER)	924	if (cnt <= 0)
1000	{	925	op->failmsg ("Only dropped some items, can't drop that many items at once.");
1001	op->contr->count = 0;
1002	op->contr->socket.update_look = 1;
1003	};	926	}
1004		927
1005	/* draw_look(op);*/
1006	return 0;	928	return 0;
1007	}	929	}
1008		930
1009	int	931	int
1010	command_examine (object *op, char *params)	932	command_examine (object *op, char *params)
1011	{	933	{
1012	if (!params)	934	if (!params)
1013	{	935	{
1014	object *tmp = op->below;	936	object *tmp = op->below;
1015		937
1016	while (tmp && !LOOK_OBJ (tmp))	938	while (tmp && !tmp->client_visible ())
1017	tmp = tmp->below;	939	tmp = tmp->below;
		940
1018	if (tmp)	941	if (tmp)
1019	examine (op, tmp);	942	examine (op, tmp);
1020	}	943	}
1021	else	944	else
1022	{	945	{
1023	object *tmp = find_best_object_match (op, params);	946	object *tmp = find_best_object_match (op, params);
1024		947
1025	if (tmp)	948	if (tmp)
1026	examine (op, tmp);	949	examine (op, tmp);
1027	else	950	else
1028	new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params);	951	op->contr->infobox (MSG_CHANNEL ("examine"), format ("Could not find an object that matches %s", params));
1029	}	952	}
		953
1030	return 0;	954	return 0;
1031	}	955	}
1032		956
1033	/* op should be a player.	957	/* op should be a player.
1034	* we return the object the player has marked with the 'mark' command	958	* we return the object the player has marked with the 'mark' command
…		…
1073	}	997	}
1074		998
1075	return 0;	999	return 0;
1076	}	1000	}
1077		1001
1078		1002	std::string
1079	/* op should be a player, params is any params.	1003	object::describe_monster (object *who)
1080	* If no params given, we print out the currently marked object.
1081	* otherwise, try to find a matching object - try best match first.
1082	*/
1083	int
1084	command_mark (object *op, char *params)
1085	{	1004	{
1086	if (!op->contr)	1005	dynbuf_text buf (512, 512);
1087	return 1;
1088		1006
1089	if (!params)	1007	object *mon = head ? head : this;
1090	{
1091	object *mark = find_marked_object (op);
1092		1008
1093	if (!mark)	1009	if (QUERY_FLAG (mon, FLAG_UNDEAD))
1094	new_draw_info (NDI_UNIQUE, 0, op, "You have no marked object.");	1010	buf << "It is an undead force.\r";
1095	else	1011
1096	new_draw_info_format (NDI_UNIQUE, 0, op, "%s is marked.", query_name (mark));	1012	if (mon->level > who->level)
1097	}	1013	buf << "It is likely more powerful than you.\r";
		1014	else if (mon->level < who->level)
		1015	buf << "It is likely less powerful than you.\r";
1098	else	1016	else
1099	{	1017	buf << "It is probably as powerful as you.\r";
1100	object *mark1 = find_best_object_match (op, params);
1101		1018
1102	if (!mark1)
1103	{
1104	new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params);
1105	return 1;
1106	}
1107	else
1108	{
1109	op->contr->mark = mark1;
1110	new_draw_info_format (NDI_UNIQUE, 0, op, "Marked item %s", query_name (mark1));
1111	return 0;
1112	}
1113	}
1114
1115	return 0; /*shouldnt get here */
1116	}
1117
1118
1119	/* op is the player
1120	* tmp is the monster being examined.
1121	*/
1122	void
1123	examine_monster (object *op, object *tmp)
1124	{
1125	object *mon = tmp->head ? tmp->head : tmp;
1126
1127	if (QUERY_FLAG (mon, FLAG_UNDEAD))
1128	new_draw_info (NDI_UNIQUE, 0, op, "It is an undead force.");
1129	if (mon->level > op->level)
1130	new_draw_info (NDI_UNIQUE, 0, op, "It is likely more powerful than you.");
1131	else if (mon->level < op->level)
1132	new_draw_info (NDI_UNIQUE, 0, op, "It is likely less powerful than you.");
1133	else
1134	new_draw_info (NDI_UNIQUE, 0, op, "It is probably as powerful as you.");
1135	if (mon->attacktype & AT_ACID)	1019	if (mon->attacktype & AT_ACID)
1136	new_draw_info (NDI_UNIQUE, 0, op, "You seem to smell an acrid odor.");	1020	buf << "You seem to smell an acrid odor.\r";
1137		1021
1138	/* 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
1139	* maxhp field? This seems that it should give more accurate results.	1023	* maxhp field? This seems that it should give more accurate results.
1140	*/	1024	*/
1141	switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))	1025	switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1142	{ /* From 1-4 */	1026	{ /* From 1-4 */
1143	case 1:	1027	case 1:
1144	new_draw_info (NDI_UNIQUE, 0, op, "It is in a bad shape.");	1028	buf << "It is in a bad shape.\r";
1145	break;	1029	break;
1146	case 2:	1030	case 2:
1147	new_draw_info (NDI_UNIQUE, 0, op, "It is hurt.");	1031	buf << "It is hurt.\r";
1148	break;	1032	break;
1149	case 3:	1033	case 3:
1150	new_draw_info (NDI_UNIQUE, 0, op, "It is somewhat hurt.");	1034	buf << "It is somewhat hurt.\r";
1151	break;	1035	break;
1152	case 4:	1036	case 4:
1153	new_draw_info (NDI_UNIQUE, 0, op, "It is in excellent shape.");	1037	buf << "It is in excellent shape.\r";
1154	break;	1038	break;
1155	}	1039	}
		1040
1156	if (present_in_ob (POISONING, mon) != NULL)	1041	if (present_in_ob (POISONING, mon))
1157	new_draw_info (NDI_UNIQUE, 0, op, "It looks very ill.");	1042	buf << "It looks very ill.\r";
1158	}
1159		1043
		1044	buf << '\n';
		1045
		1046	return buf;
		1047	}
1160		1048
1161	/* 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. */
1162	char *	1050	const char *
1163	long_desc (object *tmp, object *pl)	1051	long_desc (object *tmp, object *pl)
1164	{	1052	{
1165	static char buf[VERY_BIG_BUF];	1053	static std::string s;
1166	char *cp;
1167		1054
1168	if (tmp == NULL)	1055	return (s = tmp->long_desc (pl)).c_str ();
1169	return "";	1056	}
1170		1057
1171	buf[0] = '\0';	1058	std::string
		1059	object::long_desc (object *who)
		1060	{
		1061	std::string buf (query_name ());
		1062
1172	switch (tmp->type)	1063	switch (type)
1173	{	1064	{
1174	case RING:	1065	case RING:
1175	case SKILL:	1066	case SKILL:
1176	case WEAPON:	1067	case WEAPON:
1177	case ARMOUR:	1068	case ARMOUR:
…		…
1187	case CLOAK:	1078	case CLOAK:
1188	case FOOD:	1079	case FOOD:
1189	case DRINK:	1080	case DRINK:
1190	case FLESH:	1081	case FLESH:
1191	case SKILL_TOOL:	1082	case SKILL_TOOL:
		1083	case LAMP:
1192	case POWER_CRYSTAL:	1084	case POWER_CRYSTAL:
1193	if (*(cp = describe_item (tmp, pl)) != '\0')	1085	{
		1086	const char *cp = ::describe_item (this, who);
		1087
		1088	if (*cp)
		1089	{
		1090	buf.append (" ");
		1091	buf.append (cp);
		1092	}
		1093	}
		1094	}
		1095
		1096	return buf;
		1097	}
		1098
		1099	/* op is the player
		1100	* tmp is the monster being examined.
		1101	*/
		1102	void
		1103	examine_monster (object *op, object *tmp)
		1104	{
		1105	new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
		1106	}
		1107
		1108	std::string
		1109	object::describe (object *who)
		1110	{
		1111	dynbuf_text buf (1024, 1024);
		1112
		1113	buf.printf ("That is: %s.\r", long_desc (who).c_str ());
		1114
		1115	if (custom_name)
		1116	buf.printf ("You call it %s.\r", &custom_name);
		1117
		1118	switch (type)
		1119	{
		1120	case SPELLBOOK:
		1121	if (flag [FLAG_IDENTIFIED] && inv)
		1122	buf.printf ("%s is a level %s %s spell.\r", &inv->name, get_levelnumber (inv->level), &inv->skill);
		1123	break;
		1124
		1125	case BOOK:
		1126	if (msg)
		1127	buf << "Something is written in it.\r";
		1128	break;
		1129
		1130	case CONTAINER:
		1131	if (race)
1194	{	1132	{
		1133	if (weight_limit && stats.Str < 100)
		1134	buf.printf ("It can hold only %s and its weight limit is %.1f kg.\r",
		1135	&race, weight_limit / (10.0 * (100 - stats.Str)));
1195	int len;	1136	else
1196		1137	buf.printf ("It can hold only %s.\r", &race);
1197	assign (buf, query_name (tmp));
1198	len = strlen (buf);
1199	if (len < VERY_BIG_BUF - 5)
1200	{
1201	/* Since we know the length, we save a few cpu cycles by using
1202	* it instead of calling strcat */
1203	strcpy (buf + len, " ");
1204	len++;
1205	assign (buf + len, cp, VERY_BIG_BUF - len - 1);
1206	}
1207	}	1138	}
1208	}	1139	else if (weight_limit && stats.Str < 100)
1209		1140	buf.printf ("Its weight limit is %.1f kg.\r", weight_limit / (10.0 * (100 - stats.Str)));
1210	if (buf[0] == '\0')
1211	assign (buf, query_name (tmp));
1212
1213	return buf;
1214	}
1215
1216	void
1217	examine (object *op, object *tmp)
1218	{
1219	char buf[VERY_BIG_BUF];
1220	int i;
1221
1222	if (tmp == NULL || tmp->type == CLOSE_CON)
1223	return;
1224
1225	strcpy (buf, "That is ");
1226	strncat (buf, long_desc (tmp, op), VERY_BIG_BUF - strlen (buf) - 1);
1227	buf[VERY_BIG_BUF - 1] = 0;
1228
1229	new_draw_info (NDI_UNIQUE, 0, op, buf);
1230	buf[0] = '\0';
1231
1232	if (tmp->custom_name)
1233	{
1234	strcpy (buf, "You call it ");
1235	strncat (buf, tmp->custom_name, VERY_BIG_BUF - strlen (buf) - 1);
1236	buf[VERY_BIG_BUF - 1] = 0;
1237	new_draw_info (NDI_UNIQUE, 0, op, buf);
1238	buf[0] = '\0';
1239	}
1240
1241	switch (tmp->type)
1242	{
1243	case SPELLBOOK:
1244	if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) && tmp->inv)
1245	{
1246	sprintf (buf, "%s is a %s level %s spell", &tmp->inv->name, get_levelnumber (tmp->inv->level), &tmp->inv->skill);
1247	}
1248	break;	1141	break;
1249		1142
1250	case BOOK:	1143	case WAND:
1251	if (tmp->msg != NULL)	1144	if (flag [FLAG_IDENTIFIED])
1252	strcpy (buf, "Something is written in it.");	1145	buf.printf ("It has %d charges left.\r", stats.food);
1253	break;	1146	break;
1254
1255	case CONTAINER:
1256	if (tmp->race != NULL)
1257	{
1258	if (tmp->weight_limit && tmp->stats.Str < 100)
1259	sprintf (buf, "It can hold only %s and its weight limit is %.1f kg.",
1260	&tmp->race, tmp->weight_limit / (10.0 * (100 - tmp->stats.Str)));
1261	else
1262	sprintf (buf, "It can hold only %s.", &tmp->race);
1263	}
1264	else if (tmp->weight_limit && tmp->stats.Str < 100)
1265	sprintf (buf, "Its weight limit is %.1f kg.", tmp->weight_limit / (10.0 * (100 - tmp->stats.Str)));
1266	break;
1267
1268	case WAND:
1269	if (QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1270	sprintf (buf, "It has %d charges left.", tmp->stats.food);
1271	break;
1272	}
1273
1274	if (buf[0] != '\0')
1275	new_draw_info (NDI_UNIQUE, 0, op, buf);
1276
1277	if (tmp->materialname != NULL && !tmp->msg)
1278	{	1147	}
		1148
		1149	if (materialname && !msg)
1279	sprintf (buf, "It is made of: %s.", &tmp->materialname);	1150	buf.printf ("It is made of: %s.\r", &materialname);
1280	new_draw_info (NDI_UNIQUE, 0, op, buf);	1151
1281	}	1152	if (who)
1282	/* Where to wear this item */	1153	/* Where to wear this item */
1283	for (i = 0; i < NUM_BODY_LOCATIONS; i++)	1154	for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1284	{	1155	if (slot[i].info)
1285	if (tmp->body_info[i] < -1)	1156	{
		1157	buf << (who->slot[i].info ? body_locations[i].use_name : body_locations[i].nonuse_name);
		1158
		1159	if (slot[i].info < -1 && who->slot[i].info)
		1160	buf.printf ("(%d)", -slot[i].info);
		1161
		1162	buf << ".\r";
1286	{	1163	}
1287	if (op->body_info[i])	1164
1288	new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s (%d)", body_locations[i].use_name, -tmp->body_info[i]);	1165	if (weight)
		1166	buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
		1167
		1168	if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
		1169	{
		1170	buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
		1171
		1172	if (is_in_shop (who))
		1173	{
		1174	if (flag [FLAG_UNPAID])
		1175	buf.printf ("%s would cost you %s.\r", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1289	else	1176	else
1290	new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].nonuse_name);
1291	}
1292	else if (tmp->body_info[i])
1293	{
1294	if (op->body_info[i])
1295	new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].use_name);
1296	else
1297	new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].nonuse_name);
1298	}
1299	}
1300
1301	if (tmp->weight)
1302	{
1303	sprintf (buf, tmp->nrof > 1 ? "They weigh %3.3f kg." : "It weighs %3.3f kg.", tmp->weight * (tmp->nrof ? tmp->nrof : 1) / 1000.0);
1304	new_draw_info (NDI_UNIQUE, 0, op, buf);
1305	}
1306
1307	if (tmp->value && !QUERY_FLAG (tmp, FLAG_STARTEQUIP) && !QUERY_FLAG (tmp, FLAG_NO_PICK))
1308	{
1309	sprintf (buf, "You reckon %s worth %s.", tmp->nrof > 1 ? "they are" : "it is", query_cost_string (tmp, op, F_TRUE | F_APPROX));
1310	new_draw_info (NDI_UNIQUE, 0, op, buf);
1311	if (is_in_shop (op))
1312	{
1313	if (QUERY_FLAG (tmp, FLAG_UNPAID))
1314	sprintf (buf, "%s would cost you %s.", tmp->nrof > 1 ? "They" : "It", query_cost_string (tmp, op, F_BUY | F_SHOP));
1315	else
1316	sprintf (buf, "You are offered %s for %s.", query_cost_string (tmp, op, F_SELL + F_SHOP), tmp->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");
1317	new_draw_info (NDI_UNIQUE, 0, op, buf);
1318	}	1178	}
1319	}	1179	}
1320		1180
1321	if (QUERY_FLAG (tmp, FLAG_MONSTER))	1181	if (flag [FLAG_MONSTER])
1322	examine_monster (op, tmp);	1182	buf << describe_monster (who);
1323		1183
1324	/* Is this item buildable? */	1184	/* Is this item buildable? */
1325	if (QUERY_FLAG (tmp, FLAG_IS_BUILDABLE))	1185	if (flag [FLAG_IS_BUILDABLE])
1326	new_draw_info (NDI_UNIQUE, 0, op, "This is a buildable item.");	1186	buf << "This is a buildable item.\r";
1327		1187
1328	/* 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
1329	* types - especially if the first entry is a match	1189	* types - especially if the first entry is a match
1330	*/	1190	*/
1331	if (tmp->msg && tmp->type != EXIT && tmp->type != BOOK && tmp->type != CORPSE && !tmp->move_on && strncasecmp (tmp->msg, "@match", 7))	1191	if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && !has_dialogue ())
1332	{	1192	{
1333
1334	/* 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
1335	* out the extra message	1194	* out the extra message
1336	*/	1195	*/
1337	if (need_identify (tmp) && QUERY_FLAG (tmp, FLAG_IDENTIFIED))	1196	if (need_identify (this) && flag [FLAG_IDENTIFIED])
1338	new_draw_info (NDI_UNIQUE, 0, op, "The object has a story:");	1197	buf << "The object has a story:\r";
1339		1198
1340	new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);	1199	buf << msg << '\n';
1341	}
1342	new_draw_info (NDI_UNIQUE, 0, op, " "); /* Blank line */
1343	}
1344
1345	/*
1346	* inventory prints object's inventory. If inv==NULL then print player's
1347	* inventory.
1348	* [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1349	*/
1350	void
1351	inventory (object *op, object *inv)
1352	{
1353	object *tmp;
1354	char *in;
1355	int items = 0, length;
1356
1357	if (inv == NULL && op == NULL)
1358	{	1200	}
1359	new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?");
1360	return;
1361	}
1362	tmp = inv ? inv->inv : op->inv;
1363		1201
1364	while (tmp)	1202	buf << '\n';
1365	{	1203
1366	if ((!tmp->invisible &&	1204	return std::string (buf.linearise (), buf.size ());
1367	(inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ)))
1368	items++;
1369	tmp = tmp->below;
1370	}
1371	if (inv == NULL)
1372	{ /* player's inventory */
1373	if (items == 0)
1374	{
1375	new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing.");
1376	return;
1377	}
1378	else
1379	{
1380	length = 28;
1381	in = "";
1382	if (op)
1383	clear_win_info (op);
1384	new_draw_info (NDI_UNIQUE, 0, op, "Inventory:");
1385	}
1386	}
1387	else
1388	{
1389	if (items == 0)
1390	return;
1391	else
1392	{
1393	length = 28;
1394	in = " ";
1395	}
1396	}
1397	for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below)
1398	{
1399	if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED))))
1400	continue;
1401	if ((!op || QUERY_FLAG (op, FLAG_WIZ)))
1402	new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length,
1403	query_name (tmp), tmp->count, query_weight (tmp));
1404	else
1405	new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp));
1406	}
1407	if (!inv && op)
1408	{
1409	new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op));
1410	}
1411	}	1205	}
1412		1206
1413	static void	1207	static void
1414	display_new_pickup (object *op)	1208	display_new_pickup (object *op)
1415	{	1209	{
1416	int i = op->contr->mode;	1210	int i = op->contr->mode;
1417		1211
1418	if (!(i & PU_NEWMODE))
1419	return;
1420
1421	new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1422	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);
1423	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);
1424	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);
1425		1215
1426	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);
…		…
1477	};	1267	};
1478		1268
1479	if (!params)	1269	if (!params)
1480	{	1270	{
1481	/* if the new mode is used, just print the settings */	1271	/* if the new mode is used, just print the settings */
1482	if (op->contr->mode & PU_NEWMODE)
1483	{
1484	display_new_pickup (op);	1272	display_new_pickup (op);
1485	return 1;
1486	}
1487	if (1)
1488	LOG (llevDebug, "command_pickup: !params\n");
1489	set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1490	return 0;	1273	return 0;
1491	}	1274	}
1492		1275
1493	while (*params == ' ' && *params)	1276	while (*params == ' ' && *params)
1494	params++;	1277	params++;
…		…
1500	for (mode = 0; names[mode]; mode++)	1283	for (mode = 0; names[mode]; mode++)
1501	{	1284	{
1502	if (!strcmp (names[mode], params + 1))	1285	if (!strcmp (names[mode], params + 1))
1503	{	1286	{
1504	i = op->contr->mode;	1287	i = op->contr->mode;
1505	if (!(i & PU_NEWMODE))	1288
1506	i = PU_NEWMODE;
1507	if (*params == '+')	1289	if (*params == '+')
1508	i = i | modes[mode];	1290	i = i | modes[mode];
1509	else	1291	else
1510	i = i & ~modes[mode];	1292	i = i & ~modes[mode];
		1293
1511	op->contr->mode = i;	1294	op->contr->mode = i;
1512	display_new_pickup (op);	1295	display_new_pickup (op);
1513	return 1;	1296	return 1;
1514	}	1297	}
1515	}	1298	}
…		…
1517	return 1;	1300	return 1;
1518	}	1301	}
1519		1302
1520	if (sscanf (params, "%u", &i) != 1)	1303	if (sscanf (params, "%u", &i) != 1)
1521	{	1304	{
1522	if (1)
1523	LOG (llevDebug, "command_pickup: params==NULL\n");
1524	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.");
1525	return 1;	1306	return 1;
1526	}	1307	}
1527	set_pickup_mode (op, i);	1308
		1309	if (i <= PU_RATIO)
		1310	i |= op->contr->mode & ~PU_RATIO;
		1311
		1312	op->contr->mode = i;
1528		1313
1529	return 1;	1314	return 1;
1530	}
1531
1532	void
1533	set_pickup_mode (object *op, int i)
1534	{
1535	switch (op->contr->mode = i)
1536	{
1537	case 0:
1538	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1539	break;
1540	case 1:
1541	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1542	break;
1543	case 2:
1544	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1545	break;
1546	case 3:
1547	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1548	break;
1549	case 4:
1550	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1551	break;
1552	case 5:
1553	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1554	break;
1555	case 6:
1556	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1557	break;
1558	case 7:
1559	new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1560	break;
1561	}
1562	}	1315	}
1563		1316
1564	int	1317	int
1565	command_search_items (object *op, char *params)	1318	command_search_items (object *op, char *params)
1566	{	1319	{
1567	char buf[MAX_BUF];	1320	char buf[MAX_BUF];
1568		1321
1569	if (settings.search_items == FALSE)
1570	return 1;
1571
1572	if (params == NULL)	1322	if (params == NULL)
1573	{	1323	{
1574	if (op->contr->search_str[0] == '\0')	1324	if (op->contr->search_str[0] == '\0')
1575	{	1325	{
1576	new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1");	1326	new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1577	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");
1578	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'.");
1579	return 1;	1329	return 1;
1580	}	1330	}
		1331
1581	op->contr->search_str[0] = '\0';	1332	op->contr->search_str[0] = '\0';
1582	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");	1333	new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1583	fix_player (op);	1334	op->update_stats ();
1584	return 1;	1335	return 1;
1585	}	1336	}
		1337
1586	if ((int) strlen (params) >= MAX_BUF)	1338	if (strlen (params) >= MAX_BUF)
1587	{	1339	{
1588	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");	1340	new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1589	return 1;	1341	return 1;
1590	}	1342	}
		1343
1591	strcpy (op->contr->search_str, params);	1344	strcpy (op->contr->search_str, params);
1592	sprintf (buf, "Searching for '%s'.", op->contr->search_str);	1345	sprintf (buf, "Now searching for '%s'.", op->contr->search_str);
1593	new_draw_info (NDI_UNIQUE, 0, op, buf);	1346	new_draw_info (NDI_UNIQUE, 0, op, buf);
1594	fix_player (op);	1347	op->update_stats ();
		1348
1595	return 1;	1349	return 1;
1596	}	1350	}
1597		1351

Diff Legend

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