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