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

Diff Legend

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