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

Diff Legend

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