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.37 by pippijn, Mon Jan 15 21:06:19 2007 UTC vs.
Revision 1.80 by elmex, Sun Oct 5 12:40:21 2008 UTC

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

Diff Legend

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