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