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.46 by root, Tue Apr 24 16:30:29 2007 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * 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
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * 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
19 * 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
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 *
24 */ 23 */
25 24
26/* 25/*
27 * Object (handling) commands 26 * Object (handling) commands
28 */ 27 */
29 28
30#include <global.h> 29#include <global.h>
31#include <loader.h>
32#include <skills.h> 30#include <skills.h>
33#include <sproto.h> 31#include <sproto.h>
34#include <living.h> 32#include <living.h>
35#include <math.h>
36 33
37/* 34/*
38 * Object id parsing functions 35 * Object id parsing functions
39 */ 36 */
40 37
… …
58 * only unapply applied, or apply unapplied objects 55 * only unapply applied, or apply unapplied objects
59 **/ 56 **/
60static object * 57static object *
61find_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)
62{ 59{
63 object *tmp, *best = NULL; 60 object *best = 0;
64 int match_val = 0, tmpmatch; 61 int match_val = 0;
65 62
66 for (tmp = pl->inv; tmp; tmp = tmp->below) 63 for (object *tmp = pl->inv; tmp; tmp = tmp->below)
67 { 64 {
68 if (tmp->invisible) 65 if (tmp->invisible)
69 continue; 66 continue;
67
70 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)
71 { 71 {
72 if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED))) 72 if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED)))
73 continue; 73 continue;
74
74 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED))) 75 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED)))
75 continue; 76 continue;
77
76 match_val = tmpmatch; 78 match_val = tmpmatch;
77 best = tmp; 79 best = tmp;
78 } 80 }
79 } 81 }
82
80 return best; 83 return best;
81} 84}
82 85
83/** 86/**
84 * Shortcut to find_best_apply_object_match(pl, params, AF_NULL); 87 * Shortcut to find_best_apply_object_match(pl, params, AF_NULL);
85 **/ 88 **/
86object * 89object *
87find_best_object_match (object *pl, const char *params) 90find_best_object_match (object *pl, const char *params)
88{ 91{
89 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 }
90} 112}
91 113
92int 114int
93command_uskill (object *pl, char *params) 115command_uskill (object *pl, char *params)
94{ 116{
95 if (!params) 117 if (!params)
96 { 118 {
97 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>");
98 return 0; 120 return 0;
99 } 121 }
122
100 return use_skill (pl, params); 123 return use_skill (pl, params);
101} 124}
102 125
103int 126int
104command_rskill (object *pl, char *params) 127command_rskill (object *pl, char *params)
… …
108 if (!params) 131 if (!params)
109 { 132 {
110 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>");
111 return 0; 134 return 0;
112 } 135 }
136
113 skill = find_skill_by_name (pl, params); 137 skill = find_skill_by_name_fuzzy (pl, params);
114 138
115 if (!skill) 139 if (!skill)
116 { 140 {
117 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);
118 return 0; 146 return 1;
119 }
120 return change_skill (pl, skill, 0);
121} 147}
122
123
124/* These functions (command_search, command_disarm) are really just wrappers for
125 * things like 'use_skill ...'). In fact, they should really be obsoleted
126 * and replaced with those.
127 */
128int
129command_search (object *op, char *params)
130{
131 return use_skill (op, skill_names[SK_FIND_TRAPS]);
132}
133
134int
135command_disarm (object *op, char *params)
136{
137 return use_skill (op, skill_names[SK_DISARM_TRAPS]);
138}
139
140 148
141/* 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
142 * as it includes the object to throw. 150 * as it includes the object to throw.
143 */ 151 */
144int 152int
145command_throw (object *op, char *params) 153command_throw (object *op, char *params)
146{ 154{
147 object *skop;
148
149 skop = find_skill_by_name (op, skill_names[SK_THROWING]); 155 if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING]))
150 if (skop)
151 return do_skill (op, op, skop, op->facing, params); 156 return do_skill (op, op, skop, op->facing, params);
152 else 157 else
153 {
154 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.");
155 } 159
156 return 0; 160 return 0;
157} 161}
158
159 162
160int 163int
161command_apply (object *op, char *params) 164command_apply (object *op, char *params)
162{ 165{
163 if (!params) 166 if (!params)
… …
165 player_apply_below (op); 168 player_apply_below (op);
166 return 0; 169 return 0;
167 } 170 }
168 else 171 else
169 { 172 {
170 apply_flag aflag = (apply_flag) 0; 173 apply_flag aflag = (apply_flag)0;
171 object *inv;
172 174
173 while (*params == ' ') 175 while (*params == ' ')
174 params++; 176 params++;
177
175 if (!strncmp (params, "-a ", 3)) 178 if (!strncmp (params, "-a ", 3))
176 { 179 {
177 aflag = AP_APPLY; 180 aflag = AP_APPLY;
178 params += 3; 181 params += 3;
179 } 182 }
183
180 if (!strncmp (params, "-u ", 3)) 184 if (!strncmp (params, "-u ", 3))
181 { 185 {
182 aflag = AP_UNAPPLY; 186 aflag = AP_UNAPPLY;
183 params += 3; 187 params += 3;
184 } 188 }
189
185 while (*params == ' ') 190 while (*params == ' ')
186 params++; 191 params++;
187 192
188 inv = find_best_apply_object_match (op, params, aflag); 193 if (object *inv = find_best_apply_object_match (op, params, aflag))
189 if (inv)
190 {
191 player_apply (op, inv, aflag, 0); 194 op->apply (inv, aflag);
192 }
193 else 195 else
194 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);
195 } 197 }
198
196 return 0; 199 return 0;
197} 200}
198 201
199/* 202/*
200 * 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
… …
206 * not need to use split_ob and stuff. 209 * not need to use split_ob and stuff.
207 */ 210 */
208int 211int
209sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 212sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
210{ 213{
211
212 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 214 if (!QUERY_FLAG (sack, FLAG_APPLIED))
213 { 215 {
214 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));
215 return 0; 217 return 0;
216 } 218 }
219
217 if (sack == op) 220 if (sack == op)
218 { 221 {
219 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));
220 return 0; 223 return 0;
221 } 224 }
225
222 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)))
223 { 227 {
224 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));
225 return 0; 229 return 0;
226 } 230 }
231
227 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 232 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
228 { 233 {
229 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));
230 return 0; 235 return 0;
231 } 236 }
237
232 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 238 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) *
233 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 239 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
234 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 240 * (100 - sack->stats.Str) / 100) > sack->weight_limit)
235 { 241 {
236 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));
237 return 0; 243 return 0;
238 } 244 }
245
239 /* All other checks pass, must be OK */ 246 /* All other checks pass, must be OK */
240 return 1; 247 return 1;
241} 248}
242 249
243/* Pick up commands follow */ 250/* Pick up commands follow */
… …
248 * pick up (0 means all of them) 255 * pick up (0 means all of them)
249 */ 256 */
250static void 257static void
251pick_up_object (object *pl, object *op, object *tmp, int nrof) 258pick_up_object (object *pl, object *op, object *tmp, int nrof)
252{ 259{
253 /* buf needs to be big (more than 256 chars) because you can get
254 * very long item names.
255 */
256 char buf[HUGE_BUF];
257 object *env = tmp->env; 260 object *env = tmp->env;
258 uint32 weight, effective_weight_limit; 261 uint32 weight, effective_weight_limit;
259 int tmp_nrof = tmp->nrof ? tmp->nrof : 1; 262 int tmp_nrof = tmp->number_of ();
260 263
261 /* 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
262 * 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
263 * (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
264 * containers not allowed as of now) 267 * containers not allowed as of now)
265 */ 268 */
266 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl) 269 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
267 { 270 {
268 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.>");
269 return; 274 return;
270 } 275 }
271 276
272 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 277 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
273 return; 278 return;
274 279
275 if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
276 {
277 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff of smoke!");
278 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
279
280 if (pl->contr)
281 esrv_del_item (pl->contr, tmp->count);
282
283 tmp->destroy ();
284 return;
285 }
286
287 if (nrof > tmp_nrof || nrof == 0) 280 if (nrof > tmp_nrof || nrof <= 0)
288 nrof = tmp_nrof; 281 nrof = tmp_nrof;
289 282
290 /* 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 */
291 weight = tmp->weight * nrof; 284 weight = tmp->weight * nrof;
292 if (tmp->inv) 285 if (tmp->inv)
293 weight += tmp->carrying * (100 - tmp->stats.Str) / 100; 286 weight += tmp->carrying * (100 - tmp->stats.Str) / 100;
294 287
295 if (pl->stats.Str <= MAX_STAT)
296 effective_weight_limit = weight_limit[pl->stats.Str]; 288 effective_weight_limit = weight_limit [min (MAX_STAT, pl->stats.Str)];
297 else
298 effective_weight_limit = weight_limit[MAX_STAT];
299 289
300 if ((pl->weight + pl->carrying + weight) > effective_weight_limit) 290 if ((pl->weight + pl->carrying + weight) > effective_weight_limit)
301 { 291 {
302 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.");
303 return; 293 return;
304 } 294 }
305 295
306 if (nrof != tmp_nrof) 296 if (!can_split (pl, tmp, nrof))
307 {
308 object *tmp2 = tmp;
309
310 tmp = get_split_ob (tmp, nrof);
311 if (!tmp)
312 {
313 new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
314 return; 297 return;
315 }
316 298
317 /* Tell the client what happened to the rest of objects */ 299 if (QUERY_FLAG (tmp, FLAG_UNPAID))
318 if (pl->contr) 300 {
319 if (tmp2->destroyed ()) 301 tmp->flag.reset (FLAG_UNPAID);
320 esrv_del_item (pl->contr, tmp2->count); 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));
321 else 303 tmp->flag.set (FLAG_UNPAID);
322 esrv_update_item (UPD_NROF, pl, tmp2);
323 } 304 }
324 else 305 else
325 { 306 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
326 /* If the object is in a container, send a delete to the client.
327 * - we are moving all the items from the container to elsewhere,
328 * so it needs to be deleted.
329 */
330 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
331 {
332 if (tmp->env && pl->type == PLAYER)
333 esrv_del_item (pl->contr, tmp->count);
334 307
335 tmp->remove (); /* Unlink it */ 308 op->insert (tmp);
336 }
337 }
338
339 if (QUERY_FLAG (tmp, FLAG_UNPAID))
340 sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
341 else
342 sprintf (buf, "You pick up the %s.", query_name (tmp));
343
344 new_draw_info (NDI_UNIQUE, 0, pl, buf);
345
346 tmp = insert_ob_in_ob (tmp, op);
347
348 /* All the stuff below deals with client/server code, and is only
349 * usable by players
350 */
351 if (pl->contr)
352 {
353 esrv_send_item (pl, tmp);
354
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 }
368} 309}
369 310
370/* 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 */
371void 312void
372pick_up (object *op, object *alt) 313pick_up (object *op, object *alt)
… …
382 if (!can_pick (op, alt)) 323 if (!can_pick (op, alt))
383 { 324 {
384 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);
385 goto leave; 326 goto leave;
386 } 327 }
328
387 tmp = alt; 329 tmp = alt;
388 } 330 }
389 else 331 else
390 { 332 {
391 if (op->below == NULL || !can_pick (op, op->below)) 333 if (op->below == NULL || !can_pick (op, op->below))
… …
400 /* Try to catch it. */ 342 /* Try to catch it. */
401 tmp_map = tmp->map; 343 tmp_map = tmp->map;
402 tmp = stop_item (tmp); 344 tmp = stop_item (tmp);
403 if (tmp == NULL) 345 if (tmp == NULL)
404 goto leave; 346 goto leave;
347
405 need_fix_tmp = 1; 348 need_fix_tmp = 1;
406 if (!can_pick (op, tmp)) 349 if (!can_pick (op, tmp))
407 goto leave; 350 goto leave;
408 351
409 if (op->type == PLAYER) 352 if (op->type == PLAYER)
… …
414 } 357 }
415 else 358 else
416 count = tmp->nrof; 359 count = tmp->nrof;
417 360
418 /* container is open, so use it */ 361 /* container is open, so use it */
419 if (op->container) 362 if (tmp->flag [FLAG_STARTEQUIP])
363 alt = op;
364 else if ((alt = op->container_ ()))
420 { 365 {
421 alt = op->container;
422 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 366 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
423 goto leave; 367 goto leave;
424 } 368 }
425 else 369 else
426 { /* non container pickup */ 370 { /* non container pickup */
… …
443 /* here it could be possible to check rent, 387 /* here it could be possible to check rent,
444 * if someone wants to implement it 388 * if someone wants to implement it
445 */ 389 */
446 alt = op; 390 alt = op;
447 } 391 }
392
448#ifdef PICKUP_DEBUG 393#ifdef PICKUP_DEBUG
449 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);
450#endif 395#endif
451 396
452 /* startequip items are not allowed to be put into containers: */ 397 /* startequip items are not allowed to be put into containers: */
… …
479int 424int
480command_take (object *op, char *params) 425command_take (object *op, char *params)
481{ 426{
482 object *tmp, *next; 427 object *tmp, *next;
483 428
484 if (op->container) 429 if (op->container_ ())
485 tmp = op->container->inv; 430 tmp = op->container_ ()->inv;
486 else 431 else
487 { 432 {
488 tmp = op->above; 433 tmp = op->above;
489 if (tmp) 434 if (tmp)
490 while (tmp->above) 435 while (tmp->above)
… …
501 } 446 }
502 447
503 /* Makes processing easier */ 448 /* Makes processing easier */
504 if (params && *params == '\0') 449 if (params && *params == '\0')
505 params = 0; 450 params = 0;
451
452 int cnt = MAX_ITEM_PER_ACTION;
506 453
507 while (tmp) 454 while (tmp)
508 { 455 {
509 next = tmp->below; 456 next = tmp->below;
510 457
… …
517 /* 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
518 * but that probably will make it more difficult to read, and 465 * but that probably will make it more difficult to read, and
519 * not make it any more efficient 466 * not make it any more efficient
520 */ 467 */
521 if (params && item_matched_string (op, tmp, params)) 468 if (params && item_matched_string (op, tmp, params))
469 {
470 if (--cnt < 0) break;
522 pick_up (op, tmp); 471 pick_up (op, tmp);
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 }
528 479
529 tmp = next; 480 tmp = next;
481 }
482
483 if (cnt < 0)
484 {
485 op->failmsg ("Couldn't pick up so many items at once.");
486 return 0;
530 } 487 }
531 488
532 if (!params && !tmp) 489 if (!params && !tmp)
533 { 490 {
534 for (tmp = op->below; tmp; tmp = tmp->below) 491 for (tmp = op->below; tmp; tmp = tmp->below)
535 if (!tmp->invisible) 492 if (!tmp->invisible)
536 { 493 {
537 char buf[MAX_BUF];
538
539 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);
540 new_draw_info (NDI_UNIQUE, 0, op, buf);
541 break; 495 break;
542 } 496 }
543 497
544 if (!tmp) 498 if (!tmp)
545 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.");
546 } 500 }
547 501
548 return 0; 502 return 0;
549} 503}
550 504
551
552/* 505/*
553 * This function was part of drop, now is own function. 506 * This function was part of drop, now is own function.
554 * Player 'op' tries to put object 'tmp' into sack 'sack', 507 * Player 'op' tries to put object 'tmp' into sack 'sack',
555 * 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 *
556 * Note that the 'sack' in question can now be a transport, 510 * Note that the 'sack' in question can now be a transport,
557 * so this function isn't named very good anymore. 511 * so this function isn't named very good anymore.
558 */ 512 */
559void 513void
560put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 514put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
… …
563 char buf[MAX_BUF]; 517 char buf[MAX_BUF];
564 518
565 if (sack == tmp) 519 if (sack == tmp)
566 return; /* Can't put an object in itself */ 520 return; /* Can't put an object in itself */
567 521
568 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 522 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP))
569 { 523 {
570 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));
571 return; 525 return;
572 } 526 }
573 527
574 if (tmp->type == CONTAINER && tmp->inv) 528 if (tmp->type == CONTAINER && tmp->inv)
575 { 529 {
576
577 /* 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
578 * we instead move the contents of that container into the active 531 * we instead move the contents of that container into the active
579 * 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.
580 */ 533 */
581 sack2 = tmp; 534 sack2 = tmp;
… …
583 536
584 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 537 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
585 { 538 {
586 tmp = tmp2->below; 539 tmp = tmp2->below;
587 540
588 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)))
589 {
590 put_object_in_sack (op, sack, tmp2, 0); 542 put_object_in_sack (op, sack, tmp2, 0);
591 }
592 else 543 else
593 { 544 {
594 sprintf (buf, "Your %s fills up.", query_name (sack)); 545 sprintf (buf, "Your %s fills up.", query_name (sack));
595 new_draw_info (NDI_UNIQUE, 0, op, buf); 546 new_draw_info (NDI_UNIQUE, 0, op, buf);
596 break; 547 break;
597 } 548 }
598 } 549 }
599 550
600 esrv_update_item (UPD_WEIGHT, op, sack2);
601 return; 551 return;
602 } 552 }
603 553
604 /* Don't worry about this for containers - our caller should have 554 /* Don't worry about this for containers - our caller should have
605 * already checked this. 555 * already checked this.
606 */ 556 */
607 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)))
608 return; 558 return;
609 559
610 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 560 if (QUERY_FLAG (tmp, FLAG_APPLIED))
611 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 561 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
612 return; 562 return;
613 563
614 /* 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 */
615 if (nrof && tmp->nrof != nrof) 565 if (!can_split (op, tmp, nrof))
616 {
617 object *tmp2 = tmp;
618
619 tmp = get_split_ob (tmp, nrof);
620
621 if (!tmp)
622 {
623 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
624 return; 566 return;
625 }
626 /* Tell a client what happened other objects */
627 if (tmp2->destroyed ())
628 esrv_del_item (op->contr, tmp2->count);
629 else /* this can proably be replaced with an update */
630 esrv_send_item (op, tmp2);
631 }
632 else
633 tmp->remove ();
634 567
635 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));
636 tmp2 = insert_ob_in_ob (tmp, sack); 569 sack->insert (tmp);
637 op->update_stats (); /* This is overkill, fix_player() is called somewhere */ 570}
638 /* in object.c */
639 571
640 /* 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
641 * 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:
642 */ 619 */
643 if (tmp2 != tmp)
644 esrv_del_item (op->contr, tmp->count);
645 620
646 esrv_send_item (op, tmp2); 621 obj->x = dropper->x;
622 obj->y = dropper->y;
647 623
648 /* update the sacks weight */ 624 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
649 esrv_update_item (UPD_WEIGHT, op, sack);
650} 625}
651 626
652/* 627/*
653 * This function was part of drop, now is own function. 628 * This function was part of drop, now is own function.
654 * 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
655 * nrof objects is tried to dropped. 630 * nrof objects are tried to drop.
656 * This is used when dropping objects onto the floor. 631 * This is used when dropping objects onto the floor.
657 */ 632 */
658void 633void
659drop_object (object *op, object *tmp, uint32 nrof) 634drop_object (object *op, object *tmp, uint32 nrof)
660{ 635{
661 char buf[MAX_BUF];
662 object *floor;
663
664 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 636 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
665 return; 637 return;
666 638
667 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 639 if (QUERY_FLAG (tmp, FLAG_APPLIED))
668 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 640 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
669 return; /* can't unapply it */ 641 return; /* can't unapply it */
670
671 //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
672 642
673 /* 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
674 * off 644 * off
675 */ 645 */
676 if (nrof && tmp->nrof != nrof) 646 if (!can_split (op, tmp, nrof))
677 {
678 object *tmp2 = tmp;
679
680 tmp = get_split_ob (tmp, nrof);
681 if (!tmp)
682 {
683 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
684 return;
685 }
686 /* Tell a client what happened rest of objects. tmp2 is now the
687 * original object
688 */
689 if (op->type == PLAYER)
690 {
691 if (tmp2->destroyed ())
692 esrv_del_item (op->contr, tmp2->count);
693 else
694 esrv_send_item (op, tmp2);
695 }
696 }
697 else
698 tmp->remove ();
699
700 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
701 return; 647 return;
702 648
703 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 649 drop_object (op, tmp);
704 {
705 sprintf (buf, "You drop the %s.", query_name (tmp));
706 new_draw_info (NDI_UNIQUE, 0, op, buf);
707 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it.");
708 650
709 if (op->type == PLAYER) 651 if (!tmp->destroyed () && !tmp->is_inserted ())
710 esrv_del_item (op->contr, tmp->count);
711
712 tmp->destroy ();
713 op->update_stats ();
714 return;
715 } 652 {
716 653 // if nothing happened with the object we give it back
717 if (op->type == PLAYER) 654 op->insert (tmp);
718 esrv_del_item (op->contr, tmp->count);
719
720 /* Call this before we update the various windows/players. At least
721 * that we, we know the weight is correct.
722 */
723 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
724 /* in object.c */
725
726 if (op->type == PLAYER)
727 { 655 }
728 /* Need to update the weight for the player */
729 esrv_send_item (op, op);
730 op->contr->ns->floorbox_update ();
731 }
732
733 for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
734 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
735 return;
736
737 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
738 sell_item (tmp, op);
739
740 tmp->x = op->x;
741 tmp->y = op->y;
742
743 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
744} 656}
745 657
746void 658void
747drop (object *op, object *tmp) 659drop (object *op, object *tmp)
748{ 660{
… …
757 if (tmp->env && tmp->env->type != PLAYER) 669 if (tmp->env && tmp->env->type != PLAYER)
758 { 670 {
759 /* Just toss the object - probably shouldn't be hanging 671 /* Just toss the object - probably shouldn't be hanging
760 * around anyways 672 * around anyways
761 */ 673 */
762 tmp->remove ();
763 tmp->destroy (); 674 tmp->destroy ();
764 return; 675 return;
765 } 676 }
766 else 677 else
767 {
768 while (tmp != NULL && tmp->invisible) 678 while (tmp && tmp->invisible)
769 tmp = tmp->below; 679 tmp = tmp->below;
770 }
771 } 680 }
772 681
773 if (tmp == NULL) 682 if (!tmp)
774 { 683 {
775 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.");
776 return; 685 return;
777 } 686 }
687
778 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 688 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
779 { 689 {
780 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 690 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
781 return; 691 return;
782 } 692 }
693
783 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 694 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
784 { 695 {
785#if 0 696#if 0
786 /* 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. */
787 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.");
… …
790 } 701 }
791 702
792 if (op->type == PLAYER && op->contr->last_used == tmp) 703 if (op->type == PLAYER && op->contr->last_used == tmp)
793 op->contr->last_used = tmp->below ? tmp->below 704 op->contr->last_used = tmp->below ? tmp->below
794 : tmp->above ? tmp->above 705 : tmp->above ? tmp->above
795 : 0; 706 : (object *)0;
796 707
797 if (op->container) 708 if (op->container_ ())
798 { 709 {
799 if (op->type == PLAYER) 710 if (op->type == PLAYER)
800 put_object_in_sack (op, op->container, tmp, op->contr->count); 711 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
801 else 712 else
802 put_object_in_sack (op, op->container, tmp, 0); 713 put_object_in_sack (op, op->container_ (), tmp, 0);
803 } 714 }
804 else 715 else
805 { 716 {
806 if (op->type == PLAYER) 717 if (op->type == PLAYER)
807 drop_object (op, tmp, op->contr->count); 718 drop_object (op, tmp, op->contr->count);
… …
811 722
812 if (op->type == PLAYER) 723 if (op->type == PLAYER)
813 op->contr->count = 0; 724 op->contr->count = 0;
814} 725}
815 726
816
817
818/* Command will drop all items that have not been locked */ 727/* Command will drop all items that have not been locked */
819int 728int
820command_dropall (object *op, char *params) 729command_dropall (object *op, char *params)
821{ 730{
822 731
823 object *curinv, *nextinv;
824
825 if (op->inv == NULL) 732 if (op->inv == NULL)
826 { 733 {
827 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 734 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
828 return 0; 735 return 0;
829 } 736 }
830 737
831 curinv = op->inv; 738 object *curinv = op->inv;
739 object *nextinv;
832 740
833 /* 741 /*
834 This is the default. Drops everything not locked or considered 742 This is the default. Drops everything not locked or considered
835 not something that should be dropped. 743 not something that should be dropped.
836 */ 744 */
837 /* 745 /*
838 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
839 the drop() routine will do unknown things to it when dropping 747 the drop() routine will do unknown things to it when dropping
840 in a shop. --Tero.Pelander@utu.fi 748 in a shop. --Tero.Pelander@utu.fi
841 */ 749 */
750 int cnt = MAX_ITEM_PER_ACTION;
842 751
843 if (params == NULL) 752 if (!params)
844 { 753 {
845 while (curinv != NULL) 754 while (curinv)
846 { 755 {
847 nextinv = curinv->below; 756 nextinv = curinv->below;
757
848 while (nextinv && nextinv->type == MONEY) 758 while (nextinv && nextinv->type == MONEY)
849 nextinv = nextinv->below; 759 nextinv = nextinv->below;
760
850 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 761 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED)
851 curinv->type != FOOD && curinv->type != KEY && 762 && curinv->type != MONEY
852 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
853 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 768 && (curinv->type != CONTAINER || op->container_ () != curinv))
854 { 769 {
855 drop (op, curinv); 770 drop (op, curinv);
771 if (--cnt <= 0) break;
856 } 772 }
773
857 curinv = nextinv; 774 curinv = nextinv;
858 } 775 }
859 } 776 }
860
861 else if (strcmp (params, "weapons") == 0) 777 else if (strcmp (params, "weapons") == 0)
862 { 778 {
863 while (curinv != NULL) 779 while (curinv)
864 { 780 {
865 nextinv = curinv->below; 781 nextinv = curinv->below;
782
866 while (nextinv && nextinv->type == MONEY) 783 while (nextinv && nextinv->type == MONEY)
867 nextinv = nextinv->below; 784 nextinv = nextinv->below;
785
868 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)))
869 { 787 {
870 drop (op, curinv); 788 drop (op, curinv);
789 if (--cnt <= 0) break;
871 } 790 }
791
872 curinv = nextinv; 792 curinv = nextinv;
873 } 793 }
874 } 794 }
875
876 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 795 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
877 { 796 {
878 while (curinv != NULL) 797 while (curinv)
879 { 798 {
880 nextinv = curinv->below; 799 nextinv = curinv->below;
800
881 while (nextinv && nextinv->type == MONEY) 801 while (nextinv && nextinv->type == MONEY)
882 nextinv = nextinv->below; 802 nextinv = nextinv->below;
803
883 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))
884 { 805 {
885 drop (op, curinv); 806 drop (op, curinv);
807 if (--cnt <= 0) break;
886 } 808 }
809
887 curinv = nextinv; 810 curinv = nextinv;
888 } 811 }
889 } 812 }
890
891 else if (strcmp (params, "misc") == 0) 813 else if (strcmp (params, "misc") == 0)
892 { 814 {
893 while (curinv != NULL) 815 while (curinv)
894 { 816 {
895 nextinv = curinv->below; 817 nextinv = curinv->below;
818
896 while (nextinv && nextinv->type == MONEY) 819 while (nextinv && nextinv->type == MONEY)
897 nextinv = nextinv->below; 820 nextinv = nextinv->below;
821
898 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))
899 { 823 {
900 switch (curinv->type) 824 switch (curinv->type)
901 { 825 {
902 case HORN: 826 case HORN:
… …
920 break; 844 break;
921 default: 845 default:
922 curinv = nextinv; 846 curinv = nextinv;
923 break; 847 break;
924 } 848 }
849
850 if (--cnt <= 0) break;
925 } 851 }
852
926 curinv = nextinv; 853 curinv = nextinv;
927 } 854 }
928 } 855 }
929 856
930 op->contr->ns->floorbox_update (); 857 if (cnt <= 0)
858 op->failmsg ("Only dropped some items, can't drop that many items at once.");
931 859
932/* draw_look(op);*/ 860/* draw_look(op);*/
933 return 0; 861 return 0;
934} 862}
935 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
936/* 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
937 * comma seperated list. 890 * comma seperated list.
938 */ 891 */
939
940int 892int
941command_drop (object *op, char *params) 893command_drop (object *op, char *params)
942{ 894{
943 object *tmp, *next; 895 object *tmp, *next;
944 int did_one = 0; 896 int did_one = 0;
… …
948 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 900 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
949 return 0; 901 return 0;
950 } 902 }
951 else 903 else
952 { 904 {
905 vector<object *> matched_objs;
906
953 for (tmp = op->inv; tmp; tmp = next) 907 for (tmp = op->inv; tmp; tmp = next)
954 { 908 {
955 next = tmp->below; 909 next = tmp->below;
956 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 910 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
957 continue; 911 continue;
912
958 if (item_matched_string (op, tmp, params)) 913 if (item_matched_string (op, tmp, params))
959 { 914 matched_objs.push_back (tmp);
960 drop (op, tmp);
961 did_one = 1;
962 } 915 }
963 } 916
964 if (!did_one) 917 int cnt = MAX_ITEM_PER_ACTION;
918
919 if (!drop_vector (op, matched_objs, &cnt))
965 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 920 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
966 } 921
967 if (op->type == PLAYER) 922 if (cnt <= 0)
968 { 923 op->failmsg ("Only dropped some items, can't drop that many items at once.");
969 op->contr->count = 0;
970 op->contr->ns->floorbox_update ();
971 }; 924 }
972 925
973/* draw_look(op);*/
974 return 0; 926 return 0;
975} 927}
976 928
977int 929int
978command_examine (object *op, char *params) 930command_examine (object *op, char *params)
… …
981 { 933 {
982 object *tmp = op->below; 934 object *tmp = op->below;
983 935
984 while (tmp && !tmp->client_visible ()) 936 while (tmp && !tmp->client_visible ())
985 tmp = tmp->below; 937 tmp = tmp->below;
938
986 if (tmp) 939 if (tmp)
987 examine (op, tmp); 940 examine (op, tmp);
988 } 941 }
989 else 942 else
990 { 943 {
991 object *tmp = find_best_object_match (op, params); 944 object *tmp = find_best_object_match (op, params);
992 945
993 if (tmp) 946 if (tmp)
994 examine (op, tmp); 947 examine (op, tmp);
995 else 948 else
996 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));
997 } 950 }
951
998 return 0; 952 return 0;
999} 953}
1000 954
1001/* op should be a player. 955/* op should be a player.
1002 * 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
… …
1049 dynbuf_text buf (512, 512); 1003 dynbuf_text buf (512, 512);
1050 1004
1051 object *mon = head ? head : this; 1005 object *mon = head ? head : this;
1052 1006
1053 if (QUERY_FLAG (mon, FLAG_UNDEAD)) 1007 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1054 buf << "It is an undead force.\n"; 1008 buf << "It is an undead force.\r";
1055 1009
1056 if (mon->level > who->level) 1010 if (mon->level > who->level)
1057 buf << "It is likely more powerful than you.\n"; 1011 buf << "It is likely more powerful than you.\r";
1058 else if (mon->level < who->level) 1012 else if (mon->level < who->level)
1059 buf << "It is likely less powerful than you.\n"; 1013 buf << "It is likely less powerful than you.\r";
1060 else 1014 else
1061 buf << "It is probably as powerful as you.\n"; 1015 buf << "It is probably as powerful as you.\r";
1062 1016
1063 if (mon->attacktype & AT_ACID) 1017 if (mon->attacktype & AT_ACID)
1064 buf << "You seem to smell an acrid odor.\n"; 1018 buf << "You seem to smell an acrid odor.\r";
1065 1019
1066 /* 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
1067 * maxhp field? This seems that it should give more accurate results. 1021 * maxhp field? This seems that it should give more accurate results.
1068 */ 1022 */
1069 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 1023 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1070 { /* From 1-4 */ 1024 { /* From 1-4 */
1071 case 1: 1025 case 1:
1072 buf << "It is in a bad shape.\n"; 1026 buf << "It is in a bad shape.\r";
1073 break; 1027 break;
1074 case 2: 1028 case 2:
1075 buf << "It is hurt.\n"; 1029 buf << "It is hurt.\r";
1076 break; 1030 break;
1077 case 3: 1031 case 3:
1078 buf << "It is somewhat hurt.\n"; 1032 buf << "It is somewhat hurt.\r";
1079 break; 1033 break;
1080 case 4: 1034 case 4:
1081 buf << "It is in excellent shape.\n"; 1035 buf << "It is in excellent shape.\r";
1082 break; 1036 break;
1083 } 1037 }
1084 1038
1085 if (present_in_ob (POISONING, mon)) 1039 if (present_in_ob (POISONING, mon))
1086 buf << "It looks very ill.\n"; 1040 buf << "It looks very ill.\r";
1041
1042 buf << '\n';
1087 1043
1088 return buf; 1044 return buf;
1089} 1045}
1090 1046
1091/* 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. */
… …
1098} 1054}
1099 1055
1100std::string 1056std::string
1101object::long_desc (object *who) 1057object::long_desc (object *who)
1102{ 1058{
1103 std::string buf (query_name (this)); 1059 std::string buf (query_name ());
1104 1060
1105 switch (type) 1061 switch (type)
1106 { 1062 {
1107 case RING: 1063 case RING:
1108 case SKILL: 1064 case SKILL:
… …
1120 case CLOAK: 1076 case CLOAK:
1121 case FOOD: 1077 case FOOD:
1122 case DRINK: 1078 case DRINK:
1123 case FLESH: 1079 case FLESH:
1124 case SKILL_TOOL: 1080 case SKILL_TOOL:
1081 case LAMP:
1125 case POWER_CRYSTAL: 1082 case POWER_CRYSTAL:
1126 { 1083 {
1127 const char *cp = ::describe_item (this, who); 1084 const char *cp = ::describe_item (this, who);
1128 1085
1129 if (*cp) 1086 if (*cp)
… …
1144examine_monster (object *op, object *tmp) 1101examine_monster (object *op, object *tmp)
1145{ 1102{
1146 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ()); 1103 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1147} 1104}
1148 1105
1149std::string
1150object::describe (object *who)
1151{
1152 dynbuf_text buf (1024, 1024);
1153
1154 buf.printf ("That is: %s.\n", long_desc (who).c_str ());
1155
1156 if (custom_name)
1157 buf,printf ("You call it %s\n", &custom_name);
1158
1159 switch (type)
1160 {
1161 case SPELLBOOK:
1162 if (flag [FLAG_IDENTIFIED] && inv)
1163 buf.printf ("%s is a %s %s spell\n", &inv->name, get_levelnumber (inv->level), &inv->skill);
1164 break;
1165
1166 case BOOK:
1167 if (msg)
1168 buf << "Something is written in it.\n";
1169 break;
1170
1171 case CONTAINER:
1172 if (race != NULL)
1173 {
1174 if (weight_limit && stats.Str < 100)
1175 buf.printf ("It can hold only %s and its weight limit is %.1f kg.\n",
1176 &race, weight_limit / (10.0 * (100 - stats.Str)));
1177 else
1178 buf.printf ("It can hold only %s.\n", &race);
1179 }
1180 else if (weight_limit && stats.Str < 100)
1181 buf.printf ("Its weight limit is %.1f kg.\n", weight_limit / (10.0 * (100 - stats.Str)));
1182 break;
1183
1184 case WAND:
1185 if (flag [FLAG_IDENTIFIED])
1186 buf.printf ("It has %d charges left.\n", stats.food);
1187 break;
1188 }
1189
1190 if (materialname && !msg)
1191 buf.printf ("It is made of: %s.\n", &materialname);
1192
1193 if (who)
1194 /* Where to wear this item */
1195 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1196 if (body_info [i])
1197 {
1198 buf << "It goes ";
1199 buf << (who->body_info[i] ? body_locations[i].use_name : body_locations[i].nonuse_name);
1200
1201 if (body_info[i] < -1 && who->body_info[i])
1202 buf.printf ("(%d)", -body_info[i]);
1203
1204 buf << ".\n";
1205 }
1206
1207 if (weight)
1208 buf.printf (nrof > 1 ? "They weigh %3.3f kg.\n" : "It weighs %3.3f kg.\n", weight * (nrof ? nrof : 1) / 1000.0);
1209
1210 if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
1211 {
1212 buf.printf ("You reckon %s worth %s.\n", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
1213
1214 if (is_in_shop (who))
1215 {
1216 if (flag [FLAG_UNPAID])
1217 buf.printf ("%s would cost you %s.\n", nrof > 1 ? "They" : "It", query_cost_string (this, who, F_BUY | F_SHOP));
1218 else
1219 buf.printf ("You are offered %s for %s.\n", query_cost_string (this, who, F_SELL + F_SHOP), nrof > 1 ? "them" : "it");
1220 }
1221 }
1222
1223 if (flag [FLAG_MONSTER])
1224 buf << describe_monster (who);
1225
1226 /* Is this item buildable? */
1227 if (flag [FLAG_IS_BUILDABLE])
1228 buf << "This is a buildable item.\n";
1229
1230 /* Does the object have a message? Don't show message for all object
1231 * types - especially if the first entry is a match
1232 */
1233 if (msg && type != EXIT && type != BOOK && type != CORPSE && !move_on && strncasecmp (msg, "@match", 7))
1234 {
1235 /* This is just a hack so when identifying the items, we print
1236 * out the extra message
1237 */
1238 if (need_identify (this) && flag [FLAG_IDENTIFIED])
1239 buf << "The object has a story:\n";
1240
1241 buf << msg << '\n';
1242 }
1243
1244 buf << '\n';
1245
1246 return std::string (buf.linearise (), buf.size ());
1247}
1248
1249void
1250examine (object *op, object *tmp)
1251{
1252 std::string s = tmp->describe (op);
1253
1254 new_draw_info (NDI_UNIQUE, 0, op, s.c_str ());
1255}
1256
1257/*
1258 * inventory prints object's inventory. If inv==NULL then print player's
1259 * inventory.
1260 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1261 */
1262void
1263inventory (object *op, object *inv)
1264{
1265 object *tmp;
1266 const char *in;
1267 int items = 0, length;
1268
1269 if (inv == NULL && op == NULL)
1270 {
1271 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?");
1272 return;
1273 }
1274
1275 tmp = inv ? inv->inv : op->inv;
1276
1277 while (tmp)
1278 {
1279 if ((!tmp->invisible &&
1280 (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ)))
1281 items++;
1282 tmp = tmp->below;
1283 }
1284
1285 if (inv == NULL)
1286 { /* player's inventory */
1287 if (items == 0)
1288 {
1289 new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing.");
1290 return;
1291 }
1292 else
1293 {
1294 length = 28;
1295 in = "";
1296 if (op)
1297 clear_win_info (op);
1298 new_draw_info (NDI_UNIQUE, 0, op, "Inventory:");
1299 }
1300 }
1301 else
1302 {
1303 if (items == 0)
1304 return;
1305 else
1306 {
1307 length = 28;
1308 in = " ";
1309 }
1310 }
1311
1312 for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below)
1313 {
1314 if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED))))
1315 continue;
1316 if ((!op || QUERY_FLAG (op, FLAG_WIZ)))
1317 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length,
1318 query_name (tmp), tmp->count, query_weight (tmp));
1319 else
1320 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp));
1321 }
1322
1323 if (!inv && op)
1324 new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op));
1325}
1326
1327static void 1106static void
1328display_new_pickup (object *op) 1107display_new_pickup (object *op)
1329{ 1108{
1330 int i = op->contr->mode; 1109 int i = op->contr->mode;
1331 1110
1332 if (!(i & PU_NEWMODE))
1333 return;
1334
1335 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1336 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);
1337 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);
1338 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);
1339 1114
1340 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);
… …
1391 }; 1166 };
1392 1167
1393 if (!params) 1168 if (!params)
1394 { 1169 {
1395 /* if the new mode is used, just print the settings */ 1170 /* if the new mode is used, just print the settings */
1396 if (op->contr->mode & PU_NEWMODE)
1397 {
1398 display_new_pickup (op); 1171 display_new_pickup (op);
1399 return 1;
1400 }
1401 if (1)
1402 LOG (llevDebug, "command_pickup: !params\n");
1403 set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1404 return 0; 1172 return 0;
1405 } 1173 }
1406 1174
1407 while (*params == ' ' && *params) 1175 while (*params == ' ' && *params)
1408 params++; 1176 params++;
… …
1414 for (mode = 0; names[mode]; mode++) 1182 for (mode = 0; names[mode]; mode++)
1415 { 1183 {
1416 if (!strcmp (names[mode], params + 1)) 1184 if (!strcmp (names[mode], params + 1))
1417 { 1185 {
1418 i = op->contr->mode; 1186 i = op->contr->mode;
1419 if (!(i & PU_NEWMODE)) 1187
1420 i = PU_NEWMODE;
1421 if (*params == '+') 1188 if (*params == '+')
1422 i = i | modes[mode]; 1189 i = i | modes[mode];
1423 else 1190 else
1424 i = i & ~modes[mode]; 1191 i = i & ~modes[mode];
1192
1425 op->contr->mode = i; 1193 op->contr->mode = i;
1426 display_new_pickup (op); 1194 display_new_pickup (op);
1427 return 1; 1195 return 1;
1428 } 1196 }
1429 } 1197 }
… …
1431 return 1; 1199 return 1;
1432 } 1200 }
1433 1201
1434 if (sscanf (params, "%u", &i) != 1) 1202 if (sscanf (params, "%u", &i) != 1)
1435 { 1203 {
1436 if (1)
1437 LOG (llevDebug, "command_pickup: params==NULL\n");
1438 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.");
1439 return 1; 1205 return 1;
1440 } 1206 }
1441 set_pickup_mode (op, i); 1207
1208 if (i <= PU_RATIO)
1209 i |= op->contr->mode & ~PU_RATIO;
1210
1211 op->contr->mode = i;
1442 1212
1443 return 1; 1213 return 1;
1444}
1445
1446void
1447set_pickup_mode (object *op, int i)
1448{
1449 switch (op->contr->mode = i)
1450 {
1451 case 0:
1452 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1453 break;
1454 case 1:
1455 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1456 break;
1457 case 2:
1458 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1459 break;
1460 case 3:
1461 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1462 break;
1463 case 4:
1464 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1465 break;
1466 case 5:
1467 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1468 break;
1469 case 6:
1470 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1471 break;
1472 case 7:
1473 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1474 break;
1475 }
1476} 1214}
1477 1215
1478int 1216int
1479command_search_items (object *op, char *params) 1217command_search_items (object *op, char *params)
1480{ 1218{
1481 char buf[MAX_BUF];
1482
1483 if (settings.search_items == FALSE)
1484 return 1;
1485
1486 if (params == NULL) 1219 if (params == NULL)
1487 { 1220 {
1488 if (op->contr->search_str[0] == '\0') 1221 if (op->contr->search_str[0] == '\0')
1489 { 1222 {
1490 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1223 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1491 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");
1492 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'.");
1493 return 1; 1226 return 1;
1494 } 1227 }
1495 1228
1496 op->contr->search_str[0] = '\0'; 1229 op->contr->search_str[0] = '\0';
1497 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1230 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1498 op->update_stats (); 1231 op->contr->queue_stats_update ();
1499 return 1; 1232 return 1;
1500 } 1233 }
1501 1234
1502 if ((int) strlen (params) >= MAX_BUF) 1235 if (strlen (params) >= sizeof (op->contr->search_str))
1503 { 1236 {
1504 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1237 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1505 return 1; 1238 return 1;
1506 } 1239 }
1507 1240
1508 strcpy (op->contr->search_str, params); 1241 strcpy (op->contr->search_str, params);
1509 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));
1510 new_draw_info (NDI_UNIQUE, 0, op, buf); 1243 op->contr->queue_stats_update ();
1511 op->update_stats (); 1244
1512 return 1; 1245 return 1;
1513} 1246}
1514 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