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