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.23 by root, Mon Dec 11 23:35:37 2006 UTC vs.
Revision 1.119 by root, Sat Apr 10 04:54:09 2010 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 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) && (QUERY_FLAG (tmp, FLAG_APPLIED)))
71 continue; 73 continue;
74
72 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED))) 75 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, 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;
146
147 skop = find_skill_by_name (op, skill_names[SK_THROWING]); 155 if (object *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
157 162
158int 163int
159command_apply (object *op, char *params) 164command_apply (object *op, char *params)
160{ 165{
161 if (!params) 166 if (!params)
… …
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
210 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 214 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 }
237
230 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 238 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) *
231 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 239 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
232 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 240 * (100 - sack->stats.Str) / 100) > sack->weight_limit)
233 { 241 {
234 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack)); 242 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));
235 return 0; 243 return 0;
236 } 244 }
245
237 /* All other checks pass, must be OK */ 246 /* All other checks pass, must be OK */
238 return 1; 247 return 1;
239} 248}
240 249
241/* Pick up commands follow */ 250/* Pick up commands follow */
… …
246 * pick up (0 means all of them) 255 * pick up (0 means all of them)
247 */ 256 */
248static void 257static void
249pick_up_object (object *pl, object *op, object *tmp, int nrof) 258pick_up_object (object *pl, object *op, object *tmp, int nrof)
250{ 259{
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; 260 object *env = tmp->env;
256 uint32 weight, effective_weight_limit; 261 uint32 weight, effective_weight_limit;
257 int tmp_nrof = tmp->nrof ? tmp->nrof : 1; 262 int tmp_nrof = tmp->number_of ();
258 263
259 /* IF the player is flying & trying to take the item out of a container 264 /* 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 265 * 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 266 * (sack, luggage, etc), tmp->env->env then points to the player (nested
262 * containers not allowed as of now) 267 * containers not allowed as of now)
263 */ 268 */
264 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && is_player_inv (tmp) != pl) 269 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
265 { 270 {
266 new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!"); 271 pl->failmsg ("You are levitating, you can't reach the ground! "
272 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
273 "or waiting till the levitation effect wears off.>");
267 return; 274 return;
268 } 275 }
269 276
270 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 277 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
271 return; 278 return;
272 279
273 if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
274 {
275 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff of smoke!");
276 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
277
278 if (pl->type == PLAYER)
279 esrv_del_item (pl->contr, tmp->count);
280
281 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
282 remove_ob (tmp);
283
284 free_object (tmp);
285 return;
286 }
287
288 if (nrof > tmp_nrof || nrof == 0) 280 if (nrof > tmp_nrof || nrof <= 0)
289 nrof = tmp_nrof; 281 nrof = tmp_nrof;
290 282
291 /* Figure out how much weight this object will add to the player */ 283 /* Figure out how much weight this object will add to the player */
292 weight = tmp->weight * nrof; 284 weight = tmp->weight * nrof;
293 if (tmp->inv) 285 if (tmp->inv)
294 weight += tmp->carrying * (100 - tmp->stats.Str) / 100; 286 weight += tmp->carrying * (100 - tmp->stats.Str) / 100;
295 287
296 if (pl->stats.Str <= MAX_STAT)
297 effective_weight_limit = weight_limit[pl->stats.Str]; 288 effective_weight_limit = weight_limit [min (MAX_STAT, pl->stats.Str)];
298 else
299 effective_weight_limit = weight_limit[MAX_STAT];
300 289
301 if ((pl->weight + pl->carrying + weight) > effective_weight_limit) 290 if ((pl->weight + pl->carrying + weight) > effective_weight_limit)
302 { 291 {
303 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up."); 292 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");
304 return; 293 return;
305 } 294 }
306 295
307 if (settings.real_wiz == FALSE && QUERY_FLAG (pl, FLAG_WAS_WIZ)) 296 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; 297 return;
319 }
320 298
321 /* Tell a client what happened rest of objects */ 299 if (QUERY_FLAG (tmp, FLAG_UNPAID))
322 if (pl->type == PLAYER) 300 {
323 { 301 tmp->flag.reset (FLAG_UNPAID);
324 if (tmp2->destroyed ()) 302 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); 303 tmp->flag.set (FLAG_UNPAID);
326 else
327 esrv_send_item (pl, tmp2);
328 }
329 } 304 }
330 else 305 else
331 { 306 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
332 /* If the object is in a container, send a delete to the client.
333 * - we are moving all the items from the container to elsewhere,
334 * so it needs to be deleted.
335 */
336 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
337 {
338 if (tmp->env && pl->type == PLAYER)
339 esrv_del_item (pl->contr, tmp->count);
340 remove_ob (tmp); /* Unlink it */
341 }
342 }
343 if (QUERY_FLAG (tmp, FLAG_UNPAID))
344 (void) sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
345 else
346 (void) sprintf (buf, "You pick up the %s.", query_name (tmp));
347 new_draw_info (NDI_UNIQUE, 0, pl, buf);
348 307
349 tmp = insert_ob_in_ob (tmp, op); 308 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} 309}
371 310
372/* modified slightly to allow monsters use this -b.t. 5-31-95 */ 311/* modified slightly to allow monsters use this -b.t. 5-31-95 */
373void 312void
374pick_up (object *op, object *alt) 313pick_up (object *op, object *alt)
… …
384 if (!can_pick (op, alt)) 323 if (!can_pick (op, alt))
385 { 324 {
386 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name); 325 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name);
387 goto leave; 326 goto leave;
388 } 327 }
328
389 tmp = alt; 329 tmp = alt;
390 } 330 }
391 else 331 else
392 { 332 {
393 if (op->below == NULL || !can_pick (op, op->below)) 333 if (op->below == NULL || !can_pick (op, op->below))
… …
402 /* Try to catch it. */ 342 /* Try to catch it. */
403 tmp_map = tmp->map; 343 tmp_map = tmp->map;
404 tmp = stop_item (tmp); 344 tmp = stop_item (tmp);
405 if (tmp == NULL) 345 if (tmp == NULL)
406 goto leave; 346 goto leave;
347
407 need_fix_tmp = 1; 348 need_fix_tmp = 1;
408 if (!can_pick (op, tmp)) 349 if (!can_pick (op, tmp))
409 goto leave; 350 goto leave;
410 351
411 if (op->type == PLAYER) 352 if (op->type == PLAYER)
… …
416 } 357 }
417 else 358 else
418 count = tmp->nrof; 359 count = tmp->nrof;
419 360
420 /* container is open, so use it */ 361 /* container is open, so use it */
421 if (op->container) 362 if (tmp->flag [FLAG_STARTEQUIP])
363 alt = op;
364 else if ((alt = op->container_ ()))
422 { 365 {
423 alt = op->container;
424 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 366 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
425 goto leave; 367 goto leave;
426 } 368 }
427 else 369 else
428 { /* non container pickup */ 370 { /* non container pickup */
… …
433 375
434 if (!alt) 376 if (!alt)
435 for (alt = op->inv; alt; alt = alt->below) 377 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)) 378 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count))
437 break; /* General container comes next */ 379 break; /* General container comes next */
380
438 if (!alt) 381 if (!alt)
439 alt = op; /* No free containers */ 382 alt = op; /* No free containers */
440 } 383 }
441 384
442 if (tmp->env == alt) 385 if (tmp->env == alt)
… …
444 /* here it could be possible to check rent, 387 /* here it could be possible to check rent,
445 * if someone wants to implement it 388 * if someone wants to implement it
446 */ 389 */
447 alt = op; 390 alt = op;
448 } 391 }
392
449#ifdef PICKUP_DEBUG 393#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); 394 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
451#endif 395#endif
452 396
453 /* startequip items are not allowed to be put into containers: */ 397 /* startequip items are not allowed to be put into containers: */
… …
469 413
470leave: 414leave:
471 if (need_fix_tmp) 415 if (need_fix_tmp)
472 fix_stopped_item (tmp, tmp_map, op); 416 fix_stopped_item (tmp, tmp_map, op);
473} 417}
474
475 418
476/* This takes (picks up) and item. op is the player 419/* This takes (picks up) and item. op is the player
477 * who issued the command. params is a string to 420 * who issued the command. params is a string to
478 * match against the item name. Basically, always 421 * match against the item name. Basically, always
479 * returns zero, but that should be improved. 422 * returns zero, but that should be improved.
… …
481int 424int
482command_take (object *op, char *params) 425command_take (object *op, char *params)
483{ 426{
484 object *tmp, *next; 427 object *tmp, *next;
485 428
486 if (op->container) 429 if (op->container_ ())
487 tmp = op->container->inv; 430 tmp = op->container_ ()->inv;
488 else 431 else
489 { 432 {
490 tmp = op->above; 433 tmp = op->above;
491 if (tmp) 434 if (tmp)
492 while (tmp->above) 435 while (tmp->above)
… …
494 437
495 if (!tmp) 438 if (!tmp)
496 tmp = op->below; 439 tmp = op->below;
497 } 440 }
498 441
499 if (tmp == NULL) 442 if (!tmp)
500 { 443 {
501 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!"); 444 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!");
502 return 0; 445 return 0;
503 } 446 }
504 447
505 /* Makes processing easier */ 448 /* Makes processing easier */
506 if (params && *params == '\0') 449 if (params && *params == '\0')
507 params = NULL; 450 params = 0;
451
452 int cnt = MAX_ITEM_PER_ACTION;
508 453
509 while (tmp) 454 while (tmp)
510 { 455 {
511 next = tmp->below; 456 next = tmp->below;
512 457
513 if (tmp->invisible) 458 if (tmp->invisible)
514 { 459 {
515 tmp = next; 460 tmp = next;
516 continue; 461 continue;
517 } 462 }
463
518 /* This following two if and else if could be merged into line 464 /* This following two if and else if could be merged into line
519 * but that probably will make it more difficult to read, and 465 * but that probably will make it more difficult to read, and
520 * not make it any more efficient 466 * not make it any more efficient
521 */ 467 */
522 if (params && item_matched_string (op, tmp, params)) 468 if (params && item_matched_string (op, tmp, params))
523 { 469 {
470 if (--cnt < 0) break;
524 pick_up (op, tmp); 471 pick_up (op, tmp);
525 } 472 }
526 else if (can_pick (op, tmp) && !params) 473 else if (can_pick (op, tmp) && !params)
527 { 474 {
475 if (--cnt < 0) break;
528 pick_up (op, tmp); 476 pick_up (op, tmp);
529 break; 477 break;
530 } 478 }
479
531 tmp = next; 480 tmp = next;
532 /* Might as well just skip over the player immediately - 481 }
533 * we know it can't be picked up 482
534 */ 483 if (cnt < 0)
535 if (tmp == op)
536 tmp = tmp->below;
537 } 484 {
485 op->failmsg ("Couldn't pick up so many items at once.");
486 return 0;
487 }
488
538 if (!params && !tmp) 489 if (!params && !tmp)
539 { 490 {
540 for (tmp = op->below; tmp != NULL; tmp = tmp->next) 491 for (tmp = op->below; tmp; tmp = tmp->below)
541 if (!tmp->invisible) 492 if (!tmp->invisible)
542 { 493 {
543 char buf[MAX_BUF];
544
545 sprintf (buf, "You can't pick up a %s.", &tmp->name); 494 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; 495 break;
548 } 496 }
497
549 if (!tmp) 498 if (!tmp)
550 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up."); 499 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");
551 } 500 }
501
552 return 0; 502 return 0;
553} 503}
554 504
555
556/* 505/*
557 * This function was part of drop, now is own function. 506 * This function was part of drop, now is own function.
558 * Player 'op' tries to put object 'tmp' into sack 'sack', 507 * 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. 508 * if nrof is non zero, then nrof objects is tried to put into sack.
509 *
560 * Note that the 'sack' in question can now be a transport, 510 * Note that the 'sack' in question can now be a transport,
561 * so this function isn't named very good anymore. 511 * so this function isn't named very good anymore.
562 */ 512 */
563void 513void
564put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 514put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
… …
567 char buf[MAX_BUF]; 517 char buf[MAX_BUF];
568 518
569 if (sack == tmp) 519 if (sack == tmp)
570 return; /* Can't put an object in itself */ 520 return; /* Can't put an object in itself */
571 521
572 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 522 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP))
573 { 523 {
574 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack)); 524 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));
575 return; 525 return;
576 } 526 }
577 527
578 if (tmp->type == CONTAINER && tmp->inv) 528 if (tmp->type == CONTAINER && tmp->inv)
579 { 529 {
580
581 /* Eneq(@csd.uu.se): If the object to be dropped is a container 530 /* 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 531 * we instead move the contents of that container into the active
583 * container, this is only done if the object has something in it. 532 * container, this is only done if the object has something in it.
584 */ 533 */
585 sack2 = tmp; 534 sack2 = tmp;
… …
587 536
588 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 537 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
589 { 538 {
590 tmp = tmp2->below; 539 tmp = tmp2->below;
591 540
592 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof))) 541 if ((sack->type == CONTAINER && sack_can_hold (op, op->container_ (), tmp2, tmp2->nrof)))
593 {
594 put_object_in_sack (op, sack, tmp2, 0); 542 put_object_in_sack (op, sack, tmp2, 0);
595 }
596 else 543 else
597 { 544 {
598 sprintf (buf, "Your %s fills up.", query_name (sack)); 545 sprintf (buf, "Your %s fills up.", query_name (sack));
599 new_draw_info (NDI_UNIQUE, 0, op, buf); 546 new_draw_info (NDI_UNIQUE, 0, op, buf);
600 break; 547 break;
601 } 548 }
602 } 549 }
603 550
604 esrv_update_item (UPD_WEIGHT, op, sack2);
605 return; 551 return;
606 } 552 }
607 553
608 /* Don't worry about this for containers - our caller should have 554 /* Don't worry about this for containers - our caller should have
609 * already checked this. 555 * already checked this.
610 */ 556 */
611 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof))) 557 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof)))
612 return; 558 return;
613 559
614 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 560 if (QUERY_FLAG (tmp, FLAG_APPLIED))
615 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 561 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
616 return; 562 return;
617 563
618 /* we want to put some portion of the item into the container */ 564 /* we want to put some portion of the item into the container */
619 if (nrof && tmp->nrof != nrof) 565 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; 566 return;
629 }
630 /* Tell a client what happened other objects */
631 if (tmp2->destroyed ())
632 esrv_del_item (op->contr, tmp2->count);
633 else /* this can proably be replaced with an update */
634 esrv_send_item (op, tmp2);
635 }
636 else
637 remove_ob (tmp);
638 567
639 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 568 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); 569 sack->insert (tmp);
641 fix_player (op); /* This is overkill, fix_player() is called somewhere */ 570}
642 /* in object.c */
643 571
644 /* If an object merged (and thus, different object), we need to 572/* In contrast to drop_object (op, tmp, nrof) above this function takes the
645 * delete the original. 573 * already split off object, and feeds it to the event handlers and does
574 * other magic with it.
575 *
576 * <droppper> is the object that dropped this object and <obj> is the
577 * object that was dropped.
578 *
579 * Make sure to check what happened with <obj> after this function returns!
580 * Otherwise you may leak this object.
581 */
582void
583drop_object (object *dropper, object *obj)
584{
585 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
586 return;
587
588 if (obj->destroyed () || obj->is_inserted ())
589 return;
590
591 if (QUERY_FLAG (obj, FLAG_STARTEQUIP))
592 {
593 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
594 dropper->statusmsg ("The god who lent it to you retrieves it.");
595
596 obj->destroy ();
597 dropper->update_stats ();
598 return;
599 }
600
601 for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
602 floor;
603 floor = floor->above)
604 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
605 return;
606
607 if (obj->destroyed () || obj->is_inserted ())
608 return;
609
610 if (dropper->is_in_shop () && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
611 if (!sell_item (obj, dropper))
612 return;
613
614 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
615 return;
616
617 /* If nothing special happened with this object, the default action is to
618 * insert it below the dropper:
646 */ 619 */
647 if (tmp2 != tmp)
648 esrv_del_item (op->contr, tmp->count);
649 620
650 esrv_send_item (op, tmp2); 621 obj->x = dropper->x;
622 obj->y = dropper->y;
651 623
652 /* update the sacks weight */ 624 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
653 esrv_update_item (UPD_WEIGHT, op, sack);
654} 625}
655 626
656/* 627/*
657 * This function was part of drop, now is own function. 628 * This function was part of drop, now is own function.
658 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then 629 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
659 * nrof objects is tried to dropped. 630 * nrof objects are tried to drop.
660 * This is used when dropping objects onto the floor. 631 * This is used when dropping objects onto the floor.
661 */ 632 */
662void 633void
663drop_object (object *op, object *tmp, uint32 nrof) 634drop_object (object *op, object *tmp, uint32 nrof)
664{ 635{
665 char buf[MAX_BUF];
666 object *floor;
667
668 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 636 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
669 return; 637 return;
670 638
671 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 639 if (QUERY_FLAG (tmp, FLAG_APPLIED))
672 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 640 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
673 return; /* can't unapply it */ 641 return; /* can't unapply it */
674 642
675 /* We are only dropping some of the items. We split the current object 643 /* We are only dropping some of the items. We split the current object
676 * off 644 * off
677 */ 645 */
678 if (nrof && tmp->nrof != nrof) 646 if (!can_split (op, tmp, nrof))
679 {
680 object *tmp2 = tmp;
681
682 tmp = get_split_ob (tmp, nrof);
683 if (!tmp)
684 {
685 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
686 return;
687 }
688 /* Tell a client what happened rest of objects. tmp2 is now the
689 * original object
690 */
691 if (op->type == PLAYER)
692 {
693 if (tmp2->destroyed ())
694 esrv_del_item (op->contr, tmp2->count);
695 else
696 esrv_send_item (op, tmp2);
697 }
698 }
699 else
700 remove_ob (tmp);
701
702 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
703 return; 647 return;
704 648
705 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 649 drop_object (op, tmp);
706 { 650
707 sprintf (buf, "You drop the %s.", query_name (tmp)); 651 if (!tmp->destroyed () && !tmp->is_inserted ())
708 new_draw_info (NDI_UNIQUE, 0, op, buf);
709 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it.");
710 if (op->type == PLAYER)
711 esrv_del_item (op->contr, tmp->count);
712 free_object (tmp);
713 fix_player (op);
714 return;
715 } 652 {
716 653 // if nothing happened with the object we give it back
717/* If SAVE_INTERVAL is commented out, we never want to save 654 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 { 655 }
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} 656}
761 657
762void 658void
763drop (object *op, object *tmp) 659drop (object *op, object *tmp)
764{ 660{
… …
773 if (tmp->env && tmp->env->type != PLAYER) 669 if (tmp->env && tmp->env->type != PLAYER)
774 { 670 {
775 /* Just toss the object - probably shouldn't be hanging 671 /* Just toss the object - probably shouldn't be hanging
776 * around anyways 672 * around anyways
777 */ 673 */
778 remove_ob (tmp); 674 tmp->destroy ();
779 free_object (tmp);
780 return; 675 return;
781 } 676 }
782 else 677 else
783 {
784 while (tmp != NULL && tmp->invisible) 678 while (tmp && tmp->invisible)
785 tmp = tmp->below; 679 tmp = tmp->below;
786 }
787 } 680 }
788 681
789 if (tmp == NULL) 682 if (!tmp)
790 { 683 {
791 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); 684 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
792 return; 685 return;
793 } 686 }
687
794 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 688 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
795 { 689 {
796 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 690 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
797 return; 691 return;
798 } 692 }
693
799 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 694 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
800 { 695 {
801#if 0 696#if 0
802 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 697 /* 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."); 698 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
804#endif 699#endif
805 return; 700 return;
806 } 701 }
807 702
808 if (op->type == PLAYER) 703 if (op->type == PLAYER && op->contr->last_used == tmp)
809 { 704 op->contr->last_used = tmp->below ? tmp->below
810 if (op->contr->last_used == tmp && op->contr->last_used_id == tmp->count) 705 : tmp->above ? tmp->above
811 { 706 : (object *)0;
812 object *n = NULL;
813 707
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) 708 if (op->container_ ())
827 { 709 {
828 if (op->type == PLAYER) 710 if (op->type == PLAYER)
829 {
830 put_object_in_sack (op, op->container, tmp, op->contr->count); 711 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
831 }
832 else 712 else
833 {
834 put_object_in_sack (op, op->container, tmp, 0); 713 put_object_in_sack (op, op->container_ (), tmp, 0);
835 };
836 } 714 }
837 else 715 else
838 { 716 {
839 if (op->type == PLAYER) 717 if (op->type == PLAYER)
840 {
841 drop_object (op, tmp, op->contr->count); 718 drop_object (op, tmp, op->contr->count);
842 }
843 else 719 else
844 {
845 drop_object (op, tmp, 0); 720 drop_object (op, tmp, 0);
846 };
847 } 721 }
722
848 if (op->type == PLAYER) 723 if (op->type == PLAYER)
849 op->contr->count = 0; 724 op->contr->count = 0;
850} 725}
851
852
853 726
854/* Command will drop all items that have not been locked */ 727/* Command will drop all items that have not been locked */
855int 728int
856command_dropall (object *op, char *params) 729command_dropall (object *op, char *params)
857{ 730{
858 731
859 object *curinv, *nextinv;
860
861 if (op->inv == NULL) 732 if (op->inv == NULL)
862 { 733 {
863 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 734 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
864 return 0; 735 return 0;
865 } 736 }
866 737
867 curinv = op->inv; 738 object *curinv = op->inv;
739 object *nextinv;
868 740
869 /* 741 /*
870 This is the default. Drops everything not locked or considered 742 This is the default. Drops everything not locked or considered
871 not something that should be dropped. 743 not something that should be dropped.
872 */ 744 */
873 /* 745 /*
874 Care must be taken that the next item pointer is not to money as 746 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 747 the drop() routine will do unknown things to it when dropping
876 in a shop. --Tero.Pelander@utu.fi 748 in a shop. --Tero.Pelander@utu.fi
877 */ 749 */
750 int cnt = MAX_ITEM_PER_ACTION;
878 751
879 if (params == NULL) 752 if (!params)
880 { 753 {
881 while (curinv != NULL) 754 while (curinv)
882 { 755 {
883 nextinv = curinv->below; 756 nextinv = curinv->below;
757
884 while (nextinv && nextinv->type == MONEY) 758 while (nextinv && nextinv->type == MONEY)
885 nextinv = nextinv->below; 759 nextinv = nextinv->below;
760
886 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 761 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED)
887 curinv->type != FOOD && curinv->type != KEY && 762 && curinv->type != MONEY
888 curinv->type != SPECIAL_KEY && curinv->type != GEM && 763 && curinv->type != FOOD
764 && curinv->type != KEY
765 && curinv->type != SPECIAL_KEY
766 && curinv->type != GEM
767 && !curinv->invisible
889 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 768 && (curinv->type != CONTAINER || op->container_ () != curinv))
890 { 769 {
891 drop (op, curinv); 770 drop (op, curinv);
771 if (--cnt <= 0) break;
892 } 772 }
773
893 curinv = nextinv; 774 curinv = nextinv;
894 } 775 }
895 } 776 }
896
897 else if (strcmp (params, "weapons") == 0) 777 else if (strcmp (params, "weapons") == 0)
898 { 778 {
899 while (curinv != NULL) 779 while (curinv)
900 { 780 {
901 nextinv = curinv->below; 781 nextinv = curinv->below;
782
902 while (nextinv && nextinv->type == MONEY) 783 while (nextinv && nextinv->type == MONEY)
903 nextinv = nextinv->below; 784 nextinv = nextinv->below;
785
904 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 786 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
905 { 787 {
906 drop (op, curinv); 788 drop (op, curinv);
789 if (--cnt <= 0) break;
907 } 790 }
791
908 curinv = nextinv; 792 curinv = nextinv;
909 } 793 }
910 } 794 }
911
912 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 795 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
913 { 796 {
914 while (curinv != NULL) 797 while (curinv)
915 { 798 {
916 nextinv = curinv->below; 799 nextinv = curinv->below;
800
917 while (nextinv && nextinv->type == MONEY) 801 while (nextinv && nextinv->type == MONEY)
918 nextinv = nextinv->below; 802 nextinv = nextinv->below;
803
919 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 804 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
920 { 805 {
921 drop (op, curinv); 806 drop (op, curinv);
807 if (--cnt <= 0) break;
922 } 808 }
809
923 curinv = nextinv; 810 curinv = nextinv;
924 } 811 }
925 } 812 }
926
927 else if (strcmp (params, "misc") == 0) 813 else if (strcmp (params, "misc") == 0)
928 { 814 {
929 while (curinv != NULL) 815 while (curinv)
930 { 816 {
931 nextinv = curinv->below; 817 nextinv = curinv->below;
818
932 while (nextinv && nextinv->type == MONEY) 819 while (nextinv && nextinv->type == MONEY)
933 nextinv = nextinv->below; 820 nextinv = nextinv->below;
821
934 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 822 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
935 { 823 {
936 switch (curinv->type) 824 switch (curinv->type)
937 { 825 {
938 case HORN: 826 case HORN:
… …
956 break; 844 break;
957 default: 845 default:
958 curinv = nextinv; 846 curinv = nextinv;
959 break; 847 break;
960 } 848 }
849
850 if (--cnt <= 0) break;
961 } 851 }
852
962 curinv = nextinv; 853 curinv = nextinv;
963 } 854 }
964 } 855 }
965 op->contr->socket.update_look = 1; 856
857 if (cnt <= 0)
858 op->failmsg ("Only dropped some items, can't drop that many items at once.");
966 859
967/* draw_look(op);*/ 860/* draw_look(op);*/
968 return 0; 861 return 0;
969} 862}
970 863
864
865/* This function tries to drop all objects in the <objs> vector.
866 * <dropper> is the object that wants to drop them.
867 * <cnt> can be a 0 pointer or a pointer to the maximum number of
868 * drop operations to perform.
869 *
870 * Returns true if at least one item was dropped.
871 */
872static bool
873drop_vector (object *dropper, vector<object *> &objs, int *cnt)
874{
875 vector<object *>::iterator i;
876
877 bool did_one = false;
878
879 for (i = objs.begin (); i != objs.end (); i++)
880 {
881 drop (dropper, *i);
882 if (cnt && --*cnt <= 0) break;
883 did_one = true;
884 }
885
886 return did_one;
887}
888
971/* Object op wants to drop object(s) params. params can be a 889/* Object op wants to drop object(s) params. params can be a
972 * comma seperated list. 890 * comma seperated list.
973 */ 891 */
974
975int 892int
976command_drop (object *op, char *params) 893command_drop (object *op, char *params)
977{ 894{
978 object *tmp, *next; 895 object *tmp, *next;
979 int did_one = 0; 896 int did_one = 0;
… …
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 (QUERY_FLAG (tmp, 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. 955/* op should be a player.
1037 * we return the object the player has marked with the 'mark' command 956 * we return the object the player has marked with the 'mark' command
… …
1076 } 995 }
1077 996
1078 return 0; 997 return 0;
1079} 998}
1080 999
1081 1000std::string
1082/* op should be a player, params is any params. 1001object::describe_monster (object *who)
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{ 1002{
1089 if (!op->contr) 1003 dynbuf_text buf (512, 512);
1090 return 1;
1091 1004
1092 if (!params) 1005 object *mon = head ? head : this;
1093 {
1094 object *mark = find_marked_object (op);
1095 1006
1096 if (!mark) 1007 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1097 new_draw_info (NDI_UNIQUE, 0, op, "You have no marked object."); 1008 buf << "It is an undead force.\r";
1098 else 1009
1099 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is marked.", query_name (mark)); 1010 if (mon->level > who->level)
1100 } 1011 buf << "It is likely more powerful than you.\r";
1012 else if (mon->level < who->level)
1013 buf << "It is likely less powerful than you.\r";
1101 else 1014 else
1102 { 1015 buf << "It is probably as powerful as you.\r";
1103 object *mark1 = find_best_object_match (op, params);
1104 1016
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) 1017 if (mon->attacktype & AT_ACID)
1139 new_draw_info (NDI_UNIQUE, 0, op, "You seem to smell an acrid odor."); 1018 buf << "You seem to smell an acrid odor.\r";
1140 1019
1141 /* Anyone know why this used to use the clone value instead of the 1020 /* 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. 1021 * maxhp field? This seems that it should give more accurate results.
1143 */ 1022 */
1144 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 1023 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1145 { /* From 1-4 */ 1024 { /* From 1-4 */
1146 case 1: 1025 case 1:
1147 new_draw_info (NDI_UNIQUE, 0, op, "It is in a bad shape."); 1026 buf << "It is in a bad shape.\r";
1148 break; 1027 break;
1149 case 2: 1028 case 2:
1150 new_draw_info (NDI_UNIQUE, 0, op, "It is hurt."); 1029 buf << "It is hurt.\r";
1151 break; 1030 break;
1152 case 3: 1031 case 3:
1153 new_draw_info (NDI_UNIQUE, 0, op, "It is somewhat hurt."); 1032 buf << "It is somewhat hurt.\r";
1154 break; 1033 break;
1155 case 4: 1034 case 4:
1156 new_draw_info (NDI_UNIQUE, 0, op, "It is in excellent shape."); 1035 buf << "It is in excellent shape.\r";
1157 break; 1036 break;
1158 } 1037 }
1038
1159 if (present_in_ob (POISONING, mon) != NULL) 1039 if (present_in_ob (POISONING, mon))
1160 new_draw_info (NDI_UNIQUE, 0, op, "It looks very ill."); 1040 buf << "It looks very ill.\r";
1161}
1162 1041
1042 buf << '\n';
1043
1044 return buf;
1045}
1163 1046
1164/* tmp is the object being described, pl is who is examing it. */ 1047/* tmp is the object being described, pl is who is examing it. */
1165char * 1048const char *
1166long_desc (object *tmp, object *pl) 1049long_desc (object *tmp, object *pl)
1167{ 1050{
1168 static char buf[VERY_BIG_BUF]; 1051 static std::string s;
1169 char *cp;
1170 1052
1171 if (tmp == NULL) 1053 return (s = tmp->long_desc (pl)).c_str ();
1172 return ""; 1054}
1173 1055
1174 buf[0] = '\0'; 1056std::string
1057object::long_desc (object *who)
1058{
1059 std::string buf (query_name ());
1060
1175 switch (tmp->type) 1061 switch (type)
1176 { 1062 {
1177 case RING: 1063 case RING:
1178 case SKILL: 1064 case SKILL:
1179 case WEAPON: 1065 case WEAPON:
1180 case ARMOUR: 1066 case ARMOUR:
… …
1190 case CLOAK: 1076 case CLOAK:
1191 case FOOD: 1077 case FOOD:
1192 case DRINK: 1078 case DRINK:
1193 case FLESH: 1079 case FLESH:
1194 case SKILL_TOOL: 1080 case SKILL_TOOL:
1081 case LAMP:
1195 case POWER_CRYSTAL: 1082 case POWER_CRYSTAL:
1196 if (*(cp = describe_item (tmp, pl)) != '\0')
1197 { 1083 {
1198 int len; 1084 const char *cp = ::describe_item (this, who);
1199 1085
1200 assign (buf, query_name (tmp)); 1086 if (*cp)
1201 len = strlen (buf);
1202 if (len < VERY_BIG_BUF - 5)
1203 { 1087 {
1204 /* Since we know the length, we save a few cpu cycles by using 1088 buf.append (" ");
1205 * it instead of calling strcat */ 1089 buf.append (cp);
1206 strcpy (buf + len, " ");
1207 len++;
1208 assign (buf + len, cp, VERY_BIG_BUF - len - 1);
1209 } 1090 }
1210 } 1091 }
1211 } 1092 }
1212
1213 if (buf[0] == '\0')
1214 assign (buf, query_name (tmp));
1215 1093
1216 return buf; 1094 return buf;
1217} 1095}
1218 1096
1097/* op is the player
1098 * tmp is the monster being examined.
1099 */
1219void 1100void
1220examine (object *op, object *tmp) 1101examine_monster (object *op, object *tmp)
1221{ 1102{
1222 char buf[VERY_BIG_BUF]; 1103 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} 1104}
1415 1105
1416static void 1106static void
1417display_new_pickup (object *op) 1107display_new_pickup (object *op)
1418{ 1108{
1419 int i = op->contr->mode; 1109 int i = op->contr->mode;
1420 1110
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); 1111 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); 1112 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); 1113 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1428 1114
1429 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5); 1115 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
… …
1480 }; 1166 };
1481 1167
1482 if (!params) 1168 if (!params)
1483 { 1169 {
1484 /* if the new mode is used, just print the settings */ 1170 /* if the new mode is used, just print the settings */
1485 if (op->contr->mode & PU_NEWMODE)
1486 {
1487 display_new_pickup (op); 1171 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; 1172 return 0;
1494 } 1173 }
1495 1174
1496 while (*params == ' ' && *params) 1175 while (*params == ' ' && *params)
1497 params++; 1176 params++;
… …
1503 for (mode = 0; names[mode]; mode++) 1182 for (mode = 0; names[mode]; mode++)
1504 { 1183 {
1505 if (!strcmp (names[mode], params + 1)) 1184 if (!strcmp (names[mode], params + 1))
1506 { 1185 {
1507 i = op->contr->mode; 1186 i = op->contr->mode;
1508 if (!(i & PU_NEWMODE)) 1187
1509 i = PU_NEWMODE;
1510 if (*params == '+') 1188 if (*params == '+')
1511 i = i | modes[mode]; 1189 i = i | modes[mode];
1512 else 1190 else
1513 i = i & ~modes[mode]; 1191 i = i & ~modes[mode];
1192
1514 op->contr->mode = i; 1193 op->contr->mode = i;
1515 display_new_pickup (op); 1194 display_new_pickup (op);
1516 return 1; 1195 return 1;
1517 } 1196 }
1518 } 1197 }
… …
1520 return 1; 1199 return 1;
1521 } 1200 }
1522 1201
1523 if (sscanf (params, "%u", &i) != 1) 1202 if (sscanf (params, "%u", &i) != 1)
1524 { 1203 {
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> ."); 1204 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1528 return 1; 1205 return 1;
1529 } 1206 }
1530 set_pickup_mode (op, i); 1207
1208 if (i <= PU_RATIO)
1209 i |= op->contr->mode & ~PU_RATIO;
1210
1211 op->contr->mode = i;
1531 1212
1532 return 1; 1213 return 1;
1533}
1534
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} 1214}
1566 1215
1567int 1216int
1568command_search_items (object *op, char *params) 1217command_search_items (object *op, char *params)
1569{ 1218{
1570 char buf[MAX_BUF];
1571
1572 if (settings.search_items == FALSE)
1573 return 1;
1574
1575 if (params == NULL) 1219 if (params == NULL)
1576 { 1220 {
1577 if (op->contr->search_str[0] == '\0') 1221 if (op->contr->search_str[0] == '\0')
1578 { 1222 {
1579 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1223 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"); 1224 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'."); 1225 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1582 return 1; 1226 return 1;
1583 } 1227 }
1228
1584 op->contr->search_str[0] = '\0'; 1229 op->contr->search_str[0] = '\0';
1585 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1230 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1586 fix_player (op); 1231 op->contr->queue_stats_update ();
1587 return 1; 1232 return 1;
1588 } 1233 }
1589 if ((int) strlen (params) >= MAX_BUF) 1234
1235 if (strlen (params) >= sizeof (op->contr->search_str))
1590 { 1236 {
1591 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1237 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1592 return 1; 1238 return 1;
1593 } 1239 }
1240
1594 strcpy (op->contr->search_str, params); 1241 strcpy (op->contr->search_str, params);
1595 sprintf (buf, "Searching for '%s'.", op->contr->search_str); 1242 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); 1243 op->contr->queue_stats_update ();
1597 fix_player (op); 1244
1598 return 1; 1245 return 1;
1599} 1246}
1600 1247
1248int
1249command_unlock (object *op, char *params)
1250{
1251 /* if the unlock command typed with nothing, unlock everything,
1252 * this might be bad
1253 */
1254 if (params == NULL)
1255 {
1256 for (object *item = op->inv; item; item = item->below)
1257 {
1258 CLEAR_FLAG(item, FLAG_INV_LOCKED);
1259 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with null param.");
1260 esrv_update_item (UPD_FLAGS, op, item);
1261 }
1262 return 0;
1263 }
1264
1265 /* if the unlock command is used with a param,
1266 * unlock what matches. i.e. unlock material, should unlock all the materials
1267 */
1268 for (object *item = op->inv; item; item = item->below)
1269 if (item->name.contains (params))
1270 {
1271 CLEAR_FLAG (item, FLAG_INV_LOCKED);
1272 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with a param.");
1273 esrv_update_item (UPD_FLAGS, op, item);
1274 }
1275
1276 return 0;
1277}
1278
1279int
1280command_lock (object *op, char *params)
1281{
1282 /* if the lock command is typed by itself, lock everything
1283 */
1284 if (params == NULL)
1285 {
1286 for (object *item = op->inv; item; item = item->below)
1287 {
1288 SET_FLAG (item, FLAG_INV_LOCKED);
1289 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with null param.");
1290 esrv_update_item (UPD_FLAGS, op, item);
1291 }
1292 return 0;
1293 }
1294
1295 /* if the lock command is used with a param, lock what matches.
1296 * i.e. lock material, should lock all the materials
1297 */
1298 for (object *item = op->inv; item; item = item->below)
1299 if (item->name.contains (params))
1300 {
1301 SET_FLAG (item, FLAG_INV_LOCKED);
1302 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with param.");
1303 esrv_update_item (UPD_FLAGS, op, item);
1304 }
1305
1306 return 0;
1307}
1308
1309/* op should be a player, params is any params.
1310 * If no params given, we print out the currently marked object.
1311 * otherwise, try to find a matching object - try best match first.
1312 */
1313int
1314command_mark (object *op, char *params)
1315{
1316 if (!params)
1317 {
1318 if (object *mark = find_marked_object (op))
1319 op->statusmsg (format ("%s is marked.", query_name (mark)));
1320 else
1321 op->failmsg ("You have no marked object.");
1322 }
1323 else
1324 {
1325 if (object *mark = find_best_object_match (op, params))
1326 {
1327 op->contr->mark = mark;
1328 op->statusmsg (format ("Marked item %s", query_name (mark)));
1329 }
1330 else
1331 op->failmsgf ("Could not find an object that matches %s", params);
1332 }
1333
1334 return 0; /*shouldnt get here */
1335}
1336

Diff Legend

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