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.39 by root, Sat Feb 10 21:01:10 2007 UTC vs.
Revision 1.133 by root, Sun Jan 29 02:47:05 2017 UTC

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

Diff Legend

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