ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/c_object.C
(Generate patch)

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

Diff Legend

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