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

Diff Legend

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