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.22 by root, Sun Dec 3 00:59:58 2006 UTC vs.
Revision 1.80 by elmex, Sun Oct 5 12:40:21 2008 UTC

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

Diff Legend

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