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.36 by root, Tue Jan 9 21:32:42 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
… …
515 /* 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
516 * but that probably will make it more difficult to read, and 467 * but that probably will make it more difficult to read, and
517 * not make it any more efficient 468 * not make it any more efficient
518 */ 469 */
519 if (params && item_matched_string (op, tmp, params)) 470 if (params && item_matched_string (op, tmp, params))
471 {
472 if (--cnt < 0) break;
520 pick_up (op, tmp); 473 pick_up (op, tmp);
474 }
521 else if (can_pick (op, tmp) && !params) 475 else if (can_pick (op, tmp) && !params)
522 { 476 {
477 if (--cnt < 0) break;
523 pick_up (op, tmp); 478 pick_up (op, tmp);
524 break; 479 break;
525 } 480 }
526 481
527 tmp = next; 482 tmp = next;
483 }
484
485 if (cnt < 0)
486 {
487 op->failmsg ("Couldn't pick up so many items at once.");
488 return 0;
528 } 489 }
529 490
530 if (!params && !tmp) 491 if (!params && !tmp)
531 { 492 {
532 for (tmp = op->below; tmp; tmp = tmp->below) 493 for (tmp = op->below; tmp; tmp = tmp->below)
533 if (!tmp->invisible) 494 if (!tmp->invisible)
534 { 495 {
535 char buf[MAX_BUF];
536
537 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);
538 new_draw_info (NDI_UNIQUE, 0, op, buf);
539 break; 497 break;
540 } 498 }
541 499
542 if (!tmp) 500 if (!tmp)
543 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.");
544 } 502 }
545 503
546 return 0; 504 return 0;
547} 505}
548 506
549
550/* 507/*
551 * This function was part of drop, now is own function. 508 * This function was part of drop, now is own function.
552 * Player 'op' tries to put object 'tmp' into sack 'sack', 509 * Player 'op' tries to put object 'tmp' into sack 'sack',
553 * 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 *
554 * Note that the 'sack' in question can now be a transport, 512 * Note that the 'sack' in question can now be a transport,
555 * so this function isn't named very good anymore. 513 * so this function isn't named very good anymore.
556 */ 514 */
557void 515void
558put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 516put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
559{ 517{
560 object *tmp2, *sack2; 518 object *tmp2;
561 char buf[MAX_BUF]; 519 char buf[MAX_BUF];
562 520
563 if (sack == tmp) 521 if (sack == tmp)
564 return; /* Can't put an object in itself */ 522 return; /* Can't put an object in itself */
565 523
566 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 524 if (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP])
567 { 525 {
568 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));
569 return; 527 return;
570 } 528 }
571 529
572 if (tmp->type == CONTAINER && tmp->inv) 530 if (tmp->type == CONTAINER && tmp->inv)
573 { 531 {
574
575 /* 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
576 * we instead move the contents of that container into the active 533 * we instead move the contents of that container into the active
577 * 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.
578 */ 535 */
579 sack2 = tmp;
580 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));
581 537
582 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 538 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
583 { 539 {
584 tmp = tmp2->below; 540 tmp = tmp2->below;
585 541
586 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)))
587 {
588 put_object_in_sack (op, sack, tmp2, 0); 543 put_object_in_sack (op, sack, tmp2, 0);
589 }
590 else 544 else
591 { 545 {
592 sprintf (buf, "Your %s fills up.", query_name (sack)); 546 sprintf (buf, "Your %s fills up.", query_name (sack));
593 new_draw_info (NDI_UNIQUE, 0, op, buf); 547 new_draw_info (NDI_UNIQUE, 0, op, buf);
594 break; 548 break;
595 } 549 }
596 } 550 }
597 551
598 esrv_update_item (UPD_WEIGHT, op, sack2);
599 return; 552 return;
600 } 553 }
601 554
602 /* Don't worry about this for containers - our caller should have 555 /* Don't worry about this for containers - our caller should have
603 * already checked this. 556 * already checked this.
604 */ 557 */
605 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)))
606 return; 559 return;
607 560
608 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 561 if (tmp->flag [FLAG_APPLIED])
609 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 562 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
610 return; 563 return;
611 564
612 /* 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 */
613 if (nrof && tmp->nrof != nrof) 566 if (!can_split (op, tmp, nrof))
614 {
615 object *tmp2 = tmp;
616
617 tmp = get_split_ob (tmp, nrof);
618
619 if (!tmp)
620 {
621 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
622 return; 567 return;
623 }
624 /* Tell a client what happened other objects */
625 if (tmp2->destroyed ())
626 esrv_del_item (op->contr, tmp2->count);
627 else /* this can proably be replaced with an update */
628 esrv_send_item (op, tmp2);
629 }
630 else
631 tmp->remove ();
632 568
633 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));
634 tmp2 = insert_ob_in_ob (tmp, sack); 570 sack->insert (tmp);
635 op->update_stats (); /* This is overkill, fix_player() is called somewhere */ 571}
636 /* in object.c */
637 572
638 /* 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
639 * 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:
640 */ 620 */
641 if (tmp2 != tmp)
642 esrv_del_item (op->contr, tmp->count);
643 621
644 esrv_send_item (op, tmp2); 622 obj->x = dropper->x;
623 obj->y = dropper->y;
645 624
646 /* update the sacks weight */ 625 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
647 esrv_update_item (UPD_WEIGHT, op, sack);
648} 626}
649 627
650/* 628/*
651 * This function was part of drop, now is own function. 629 * This function was part of drop, now is own function.
652 * 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
653 * nrof objects is tried to dropped. 631 * nrof objects are tried to drop.
654 * This is used when dropping objects onto the floor. 632 * This is used when dropping objects onto the floor.
655 */ 633 */
656void 634void
657drop_object (object *op, object *tmp, uint32 nrof) 635drop_object (object *op, object *tmp, uint32 nrof)
658{ 636{
659 char buf[MAX_BUF]; 637 if (tmp->flag [FLAG_NO_DROP])
660 object *floor;
661
662 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
663 return; 638 return;
664 639
665 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 640 if (tmp->flag [FLAG_APPLIED])
666 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 641 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
667 return; /* can't unapply it */ 642 return; /* can't unapply it */
668 643
669 /* 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
670 * off 645 * off
671 */ 646 */
672 if (nrof && tmp->nrof != nrof) 647 if (!can_split (op, tmp, nrof))
673 {
674 object *tmp2 = tmp;
675
676 tmp = get_split_ob (tmp, nrof);
677 if (!tmp)
678 {
679 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
680 return;
681 }
682 /* Tell a client what happened rest of objects. tmp2 is now the
683 * original object
684 */
685 if (op->type == PLAYER)
686 {
687 if (tmp2->destroyed ())
688 esrv_del_item (op->contr, tmp2->count);
689 else
690 esrv_send_item (op, tmp2);
691 }
692 }
693 else
694 tmp->remove ();
695
696 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
697 return; 648 return;
698 649
699 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 650 drop_object (op, tmp);
700 {
701 sprintf (buf, "You drop the %s.", query_name (tmp));
702 new_draw_info (NDI_UNIQUE, 0, op, buf);
703 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it.");
704 651
705 if (op->type == PLAYER) 652 if (!tmp->destroyed () && !tmp->is_inserted ())
706 esrv_del_item (op->contr, tmp->count);
707
708 tmp->destroy ();
709 op->update_stats ();
710 return;
711 } 653 {
712 654 // if nothing happened with the object we give it back
713 if (op->type == PLAYER) 655 op->insert (tmp);
714 esrv_del_item (op->contr, tmp->count);
715
716 /* Call this before we update the various windows/players. At least
717 * that we, we know the weight is correct.
718 */
719 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
720 /* in object.c */
721
722 if (op->type == PLAYER)
723 { 656 }
724 /* Need to update the weight for the player */
725 esrv_send_item (op, op);
726 op->contr->ns->floorbox_update ();
727 }
728
729 for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
730 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
731 return;
732
733 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
734 sell_item (tmp, op);
735
736 tmp->x = op->x;
737 tmp->y = op->y;
738
739 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
740} 657}
741 658
742void 659void
743drop (object *op, object *tmp) 660drop (object *op, object *tmp)
744{ 661{
… …
753 if (tmp->env && tmp->env->type != PLAYER) 670 if (tmp->env && tmp->env->type != PLAYER)
754 { 671 {
755 /* Just toss the object - probably shouldn't be hanging 672 /* Just toss the object - probably shouldn't be hanging
756 * around anyways 673 * around anyways
757 */ 674 */
758 tmp->remove ();
759 tmp->destroy (); 675 tmp->destroy ();
760 return; 676 return;
761 } 677 }
762 else 678 else
763 {
764 while (tmp != NULL && tmp->invisible) 679 while (tmp && tmp->invisible)
765 tmp = tmp->below; 680 tmp = tmp->below;
766 }
767 } 681 }
768 682
769 if (tmp == NULL) 683 if (!tmp)
770 { 684 {
771 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.");
772 return; 686 return;
773 } 687 }
774 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 688
689 if (tmp->flag [FLAG_INV_LOCKED])
775 { 690 {
776 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 691 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
777 return; 692 return;
778 } 693 }
779 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 694
695 if (tmp->flag [FLAG_NO_DROP])
780 { 696 {
781#if 0 697#if 0
782 /* 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. */
783 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.");
784#endif 700#endif
… …
786 } 702 }
787 703
788 if (op->type == PLAYER && op->contr->last_used == tmp) 704 if (op->type == PLAYER && op->contr->last_used == tmp)
789 op->contr->last_used = tmp->below ? tmp->below 705 op->contr->last_used = tmp->below ? tmp->below
790 : tmp->above ? tmp->above 706 : tmp->above ? tmp->above
791 : 0; 707 : (object *)0;
792 708
793 if (op->container) 709 if (op->container_ ())
794 { 710 {
795 if (op->type == PLAYER) 711 if (op->type == PLAYER)
796 put_object_in_sack (op, op->container, tmp, op->contr->count); 712 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
797 else 713 else
798 put_object_in_sack (op, op->container, tmp, 0); 714 put_object_in_sack (op, op->container_ (), tmp, 0);
799 } 715 }
800 else 716 else
801 { 717 {
802 if (op->type == PLAYER) 718 if (op->type == PLAYER)
803 drop_object (op, tmp, op->contr->count); 719 drop_object (op, tmp, op->contr->count);
… …
807 723
808 if (op->type == PLAYER) 724 if (op->type == PLAYER)
809 op->contr->count = 0; 725 op->contr->count = 0;
810} 726}
811 727
812
813
814/* Command will drop all items that have not been locked */ 728/* Command will drop all items that have not been locked */
815int 729int
816command_dropall (object *op, char *params) 730command_dropall (object *op, char *params)
817{ 731{
818 732
819 object *curinv, *nextinv;
820
821 if (op->inv == NULL) 733 if (op->inv == NULL)
822 { 734 {
823 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 735 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
824 return 0; 736 return 0;
825 } 737 }
826 738
827 curinv = op->inv; 739 object *curinv = op->inv;
740 object *nextinv;
828 741
829 /* 742 /*
830 This is the default. Drops everything not locked or considered 743 This is the default. Drops everything not locked or considered
831 not something that should be dropped. 744 not something that should be dropped.
832 */ 745 */
833 /* 746 /*
834 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
835 the drop() routine will do unknown things to it when dropping 748 the drop() routine will do unknown things to it when dropping
836 in a shop. --Tero.Pelander@utu.fi 749 in a shop. --Tero.Pelander@utu.fi
837 */ 750 */
751 int cnt = MAX_ITEM_PER_ACTION;
838 752
839 if (params == NULL) 753 if (!params)
840 { 754 {
841 while (curinv != NULL) 755 while (curinv)
842 { 756 {
843 nextinv = curinv->below; 757 nextinv = curinv->below;
758
844 while (nextinv && nextinv->type == MONEY) 759 while (nextinv && nextinv->type == MONEY)
845 nextinv = nextinv->below; 760 nextinv = nextinv->below;
846 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 761
847 curinv->type != FOOD && curinv->type != KEY && 762 if (!curinv->flag [FLAG_INV_LOCKED]
848 curinv->type != SPECIAL_KEY && curinv->type != GEM && 763 && !curinv->invisible
849 !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)
850 { 770 {
851 drop (op, curinv); 771 drop (op, curinv);
772 if (--cnt <= 0) break;
852 } 773 }
774
853 curinv = nextinv; 775 curinv = nextinv;
854 } 776 }
855 } 777 }
856
857 else if (strcmp (params, "weapons") == 0) 778 else if (strcmp (params, "weapons") == 0)
858 { 779 {
859 while (curinv != NULL) 780 while (curinv)
860 { 781 {
861 nextinv = curinv->below; 782 nextinv = curinv->below;
783
862 while (nextinv && nextinv->type == MONEY) 784 while (nextinv && nextinv->type == MONEY)
863 nextinv = nextinv->below; 785 nextinv = nextinv->below;
786
864 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)))
865 { 788 {
866 drop (op, curinv); 789 drop (op, curinv);
790 if (--cnt <= 0) break;
867 } 791 }
792
868 curinv = nextinv; 793 curinv = nextinv;
869 } 794 }
870 } 795 }
871
872 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 796 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
873 { 797 {
874 while (curinv != NULL) 798 while (curinv)
875 { 799 {
876 nextinv = curinv->below; 800 nextinv = curinv->below;
801
877 while (nextinv && nextinv->type == MONEY) 802 while (nextinv && nextinv->type == MONEY)
878 nextinv = nextinv->below; 803 nextinv = nextinv->below;
804
879 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))
880 { 806 {
881 drop (op, curinv); 807 drop (op, curinv);
808 if (--cnt <= 0) break;
882 } 809 }
810
883 curinv = nextinv; 811 curinv = nextinv;
884 } 812 }
885 } 813 }
886
887 else if (strcmp (params, "misc") == 0) 814 else if (strcmp (params, "misc") == 0)
888 { 815 {
889 while (curinv != NULL) 816 while (curinv)
890 { 817 {
891 nextinv = curinv->below; 818 nextinv = curinv->below;
819
892 while (nextinv && nextinv->type == MONEY) 820 while (nextinv && nextinv->type == MONEY)
893 nextinv = nextinv->below; 821 nextinv = nextinv->below;
894 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 822
823 if (!curinv->flag [FLAG_INV_LOCKED] && !curinv->flag [FLAG_APPLIED])
895 { 824 {
896 switch (curinv->type) 825 switch (curinv->type)
897 { 826 {
898 case HORN: 827 case HORN:
899 case BOOK: 828 case BOOK:
… …
916 break; 845 break;
917 default: 846 default:
918 curinv = nextinv; 847 curinv = nextinv;
919 break; 848 break;
920 } 849 }
850
851 if (--cnt <= 0) break;
921 } 852 }
853
922 curinv = nextinv; 854 curinv = nextinv;
923 } 855 }
924 } 856 }
925 857
926 op->contr->ns->floorbox_update (); 858 if (cnt <= 0)
859 op->failmsg ("Only dropped some items, can't drop that many items at once.");
927 860
928/* draw_look(op);*/ 861/* draw_look(op);*/
929 return 0; 862 return 0;
930} 863}
931 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
932/* 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
933 * comma seperated list. 891 * comma seperated list.
934 */ 892 */
935
936int 893int
937command_drop (object *op, char *params) 894command_drop (object *op, char *params)
938{ 895{
939 object *tmp, *next; 896 object *tmp, *next;
940 int did_one = 0;
941 897
942 if (!params) 898 if (!params)
943 { 899 {
944 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 900 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
945 return 0; 901 return 0;
946 } 902 }
947 else 903 else
948 { 904 {
905 vector<object *> matched_objs;
906
949 for (tmp = op->inv; tmp; tmp = next) 907 for (tmp = op->inv; tmp; tmp = next)
950 { 908 {
951 next = tmp->below; 909 next = tmp->below;
952 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 910 if (tmp->flag [FLAG_NO_DROP] || tmp->invisible)
953 continue; 911 continue;
912
954 if (item_matched_string (op, tmp, params)) 913 if (item_matched_string (op, tmp, params))
955 { 914 matched_objs.push_back (tmp);
956 drop (op, tmp);
957 did_one = 1;
958 } 915 }
959 } 916
960 if (!did_one) 917 int cnt = MAX_ITEM_PER_ACTION;
918
919 if (!drop_vector (op, matched_objs, &cnt))
961 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 920 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
962 } 921
963 if (op->type == PLAYER) 922 if (cnt <= 0)
964 { 923 op->failmsg ("Only dropped some items, can't drop that many items at once.");
965 op->contr->count = 0;
966 op->contr->ns->floorbox_update ();
967 }; 924 }
968 925
969/* draw_look(op);*/
970 return 0; 926 return 0;
971} 927}
972 928
973int 929int
974command_examine (object *op, char *params) 930command_examine (object *op, char *params)
… …
977 { 933 {
978 object *tmp = op->below; 934 object *tmp = op->below;
979 935
980 while (tmp && !tmp->client_visible ()) 936 while (tmp && !tmp->client_visible ())
981 tmp = tmp->below; 937 tmp = tmp->below;
938
982 if (tmp) 939 if (tmp)
983 examine (op, tmp); 940 examine (op, tmp);
984 } 941 }
985 else 942 else
986 { 943 {
987 object *tmp = find_best_object_match (op, params); 944 object *tmp = find_best_object_match (op, params);
988 945
989 if (tmp) 946 if (tmp)
990 examine (op, tmp); 947 examine (op, tmp);
991 else 948 else
992 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));
993 } 950 }
951
994 return 0; 952 return 0;
995} 953}
996 954
997/* op should be a player. 955std::string
998 * we return the object the player has marked with the 'mark' command 956object::describe_monster (object *who)
999 * below. If no match is found (or object has changed), we return
1000 * NULL. We leave it up to the calling function to print messages if
1001 * nothing is found.
1002 */
1003object *
1004find_marked_object (object *op)
1005{ 957{
1006 object *tmp; 958 dynbuf_text buf (512, 512);
1007 959
1008 if (!op || !op->contr) 960 object *mon = head ? head : this;
1009 return NULL;
1010 961
1011 if (!op->contr->mark) 962 if (mon->flag [FLAG_UNDEAD])
1012 { 963 buf << "It is an undead force.\r";
1013/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
1014 return 0;
1015 }
1016 964
1017 /* This may seem like overkill, but we need to make sure that they 965 if (mon->level > who->level)
1018 * player hasn't dropped the item. We use count on the off chance that 966 buf << "It is likely more powerful than you.\r";
1019 * an item got reincarnated at some point. 967 else if (mon->level < who->level)
1020 */ 968 buf << "It is likely less powerful than you.\r";
1021 for (tmp = op->inv; tmp; tmp = tmp->below)
1022 {
1023 if (tmp->invisible)
1024 continue;
1025
1026 if (tmp == op->contr->mark)
1027 {
1028 if (!tmp->destroyed ())
1029 return tmp;
1030 else
1031 {
1032 op->contr->mark = 0;
1033/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
1034 return 0;
1035 }
1036 }
1037 }
1038
1039 return 0;
1040}
1041
1042
1043/* op should be a player, params is any params.
1044 * If no params given, we print out the currently marked object.
1045 * otherwise, try to find a matching object - try best match first.
1046 */
1047int
1048command_mark (object *op, char *params)
1049{
1050 if (!op->contr)
1051 return 1;
1052
1053 if (!params)
1054 {
1055 object *mark = find_marked_object (op);
1056
1057 if (!mark)
1058 new_draw_info (NDI_UNIQUE, 0, op, "You have no marked object.");
1059 else
1060 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is marked.", query_name (mark));
1061 }
1062 else 969 else
1063 { 970 buf << "It is probably as powerful as you.\r";
1064 object *mark1 = find_best_object_match (op, params);
1065 971
1066 if (!mark1)
1067 {
1068 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params);
1069 return 1;
1070 }
1071 else
1072 {
1073 op->contr->mark = mark1;
1074 new_draw_info_format (NDI_UNIQUE, 0, op, "Marked item %s", query_name (mark1));
1075 return 0;
1076 }
1077 }
1078
1079 return 0; /*shouldnt get here */
1080}
1081
1082
1083/* op is the player
1084 * tmp is the monster being examined.
1085 */
1086void
1087examine_monster (object *op, object *tmp)
1088{
1089 object *mon = tmp->head ? tmp->head : tmp;
1090
1091 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1092 new_draw_info (NDI_UNIQUE, 0, op, "It is an undead force.");
1093 if (mon->level > op->level)
1094 new_draw_info (NDI_UNIQUE, 0, op, "It is likely more powerful than you.");
1095 else if (mon->level < op->level)
1096 new_draw_info (NDI_UNIQUE, 0, op, "It is likely less powerful than you.");
1097 else
1098 new_draw_info (NDI_UNIQUE, 0, op, "It is probably as powerful as you.");
1099 if (mon->attacktype & AT_ACID) 972 if (mon->attacktype & AT_ACID)
1100 new_draw_info (NDI_UNIQUE, 0, op, "You seem to smell an acrid odor."); 973 buf << "You seem to smell an acrid odor.\r";
1101 974
1102 /* 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
1103 * maxhp field? This seems that it should give more accurate results. 976 * maxhp field? This seems that it should give more accurate results.
1104 */ 977 */
1105 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 978 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1106 { /* From 1-4 */ 979 { /* From 1-4 */
1107 case 1: 980 case 1:
1108 new_draw_info (NDI_UNIQUE, 0, op, "It is in a bad shape."); 981 buf << "It is in a bad shape.\r";
1109 break; 982 break;
1110 case 2: 983 case 2:
1111 new_draw_info (NDI_UNIQUE, 0, op, "It is hurt."); 984 buf << "It is hurt.\r";
1112 break; 985 break;
1113 case 3: 986 case 3:
1114 new_draw_info (NDI_UNIQUE, 0, op, "It is somewhat hurt."); 987 buf << "It is somewhat hurt.\r";
1115 break; 988 break;
1116 case 4: 989 case 4:
1117 new_draw_info (NDI_UNIQUE, 0, op, "It is in excellent shape."); 990 buf << "It is in excellent shape.\r";
1118 break; 991 break;
1119 } 992 }
993
1120 if (present_in_ob (POISONING, mon) != NULL) 994 if (present_in_ob (POISONING, mon))
1121 new_draw_info (NDI_UNIQUE, 0, op, "It looks very ill."); 995 buf << "It looks very ill.\r";
1122}
1123 996
997 buf << '\n';
998
999 return buf;
1000}
1124 1001
1125/* 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. */
1126char * 1003const char *
1127long_desc (object *tmp, object *pl) 1004long_desc (object *tmp, object *pl)
1128{ 1005{
1129 static char buf[VERY_BIG_BUF]; 1006 static std::string s;
1130 char *cp;
1131 1007
1132 if (tmp == NULL) 1008 return (s = tmp->long_desc (pl)).c_str ();
1133 return ""; 1009}
1134 1010
1135 buf[0] = '\0'; 1011std::string
1012object::long_desc (object *who)
1013{
1014 std::string buf (query_name ());
1015
1136 switch (tmp->type) 1016 switch (type)
1137 { 1017 {
1138 case RING: 1018 case RING:
1139 case SKILL: 1019 case SKILL:
1140 case WEAPON: 1020 case WEAPON:
1141 case ARMOUR: 1021 case ARMOUR:
… …
1144 case SHIELD: 1024 case SHIELD:
1145 case BOOTS: 1025 case BOOTS:
1146 case GLOVES: 1026 case GLOVES:
1147 case AMULET: 1027 case AMULET:
1148 case GIRDLE: 1028 case GIRDLE:
1029 case RANGED:
1149 case BOW: 1030 case BOW:
1150 case ARROW: 1031 case ARROW:
1151 case CLOAK: 1032 case CLOAK:
1152 case FOOD: 1033 case FOOD:
1153 case DRINK: 1034 case DRINK:
1154 case FLESH: 1035 case FLESH:
1155 case SKILL_TOOL: 1036 case SKILL_TOOL:
1037 case LAMP:
1156 case POWER_CRYSTAL: 1038 case POWER_CRYSTAL:
1157 if (*(cp = describe_item (tmp, pl)) != '\0')
1158 { 1039 {
1159 int len; 1040 const char *cp = ::describe_item (this, who);
1160 1041
1161 assign (buf, query_name (tmp)); 1042 if (*cp)
1162 len = strlen (buf);
1163 if (len < VERY_BIG_BUF - 5)
1164 { 1043 {
1165 /* Since we know the length, we save a few cpu cycles by using 1044 buf.append (" ");
1166 * it instead of calling strcat */ 1045 buf.append (cp);
1167 strcpy (buf + len, " ");
1168 len++;
1169 assign (buf + len, cp, VERY_BIG_BUF - len - 1);
1170 } 1046 }
1171 } 1047 }
1172 } 1048 }
1173
1174 if (buf[0] == '\0')
1175 assign (buf, query_name (tmp));
1176 1049
1177 return buf; 1050 return buf;
1178} 1051}
1179 1052
1053/* op is the player
1054 * tmp is the monster being examined.
1055 */
1180void 1056void
1181examine (object *op, object *tmp) 1057examine_monster (object *op, object *tmp)
1182{ 1058{
1183 char buf[VERY_BIG_BUF]; 1059 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1184 int i;
1185
1186 if (tmp == NULL || tmp->type == CLOSE_CON)
1187 return;
1188
1189 strcpy (buf, "That is ");
1190 strncat (buf, long_desc (tmp, op), VERY_BIG_BUF - strlen (buf) - 1);
1191 buf[VERY_BIG_BUF - 1] = 0;
1192
1193 new_draw_info (NDI_UNIQUE, 0, op, buf);
1194 buf[0] = '\0';
1195
1196 if (tmp->custom_name)
1197 {
1198 strcpy (buf, "You call it ");
1199 strncat (buf, tmp->custom_name, VERY_BIG_BUF - strlen (buf) - 1);
1200 buf[VERY_BIG_BUF - 1] = 0;
1201 new_draw_info (NDI_UNIQUE, 0, op, buf);
1202 buf[0] = '\0';
1203 }
1204
1205 switch (tmp->type)
1206 {
1207 case SPELLBOOK:
1208 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) && tmp->inv)
1209 {
1210 sprintf (buf, "%s is a %s level %s spell", &tmp->inv->name, get_levelnumber (tmp->inv->level), &tmp->inv->skill);
1211 }
1212 break;
1213
1214 case BOOK:
1215 if (tmp->msg != NULL)
1216 strcpy (buf, "Something is written in it.");
1217 break;
1218
1219 case CONTAINER:
1220 if (tmp->race != NULL)
1221 {
1222 if (tmp->weight_limit && tmp->stats.Str < 100)
1223 sprintf (buf, "It can hold only %s and its weight limit is %.1f kg.",
1224 &tmp->race, tmp->weight_limit / (10.0 * (100 - tmp->stats.Str)));
1225 else
1226 sprintf (buf, "It can hold only %s.", &tmp->race);
1227 }
1228 else if (tmp->weight_limit && tmp->stats.Str < 100)
1229 sprintf (buf, "Its weight limit is %.1f kg.", tmp->weight_limit / (10.0 * (100 - tmp->stats.Str)));
1230 break;
1231
1232 case WAND:
1233 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1234 sprintf (buf, "It has %d charges left.", tmp->stats.food);
1235 break;
1236 }
1237
1238 if (buf[0] != '\0')
1239 new_draw_info (NDI_UNIQUE, 0, op, buf);
1240
1241 if (tmp->materialname != NULL && !tmp->msg)
1242 {
1243 sprintf (buf, "It is made of: %s.", &tmp->materialname);
1244 new_draw_info (NDI_UNIQUE, 0, op, buf);
1245 }
1246 /* Where to wear this item */
1247 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1248 {
1249 if (tmp->body_info[i] < -1)
1250 {
1251 if (op->body_info[i])
1252 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s (%d)", body_locations[i].use_name, -tmp->body_info[i]);
1253 else
1254 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].nonuse_name);
1255 }
1256 else if (tmp->body_info[i])
1257 {
1258 if (op->body_info[i])
1259 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].use_name);
1260 else
1261 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].nonuse_name);
1262 }
1263 }
1264
1265 if (tmp->weight)
1266 {
1267 sprintf (buf, tmp->nrof > 1 ? "They weigh %3.3f kg." : "It weighs %3.3f kg.", tmp->weight * (tmp->nrof ? tmp->nrof : 1) / 1000.0);
1268 new_draw_info (NDI_UNIQUE, 0, op, buf);
1269 }
1270
1271 if (tmp->value && !QUERY_FLAG (tmp, FLAG_STARTEQUIP) && !QUERY_FLAG (tmp, FLAG_NO_PICK))
1272 {
1273 sprintf (buf, "You reckon %s worth %s.", tmp->nrof > 1 ? "they are" : "it is", query_cost_string (tmp, op, F_TRUE | F_APPROX));
1274 new_draw_info (NDI_UNIQUE, 0, op, buf);
1275 if (is_in_shop (op))
1276 {
1277 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1278 sprintf (buf, "%s would cost you %s.", tmp->nrof > 1 ? "They" : "It", query_cost_string (tmp, op, F_BUY | F_SHOP));
1279 else
1280 sprintf (buf, "You are offered %s for %s.", query_cost_string (tmp, op, F_SELL + F_SHOP), tmp->nrof > 1 ? "them" : "it");
1281 new_draw_info (NDI_UNIQUE, 0, op, buf);
1282 }
1283 }
1284
1285 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1286 examine_monster (op, tmp);
1287
1288 /* Is this item buildable? */
1289 if (QUERY_FLAG (tmp, FLAG_IS_BUILDABLE))
1290 new_draw_info (NDI_UNIQUE, 0, op, "This is a buildable item.");
1291
1292 /* Does the object have a message? Don't show message for all object
1293 * types - especially if the first entry is a match
1294 */
1295 if (tmp->msg && tmp->type != EXIT && tmp->type != BOOK && tmp->type != CORPSE && !tmp->move_on && strncasecmp (tmp->msg, "@match", 7))
1296 {
1297
1298 /* This is just a hack so when identifying the items, we print
1299 * out the extra message
1300 */
1301 if (need_identify (tmp) && QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1302 new_draw_info (NDI_UNIQUE, 0, op, "The object has a story:");
1303
1304 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1305 }
1306 new_draw_info (NDI_UNIQUE, 0, op, " "); /* Blank line */
1307}
1308
1309/*
1310 * inventory prints object's inventory. If inv==NULL then print player's
1311 * inventory.
1312 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1313 */
1314void
1315inventory (object *op, object *inv)
1316{
1317 object *tmp;
1318 char *in;
1319 int items = 0, length;
1320
1321 if (inv == NULL && op == NULL)
1322 {
1323 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?");
1324 return;
1325 }
1326 tmp = inv ? inv->inv : op->inv;
1327
1328 while (tmp)
1329 {
1330 if ((!tmp->invisible &&
1331 (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ)))
1332 items++;
1333 tmp = tmp->below;
1334 }
1335 if (inv == NULL)
1336 { /* player's inventory */
1337 if (items == 0)
1338 {
1339 new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing.");
1340 return;
1341 }
1342 else
1343 {
1344 length = 28;
1345 in = "";
1346 if (op)
1347 clear_win_info (op);
1348 new_draw_info (NDI_UNIQUE, 0, op, "Inventory:");
1349 }
1350 }
1351 else
1352 {
1353 if (items == 0)
1354 return;
1355 else
1356 {
1357 length = 28;
1358 in = " ";
1359 }
1360 }
1361 for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below)
1362 {
1363 if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED))))
1364 continue;
1365 if ((!op || QUERY_FLAG (op, FLAG_WIZ)))
1366 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length,
1367 query_name (tmp), tmp->count, query_weight (tmp));
1368 else
1369 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp));
1370 }
1371 if (!inv && op)
1372 {
1373 new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op));
1374 }
1375} 1060}
1376 1061
1377static void 1062static void
1378display_new_pickup (object *op) 1063display_new_pickup (object *op)
1379{ 1064{
1380 int i = op->contr->mode; 1065 int i = op->contr->mode;
1381 1066
1382 if (!(i & PU_NEWMODE))
1383 return;
1384
1385 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1386 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);
1387 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);
1388 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);
1389 1070
1390 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);
… …
1441 }; 1122 };
1442 1123
1443 if (!params) 1124 if (!params)
1444 { 1125 {
1445 /* if the new mode is used, just print the settings */ 1126 /* if the new mode is used, just print the settings */
1446 if (op->contr->mode & PU_NEWMODE)
1447 {
1448 display_new_pickup (op); 1127 display_new_pickup (op);
1449 return 1;
1450 }
1451 if (1)
1452 LOG (llevDebug, "command_pickup: !params\n");
1453 set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1454 return 0; 1128 return 0;
1455 } 1129 }
1456 1130
1457 while (*params == ' ' && *params) 1131 while (*params == ' ' && *params)
1458 params++; 1132 params++;
… …
1464 for (mode = 0; names[mode]; mode++) 1138 for (mode = 0; names[mode]; mode++)
1465 { 1139 {
1466 if (!strcmp (names[mode], params + 1)) 1140 if (!strcmp (names[mode], params + 1))
1467 { 1141 {
1468 i = op->contr->mode; 1142 i = op->contr->mode;
1469 if (!(i & PU_NEWMODE)) 1143
1470 i = PU_NEWMODE;
1471 if (*params == '+') 1144 if (*params == '+')
1472 i = i | modes[mode]; 1145 i = i | modes[mode];
1473 else 1146 else
1474 i = i & ~modes[mode]; 1147 i = i & ~modes[mode];
1148
1475 op->contr->mode = i; 1149 op->contr->mode = i;
1476 display_new_pickup (op); 1150 display_new_pickup (op);
1477 return 1; 1151 return 1;
1478 } 1152 }
1479 } 1153 }
… …
1481 return 1; 1155 return 1;
1482 } 1156 }
1483 1157
1484 if (sscanf (params, "%u", &i) != 1) 1158 if (sscanf (params, "%u", &i) != 1)
1485 { 1159 {
1486 if (1)
1487 LOG (llevDebug, "command_pickup: params==NULL\n");
1488 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.");
1489 return 1; 1161 return 1;
1490 } 1162 }
1491 set_pickup_mode (op, i); 1163
1164 if (i <= PU_RATIO)
1165 i |= op->contr->mode & ~PU_RATIO;
1166
1167 op->contr->mode = i;
1492 1168
1493 return 1; 1169 return 1;
1494} 1170}
1495 1171
1496void
1497set_pickup_mode (object *op, int i)
1498{
1499 switch (op->contr->mode = i)
1500 {
1501 case 0:
1502 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1503 break;
1504 case 1:
1505 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1506 break;
1507 case 2:
1508 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1509 break;
1510 case 3:
1511 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1512 break;
1513 case 4:
1514 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1515 break;
1516 case 5:
1517 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1518 break;
1519 case 6:
1520 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1521 break;
1522 case 7:
1523 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1524 break;
1525 }
1526}
1527
1528int 1172int
1529command_search_items (object *op, char *params) 1173command_search_items (object *op, char *params)
1530{ 1174{
1531 char buf[MAX_BUF];
1532
1533 if (settings.search_items == FALSE)
1534 return 1;
1535
1536 if (params == NULL) 1175 if (params == NULL)
1537 { 1176 {
1538 if (op->contr->search_str[0] == '\0') 1177 if (op->contr->search_str[0] == '\0')
1539 { 1178 {
1540 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1179 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1541 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");
1542 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'.");
1543 return 1; 1182 return 1;
1544 } 1183 }
1184
1545 op->contr->search_str[0] = '\0'; 1185 op->contr->search_str[0] = '\0';
1546 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1186 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1547 op->update_stats (); 1187 op->contr->queue_stats_update ();
1548 return 1; 1188 return 1;
1549 } 1189 }
1550 if ((int) strlen (params) >= MAX_BUF) 1190
1191 if (strlen (params) >= sizeof (op->contr->search_str))
1551 { 1192 {
1552 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1193 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1553 return 1; 1194 return 1;
1554 } 1195 }
1196
1555 strcpy (op->contr->search_str, params); 1197 strcpy (op->contr->search_str, params);
1556 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));
1557 new_draw_info (NDI_UNIQUE, 0, op, buf); 1199 op->contr->queue_stats_update ();
1558 op->update_stats (); 1200
1559 return 1; 1201 return 1;
1560} 1202}
1561 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