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