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

Diff Legend

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