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

Diff Legend

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