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.17 by root, Thu Sep 14 22:34:03 2006 UTC vs.
Revision 1.133 by root, Sun Jan 29 02:47:05 2017 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
8 it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
10 (at your option) any later version. 11 * option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
18 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 *
22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */
20 24
21 The author can be reached via e-mail to <crossfire@schmorp.de> 25/*
22
23 Object (handling) commands 26 * Object (handling) commands
24*/ 27 */
25 28
26#include <global.h> 29#include <global.h>
27#include <loader.h>
28#include <skills.h> 30#include <skills.h>
29#ifndef __CEXTRACT__
30# include <sproto.h> 31#include <sproto.h>
31#endif
32#include <living.h> 32#include <living.h>
33#include <math.h>
34 33
35/* 34/*
36 * Object id parsing functions 35 * Object id parsing functions
37 */ 36 */
38 37
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) && (tmp->flag [FLAG_APPLIED]))
74 continue; 73 continue;
74
75 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED))) 75 if ((aflag == AP_UNAPPLY) && (!tmp->flag [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; 155 if (object *skop = find_skill_by_name (op, shstr_throwing))
149
150 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 162
160
161int 163int
162command_apply (object *op, char *params) 164command_apply (object *op, char *params)
163{ 165{
164 if (!params) 166 if (!params)
165 { 167 {
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 214 if (!sack->flag [FLAG_APPLIED])
213 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 }
233 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) * 237
238 if (sack->weight_limit
239 && weight_t (sack->carrying
240 + sack->number_of ()
234 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0)) 241 * (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
235 * (100 - sack->stats.Str) / 100) > sack->weight_limit) 242 * (100 - sack->stats.Str) / 100)
243 > sack->weight_limit)
236 { 244 {
237 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack)); 245 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));
238 return 0; 246 return 0;
239 } 247 }
248
240 /* All other checks pass, must be OK */ 249 /* All other checks pass, must be OK */
241 return 1; 250 return 1;
242} 251}
243 252
244/* Pick up commands follow */ 253/* Pick up commands follow */
245 254
246/* pl = player (not always - monsters can use this now) 255/* pl = player (not always - monsters can use this now)
247 * op is the object to put tmp into, 256 * op is the object to put tmp into,
248 * tmp is the object to pick up, nrof is the number to 257 * tmp is the object to pick up, nrof is the number to
249 * pick up (0 means all of them) 258 * pick up (0 means all of them)
250 */ 259 */
251static void 260static void
252pick_up_object (object *pl, object *op, object *tmp, int nrof) 261pick_up_object (object *pl, object *op, object *tmp, int nrof)
253{ 262{
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;
259 uint32 weight, effective_weight_limit; 263 weight_t weight, effective_weight_limit;
260 int tmp_nrof = tmp->nrof ? tmp->nrof : 1; 264 int tmp_nrof = tmp->number_of ();
261 265
262 /* IF the player is flying & trying to take the item out of a container 266 /* IF the player is flying & trying to take the item out of a container
263 * that is in his inventory, let him. tmp->env points to the container 267 * that is in his inventory, let him. tmp->env points to the container
264 * (sack, luggage, etc), tmp->env->env then points to the player (nested 268 * (sack, luggage, etc), tmp->env->env then points to the player (nested
265 * containers not allowed as of now) 269 * containers not allowed as of now)
266 */ 270 */
267 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && is_player_inv (tmp) != pl) 271 if ((pl->move_type & MOVE_FLYING) && !pl->flag [FLAG_WIZ] && tmp->in_player () != pl)
268 { 272 {
269 new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!"); 273 pl->failmsg ("You are levitating, you can't reach the ground! "
274 "H<You have to stop levitating first, if you can, either by using your levitation skill, "
275 "or waiting till the levitation effect wears off.>");
270 return; 276 return;
271 } 277 }
272 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 278
279 if (tmp->flag [FLAG_NO_DROP])
273 return; 280 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 281
286 if (nrof > tmp_nrof || nrof == 0) 282 if (nrof > tmp_nrof || nrof <= 0)
287 nrof = tmp_nrof; 283 nrof = tmp_nrof;
284
288 /* Figure out how much weight this object will add to the player */ 285 /* Figure out how much weight this object will add to the player */
289 weight = tmp->weight * nrof; 286 weight = tmp->weight * nrof;
290 if (tmp->inv) 287 if (tmp->inv)
291 weight += tmp->carrying * (100 - tmp->stats.Str) / 100; 288 weight += tmp->carrying * (100 - tmp->stats.Str) / 100;
292 if (pl->stats.Str <= MAX_STAT) 289
293 effective_weight_limit = weight_limit[pl->stats.Str]; 290 effective_weight_limit = weight_limit [min (MAX_STAT, pl->stats.Str)];
294 else 291
295 effective_weight_limit = weight_limit[MAX_STAT];
296 if ((pl->weight + pl->carrying + weight) > effective_weight_limit) 292 if ((pl->weight + pl->carrying + weight) > effective_weight_limit)
297 { 293 {
298 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up."); 294 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");
299 return; 295 return;
300 } 296 }
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 297
308 tmp = get_split_ob (tmp, nrof); 298 if (!can_split (pl, tmp, nrof))
309 if (!tmp)
310 {
311 new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
312 return; 299 return;
313 } 300
314 /* Tell a client what happened rest of objects */ 301 if (tmp->flag [FLAG_UNPAID])
315 if (pl->type == PLAYER) 302 {
316 { 303 tmp->flag.reset (FLAG_UNPAID);
317 if (was_destroyed (tmp2, tmp2_tag)) 304 new_draw_info_format (NDI_UNIQUE, 0, pl, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
318 esrv_del_item (pl->contr, tmp2_tag); 305 tmp->flag.set (FLAG_UNPAID);
319 else
320 esrv_send_item (pl, tmp2);
321 }
322 } 306 }
323 else 307 else
324 { 308 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 309
342 tmp = insert_ob_in_ob (tmp, op); 310 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} 311}
364 312
365 313/* modified slightly to allow monsters use this -b.t. 5-31-95 */
366void 314void
367pick_up (object *op, object *alt) 315pick_up (object *op, object *alt)
368
369/* modified slightly to allow monsters use this -b.t. 5-31-95 */
370{ 316{
371 int need_fix_tmp = 0; 317 int need_fix_tmp = 0;
372 object *tmp = NULL; 318 object *tmp = NULL;
373 mapstruct *tmp_map = NULL; 319 maptile *tmp_map = NULL;
374 int count; 320 int count;
375 tag_t tag;
376 321
377 /* Decide which object to pick. */ 322 /* Decide which object to pick. */
378 if (alt) 323 if (alt)
379 { 324 {
380 if (!can_pick (op, alt)) 325 if (!can_pick (op, alt))
381 { 326 {
382 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name); 327 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name);
383 goto leave; 328 goto leave;
384 } 329 }
330
385 tmp = alt; 331 tmp = alt;
386 } 332 }
387 else 333 else
388 { 334 {
389 if (op->below == NULL || !can_pick (op, op->below)) 335 if (op->below == NULL || !can_pick (op, op->below))
390 { 336 {
391 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up here."); 337 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up here.");
392 goto leave; 338 goto leave;
393 } 339 }
340
394 tmp = op->below; 341 tmp = op->below;
395 } 342 }
396 343
397 /* Try to catch it. */ 344 /* Try to catch it. */
398 tmp_map = tmp->map; 345 tmp_map = tmp->map;
399 tmp = stop_item (tmp); 346 tmp = stop_item (tmp);
400 if (tmp == NULL) 347 if (tmp == NULL)
401 goto leave; 348 goto leave;
349
402 need_fix_tmp = 1; 350 need_fix_tmp = 1;
403 if (!can_pick (op, tmp)) 351 if (!can_pick (op, tmp))
404 goto leave; 352 goto leave;
405 353
406 if (op->type == PLAYER) 354 if (op->type == PLAYER)
… …
411 } 359 }
412 else 360 else
413 count = tmp->nrof; 361 count = tmp->nrof;
414 362
415 /* container is open, so use it */ 363 /* container is open, so use it */
416 if (op->container) 364 if (tmp->flag [FLAG_STARTEQUIP])
365 alt = op;
366 else if ((alt = op->container_ ()))
417 { 367 {
418 alt = op->container;
419 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count)) 368 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
420 goto leave; 369 goto leave;
421 } 370 }
422 else 371 else
423 { /* non container pickup */ 372 { /* non container pickup */
424 for (alt = op->inv; alt; alt = alt->below) 373 for (alt = op->inv; alt; alt = alt->below)
425 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && 374 if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] &&
426 alt->race && alt->race == tmp->race && sack_can_hold (NULL, alt, tmp, count)) 375 alt->race && alt->race == tmp->race && sack_can_hold (NULL, alt, tmp, count))
427 break; /* perfect match */ 376 break; /* perfect match */
428 377
429 if (!alt) 378 if (!alt)
430 for (alt = op->inv; alt; alt = alt->below) 379 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)) 380 if (alt->type == CONTAINER && alt->flag [FLAG_APPLIED] && sack_can_hold (NULL, alt, tmp, count))
432 break; /* General container comes next */ 381 break; /* General container comes next */
382
433 if (!alt) 383 if (!alt)
434 alt = op; /* No free containers */ 384 alt = op; /* No free containers */
435 } 385 }
386
436 if (tmp->env == alt) 387 if (tmp->env == alt)
437 { 388 {
438 /* here it could be possible to check rent, 389 /* here it could be possible to check rent,
439 * if someone wants to implement it 390 * if someone wants to implement it
440 */ 391 */
441 alt = op; 392 alt = op;
442 } 393 }
394
443#ifdef PICKUP_DEBUG 395#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); 396 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
445#endif 397#endif
446 398
447 /* startequip items are not allowed to be put into containers: */ 399 /* startequip items are not allowed to be put into containers: */
448 if (op->type == PLAYER && alt->type == CONTAINER && QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 400 if (op->type == PLAYER && alt->type == CONTAINER && tmp->flag [FLAG_STARTEQUIP])
449 { 401 {
450 new_draw_info (NDI_UNIQUE, 0, op, "This object cannot be put into containers!"); 402 new_draw_info (NDI_UNIQUE, 0, op, "This object cannot be put into containers!");
451 goto leave; 403 goto leave;
452 } 404 }
453 405
454 tag = tmp->count;
455 pick_up_object (op, alt, tmp, count); 406 pick_up_object (op, alt, tmp, count);
407
456 if (was_destroyed (tmp, tag) || tmp->env) 408 if (tmp->destroyed () || tmp->env)
457 need_fix_tmp = 0; 409 need_fix_tmp = 0;
410
458 if (op->type == PLAYER) 411 if (op->type == PLAYER)
459 op->contr->count = 0; 412 op->contr->count = 0;
413
460 goto leave; 414 goto leave;
461 415
462leave: 416leave:
463 if (need_fix_tmp) 417 if (need_fix_tmp)
464 fix_stopped_item (tmp, tmp_map, op); 418 fix_stopped_item (tmp, tmp_map, op);
465} 419}
466
467 420
468/* This takes (picks up) and item. op is the player 421/* This takes (picks up) and item. op is the player
469 * who issued the command. params is a string to 422 * who issued the command. params is a string to
470 * match against the item name. Basically, always 423 * match against the item name. Basically, always
471 * returns zero, but that should be improved. 424 * returns zero, but that should be improved.
… …
473int 426int
474command_take (object *op, char *params) 427command_take (object *op, char *params)
475{ 428{
476 object *tmp, *next; 429 object *tmp, *next;
477 430
478 if (op->container) 431 if (op->container_ ())
479 tmp = op->container->inv; 432 tmp = op->container_ ()->inv;
480 else 433 else
481 { 434 {
482 tmp = op->above; 435 tmp = op->above;
483 if (tmp) 436 if (tmp)
484 while (tmp->above) 437 while (tmp->above)
485 {
486 tmp = tmp->above; 438 tmp = tmp->above;
487 } 439
488 if (!tmp) 440 if (!tmp)
489 tmp = op->below; 441 tmp = op->below;
490 } 442 }
491 443
492 if (tmp == NULL) 444 if (!tmp)
493 { 445 {
494 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!"); 446 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!");
495 return 0; 447 return 0;
496 } 448 }
497 449
498 /* Makes processing easier */ 450 /* Makes processing easier */
499 if (params && *params == '\0') 451 if (params && *params == '\0')
500 params = NULL; 452 params = 0;
453
454 int cnt = MAX_ITEM_PER_ACTION;
501 455
502 while (tmp) 456 while (tmp)
503 { 457 {
504 next = tmp->below; 458 next = tmp->below;
505 459
506 if (tmp->invisible) 460 if (tmp->invisible)
507 { 461 {
508 tmp = next; 462 tmp = next;
509 continue; 463 continue;
510 } 464 }
465
511 /* This following two if and else if could be merged into line 466 /* This following two if and else if could be merged into line
512 * but that probably will make it more difficult to read, and 467 * but that probably will make it more difficult to read, and
513 * not make it any more efficient 468 * not make it any more efficient
514 */ 469 */
515 if (params && item_matched_string (op, tmp, params)) 470 if (params && item_matched_string (op, tmp, params))
516 { 471 {
472 if (--cnt < 0) break;
517 pick_up (op, tmp); 473 pick_up (op, tmp);
518 } 474 }
519 else if (can_pick (op, tmp) && !params) 475 else if (can_pick (op, tmp) && !params)
520 { 476 {
477 if (--cnt < 0) break;
521 pick_up (op, tmp); 478 pick_up (op, tmp);
522 break; 479 break;
523 } 480 }
481
524 tmp = next; 482 tmp = next;
525 /* Might as well just skip over the player immediately - 483 }
526 * we know it can't be picked up 484
527 */ 485 if (cnt < 0)
528 if (tmp == op)
529 tmp = tmp->below;
530 } 486 {
487 op->failmsg ("Couldn't pick up so many items at once.");
488 return 0;
489 }
490
531 if (!params && !tmp) 491 if (!params && !tmp)
532 { 492 {
533 for (tmp = op->below; tmp != NULL; tmp = tmp->next) 493 for (tmp = op->below; tmp; tmp = tmp->below)
534 if (!tmp->invisible) 494 if (!tmp->invisible)
535 { 495 {
536 char buf[MAX_BUF];
537
538 sprintf (buf, "You can't pick up a %s.", &tmp->name); 496 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up a %s.", &tmp->name);
539 new_draw_info (NDI_UNIQUE, 0, op, buf);
540 break; 497 break;
541 } 498 }
499
542 if (!tmp) 500 if (!tmp)
543 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up."); 501 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");
544 } 502 }
503
545 return 0; 504 return 0;
546} 505}
547 506
548
549/* 507/*
550 * This function was part of drop, now is own function. 508 * This function was part of drop, now is own function.
551 * Player 'op' tries to put object 'tmp' into sack 'sack', 509 * 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. 510 * if nrof is non zero, then nrof objects is tried to put into sack.
511 *
553 * Note that the 'sack' in question can now be a transport, 512 * Note that the 'sack' in question can now be a transport,
554 * so this function isn't named very good anymore. 513 * so this function isn't named very good anymore.
555 */ 514 */
556void 515void
557put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 516put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
558{ 517{
559 tag_t tmp_tag, tmp2_tag;
560 object *tmp2, *sack2; 518 object *tmp2;
561 char buf[MAX_BUF]; 519 char buf[MAX_BUF];
562 520
563 if (sack == tmp) 521 if (sack == tmp)
564 return; /* Can't put an object in itself */ 522 return; /* Can't put an object in itself */
565 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 523
524 if (tmp->flag [FLAG_STARTEQUIP] || tmp->flag [FLAG_NO_DROP])
566 { 525 {
567 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack)); 526 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));
568 return; 527 return;
569 } 528 }
529
570 if (tmp->type == CONTAINER && tmp->inv) 530 if (tmp->type == CONTAINER && tmp->inv)
571 { 531 {
572
573 /* Eneq(@csd.uu.se): If the object to be dropped is a container 532 /* Eneq(@csd.uu.se): If the object to be dropped is a container
574 * we instead move the contents of that container into the active 533 * we instead move the contents of that container into the active
575 * container, this is only done if the object has something in it. 534 * container, this is only done if the object has something in it.
576 */ 535 */
577 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)); 536 new_draw_info_format (NDI_UNIQUE, 0, op, "You move the items from %s into %s.", query_name (tmp), query_name (sack));
537
579 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) 538 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
580 { 539 {
581 tmp = tmp2->below; 540 tmp = tmp2->below;
541
582 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof))) 542 if ((sack->type == CONTAINER && sack_can_hold (op, op->container_ (), tmp2, tmp2->nrof)))
583 {
584 put_object_in_sack (op, sack, tmp2, 0); 543 put_object_in_sack (op, sack, tmp2, 0);
585 }
586 else 544 else
587 { 545 {
588 sprintf (buf, "Your %s fills up.", query_name (sack)); 546 sprintf (buf, "Your %s fills up.", query_name (sack));
589 new_draw_info (NDI_UNIQUE, 0, op, buf); 547 new_draw_info (NDI_UNIQUE, 0, op, buf);
590 break; 548 break;
591 } 549 }
592 } 550 }
593 esrv_update_item (UPD_WEIGHT, op, sack2); 551
594 return; 552 return;
595 } 553 }
596 554
597 /* Don't worry about this for containers - our caller should have 555 /* Don't worry about this for containers - our caller should have
598 * already checked this. 556 * already checked this.
599 */ 557 */
600 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof))) 558 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof)))
601 return; 559 return;
602 560
603 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 561 if (tmp->flag [FLAG_APPLIED])
604 {
605 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 562 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
606 return; 563 return;
607 }
608 564
609 /* we want to put some portion of the item into the container */ 565 /* we want to put some portion of the item into the container */
610 if (nrof && tmp->nrof != nrof) 566 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; 567 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 568
631 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack)); 569 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
632 tmp_tag = tmp->count; 570 sack->insert (tmp);
633 tmp2 = insert_ob_in_ob (tmp, sack); 571}
634 fix_player (op); /* This is overkill, fix_player() is called somewhere */
635 /* in object.c */
636 572
637 /* If an object merged (and thus, different object), we need to 573/* In contrast to drop_object (op, tmp, nrof) above this function takes the
638 * delete the original. 574 * already split off object, and feeds it to the event handlers and does
575 * other magic with it.
576 *
577 * <droppper> is the object that dropped this object and <obj> is the
578 * object that was dropped.
579 *
580 * Make sure to check what happened with <obj> after this function returns!
581 * Otherwise you may leak this object.
582 */
583void
584drop_object (object *dropper, object *obj)
585{
586 if (INVOKE_OBJECT (DROP, obj, ARG_OBJECT (dropper)))
587 return;
588
589 if (obj->destroyed () || obj->is_inserted ())
590 return;
591
592 if (obj->flag [FLAG_STARTEQUIP])
593 {
594 dropper->statusmsg (format ("You drop the %s.", query_name (obj)));
595 dropper->statusmsg ("The god who lent it to you retrieves it.");
596
597 obj->destroy ();
598 dropper->update_stats ();
599 return;
600 }
601
602 for (object *floor = GET_MAP_OB (dropper->map, dropper->x, dropper->y);
603 floor;
604 floor = floor->above)
605 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (obj), ARG_OBJECT (dropper)))
606 return;
607
608 if (obj->destroyed () || obj->is_inserted ())
609 return;
610
611 if (dropper->is_in_shop () && !obj->flag [FLAG_UNPAID] && obj->type != MONEY)
612 if (!sell_item (obj, dropper))
613 return;
614
615 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
616 return;
617
618 /* If nothing special happened with this object, the default action is to
619 * insert it below the dropper:
639 */ 620 */
640 if (tmp2 != tmp)
641 esrv_del_item (op->contr, tmp_tag);
642 621
643 esrv_send_item (op, tmp2); 622 obj->x = dropper->x;
623 obj->y = dropper->y;
644 624
645 /* update the sacks weight */ 625 insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
646 esrv_update_item (UPD_WEIGHT, op, sack);
647} 626}
648 627
649/* 628/*
650 * This function was part of drop, now is own function. 629 * This function was part of drop, now is own function.
651 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then 630 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
652 * nrof objects is tried to dropped. 631 * nrof objects are tried to drop.
653 * This is used when dropping objects onto the floor. 632 * This is used when dropping objects onto the floor.
654 */ 633 */
655void 634void
656drop_object (object *op, object *tmp, uint32 nrof) 635drop_object (object *op, object *tmp, uint32 nrof)
657{ 636{
658 char buf[MAX_BUF]; 637 if (tmp->flag [FLAG_NO_DROP])
659 object *floor;
660
661 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
662 return; 638 return;
663 639
664 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 640 if (tmp->flag [FLAG_APPLIED])
665 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 641 if (!op->apply (tmp, AP_UNAPPLY | AP_NO_MERGE))
666 return; /* can't unapply it */ 642 return; /* can't unapply it */
667 643
668 /* We are only dropping some of the items. We split the current objec 644 /* We are only dropping some of the items. We split the current object
669 * off 645 * off
670 */ 646 */
671 if (nrof && tmp->nrof != nrof) 647 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; 648 return;
698 649
699 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 650 drop_object (op, tmp);
700 { 651
701 sprintf (buf, "You drop the %s.", query_name (tmp)); 652 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 } 653 {
710 654 // if nothing happened with the object we give it back
711/* If SAVE_INTERVAL is commented out, we never want to save 655 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 { 656 }
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} 657}
755 658
756void 659void
757drop (object *op, object *tmp) 660drop (object *op, object *tmp)
758{ 661{
… …
767 if (tmp->env && tmp->env->type != PLAYER) 670 if (tmp->env && tmp->env->type != PLAYER)
768 { 671 {
769 /* Just toss the object - probably shouldn't be hanging 672 /* Just toss the object - probably shouldn't be hanging
770 * around anyways 673 * around anyways
771 */ 674 */
772 remove_ob (tmp); 675 tmp->destroy ();
773 free_object (tmp);
774 return; 676 return;
775 } 677 }
776 else 678 else
777 {
778 while (tmp != NULL && tmp->invisible) 679 while (tmp && tmp->invisible)
779 tmp = tmp->below; 680 tmp = tmp->below;
780 }
781 } 681 }
782 682
783 if (tmp == NULL) 683 if (!tmp)
784 { 684 {
785 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop."); 685 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
786 return; 686 return;
787 } 687 }
788 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED)) 688
689 if (tmp->flag [FLAG_INV_LOCKED])
789 { 690 {
790 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked"); 691 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
791 return; 692 return;
792 } 693 }
793 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 694
695 if (tmp->flag [FLAG_NO_DROP])
794 { 696 {
795#if 0 697#if 0
796 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 698 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
797 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped."); 699 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
798#endif 700#endif
799 return; 701 return;
800 } 702 }
801 703
802 if (op->type == PLAYER) 704 if (op->type == PLAYER && op->contr->last_used == tmp)
803 { 705 op->contr->last_used = tmp->below ? tmp->below
804 if (op->contr->last_used == tmp && op->contr->last_used_id == tmp->count) 706 : tmp->above ? tmp->above
805 { 707 : (object *)0;
806 object *n = NULL;
807 708
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) 709 if (op->container_ ())
821 { 710 {
822 if (op->type == PLAYER) 711 if (op->type == PLAYER)
823 {
824 put_object_in_sack (op, op->container, tmp, op->contr->count); 712 put_object_in_sack (op, op->container_ (), tmp, op->contr->count);
825 }
826 else 713 else
827 {
828 put_object_in_sack (op, op->container, tmp, 0); 714 put_object_in_sack (op, op->container_ (), tmp, 0);
829 };
830 } 715 }
831 else 716 else
832 { 717 {
833 if (op->type == PLAYER) 718 if (op->type == PLAYER)
834 {
835 drop_object (op, tmp, op->contr->count); 719 drop_object (op, tmp, op->contr->count);
836 }
837 else 720 else
838 {
839 drop_object (op, tmp, 0); 721 drop_object (op, tmp, 0);
840 };
841 } 722 }
723
842 if (op->type == PLAYER) 724 if (op->type == PLAYER)
843 op->contr->count = 0; 725 op->contr->count = 0;
844} 726}
845 727
846
847
848/* Command will drop all items that have not been locked */ 728/* Command will drop all items that have not been locked */
849int 729int
850command_dropall (object *op, char *params) 730command_dropall (object *op, char *params)
851{ 731{
852 732
853 object *curinv, *nextinv;
854
855 if (op->inv == NULL) 733 if (op->inv == NULL)
856 { 734 {
857 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!"); 735 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
858 return 0; 736 return 0;
859 } 737 }
860 738
861 curinv = op->inv; 739 object *curinv = op->inv;
740 object *nextinv;
862 741
863 /* 742 /*
864 This is the default. Drops everything not locked or considered 743 This is the default. Drops everything not locked or considered
865 not something that should be dropped. 744 not something that should be dropped.
866 */ 745 */
867 /* 746 /*
868 Care must be taken that the next item pointer is not to money as 747 Care must be taken that the next item pointer is not to money as
869 the drop() routine will do unknown things to it when dropping 748 the drop() routine will do unknown things to it when dropping
870 in a shop. --Tero.Pelander@utu.fi 749 in a shop. --Tero.Pelander@utu.fi
871 */ 750 */
751 int cnt = MAX_ITEM_PER_ACTION;
872 752
873 if (params == NULL) 753 if (!params)
874 { 754 {
875 while (curinv != NULL) 755 while (curinv)
876 { 756 {
877 nextinv = curinv->below; 757 nextinv = curinv->below;
758
878 while (nextinv && nextinv->type == MONEY) 759 while (nextinv && nextinv->type == MONEY)
879 nextinv = nextinv->below; 760 nextinv = nextinv->below;
880 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY && 761
881 curinv->type != FOOD && curinv->type != KEY && 762 if (!curinv->flag [FLAG_INV_LOCKED]
882 curinv->type != SPECIAL_KEY && curinv->type != GEM && 763 && !curinv->invisible
883 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv)) 764 && curinv->type != MONEY
765 && curinv->type != FOOD
766 && curinv->type != KEY
767 && curinv->type != SPECIAL_KEY
768 && curinv->type != GEM
769 && curinv->type != CONTAINER)
884 { 770 {
885 drop (op, curinv); 771 drop (op, curinv);
772 if (--cnt <= 0) break;
886 } 773 }
774
887 curinv = nextinv; 775 curinv = nextinv;
888 } 776 }
889 } 777 }
890
891 else if (strcmp (params, "weapons") == 0) 778 else if (strcmp (params, "weapons") == 0)
892 { 779 {
893 while (curinv != NULL) 780 while (curinv)
894 { 781 {
895 nextinv = curinv->below; 782 nextinv = curinv->below;
783
896 while (nextinv && nextinv->type == MONEY) 784 while (nextinv && nextinv->type == MONEY)
897 nextinv = nextinv->below; 785 nextinv = nextinv->below;
786
898 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW))) 787 if (!curinv->flag [FLAG_INV_LOCKED] && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
899 { 788 {
900 drop (op, curinv); 789 drop (op, curinv);
790 if (--cnt <= 0) break;
901 } 791 }
792
902 curinv = nextinv; 793 curinv = nextinv;
903 } 794 }
904 } 795 }
905
906 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0) 796 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
907 { 797 {
908 while (curinv != NULL) 798 while (curinv)
909 { 799 {
910 nextinv = curinv->below; 800 nextinv = curinv->below;
801
911 while (nextinv && nextinv->type == MONEY) 802 while (nextinv && nextinv->type == MONEY)
912 nextinv = nextinv->below; 803 nextinv = nextinv->below;
804
913 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET)) 805 if (!curinv->flag [FLAG_INV_LOCKED] && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
914 { 806 {
915 drop (op, curinv); 807 drop (op, curinv);
808 if (--cnt <= 0) break;
916 } 809 }
810
917 curinv = nextinv; 811 curinv = nextinv;
918 } 812 }
919 } 813 }
920
921 else if (strcmp (params, "misc") == 0) 814 else if (strcmp (params, "misc") == 0)
922 { 815 {
923 while (curinv != NULL) 816 while (curinv)
924 { 817 {
925 nextinv = curinv->below; 818 nextinv = curinv->below;
819
926 while (nextinv && nextinv->type == MONEY) 820 while (nextinv && nextinv->type == MONEY)
927 nextinv = nextinv->below; 821 nextinv = nextinv->below;
928 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED)) 822
823 if (!curinv->flag [FLAG_INV_LOCKED] && !curinv->flag [FLAG_APPLIED])
929 { 824 {
930 switch (curinv->type) 825 switch (curinv->type)
931 { 826 {
932 case HORN: 827 case HORN:
933 case BOOK: 828 case BOOK:
… …
950 break; 845 break;
951 default: 846 default:
952 curinv = nextinv; 847 curinv = nextinv;
953 break; 848 break;
954 } 849 }
850
851 if (--cnt <= 0) break;
955 } 852 }
853
956 curinv = nextinv; 854 curinv = nextinv;
957 } 855 }
958 } 856 }
959 op->contr->socket.update_look = 1; 857
858 if (cnt <= 0)
859 op->failmsg ("Only dropped some items, can't drop that many items at once.");
960 860
961/* draw_look(op);*/ 861/* draw_look(op);*/
962 return 0; 862 return 0;
963} 863}
964 864
865
866/* This function tries to drop all objects in the <objs> vector.
867 * <dropper> is the object that wants to drop them.
868 * <cnt> can be a 0 pointer or a pointer to the maximum number of
869 * drop operations to perform.
870 *
871 * Returns true if at least one item was dropped.
872 */
873static bool
874drop_vector (object *dropper, vector<object *> &objs, int *cnt)
875{
876 vector<object *>::iterator i;
877
878 bool did_one = false;
879
880 for (i = objs.begin (); i != objs.end (); i++)
881 {
882 drop (dropper, *i);
883 if (cnt && --*cnt <= 0) break;
884 did_one = true;
885 }
886
887 return did_one;
888}
889
965/* Object op wants to drop object(s) params. params can be a 890/* Object op wants to drop object(s) params. params can be a
966 * comma seperated list. 891 * comma seperated list.
967 */ 892 */
968
969int 893int
970command_drop (object *op, char *params) 894command_drop (object *op, char *params)
971{ 895{
972 object *tmp, *next; 896 object *tmp, *next;
973 int did_one = 0;
974 897
975 if (!params) 898 if (!params)
976 { 899 {
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 (tmp->flag [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. 955std::string
1031 * we return the object the player has marked with the 'mark' command 956object::describe_monster (object *who)
1032 * below. If no match is found (or object has changed), we return
1033 * NULL. We leave it up to the calling function to print messages if
1034 * nothing is found.
1035 */
1036object *
1037find_marked_object (object *op)
1038{ 957{
1039 object *tmp; 958 dynbuf_text buf (512, 512);
1040 959
1041 if (!op || !op->contr) 960 object *mon = head ? head : this;
1042 return NULL;
1043 if (!op->contr->mark)
1044 {
1045 961
1046/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/ 962 if (mon->flag [FLAG_UNDEAD])
1047 return NULL; 963 buf << "It is an undead force.\r";
1048 }
1049 /* 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
1051 * an item got reincarnated at some point.
1052 */
1053 for (tmp = op->inv; tmp; tmp = tmp->below)
1054 {
1055 if (tmp->invisible)
1056 continue;
1057 if (tmp == op->contr->mark)
1058 {
1059 if (tmp->count == op->contr->mark_count)
1060 return tmp;
1061 else
1062 {
1063 op->contr->mark = NULL;
1064 op->contr->mark_count = 0;
1065 964
1066/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/ 965 if (mon->level > who->level)
1067 return NULL; 966 buf << "It is likely more powerful than you.\r";
1068 } 967 else if (mon->level < who->level)
1069 } 968 buf << "It is likely less powerful than you.\r";
1070 }
1071 return NULL;
1072}
1073
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;
1084 if (!params)
1085 {
1086 object *mark = find_marked_object (op);
1087
1088 if (!mark)
1089 new_draw_info (NDI_UNIQUE, 0, op, "You have no marked object.");
1090 else
1091 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is marked.", query_name (mark));
1092 }
1093 else 969 else
1094 { 970 buf << "It is probably as powerful as you.\r";
1095 object *mark1 = find_best_object_match (op, params);
1096 971
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) 972 if (mon->attacktype & AT_ACID)
1131 new_draw_info (NDI_UNIQUE, 0, op, "You seem to smell an acrid odor."); 973 buf << "You seem to smell an acrid odor.\r";
1132 974
1133 /* Anyone know why this used to use the clone value instead of the 975 /* Anyone know why this used to use the clone value instead of the
1134 * maxhp field? This seems that it should give more accurate results. 976 * maxhp field? This seems that it should give more accurate results.
1135 */ 977 */
1136 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1)) 978 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1137 { /* From 1-4 */ 979 { /* From 1-4 */
1138 case 1: 980 case 1:
1139 new_draw_info (NDI_UNIQUE, 0, op, "It is in a bad shape."); 981 buf << "It is in a bad shape.\r";
1140 break; 982 break;
1141 case 2: 983 case 2:
1142 new_draw_info (NDI_UNIQUE, 0, op, "It is hurt."); 984 buf << "It is hurt.\r";
1143 break; 985 break;
1144 case 3: 986 case 3:
1145 new_draw_info (NDI_UNIQUE, 0, op, "It is somewhat hurt."); 987 buf << "It is somewhat hurt.\r";
1146 break; 988 break;
1147 case 4: 989 case 4:
1148 new_draw_info (NDI_UNIQUE, 0, op, "It is in excellent shape."); 990 buf << "It is in excellent shape.\r";
1149 break; 991 break;
1150 } 992 }
993
1151 if (present_in_ob (POISONING, mon) != NULL) 994 if (present_in_ob (POISONING, mon))
1152 new_draw_info (NDI_UNIQUE, 0, op, "It looks very ill."); 995 buf << "It looks very ill.\r";
1153}
1154 996
997 buf << '\n';
998
999 return buf;
1000}
1155 1001
1156/* tmp is the object being described, pl is who is examing it. */ 1002/* tmp is the object being described, pl is who is examing it. */
1157char * 1003const char *
1158long_desc (object *tmp, object *pl) 1004long_desc (object *tmp, object *pl)
1159{ 1005{
1160 static char buf[VERY_BIG_BUF]; 1006 static std::string s;
1161 char *cp;
1162 1007
1163 if (tmp == NULL) 1008 return (s = tmp->long_desc (pl)).c_str ();
1164 return ""; 1009}
1165 1010
1166 buf[0] = '\0'; 1011std::string
1012object::long_desc (object *who)
1013{
1014 std::string buf (query_name ());
1015
1167 switch (tmp->type) 1016 switch (type)
1168 { 1017 {
1169 case RING: 1018 case RING:
1170 case SKILL: 1019 case SKILL:
1171 case WEAPON: 1020 case WEAPON:
1172 case ARMOUR: 1021 case ARMOUR:
… …
1175 case SHIELD: 1024 case SHIELD:
1176 case BOOTS: 1025 case BOOTS:
1177 case GLOVES: 1026 case GLOVES:
1178 case AMULET: 1027 case AMULET:
1179 case GIRDLE: 1028 case GIRDLE:
1029 case RANGED:
1180 case BOW: 1030 case BOW:
1181 case ARROW: 1031 case ARROW:
1182 case CLOAK: 1032 case CLOAK:
1183 case FOOD: 1033 case FOOD:
1184 case DRINK: 1034 case DRINK:
1185 case FLESH: 1035 case FLESH:
1186 case SKILL_TOOL: 1036 case SKILL_TOOL:
1037 case LAMP:
1187 case POWER_CRYSTAL: 1038 case POWER_CRYSTAL:
1188 if (*(cp = describe_item (tmp, pl)) != '\0')
1189 { 1039 {
1190 int len; 1040 const char *cp = ::describe_item (this, who);
1191 1041
1192 assign (buf, query_name (tmp)); 1042 if (*cp)
1193 len = strlen (buf);
1194 if (len < VERY_BIG_BUF - 5)
1195 { 1043 {
1196 /* Since we know the length, we save a few cpu cycles by using 1044 buf.append (" ");
1197 * it instead of calling strcat */ 1045 buf.append (cp);
1198 strcpy (buf + len, " ");
1199 len++;
1200 assign (buf + len, cp, VERY_BIG_BUF - len - 1);
1201 } 1046 }
1202 } 1047 }
1203 } 1048 }
1204
1205 if (buf[0] == '\0')
1206 assign (buf, query_name (tmp));
1207 1049
1208 return buf; 1050 return buf;
1209} 1051}
1210 1052
1053/* op is the player
1054 * tmp is the monster being examined.
1055 */
1211void 1056void
1212examine (object *op, object *tmp) 1057examine_monster (object *op, object *tmp)
1213{ 1058{
1214 char buf[VERY_BIG_BUF]; 1059 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} 1060}
1407 1061
1408static void 1062static void
1409display_new_pickup (object *op) 1063display_new_pickup (object *op)
1410{ 1064{
1411 int i = op->contr->mode; 1065 int i = op->contr->mode;
1412 1066
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); 1067 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); 1068 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); 1069 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1420 1070
1421 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5); 1071 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
… …
1447 new_draw_info_format (NDI_UNIQUE, 0, op, "%d MAGICDEVICE", i & PU_MAGIC_DEVICE ? 1 : 0); 1097 new_draw_info_format (NDI_UNIQUE, 0, op, "%d MAGICDEVICE", i & PU_MAGIC_DEVICE ? 1 : 0);
1448 1098
1449 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NOT CURSED", i & PU_NOT_CURSED ? 1 : 0); 1099 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NOT CURSED", i & PU_NOT_CURSED ? 1 : 0);
1450 1100
1451 new_draw_info_format (NDI_UNIQUE, 0, op, "%d JEWELS", i & PU_JEWELS ? 1 : 0); 1101 new_draw_info_format (NDI_UNIQUE, 0, op, "%d JEWELS", i & PU_JEWELS ? 1 : 0);
1102 new_draw_info_format (NDI_UNIQUE, 0, op, "%d FLESH", i & PU_FLESH ? 1 : 0);
1452 1103
1453 new_draw_info_format (NDI_UNIQUE, 0, op, ""); 1104 new_draw_info_format (NDI_UNIQUE, 0, op, "");
1454} 1105}
1455 1106
1456int 1107int
… …
1458{ 1109{
1459 uint32 i; 1110 uint32 i;
1460 static const char *names[] = { 1111 static const char *names[] = {
1461 "debug", "inhibit", "stop", "food", "drink", "valuables", "bow", "arrow", "helmet", 1112 "debug", "inhibit", "stop", "food", "drink", "valuables", "bow", "arrow", "helmet",
1462 "shield", "armour", "boots", "gloves", "cloak", "key", "missile", "allweapon", 1113 "shield", "armour", "boots", "gloves", "cloak", "key", "missile", "allweapon",
1463 "magical", "potion", "spellbook", "skillscroll", "readables", "magicdevice", "notcursed", "jewels", NULL 1114 "magical", "potion", "spellbook", "skillscroll", "readables", "magicdevice", "notcursed",
1115 "jewels", "flesh", NULL
1464 }; 1116 };
1465 static uint32 modes[] = { 1117 static uint32 modes[] = {
1466 PU_DEBUG, PU_INHIBIT, PU_STOP, PU_FOOD, PU_DRINK, PU_VALUABLES, PU_BOW, PU_ARROW, PU_HELMET, 1118 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, 1119 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 1120 PU_MAGICAL, PU_POTION, PU_SPELLBOOK, PU_SKILLSCROLL, PU_READABLES, PU_MAGIC_DEVICE, PU_NOT_CURSED,
1121 PU_JEWELS, PU_FLESH, 0
1469 }; 1122 };
1470 1123
1471 if (!params) 1124 if (!params)
1472 { 1125 {
1473 /* if the new mode is used, just print the settings */ 1126 /* if the new mode is used, just print the settings */
1474 if (op->contr->mode & PU_NEWMODE)
1475 {
1476 display_new_pickup (op); 1127 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; 1128 return 0;
1483 } 1129 }
1484 1130
1485 while (*params == ' ' && *params) 1131 while (*params == ' ' && *params)
1486 params++; 1132 params++;
… …
1492 for (mode = 0; names[mode]; mode++) 1138 for (mode = 0; names[mode]; mode++)
1493 { 1139 {
1494 if (!strcmp (names[mode], params + 1)) 1140 if (!strcmp (names[mode], params + 1))
1495 { 1141 {
1496 i = op->contr->mode; 1142 i = op->contr->mode;
1497 if (!(i & PU_NEWMODE)) 1143
1498 i = PU_NEWMODE;
1499 if (*params == '+') 1144 if (*params == '+')
1500 i = i | modes[mode]; 1145 i = i | modes[mode];
1501 else 1146 else
1502 i = i & ~modes[mode]; 1147 i = i & ~modes[mode];
1148
1503 op->contr->mode = i; 1149 op->contr->mode = i;
1504 display_new_pickup (op); 1150 display_new_pickup (op);
1505 return 1; 1151 return 1;
1506 } 1152 }
1507 } 1153 }
… …
1509 return 1; 1155 return 1;
1510 } 1156 }
1511 1157
1512 if (sscanf (params, "%u", &i) != 1) 1158 if (sscanf (params, "%u", &i) != 1)
1513 { 1159 {
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> ."); 1160 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <value_density> or [+-]type.");
1517 return 1; 1161 return 1;
1518 } 1162 }
1519 set_pickup_mode (op, i); 1163
1164 if (i <= PU_RATIO)
1165 i |= op->contr->mode & ~PU_RATIO;
1166
1167 op->contr->mode = i;
1520 1168
1521 return 1; 1169 return 1;
1522} 1170}
1523 1171
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}
1555
1556int 1172int
1557command_search_items (object *op, char *params) 1173command_search_items (object *op, char *params)
1558{ 1174{
1559 char buf[MAX_BUF];
1560
1561 if (settings.search_items == FALSE)
1562 return 1;
1563
1564 if (params == NULL) 1175 if (params == NULL)
1565 { 1176 {
1566 if (op->contr->search_str[0] == '\0') 1177 if (op->contr->search_str[0] == '\0')
1567 { 1178 {
1568 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1"); 1179 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"); 1180 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'."); 1181 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1571 return 1; 1182 return 1;
1572 } 1183 }
1184
1573 op->contr->search_str[0] = '\0'; 1185 op->contr->search_str[0] = '\0';
1574 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off."); 1186 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1575 fix_player (op); 1187 op->contr->queue_stats_update ();
1576 return 1; 1188 return 1;
1577 } 1189 }
1578 if ((int) strlen (params) >= MAX_BUF) 1190
1191 if (strlen (params) >= sizeof (op->contr->search_str))
1579 { 1192 {
1580 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long."); 1193 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1581 return 1; 1194 return 1;
1582 } 1195 }
1196
1583 strcpy (op->contr->search_str, params); 1197 strcpy (op->contr->search_str, params);
1584 sprintf (buf, "Searching for '%s'.", op->contr->search_str); 1198 new_draw_info (NDI_UNIQUE, 0, op, format ("Now searching for '%s'.", op->contr->search_str));
1585 new_draw_info (NDI_UNIQUE, 0, op, buf); 1199 op->contr->queue_stats_update ();
1586 fix_player (op); 1200
1587 return 1; 1201 return 1;
1588} 1202}
1589 1203
1204int
1205command_unlock (object *op, char *params)
1206{
1207 /* if the unlock command typed with nothing, unlock everything,
1208 * this might be bad
1209 */
1210 if (params == NULL)
1211 {
1212 for (object *item = op->inv; item; item = item->below)
1213 {
1214 item->clr_flag (FLAG_INV_LOCKED);
1215 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with null param.");
1216 esrv_update_item (UPD_FLAGS, op, item);
1217 }
1218 return 0;
1219 }
1220
1221 /* if the unlock command is used with a param,
1222 * unlock what matches. i.e. unlock material, should unlock all the materials
1223 */
1224 for (object *item = op->inv; item; item = item->below)
1225 if (item->name.contains (params))
1226 {
1227 item->clr_flag (FLAG_INV_LOCKED);
1228 //d// new_draw_info (NDI_UNIQUE, 0, op, "unlocked items with a param.");
1229 esrv_update_item (UPD_FLAGS, op, item);
1230 }
1231
1232 return 0;
1233}
1234
1235int
1236command_lock (object *op, char *params)
1237{
1238 /* if the lock command is typed by itself, lock everything
1239 */
1240 if (params == NULL)
1241 {
1242 for (object *item = op->inv; item; item = item->below)
1243 {
1244 item->set_flag (FLAG_INV_LOCKED);
1245 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with null param.");
1246 esrv_update_item (UPD_FLAGS, op, item);
1247 }
1248 return 0;
1249 }
1250
1251 /* if the lock command is used with a param, lock what matches.
1252 * i.e. lock material, should lock all the materials
1253 */
1254 for (object *item = op->inv; item; item = item->below)
1255 if (item->name.contains (params))
1256 {
1257 item->set_flag (FLAG_INV_LOCKED);
1258 //d// new_draw_info (NDI_UNIQUE, 0, op, "locked items with param.");
1259 esrv_update_item (UPD_FLAGS, op, item);
1260 }
1261
1262 return 0;
1263}
1264
1265/* op should be a player, params is any params.
1266 * If no params given, we print out the currently marked object.
1267 * otherwise, try to find a matching object - try best match first.
1268 */
1269int
1270command_mark (object *op, char *params)
1271{
1272 if (!params)
1273 {
1274 if (object *mark = op->mark ())
1275 op->statusmsg (format ("%s is marked.", query_name (mark)));
1276 else
1277 op->failmsg ("You have no marked object.");
1278 }
1279 else
1280 {
1281 if (object *mark = find_best_object_match (op, params))
1282 {
1283 op->contr->mark = mark;
1284 op->statusmsg (format ("Marked item %s", query_name (mark)));
1285 }
1286 else
1287 op->failmsgf ("Could not find an object that matches %s", params);
1288 }
1289
1290 return 0; /*shouldnt get here */
1291}
1292

Diff Legend

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