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.24 by root, Tue Dec 12 20:53:03 2006 UTC vs.
Revision 1.133 by root, Sun Jan 29 02:47:05 2017 UTC

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

Diff Legend

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