ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/c_object.C
(Generate patch)

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