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.7 by root, Sun Aug 27 15:24:22 2006 UTC vs.
Revision 1.76 by root, Sun Sep 7 21:31:23 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines