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.34 by pippijn, Sat Jan 6 14:42:30 2007 UTC vs.
Revision 1.133 by root, Sun Jan 29 02:47:05 2017 UTC

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

Diff Legend

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