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

Diff Legend

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