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

Diff Legend

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