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.10 by root, Tue Aug 29 08:01:37 2006 UTC vs.
Revision 1.31 by root, Fri Dec 22 16:34:00 2006 UTC

1/*
2 * static char *rcsid_c_object_c =
3 * "$Id: c_object.C,v 1.10 2006/08/29 08:01:37 root Exp $";
4 */
5/* 1/*
6 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
7 3
8 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
9 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
20 16
21 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
22 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
23 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 20
25 The author can be reached via e-mail to crossfire-devel@real-time.com 21 The author can be reached via e-mail to <crossfire@schmorp.de>
26 22
27 Object (handling) commands 23 Object (handling) commands
28*/ 24*/
29 25
30#include <global.h> 26#include <global.h>
31#include <loader.h> 27#include <loader.h>
32#include <skills.h> 28#include <skills.h>
33#ifndef __CEXTRACT__ 29#ifndef __CEXTRACT__
34#include <sproto.h> 30# include <sproto.h>
35#endif 31#endif
36#include <living.h> 32#include <living.h>
37#include <math.h> 33#include <math.h>
34
38/* 35/*
39 * Object id parsing functions 36 * Object id parsing functions
40 */ 37 */
41 38
42#define OBLINKMALLOC(p) if(!((p)=(objectlink *)malloc(sizeof(objectlink))))\
43 fatal(OUT_OF_MEMORY);
44
45#define ADD_ITEM(NEW,COUNT)\ 39#define ADD_ITEM(NEW,COUNT)\
46 if(!first) {\ 40 if(!first) {\
47 OBLINKMALLOC(first);\ 41 first = new objectlink;\
48 last=first;\ 42 last=first;\
49 } else {\ 43 } else {\
50 OBLINKMALLOC(last->next);\ 44 last->next = new objectlink;\
51 last=last->next;\ 45 last=last->next;\
52 }\ 46 }\
53 last->next=NULL;\ 47 last->next=0;\
54 last->ob=(NEW);\ 48 last->ob=(NEW);\
55 last->id=(COUNT); 49 last->id=(COUNT);
56 50
57/** 51/**
58 * Search the inventory of 'pl' for what matches best with params. 52 * Search the inventory of 'pl' for what matches best with params.
59 * we use item_matched_string above - this gives us consistent behaviour 53 * we use item_matched_string above - this gives us consistent behaviour
60 * between many commands. Return the best match, or NULL if no match. 54 * between many commands. Return the best match, or NULL if no match.
61 * aflag is used with apply -u , and apply -a to 55 * aflag is used with apply -u , and apply -a to
62 * only unapply applied, or apply unapplied objects 56 * only unapply applied, or apply unapplied objects
63 **/ 57 **/
58static object *
64static object *find_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)
65{ 60{
66 object *tmp, *best=NULL; 61 object *tmp, *best = NULL;
67 int match_val=0,tmpmatch; 62 int match_val = 0, tmpmatch;
68 63
69 for (tmp=pl->inv; tmp; tmp=tmp->below) { 64 for (tmp = pl->inv; tmp; tmp = tmp->below)
65 {
70 if (tmp->invisible) continue; 66 if (tmp->invisible)
67 continue;
71 if ((tmpmatch=item_matched_string(pl, tmp, params))>match_val) { 68 if ((tmpmatch = item_matched_string (pl, tmp, params)) > match_val)
69 {
72 if ((aflag==AP_APPLY) && (QUERY_FLAG(tmp,FLAG_APPLIED))) continue; 70 if ((aflag == AP_APPLY) && (QUERY_FLAG (tmp, FLAG_APPLIED)))
71 continue;
73 if ((aflag==AP_UNAPPLY) && (!QUERY_FLAG(tmp,FLAG_APPLIED))) continue; 72 if ((aflag == AP_UNAPPLY) && (!QUERY_FLAG (tmp, FLAG_APPLIED)))
73 continue;
74 match_val=tmpmatch; 74 match_val = tmpmatch;
75 best=tmp; 75 best = tmp;
76 } 76 }
77 } 77 }
78 return best; 78 return best;
79} 79}
80 80
81/** 81/**
82 * Shortcut to find_best_apply_object_match(pl, params, AF_NULL); 82 * Shortcut to find_best_apply_object_match(pl, params, AF_NULL);
83 **/ 83 **/
84object *
84object *find_best_object_match(object *pl, const char *params) 85find_best_object_match (object *pl, const char *params)
85{ 86{
86 return find_best_apply_object_match(pl, params, AP_NULL); 87 return find_best_apply_object_match (pl, params, AP_NULL);
87} 88}
88 89
90int
89int command_uskill ( object *pl, char *params) { 91command_uskill (object *pl, char *params)
92{
90 if (!params) { 93 if (!params)
94 {
91 new_draw_info(NDI_UNIQUE, 0, pl, "Usage: use_skill <skill name>"); 95 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: use_skill <skill name>");
92 return 0; 96 return 0;
93 } 97 }
94 return use_skill(pl,params); 98 return use_skill (pl, params);
95} 99}
96 100
101int
97int command_rskill ( object *pl, char *params) { 102command_rskill (object *pl, char *params)
103{
98 object *skill; 104 object *skill;
99 105
100 if (!params) { 106 if (!params)
107 {
101 new_draw_info(NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>"); 108 new_draw_info (NDI_UNIQUE, 0, pl, "Usage: ready_skill <skill name>");
102 return 0; 109 return 0;
103 } 110 }
104 skill = find_skill_by_name(pl, params); 111 skill = find_skill_by_name (pl, params);
105 112
106 if (!skill) { 113 if (!skill)
114 {
107 new_draw_info_format(NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params); 115 new_draw_info_format (NDI_UNIQUE, 0, pl, "You have no knowledge of the skill %s", params);
108 return 0; 116 return 0;
109 } 117 }
110 return change_skill(pl,skill, 0); 118 return change_skill (pl, skill, 0);
111} 119}
112 120
113 121
114/* These functions (command_search, command_disarm) are really just wrappers for 122/* These functions (command_search, command_disarm) are really just wrappers for
115 * things like 'use_skill ...'). In fact, they should really be obsoleted 123 * things like 'use_skill ...'). In fact, they should really be obsoleted
116 * and replaced with those. 124 * and replaced with those.
117 */ 125 */
126int
118int command_search (object *op, char *params) { 127command_search (object *op, char *params)
128{
119 return use_skill(op, skill_names[SK_FIND_TRAPS]); 129 return use_skill (op, skill_names[SK_FIND_TRAPS]);
120} 130}
121 131
132int
122int command_disarm (object *op, char *params) { 133command_disarm (object *op, char *params)
134{
123 return use_skill(op, skill_names[SK_DISARM_TRAPS]); 135 return use_skill (op, skill_names[SK_DISARM_TRAPS]);
124} 136}
125 137
126 138
127/* A little special because we do want to pass the full params along 139/* A little special because we do want to pass the full params along
128 * as it includes the object to throw. 140 * as it includes the object to throw.
129 */ 141 */
142int
130int command_throw (object *op, char *params) 143command_throw (object *op, char *params)
131{ 144{
132 object *skop; 145 object *skop;
133 146
134 skop = find_skill_by_name(op, skill_names[SK_THROWING]); 147 skop = find_skill_by_name (op, skill_names[SK_THROWING]);
148 if (skop)
135 if (skop) return do_skill(op, op, skop, op->facing,params); 149 return do_skill (op, op, skop, op->facing, params);
136 else { 150 else
151 {
137 new_draw_info(NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing."); 152 new_draw_info (NDI_UNIQUE, 0, op, "You have no knowledge of the skill throwing.");
138 } 153 }
139 return 0; 154 return 0;
140} 155}
141 156
142 157
158int
143int command_apply (object *op, char *params) 159command_apply (object *op, char *params)
144{ 160{
145 if (!params) { 161 if (!params)
162 {
146 player_apply_below(op); 163 player_apply_below (op);
147 return 0; 164 return 0;
148 } 165 }
149 else { 166 else
167 {
150 apply_flag aflag = (apply_flag) 0; 168 apply_flag aflag = (apply_flag) 0;
151 object *inv; 169 object *inv;
152 170
153 while (*params==' ') params++; 171 while (*params == ' ')
172 params++;
154 if (!strncmp(params,"-a ",3)) { 173 if (!strncmp (params, "-a ", 3))
174 {
155 aflag=AP_APPLY; 175 aflag = AP_APPLY;
156 params+=3; 176 params += 3;
157 } 177 }
158 if (!strncmp(params,"-u ",3)) { 178 if (!strncmp (params, "-u ", 3))
179 {
159 aflag=AP_UNAPPLY; 180 aflag = AP_UNAPPLY;
181 params += 3;
182 }
183 while (*params == ' ')
160 params+=3; 184 params++;
161 }
162 while (*params==' ') params++;
163 185
164 inv=find_best_apply_object_match(op, params, aflag); 186 inv = find_best_apply_object_match (op, params, aflag);
165 if (inv) { 187 if (inv)
188 {
166 player_apply(op,inv,aflag,0); 189 player_apply (op, inv, aflag, 0);
190 }
167 } else 191 else
168 new_draw_info_format(NDI_UNIQUE, 0, op, 192 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find any match to the %s.", params);
169 "Could not find any match to the %s.",params);
170 } 193 }
171 return 0; 194 return 0;
172} 195}
173 196
174/* 197/*
175 * Check if an item op can be put into a sack. If pl exists then tell 198 * Check if an item op can be put into a sack. If pl exists then tell
… …
178 * objects (op) we want to put in. We specify it separately instead of 201 * objects (op) we want to put in. We specify it separately instead of
179 * using op->nrof because often times, a player may have specified a 202 * using op->nrof because often times, a player may have specified a
180 * certain number of objects to drop, so we can pass that number, and 203 * certain number of objects to drop, so we can pass that number, and
181 * not need to use split_ob and stuff. 204 * not need to use split_ob and stuff.
182 */ 205 */
206int
183int sack_can_hold (object *pl, object *sack, object *op, uint32 nrof) { 207sack_can_hold (object *pl, object *sack, object *op, uint32 nrof)
208{
184 209
185 if (! QUERY_FLAG (sack, FLAG_APPLIED)) { 210 if (!QUERY_FLAG (sack, FLAG_APPLIED))
186 new_draw_info_format(NDI_UNIQUE, 0, pl, 211 {
187 "The %s is not active.", query_name(sack)); 212 new_draw_info_format (NDI_UNIQUE, 0, pl, "The %s is not active.", query_name (sack));
188 return 0; 213 return 0;
189 } 214 }
190 if (sack == op) { 215 if (sack == op)
191 new_draw_info_format(NDI_UNIQUE, 0, pl, 216 {
192 "You can't put the %s into itself.", query_name(sack)); 217 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the %s into itself.", query_name (sack));
193 return 0; 218 return 0;
219 }
220 if (sack->race && (sack->race != op->race || op->type == CONTAINER || (sack->stats.food && sack->stats.food != op->type)))
194 } 221 {
195 if (sack->race && (sack->race != op->race || op->type == CONTAINER
196 || (sack->stats.food && sack->stats.food != op->type))) {
197 new_draw_info_format(NDI_UNIQUE, 0, pl,
198 "You can put only %s into the %s.", sack->race, query_name(sack)); 222 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can put only %s into the %s.", &sack->race, query_name (sack));
199 return 0; 223 return 0;
200 } 224 }
201 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying) { 225 if (op->type == SPECIAL_KEY && sack->slaying && op->slaying)
202 new_draw_info_format(NDI_UNIQUE, 0, pl, 226 {
203 "You can't put the key into %s.", query_name(sack)); 227 new_draw_info_format (NDI_UNIQUE, 0, pl, "You can't put the key into %s.", query_name (sack));
204 return 0; 228 return 0;
205 } 229 }
206 if (sack->weight_limit && sack->carrying + (nrof ? nrof : 1) * 230 if (sack->weight_limit && (sint32) (sack->carrying + (nrof ? nrof : 1) *
207 (op->weight + (op->type==CONTAINER?(op->carrying*op->stats.Str):0)) 231 (op->weight + (op->type == CONTAINER ? (op->carrying * op->stats.Str) : 0))
208 * (100 - sack->stats.Str) / 100 > sack->weight_limit) { 232 * (100 - sack->stats.Str) / 100) > sack->weight_limit)
209 new_draw_info_format(NDI_UNIQUE, 0, pl, 233 {
210 "That won't fit in the %s!", query_name(sack)); 234 new_draw_info_format (NDI_UNIQUE, 0, pl, "That won't fit in the %s!", query_name (sack));
211 return 0; 235 return 0;
212 } 236 }
213 /* All other checks pass, must be OK */ 237 /* All other checks pass, must be OK */
214 return 1; 238 return 1;
215} 239}
216 240
217/* Pick up commands follow */ 241/* Pick up commands follow */
242
218/* pl = player (not always - monsters can use this now) 243/* pl = player (not always - monsters can use this now)
219 * op is the object to put tmp into, 244 * op is the object to put tmp into,
220 * tmp is the object to pick up, nrof is the number to 245 * tmp is the object to pick up, nrof is the number to
221 * pick up (0 means all of them) 246 * pick up (0 means all of them)
222 */ 247 */
248static void
223static void pick_up_object (object *pl, object *op, object *tmp, int nrof) 249pick_up_object (object *pl, object *op, object *tmp, int nrof)
224{ 250{
225 /* buf needs to be big (more than 256 chars) because you can get 251 /* buf needs to be big (more than 256 chars) because you can get
226 * very long item names. 252 * very long item names.
227 */ 253 */
228 char buf[HUGE_BUF]; 254 char buf[HUGE_BUF];
229 object *env=tmp->env; 255 object *env = tmp->env;
230 uint32 weight, effective_weight_limit; 256 uint32 weight, effective_weight_limit;
231 int tmp_nrof = tmp->nrof ? tmp->nrof : 1; 257 int tmp_nrof = tmp->nrof ? tmp->nrof : 1;
232 258
233 /* IF the player is flying & trying to take the item out of a container 259 /* IF the player is flying & trying to take the item out of a container
234 * that is in his inventory, let him. tmp->env points to the container 260 * that is in his inventory, let him. tmp->env points to the container
235 * (sack, luggage, etc), tmp->env->env then points to the player (nested 261 * (sack, luggage, etc), tmp->env->env then points to the player (nested
236 * containers not allowed as of now) 262 * containers not allowed as of now)
237 */ 263 */
238 if((pl->move_type & MOVE_FLYING) && !QUERY_FLAG(pl, FLAG_WIZ) && 264 if ((pl->move_type & MOVE_FLYING) && !QUERY_FLAG (pl, FLAG_WIZ) && tmp->in_player () != pl)
239 is_player_inv(tmp)!=pl) { 265 {
240 new_draw_info(NDI_UNIQUE, 0,pl, "You are levitating, you can't reach the ground!"); 266 new_draw_info (NDI_UNIQUE, 0, pl, "You are levitating, you can't reach the ground!");
241 return; 267 return;
242 } 268 }
269
243 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 270 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
244 return; 271 return;
272
245 if(QUERY_FLAG(tmp,FLAG_WAS_WIZ) && !QUERY_FLAG(pl, FLAG_WAS_WIZ)) { 273 if (QUERY_FLAG (tmp, FLAG_WAS_WIZ) && !QUERY_FLAG (pl, FLAG_WAS_WIZ))
274 {
246 new_draw_info(NDI_UNIQUE, 0,pl, "The object disappears in a puff of smoke!"); 275 new_draw_info (NDI_UNIQUE, 0, pl, "The object disappears in a puff of smoke!");
247 new_draw_info(NDI_UNIQUE, 0,pl, "It must have been an illusion."); 276 new_draw_info (NDI_UNIQUE, 0, pl, "It must have been an illusion.");
277
278 if (pl->type == PLAYER)
248 if (pl->type==PLAYER) esrv_del_item (pl->contr, tmp->count); 279 esrv_del_item (pl->contr, tmp->count);
249 if ( ! QUERY_FLAG (tmp, FLAG_REMOVED)) 280
250 remove_ob (tmp); 281 tmp->destroy ();
251 free_object(tmp);
252 return; 282 return;
253 }
254 283 }
284
255 if (nrof > tmp_nrof || nrof == 0) 285 if (nrof > tmp_nrof || nrof == 0)
256 nrof = tmp_nrof; 286 nrof = tmp_nrof;
287
257 /* Figure out how much weight this object will add to the player */ 288 /* Figure out how much weight this object will add to the player */
258 weight = tmp->weight * nrof; 289 weight = tmp->weight * nrof;
290 if (tmp->inv)
259 if (tmp->inv) weight += tmp->carrying * (100 - tmp->stats.Str) / 100; 291 weight += tmp->carrying * (100 - tmp->stats.Str) / 100;
292
260 if (pl->stats.Str <= MAX_STAT) 293 if (pl->stats.Str <= MAX_STAT)
261 effective_weight_limit = weight_limit[pl->stats.Str]; 294 effective_weight_limit = weight_limit[pl->stats.Str];
262 else 295 else
263 effective_weight_limit = weight_limit[MAX_STAT]; 296 effective_weight_limit = weight_limit[MAX_STAT];
297
264 if ((pl->weight + pl->carrying + weight) > effective_weight_limit) { 298 if ((pl->weight + pl->carrying + weight) > effective_weight_limit)
299 {
265 new_draw_info(0, 0,pl,"That item is too heavy for you to pick up."); 300 new_draw_info (0, 0, pl, "That item is too heavy for you to pick up.");
266 return; 301 return;
267 } 302 }
303
268 if (settings.real_wiz == FALSE && QUERY_FLAG(pl, FLAG_WAS_WIZ)) 304 if (settings.real_wiz == FALSE && QUERY_FLAG (pl, FLAG_WAS_WIZ))
269 SET_FLAG(tmp, FLAG_WAS_WIZ); 305 SET_FLAG (tmp, FLAG_WAS_WIZ);
306
270 if (nrof != tmp_nrof) { 307 if (nrof != tmp_nrof)
308 {
271 object *tmp2 = tmp; 309 object *tmp2 = tmp;
272 tag_t tmp2_tag = tmp2->count; 310
273 tmp = get_split_ob (tmp, nrof); 311 tmp = get_split_ob (tmp, nrof);
274 if(!tmp) { 312 if (!tmp)
313 {
275 new_draw_info(NDI_UNIQUE, 0,pl, errmsg); 314 new_draw_info (NDI_UNIQUE, 0, pl, errmsg);
276 return; 315 return;
277 } 316 }
317
278 /* Tell a client what happened rest of objects */ 318 /* Tell a client what happened rest of objects */
279 if (pl->type == PLAYER) { 319 if (pl->type == PLAYER)
280 if (was_destroyed (tmp2, tmp2_tag)) 320 {
321 if (tmp2->destroyed ())
281 esrv_del_item (pl->contr, tmp2_tag); 322 esrv_del_item (pl->contr, tmp2->count);
282 else 323 else
283 esrv_send_item (pl, tmp2); 324 esrv_send_item (pl, tmp2);
284 } 325 }
285 } else { 326 }
327 else
328 {
286 /* If the object is in a container, send a delete to the client. 329 /* If the object is in a container, send a delete to the client.
287 * - we are moving all the items from the container to elsewhere, 330 * - we are moving all the items from the container to elsewhere,
288 * so it needs to be deleted. 331 * so it needs to be deleted.
289 */ 332 */
290 if ( ! QUERY_FLAG (tmp, FLAG_REMOVED)) { 333 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
334 {
291 if (tmp->env && pl->type==PLAYER) 335 if (tmp->env && pl->type == PLAYER)
292 esrv_del_item (pl->contr, tmp->count); 336 esrv_del_item (pl->contr, tmp->count);
293 remove_ob(tmp); /* Unlink it */ 337 tmp->remove (); /* Unlink it */
294 } 338 }
295 } 339 }
296 if(QUERY_FLAG(tmp, FLAG_UNPAID)) 340 if (QUERY_FLAG (tmp, FLAG_UNPAID))
297 (void) sprintf(buf,"%s will cost you %s.", query_name(tmp), 341 (void) sprintf (buf, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
298 query_cost_string(tmp,pl,F_BUY | F_SHOP));
299 else 342 else
300 (void) sprintf(buf,"You pick up the %s.", query_name(tmp)); 343 (void) sprintf (buf, "You pick up the %s.", query_name (tmp));
301 new_draw_info(NDI_UNIQUE, 0,pl,buf); 344 new_draw_info (NDI_UNIQUE, 0, pl, buf);
302 345
303 tmp = insert_ob_in_ob(tmp, op); 346 tmp = insert_ob_in_ob (tmp, op);
304 347
305 /* All the stuff below deals with client/server code, and is only 348 /* All the stuff below deals with client/server code, and is only
306 * usable by players 349 * usable by players
307 */ 350 */
308 if(pl->type!=PLAYER) return; 351 if (pl->type != PLAYER)
352 return;
309 353
310 esrv_send_item (pl, tmp); 354 esrv_send_item (pl, tmp);
311 /* These are needed to update the weight for the container we 355 /* These are needed to update the weight for the container we
312 * are putting the object in. 356 * are putting the object in.
313 */ 357 */
314 if (op!=pl) { 358 if (op != pl)
359 {
315 esrv_update_item (UPD_WEIGHT, pl, op); 360 esrv_update_item (UPD_WEIGHT, pl, op);
316 esrv_send_item (pl, pl); 361 esrv_send_item (pl, pl);
317 } 362 }
318 363
319 /* Update the container the object was in */ 364 /* Update the container the object was in */
320 if (env && env!=pl && env!=op) esrv_update_item (UPD_WEIGHT, pl, env); 365 if (env && env != pl && env != op)
366 esrv_update_item (UPD_WEIGHT, pl, env);
321} 367}
322 368
323
324void pick_up(object *op,object *alt)
325/* modified slightly to allow monsters use this -b.t. 5-31-95 */ 369/* modified slightly to allow monsters use this -b.t. 5-31-95 */
370void
371pick_up (object *op, object *alt)
326{ 372{
327 int need_fix_tmp = 0; 373 int need_fix_tmp = 0;
328 object *tmp=NULL; 374 object *tmp = NULL;
329 mapstruct *tmp_map=NULL; 375 maptile *tmp_map = NULL;
330 int count; 376 int count;
331 tag_t tag;
332 377
333 /* Decide which object to pick. */ 378 /* Decide which object to pick. */
334 if (alt) 379 if (alt)
335 { 380 {
336 if ( ! can_pick (op, alt)) { 381 if (!can_pick (op, alt))
382 {
337 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", 383 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name);
338 alt->name);
339 goto leave; 384 goto leave;
340 } 385 }
341 tmp = alt; 386 tmp = alt;
342 } 387 }
343 else 388 else
344 { 389 {
345 if (op->below == NULL || ! can_pick (op, op->below)) { 390 if (op->below == NULL || !can_pick (op, op->below))
346 new_draw_info (NDI_UNIQUE, 0, op, 391 {
347 "There is nothing to pick up here."); 392 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up here.");
348 goto leave; 393 goto leave;
349 } 394 }
395
350 tmp = op->below; 396 tmp = op->below;
351 } 397 }
352 398
353 /* Try to catch it. */ 399 /* Try to catch it. */
354 tmp_map = tmp->map; 400 tmp_map = tmp->map;
355 tmp = stop_item (tmp); 401 tmp = stop_item (tmp);
356 if (tmp == NULL) 402 if (tmp == NULL)
403 goto leave;
404 need_fix_tmp = 1;
405 if (!can_pick (op, tmp))
406 goto leave;
407
408 if (op->type == PLAYER)
409 {
410 count = op->contr->count;
411 if (count == 0)
412 count = tmp->nrof;
413 }
414 else
415 count = tmp->nrof;
416
417 /* container is open, so use it */
418 if (op->container)
419 {
420 alt = op->container;
421 if (alt != tmp->env && !sack_can_hold (op, alt, tmp, count))
357 goto leave; 422 goto leave;
358 need_fix_tmp = 1;
359 if ( ! can_pick (op, tmp))
360 goto leave;
361
362 if (op->type==PLAYER) {
363 count=op->contr->count;
364 if (count==0) count = tmp->nrof;
365 } 423 }
366 else 424 else
367 count=tmp->nrof; 425 { /* non container pickup */
426 for (alt = op->inv; alt; alt = alt->below)
427 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) &&
428 alt->race && alt->race == tmp->race && sack_can_hold (NULL, alt, tmp, count))
429 break; /* perfect match */
368 430
369 /* container is open, so use it */ 431 if (!alt)
370 if (op->container) {
371 alt = op->container;
372 if (alt != tmp->env && !sack_can_hold (op, alt, tmp,count))
373 goto leave;
374 } else { /* non container pickup */
375 for (alt=op->inv; alt; alt=alt->below) 432 for (alt = op->inv; alt; alt = alt->below)
376 if (alt->type==CONTAINER && QUERY_FLAG(alt, FLAG_APPLIED) && 433 if (alt->type == CONTAINER && QUERY_FLAG (alt, FLAG_APPLIED) && sack_can_hold (NULL, alt, tmp, count))
377 alt->race && alt->race==tmp->race && 434 break; /* General container comes next */
378 sack_can_hold (NULL, alt, tmp,count))
379 break; /* perfect match */
380
381 if (!alt) 435 if (!alt)
382 for (alt=op->inv; alt; alt=alt->below)
383 if (alt->type==CONTAINER && QUERY_FLAG(alt, FLAG_APPLIED) &&
384 sack_can_hold (NULL, alt, tmp,count))
385 break; /* General container comes next */
386 if (!alt)
387 alt = op; /* No free containers */ 436 alt = op; /* No free containers */
388 } 437 }
438
389 if(tmp->env == alt) { 439 if (tmp->env == alt)
440 {
390 /* here it could be possible to check rent, 441 /* here it could be possible to check rent,
391 * if someone wants to implement it 442 * if someone wants to implement it
392 */ 443 */
393 alt = op; 444 alt = op;
394 } 445 }
395#ifdef PICKUP_DEBUG 446#ifdef PICKUP_DEBUG
396 LOG(llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name); 447 LOG (llevDebug, "Pick_up(): %s picks %s (%d) and inserts it %s.\n", op->name, tmp->name, op->contr->count, alt->name);
397#endif 448#endif
398 449
399 /* startequip items are not allowed to be put into containers: */ 450 /* startequip items are not allowed to be put into containers: */
400 if (op->type == PLAYER && alt->type == CONTAINER 451 if (op->type == PLAYER && alt->type == CONTAINER && QUERY_FLAG (tmp, FLAG_STARTEQUIP))
401 && QUERY_FLAG (tmp, FLAG_STARTEQUIP))
402 { 452 {
403 new_draw_info (NDI_UNIQUE, 0, op, 453 new_draw_info (NDI_UNIQUE, 0, op, "This object cannot be put into containers!");
404 "This object cannot be put into containers!");
405 goto leave; 454 goto leave;
406 } 455 }
407 456
408 tag = tmp->count;
409 pick_up_object (op, alt, tmp, count); 457 pick_up_object (op, alt, tmp, count);
458
410 if (was_destroyed (tmp, tag) || tmp->env) 459 if (tmp->destroyed () || tmp->env)
411 need_fix_tmp = 0; 460 need_fix_tmp = 0;
461
412 if (op->type == PLAYER) 462 if (op->type == PLAYER)
413 op->contr->count=0; 463 op->contr->count = 0;
464
414 goto leave; 465 goto leave;
415 466
416 leave: 467leave:
417 if (need_fix_tmp) 468 if (need_fix_tmp)
418 fix_stopped_item (tmp, tmp_map, op); 469 fix_stopped_item (tmp, tmp_map, op);
419} 470}
420 471
421 472
422/* This takes (picks up) and item. op is the player 473/* This takes (picks up) and item. op is the player
423 * who issued the command. params is a string to 474 * who issued the command. params is a string to
424 * match against the item name. Basically, always 475 * match against the item name. Basically, always
425 * returns zero, but that should be improved. 476 * returns zero, but that should be improved.
426 */ 477 */
478int
427int command_take (object *op, char *params) 479command_take (object *op, char *params)
428{ 480{
429 object *tmp, *next; 481 object *tmp, *next;
430 482
431 if (op->container) 483 if (op->container)
432 tmp=op->container->inv; 484 tmp = op->container->inv;
433 else { 485 else
486 {
434 tmp=op->above; 487 tmp = op->above;
488 if (tmp)
435 if (tmp) while (tmp->above) { 489 while (tmp->above)
436 tmp=tmp->above; 490 tmp = tmp->above;
437 } 491
438 if (!tmp) 492 if (!tmp)
439 tmp=op->below; 493 tmp = op->below;
440 } 494 }
441 495
442 if (tmp==NULL) { 496 if (tmp == NULL)
497 {
443 new_draw_info(NDI_UNIQUE, 0,op,"Nothing to take!"); 498 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!");
444 return 0; 499 return 0;
445 } 500 }
446 501
447 /* Makes processing easier */ 502 /* Makes processing easier */
448 if (params && *params=='\0') params=NULL; 503 if (params && *params == '\0')
504 params = NULL;
449 505
450 while (tmp) { 506 while (tmp)
507 {
451 next=tmp->below; 508 next = tmp->below;
452 509
453 if (tmp->invisible) { 510 if (tmp->invisible)
511 {
454 tmp=next; 512 tmp = next;
455 continue; 513 continue;
456 } 514 }
457 /* This following two if and else if could be merged into line 515 /* This following two if and else if could be merged into line
458 * but that probably will make it more difficult to read, and 516 * but that probably will make it more difficult to read, and
459 * not make it any more efficient 517 * not make it any more efficient
460 */ 518 */
461 if (params && item_matched_string(op, tmp, params)) { 519 if (params && item_matched_string (op, tmp, params))
520 {
462 pick_up(op, tmp); 521 pick_up (op, tmp);
463 } 522 }
464 else if (can_pick(op, tmp) && !params) { 523 else if (can_pick (op, tmp) && !params)
524 {
465 pick_up(op,tmp); 525 pick_up (op, tmp);
526 break;
527 }
528 tmp = next;
529 /* Might as well just skip over the player immediately -
530 * we know it can't be picked up
531 */
532 if (tmp == op)
533 tmp = tmp->below;
534 }
535 if (!params && !tmp)
536 {
537 for (tmp = op->below; tmp != NULL; tmp = tmp->next)
538 if (!tmp->invisible)
539 {
540 char buf[MAX_BUF];
541
542 sprintf (buf, "You can't pick up a %s.", &tmp->name);
543 new_draw_info (NDI_UNIQUE, 0, op, buf);
466 break; 544 break;
467 }
468 tmp=next;
469 /* Might as well just skip over the player immediately -
470 * we know it can't be picked up
471 */
472 if (tmp == op) tmp=tmp->below;
473 }
474 if (!params && !tmp) {
475 for (tmp=op->below; tmp!=NULL; tmp=tmp->next)
476 if (!tmp->invisible) {
477 char buf[MAX_BUF];
478 sprintf(buf,"You can't pick up a %s.",
479 tmp->name? tmp->name:"null");
480 new_draw_info(NDI_UNIQUE, 0,op, buf);
481 break;
482 } 545 }
546 if (!tmp)
483 if (!tmp) new_draw_info(NDI_UNIQUE, 0,op, "There is nothing to pick up."); 547 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up.");
484 } 548 }
485 return 0; 549 return 0;
486} 550}
487 551
488 552
489/* 553/*
490 * This function was part of drop, now is own function. 554 * This function was part of drop, now is own function.
491 * Player 'op' tries to put object 'tmp' into sack 'sack', 555 * Player 'op' tries to put object 'tmp' into sack 'sack',
492 * if nrof is non zero, then nrof objects is tried to put into sack. 556 * if nrof is non zero, then nrof objects is tried to put into sack.
493 * Note that the 'sack' in question can now be a transport, 557 * Note that the 'sack' in question can now be a transport,
494 * so this function isn't named very good anymore. 558 * so this function isn't named very good anymore.
495 */ 559 */
560void
496void put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 561put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
497{ 562{
498 tag_t tmp_tag, tmp2_tag;
499 object *tmp2, *sack2; 563 object *tmp2, *sack2;
500 char buf[MAX_BUF]; 564 char buf[MAX_BUF];
501 565
502 if (sack==tmp) return; /* Can't put an object in itself */ 566 if (sack == tmp)
567 return; /* Can't put an object in itself */
568
503 if (QUERY_FLAG(tmp,FLAG_STARTEQUIP)) { 569 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
504 new_draw_info_format(NDI_UNIQUE, 0,op, 570 {
505 "You cannot put the %s in the %s.", query_name(tmp), 571 new_draw_info_format (NDI_UNIQUE, 0, op, "You cannot put the %s in the %s.", query_name (tmp), query_name (sack));
506 query_name(sack));
507 return; 572 return;
508 } 573 }
574
509 if (tmp->type == CONTAINER && tmp->inv) { 575 if (tmp->type == CONTAINER && tmp->inv)
576 {
510 577
511 /* Eneq(@csd.uu.se): If the object to be dropped is a container 578 /* Eneq(@csd.uu.se): If the object to be dropped is a container
512 * we instead move the contents of that container into the active 579 * we instead move the contents of that container into the active
513 * container, this is only done if the object has something in it. 580 * container, this is only done if the object has something in it.
514 */ 581 */
515 sack2 = tmp; 582 sack2 = tmp;
516 new_draw_info_format(NDI_UNIQUE, 0,op, "You move the items from %s into %s.", 583 new_draw_info_format (NDI_UNIQUE, 0, op, "You move the items from %s into %s.", query_name (tmp), query_name (sack));
517 query_name(tmp), query_name(sack)); 584
518 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) { 585 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
586 {
519 tmp = tmp2->below; 587 tmp = tmp2->below;
588
520 if ((sack->type == CONTAINER && sack_can_hold(op, op->container, tmp2,tmp2->nrof))) { 589 if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof)))
590 {
521 put_object_in_sack (op, sack, tmp2, 0); 591 put_object_in_sack (op, sack, tmp2, 0);
522 } else {
523 sprintf(buf,"Your %s fills up.", query_name(sack));
524 new_draw_info(NDI_UNIQUE, 0,op, buf);
525 break;
526 } 592 }
593 else
594 {
595 sprintf (buf, "Your %s fills up.", query_name (sack));
596 new_draw_info (NDI_UNIQUE, 0, op, buf);
597 break;
527 } 598 }
599 }
600
528 esrv_update_item (UPD_WEIGHT, op, sack2); 601 esrv_update_item (UPD_WEIGHT, op, sack2);
529 return; 602 return;
530 } 603 }
531 604
532 /* Don't worry about this for containers - our caller should have 605 /* Don't worry about this for containers - our caller should have
533 * already checked this. 606 * already checked this.
534 */ 607 */
535 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp,(nrof?nrof:tmp->nrof))) 608 if ((sack->type == CONTAINER) && !sack_can_hold (op, sack, tmp, (nrof ? nrof : tmp->nrof)))
536 return; 609 return;
537 610
538 if(QUERY_FLAG(tmp, FLAG_APPLIED)) { 611 if (QUERY_FLAG (tmp, FLAG_APPLIED))
539 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 612 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
540 return; 613 return;
541 }
542 614
543 /* we want to put some portion of the item into the container */ 615 /* we want to put some portion of the item into the container */
544 if (nrof && tmp->nrof != nrof) { 616 if (nrof && tmp->nrof != nrof)
617 {
545 object *tmp2 = tmp; 618 object *tmp2 = tmp;
546 tmp2_tag = tmp2->count; 619
547 tmp = get_split_ob (tmp, nrof); 620 tmp = get_split_ob (tmp, nrof);
548 621
549 if(!tmp) { 622 if (!tmp)
623 {
550 new_draw_info(NDI_UNIQUE, 0,op, errmsg); 624 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
551 return; 625 return;
552 } 626 }
553 /* Tell a client what happened other objects */ 627 /* Tell a client what happened other objects */
554 if (was_destroyed (tmp2, tmp2_tag)) 628 if (tmp2->destroyed ())
555 esrv_del_item (op->contr, tmp2_tag); 629 esrv_del_item (op->contr, tmp2->count);
556 else /* this can proably be replaced with an update */ 630 else /* this can proably be replaced with an update */
557 esrv_send_item (op, tmp2); 631 esrv_send_item (op, tmp2);
632 }
558 } else 633 else
559 remove_ob(tmp); 634 tmp->remove ();
560 635
561 new_draw_info_format(NDI_UNIQUE, 0,op, "You put the %s in %s.", 636 new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
562 query_name(tmp), query_name(sack));
563 tmp_tag = tmp->count;
564 tmp2 = insert_ob_in_ob(tmp, sack); 637 tmp2 = insert_ob_in_ob (tmp, sack);
565 fix_player(op); /* This is overkill, fix_player() is called somewhere */ 638 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
566 /* in object.c */ 639 /* in object.c */
567 640
568 /* If an object merged (and thus, different object), we need to 641 /* If an object merged (and thus, different object), we need to
569 * delete the original. 642 * delete the original.
570 */ 643 */
571 if (tmp2 != tmp) 644 if (tmp2 != tmp)
572 esrv_del_item (op->contr, tmp_tag); 645 esrv_del_item (op->contr, tmp->count);
573 646
574 esrv_send_item (op, tmp2); 647 esrv_send_item (op, tmp2);
575 648
576 /* update the sacks weight */ 649 /* update the sacks weight */
577 esrv_update_item (UPD_WEIGHT, op, sack); 650 esrv_update_item (UPD_WEIGHT, op, sack);
578} 651}
579 652
580/* 653/*
581 * This function was part of drop, now is own function. 654 * This function was part of drop, now is own function.
582 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then 655 * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
583 * nrof objects is tried to dropped. 656 * nrof objects is tried to dropped.
584 * This is used when dropping objects onto the floor. 657 * This is used when dropping objects onto the floor.
585 */ 658 */
586void 659void
587drop_object (object * op, object * tmp, uint32 nrof) 660drop_object (object *op, object *tmp, uint32 nrof)
588{ 661{
589 char buf[MAX_BUF]; 662 char buf[MAX_BUF];
590 object *floor; 663 object *floor;
591 664
592 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 665 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
593 return; 666 return;
594 667
595 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 668 if (QUERY_FLAG (tmp, FLAG_APPLIED))
596 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 669 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
597 return; /* can't unapply it */ 670 return; /* can't unapply it */
598 671
599 /* We are only dropping some of the items. We split the current objec 672 /* We are only dropping some of the items. We split the current object
600 * off 673 * off
601 */ 674 */
602 if (nrof && tmp->nrof != nrof) 675 if (nrof && tmp->nrof != nrof)
603 { 676 {
604 object *tmp2 = tmp; 677 object *tmp2 = tmp;
605 tag_t tmp2_tag = tmp2->count; 678
606 tmp = get_split_ob (tmp, nrof); 679 tmp = get_split_ob (tmp, nrof);
607 if (!tmp) 680 if (!tmp)
608 { 681 {
609 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 682 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
610 return; 683 return;
… …
612 /* Tell a client what happened rest of objects. tmp2 is now the 685 /* Tell a client what happened rest of objects. tmp2 is now the
613 * original object 686 * original object
614 */ 687 */
615 if (op->type == PLAYER) 688 if (op->type == PLAYER)
616 { 689 {
617 if (was_destroyed (tmp2, tmp2_tag)) 690 if (tmp2->destroyed ())
618 esrv_del_item (op->contr, tmp2_tag); 691 esrv_del_item (op->contr, tmp2->count);
619 else 692 else
620 esrv_send_item (op, tmp2); 693 esrv_send_item (op, tmp2);
621 } 694 }
622 } 695 }
623 else 696 else
624 remove_ob (tmp); 697 tmp->remove ();
625 698
626 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op))) 699 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
627 return; 700 return;
628 701
629 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 702 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
630 { 703 {
631 sprintf (buf, "You drop the %s.", query_name (tmp)); 704 sprintf (buf, "You drop the %s.", query_name (tmp));
632 new_draw_info (NDI_UNIQUE, 0, op, buf); 705 new_draw_info (NDI_UNIQUE, 0, op, buf);
633 new_draw_info (NDI_UNIQUE, 0, op, 706 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it.");
634 "The gods who lent it to you retrieves it."); 707
635 if (op->type == PLAYER) 708 if (op->type == PLAYER)
636 esrv_del_item (op->contr, tmp->count); 709 esrv_del_item (op->contr, tmp->count);
637 free_object (tmp); 710
638 fix_player (op); 711 tmp->destroy ();
712 op->update_stats ();
639 return; 713 return;
640 } 714 }
641 715
642/* If SAVE_INTERVAL is commented out, we never want to save 716/* If SAVE_INTERVAL is commented out, we never want to save
643 * the player here. 717 * the player here.
… …
646 /* I'm not sure why there is a value check - since the save 720 /* I'm not sure why there is a value check - since the save
647 * is done every SAVE_INTERVAL seconds, why care the value 721 * is done every SAVE_INTERVAL seconds, why care the value
648 * of what he is dropping? 722 * of what he is dropping?
649 */ 723 */
650 if (op->type == PLAYER && !QUERY_FLAG (tmp, FLAG_UNPAID) && 724 if (op->type == PLAYER && !QUERY_FLAG (tmp, FLAG_UNPAID) &&
651 (tmp->nrof ? tmp->value * tmp->nrof : tmp->value > 2000) && 725 (tmp->nrof ? tmp->value * tmp->nrof : tmp->value > 2000) && (op->contr->last_save_time + SAVE_INTERVAL) <= time (NULL))
652 (op->contr->last_save_time + SAVE_INTERVAL) <= time (NULL))
653 { 726 {
654 save_player (op, 1); 727 op->contr->save ();
655 op->contr->last_save_time = time (NULL); 728 op->contr->last_save_time = time (NULL);
656 } 729 }
657#endif /* SAVE_INTERVAL */ 730#endif /* SAVE_INTERVAL */
658 731
659 if (op->type == PLAYER) 732 if (op->type == PLAYER)
660 esrv_del_item (op->contr, tmp->count); 733 esrv_del_item (op->contr, tmp->count);
661 734
662 /* Call this before we update the various windows/players. At least 735 /* Call this before we update the various windows/players. At least
663 * that we, we know the weight is correct. 736 * that we, we know the weight is correct.
664 */ 737 */
665 fix_player (op); /* This is overkill, fix_player() is called somewhere */ 738 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
666 /* in object.c */ 739 /* in object.c */
667 740
668 if (op->type == PLAYER) 741 if (op->type == PLAYER)
669 { 742 {
670 op->contr->socket.update_look = 1;
671 /* Need to update the weight for the player */ 743 /* Need to update the weight for the player */
672 esrv_send_item (op, op); 744 esrv_send_item (op, op);
745 op->contr->ns->floorbox_update ();
673 } 746 }
674 747
675 for (floor = get_map_ob (op->map, op->x, op->y); floor; floor = floor->above) 748 for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
676 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op))) 749 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
677 return; 750 return;
678 751
679 floor = get_map_ob (op->map, op->x, op->y); 752 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
680
681 if (floor
682 && floor->type == SHOP_FLOOR
683 && !QUERY_FLAG (tmp, FLAG_UNPAID)
684 && tmp->type != MONEY)
685 sell_item (tmp, op); 753 sell_item (tmp, op);
686 754
687 tmp->x = op->x; 755 tmp->x = op->x;
688 tmp->y = op->y; 756 tmp->y = op->y;
689 757
690 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR); 758 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
691} 759}
692 760
761void
693void drop(object *op, object *tmp) 762drop (object *op, object *tmp)
694{ 763{
695 /* Hopeful fix for disappearing objects when dropping from a container - 764 /* Hopeful fix for disappearing objects when dropping from a container -
696 * somehow, players get an invisible object in the container, and the 765 * somehow, players get an invisible object in the container, and the
697 * old logic would skip over invisible objects - works fine for the 766 * old logic would skip over invisible objects - works fine for the
698 * playes inventory, but drop inventory wants to use the next value. 767 * playes inventory, but drop inventory wants to use the next value.
699 */ 768 */
700 if (tmp->invisible) { 769 if (tmp->invisible)
770 {
701 /* if the following is the case, it must be in an container. */ 771 /* if the following is the case, it must be in an container. */
702 if (tmp->env && tmp->env->type != PLAYER) { 772 if (tmp->env && tmp->env->type != PLAYER)
773 {
703 /* Just toss the object - probably shouldn't be hanging 774 /* Just toss the object - probably shouldn't be hanging
704 * around anyways 775 * around anyways
705 */ 776 */
706 remove_ob(tmp); 777 tmp->remove ();
707 free_object(tmp); 778 tmp->destroy ();
708 return; 779 return;
780 }
709 } else { 781 else
782 {
710 while(tmp!=NULL && tmp->invisible) 783 while (tmp != NULL && tmp->invisible)
711 tmp=tmp->below; 784 tmp = tmp->below;
712 } 785 }
713 } 786 }
714 787
715 if (tmp==NULL) { 788 if (tmp == NULL)
789 {
716 new_draw_info(NDI_UNIQUE, 0,op,"You don't have anything to drop."); 790 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
717 return; 791 return;
718 } 792 }
719 if (QUERY_FLAG(tmp, FLAG_INV_LOCKED)) { 793 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
794 {
720 new_draw_info(NDI_UNIQUE, 0,op,"This item is locked"); 795 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
721 return; 796 return;
722 } 797 }
723 if (QUERY_FLAG(tmp, FLAG_NO_DROP)) { 798 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
799 {
724#if 0 800#if 0
725 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 801 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
726 new_draw_info(NDI_UNIQUE, 0,op, "This item can't be dropped."); 802 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
727#endif 803#endif
728 return; 804 return;
729 } 805 }
730 806
807 if (op->type == PLAYER && op->contr->last_used == tmp)
808 op->contr->last_used = tmp->below ? tmp->below
809 : tmp->above ? tmp->above
810 : 0;
811
812 if (op->container)
813 {
731 if (op->type == PLAYER) 814 if (op->type == PLAYER)
732 { 815 put_object_in_sack (op, op->container, tmp, op->contr->count);
733 if (op->contr->last_used==tmp && op->contr->last_used_id == tmp->count) {
734 object *n=NULL;
735 if(tmp->below != NULL)
736 n = tmp->below;
737 else if(tmp->above != NULL)
738 n = tmp->above;
739 op->contr->last_used = n;
740 if (n != NULL)
741 op->contr->last_used_id = n->count;
742 else 816 else
743 op->contr->last_used_id = 0; 817 put_object_in_sack (op, op->container, tmp, 0);
744 }
745 }; 818 }
746 819 else
747 if (op->container) { 820 {
748 if (op->type == PLAYER) 821 if (op->type == PLAYER)
749 {
750 put_object_in_sack (op, op->container, tmp, op->contr->count);
751 } else {
752 put_object_in_sack(op, op->container, tmp, 0);
753 };
754 } else {
755 if (op->type == PLAYER)
756 {
757 drop_object (op, tmp, op->contr->count); 822 drop_object (op, tmp, op->contr->count);
758 } else { 823 else
759 drop_object(op,tmp,0); 824 drop_object (op, tmp, 0);
760 };
761 } 825 }
826
762 if (op->type == PLAYER) 827 if (op->type == PLAYER)
763 op->contr->count = 0; 828 op->contr->count = 0;
764} 829}
765 830
766 831
767 832
768/* Command will drop all items that have not been locked */ 833/* Command will drop all items that have not been locked */
834int
769int command_dropall (object *op, char *params) { 835command_dropall (object *op, char *params)
836{
770 837
771 object * curinv, *nextinv; 838 object *curinv, *nextinv;
772 839
773 if(op->inv == NULL) { 840 if (op->inv == NULL)
841 {
774 new_draw_info(NDI_UNIQUE, 0,op,"Nothing to drop!"); 842 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
775 return 0; 843 return 0;
776 } 844 }
777 845
778 curinv = op->inv; 846 curinv = op->inv;
779 847
780 /* 848 /*
781 This is the default. Drops everything not locked or considered 849 This is the default. Drops everything not locked or considered
782 not something that should be dropped. 850 not something that should be dropped.
783 */ 851 */
784 /* 852 /*
785 Care must be taken that the next item pointer is not to money as 853 Care must be taken that the next item pointer is not to money as
786 the drop() routine will do unknown things to it when dropping 854 the drop() routine will do unknown things to it when dropping
787 in a shop. --Tero.Pelander@utu.fi 855 in a shop. --Tero.Pelander@utu.fi
788 */ 856 */
789 857
790 if(params==NULL) { 858 if (params == NULL)
859 {
791 while(curinv != NULL) { 860 while (curinv != NULL)
861 {
792 nextinv = curinv->below; 862 nextinv = curinv->below;
793 while (nextinv && nextinv->type==MONEY) 863 while (nextinv && nextinv->type == MONEY)
794 nextinv = nextinv->below; 864 nextinv = nextinv->below;
795 if(! QUERY_FLAG(curinv,FLAG_INV_LOCKED) && curinv->type != MONEY && 865 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
796 curinv->type != FOOD && curinv->type != KEY && 866 curinv->type != FOOD && curinv->type != KEY &&
797 curinv->type != SPECIAL_KEY && curinv->type != GEM && 867 curinv->type != SPECIAL_KEY && curinv->type != GEM &&
798 !curinv->invisible &&
799 (curinv->type!=CONTAINER || op->container!=curinv)) 868 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
800 { 869 {
801 drop(op,curinv);
802 }
803 curinv = nextinv;
804 }
805 }
806
807 else if(strcmp(params, "weapons") == 0) {
808 while(curinv != NULL) {
809 nextinv = curinv->below;
810 while (nextinv && nextinv->type==MONEY)
811 nextinv = nextinv->below;
812 if(! QUERY_FLAG(curinv,FLAG_INV_LOCKED) && ((curinv->type == WEAPON) ||
813 (curinv->type == BOW) || (curinv->type == ARROW)))
814 {
815 drop(op,curinv); 870 drop (op, curinv);
816 } 871 }
817 curinv = nextinv;
818 }
819 }
820
821 else if(strcmp(params, "armor") == 0 || strcmp(params, "armour") == 0) {
822 while(curinv != NULL) {
823 nextinv = curinv->below;
824 while (nextinv && nextinv->type==MONEY)
825 nextinv = nextinv->below;
826 if(! QUERY_FLAG(curinv,FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) ||
827 curinv->type == SHIELD || curinv->type==HELMET))
828 {
829 drop(op,curinv);
830 }
831 curinv = nextinv;
832 }
833 }
834
835 else if(strcmp(params, "misc") == 0) {
836 while(curinv != NULL) {
837 nextinv = curinv->below;
838 while (nextinv && nextinv->type==MONEY)
839 nextinv = nextinv->below;
840 if(! QUERY_FLAG(curinv,FLAG_INV_LOCKED) && ! QUERY_FLAG(curinv,FLAG_APPLIED)) {
841 switch(curinv->type) {
842 case HORN:
843 case BOOK:
844 case SPELLBOOK:
845 case GIRDLE:
846 case AMULET:
847 case RING:
848 case CLOAK:
849 case BOOTS:
850 case GLOVES:
851 case BRACERS:
852 case SCROLL:
853 case ARMOUR_IMPROVER:
854 case WEAPON_IMPROVER:
855 case WAND:
856 case ROD:
857 case POTION:
858 drop(op,curinv);
859 curinv = nextinv; 872 curinv = nextinv;
860 break; 873 }
861 default: 874 }
875
876 else if (strcmp (params, "weapons") == 0)
877 {
878 while (curinv != NULL)
879 {
880 nextinv = curinv->below;
881 while (nextinv && nextinv->type == MONEY)
882 nextinv = nextinv->below;
883 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
884 {
885 drop (op, curinv);
886 }
862 curinv = nextinv; 887 curinv = nextinv;
863 break; 888 }
889 }
890
891 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
892 {
893 while (curinv != NULL)
864 } 894 {
865 } 895 nextinv = curinv->below;
896 while (nextinv && nextinv->type == MONEY)
897 nextinv = nextinv->below;
898 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
899 {
900 drop (op, curinv);
901 }
866 curinv = nextinv; 902 curinv = nextinv;
903 }
904 }
905
906 else if (strcmp (params, "misc") == 0)
867 } 907 {
908 while (curinv != NULL)
909 {
910 nextinv = curinv->below;
911 while (nextinv && nextinv->type == MONEY)
912 nextinv = nextinv->below;
913 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
914 {
915 switch (curinv->type)
916 {
917 case HORN:
918 case BOOK:
919 case SPELLBOOK:
920 case GIRDLE:
921 case AMULET:
922 case RING:
923 case CLOAK:
924 case BOOTS:
925 case GLOVES:
926 case BRACERS:
927 case SCROLL:
928 case ARMOUR_IMPROVER:
929 case WEAPON_IMPROVER:
930 case WAND:
931 case ROD:
932 case POTION:
933 drop (op, curinv);
934 curinv = nextinv;
935 break;
936 default:
937 curinv = nextinv;
938 break;
939 }
940 }
941 curinv = nextinv;
942 }
868 } 943 }
869 op->contr->socket.update_look=1; 944
945 op->contr->ns->floorbox_update ();
946
870/* draw_look(op);*/ 947/* draw_look(op);*/
871 return 0; 948 return 0;
872} 949}
873 950
874/* Object op wants to drop object(s) params. params can be a 951/* Object op wants to drop object(s) params. params can be a
875 * comma seperated list. 952 * comma seperated list.
876 */ 953 */
877 954
955int
878int command_drop (object *op, char *params) 956command_drop (object *op, char *params)
879{ 957{
880 object *tmp, *next; 958 object *tmp, *next;
881 int did_one=0; 959 int did_one = 0;
882 960
883 if (!params) { 961 if (!params)
962 {
884 new_draw_info(NDI_UNIQUE,0, op, "Drop what?"); 963 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
885 return 0; 964 return 0;
886 } else { 965 }
966 else
967 {
887 for (tmp=op->inv; tmp; tmp=next) { 968 for (tmp = op->inv; tmp; tmp = next)
969 {
888 next=tmp->below; 970 next = tmp->below;
889 if (QUERY_FLAG(tmp,FLAG_NO_DROP) || 971 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
890 tmp->invisible) continue; 972 continue;
891 if (item_matched_string(op,tmp,params)) { 973 if (item_matched_string (op, tmp, params))
974 {
892 drop(op, tmp); 975 drop (op, tmp);
893 did_one=1; 976 did_one = 1;
894 } 977 }
895 } 978 }
979 if (!did_one)
896 if (!did_one) new_draw_info(NDI_UNIQUE, 0,op,"Nothing to drop."); 980 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
897 } 981 }
898 if (op->type==PLAYER) 982 if (op->type == PLAYER)
899 { 983 {
900 op->contr->count=0; 984 op->contr->count = 0;
901 op->contr->socket.update_look=1; 985 op->contr->ns->floorbox_update ();
902 }; 986 };
987
903/* draw_look(op);*/ 988/* draw_look(op);*/
904 return 0; 989 return 0;
905} 990}
906 991
992int
907int command_examine (object *op, char *params) 993command_examine (object *op, char *params)
908{ 994{
909 if (!params) { 995 if (!params)
996 {
910 object *tmp=op->below; 997 object *tmp = op->below;
998
911 while (tmp && !LOOK_OBJ(tmp)) tmp=tmp->below; 999 while (tmp && !LOOK_OBJ (tmp))
912 if (tmp) examine(op,tmp); 1000 tmp = tmp->below;
913 }
914 else {
915 object *tmp=find_best_object_match(op,params);
916 if (tmp) 1001 if (tmp)
917 examine(op,tmp); 1002 examine (op, tmp);
1003 }
1004 else
1005 {
1006 object *tmp = find_best_object_match (op, params);
1007
1008 if (tmp)
1009 examine (op, tmp);
918 else 1010 else
919 new_draw_info_format(NDI_UNIQUE,0,op,"Could not find an object that matches %s",params); 1011 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params);
920 } 1012 }
921 return 0; 1013 return 0;
922} 1014}
923 1015
924/* op should be a player. 1016/* op should be a player.
925 * we return the object the player has marked with the 'mark' command 1017 * we return the object the player has marked with the 'mark' command
926 * below. If no match is found (or object has changed), we return 1018 * below. If no match is found (or object has changed), we return
927 * NULL. We leave it up to the calling function to print messages if 1019 * NULL. We leave it up to the calling function to print messages if
928 * nothing is found. 1020 * nothing is found.
929 */ 1021 */
1022object *
930object *find_marked_object(object *op) 1023find_marked_object (object *op)
931{ 1024{
932 object *tmp; 1025 object *tmp;
933 1026
934 if (!op || !op->contr) return NULL; 1027 if (!op || !op->contr)
1028 return NULL;
1029
935 if (!op->contr->mark) { 1030 if (!op->contr->mark)
1031 {
936/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/ 1032/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
937 return NULL; 1033 return 0;
938 } 1034 }
1035
939 /* This may seem like overkill, but we need to make sure that they 1036 /* This may seem like overkill, but we need to make sure that they
940 * player hasn't dropped the item. We use count on the off chance that 1037 * player hasn't dropped the item. We use count on the off chance that
941 * an item got reincarnated at some point. 1038 * an item got reincarnated at some point.
942 */ 1039 */
943 for (tmp=op->inv; tmp; tmp=tmp->below) { 1040 for (tmp = op->inv; tmp; tmp = tmp->below)
1041 {
944 if (tmp->invisible) continue; 1042 if (tmp->invisible)
1043 continue;
1044
945 if (tmp == op->contr->mark) { 1045 if (tmp == op->contr->mark)
946 if (tmp->count == op->contr->mark_count) 1046 {
1047 if (!tmp->destroyed ())
947 return tmp; 1048 return tmp;
948 else { 1049 else
1050 {
949 op->contr->mark=NULL; 1051 op->contr->mark = 0;
950 op->contr->mark_count=0;
951/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/ 1052/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
952 return NULL; 1053 return 0;
953 } 1054 }
954 } 1055 }
955 } 1056 }
956 return NULL; 1057
1058 return 0;
957} 1059}
958 1060
959 1061
960/* op should be a player, params is any params. 1062/* op should be a player, params is any params.
961 * If no params given, we print out the currently marked object. 1063 * If no params given, we print out the currently marked object.
962 * otherwise, try to find a matching object - try best match first. 1064 * otherwise, try to find a matching object - try best match first.
963 */ 1065 */
1066int
964int command_mark(object *op, char *params) 1067command_mark (object *op, char *params)
965{ 1068{
966 if (!op->contr) return 1; 1069 if (!op->contr)
1070 return 1;
1071
967 if (!params) { 1072 if (!params)
1073 {
968 object *mark=find_marked_object(op); 1074 object *mark = find_marked_object (op);
1075
1076 if (!mark)
969 if (!mark) new_draw_info(NDI_UNIQUE,0,op,"You have no marked object."); 1077 new_draw_info (NDI_UNIQUE, 0, op, "You have no marked object.");
1078 else
970 else new_draw_info_format(NDI_UNIQUE,0,op,"%s is marked.", query_name(mark)); 1079 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is marked.", query_name (mark));
1080 }
1081 else
971 } 1082 {
972 else {
973 object *mark1=find_best_object_match(op, params); 1083 object *mark1 = find_best_object_match (op, params);
1084
974 if (!mark1) { 1085 if (!mark1)
1086 {
975 new_draw_info_format(NDI_UNIQUE,0,op,"Could not find an object that matches %s",params); 1087 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params);
976 return 1; 1088 return 1;
1089 }
1090 else
977 } 1091 {
978 else {
979 op->contr->mark=mark1; 1092 op->contr->mark = mark1;
980 op->contr->mark_count=mark1->count;
981 new_draw_info_format(NDI_UNIQUE,0,op,"Marked item %s", query_name(mark1)); 1093 new_draw_info_format (NDI_UNIQUE, 0, op, "Marked item %s", query_name (mark1));
982 return 0; 1094 return 0;
983 } 1095 }
984 } 1096 }
985 return 0; /*shouldnt get here */ 1097
1098 return 0; /*shouldnt get here */
986} 1099}
987 1100
988 1101
989/* op is the player 1102/* op is the player
990 * tmp is the monster being examined. 1103 * tmp is the monster being examined.
991 */ 1104 */
1105void
992void examine_monster(object *op,object *tmp) { 1106examine_monster (object *op, object *tmp)
1107{
993 object *mon=tmp->head?tmp->head:tmp; 1108 object *mon = tmp->head ? tmp->head : tmp;
994 1109
995 if(QUERY_FLAG(mon,FLAG_UNDEAD)) 1110 if (QUERY_FLAG (mon, FLAG_UNDEAD))
996 new_draw_info(NDI_UNIQUE, 0,op,"It is an undead force."); 1111 new_draw_info (NDI_UNIQUE, 0, op, "It is an undead force.");
997 if(mon->level>op->level) 1112 if (mon->level > op->level)
998 new_draw_info(NDI_UNIQUE, 0,op,"It is likely more powerful than you."); 1113 new_draw_info (NDI_UNIQUE, 0, op, "It is likely more powerful than you.");
999 else if(mon->level<op->level) 1114 else if (mon->level < op->level)
1000 new_draw_info(NDI_UNIQUE, 0,op,"It is likely less powerful than you."); 1115 new_draw_info (NDI_UNIQUE, 0, op, "It is likely less powerful than you.");
1001 else 1116 else
1002 new_draw_info(NDI_UNIQUE, 0,op,"It is probably as powerful as you."); 1117 new_draw_info (NDI_UNIQUE, 0, op, "It is probably as powerful as you.");
1003 if(mon->attacktype&AT_ACID) 1118 if (mon->attacktype & AT_ACID)
1004 new_draw_info(NDI_UNIQUE, 0,op,"You seem to smell an acrid odor."); 1119 new_draw_info (NDI_UNIQUE, 0, op, "You seem to smell an acrid odor.");
1005 1120
1006 /* Anyone know why this used to use the clone value instead of the 1121 /* Anyone know why this used to use the clone value instead of the
1007 * maxhp field? This seems that it should give more accurate results. 1122 * maxhp field? This seems that it should give more accurate results.
1008 */ 1123 */
1009 switch((mon->stats.hp+1)*4/(mon->stats.maxhp+1)) { /* From 1-4 */ 1124 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1125 { /* From 1-4 */
1010 case 1: 1126 case 1:
1011 new_draw_info(NDI_UNIQUE, 0,op,"It is in a bad shape."); 1127 new_draw_info (NDI_UNIQUE, 0, op, "It is in a bad shape.");
1012 break; 1128 break;
1013 case 2: 1129 case 2:
1014 new_draw_info(NDI_UNIQUE, 0,op,"It is hurt."); 1130 new_draw_info (NDI_UNIQUE, 0, op, "It is hurt.");
1015 break; 1131 break;
1016 case 3: 1132 case 3:
1017 new_draw_info(NDI_UNIQUE, 0,op,"It is somewhat hurt."); 1133 new_draw_info (NDI_UNIQUE, 0, op, "It is somewhat hurt.");
1018 break; 1134 break;
1019 case 4: 1135 case 4:
1020 new_draw_info(NDI_UNIQUE, 0,op,"It is in excellent shape."); 1136 new_draw_info (NDI_UNIQUE, 0, op, "It is in excellent shape.");
1021 break; 1137 break;
1022 } 1138 }
1023 if(present_in_ob(POISONING,mon)!=NULL) 1139 if (present_in_ob (POISONING, mon) != NULL)
1024 new_draw_info(NDI_UNIQUE, 0,op,"It looks very ill."); 1140 new_draw_info (NDI_UNIQUE, 0, op, "It looks very ill.");
1025} 1141}
1026 1142
1027 1143
1028/* tmp is the object being described, pl is who is examing it. */ 1144/* tmp is the object being described, pl is who is examing it. */
1145char *
1029char *long_desc(object *tmp, object *pl) { 1146long_desc (object *tmp, object *pl)
1147{
1030 static char buf[VERY_BIG_BUF]; 1148 static char buf[VERY_BIG_BUF];
1031 char *cp; 1149 char *cp;
1032 1150
1033 if(tmp==NULL) 1151 if (tmp == NULL)
1034 return ""; 1152 return "";
1035 1153
1036 buf[0]='\0'; 1154 buf[0] = '\0';
1037 switch(tmp->type) { 1155 switch (tmp->type)
1156 {
1038 case RING: 1157 case RING:
1039 case SKILL: 1158 case SKILL:
1040 case WEAPON: 1159 case WEAPON:
1041 case ARMOUR: 1160 case ARMOUR:
1042 case BRACERS: 1161 case BRACERS:
1043 case HELMET: 1162 case HELMET:
1044 case SHIELD: 1163 case SHIELD:
1045 case BOOTS: 1164 case BOOTS:
1046 case GLOVES: 1165 case GLOVES:
1047 case AMULET: 1166 case AMULET:
1048 case GIRDLE: 1167 case GIRDLE:
1049 case BOW: 1168 case BOW:
1050 case ARROW: 1169 case ARROW:
1051 case CLOAK: 1170 case CLOAK:
1052 case FOOD: 1171 case FOOD:
1053 case DRINK: 1172 case DRINK:
1054 case FLESH: 1173 case FLESH:
1055 case SKILL_TOOL: 1174 case SKILL_TOOL:
1056 case POWER_CRYSTAL: 1175 case POWER_CRYSTAL:
1057 if(*(cp=describe_item(tmp, pl))!='\0') { 1176 if (*(cp = describe_item (tmp, pl)) != '\0')
1177 {
1058 int len; 1178 int len;
1059 1179
1060 strncpy(buf,query_name(tmp), VERY_BIG_BUF-1); 1180 assign (buf, query_name (tmp));
1061 buf[VERY_BIG_BUF-1]=0;
1062 len=strlen(buf); 1181 len = strlen (buf);
1063 if (len<VERY_BIG_BUF-5) { 1182 if (len < VERY_BIG_BUF - 5)
1183 {
1064 /* Since we know the length, we save a few cpu cycles by using 1184 /* Since we know the length, we save a few cpu cycles by using
1065 * it instead of calling strcat */ 1185 * it instead of calling strcat */
1066 strcpy(buf+len," "); 1186 strcpy (buf + len, " ");
1067 len++; 1187 len++;
1068 strncpy(buf+len, cp, VERY_BIG_BUF-len-1); 1188 assign (buf + len, cp, VERY_BIG_BUF - len - 1);
1069 buf[VERY_BIG_BUF-1]=0;
1070 } 1189 }
1071 } 1190 }
1072 } 1191 }
1192
1073 if(buf[0]=='\0') { 1193 if (buf[0] == '\0')
1074 strncpy(buf,query_name(tmp), VERY_BIG_BUF-1); 1194 assign (buf, query_name (tmp));
1075 buf[VERY_BIG_BUF-1]=0;
1076 }
1077 1195
1078 return buf; 1196 return buf;
1079} 1197}
1080 1198
1199void
1081void examine(object *op, object *tmp) { 1200examine (object *op, object *tmp)
1201{
1082 char buf[VERY_BIG_BUF]; 1202 char buf[VERY_BIG_BUF];
1083 int i; 1203 int i;
1084 1204
1085 if (tmp == NULL || tmp->type == CLOSE_CON) 1205 if (tmp == NULL || tmp->type == CLOSE_CON)
1086 return; 1206 return;
1087 1207
1088 strcpy(buf,"That is "); 1208 strcpy (buf, "That is ");
1089 strncat(buf, long_desc(tmp, op), VERY_BIG_BUF-strlen(buf)-1); 1209 strncat (buf, long_desc (tmp, op), VERY_BIG_BUF - strlen (buf) - 1);
1090 buf[VERY_BIG_BUF-1]=0; 1210 buf[VERY_BIG_BUF - 1] = 0;
1091 1211
1092 new_draw_info(NDI_UNIQUE, 0,op,buf); 1212 new_draw_info (NDI_UNIQUE, 0, op, buf);
1093 buf[0]='\0'; 1213 buf[0] = '\0';
1094 1214
1095 if(tmp->custom_name) { 1215 if (tmp->custom_name)
1216 {
1096 strcpy(buf,"You call it "); 1217 strcpy (buf, "You call it ");
1097 strncat(buf, tmp->custom_name, VERY_BIG_BUF-strlen(buf)-1); 1218 strncat (buf, tmp->custom_name, VERY_BIG_BUF - strlen (buf) - 1);
1098 buf[VERY_BIG_BUF-1]=0; 1219 buf[VERY_BIG_BUF - 1] = 0;
1099 new_draw_info(NDI_UNIQUE, 0,op,buf); 1220 new_draw_info (NDI_UNIQUE, 0, op, buf);
1100 buf[0]='\0'; 1221 buf[0] = '\0';
1101 } 1222 }
1102 1223
1103 switch(tmp->type) { 1224 switch (tmp->type)
1225 {
1104 case SPELLBOOK: 1226 case SPELLBOOK:
1105 if(QUERY_FLAG(tmp, FLAG_IDENTIFIED) && tmp->inv ) { 1227 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) && tmp->inv)
1106 sprintf(buf,"%s is a %s level %s spell", 1228 {
1107 tmp->inv->name, get_levelnumber(tmp->inv->level), 1229 sprintf (buf, "%s is a %s level %s spell", &tmp->inv->name, get_levelnumber (tmp->inv->level), &tmp->inv->skill);
1108 tmp->inv->skill);
1109 } 1230 }
1110 break; 1231 break;
1111 1232
1112 case BOOK: 1233 case BOOK:
1113 if(tmp->msg!=NULL) 1234 if (tmp->msg != NULL)
1114 strcpy(buf,"Something is written in it."); 1235 strcpy (buf, "Something is written in it.");
1115 break; 1236 break;
1116 1237
1117 case CONTAINER: 1238 case CONTAINER:
1118 if(tmp->race!=NULL) { 1239 if (tmp->race != NULL)
1240 {
1119 if(tmp->weight_limit && tmp->stats.Str<100) 1241 if (tmp->weight_limit && tmp->stats.Str < 100)
1120 sprintf (buf,"It can hold only %s and its weight limit is %.1f kg.", 1242 sprintf (buf, "It can hold only %s and its weight limit is %.1f kg.",
1121 tmp->race, tmp->weight_limit/(10.0 * (100 - tmp->stats.Str))); 1243 &tmp->race, tmp->weight_limit / (10.0 * (100 - tmp->stats.Str)));
1122 else
1123 sprintf (buf,"It can hold only %s.", tmp->race);
1124 } else
1125 if(tmp->weight_limit && tmp->stats.Str<100)
1126 sprintf (buf,"Its weight limit is %.1f kg.",
1127 tmp->weight_limit/(10.0 * (100 - tmp->stats.Str)));
1128 break;
1129
1130 case WAND:
1131 if(QUERY_FLAG(tmp, FLAG_IDENTIFIED))
1132 sprintf(buf,"It has %d charges left.",tmp->stats.food);
1133 break;
1134 }
1135
1136 if(buf[0]!='\0')
1137 new_draw_info(NDI_UNIQUE, 0,op,buf);
1138
1139 if(tmp->materialname != NULL && !tmp->msg) {
1140 sprintf(buf, "It is made of: %s.", tmp->materialname);
1141 new_draw_info(NDI_UNIQUE, 0, op, buf);
1142 }
1143 /* Where to wear this item */
1144 for (i=0; i < NUM_BODY_LOCATIONS; i++) {
1145 if (tmp->body_info[i]<-1) {
1146 if (op->body_info[i])
1147 new_draw_info_format(NDI_UNIQUE, 0,op,
1148 "It goes %s (%d)", body_locations[i].use_name, -tmp->body_info[i]);
1149 else 1244 else
1245 sprintf (buf, "It can hold only %s.", &tmp->race);
1246 }
1247 else if (tmp->weight_limit && tmp->stats.Str < 100)
1248 sprintf (buf, "Its weight limit is %.1f kg.", tmp->weight_limit / (10.0 * (100 - tmp->stats.Str)));
1249 break;
1250
1251 case WAND:
1252 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1253 sprintf (buf, "It has %d charges left.", tmp->stats.food);
1254 break;
1255 }
1256
1257 if (buf[0] != '\0')
1258 new_draw_info (NDI_UNIQUE, 0, op, buf);
1259
1260 if (tmp->materialname != NULL && !tmp->msg)
1261 {
1262 sprintf (buf, "It is made of: %s.", &tmp->materialname);
1150 new_draw_info_format(NDI_UNIQUE, 0,op, 1263 new_draw_info (NDI_UNIQUE, 0, op, buf);
1151 "It goes %s", body_locations[i].nonuse_name); 1264 }
1265 /* Where to wear this item */
1266 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1267 {
1152 } else if (tmp->body_info[i]) { 1268 if (tmp->body_info[i] < -1)
1269 {
1153 if (op->body_info[i]) 1270 if (op->body_info[i])
1154 new_draw_info_format(NDI_UNIQUE, 0,op, 1271 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s (%d)", body_locations[i].use_name, -tmp->body_info[i]);
1155 "It goes %s", body_locations[i].use_name);
1156 else 1272 else
1157 new_draw_info_format(NDI_UNIQUE, 0,op, 1273 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].nonuse_name);
1158 "It goes %s", body_locations[i].nonuse_name); 1274 }
1275 else if (tmp->body_info[i])
1159 } 1276 {
1277 if (op->body_info[i])
1278 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].use_name);
1279 else
1280 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].nonuse_name);
1281 }
1160 } 1282 }
1161 1283
1162 if(tmp->weight) { 1284 if (tmp->weight)
1163 sprintf(buf,tmp->nrof>1?"They weigh %3.3f kg.":"It weighs %3.3f kg.", 1285 {
1164 tmp->weight*(tmp->nrof?tmp->nrof:1)/1000.0); 1286 sprintf (buf, tmp->nrof > 1 ? "They weigh %3.3f kg." : "It weighs %3.3f kg.", tmp->weight * (tmp->nrof ? tmp->nrof : 1) / 1000.0);
1165 new_draw_info(NDI_UNIQUE, 0,op,buf); 1287 new_draw_info (NDI_UNIQUE, 0, op, buf);
1166 } 1288 }
1167 1289
1168 if (tmp->value && !QUERY_FLAG(tmp, FLAG_STARTEQUIP) && !QUERY_FLAG(tmp, FLAG_NO_PICK)) { 1290 if (tmp->value && !QUERY_FLAG (tmp, FLAG_STARTEQUIP) && !QUERY_FLAG (tmp, FLAG_NO_PICK))
1169 object *floor; 1291 {
1170 sprintf(buf,"You reckon %s worth %s.", 1292 sprintf (buf, "You reckon %s worth %s.", tmp->nrof > 1 ? "they are" : "it is", query_cost_string (tmp, op, F_TRUE | F_APPROX));
1171 tmp->nrof>1?"they are":"it is",query_cost_string(tmp,op, F_TRUE | F_APPROX));
1172 new_draw_info(NDI_UNIQUE, 0,op,buf); 1293 new_draw_info (NDI_UNIQUE, 0, op, buf);
1173 floor = get_map_ob (op->map, op->x, op->y); 1294 if (is_in_shop (op))
1174 if (floor && floor->type == SHOP_FLOOR) { 1295 {
1175 if(QUERY_FLAG(tmp, FLAG_UNPAID)) 1296 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1176 sprintf(buf,"%s would cost you %s.", 1297 sprintf (buf, "%s would cost you %s.", tmp->nrof > 1 ? "They" : "It", query_cost_string (tmp, op, F_BUY | F_SHOP));
1177 tmp->nrof>1?"They":"It",query_cost_string(tmp,op,F_BUY | F_SHOP));
1178 else 1298 else
1179 sprintf(buf,"You are offered %s for %s.", 1299 sprintf (buf, "You are offered %s for %s.", query_cost_string (tmp, op, F_SELL + F_SHOP), tmp->nrof > 1 ? "them" : "it");
1180 query_cost_string(tmp,op,F_SELL+F_SHOP), tmp->nrof>1?"them":"it");
1181 new_draw_info(NDI_UNIQUE, 0,op,buf); 1300 new_draw_info (NDI_UNIQUE, 0, op, buf);
1182 } 1301 }
1183 } 1302 }
1184 1303
1185 if(QUERY_FLAG(tmp, FLAG_MONSTER)) 1304 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1186 examine_monster(op,tmp); 1305 examine_monster (op, tmp);
1187 1306
1188 /* Is this item buildable? */ 1307 /* Is this item buildable? */
1189 if ( QUERY_FLAG( tmp, FLAG_IS_BUILDABLE ) ) 1308 if (QUERY_FLAG (tmp, FLAG_IS_BUILDABLE))
1190 new_draw_info( NDI_UNIQUE, 0, op, "This is a buildable item." ); 1309 new_draw_info (NDI_UNIQUE, 0, op, "This is a buildable item.");
1191 1310
1192 /* Does the object have a message? Don't show message for all object 1311 /* Does the object have a message? Don't show message for all object
1193 * types - especially if the first entry is a match 1312 * types - especially if the first entry is a match
1194 */ 1313 */
1195 if(tmp->msg && tmp->type != EXIT && tmp->type != BOOK && 1314 if (tmp->msg && tmp->type != EXIT && tmp->type != BOOK && tmp->type != CORPSE && !tmp->move_on && strncasecmp (tmp->msg, "@match", 7))
1196 tmp->type != CORPSE && !tmp->move_on && 1315 {
1197 strncasecmp(tmp->msg, "@match",7)) {
1198 1316
1199 /* This is just a hack so when identifying the items, we print 1317 /* This is just a hack so when identifying the items, we print
1200 * out the extra message 1318 * out the extra message
1201 */ 1319 */
1202 if (need_identify(tmp) && QUERY_FLAG(tmp, FLAG_IDENTIFIED)) 1320 if (need_identify (tmp) && QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1203 new_draw_info(NDI_UNIQUE, 0,op, "The object has a story:"); 1321 new_draw_info (NDI_UNIQUE, 0, op, "The object has a story:");
1204 1322
1205 new_draw_info(NDI_UNIQUE, 0,op,tmp->msg); 1323 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1206 } 1324 }
1207 new_draw_info(NDI_UNIQUE, 0,op," "); /* Blank line */ 1325 new_draw_info (NDI_UNIQUE, 0, op, " "); /* Blank line */
1208} 1326}
1209 1327
1210/* 1328/*
1211 * inventory prints object's inventory. If inv==NULL then print player's 1329 * inventory prints object's inventory. If inv==NULL then print player's
1212 * inventory. 1330 * inventory.
1213 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ] 1331 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1214 */ 1332 */
1333void
1215void inventory(object *op,object *inv) { 1334inventory (object *op, object *inv)
1335{
1216 object *tmp; 1336 object *tmp;
1217 char *in; 1337 char *in;
1218 int items = 0, length; 1338 int items = 0, length;
1219 1339
1220 if (inv==NULL && op==NULL) { 1340 if (inv == NULL && op == NULL)
1341 {
1221 new_draw_info(NDI_UNIQUE, 0,op,"Inventory of what object?"); 1342 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?");
1343 return;
1344 }
1345 tmp = inv ? inv->inv : op->inv;
1346
1347 while (tmp)
1348 {
1349 if ((!tmp->invisible &&
1350 (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ)))
1351 items++;
1352 tmp = tmp->below;
1353 }
1354 if (inv == NULL)
1355 { /* player's inventory */
1356 if (items == 0)
1357 {
1358 new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing.");
1359 return;
1360 }
1361 else
1362 {
1363 length = 28;
1364 in = "";
1365 if (op)
1366 clear_win_info (op);
1367 new_draw_info (NDI_UNIQUE, 0, op, "Inventory:");
1368 }
1369 }
1370 else
1371 {
1372 if (items == 0)
1373 return;
1374 else
1375 {
1376 length = 28;
1377 in = " ";
1378 }
1379 }
1380 for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below)
1381 {
1382 if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED))))
1383 continue;
1384 if ((!op || QUERY_FLAG (op, FLAG_WIZ)))
1385 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length,
1386 query_name (tmp), tmp->count, query_weight (tmp));
1387 else
1388 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp));
1389 }
1390 if (!inv && op)
1391 {
1392 new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op));
1393 }
1394}
1395
1396static void
1397display_new_pickup (object *op)
1398{
1399 int i = op->contr->mode;
1400
1401 if (!(i & PU_NEWMODE))
1222 return; 1402 return;
1223 }
1224 tmp = inv ? inv->inv : op->inv;
1225 1403
1226 while (tmp) {
1227 if ((!tmp->invisible &&
1228 (inv==NULL || inv->type == CONTAINER || QUERY_FLAG(tmp, FLAG_APPLIED)))
1229 || (!op || QUERY_FLAG(op, FLAG_WIZ)))
1230 items++;
1231 tmp=tmp->below;
1232 }
1233 if (inv==NULL) { /* player's inventory */
1234 if (items==0) {
1235 new_draw_info(NDI_UNIQUE, 0,op,"You carry nothing.");
1236 return;
1237 } else {
1238 length = 28;
1239 in = "";
1240 if (op)
1241 clear_win_info(op);
1242 new_draw_info(NDI_UNIQUE, 0,op,"Inventory:");
1243 }
1244 } else {
1245 if (items==0)
1246 return;
1247 else {
1248 length = 28;
1249 in = " ";
1250 }
1251 }
1252 for (tmp=inv?inv->inv:op->inv; tmp; tmp=tmp->below) {
1253 if((!op||!QUERY_FLAG(op, FLAG_WIZ)) && (tmp->invisible ||
1254 (inv && inv->type != CONTAINER && !QUERY_FLAG(tmp, FLAG_APPLIED))))
1255 continue;
1256 if((!op || QUERY_FLAG(op, FLAG_WIZ)))
1257 new_draw_info_format(NDI_UNIQUE, 0,op ,"%s- %-*.*s (%5d) %-8s", in, length, length,
1258 query_name(tmp), tmp->count,query_weight(tmp));
1259 else
1260 new_draw_info_format(NDI_UNIQUE,0, op, "%s- %-*.*s %-8s", in, length+8,
1261 length+8, query_name(tmp),
1262 query_weight(tmp));
1263 }
1264 if(!inv && op) {
1265 new_draw_info_format(NDI_UNIQUE,0, op ,"%-*s %-8s",
1266 41,"Total weight :",query_weight(op));
1267 }
1268}
1269
1270static void display_new_pickup( object* op )
1271 {
1272 int i = op->contr->mode;
1273
1274 if(!(i & PU_NEWMODE)) return;
1275
1276 new_draw_info_format(NDI_UNIQUE, 0,op,"%d NEWMODE",i & PU_NEWMODE?1:0); 1404 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1277 new_draw_info_format(NDI_UNIQUE, 0,op,"%d DEBUG",i & PU_DEBUG?1:0); 1405 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);
1278 new_draw_info_format(NDI_UNIQUE, 0,op,"%d INHIBIT",i & PU_INHIBIT?1:0); 1406 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);
1279 new_draw_info_format(NDI_UNIQUE, 0,op,"%d STOP",i & PU_STOP?1:0); 1407 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1280 1408
1281 new_draw_info_format(NDI_UNIQUE, 0,op,"%d <= x pickup weight/value RATIO (0==off)",(i & PU_RATIO)*5); 1409 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
1282 1410
1283 new_draw_info_format(NDI_UNIQUE, 0,op,"%d FOOD",i & PU_FOOD?1:0); 1411 new_draw_info_format (NDI_UNIQUE, 0, op, "%d FOOD", i & PU_FOOD ? 1 : 0);
1284 new_draw_info_format(NDI_UNIQUE, 0,op,"%d DRINK",i & PU_DRINK?1:0); 1412 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DRINK", i & PU_DRINK ? 1 : 0);
1285 new_draw_info_format(NDI_UNIQUE, 0,op,"%d VALUABLES",i & PU_VALUABLES?1:0); 1413 new_draw_info_format (NDI_UNIQUE, 0, op, "%d VALUABLES", i & PU_VALUABLES ? 1 : 0);
1286 1414
1287 new_draw_info_format(NDI_UNIQUE, 0,op,"%d BOW",i & PU_BOW?1:0); 1415 new_draw_info_format (NDI_UNIQUE, 0, op, "%d BOW", i & PU_BOW ? 1 : 0);
1288 new_draw_info_format(NDI_UNIQUE, 0,op,"%d ARROW",i & PU_ARROW?1:0); 1416 new_draw_info_format (NDI_UNIQUE, 0, op, "%d ARROW", i & PU_ARROW ? 1 : 0);
1289 1417
1290 new_draw_info_format(NDI_UNIQUE, 0,op,"%d HELMET",i & PU_HELMET?1:0); 1418 new_draw_info_format (NDI_UNIQUE, 0, op, "%d HELMET", i & PU_HELMET ? 1 : 0);
1291 new_draw_info_format(NDI_UNIQUE, 0,op,"%d SHIELD",i & PU_SHIELD?1:0); 1419 new_draw_info_format (NDI_UNIQUE, 0, op, "%d SHIELD", i & PU_SHIELD ? 1 : 0);
1292 new_draw_info_format(NDI_UNIQUE, 0,op,"%d ARMOUR",i & PU_ARMOUR?1:0); 1420 new_draw_info_format (NDI_UNIQUE, 0, op, "%d ARMOUR", i & PU_ARMOUR ? 1 : 0);
1293 1421
1294 new_draw_info_format(NDI_UNIQUE, 0,op,"%d BOOTS",i & PU_BOOTS?1:0); 1422 new_draw_info_format (NDI_UNIQUE, 0, op, "%d BOOTS", i & PU_BOOTS ? 1 : 0);
1295 new_draw_info_format(NDI_UNIQUE, 0,op,"%d GLOVES",i & PU_GLOVES?1:0); 1423 new_draw_info_format (NDI_UNIQUE, 0, op, "%d GLOVES", i & PU_GLOVES ? 1 : 0);
1296 new_draw_info_format(NDI_UNIQUE, 0,op,"%d CLOAK",i & PU_CLOAK?1:0); 1424 new_draw_info_format (NDI_UNIQUE, 0, op, "%d CLOAK", i & PU_CLOAK ? 1 : 0);
1297 new_draw_info_format(NDI_UNIQUE, 0,op,"%d KEY",i & PU_KEY?1:0); 1425 new_draw_info_format (NDI_UNIQUE, 0, op, "%d KEY", i & PU_KEY ? 1 : 0);
1298 1426
1299 new_draw_info_format(NDI_UNIQUE, 0,op,"%d MISSILEWEAPON",i & PU_MISSILEWEAPON?1:0); 1427 new_draw_info_format (NDI_UNIQUE, 0, op, "%d MISSILEWEAPON", i & PU_MISSILEWEAPON ? 1 : 0);
1300 new_draw_info_format(NDI_UNIQUE, 0,op,"%d ALLWEAPON",i & PU_ALLWEAPON?1:0); 1428 new_draw_info_format (NDI_UNIQUE, 0, op, "%d ALLWEAPON", i & PU_ALLWEAPON ? 1 : 0);
1301 new_draw_info_format(NDI_UNIQUE, 0,op,"%d MAGICAL",i & PU_MAGICAL?1:0); 1429 new_draw_info_format (NDI_UNIQUE, 0, op, "%d MAGICAL", i & PU_MAGICAL ? 1 : 0);
1302 new_draw_info_format(NDI_UNIQUE, 0,op,"%d POTION",i & PU_POTION?1:0); 1430 new_draw_info_format (NDI_UNIQUE, 0, op, "%d POTION", i & PU_POTION ? 1 : 0);
1303 1431
1304 new_draw_info_format(NDI_UNIQUE, 0,op,"%d SPELLBOOK",i & PU_SPELLBOOK?1:0); 1432 new_draw_info_format (NDI_UNIQUE, 0, op, "%d SPELLBOOK", i & PU_SPELLBOOK ? 1 : 0);
1305 new_draw_info_format(NDI_UNIQUE, 0,op,"%d SKILLSCROLL",i & PU_SKILLSCROLL?1:0); 1433 new_draw_info_format (NDI_UNIQUE, 0, op, "%d SKILLSCROLL", i & PU_SKILLSCROLL ? 1 : 0);
1306 new_draw_info_format(NDI_UNIQUE, 0,op,"%d READABLES",i & PU_READABLES?1:0); 1434 new_draw_info_format (NDI_UNIQUE, 0, op, "%d READABLES", i & PU_READABLES ? 1 : 0);
1307 new_draw_info_format(NDI_UNIQUE, 0,op,"%d MAGICDEVICE", i & PU_MAGIC_DEVICE?1:0); 1435 new_draw_info_format (NDI_UNIQUE, 0, op, "%d MAGICDEVICE", i & PU_MAGIC_DEVICE ? 1 : 0);
1308 1436
1309 new_draw_info_format(NDI_UNIQUE, 0,op,"%d NOT CURSED", i & PU_NOT_CURSED?1:0); 1437 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NOT CURSED", i & PU_NOT_CURSED ? 1 : 0);
1310 1438
1311 new_draw_info_format(NDI_UNIQUE, 0,op,"%d JEWELS", i & PU_JEWELS?1:0); 1439 new_draw_info_format (NDI_UNIQUE, 0, op, "%d JEWELS", i & PU_JEWELS ? 1 : 0);
1440 new_draw_info_format (NDI_UNIQUE, 0, op, "%d FLESH", i & PU_FLESH ? 1 : 0);
1312 1441
1313 new_draw_info_format(NDI_UNIQUE, 0,op,""); 1442 new_draw_info_format (NDI_UNIQUE, 0, op, "");
1314 } 1443}
1315 1444
1445int
1316int command_pickup (object *op, char *params) 1446command_pickup (object *op, char *params)
1317{ 1447{
1318 uint32 i; 1448 uint32 i;
1319 static const char* names[ ] = { 1449 static const char *names[] = {
1320 "debug", "inhibit", "stop", "food", "drink", "valuables", "bow", "arrow", "helmet", 1450 "debug", "inhibit", "stop", "food", "drink", "valuables", "bow", "arrow", "helmet",
1321 "shield", "armour", "boots", "gloves", "cloak", "key", "missile", "allweapon", 1451 "shield", "armour", "boots", "gloves", "cloak", "key", "missile", "allweapon",
1322 "magical", "potion", "spellbook", "skillscroll", "readables", "magicdevice", "notcursed", "jewels", NULL }; 1452 "magical", "potion", "spellbook", "skillscroll", "readables", "magicdevice", "notcursed",
1453 "jewels", "flesh", NULL
1454 };
1323 static uint32 modes[ ] = { 1455 static uint32 modes[] = {
1324 PU_DEBUG, PU_INHIBIT, PU_STOP, PU_FOOD, PU_DRINK, PU_VALUABLES, PU_BOW, PU_ARROW, PU_HELMET, 1456 PU_DEBUG, PU_INHIBIT, PU_STOP, PU_FOOD, PU_DRINK, PU_VALUABLES, PU_BOW, PU_ARROW, PU_HELMET,
1325 PU_SHIELD, PU_ARMOUR, PU_BOOTS, PU_GLOVES, PU_CLOAK, PU_KEY, PU_MISSILEWEAPON, PU_ALLWEAPON, 1457 PU_SHIELD, PU_ARMOUR, PU_BOOTS, PU_GLOVES, PU_CLOAK, PU_KEY, PU_MISSILEWEAPON, PU_ALLWEAPON,
1326 PU_MAGICAL, PU_POTION, PU_SPELLBOOK, PU_SKILLSCROLL, PU_READABLES, PU_MAGIC_DEVICE, PU_NOT_CURSED, PU_JEWELS, 0 }; 1458 PU_MAGICAL, PU_POTION, PU_SPELLBOOK, PU_SKILLSCROLL, PU_READABLES, PU_MAGIC_DEVICE, PU_NOT_CURSED,
1459 PU_JEWELS, PU_FLESH, 0
1460 };
1327 1461
1328 if(!params) { 1462 if (!params)
1463 {
1329 /* if the new mode is used, just print the settings */ 1464 /* if the new mode is used, just print the settings */
1330 if(op->contr->mode & PU_NEWMODE) 1465 if (op->contr->mode & PU_NEWMODE)
1331 { 1466 {
1332 display_new_pickup( op ); 1467 display_new_pickup (op);
1333 return 1; 1468 return 1;
1334 } 1469 }
1470 if (1)
1335 if(1) LOG(llevDebug, "command_pickup: !params\n"); 1471 LOG (llevDebug, "command_pickup: !params\n");
1336 set_pickup_mode(op, (op->contr->mode > 6)? 0: op->contr->mode+1); 1472 set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1337 return 0; 1473 return 0;
1338 } 1474 }
1339 1475
1340 while ( *params == ' ' && *params ) 1476 while (*params == ' ' && *params)
1341 params++; 1477 params++;
1342 1478
1343 if ( *params == '+' || *params == '-' ) 1479 if (*params == '+' || *params == '-')
1344 { 1480 {
1345 int mode; 1481 int mode;
1482
1346 for ( mode = 0; names[ mode ]; mode++ ) 1483 for (mode = 0; names[mode]; mode++)
1347 { 1484 {
1348 if ( !strcmp( names[ mode ], params + 1 ) ) 1485 if (!strcmp (names[mode], params + 1))
1349 { 1486 {
1350 i = op->contr->mode; 1487 i = op->contr->mode;
1351 if ( !( i & PU_NEWMODE ) ) 1488 if (!(i & PU_NEWMODE))
1352 i = PU_NEWMODE; 1489 i = PU_NEWMODE;
1353 if ( *params == '+' ) 1490 if (*params == '+')
1354 i = i | modes[ mode ]; 1491 i = i | modes[mode];
1355 else 1492 else
1356 i = i & ~modes[ mode ]; 1493 i = i & ~modes[mode];
1357 op->contr->mode = i; 1494 op->contr->mode = i;
1358 display_new_pickup( op ); 1495 display_new_pickup (op);
1359 return 1; 1496 return 1;
1360 } 1497 }
1361 } 1498 }
1362 new_draw_info_format( NDI_UNIQUE, 0, op, "Pickup: invalid item %s\n", params ); 1499 new_draw_info_format (NDI_UNIQUE, 0, op, "Pickup: invalid item %s\n", params);
1363 return 1; 1500 return 1;
1364 } 1501 }
1365 1502
1366 if(sscanf(params, "%u", &i) != 1) { 1503 if (sscanf (params, "%u", &i) != 1)
1504 {
1505 if (1)
1367 if(1) LOG(llevDebug, "command_pickup: params==NULL\n"); 1506 LOG (llevDebug, "command_pickup: params==NULL\n");
1368 new_draw_info(NDI_UNIQUE, 0,op,"Usage: pickup <0-7> or <value_density> ."); 1507 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <0-7> or <value_density> .");
1508 return 1;
1509 }
1510 set_pickup_mode (op, i);
1511
1512 return 1;
1513}
1514
1515void
1516set_pickup_mode (object *op, int i)
1517{
1518 switch (op->contr->mode = i)
1519 {
1520 case 0:
1521 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1522 break;
1523 case 1:
1524 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1525 break;
1526 case 2:
1527 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1528 break;
1529 case 3:
1530 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1531 break;
1532 case 4:
1533 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1534 break;
1535 case 5:
1536 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1537 break;
1538 case 6:
1539 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1540 break;
1541 case 7:
1542 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1543 break;
1544 }
1545}
1546
1547int
1548command_search_items (object *op, char *params)
1549{
1550 char buf[MAX_BUF];
1551
1552 if (settings.search_items == FALSE)
1369 return 1; 1553 return 1;
1554
1555 if (params == NULL)
1556 {
1557 if (op->contr->search_str[0] == '\0')
1558 {
1559 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1");
1560 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1561 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1562 return 1;
1563 }
1564 op->contr->search_str[0] = '\0';
1565 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1566 op->update_stats ();
1567 return 1;
1370 } 1568 }
1371 set_pickup_mode(op,i); 1569 if ((int) strlen (params) >= MAX_BUF)
1372 1570 {
1571 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1572 return 1;
1573 }
1574 strcpy (op->contr->search_str, params);
1575 sprintf (buf, "Searching for '%s'.", op->contr->search_str);
1576 new_draw_info (NDI_UNIQUE, 0, op, buf);
1577 op->update_stats ();
1373 return 1; 1578 return 1;
1374} 1579}
1375 1580
1376void set_pickup_mode(object *op,int i) {
1377 switch(op->contr->mode=i) {
1378 case 0:
1379 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Don't pick up.");
1380 break;
1381 case 1:
1382 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up one item.");
1383 break;
1384 case 2:
1385 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up one item and stop.");
1386 break;
1387 case 3:
1388 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Stop before picking up.");
1389 break;
1390 case 4:
1391 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up all items.");
1392 break;
1393 case 5:
1394 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up all items and stop.");
1395 break;
1396 case 6:
1397 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up all magic items.");
1398 break;
1399 case 7:
1400 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up all coins and gems");
1401 break;
1402 }
1403}
1404
1405int command_search_items (object *op, char *params)
1406{
1407 char buf[MAX_BUF];
1408
1409 if (settings.search_items == FALSE)
1410 return 1;
1411
1412 if(params == NULL) {
1413 if(op->contr->search_str[0]=='\0') {
1414 new_draw_info(NDI_UNIQUE, 0,op,"Example: search magic+1");
1415 new_draw_info(NDI_UNIQUE, 0,op,"Would automatically pick up all");
1416 new_draw_info(NDI_UNIQUE, 0,op,"items containing the word 'magic+1'.");
1417 return 1;
1418 }
1419 op->contr->search_str[0]='\0';
1420 new_draw_info(NDI_UNIQUE, 0,op,"Search mode turned off.");
1421 fix_player(op);
1422 return 1;
1423 }
1424 if((int)strlen(params) >= MAX_BUF) {
1425 new_draw_info(NDI_UNIQUE, 0,op,"Search string too long.");
1426 return 1;
1427 }
1428 strcpy(op->contr->search_str, params);
1429 sprintf(buf,"Searching for '%s'.",op->contr->search_str);
1430 new_draw_info(NDI_UNIQUE, 0,op,buf);
1431 fix_player(op);
1432 return 1;
1433}
1434
1435/*
1436 * Changing the custom name of an item
1437 *
1438 * Syntax is: rename <what object> to <new name>
1439 * if '<what object>' is omitted, marked object is used
1440 * if 'to <new name>' is omitted, custom name is cleared
1441 *
1442 * Names are considered for all purpose having a length <=127 (max length sent to client
1443 * by server) */
1444
1445int command_rename_item(object *op, char *params)
1446{
1447 char buf[VERY_BIG_BUF];
1448 int itemnumber;
1449 object *item=NULL;
1450 char *closebrace;
1451 size_t counter;
1452
1453 if (params) {
1454 /* Let's skip white spaces */
1455 while(' '==*params) params++;
1456
1457 /* Checking the first part */
1458 if ((itemnumber = atoi(params))!=0) {
1459 for (item=op->inv; item && ((item->count != itemnumber) || item->invisible); item=item->below);
1460 if (!item) {
1461 new_draw_info(NDI_UNIQUE,0,op,"Tried to rename an invalid item.");
1462 return 1;
1463 }
1464 while(isdigit(*params) || ' '==*params) params++;
1465 }
1466 else if ('<'==*params) {
1467 /* Got old name, let's get it & find appropriate matching item */
1468 closebrace=strchr(params,'>');
1469 if(!closebrace) {
1470 new_draw_info(NDI_UNIQUE,0,op,"Syntax error!");
1471 return 1;
1472 }
1473 /* Sanity check for buffer overruns */
1474 if((closebrace-params)>127) {
1475 new_draw_info(NDI_UNIQUE,0,op,"Old name too long (up to 127 characters allowed)!");
1476 return 1;
1477 }
1478 /* Copy the old name */
1479 strncpy(buf,params+1,closebrace-params-1);
1480 buf[closebrace-params-1]='\0';
1481
1482 /* Find best matching item */
1483 item=find_best_object_match(op,buf);
1484 if(!item) {
1485 new_draw_info(NDI_UNIQUE,0,op,"Could not find a matching item to rename.");
1486 return 1;
1487 }
1488
1489 /* Now need to move pointer to just after > */
1490 params=closebrace+1;
1491 while(' '==*params) params++;
1492
1493 } else {
1494 /* Use marked item */
1495 item=find_marked_object(op);
1496 if(!item) {
1497 new_draw_info(NDI_UNIQUE,0,op,"No marked item to rename.");
1498 return 1;
1499 }
1500 }
1501
1502 /* Now let's find the new name */
1503 if(!strncmp(params,"to ",3)) {
1504 params+=3;
1505 while(' '==*params) params++;
1506 if('<'!=*params) {
1507 new_draw_info(NDI_UNIQUE,0,op,"Syntax error, expecting < at start of new name!");
1508 return 1;
1509 }
1510 closebrace=strchr(params+1,'>');
1511 if(!closebrace) {
1512 new_draw_info(NDI_UNIQUE,0,op,"Syntax error, expecting > at end of new name!");
1513 return 1;
1514 }
1515
1516 /* Sanity check for buffer overruns */
1517 if((closebrace-params)>127) {
1518 new_draw_info(NDI_UNIQUE,0,op,"New name too long (up to 127 characters allowed)!");
1519 return 1;
1520 }
1521
1522 /* Copy the new name */
1523 strncpy(buf,params+1,closebrace-params-1);
1524 buf[closebrace-params-1]='\0';
1525
1526 /* Let's check it for weird characters */
1527 for(counter=0;counter<strlen(buf);counter++) {
1528 if(isalnum(buf[counter])) continue;
1529 if(' '==buf[counter]) continue;
1530 if('\''==buf[counter]) continue;
1531 if('+'==buf[counter]) continue;
1532 if('_'==buf[counter]) continue;
1533 if('-'==buf[counter]) continue;
1534
1535 /* If we come here, then the name contains an invalid character...
1536 tell the player & exit */
1537 new_draw_info(NDI_UNIQUE,0,op,"Invalid new name!");
1538 return 1;
1539 }
1540
1541 } else {
1542 /* If param contains something, then syntax error... */
1543 if(strlen(params)) {
1544 new_draw_info(NDI_UNIQUE,0,op,"Syntax error, expected 'to <' after old name!");
1545 return 1;
1546 }
1547 /* New name is empty */
1548 buf[0]='\0';
1549 }
1550 } else {
1551 /* Last case: params==NULL */
1552 item=find_marked_object(op);
1553 if(!item) {
1554 new_draw_info(NDI_UNIQUE,0,op,"No marked item to rename.");
1555 return 1;
1556 }
1557 buf[0]='\0';
1558 }
1559
1560 if (QUERY_FLAG(item, FLAG_UNPAID)) {
1561 new_draw_info(NDI_UNIQUE,0,op,"You can't rename an unpaid item! You should pay for it first.");
1562 return 1;
1563 }
1564
1565 /* Coming here, everything is fine... */
1566 if(!strlen(buf)) {
1567 /* Clear custom name */
1568 if(item->custom_name) {
1569 FREE_AND_CLEAR_STR(item->custom_name);
1570
1571 new_draw_info_format(NDI_UNIQUE, 0, op,"You stop calling your %s with weird names.",query_base_name(item,item->nrof>1?1:0));
1572 esrv_update_item(UPD_NAME,op,item);
1573 } else {
1574 new_draw_info(NDI_UNIQUE,0,op,"This item has no custom name.");
1575 }
1576 } else {
1577 /* Set custom name */
1578 FREE_AND_COPY(item->custom_name,buf);
1579
1580 new_draw_info_format(NDI_UNIQUE, 0, op,"Your %s will now be called %s.",query_base_name(item,item->nrof>1?1:0),buf);
1581 esrv_update_item(UPD_NAME,op,item);
1582 }
1583
1584 return 1;
1585}

Diff Legend

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