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.16 by root, Thu Sep 14 19:08:39 2006 UTC vs.
Revision 1.119 by root, Sat Apr 10 04:54:09 2010 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
8 it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
18 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 *
22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */
20 24
21 The author can be reached via e-mail to crossfire-devel@real-time.com 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
39#define OBLINKMALLOC(p) if(!((p)=(objectlink *)malloc(sizeof(objectlink))))\
40 fatal(OUT_OF_MEMORY);
41
42#define ADD_ITEM(NEW,COUNT)\ 38#define ADD_ITEM(NEW,COUNT)\
43 if(!first) {\ 39 if(!first) {\
44 OBLINKMALLOC(first);\ 40 first = new objectlink;\
45 last=first;\ 41 last=first;\
46 } else {\ 42 } else {\
47 OBLINKMALLOC(last->next);\ 43 last->next = new objectlink;\
48 last=last->next;\ 44 last=last->next;\
49 }\ 45 }\
50 last->next=NULL;\ 46 last->next=0;\
51 last->ob=(NEW);\ 47 last->ob=(NEW);\
52 last->id=(COUNT); 48 last->id=(COUNT);
53 49
54/** 50/**
55 * Search the inventory of 'pl' for what matches best with params. 51 * Search the inventory of 'pl' for what matches best with params.
… …
59 * only unapply applied, or apply unapplied objects 55 * only unapply applied, or apply unapplied objects
60 **/ 56 **/
61static object * 57static object *
62find_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)
63{ 59{
64 object *tmp, *best = NULL; 60 object *best = 0;
65 int match_val = 0, tmpmatch; 61 int match_val = 0;
66 62
67 for (tmp = pl->inv; tmp; tmp = tmp->below) 63 for (object *tmp = pl->inv; tmp; tmp = tmp->below)
68 { 64 {
69 if (tmp->invisible) 65 if (tmp->invisible)
70 continue; 66 continue;
67
71 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)
72 { 71 {
73 if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED))) 72 if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED)))
74 continue; 73 continue;
74
75 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED))) 75 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED)))
76 continue; 76 continue;
77
77 match_val = tmpmatch; 78 match_val = tmpmatch;
78 best = tmp; 79 best = tmp;
79 } 80 }
80 } 81 }
82
81 return best; 83 return best;
82} 84}
83 85
84/** 86/**
85 * Shortcut to find_best_apply_object_match(pl, params, AF_NULL); 87 * Shortcut to find_best_apply_object_match(pl, params, AF_NULL);
86 **/ 88 **/
87object * 89object *
88find_best_object_match (object *pl, const char *params) 90find_best_object_match (object *pl, const char *params)
89{ 91{
90 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 }
91} 112}
92 113
93int 114int
94command_uskill (object *pl, char *params) 115command_uskill (object *pl, char *params)
95{ 116{
96 if (!params) 117 if (!params)
97 { 118 {
98 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>");
99 return 0; 120 return 0;
100 } 121 }
122
101 return use_skill (pl, params); 123 return use_skill (pl, params);
102} 124}
103 125
104int 126int
105command_rskill (object *pl, char *params) 127command_rskill (object *pl, char *params)
… …
109 if (!params) 131 if (!params)
110 { 132 {
111 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>");
112 return 0; 134 return 0;
113 } 135 }
136
114 skill = find_skill_by_name (pl, params); 137 skill = find_skill_by_name_fuzzy (pl, params);
115 138
116 if (!skill) 139 if (!skill)
117 { 140 {
118 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);
119 return 0; 146 return 1;
120 }
121 return change_skill (pl, skill, 0);
122} 147}
123
124
125/* These functions (command_search, command_disarm) are really just wrappers for
126 * things like 'use_skill ...'). In fact, they should really be obsoleted
127 * and replaced with those.
128 */
129int
130command_search (object *op, char *params)
131{
132 return use_skill (op, skill_names[SK_FIND_TRAPS]);
133}
134
135int
136command_disarm (object *op, char *params)
137{
138 return use_skill (op, skill_names[SK_DISARM_TRAPS]);
139}
140
141 148
142/* 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
143 * as it includes the object to throw. 150 * as it includes the object to throw.
144 */ 151 */
145int 152int
146command_throw (object *op, char *params) 153command_throw (object *op, char *params)
147{ 154{
148 object *skop;
149
150 skop = find_skill_by_name (op, skill_names[SK_THROWING]); 155 if (object *skop = find_skill_by_name (op, skill_names[SK_THROWING]))
151 if (skop)
152 return do_skill (op, op, skop, op->facing, params); 156 return do_skill (op, op, skop, op->facing, params);
153 else 157 else
154 {
155 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.");
156 } 159
157 return 0; 160 return 0;
158} 161}
159
160 162
161int 163int
162command_apply (object *op, char *params) 164command_apply (object *op, char *params)
163{ 165{
164 if (!params) 166 if (!params)
… …
166 player_apply_below (op); 168 player_apply_below (op);
167 return 0; 169 return 0;
168 } 170 }
169 else 171 else
170 { 172 {
171 apply_flag aflag = (apply_flag) 0; 173 apply_flag aflag = (apply_flag)0;
172 object *inv;
173 174
174 while (*params == ' ') 175 while (*params == ' ')
175 params++; 176 params++;
177
176 if (!strncmp (params, "-a ", 3)) 178 if (!strncmp (params, "-a ", 3))
177 { 179 {
178 aflag = AP_APPLY; 180 aflag = AP_APPLY;
179 params += 3; 181 params += 3;
180 } 182 }
183
181 if (!strncmp (params, "-u ", 3)) 184 if (!strncmp (params, "-u ", 3))
182 { 185 {
183 aflag = AP_UNAPPLY; 186 aflag = AP_UNAPPLY;
184 params += 3; 187 params += 3;
185 } 188 }
189
186 while (*params == ' ') 190 while (*params == ' ')
187 params++; 191 params++;
188 192
189 inv = find_best_apply_object_match (op, params, aflag); 193 if (object *inv = find_best_apply_object_match (op, params, aflag))
190 if (inv)
191 {
192 player_apply (op, inv, aflag, 0); 194 op->apply (inv, aflag);
193 }
194 else 195 else
195 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);
196 } 197 }
198
197 return 0; 199 return 0;
198} 200}
199 201
200/* 202/*
201 * 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
… …
207 * not need to use split_ob and stuff. 209 * not need to use split_ob and stuff.
208 */ 210 */
209int 211int
210sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) 212sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
211{ 213{
212
213 if (!QUERY_FLAG (sack, FLAG_APPLIED)) 214 if (!QUERY_FLAG (sack, FLAG_APPLIED))
214 { 215 {
215 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));
216 return 0; 217 return 0;
217 } 218 }
219
218 if (sack == op) 220 if (sack == op)
219 { 221 {
220 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));
221 return 0; 223 return 0;
222 } 224 }
225
223 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)))
224 { 227 {
225 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));
226 return 0; 229 return 0;
227 } 230 }
231
228 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) 232 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
229 { 233 {
230 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));
231 return 0; 235 return 0;
232 } 236 }
237
233 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 238 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) *
234 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 239 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
235 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 240 * (100 - sack->stats.Str) / 100) > sack->weight_limit)
236 { 241 {
237 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));
238 return 0; 243 return 0;
239 } 244 }
245
240 /* All other checks pass, must be OK */ 246 /* All other checks pass, must be OK */
241 return 1; 247 return 1;
242} 248}
243 249
244/* Pick up commands follow */ 250/* Pick up commands follow */
… …
249 * pick up (0 means all of them) 255 * pick up (0 means all of them)
250 */ 256 */
251static void 257static void
252pick_up_object (object *pl, object *op, object *tmp, int nrof) 258pick_up_object (object *pl, object *op, object *tmp, int nrof)
253{ 259{
254 /* buf needs to be big (more than 256 chars) because you can get
255 * very long item names.
256 */
257 char buf[HUGE_BUF];
258 object *env = tmp->env; 260 object *env = tmp->env;
259 uint32 weight, effective_weight_limit; 261 uint32 weight, effective_weight_limit;
260 int tmp_nrof = tmp->nrof ? tmp->nrof : 1; 262 int tmp_nrof = tmp->number_of ();
261 263
262 /* 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
263 * 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
264 * (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
265 * containers not allowed as of now) 267 * containers not allowed as of now)
266 */ 268 */
267 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && is_player_inv (tmp) != pl) 269 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
268 { 270 {
269 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.>");
270 return; 274 return;
271 } 275 }
276
272 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 277 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
273 return; 278 return;
274 if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
275 {
276 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff of smoke!");
277 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
278 if (pl->type == PLAYER)
279 esrv_del_item (pl->contr, tmp->count);
280 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
281 remove_ob (tmp);
282 free_object (tmp);
283 return;
284 }
285 279
286 if (nrof > tmp_nrof || nrof == 0) 280 if (nrof > tmp_nrof || nrof <= 0)
287 nrof = tmp_nrof; 281 nrof = tmp_nrof;
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 if (pl->stats.Str <= MAX_STAT) 287
293 effective_weight_limit = weight_limit[pl->stats.Str]; 288 effective_weight_limit = weight_limit [min (MAX_STAT, pl->stats.Str)];
294 else 289
295 effective_weight_limit = weight_limit[MAX_STAT];
296 if ((pl->weight + pl->carrying + weight) > effective_weight_limit) 290 if ((pl->weight + pl->carrying + weight) > effective_weight_limit)
297 { 291 {
298 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.");
299 return; 293 return;
300 } 294 }
301 if (settings.real_wiz == FALSE && QUERY_FLAG (pl, FLAG_WAS_WIZ))
302 SET_FLAG (tmp, FLAG_WAS_WIZ);
303 if (nrof != tmp_nrof)
304 {
305 object *tmp2 = tmp;
306 tag_t tmp2_tag = tmp2->count;
307 295
308 tmp = get_split_ob (tmp, nrof); 296 if (!can_split (pl, tmp, nrof))
309 if (!tmp)
310 {
311 new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
312 return; 297 return;
313 } 298
314 /* Tell a client what happened rest of objects */ 299 if (QUERY_FLAG (tmp, FLAG_UNPAID))
315 if (pl->type == PLAYER) 300 {
316 { 301 tmp->flag.reset (FLAG_UNPAID);
317 if (was_destroyed (tmp2, tmp2_tag)) 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));
318 esrv_del_item (pl->contr, tmp2_tag); 303 tmp->flag.set (FLAG_UNPAID);
319 else
320 esrv_send_item (pl, tmp2);
321 }
322 } 304 }
323 else 305 else
324 { 306 new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
325 /* If the object is in a container, send a delete to the client.
326 * - we are moving all the items from the container to elsewhere,
327 * so it needs to be deleted.
328 */
329 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
330 {
331 if (tmp->env && pl->type == PLAYER)
332 esrv_del_item (pl->contr, tmp->count);
333 remove_ob (tmp); /* Unlink it */
334 }
335 }
336 if (QUERY_FLAG (tmp, FLAG_UNPAID))
337 (void) sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
338 else
339 (void) sprintf (buf, "You pick up the %s.", query_name (tmp));
340 new_draw_info (NDI_UNIQUE, 0, pl, buf);
341 307
342 tmp = insert_ob_in_ob (tmp, op); 308 op->insert (tmp);
343
344 /* All the stuff below deals with client/server code, and is only
345 * usable by players
346 */
347 if (pl->type != PLAYER)
348 return;
349
350 esrv_send_item (pl, tmp);
351 /* These are needed to update the weight for the container we
352 * are putting the object in.
353 */
354 if (op != pl)
355 {
356 esrv_update_item (UPD_WEIGHT, pl, op);
357 esrv_send_item (pl, pl);
358 }
359
360 /* Update the container the object was in */
361 if (env && env != pl && env != op)
362 esrv_update_item (UPD_WEIGHT, pl, env);
363} 309}
364 310
365 311/* modified slightly to allow monsters use this -b.t. 5-31-95 */
366void 312void
367pick_up (object *op, object *alt) 313pick_up (object *op, object *alt)
368
369/* modified slightly to allow monsters use this -b.t. 5-31-95 */
370{ 314{
371 int need_fix_tmp = 0; 315 int need_fix_tmp = 0;
372 object *tmp = NULL; 316 object *tmp = NULL;
373 mapstruct *tmp_map = NULL; 317 maptile *tmp_map = NULL;
374 int count; 318 int count;
375 tag_t tag;
376 319
377 /* Decide which object to pick. */ 320 /* Decide which object to pick. */
378 if (alt) 321 if (alt)
379 { 322 {
380 if (!can_pick (op, alt)) 323 if (!can_pick (op, alt))
381 { 324 {
382 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);
383 goto leave; 326 goto leave;
384 } 327 }
328
385 tmp = alt; 329 tmp = alt;
386 } 330 }
387 else 331 else
388 { 332 {
389 if (op->below == NULL || !can_pick (op, op->below)) 333 if (op->below == NULL || !can_pick (op, op->below))
390 { 334 {
391 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up here."); 335 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up here.");
392 goto leave; 336 goto leave;
393 } 337 }
338
394 tmp = op->below; 339 tmp = op->below;
395 } 340 }
396 341
397 /* Try to catch it. */ 342 /* Try to catch it. */
398 tmp_map = tmp->map; 343 tmp_map = tmp->map;
399 tmp = stop_item (tmp); 344 tmp = stop_item (tmp);
400 if (tmp == NULL) 345 if (tmp == NULL)
401 goto leave; 346 goto leave;
347
402 need_fix_tmp = 1; 348 need_fix_tmp = 1;
403 if (!can_pick (op, tmp)) 349 if (!can_pick (op, tmp))
404 goto leave; 350 goto leave;
405 351
406 if (op->type == PLAYER) 352 if (op->type == PLAYER)
… …
411 } 357 }
412 else 358 else
413 count = tmp->nrof; 359 count = tmp->nrof;
414 360
415 /* container is open, so use it */ 361 /* container is open, so use it */
416 if (op->container) 362 if (tmp->flag [FLAG_STARTEQUIP])
363 alt = op;
364 else if ((alt = op->container_ ()))
417 { 365 {
418 alt = op->container;
419 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 366 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
420 goto leave; 367 goto leave;
421 } 368 }
422 else 369 else
423 { /* non container pickup */ 370 { /* non container pickup */
… …
428 375
429 if (!alt) 376 if (!alt)
430 for (alt = op->inv; alt; alt = alt->below) 377 for (alt = op->inv; alt; alt = alt->below)
431 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count)) 378 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count))
432 break; /* General container comes next */ 379 break; /* General container comes next */
380
433 if (!alt) 381 if (!alt)
434 alt = op; /* No free containers */ 382 alt = op; /* No free containers */
435 } 383 }
384
436 if (tmp->env == alt) 385 if (tmp->env == alt)
437 { 386 {
438 /* here it could be possible to check rent, 387 /* here it could be possible to check rent,
439 * if someone wants to implement it 388 * if someone wants to implement it
440 */ 389 */
441 alt = op; 390 alt = op;
442 } 391 }
392
443#ifdef PICKUP_DEBUG 393#ifdef PICKUP_DEBUG
444 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);
445#endif 395#endif
446 396
447 /* startequip items are not allowed to be put into containers: */ 397 /* startequip items are not allowed to be put into containers: */
… …
449 { 399 {
450 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!");
451 goto leave; 401 goto leave;
452 } 402 }
453 403
454 tag = tmp->count;
455 pick_up_object (op, alt, tmp, count); 404 pick_up_object (op, alt, tmp, count);
405
456 if (was_destroyed (tmp, tag) || tmp->env) 406 if (tmp->destroyed () || tmp->env)
457 need_fix_tmp = 0; 407 need_fix_tmp = 0;
408
458 if (op->type == PLAYER) 409 if (op->type == PLAYER)
459 op->contr->count = 0; 410 op->contr->count = 0;
411
460 goto leave; 412 goto leave;
461 413
462leave: 414leave:
463 if (need_fix_tmp) 415 if (need_fix_tmp)
464 fix_stopped_item (tmp, tmp_map, op); 416 fix_stopped_item (tmp, tmp_map, op);
465} 417}
466
467 418
468/* This takes (picks up) and item. op is the player 419/* This takes (picks up) and item. op is the player
469 * who issued the command. params is a string to 420 * who issued the command. params is a string to
470 * match against the item name. Basically, always 421 * match against the item name. Basically, always
471 * returns zero, but that should be improved. 422 * returns zero, but that should be improved.
… …
473int 424int
474command_take (object *op, char *params) 425command_take (object *op, char *params)
475{ 426{
476 object *tmp, *next; 427 object *tmp, *next;
477 428
478 if (op->container) 429 if (op->container_ ())
479 tmp = op->container->inv; 430 tmp = op->container_ ()->inv;
480 else 431 else
481 { 432 {
482 tmp = op->above; 433 tmp = op->above;
483 if (tmp) 434 if (tmp)
484 while (tmp->above) 435 while (tmp->above)
485 {
486 tmp = tmp->above; 436 tmp = tmp->above;
487 } 437
488 if (!tmp) 438 if (!tmp)
489 tmp = op->below; 439 tmp = op->below;
490 } 440 }
491 441
492 if (tmp == NULL) 442 if (!tmp)
493 { 443 {
494 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!"); 444 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!");
495 return 0; 445 return 0;
496 } 446 }
497 447
498 /* Makes processing easier */ 448 /* Makes processing easier */
499 if (params && *params == '\0') 449 if (params && *params == '\0')
500 params = NULL; 450 params = 0;
451
452 int cnt = MAX_ITEM_PER_ACTION;
501 453
502 while (tmp) 454 while (tmp)
503 { 455 {
504 next = tmp->below; 456 next = tmp->below;
505 457
506 if (tmp->invisible) 458 if (tmp->invisible)
507 { 459 {
508 tmp = next; 460 tmp = next;
509 continue; 461 continue;
510 } 462 }
463
511 /* 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
512 * but that probably will make it more difficult to read, and 465 * but that probably will make it more difficult to read, and
513 * not make it any more efficient 466 * not make it any more efficient
514 */ 467 */
515 if (params && item_matched_string (op, tmp, params)) 468 if (params && item_matched_string (op, tmp, params))
516 { 469 {
470 if (--cnt < 0) break;
517 pick_up (op, tmp); 471 pick_up (op, tmp);
518 } 472 }
519 else if (can_pick (op, tmp) && !params) 473 else if (can_pick (op, tmp) && !params)
520 { 474 {
475 if (--cnt < 0) break;
521 pick_up (op, tmp); 476 pick_up (op, tmp);
522 break; 477 break;
523 } 478 }
479
524 tmp = next; 480 tmp = next;
525 /* Might as well just skip over the player immediately - 481 }
526 * we know it can't be picked up 482
527 */ 483 if (cnt < 0)
528 if (tmp == op)
529 tmp = tmp->below;
530 } 484 {
485 op->failmsg ("Couldn't pick up so many items at once.");
486 return 0;
487 }
488
531 if (!params && !tmp) 489 if (!params && !tmp)
532 { 490 {
533 for (tmp = op->below; tmp != NULL; tmp = tmp->next) 491 for (tmp = op->below; tmp; tmp = tmp->below)
534 if (!tmp->invisible) 492 if (!tmp->invisible)
535 { 493 {
536 char buf[MAX_BUF];
537
538 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);
539 new_draw_info (NDI_UNIQUE, 0, op, buf);
540 break; 495 break;
541 } 496 }
497
542 if (!tmp) 498 if (!tmp)
543 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.");
544 } 500 }
501
545 return 0; 502 return 0;
546} 503}
547 504
548
549/* 505/*
550 * This function was part of drop, now is own function. 506 * This function was part of drop, now is own function.
551 * Player 'op' tries to put object 'tmp' into sack 'sack', 507 * Player 'op' tries to put object 'tmp' into sack 'sack',
552 * 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 *
553 * Note that the 'sack' in question can now be a transport, 510 * Note that the 'sack' in question can now be a transport,
554 * so this function isn't named very good anymore. 511 * so this function isn't named very good anymore.
555 */ 512 */
556void 513void
557put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 514put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
558{ 515{
559 tag_t tmp_tag, tmp2_tag;
560 object *tmp2, *sack2; 516 object *tmp2, *sack2;
561 char buf[MAX_BUF]; 517 char buf[MAX_BUF];
562 518
563 if (sack == tmp) 519 if (sack == tmp)
564 return; /* Can't put an object in itself */ 520 return; /* Can't put an object in itself */
565 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 521
522 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP))
566 { 523 {
567 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));
568 return; 525 return;
569 } 526 }
527
570 if (tmp->type == CONTAINER && tmp->inv) 528 if (tmp->type == CONTAINER && tmp->inv)
571 { 529 {
572
573 /* 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
574 * we instead move the contents of that container into the active 531 * we instead move the contents of that container into the active
575 * 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.
576 */ 533 */
577 sack2 = tmp; 534 sack2 = tmp;
578 new_draw_info_format (NDI_UNIQUE, 0, op, "You move the items from %s into %s.", query_name (tmp), query_name (sack)); 535 new_draw_info_format (NDI_UNIQUE, 0, op, "You move the items from %s into %s.", query_name (tmp), query_name (sack));
536
579 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 537 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
580 { 538 {
581 tmp = tmp2->below; 539 tmp = tmp2->below;
540
582 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)))
583 {
584 put_object_in_sack (op, sack, tmp2, 0); 542 put_object_in_sack (op, sack, tmp2, 0);
585 }
586 else 543 else
587 { 544 {
588 sprintf (buf, "Your %s fills up.", query_name (sack)); 545 sprintf (buf, "Your %s fills up.", query_name (sack));
589 new_draw_info (NDI_UNIQUE, 0, op, buf); 546 new_draw_info (NDI_UNIQUE, 0, op, buf);
590 break; 547 break;
591 } 548 }
592 } 549 }
593 esrv_update_item (UPD_WEIGHT, op, sack2); 550
594 return; 551 return;
595 } 552 }
596 553
597 /* Don't worry about this for containers - our caller should have 554 /* Don't worry about this for containers - our caller should have
598 * already checked this. 555 * already checked this.
599 */ 556 */
600 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)))
601 return; 558 return;
602 559
603 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 560 if (QUERY_FLAG (tmp, FLAG_APPLIED))
604 {
605 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 561 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
606 return; 562 return;
607 }
608 563
609 /* 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 */
610 if (nrof && tmp->nrof != nrof) 565 if (!can_split (op, tmp, nrof))
611 {
612 object *tmp2 = tmp;
613
614 tmp2_tag = tmp2->count;
615 tmp = get_split_ob (tmp, nrof);
616
617 if (!tmp)
618 {
619 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
620 return; 566 return;
621 }
622 /* Tell a client what happened other objects */
623 if (was_destroyed (tmp2, tmp2_tag))
624 esrv_del_item (op->contr, tmp2_tag);
625 else /* this can proably be replaced with an update */
626 esrv_send_item (op, tmp2);
627 }
628 else
629 remove_ob (tmp);
630 567
631 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));
632 tmp_tag = tmp->count; 569 sack->insert (tmp);
633 tmp2 = insert_ob_in_ob (tmp, sack); 570}
634 fix_player (op); /* This is overkill, fix_player() is called somewhere */
635 /* in object.c */
636 571
637 /* 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
638 * 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:
639 */ 619 */
640 if (tmp2 != tmp)
641 esrv_del_item (op->contr, tmp_tag);
642 620
643 esrv_send_item (op, tmp2); 621 obj->x = dropper->x;
622 obj->y = dropper->y;
644 623
645 /* update the sacks weight */ 624 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
646 esrv_update_item (UPD_WEIGHT, op, sack);
647} 625}
648 626
649/* 627/*
650 * This function was part of drop, now is own function. 628 * This function was part of drop, now is own function.
651 * 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
652 * nrof objects is tried to dropped. 630 * nrof objects are tried to drop.
653 * This is used when dropping objects onto the floor. 631 * This is used when dropping objects onto the floor.
654 */ 632 */
655void 633void
656drop_object (object *op, object *tmp, uint32 nrof) 634drop_object (object *op, object *tmp, uint32 nrof)
657{ 635{
658 char buf[MAX_BUF];
659 object *floor;
660
661 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 636 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
662 return; 637 return;
663 638
664 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 639 if (QUERY_FLAG (tmp, FLAG_APPLIED))
665 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 640 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
666 return; /* can't unapply it */ 641 return; /* can't unapply it */
667 642
668 /* We are only dropping some of the items. We split the current objec 643 /* We are only dropping some of the items. We split the current object
669 * off 644 * off
670 */ 645 */
671 if (nrof && tmp->nrof != nrof) 646 if (!can_split (op, tmp, nrof))
672 {
673 object *tmp2 = tmp;
674 tag_t tmp2_tag = tmp2->count;
675
676 tmp = get_split_ob (tmp, nrof);
677 if (!tmp)
678 {
679 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
680 return;
681 }
682 /* Tell a client what happened rest of objects. tmp2 is now the
683 * original object
684 */
685 if (op->type == PLAYER)
686 {
687 if (was_destroyed (tmp2, tmp2_tag))
688 esrv_del_item (op->contr, tmp2_tag);
689 else
690 esrv_send_item (op, tmp2);
691 }
692 }
693 else
694 remove_ob (tmp);
695
696 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
697 return; 647 return;
698 648
699 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 649 drop_object (op, tmp);
700 { 650
701 sprintf (buf, "You drop the %s.", query_name (tmp)); 651 if (!tmp->destroyed () && !tmp->is_inserted ())
702 new_draw_info (NDI_UNIQUE, 0, op, buf);
703 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it.");
704 if (op->type == PLAYER)
705 esrv_del_item (op->contr, tmp->count);
706 free_object (tmp);
707 fix_player (op);
708 return;
709 } 652 {
710 653 // if nothing happened with the object we give it back
711/* If SAVE_INTERVAL is commented out, we never want to save 654 op->insert (tmp);
712 * the player here.
713 */
714#ifdef SAVE_INTERVAL
715 /* I'm not sure why there is a value check - since the save
716 * is done every SAVE_INTERVAL seconds, why care the value
717 * of what he is dropping?
718 */
719 if (op->type == PLAYER && !QUERY_FLAG (tmp, FLAG_UNPAID) &&
720 (tmp->nrof ? tmp->value * tmp->nrof : tmp->value > 2000) && (op->contr->last_save_time + SAVE_INTERVAL) <= time (NULL))
721 { 655 }
722 save_player (op, 1);
723 op->contr->last_save_time = time (NULL);
724 }
725#endif /* SAVE_INTERVAL */
726
727 if (op->type == PLAYER)
728 esrv_del_item (op->contr, tmp->count);
729
730 /* Call this before we update the various windows/players. At least
731 * that we, we know the weight is correct.
732 */
733 fix_player (op); /* This is overkill, fix_player() is called somewhere */
734 /* in object.c */
735
736 if (op->type == PLAYER)
737 {
738 op->contr->socket.update_look = 1;
739 /* Need to update the weight for the player */
740 esrv_send_item (op, op);
741 }
742
743 for (floor = get_map_ob (op->map, op->x, op->y); floor; floor = floor->above)
744 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
745 return;
746
747 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
748 sell_item (tmp, op);
749
750 tmp->x = op->x;
751 tmp->y = op->y;
752
753 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
754} 656}
755 657
756void 658void
757drop (object *op, object *tmp) 659drop (object *op, object *tmp)
758{ 660{
… …
767 if (tmp->env && tmp->env->type != PLAYER) 669 if (tmp->env && tmp->env->type != PLAYER)
768 { 670 {
769 /* Just toss the object - probably shouldn't be hanging 671 /* Just toss the object - probably shouldn't be hanging
770 * around anyways 672 * around anyways
771 */ 673 */
772 remove_ob (tmp); 674 tmp->destroy ();
773 free_object (tmp);
774 return; 675 return;
775 } 676 }
776 else 677 else
777 {
778 while (tmp != NULL && tmp->invisible) 678 while (tmp && tmp->invisible)
779 tmp = tmp->below; 679 tmp = tmp->below;
780 }
781 } 680 }
782 681
783 if (tmp == NULL) 682 if (!tmp)
784 { 683 {
785 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.");
786 return; 685 return;
787 } 686 }
687
788 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 688 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
789 { 689 {
790 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 690 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
791 return; 691 return;
792 } 692 }
693
793 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 694 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
794 { 695 {
795#if 0 696#if 0
796 /* 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. */
797 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.");
798#endif 699#endif
799 return; 700 return;
800 } 701 }
801 702
802 if (op->type == PLAYER) 703 if (op->type == PLAYER && op->contr->last_used == tmp)
803 { 704 op->contr->last_used = tmp->below ? tmp->below
804 if (op->contr->last_used == tmp && op->contr->last_used_id == tmp->count) 705 : tmp->above ? tmp->above
805 { 706 : (object *)0;
806 object *n = NULL;
807 707
808 if (tmp->below != NULL)
809 n = tmp->below;
810 else if (tmp->above != NULL)
811 n = tmp->above;
812 op->contr->last_used = n;
813 if (n != NULL)
814 op->contr->last_used_id = n->count;
815 else
816 op->contr->last_used_id = 0;
817 }
818 };
819
820 if (op->container) 708 if (op->container_ ())
821 { 709 {
822 if (op->type == PLAYER) 710 if (op->type == PLAYER)
823 {
824 put_object_in_sack (op, op->container, tmp, op->contr->count); 711 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
825 }
826 else 712 else
827 {
828 put_object_in_sack (op, op->container, tmp, 0); 713 put_object_in_sack (op, op->container_ (), tmp, 0);
829 };
830 } 714 }
831 else 715 else
832 { 716 {
833 if (op->type == PLAYER) 717 if (op->type == PLAYER)
834 {
835 drop_object (op, tmp, op->contr->count); 718 drop_object (op, tmp, op->contr->count);
836 }
837 else 719 else
838 {
839 drop_object (op, tmp, 0); 720 drop_object (op, tmp, 0);
840 };
841 } 721 }
722
842 if (op->type == PLAYER) 723 if (op->type == PLAYER)
843 op->contr->count = 0; 724 op->contr->count = 0;
844} 725}
845
846
847 726
848/* Command will drop all items that have not been locked */ 727/* Command will drop all items that have not been locked */
849int 728int
850command_dropall (object *op, char *params) 729command_dropall (object *op, char *params)
851{ 730{
852 731
853 object *curinv, *nextinv;
854
855 if (op->inv == NULL) 732 if (op->inv == NULL)
856 { 733 {
857 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 734 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
858 return 0; 735 return 0;
859 } 736 }
860 737
861 curinv = op->inv; 738 object *curinv = op->inv;
739 object *nextinv;
862 740
863 /* 741 /*
864 This is the default. Drops everything not locked or considered 742 This is the default. Drops everything not locked or considered
865 not something that should be dropped. 743 not something that should be dropped.
866 */ 744 */
867 /* 745 /*
868 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
869 the drop() routine will do unknown things to it when dropping 747 the drop() routine will do unknown things to it when dropping
870 in a shop. --Tero.Pelander@utu.fi 748 in a shop. --Tero.Pelander@utu.fi
871 */ 749 */
750 int cnt = MAX_ITEM_PER_ACTION;
872 751
873 if (params == NULL) 752 if (!params)
874 { 753 {
875 while (curinv != NULL) 754 while (curinv)
876 { 755 {
877 nextinv = curinv->below; 756 nextinv = curinv->below;
757
878 while (nextinv && nextinv->type == MONEY) 758 while (nextinv && nextinv->type == MONEY)
879 nextinv = nextinv->below; 759 nextinv = nextinv->below;
760
880 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 761 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED)
881 curinv->type != FOOD && curinv->type != KEY && 762 && curinv->type != MONEY
882 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
883 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 768 && (curinv->type != CONTAINER || op->container_ () != curinv))
884 { 769 {
885 drop (op, curinv); 770 drop (op, curinv);
771 if (--cnt <= 0) break;
886 } 772 }
773
887 curinv = nextinv; 774 curinv = nextinv;
888 } 775 }
889 } 776 }
890
891 else if (strcmp (params, "weapons") == 0) 777 else if (strcmp (params, "weapons") == 0)
892 { 778 {
893 while (curinv != NULL) 779 while (curinv)
894 { 780 {
895 nextinv = curinv->below; 781 nextinv = curinv->below;
782
896 while (nextinv && nextinv->type == MONEY) 783 while (nextinv && nextinv->type == MONEY)
897 nextinv = nextinv->below; 784 nextinv = nextinv->below;
785
898 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)))
899 { 787 {
900 drop (op, curinv); 788 drop (op, curinv);
789 if (--cnt <= 0) break;
901 } 790 }
791
902 curinv = nextinv; 792 curinv = nextinv;
903 } 793 }
904 } 794 }
905
906 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 795 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
907 { 796 {
908 while (curinv != NULL) 797 while (curinv)
909 { 798 {
910 nextinv = curinv->below; 799 nextinv = curinv->below;
800
911 while (nextinv && nextinv->type == MONEY) 801 while (nextinv && nextinv->type == MONEY)
912 nextinv = nextinv->below; 802 nextinv = nextinv->below;
803
913 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))
914 { 805 {
915 drop (op, curinv); 806 drop (op, curinv);
807 if (--cnt <= 0) break;
916 } 808 }
809
917 curinv = nextinv; 810 curinv = nextinv;
918 } 811 }
919 } 812 }
920
921 else if (strcmp (params, "misc") == 0) 813 else if (strcmp (params, "misc") == 0)
922 { 814 {
923 while (curinv != NULL) 815 while (curinv)
924 { 816 {
925 nextinv = curinv->below; 817 nextinv = curinv->below;
818
926 while (nextinv && nextinv->type == MONEY) 819 while (nextinv && nextinv->type == MONEY)
927 nextinv = nextinv->below; 820 nextinv = nextinv->below;
821
928 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))
929 { 823 {
930 switch (curinv->type) 824 switch (curinv->type)
931 { 825 {
932 case HORN: 826 case HORN:
… …
950 break; 844 break;
951 default: 845 default:
952 curinv = nextinv; 846 curinv = nextinv;
953 break; 847 break;
954 } 848 }
849
850 if (--cnt <= 0) break;
955 } 851 }
852
956 curinv = nextinv; 853 curinv = nextinv;
957 } 854 }
958 } 855 }
959 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.");
960 859
961/* draw_look(op);*/ 860/* draw_look(op);*/
962 return 0; 861 return 0;
963} 862}
964 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
965/* 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
966 * comma seperated list. 890 * comma seperated list.
967 */ 891 */
968
969int 892int
970command_drop (object *op, char *params) 893command_drop (object *op, char *params)
971{ 894{
972 object *tmp, *next; 895 object *tmp, *next;
973 int did_one = 0; 896 int did_one = 0;
… …
977 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?"); 900 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
978 return 0; 901 return 0;
979 } 902 }
980 else 903 else
981 { 904 {
905 vector<object *> matched_objs;
906
982 for (tmp = op->inv; tmp; tmp = next) 907 for (tmp = op->inv; tmp; tmp = next)
983 { 908 {
984 next = tmp->below; 909 next = tmp->below;
985 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible) 910 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
986 continue; 911 continue;
912
987 if (item_matched_string (op, tmp, params)) 913 if (item_matched_string (op, tmp, params))
988 { 914 matched_objs.push_back (tmp);
989 drop (op, tmp);
990 did_one = 1;
991 } 915 }
992 } 916
993 if (!did_one) 917 int cnt = MAX_ITEM_PER_ACTION;
918
919 if (!drop_vector (op, matched_objs, &cnt))
994 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop."); 920 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
995 } 921
996 if (op->type == PLAYER) 922 if (cnt <= 0)
997 { 923 op->failmsg ("Only dropped some items, can't drop that many items at once.");
998 op->contr->count = 0;
999 op->contr->socket.update_look = 1;
1000 }; 924 }
1001 925
1002/* draw_look(op);*/
1003 return 0; 926 return 0;
1004} 927}
1005 928
1006int 929int
1007command_examine (object *op, char *params) 930command_examine (object *op, char *params)
1008{ 931{
1009 if (!params) 932 if (!params)
1010 { 933 {
1011 object *tmp = op->below; 934 object *tmp = op->below;
1012 935
1013 while (tmp && !LOOK_OBJ (tmp)) 936 while (tmp && !tmp->client_visible ())
1014 tmp = tmp->below; 937 tmp = tmp->below;
938
1015 if (tmp) 939 if (tmp)
1016 examine (op, tmp); 940 examine (op, tmp);
1017 } 941 }
1018 else 942 else
1019 { 943 {
1020 object *tmp = find_best_object_match (op, params); 944 object *tmp = find_best_object_match (op, params);
1021 945
1022 if (tmp) 946 if (tmp)
1023 examine (op, tmp); 947 examine (op, tmp);
1024 else 948 else
1025 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));
1026 } 950 }
951
1027 return 0; 952 return 0;
1028} 953}
1029 954
1030/* op should be a player. 955/* op should be a player.
1031 * 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
… …
1038{ 963{
1039 object *tmp; 964 object *tmp;
1040 965
1041 if (!op || !op->contr) 966 if (!op || !op->contr)
1042 return NULL; 967 return NULL;
968
1043 if (!op->contr->mark) 969 if (!op->contr->mark)
1044 { 970 {
1045
1046/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/ 971/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
1047 return NULL; 972 return 0;
1048 } 973 }
974
1049 /* This may seem like overkill, but we need to make sure that they 975 /* This may seem like overkill, but we need to make sure that they
1050 * player hasn't dropped the item. We use count on the off chance that 976 * player hasn't dropped the item. We use count on the off chance that
1051 * an item got reincarnated at some point. 977 * an item got reincarnated at some point.
1052 */ 978 */
1053 for (tmp = op->inv; tmp; tmp = tmp->below) 979 for (tmp = op->inv; tmp; tmp = tmp->below)
1054 { 980 {
1055 if (tmp->invisible) 981 if (tmp->invisible)
1056 continue; 982 continue;
983
1057 if (tmp == op->contr->mark) 984 if (tmp == op->contr->mark)
1058 { 985 {
1059 if (tmp->count == op->contr->mark_count) 986 if (!tmp->destroyed ())
1060 return tmp; 987 return tmp;
1061 else 988 else
1062 { 989 {
1063 op->contr->mark = NULL; 990 op->contr->mark = 0;
1064 op->contr->mark_count = 0;
1065
1066/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/ 991/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
1067 return NULL; 992 return 0;
1068 } 993 }
1069 } 994 }
1070 } 995 }
1071 return NULL;
1072}
1073 996
1074
1075/* op should be a player, params is any params.
1076 * If no params given, we print out the currently marked object.
1077 * otherwise, try to find a matching object - try best match first.
1078 */
1079int
1080command_mark (object *op, char *params)
1081{
1082 if (!op->contr)
1083 return 1; 997 return 0;
1084 if (!params) 998}
1085 {
1086 object *mark = find_marked_object (op);
1087 999
1088 if (!mark) 1000std::string
1089 new_draw_info (NDI_UNIQUE, 0, op, "You have no marked object."); 1001object::describe_monster (object *who)
1090 else 1002{
1091 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is marked.", query_name (mark)); 1003 dynbuf_text buf (512, 512);
1092 } 1004
1005 object *mon = head ? head : this;
1006
1007 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1008 buf << "It is an undead force.\r";
1009
1010 if (mon->level > who->level)
1011 buf << "It is likely more powerful than you.\r";
1012 else if (mon->level < who->level)
1013 buf << "It is likely less powerful than you.\r";
1093 else 1014 else
1094 { 1015 buf << "It is probably as powerful as you.\r";
1095 object *mark1 = find_best_object_match (op, params);
1096 1016
1097 if (!mark1)
1098 {
1099 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params);
1100 return 1;
1101 }
1102 else
1103 {
1104 op->contr->mark = mark1;
1105 op->contr->mark_count = mark1->count;
1106 new_draw_info_format (NDI_UNIQUE, 0, op, "Marked item %s", query_name (mark1));
1107 return 0;
1108 }
1109 }
1110 return 0; /*shouldnt get here */
1111}
1112
1113
1114/* op is the player
1115 * tmp is the monster being examined.
1116 */
1117void
1118examine_monster (object *op, object *tmp)
1119{
1120 object *mon = tmp->head ? tmp->head : tmp;
1121
1122 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1123 new_draw_info (NDI_UNIQUE, 0, op, "It is an undead force.");
1124 if (mon->level > op->level)
1125 new_draw_info (NDI_UNIQUE, 0, op, "It is likely more powerful than you.");
1126 else if (mon->level < op->level)
1127 new_draw_info (NDI_UNIQUE, 0, op, "It is likely less powerful than you.");
1128 else
1129 new_draw_info (NDI_UNIQUE, 0, op, "It is probably as powerful as you.");
1130 if (mon->attacktype & AT_ACID) 1017 if (mon->attacktype & AT_ACID)
1131 new_draw_info (NDI_UNIQUE, 0, op, "You seem to smell an acrid odor."); 1018 buf << "You seem to smell an acrid odor.\r";
1132 1019
1133 /* 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
1134 * maxhp field? This seems that it should give more accurate results. 1021 * maxhp field? This seems that it should give more accurate results.
1135 */ 1022 */
1136 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 1023 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1137 { /* From 1-4 */ 1024 { /* From 1-4 */
1138 case 1: 1025 case 1:
1139 new_draw_info (NDI_UNIQUE, 0, op, "It is in a bad shape."); 1026 buf << "It is in a bad shape.\r";
1140 break; 1027 break;
1141 case 2: 1028 case 2:
1142 new_draw_info (NDI_UNIQUE, 0, op, "It is hurt."); 1029 buf << "It is hurt.\r";
1143 break; 1030 break;
1144 case 3: 1031 case 3:
1145 new_draw_info (NDI_UNIQUE, 0, op, "It is somewhat hurt."); 1032 buf << "It is somewhat hurt.\r";
1146 break; 1033 break;
1147 case 4: 1034 case 4:
1148 new_draw_info (NDI_UNIQUE, 0, op, "It is in excellent shape."); 1035 buf << "It is in excellent shape.\r";
1149 break; 1036 break;
1150 } 1037 }
1038
1151 if (present_in_ob (POISONING, mon) != NULL) 1039 if (present_in_ob (POISONING, mon))
1152 new_draw_info (NDI_UNIQUE, 0, op, "It looks very ill."); 1040 buf << "It looks very ill.\r";
1153}
1154 1041
1042 buf << '\n';
1043
1044 return buf;
1045}
1155 1046
1156/* 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. */
1157char * 1048const char *
1158long_desc (object *tmp, object *pl) 1049long_desc (object *tmp, object *pl)
1159{ 1050{
1160 static char buf[VERY_BIG_BUF]; 1051 static std::string s;
1161 char *cp;
1162 1052
1163 if (tmp == NULL) 1053 return (s = tmp->long_desc (pl)).c_str ();
1164 return ""; 1054}
1165 1055
1166 buf[0] = '\0'; 1056std::string
1057object::long_desc (object *who)
1058{
1059 std::string buf (query_name ());
1060
1167 switch (tmp->type) 1061 switch (type)
1168 { 1062 {
1169 case RING: 1063 case RING:
1170 case SKILL: 1064 case SKILL:
1171 case WEAPON: 1065 case WEAPON:
1172 case ARMOUR: 1066 case ARMOUR:
… …
1182 case CLOAK: 1076 case CLOAK:
1183 case FOOD: 1077 case FOOD:
1184 case DRINK: 1078 case DRINK:
1185 case FLESH: 1079 case FLESH:
1186 case SKILL_TOOL: 1080 case SKILL_TOOL:
1081 case LAMP:
1187 case POWER_CRYSTAL: 1082 case POWER_CRYSTAL:
1188 if (*(cp = describe_item (tmp, pl)) != '\0')
1189 { 1083 {
1190 int len; 1084 const char *cp = ::describe_item (this, who);
1191 1085
1192 assign (buf, query_name (tmp)); 1086 if (*cp)
1193 len = strlen (buf);
1194 if (len < VERY_BIG_BUF - 5)
1195 { 1087 {
1196 /* Since we know the length, we save a few cpu cycles by using 1088 buf.append (" ");
1197 * it instead of calling strcat */ 1089 buf.append (cp);
1198 strcpy (buf + len, " ");
1199 len++;
1200 assign (buf + len, cp, VERY_BIG_BUF - len - 1);
1201 } 1090 }
1202 } 1091 }
1203 } 1092 }
1204
1205 if (buf[0] == '\0')
1206 assign (buf, query_name (tmp));
1207 1093
1208 return buf; 1094 return buf;
1209} 1095}
1210 1096
1097/* op is the player
1098 * tmp is the monster being examined.
1099 */
1211void 1100void
1212examine (object *op, object *tmp) 1101examine_monster (object *op, object *tmp)
1213{ 1102{
1214 char buf[VERY_BIG_BUF]; 1103 new_draw_info (NDI_UNIQUE, 0, op, tmp->describe_monster (op).c_str ());
1215 int i;
1216
1217 if (tmp == NULL || tmp->type == CLOSE_CON)
1218 return;
1219
1220 strcpy (buf, "That is ");
1221 strncat (buf, long_desc (tmp, op), VERY_BIG_BUF - strlen (buf) - 1);
1222 buf[VERY_BIG_BUF - 1] = 0;
1223
1224 new_draw_info (NDI_UNIQUE, 0, op, buf);
1225 buf[0] = '\0';
1226
1227 if (tmp->custom_name)
1228 {
1229 strcpy (buf, "You call it ");
1230 strncat (buf, tmp->custom_name, VERY_BIG_BUF - strlen (buf) - 1);
1231 buf[VERY_BIG_BUF - 1] = 0;
1232 new_draw_info (NDI_UNIQUE, 0, op, buf);
1233 buf[0] = '\0';
1234 }
1235
1236 switch (tmp->type)
1237 {
1238 case SPELLBOOK:
1239 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) && tmp->inv)
1240 {
1241 sprintf (buf, "%s is a %s level %s spell", &tmp->inv->name, get_levelnumber (tmp->inv->level), &tmp->inv->skill);
1242 }
1243 break;
1244
1245 case BOOK:
1246 if (tmp->msg != NULL)
1247 strcpy (buf, "Something is written in it.");
1248 break;
1249
1250 case CONTAINER:
1251 if (tmp->race != NULL)
1252 {
1253 if (tmp->weight_limit && tmp->stats.Str < 100)
1254 sprintf (buf, "It can hold only %s and its weight limit is %.1f kg.",
1255 &tmp->race, tmp->weight_limit / (10.0 * (100 - tmp->stats.Str)));
1256 else
1257 sprintf (buf, "It can hold only %s.", &tmp->race);
1258 }
1259 else if (tmp->weight_limit && tmp->stats.Str < 100)
1260 sprintf (buf, "Its weight limit is %.1f kg.", tmp->weight_limit / (10.0 * (100 - tmp->stats.Str)));
1261 break;
1262
1263 case WAND:
1264 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1265 sprintf (buf, "It has %d charges left.", tmp->stats.food);
1266 break;
1267 }
1268
1269 if (buf[0] != '\0')
1270 new_draw_info (NDI_UNIQUE, 0, op, buf);
1271
1272 if (tmp->materialname != NULL && !tmp->msg)
1273 {
1274 sprintf (buf, "It is made of: %s.", &tmp->materialname);
1275 new_draw_info (NDI_UNIQUE, 0, op, buf);
1276 }
1277 /* Where to wear this item */
1278 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1279 {
1280 if (tmp->body_info[i] < -1)
1281 {
1282 if (op->body_info[i])
1283 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s (%d)", body_locations[i].use_name, -tmp->body_info[i]);
1284 else
1285 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].nonuse_name);
1286 }
1287 else if (tmp->body_info[i])
1288 {
1289 if (op->body_info[i])
1290 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].use_name);
1291 else
1292 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].nonuse_name);
1293 }
1294 }
1295
1296 if (tmp->weight)
1297 {
1298 sprintf (buf, tmp->nrof > 1 ? "They weigh %3.3f kg." : "It weighs %3.3f kg.", tmp->weight * (tmp->nrof ? tmp->nrof : 1) / 1000.0);
1299 new_draw_info (NDI_UNIQUE, 0, op, buf);
1300 }
1301
1302 if (tmp->value && !QUERY_FLAG (tmp, FLAG_STARTEQUIP) && !QUERY_FLAG (tmp, FLAG_NO_PICK))
1303 {
1304 sprintf (buf, "You reckon %s worth %s.", tmp->nrof > 1 ? "they are" : "it is", query_cost_string (tmp, op, F_TRUE | F_APPROX));
1305 new_draw_info (NDI_UNIQUE, 0, op, buf);
1306 if (is_in_shop (op))
1307 {
1308 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1309 sprintf (buf, "%s would cost you %s.", tmp->nrof > 1 ? "They" : "It", query_cost_string (tmp, op, F_BUY | F_SHOP));
1310 else
1311 sprintf (buf, "You are offered %s for %s.", query_cost_string (tmp, op, F_SELL + F_SHOP), tmp->nrof > 1 ? "them" : "it");
1312 new_draw_info (NDI_UNIQUE, 0, op, buf);
1313 }
1314 }
1315
1316 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1317 examine_monster (op, tmp);
1318
1319 /* Is this item buildable? */
1320 if (QUERY_FLAG (tmp, FLAG_IS_BUILDABLE))
1321 new_draw_info (NDI_UNIQUE, 0, op, "This is a buildable item.");
1322
1323 /* Does the object have a message? Don't show message for all object
1324 * types - especially if the first entry is a match
1325 */
1326 if (tmp->msg && tmp->type != EXIT && tmp->type != BOOK && tmp->type != CORPSE && !tmp->move_on && strncasecmp (tmp->msg, "@match", 7))
1327 {
1328
1329 /* This is just a hack so when identifying the items, we print
1330 * out the extra message
1331 */
1332 if (need_identify (tmp) && QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1333 new_draw_info (NDI_UNIQUE, 0, op, "The object has a story:");
1334
1335 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1336 }
1337 new_draw_info (NDI_UNIQUE, 0, op, " "); /* Blank line */
1338}
1339
1340/*
1341 * inventory prints object's inventory. If inv==NULL then print player's
1342 * inventory.
1343 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1344 */
1345void
1346inventory (object *op, object *inv)
1347{
1348 object *tmp;
1349 char *in;
1350 int items = 0, length;
1351
1352 if (inv == NULL && op == NULL)
1353 {
1354 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?");
1355 return;
1356 }
1357 tmp = inv ? inv->inv : op->inv;
1358
1359 while (tmp)
1360 {
1361 if ((!tmp->invisible &&
1362 (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ)))
1363 items++;
1364 tmp = tmp->below;
1365 }
1366 if (inv == NULL)
1367 { /* player's inventory */
1368 if (items == 0)
1369 {
1370 new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing.");
1371 return;
1372 }
1373 else
1374 {
1375 length = 28;
1376 in = "";
1377 if (op)
1378 clear_win_info (op);
1379 new_draw_info (NDI_UNIQUE, 0, op, "Inventory:");
1380 }
1381 }
1382 else
1383 {
1384 if (items == 0)
1385 return;
1386 else
1387 {
1388 length = 28;
1389 in = " ";
1390 }
1391 }
1392 for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below)
1393 {
1394 if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED))))
1395 continue;
1396 if ((!op || QUERY_FLAG (op, FLAG_WIZ)))
1397 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length,
1398 query_name (tmp), tmp->count, query_weight (tmp));
1399 else
1400 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp));
1401 }
1402 if (!inv && op)
1403 {
1404 new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op));
1405 }
1406} 1104}
1407 1105
1408static void 1106static void
1409display_new_pickup (object *op) 1107display_new_pickup (object *op)
1410{ 1108{
1411 int i = op->contr->mode; 1109 int i = op->contr->mode;
1412 1110
1413 if (!(i & PU_NEWMODE))
1414 return;
1415
1416 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1417 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);
1418 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);
1419 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);
1420 1114
1421 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);
… …
1447 new_draw_info_format (NDI_UNIQUE, 0, op, "%d MAGICDEVICE", i & PU_MAGIC_DEVICE ? 1 : 0); 1141 new_draw_info_format (NDI_UNIQUE, 0, op, "%d MAGICDEVICE", i & PU_MAGIC_DEVICE ? 1 : 0);
1448 1142
1449 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NOT CURSED", i & PU_NOT_CURSED ? 1 : 0); 1143 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NOT CURSED", i & PU_NOT_CURSED ? 1 : 0);
1450 1144
1451 new_draw_info_format (NDI_UNIQUE, 0, op, "%d JEWELS", i & PU_JEWELS ? 1 : 0); 1145 new_draw_info_format (NDI_UNIQUE, 0, op, "%d JEWELS", i & PU_JEWELS ? 1 : 0);
1146 new_draw_info_format (NDI_UNIQUE, 0, op, "%d FLESH", i & PU_FLESH ? 1 : 0);
1452 1147
1453 new_draw_info_format (NDI_UNIQUE, 0, op, ""); 1148 new_draw_info_format (NDI_UNIQUE, 0, op, "");
1454} 1149}
1455 1150
1456int 1151int
… …
1458{ 1153{
1459 uint32 i; 1154 uint32 i;
1460 static const char *names[] = { 1155 static const char *names[] = {
1461 "debug", "inhibit", "stop", "food", "drink", "valuables", "bow", "arrow", "helmet", 1156 "debug", "inhibit", "stop", "food", "drink", "valuables", "bow", "arrow", "helmet",
1462 "shield", "armour", "boots", "gloves", "cloak", "key", "missile", "allweapon", 1157 "shield", "armour", "boots", "gloves", "cloak", "key", "missile", "allweapon",
1463 "magical", "potion", "spellbook", "skillscroll", "readables", "magicdevice", "notcursed", "jewels", NULL 1158 "magical", "potion", "spellbook", "skillscroll", "readables", "magicdevice", "notcursed",
1159 "jewels", "flesh", NULL
1464 }; 1160 };
1465 static uint32 modes[] = { 1161 static uint32 modes[] = {
1466 PU_DEBUG, PU_INHIBIT, PU_STOP, PU_FOOD, PU_DRINK, PU_VALUABLES, PU_BOW, PU_ARROW, PU_HELMET, 1162 PU_DEBUG, PU_INHIBIT, PU_STOP, PU_FOOD, PU_DRINK, PU_VALUABLES, PU_BOW, PU_ARROW, PU_HELMET,
1467 PU_SHIELD, PU_ARMOUR, PU_BOOTS, PU_GLOVES, PU_CLOAK, PU_KEY, PU_MISSILEWEAPON, PU_ALLWEAPON, 1163 PU_SHIELD, PU_ARMOUR, PU_BOOTS, PU_GLOVES, PU_CLOAK, PU_KEY, PU_MISSILEWEAPON, PU_ALLWEAPON,
1468 PU_MAGICAL, PU_POTION, PU_SPELLBOOK, PU_SKILLSCROLL, PU_READABLES, PU_MAGIC_DEVICE, PU_NOT_CURSED, PU_JEWELS, 0 1164 PU_MAGICAL, PU_POTION, PU_SPELLBOOK, PU_SKILLSCROLL, PU_READABLES, PU_MAGIC_DEVICE, PU_NOT_CURSED,
1165 PU_JEWELS, PU_FLESH, 0
1469 }; 1166 };
1470 1167
1471 if (!params) 1168 if (!params)
1472 { 1169 {
1473 /* if the new mode is used, just print the settings */ 1170 /* if the new mode is used, just print the settings */
1474 if (op->contr->mode & PU_NEWMODE)
1475 {
1476 display_new_pickup (op); 1171 display_new_pickup (op);
1477 return 1;
1478 }
1479 if (1)
1480 LOG (llevDebug, "command_pickup: !params\n");
1481 set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1482 return 0; 1172 return 0;
1483 } 1173 }
1484 1174
1485 while (*params == ' ' && *params) 1175 while (*params == ' ' && *params)
1486 params++; 1176 params++;
… …
1492 for (mode = 0; names[mode]; mode++) 1182 for (mode = 0; names[mode]; mode++)
1493 { 1183 {
1494 if (!strcmp (names[mode], params + 1)) 1184 if (!strcmp (names[mode], params + 1))
1495 { 1185 {
1496 i = op->contr->mode; 1186 i = op->contr->mode;
1497 if (!(i & PU_NEWMODE)) 1187
1498 i = PU_NEWMODE;
1499 if (*params == '+') 1188 if (*params == '+')
1500 i = i | modes[mode]; 1189 i = i | modes[mode];
1501 else 1190 else
1502 i = i & ~modes[mode]; 1191 i = i & ~modes[mode];
1192
1503 op->contr->mode = i; 1193 op->contr->mode = i;
1504 display_new_pickup (op); 1194 display_new_pickup (op);
1505 return 1; 1195 return 1;
1506 } 1196 }
1507 } 1197 }
… …
1509 return 1; 1199 return 1;
1510 } 1200 }
1511 1201
1512 if (sscanf (params, "%u", &i) != 1) 1202 if (sscanf (params, "%u", &i) != 1)
1513 { 1203 {
1514 if (1)
1515 LOG (llevDebug, "command_pickup: params==NULL\n");
1516 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.");
1517 return 1; 1205 return 1;
1518 } 1206 }
1519 set_pickup_mode (op, i); 1207
1208 if (i <= PU_RATIO)
1209 i |= op->contr->mode & ~PU_RATIO;
1210
1211 op->contr->mode = i;
1520 1212
1521 return 1; 1213 return 1;
1522}
1523
1524void
1525set_pickup_mode (object *op, int i)
1526{
1527 switch (op->contr->mode = i)
1528 {
1529 case 0:
1530 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1531 break;
1532 case 1:
1533 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1534 break;
1535 case 2:
1536 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1537 break;
1538 case 3:
1539 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1540 break;
1541 case 4:
1542 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1543 break;
1544 case 5:
1545 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1546 break;
1547 case 6:
1548 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1549 break;
1550 case 7:
1551 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1552 break;
1553 }
1554} 1214}
1555 1215
1556int 1216int
1557command_search_items (object *op, char *params) 1217command_search_items (object *op, char *params)
1558{ 1218{
1559 char buf[MAX_BUF];
1560
1561 if (settings.search_items == FALSE)
1562 return 1;
1563
1564 if (params == NULL) 1219 if (params == NULL)
1565 { 1220 {
1566 if (op->contr->search_str[0] == '\0') 1221 if (op->contr->search_str[0] == '\0')
1567 { 1222 {
1568 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1223 new_draw_info (NDI_UNIQUE, 0, op, "Example: search-items magic+1");
1569 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");
1570 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'.");
1571 return 1; 1226 return 1;
1572 } 1227 }
1228
1573 op->contr->search_str[0] = '\0'; 1229 op->contr->search_str[0] = '\0';
1574 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1230 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1575 fix_player (op); 1231 op->contr->queue_stats_update ();
1576 return 1; 1232 return 1;
1577 } 1233 }
1578 if ((int) strlen (params) >= MAX_BUF) 1234
1235 if (strlen (params) >= sizeof (op->contr->search_str))
1579 { 1236 {
1580 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1237 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1581 return 1; 1238 return 1;
1582 } 1239 }
1240
1583 strcpy (op->contr->search_str, params); 1241 strcpy (op->contr->search_str, params);
1584 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));
1585 new_draw_info (NDI_UNIQUE, 0, op, buf); 1243 op->contr->queue_stats_update ();
1586 fix_player (op); 1244
1587 return 1; 1245 return 1;
1588} 1246}
1589 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