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