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.13 by pippijn, Thu Sep 7 10:01:57 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.13 2006/09/07 10:01:57 pippijn 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 && (sint32) (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.", &alt->name); 383 new_draw_info_format (NDI_UNIQUE, 0, op, "You can't pick up the %s.", &alt->name);
338 goto leave; 384 goto leave;
339 } 385 }
340 tmp = alt; 386 tmp = alt;
341 } 387 }
342 else 388 else
343 { 389 {
344 if (op->below == NULL || ! can_pick (op, op->below)) { 390 if (op->below == NULL || !can_pick (op, op->below))
345 new_draw_info (NDI_UNIQUE, 0, op, 391 {
346 "There is nothing to pick up here."); 392 new_draw_info (NDI_UNIQUE, 0, op, "There is nothing to pick up here.");
347 goto leave; 393 goto leave;
348 } 394 }
395
349 tmp = op->below; 396 tmp = op->below;
350 } 397 }
351 398
352 /* Try to catch it. */ 399 /* Try to catch it. */
353 tmp_map = tmp->map; 400 tmp_map = tmp->map;
354 tmp = stop_item (tmp); 401 tmp = stop_item (tmp);
355 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))
356 goto leave; 422 goto leave;
357 need_fix_tmp = 1;
358 if ( ! can_pick (op, tmp))
359 goto leave;
360
361 if (op->type==PLAYER) {
362 count=op->contr->count;
363 if (count==0) count = tmp->nrof;
364 } 423 }
365 else 424 else
366 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 */
367 430
368 /* container is open, so use it */ 431 if (!alt)
369 if (op->container) {
370 alt = op->container;
371 if (alt != tmp->env && !sack_can_hold (op, alt, tmp,count))
372 goto leave;
373 } else { /* non container pickup */
374 for (alt=op->inv; alt; alt=alt->below) 432 for (alt = op->inv; alt; alt = alt->below)
375 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))
376 alt->race && alt->race==tmp->race && 434 break; /* General container comes next */
377 sack_can_hold (NULL, alt, tmp,count))
378 break; /* perfect match */
379
380 if (!alt) 435 if (!alt)
381 for (alt=op->inv; alt; alt=alt->below)
382 if (alt->type==CONTAINER && QUERY_FLAG(alt, FLAG_APPLIED) &&
383 sack_can_hold (NULL, alt, tmp,count))
384 break; /* General container comes next */
385 if (!alt)
386 alt = op; /* No free containers */ 436 alt = op; /* No free containers */
387 } 437 }
438
388 if(tmp->env == alt) { 439 if (tmp->env == alt)
440 {
389 /* here it could be possible to check rent, 441 /* here it could be possible to check rent,
390 * if someone wants to implement it 442 * if someone wants to implement it
391 */ 443 */
392 alt = op; 444 alt = op;
393 } 445 }
394#ifdef PICKUP_DEBUG 446#ifdef PICKUP_DEBUG
395 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);
396#endif 448#endif
397 449
398 /* startequip items are not allowed to be put into containers: */ 450 /* startequip items are not allowed to be put into containers: */
399 if (op->type == PLAYER && alt->type == CONTAINER 451 if (op->type == PLAYER && alt->type == CONTAINER && QUERY_FLAG (tmp, FLAG_STARTEQUIP))
400 && QUERY_FLAG (tmp, FLAG_STARTEQUIP))
401 { 452 {
402 new_draw_info (NDI_UNIQUE, 0, op, 453 new_draw_info (NDI_UNIQUE, 0, op, "This object cannot be put into containers!");
403 "This object cannot be put into containers!");
404 goto leave; 454 goto leave;
405 } 455 }
406 456
407 tag = tmp->count;
408 pick_up_object (op, alt, tmp, count); 457 pick_up_object (op, alt, tmp, count);
458
409 if (was_destroyed (tmp, tag) || tmp->env) 459 if (tmp->destroyed () || tmp->env)
410 need_fix_tmp = 0; 460 need_fix_tmp = 0;
461
411 if (op->type == PLAYER) 462 if (op->type == PLAYER)
412 op->contr->count=0; 463 op->contr->count = 0;
464
413 goto leave; 465 goto leave;
414 466
415 leave: 467leave:
416 if (need_fix_tmp) 468 if (need_fix_tmp)
417 fix_stopped_item (tmp, tmp_map, op); 469 fix_stopped_item (tmp, tmp_map, op);
418} 470}
419 471
420 472
421/* This takes (picks up) and item. op is the player 473/* This takes (picks up) and item. op is the player
422 * who issued the command. params is a string to 474 * who issued the command. params is a string to
423 * match against the item name. Basically, always 475 * match against the item name. Basically, always
424 * returns zero, but that should be improved. 476 * returns zero, but that should be improved.
425 */ 477 */
478int
426int command_take (object *op, char *params) 479command_take (object *op, char *params)
427{ 480{
428 object *tmp, *next; 481 object *tmp, *next;
429 482
430 if (op->container) 483 if (op->container)
431 tmp=op->container->inv; 484 tmp = op->container->inv;
432 else { 485 else
486 {
433 tmp=op->above; 487 tmp = op->above;
488 if (tmp)
434 if (tmp) while (tmp->above) { 489 while (tmp->above)
435 tmp=tmp->above; 490 tmp = tmp->above;
436 } 491
437 if (!tmp) 492 if (!tmp)
438 tmp=op->below; 493 tmp = op->below;
439 } 494 }
440 495
441 if (tmp==NULL) { 496 if (tmp == NULL)
497 {
442 new_draw_info(NDI_UNIQUE, 0,op,"Nothing to take!"); 498 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to take!");
443 return 0; 499 return 0;
444 } 500 }
445 501
446 /* Makes processing easier */ 502 /* Makes processing easier */
447 if (params && *params=='\0') params=NULL; 503 if (params && *params == '\0')
504 params = NULL;
448 505
449 while (tmp) { 506 while (tmp)
507 {
450 next=tmp->below; 508 next = tmp->below;
451 509
452 if (tmp->invisible) { 510 if (tmp->invisible)
511 {
453 tmp=next; 512 tmp = next;
454 continue; 513 continue;
455 } 514 }
456 /* 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
457 * but that probably will make it more difficult to read, and 516 * but that probably will make it more difficult to read, and
458 * not make it any more efficient 517 * not make it any more efficient
459 */ 518 */
460 if (params && item_matched_string(op, tmp, params)) { 519 if (params && item_matched_string (op, tmp, params))
520 {
461 pick_up(op, tmp); 521 pick_up (op, tmp);
462 } 522 }
463 else if (can_pick(op, tmp) && !params) { 523 else if (can_pick (op, tmp) && !params)
524 {
464 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);
465 break; 544 break;
466 }
467 tmp=next;
468 /* Might as well just skip over the player immediately -
469 * we know it can't be picked up
470 */
471 if (tmp == op) tmp=tmp->below;
472 }
473 if (!params && !tmp) {
474 for (tmp=op->below; tmp!=NULL; tmp=tmp->next)
475 if (!tmp->invisible) {
476 char buf[MAX_BUF];
477 sprintf(buf,"You can't pick up a %s.", &tmp->name);
478 new_draw_info(NDI_UNIQUE, 0, op, buf);
479 break;
480 } 545 }
546 if (!tmp)
481 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.");
482 } 548 }
483 return 0; 549 return 0;
484} 550}
485 551
486 552
487/* 553/*
488 * This function was part of drop, now is own function. 554 * This function was part of drop, now is own function.
489 * Player 'op' tries to put object 'tmp' into sack 'sack', 555 * Player 'op' tries to put object 'tmp' into sack 'sack',
490 * 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.
491 * Note that the 'sack' in question can now be a transport, 557 * Note that the 'sack' in question can now be a transport,
492 * so this function isn't named very good anymore. 558 * so this function isn't named very good anymore.
493 */ 559 */
560void
494void put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof) 561put_object_in_sack (object *op, object *sack, object *tmp, uint32 nrof)
495{ 562{
496 tag_t tmp_tag, tmp2_tag;
497 object *tmp2, *sack2; 563 object *tmp2, *sack2;
498 char buf[MAX_BUF]; 564 char buf[MAX_BUF];
499 565
500 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
501 if (QUERY_FLAG(tmp,FLAG_STARTEQUIP)) { 569 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
502 new_draw_info_format(NDI_UNIQUE, 0,op, 570 {
503 "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));
504 query_name(sack));
505 return; 572 return;
506 } 573 }
574
507 if (tmp->type == CONTAINER && tmp->inv) { 575 if (tmp->type == CONTAINER && tmp->inv)
576 {
508 577
509 /* 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
510 * we instead move the contents of that container into the active 579 * we instead move the contents of that container into the active
511 * 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.
512 */ 581 */
513 sack2 = tmp; 582 sack2 = tmp;
514 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));
515 query_name(tmp), query_name(sack)); 584
516 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp) { 585 for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
586 {
517 tmp = tmp2->below; 587 tmp = tmp2->below;
588
518 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 {
519 put_object_in_sack (op, sack, tmp2, 0); 591 put_object_in_sack (op, sack, tmp2, 0);
520 } else {
521 sprintf(buf,"Your %s fills up.", query_name(sack));
522 new_draw_info(NDI_UNIQUE, 0,op, buf);
523 break;
524 } 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;
525 } 598 }
599 }
600
526 esrv_update_item (UPD_WEIGHT, op, sack2); 601 esrv_update_item (UPD_WEIGHT, op, sack2);
527 return; 602 return;
528 } 603 }
529 604
530 /* Don't worry about this for containers - our caller should have 605 /* Don't worry about this for containers - our caller should have
531 * already checked this. 606 * already checked this.
532 */ 607 */
533 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)))
534 return; 609 return;
535 610
536 if(QUERY_FLAG(tmp, FLAG_APPLIED)) { 611 if (QUERY_FLAG (tmp, FLAG_APPLIED))
537 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 612 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
538 return; 613 return;
539 }
540 614
541 /* 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 */
542 if (nrof && tmp->nrof != nrof) { 616 if (nrof && tmp->nrof != nrof)
617 {
543 object *tmp2 = tmp; 618 object *tmp2 = tmp;
544 tmp2_tag = tmp2->count; 619
545 tmp = get_split_ob (tmp, nrof); 620 tmp = get_split_ob (tmp, nrof);
546 621
547 if(!tmp) { 622 if (!tmp)
623 {
548 new_draw_info(NDI_UNIQUE, 0,op, errmsg); 624 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
549 return; 625 return;
550 } 626 }
551 /* Tell a client what happened other objects */ 627 /* Tell a client what happened other objects */
552 if (was_destroyed (tmp2, tmp2_tag)) 628 if (tmp2->destroyed ())
553 esrv_del_item (op->contr, tmp2_tag); 629 esrv_del_item (op->contr, tmp2->count);
554 else /* this can proably be replaced with an update */ 630 else /* this can proably be replaced with an update */
555 esrv_send_item (op, tmp2); 631 esrv_send_item (op, tmp2);
632 }
556 } else 633 else
557 remove_ob(tmp); 634 tmp->remove ();
558 635
559 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));
560 query_name(tmp), query_name(sack));
561 tmp_tag = tmp->count;
562 tmp2 = insert_ob_in_ob(tmp, sack); 637 tmp2 = insert_ob_in_ob (tmp, sack);
563 fix_player(op); /* This is overkill, fix_player() is called somewhere */ 638 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
564 /* in object.c */ 639 /* in object.c */
565 640
566 /* If an object merged (and thus, different object), we need to 641 /* If an object merged (and thus, different object), we need to
567 * delete the original. 642 * delete the original.
568 */ 643 */
569 if (tmp2 != tmp) 644 if (tmp2 != tmp)
570 esrv_del_item (op->contr, tmp_tag); 645 esrv_del_item (op->contr, tmp->count);
571 646
572 esrv_send_item (op, tmp2); 647 esrv_send_item (op, tmp2);
573 648
574 /* update the sacks weight */ 649 /* update the sacks weight */
575 esrv_update_item (UPD_WEIGHT, op, sack); 650 esrv_update_item (UPD_WEIGHT, op, sack);
576} 651}
577 652
578/* 653/*
579 * This function was part of drop, now is own function. 654 * This function was part of drop, now is own function.
580 * 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
581 * nrof objects is tried to dropped. 656 * nrof objects is tried to dropped.
582 * This is used when dropping objects onto the floor. 657 * This is used when dropping objects onto the floor.
583 */ 658 */
584void 659void
585drop_object (object * op, object * tmp, uint32 nrof) 660drop_object (object *op, object *tmp, uint32 nrof)
586{ 661{
587 char buf[MAX_BUF]; 662 char buf[MAX_BUF];
588 object *floor; 663 object *floor;
589 664
590 if (QUERY_FLAG (tmp, FLAG_NO_DROP)) 665 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
591 return; 666 return;
592 667
593 if (QUERY_FLAG (tmp, FLAG_APPLIED)) 668 if (QUERY_FLAG (tmp, FLAG_APPLIED))
594 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE)) 669 if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
595 return; /* can't unapply it */ 670 return; /* can't unapply it */
596 671
597 /* 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
598 * off 673 * off
599 */ 674 */
600 if (nrof && tmp->nrof != nrof) 675 if (nrof && tmp->nrof != nrof)
601 { 676 {
602 object *tmp2 = tmp; 677 object *tmp2 = tmp;
603 tag_t tmp2_tag = tmp2->count; 678
604 tmp = get_split_ob (tmp, nrof); 679 tmp = get_split_ob (tmp, nrof);
605 if (!tmp) 680 if (!tmp)
606 { 681 {
607 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 682 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
608 return; 683 return;
… …
610 /* 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
611 * original object 686 * original object
612 */ 687 */
613 if (op->type == PLAYER) 688 if (op->type == PLAYER)
614 { 689 {
615 if (was_destroyed (tmp2, tmp2_tag)) 690 if (tmp2->destroyed ())
616 esrv_del_item (op->contr, tmp2_tag); 691 esrv_del_item (op->contr, tmp2->count);
617 else 692 else
618 esrv_send_item (op, tmp2); 693 esrv_send_item (op, tmp2);
619 } 694 }
620 } 695 }
621 else 696 else
622 remove_ob (tmp); 697 tmp->remove ();
623 698
624 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op))) 699 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
625 return; 700 return;
626 701
627 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 702 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
628 { 703 {
629 sprintf (buf, "You drop the %s.", query_name (tmp)); 704 sprintf (buf, "You drop the %s.", query_name (tmp));
630 new_draw_info (NDI_UNIQUE, 0, op, buf); 705 new_draw_info (NDI_UNIQUE, 0, op, buf);
631 new_draw_info (NDI_UNIQUE, 0, op, 706 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it.");
632 "The gods who lent it to you retrieves it."); 707
633 if (op->type == PLAYER) 708 if (op->type == PLAYER)
634 esrv_del_item (op->contr, tmp->count); 709 esrv_del_item (op->contr, tmp->count);
635 free_object (tmp); 710
636 fix_player (op); 711 tmp->destroy ();
712 op->update_stats ();
637 return; 713 return;
638 } 714 }
639 715
640/* If SAVE_INTERVAL is commented out, we never want to save 716/* If SAVE_INTERVAL is commented out, we never want to save
641 * the player here. 717 * the player here.
… …
644 /* 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
645 * is done every SAVE_INTERVAL seconds, why care the value 721 * is done every SAVE_INTERVAL seconds, why care the value
646 * of what he is dropping? 722 * of what he is dropping?
647 */ 723 */
648 if (op->type == PLAYER && !QUERY_FLAG (tmp, FLAG_UNPAID) && 724 if (op->type == PLAYER && !QUERY_FLAG (tmp, FLAG_UNPAID) &&
649 (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))
650 (op->contr->last_save_time + SAVE_INTERVAL) <= time (NULL))
651 { 726 {
652 save_player (op, 1); 727 op->contr->save ();
653 op->contr->last_save_time = time (NULL); 728 op->contr->last_save_time = time (NULL);
654 } 729 }
655#endif /* SAVE_INTERVAL */ 730#endif /* SAVE_INTERVAL */
656 731
657 if (op->type == PLAYER) 732 if (op->type == PLAYER)
658 esrv_del_item (op->contr, tmp->count); 733 esrv_del_item (op->contr, tmp->count);
659 734
660 /* Call this before we update the various windows/players. At least 735 /* Call this before we update the various windows/players. At least
661 * that we, we know the weight is correct. 736 * that we, we know the weight is correct.
662 */ 737 */
663 fix_player (op); /* This is overkill, fix_player() is called somewhere */ 738 op->update_stats (); /* This is overkill, fix_player() is called somewhere */
664 /* in object.c */ 739 /* in object.c */
665 740
666 if (op->type == PLAYER) 741 if (op->type == PLAYER)
667 { 742 {
668 op->contr->socket.update_look = 1;
669 /* Need to update the weight for the player */ 743 /* Need to update the weight for the player */
670 esrv_send_item (op, op); 744 esrv_send_item (op, op);
745 op->contr->ns->floorbox_update ();
671 } 746 }
672 747
673 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)
674 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)))
675 return; 750 return;
676 751
677 if (is_in_shop (op) 752 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
678 && !QUERY_FLAG (tmp, FLAG_UNPAID)
679 && tmp->type != MONEY)
680 sell_item (tmp, op); 753 sell_item (tmp, op);
681 754
682 tmp->x = op->x; 755 tmp->x = op->x;
683 tmp->y = op->y; 756 tmp->y = op->y;
684 757
685 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR); 758 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
686} 759}
687 760
761void
688void drop(object *op, object *tmp) 762drop (object *op, object *tmp)
689{ 763{
690 /* Hopeful fix for disappearing objects when dropping from a container - 764 /* Hopeful fix for disappearing objects when dropping from a container -
691 * somehow, players get an invisible object in the container, and the 765 * somehow, players get an invisible object in the container, and the
692 * old logic would skip over invisible objects - works fine for the 766 * old logic would skip over invisible objects - works fine for the
693 * playes inventory, but drop inventory wants to use the next value. 767 * playes inventory, but drop inventory wants to use the next value.
694 */ 768 */
695 if (tmp->invisible) { 769 if (tmp->invisible)
770 {
696 /* 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. */
697 if (tmp->env && tmp->env->type != PLAYER) { 772 if (tmp->env && tmp->env->type != PLAYER)
773 {
698 /* Just toss the object - probably shouldn't be hanging 774 /* Just toss the object - probably shouldn't be hanging
699 * around anyways 775 * around anyways
700 */ 776 */
701 remove_ob(tmp); 777 tmp->remove ();
702 free_object(tmp); 778 tmp->destroy ();
703 return; 779 return;
780 }
704 } else { 781 else
782 {
705 while(tmp!=NULL && tmp->invisible) 783 while (tmp != NULL && tmp->invisible)
706 tmp=tmp->below; 784 tmp = tmp->below;
707 } 785 }
708 } 786 }
709 787
710 if (tmp==NULL) { 788 if (tmp == NULL)
789 {
711 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.");
712 return; 791 return;
713 } 792 }
714 if (QUERY_FLAG(tmp, FLAG_INV_LOCKED)) { 793 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
794 {
715 new_draw_info(NDI_UNIQUE, 0,op,"This item is locked"); 795 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
716 return; 796 return;
717 } 797 }
718 if (QUERY_FLAG(tmp, FLAG_NO_DROP)) { 798 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
799 {
719#if 0 800#if 0
720 /* 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. */
721 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.");
722#endif 803#endif
723 return; 804 return;
724 } 805 }
725 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 {
726 if (op->type == PLAYER) 814 if (op->type == PLAYER)
727 { 815 put_object_in_sack (op, op->container, tmp, op->contr->count);
728 if (op->contr->last_used==tmp && op->contr->last_used_id == tmp->count) {
729 object *n=NULL;
730 if(tmp->below != NULL)
731 n = tmp->below;
732 else if(tmp->above != NULL)
733 n = tmp->above;
734 op->contr->last_used = n;
735 if (n != NULL)
736 op->contr->last_used_id = n->count;
737 else 816 else
738 op->contr->last_used_id = 0; 817 put_object_in_sack (op, op->container, tmp, 0);
739 }
740 }; 818 }
741 819 else
742 if (op->container) { 820 {
743 if (op->type == PLAYER) 821 if (op->type == PLAYER)
744 {
745 put_object_in_sack (op, op->container, tmp, op->contr->count);
746 } else {
747 put_object_in_sack(op, op->container, tmp, 0);
748 };
749 } else {
750 if (op->type == PLAYER)
751 {
752 drop_object (op, tmp, op->contr->count); 822 drop_object (op, tmp, op->contr->count);
753 } else { 823 else
754 drop_object(op,tmp,0); 824 drop_object (op, tmp, 0);
755 };
756 } 825 }
826
757 if (op->type == PLAYER) 827 if (op->type == PLAYER)
758 op->contr->count = 0; 828 op->contr->count = 0;
759} 829}
760 830
761 831
762 832
763/* Command will drop all items that have not been locked */ 833/* Command will drop all items that have not been locked */
834int
764int command_dropall (object *op, char *params) { 835command_dropall (object *op, char *params)
836{
765 837
766 object * curinv, *nextinv; 838 object *curinv, *nextinv;
767 839
768 if(op->inv == NULL) { 840 if (op->inv == NULL)
841 {
769 new_draw_info(NDI_UNIQUE, 0,op,"Nothing to drop!"); 842 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
770 return 0; 843 return 0;
771 } 844 }
772 845
773 curinv = op->inv; 846 curinv = op->inv;
774 847
775 /* 848 /*
776 This is the default. Drops everything not locked or considered 849 This is the default. Drops everything not locked or considered
777 not something that should be dropped. 850 not something that should be dropped.
778 */ 851 */
779 /* 852 /*
780 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
781 the drop() routine will do unknown things to it when dropping 854 the drop() routine will do unknown things to it when dropping
782 in a shop. --Tero.Pelander@utu.fi 855 in a shop. --Tero.Pelander@utu.fi
783 */ 856 */
784 857
785 if(params==NULL) { 858 if (params == NULL)
859 {
786 while(curinv != NULL) { 860 while (curinv != NULL)
861 {
787 nextinv = curinv->below; 862 nextinv = curinv->below;
788 while (nextinv && nextinv->type==MONEY) 863 while (nextinv && nextinv->type == MONEY)
789 nextinv = nextinv->below; 864 nextinv = nextinv->below;
790 if(! QUERY_FLAG(curinv,FLAG_INV_LOCKED) && curinv->type != MONEY && 865 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
791 curinv->type != FOOD && curinv->type != KEY && 866 curinv->type != FOOD && curinv->type != KEY &&
792 curinv->type != SPECIAL_KEY && curinv->type != GEM && 867 curinv->type != SPECIAL_KEY && curinv->type != GEM &&
793 !curinv->invisible &&
794 (curinv->type!=CONTAINER || op->container!=curinv)) 868 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
795 { 869 {
796 drop(op,curinv);
797 }
798 curinv = nextinv;
799 }
800 }
801
802 else if(strcmp(params, "weapons") == 0) {
803 while(curinv != NULL) {
804 nextinv = curinv->below;
805 while (nextinv && nextinv->type==MONEY)
806 nextinv = nextinv->below;
807 if(! QUERY_FLAG(curinv,FLAG_INV_LOCKED) && ((curinv->type == WEAPON) ||
808 (curinv->type == BOW) || (curinv->type == ARROW)))
809 {
810 drop(op,curinv); 870 drop (op, curinv);
811 } 871 }
812 curinv = nextinv;
813 }
814 }
815
816 else if(strcmp(params, "armor") == 0 || strcmp(params, "armour") == 0) {
817 while(curinv != NULL) {
818 nextinv = curinv->below;
819 while (nextinv && nextinv->type==MONEY)
820 nextinv = nextinv->below;
821 if(! QUERY_FLAG(curinv,FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) ||
822 curinv->type == SHIELD || curinv->type==HELMET))
823 {
824 drop(op,curinv);
825 }
826 curinv = nextinv;
827 }
828 }
829
830 else if(strcmp(params, "misc") == 0) {
831 while(curinv != NULL) {
832 nextinv = curinv->below;
833 while (nextinv && nextinv->type==MONEY)
834 nextinv = nextinv->below;
835 if(! QUERY_FLAG(curinv,FLAG_INV_LOCKED) && ! QUERY_FLAG(curinv,FLAG_APPLIED)) {
836 switch(curinv->type) {
837 case HORN:
838 case BOOK:
839 case SPELLBOOK:
840 case GIRDLE:
841 case AMULET:
842 case RING:
843 case CLOAK:
844 case BOOTS:
845 case GLOVES:
846 case BRACERS:
847 case SCROLL:
848 case ARMOUR_IMPROVER:
849 case WEAPON_IMPROVER:
850 case WAND:
851 case ROD:
852 case POTION:
853 drop(op,curinv);
854 curinv = nextinv; 872 curinv = nextinv;
855 break; 873 }
856 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 }
857 curinv = nextinv; 887 curinv = nextinv;
858 break; 888 }
889 }
890
891 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
892 {
893 while (curinv != NULL)
859 } 894 {
860 } 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 }
861 curinv = nextinv; 902 curinv = nextinv;
903 }
904 }
905
906 else if (strcmp (params, "misc") == 0)
862 } 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 }
863 } 943 }
864 op->contr->socket.update_look=1; 944
945 op->contr->ns->floorbox_update ();
946
865/* draw_look(op);*/ 947/* draw_look(op);*/
866 return 0; 948 return 0;
867} 949}
868 950
869/* 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
870 * comma seperated list. 952 * comma seperated list.
871 */ 953 */
872 954
955int
873int command_drop (object *op, char *params) 956command_drop (object *op, char *params)
874{ 957{
875 object *tmp, *next; 958 object *tmp, *next;
876 int did_one=0; 959 int did_one = 0;
877 960
878 if (!params) { 961 if (!params)
962 {
879 new_draw_info(NDI_UNIQUE,0, op, "Drop what?"); 963 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
880 return 0; 964 return 0;
881 } else { 965 }
966 else
967 {
882 for (tmp=op->inv; tmp; tmp=next) { 968 for (tmp = op->inv; tmp; tmp = next)
969 {
883 next=tmp->below; 970 next = tmp->below;
884 if (QUERY_FLAG(tmp,FLAG_NO_DROP) || 971 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
885 tmp->invisible) continue; 972 continue;
886 if (item_matched_string(op,tmp,params)) { 973 if (item_matched_string (op, tmp, params))
974 {
887 drop(op, tmp); 975 drop (op, tmp);
888 did_one=1; 976 did_one = 1;
889 } 977 }
890 } 978 }
979 if (!did_one)
891 if (!did_one) new_draw_info(NDI_UNIQUE, 0,op,"Nothing to drop."); 980 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
892 } 981 }
893 if (op->type==PLAYER) 982 if (op->type == PLAYER)
894 { 983 {
895 op->contr->count=0; 984 op->contr->count = 0;
896 op->contr->socket.update_look=1; 985 op->contr->ns->floorbox_update ();
897 }; 986 };
987
898/* draw_look(op);*/ 988/* draw_look(op);*/
899 return 0; 989 return 0;
900} 990}
901 991
992int
902int command_examine (object *op, char *params) 993command_examine (object *op, char *params)
903{ 994{
904 if (!params) { 995 if (!params)
996 {
905 object *tmp=op->below; 997 object *tmp = op->below;
998
906 while (tmp && !LOOK_OBJ(tmp)) tmp=tmp->below; 999 while (tmp && !LOOK_OBJ (tmp))
907 if (tmp) examine(op,tmp); 1000 tmp = tmp->below;
908 }
909 else {
910 object *tmp=find_best_object_match(op,params);
911 if (tmp) 1001 if (tmp)
912 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);
913 else 1010 else
914 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);
915 } 1012 }
916 return 0; 1013 return 0;
917} 1014}
918 1015
919/* op should be a player. 1016/* op should be a player.
920 * 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
921 * 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
922 * 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
923 * nothing is found. 1020 * nothing is found.
924 */ 1021 */
1022object *
925object *find_marked_object(object *op) 1023find_marked_object (object *op)
926{ 1024{
927 object *tmp; 1025 object *tmp;
928 1026
929 if (!op || !op->contr) return NULL; 1027 if (!op || !op->contr)
1028 return NULL;
1029
930 if (!op->contr->mark) { 1030 if (!op->contr->mark)
1031 {
931/* 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");*/
932 return NULL; 1033 return 0;
933 } 1034 }
1035
934 /* 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
935 * 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
936 * an item got reincarnated at some point. 1038 * an item got reincarnated at some point.
937 */ 1039 */
938 for (tmp=op->inv; tmp; tmp=tmp->below) { 1040 for (tmp = op->inv; tmp; tmp = tmp->below)
1041 {
939 if (tmp->invisible) continue; 1042 if (tmp->invisible)
1043 continue;
1044
940 if (tmp == op->contr->mark) { 1045 if (tmp == op->contr->mark)
941 if (tmp->count == op->contr->mark_count) 1046 {
1047 if (!tmp->destroyed ())
942 return tmp; 1048 return tmp;
943 else { 1049 else
1050 {
944 op->contr->mark=NULL; 1051 op->contr->mark = 0;
945 op->contr->mark_count=0;
946/* 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");*/
947 return NULL; 1053 return 0;
948 } 1054 }
949 } 1055 }
950 } 1056 }
951 return NULL; 1057
1058 return 0;
952} 1059}
953 1060
954 1061
955/* op should be a player, params is any params. 1062/* op should be a player, params is any params.
956 * If no params given, we print out the currently marked object. 1063 * If no params given, we print out the currently marked object.
957 * otherwise, try to find a matching object - try best match first. 1064 * otherwise, try to find a matching object - try best match first.
958 */ 1065 */
1066int
959int command_mark(object *op, char *params) 1067command_mark (object *op, char *params)
960{ 1068{
961 if (!op->contr) return 1; 1069 if (!op->contr)
1070 return 1;
1071
962 if (!params) { 1072 if (!params)
1073 {
963 object *mark=find_marked_object(op); 1074 object *mark = find_marked_object (op);
1075
1076 if (!mark)
964 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
965 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
966 } 1082 {
967 else {
968 object *mark1=find_best_object_match(op, params); 1083 object *mark1 = find_best_object_match (op, params);
1084
969 if (!mark1) { 1085 if (!mark1)
1086 {
970 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);
971 return 1; 1088 return 1;
1089 }
1090 else
972 } 1091 {
973 else {
974 op->contr->mark=mark1; 1092 op->contr->mark = mark1;
975 op->contr->mark_count=mark1->count;
976 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));
977 return 0; 1094 return 0;
978 } 1095 }
979 } 1096 }
980 return 0; /*shouldnt get here */ 1097
1098 return 0; /*shouldnt get here */
981} 1099}
982 1100
983 1101
984/* op is the player 1102/* op is the player
985 * tmp is the monster being examined. 1103 * tmp is the monster being examined.
986 */ 1104 */
1105void
987void examine_monster(object *op,object *tmp) { 1106examine_monster (object *op, object *tmp)
1107{
988 object *mon=tmp->head?tmp->head:tmp; 1108 object *mon = tmp->head ? tmp->head : tmp;
989 1109
990 if(QUERY_FLAG(mon,FLAG_UNDEAD)) 1110 if (QUERY_FLAG (mon, FLAG_UNDEAD))
991 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.");
992 if(mon->level>op->level) 1112 if (mon->level > op->level)
993 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.");
994 else if(mon->level<op->level) 1114 else if (mon->level < op->level)
995 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.");
996 else 1116 else
997 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.");
998 if(mon->attacktype&AT_ACID) 1118 if (mon->attacktype & AT_ACID)
999 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.");
1000 1120
1001 /* 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
1002 * maxhp field? This seems that it should give more accurate results. 1122 * maxhp field? This seems that it should give more accurate results.
1003 */ 1123 */
1004 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 */
1005 case 1: 1126 case 1:
1006 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.");
1007 break; 1128 break;
1008 case 2: 1129 case 2:
1009 new_draw_info(NDI_UNIQUE, 0,op,"It is hurt."); 1130 new_draw_info (NDI_UNIQUE, 0, op, "It is hurt.");
1010 break; 1131 break;
1011 case 3: 1132 case 3:
1012 new_draw_info(NDI_UNIQUE, 0,op,"It is somewhat hurt."); 1133 new_draw_info (NDI_UNIQUE, 0, op, "It is somewhat hurt.");
1013 break; 1134 break;
1014 case 4: 1135 case 4:
1015 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.");
1016 break; 1137 break;
1017 } 1138 }
1018 if(present_in_ob(POISONING,mon)!=NULL) 1139 if (present_in_ob (POISONING, mon) != NULL)
1019 new_draw_info(NDI_UNIQUE, 0,op,"It looks very ill."); 1140 new_draw_info (NDI_UNIQUE, 0, op, "It looks very ill.");
1020} 1141}
1021 1142
1022 1143
1023/* 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 *
1024char *long_desc(object *tmp, object *pl) { 1146long_desc (object *tmp, object *pl)
1147{
1025 static char buf[VERY_BIG_BUF]; 1148 static char buf[VERY_BIG_BUF];
1026 char *cp; 1149 char *cp;
1027 1150
1028 if(tmp==NULL) 1151 if (tmp == NULL)
1029 return ""; 1152 return "";
1030 1153
1031 buf[0]='\0'; 1154 buf[0] = '\0';
1032 switch(tmp->type) { 1155 switch (tmp->type)
1156 {
1033 case RING: 1157 case RING:
1034 case SKILL: 1158 case SKILL:
1035 case WEAPON: 1159 case WEAPON:
1036 case ARMOUR: 1160 case ARMOUR:
1037 case BRACERS: 1161 case BRACERS:
1038 case HELMET: 1162 case HELMET:
1039 case SHIELD: 1163 case SHIELD:
1040 case BOOTS: 1164 case BOOTS:
1041 case GLOVES: 1165 case GLOVES:
1042 case AMULET: 1166 case AMULET:
1043 case GIRDLE: 1167 case GIRDLE:
1044 case BOW: 1168 case BOW:
1045 case ARROW: 1169 case ARROW:
1046 case CLOAK: 1170 case CLOAK:
1047 case FOOD: 1171 case FOOD:
1048 case DRINK: 1172 case DRINK:
1049 case FLESH: 1173 case FLESH:
1050 case SKILL_TOOL: 1174 case SKILL_TOOL:
1051 case POWER_CRYSTAL: 1175 case POWER_CRYSTAL:
1052 if(*(cp=describe_item(tmp, pl))!='\0') { 1176 if (*(cp = describe_item (tmp, pl)) != '\0')
1177 {
1053 int len; 1178 int len;
1054 1179
1055 strncpy(buf,query_name(tmp), VERY_BIG_BUF-1); 1180 assign (buf, query_name (tmp));
1056 buf[VERY_BIG_BUF-1]=0;
1057 len=strlen(buf); 1181 len = strlen (buf);
1058 if (len<VERY_BIG_BUF-5) { 1182 if (len < VERY_BIG_BUF - 5)
1183 {
1059 /* 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
1060 * it instead of calling strcat */ 1185 * it instead of calling strcat */
1061 strcpy(buf+len," "); 1186 strcpy (buf + len, " ");
1062 len++; 1187 len++;
1063 strncpy(buf+len, cp, VERY_BIG_BUF-len-1); 1188 assign (buf + len, cp, VERY_BIG_BUF - len - 1);
1064 buf[VERY_BIG_BUF-1]=0;
1065 } 1189 }
1066 } 1190 }
1067 } 1191 }
1192
1068 if(buf[0]=='\0') { 1193 if (buf[0] == '\0')
1069 strncpy(buf,query_name(tmp), VERY_BIG_BUF-1); 1194 assign (buf, query_name (tmp));
1070 buf[VERY_BIG_BUF-1]=0;
1071 }
1072 1195
1073 return buf; 1196 return buf;
1074} 1197}
1075 1198
1199void
1076void examine(object *op, object *tmp) { 1200examine (object *op, object *tmp)
1201{
1077 char buf[VERY_BIG_BUF]; 1202 char buf[VERY_BIG_BUF];
1078 int i; 1203 int i;
1079 1204
1080 if (tmp == NULL || tmp->type == CLOSE_CON) 1205 if (tmp == NULL || tmp->type == CLOSE_CON)
1081 return; 1206 return;
1082 1207
1083 strcpy(buf,"That is "); 1208 strcpy (buf, "That is ");
1084 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);
1085 buf[VERY_BIG_BUF-1]=0; 1210 buf[VERY_BIG_BUF - 1] = 0;
1086 1211
1087 new_draw_info(NDI_UNIQUE, 0,op,buf); 1212 new_draw_info (NDI_UNIQUE, 0, op, buf);
1088 buf[0]='\0'; 1213 buf[0] = '\0';
1089 1214
1090 if(tmp->custom_name) { 1215 if (tmp->custom_name)
1216 {
1091 strcpy(buf,"You call it "); 1217 strcpy (buf, "You call it ");
1092 strncat(buf, tmp->custom_name, VERY_BIG_BUF-strlen(buf)-1); 1218 strncat (buf, tmp->custom_name, VERY_BIG_BUF - strlen (buf) - 1);
1093 buf[VERY_BIG_BUF-1]=0; 1219 buf[VERY_BIG_BUF - 1] = 0;
1094 new_draw_info(NDI_UNIQUE, 0,op,buf); 1220 new_draw_info (NDI_UNIQUE, 0, op, buf);
1095 buf[0]='\0'; 1221 buf[0] = '\0';
1096 } 1222 }
1097 1223
1098 switch(tmp->type) { 1224 switch (tmp->type)
1225 {
1099 case SPELLBOOK: 1226 case SPELLBOOK:
1100 if(QUERY_FLAG(tmp, FLAG_IDENTIFIED) && tmp->inv ) { 1227 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) && tmp->inv)
1101 sprintf(buf,"%s is a %s level %s spell", 1228 {
1102 &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);
1103 &tmp->inv->skill);
1104 } 1230 }
1105 break; 1231 break;
1106 1232
1107 case BOOK: 1233 case BOOK:
1108 if(tmp->msg!=NULL) 1234 if (tmp->msg != NULL)
1109 strcpy(buf,"Something is written in it."); 1235 strcpy (buf, "Something is written in it.");
1110 break; 1236 break;
1111 1237
1112 case CONTAINER: 1238 case CONTAINER:
1113 if(tmp->race!=NULL) { 1239 if (tmp->race != NULL)
1240 {
1114 if(tmp->weight_limit && tmp->stats.Str<100) 1241 if (tmp->weight_limit && tmp->stats.Str < 100)
1115 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.",
1116 &tmp->race, tmp->weight_limit/(10.0 * (100 - tmp->stats.Str))); 1243 &tmp->race, tmp->weight_limit / (10.0 * (100 - tmp->stats.Str)));
1117 else
1118 sprintf (buf,"It can hold only %s.", &tmp->race);
1119 } else
1120 if(tmp->weight_limit && tmp->stats.Str<100)
1121 sprintf (buf,"Its weight limit is %.1f kg.",
1122 tmp->weight_limit/(10.0 * (100 - tmp->stats.Str)));
1123 break;
1124
1125 case WAND:
1126 if(QUERY_FLAG(tmp, FLAG_IDENTIFIED))
1127 sprintf(buf,"It has %d charges left.",tmp->stats.food);
1128 break;
1129 }
1130
1131 if(buf[0]!='\0')
1132 new_draw_info(NDI_UNIQUE, 0,op,buf);
1133
1134 if(tmp->materialname != NULL && !tmp->msg) {
1135 sprintf(buf, "It is made of: %s.", &tmp->materialname);
1136 new_draw_info(NDI_UNIQUE, 0, op, buf);
1137 }
1138 /* Where to wear this item */
1139 for (i=0; i < NUM_BODY_LOCATIONS; i++) {
1140 if (tmp->body_info[i]<-1) {
1141 if (op->body_info[i])
1142 new_draw_info_format(NDI_UNIQUE, 0,op,
1143 "It goes %s (%d)", body_locations[i].use_name, -tmp->body_info[i]);
1144 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);
1145 new_draw_info_format(NDI_UNIQUE, 0,op, 1263 new_draw_info (NDI_UNIQUE, 0, op, buf);
1146 "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 {
1147 } else if (tmp->body_info[i]) { 1268 if (tmp->body_info[i] < -1)
1269 {
1148 if (op->body_info[i]) 1270 if (op->body_info[i])
1149 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]);
1150 "It goes %s", body_locations[i].use_name);
1151 else 1272 else
1152 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);
1153 "It goes %s", body_locations[i].nonuse_name); 1274 }
1275 else if (tmp->body_info[i])
1154 } 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 }
1155 } 1282 }
1156 1283
1157 if(tmp->weight) { 1284 if (tmp->weight)
1158 sprintf(buf,tmp->nrof>1?"They weigh %3.3f kg.":"It weighs %3.3f kg.", 1285 {
1159 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);
1160 new_draw_info(NDI_UNIQUE, 0,op,buf); 1287 new_draw_info (NDI_UNIQUE, 0, op, buf);
1161 } 1288 }
1162 1289
1163 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))
1164 sprintf(buf,"You reckon %s worth %s.", 1291 {
1165 tmp->nrof>1?"they are":"it is",query_cost_string(tmp,op, F_TRUE | F_APPROX)); 1292 sprintf (buf, "You reckon %s worth %s.", tmp->nrof > 1 ? "they are" : "it is", query_cost_string (tmp, op, F_TRUE | F_APPROX));
1166 new_draw_info(NDI_UNIQUE, 0,op,buf); 1293 new_draw_info (NDI_UNIQUE, 0, op, buf);
1167 if (is_in_shop (op)) { 1294 if (is_in_shop (op))
1295 {
1168 if(QUERY_FLAG(tmp, FLAG_UNPAID)) 1296 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1169 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));
1170 tmp->nrof>1?"They":"It",query_cost_string(tmp,op,F_BUY | F_SHOP));
1171 else 1298 else
1172 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");
1173 query_cost_string(tmp,op,F_SELL+F_SHOP), tmp->nrof>1?"them":"it");
1174 new_draw_info(NDI_UNIQUE, 0,op,buf); 1300 new_draw_info (NDI_UNIQUE, 0, op, buf);
1175 } 1301 }
1176 } 1302 }
1177 1303
1178 if(QUERY_FLAG(tmp, FLAG_MONSTER)) 1304 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1179 examine_monster(op,tmp); 1305 examine_monster (op, tmp);
1180 1306
1181 /* Is this item buildable? */ 1307 /* Is this item buildable? */
1182 if ( QUERY_FLAG( tmp, FLAG_IS_BUILDABLE ) ) 1308 if (QUERY_FLAG (tmp, FLAG_IS_BUILDABLE))
1183 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.");
1184 1310
1185 /* 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
1186 * types - especially if the first entry is a match 1312 * types - especially if the first entry is a match
1187 */ 1313 */
1188 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))
1189 tmp->type != CORPSE && !tmp->move_on && 1315 {
1190 strncasecmp(tmp->msg, "@match",7)) {
1191 1316
1192 /* 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
1193 * out the extra message 1318 * out the extra message
1194 */ 1319 */
1195 if (need_identify(tmp) && QUERY_FLAG(tmp, FLAG_IDENTIFIED)) 1320 if (need_identify (tmp) && QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1196 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:");
1197 1322
1198 new_draw_info(NDI_UNIQUE, 0,op,tmp->msg); 1323 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1199 } 1324 }
1200 new_draw_info(NDI_UNIQUE, 0,op," "); /* Blank line */ 1325 new_draw_info (NDI_UNIQUE, 0, op, " "); /* Blank line */
1201} 1326}
1202 1327
1203/* 1328/*
1204 * 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
1205 * inventory. 1330 * inventory.
1206 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ] 1331 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1207 */ 1332 */
1333void
1208void inventory(object *op,object *inv) { 1334inventory (object *op, object *inv)
1335{
1209 object *tmp; 1336 object *tmp;
1210 char *in; 1337 char *in;
1211 int items = 0, length; 1338 int items = 0, length;
1212 1339
1213 if (inv==NULL && op==NULL) { 1340 if (inv == NULL && op == NULL)
1341 {
1214 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))
1215 return; 1402 return;
1216 }
1217 tmp = inv ? inv->inv : op->inv;
1218 1403
1219 while (tmp) {
1220 if ((!tmp->invisible &&
1221 (inv==NULL || inv->type == CONTAINER || QUERY_FLAG(tmp, FLAG_APPLIED)))
1222 || (!op || QUERY_FLAG(op, FLAG_WIZ)))
1223 items++;
1224 tmp=tmp->below;
1225 }
1226 if (inv==NULL) { /* player's inventory */
1227 if (items==0) {
1228 new_draw_info(NDI_UNIQUE, 0,op,"You carry nothing.");
1229 return;
1230 } else {
1231 length = 28;
1232 in = "";
1233 if (op)
1234 clear_win_info(op);
1235 new_draw_info(NDI_UNIQUE, 0,op,"Inventory:");
1236 }
1237 } else {
1238 if (items==0)
1239 return;
1240 else {
1241 length = 28;
1242 in = " ";
1243 }
1244 }
1245 for (tmp=inv?inv->inv:op->inv; tmp; tmp=tmp->below) {
1246 if((!op||!QUERY_FLAG(op, FLAG_WIZ)) && (tmp->invisible ||
1247 (inv && inv->type != CONTAINER && !QUERY_FLAG(tmp, FLAG_APPLIED))))
1248 continue;
1249 if((!op || QUERY_FLAG(op, FLAG_WIZ)))
1250 new_draw_info_format(NDI_UNIQUE, 0,op ,"%s- %-*.*s (%5d) %-8s", in, length, length,
1251 query_name(tmp), tmp->count,query_weight(tmp));
1252 else
1253 new_draw_info_format(NDI_UNIQUE,0, op, "%s- %-*.*s %-8s", in, length+8,
1254 length+8, query_name(tmp),
1255 query_weight(tmp));
1256 }
1257 if(!inv && op) {
1258 new_draw_info_format(NDI_UNIQUE,0, op ,"%-*s %-8s",
1259 41,"Total weight :",query_weight(op));
1260 }
1261}
1262
1263static void display_new_pickup( object* op )
1264 {
1265 int i = op->contr->mode;
1266
1267 if(!(i & PU_NEWMODE)) return;
1268
1269 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);
1270 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);
1271 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);
1272 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);
1273 1408
1274 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);
1275 1410
1276 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);
1277 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);
1278 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);
1279 1414
1280 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);
1281 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);
1282 1417
1283 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);
1284 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);
1285 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);
1286 1421
1287 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);
1288 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);
1289 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);
1290 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);
1291 1426
1292 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);
1293 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);
1294 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);
1295 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);
1296 1431
1297 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);
1298 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);
1299 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);
1300 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);
1301 1436
1302 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);
1303 1438
1304 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);
1305 1441
1306 new_draw_info_format(NDI_UNIQUE, 0,op,""); 1442 new_draw_info_format (NDI_UNIQUE, 0, op, "");
1307 } 1443}
1308 1444
1445int
1309int command_pickup (object *op, char *params) 1446command_pickup (object *op, char *params)
1310{ 1447{
1311 uint32 i; 1448 uint32 i;
1312 static const char* names[ ] = { 1449 static const char *names[] = {
1313 "debug", "inhibit", "stop", "food", "drink", "valuables", "bow", "arrow", "helmet", 1450 "debug", "inhibit", "stop", "food", "drink", "valuables", "bow", "arrow", "helmet",
1314 "shield", "armour", "boots", "gloves", "cloak", "key", "missile", "allweapon", 1451 "shield", "armour", "boots", "gloves", "cloak", "key", "missile", "allweapon",
1315 "magical", "potion", "spellbook", "skillscroll", "readables", "magicdevice", "notcursed", "jewels", NULL }; 1452 "magical", "potion", "spellbook", "skillscroll", "readables", "magicdevice", "notcursed",
1453 "jewels", "flesh", NULL
1454 };
1316 static uint32 modes[ ] = { 1455 static uint32 modes[] = {
1317 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,
1318 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,
1319 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 };
1320 1461
1321 if(!params) { 1462 if (!params)
1463 {
1322 /* if the new mode is used, just print the settings */ 1464 /* if the new mode is used, just print the settings */
1323 if(op->contr->mode & PU_NEWMODE) 1465 if (op->contr->mode & PU_NEWMODE)
1324 { 1466 {
1325 display_new_pickup( op ); 1467 display_new_pickup (op);
1326 return 1; 1468 return 1;
1327 } 1469 }
1470 if (1)
1328 if(1) LOG(llevDebug, "command_pickup: !params\n"); 1471 LOG (llevDebug, "command_pickup: !params\n");
1329 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);
1330 return 0; 1473 return 0;
1331 } 1474 }
1332 1475
1333 while ( *params == ' ' && *params ) 1476 while (*params == ' ' && *params)
1334 params++; 1477 params++;
1335 1478
1336 if ( *params == '+' || *params == '-' ) 1479 if (*params == '+' || *params == '-')
1337 { 1480 {
1338 int mode; 1481 int mode;
1482
1339 for ( mode = 0; names[ mode ]; mode++ ) 1483 for (mode = 0; names[mode]; mode++)
1340 { 1484 {
1341 if ( !strcmp( names[ mode ], params + 1 ) ) 1485 if (!strcmp (names[mode], params + 1))
1342 { 1486 {
1343 i = op->contr->mode; 1487 i = op->contr->mode;
1344 if ( !( i & PU_NEWMODE ) ) 1488 if (!(i & PU_NEWMODE))
1345 i = PU_NEWMODE; 1489 i = PU_NEWMODE;
1346 if ( *params == '+' ) 1490 if (*params == '+')
1347 i = i | modes[ mode ]; 1491 i = i | modes[mode];
1348 else 1492 else
1349 i = i & ~modes[ mode ]; 1493 i = i & ~modes[mode];
1350 op->contr->mode = i; 1494 op->contr->mode = i;
1351 display_new_pickup( op ); 1495 display_new_pickup (op);
1352 return 1; 1496 return 1;
1353 } 1497 }
1354 } 1498 }
1355 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);
1356 return 1; 1500 return 1;
1357 } 1501 }
1358 1502
1359 if(sscanf(params, "%u", &i) != 1) { 1503 if (sscanf (params, "%u", &i) != 1)
1504 {
1505 if (1)
1360 if(1) LOG(llevDebug, "command_pickup: params==NULL\n"); 1506 LOG (llevDebug, "command_pickup: params==NULL\n");
1361 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)
1362 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;
1363 } 1568 }
1364 set_pickup_mode(op,i); 1569 if ((int) strlen (params) >= MAX_BUF)
1365 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 ();
1366 return 1; 1578 return 1;
1367} 1579}
1368 1580
1369void set_pickup_mode(object *op,int i) {
1370 switch(op->contr->mode=i) {
1371 case 0:
1372 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Don't pick up.");
1373 break;
1374 case 1:
1375 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up one item.");
1376 break;
1377 case 2:
1378 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up one item and stop.");
1379 break;
1380 case 3:
1381 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Stop before picking up.");
1382 break;
1383 case 4:
1384 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up all items.");
1385 break;
1386 case 5:
1387 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up all items and stop.");
1388 break;
1389 case 6:
1390 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up all magic items.");
1391 break;
1392 case 7:
1393 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up all coins and gems");
1394 break;
1395 }
1396}
1397
1398int command_search_items (object *op, char *params)
1399{
1400 char buf[MAX_BUF];
1401
1402 if (settings.search_items == FALSE)
1403 return 1;
1404
1405 if(params == NULL) {
1406 if(op->contr->search_str[0]=='\0') {
1407 new_draw_info(NDI_UNIQUE, 0,op,"Example: search magic+1");
1408 new_draw_info(NDI_UNIQUE, 0,op,"Would automatically pick up all");
1409 new_draw_info(NDI_UNIQUE, 0,op,"items containing the word 'magic+1'.");
1410 return 1;
1411 }
1412 op->contr->search_str[0]='\0';
1413 new_draw_info(NDI_UNIQUE, 0,op,"Search mode turned off.");
1414 fix_player(op);
1415 return 1;
1416 }
1417 if((int)strlen(params) >= MAX_BUF) {
1418 new_draw_info(NDI_UNIQUE, 0,op,"Search string too long.");
1419 return 1;
1420 }
1421 strcpy(op->contr->search_str, params);
1422 sprintf(buf,"Searching for '%s'.",op->contr->search_str);
1423 new_draw_info(NDI_UNIQUE, 0,op,buf);
1424 fix_player(op);
1425 return 1;
1426}
1427
1428/*
1429 * Changing the custom name of an item
1430 *
1431 * Syntax is: rename <what object> to <new name>
1432 * if '<what object>' is omitted, marked object is used
1433 * if 'to <new name>' is omitted, custom name is cleared
1434 *
1435 * Names are considered for all purpose having a length <=127 (max length sent to client
1436 * by server) */
1437
1438int command_rename_item(object *op, char *params)
1439{
1440 char buf[VERY_BIG_BUF];
1441 int itemnumber;
1442 object *item = NULL;
1443 char *closebrace;
1444 size_t counter;
1445
1446 if (params) {
1447 /* Let's skip white spaces */
1448 while(' '==*params) params++;
1449
1450 /* Checking the first part */
1451 if ((itemnumber = atoi(params))!=0) {
1452 for (item = op->inv; item && ((item->count != (tag_t) itemnumber) || item->invisible); item = item->below);
1453 if (!item) {
1454 new_draw_info(NDI_UNIQUE,0,op,"Tried to rename an invalid item.");
1455 return 1;
1456 }
1457 while(isdigit(*params) || ' '==*params) params++;
1458 }
1459 else if ('<'==*params) {
1460 /* Got old name, let's get it & find appropriate matching item */
1461 closebrace=strchr(params,'>');
1462 if(!closebrace) {
1463 new_draw_info(NDI_UNIQUE,0,op,"Syntax error!");
1464 return 1;
1465 }
1466 /* Sanity check for buffer overruns */
1467 if((closebrace-params)>127) {
1468 new_draw_info(NDI_UNIQUE,0,op,"Old name too long (up to 127 characters allowed)!");
1469 return 1;
1470 }
1471 /* Copy the old name */
1472 strncpy(buf,params+1,closebrace-params-1);
1473 buf[closebrace-params-1]='\0';
1474
1475 /* Find best matching item */
1476 item=find_best_object_match(op,buf);
1477 if(!item) {
1478 new_draw_info(NDI_UNIQUE,0,op,"Could not find a matching item to rename.");
1479 return 1;
1480 }
1481
1482 /* Now need to move pointer to just after > */
1483 params=closebrace+1;
1484 while(' '==*params) params++;
1485
1486 } else {
1487 /* Use marked item */
1488 item=find_marked_object(op);
1489 if(!item) {
1490 new_draw_info(NDI_UNIQUE,0,op,"No marked item to rename.");
1491 return 1;
1492 }
1493 }
1494
1495 /* Now let's find the new name */
1496 if(!strncmp(params,"to ",3)) {
1497 params+=3;
1498 while(' '==*params) params++;
1499 if('<'!=*params) {
1500 new_draw_info(NDI_UNIQUE,0,op,"Syntax error, expecting < at start of new name!");
1501 return 1;
1502 }
1503 closebrace=strchr(params+1,'>');
1504 if(!closebrace) {
1505 new_draw_info(NDI_UNIQUE,0,op,"Syntax error, expecting > at end of new name!");
1506 return 1;
1507 }
1508
1509 /* Sanity check for buffer overruns */
1510 if((closebrace-params)>127) {
1511 new_draw_info(NDI_UNIQUE,0,op,"New name too long (up to 127 characters allowed)!");
1512 return 1;
1513 }
1514
1515 /* Copy the new name */
1516 strncpy(buf,params+1,closebrace-params-1);
1517 buf[closebrace-params-1]='\0';
1518
1519 /* Let's check it for weird characters */
1520 for(counter=0;counter<strlen(buf);counter++) {
1521 if(isalnum(buf[counter])) continue;
1522 if(' '==buf[counter]) continue;
1523 if('\''==buf[counter]) continue;
1524 if('+'==buf[counter]) continue;
1525 if('_'==buf[counter]) continue;
1526 if('-'==buf[counter]) continue;
1527
1528 /* If we come here, then the name contains an invalid character...
1529 tell the player & exit */
1530 new_draw_info(NDI_UNIQUE,0,op,"Invalid new name!");
1531 return 1;
1532 }
1533
1534 } else {
1535 /* If param contains something, then syntax error... */
1536 if(strlen(params)) {
1537 new_draw_info(NDI_UNIQUE,0,op,"Syntax error, expected 'to <' after old name!");
1538 return 1;
1539 }
1540 /* New name is empty */
1541 buf[0]='\0';
1542 }
1543 } else {
1544 /* Last case: params==NULL */
1545 item=find_marked_object(op);
1546 if(!item) {
1547 new_draw_info(NDI_UNIQUE,0,op,"No marked item to rename.");
1548 return 1;
1549 }
1550 buf[0]='\0';
1551 }
1552
1553 if (QUERY_FLAG(item, FLAG_UNPAID)) {
1554 new_draw_info(NDI_UNIQUE,0,op,"You can't rename an unpaid item! You should pay for it first.");
1555 return 1;
1556 }
1557
1558 /* Coming here, everything is fine... */
1559 if(!strlen(buf)) {
1560 /* Clear custom name */
1561 if(item->custom_name) {
1562 item->custom_name = 0;
1563
1564 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));
1565 esrv_update_item(UPD_NAME,op,item);
1566 } else {
1567 new_draw_info(NDI_UNIQUE,0,op,"This item has no custom name.");
1568 }
1569 } else {
1570 /* Set custom name */
1571 item->custom_name = buf;
1572
1573 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);
1574 esrv_update_item(UPD_NAME,op,item);
1575 }
1576
1577 return 1;
1578}

Diff Legend

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