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

Diff Legend

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