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