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