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.6 by root, Sat Aug 26 23:36:33 2006 UTC vs.
Revision 1.25 by root, Tue Dec 12 21:39:57 2006 UTC

1/*
2 * static char *rcsid_c_object_c =
3 * "$Id: c_object.C,v 1.6 2006/08/26 23:36:33 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) && is_player_inv (tmp) != 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 fix_player (op); /* 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 /* Lauwenmark: Handle for plugin drop event */ 699 if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
642 if (execute_event (tmp, EVENT_DROP, op, NULL, NULL, SCRIPT_FIX_ALL) != 0)
643 return; 700 return;
644 701
645 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP)) 702 if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
646 { 703 {
647 sprintf (buf, "You drop the %s.", query_name (tmp)); 704 sprintf (buf, "You drop the %s.", query_name (tmp));
648 new_draw_info (NDI_UNIQUE, 0, op, buf); 705 new_draw_info (NDI_UNIQUE, 0, op, buf);
649 new_draw_info (NDI_UNIQUE, 0, op, 706 new_draw_info (NDI_UNIQUE, 0, op, "The gods who lent it to you retrieves it.");
650 "The gods who lent it to you retrieves it.");
651 if (op->type == PLAYER) 707 if (op->type == PLAYER)
652 esrv_del_item (op->contr, tmp->count); 708 esrv_del_item (op->contr, tmp->count);
653 free_object (tmp); 709 tmp->destroy ();
654 fix_player (op); 710 fix_player (op);
655 return; 711 return;
656 } 712 }
657 713
658/* If SAVE_INTERVAL is commented out, we never want to save 714/* If SAVE_INTERVAL is commented out, we never want to save
… …
662 /* I'm not sure why there is a value check - since the save 718 /* I'm not sure why there is a value check - since the save
663 * is done every SAVE_INTERVAL seconds, why care the value 719 * is done every SAVE_INTERVAL seconds, why care the value
664 * of what he is dropping? 720 * of what he is dropping?
665 */ 721 */
666 if (op->type == PLAYER && !QUERY_FLAG (tmp, FLAG_UNPAID) && 722 if (op->type == PLAYER && !QUERY_FLAG (tmp, FLAG_UNPAID) &&
667 (tmp->nrof ? tmp->value * tmp->nrof : tmp->value > 2000) && 723 (tmp->nrof ? tmp->value * tmp->nrof : tmp->value > 2000) && (op->contr->last_save_time + SAVE_INTERVAL) <= time (NULL))
668 (op->contr->last_save_time + SAVE_INTERVAL) <= time (NULL))
669 { 724 {
670 save_player (op, 1); 725 save_player (op, 1);
671 op->contr->last_save_time = time (NULL); 726 op->contr->last_save_time = time (NULL);
672 } 727 }
673#endif /* SAVE_INTERVAL */ 728#endif /* SAVE_INTERVAL */
… …
676 esrv_del_item (op->contr, tmp->count); 731 esrv_del_item (op->contr, tmp->count);
677 732
678 /* Call this before we update the various windows/players. At least 733 /* Call this before we update the various windows/players. At least
679 * that we, we know the weight is correct. 734 * that we, we know the weight is correct.
680 */ 735 */
681 fix_player (op); /* This is overkill, fix_player() is called somewhere */ 736 fix_player (op); /* This is overkill, fix_player() is called somewhere */
682 /* in object.c */ 737 /* in object.c */
683 738
684 if (op->type == PLAYER) 739 if (op->type == PLAYER)
685 { 740 {
686 op->contr->socket.update_look = 1; 741 op->contr->socket.update_look = 1;
687 /* Need to update the weight for the player */ 742 /* Need to update the weight for the player */
688 esrv_send_item (op, op); 743 esrv_send_item (op, op);
689 } 744 }
690 745
691 for (floor = get_map_ob (op->map, op->x, op->y); floor; floor = floor->above) 746 for (floor = get_map_ob (op->map, op->x, op->y); floor; floor = floor->above)
692 if (execute_event (floor, EVENT_DROP_ON, op, tmp, NULL, SCRIPT_FIX_ALL)) 747 if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
693 return; 748 return;
694 749
695 if (floor 750 if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
696 && floor->type == SHOP_FLOOR
697 && !QUERY_FLAG (tmp, FLAG_UNPAID)
698 && tmp->type != MONEY)
699 sell_item (tmp, op); 751 sell_item (tmp, op);
700 752
701 tmp->x = op->x; 753 tmp->x = op->x;
702 tmp->y = op->y; 754 tmp->y = op->y;
703 755
704 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR); 756 insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
705} 757}
706 758
759void
707void drop(object *op, object *tmp) 760drop (object *op, object *tmp)
708{ 761{
709 /* Hopeful fix for disappearing objects when dropping from a container - 762 /* Hopeful fix for disappearing objects when dropping from a container -
710 * somehow, players get an invisible object in the container, and the 763 * somehow, players get an invisible object in the container, and the
711 * old logic would skip over invisible objects - works fine for the 764 * old logic would skip over invisible objects - works fine for the
712 * playes inventory, but drop inventory wants to use the next value. 765 * playes inventory, but drop inventory wants to use the next value.
713 */ 766 */
714 if (tmp->invisible) { 767 if (tmp->invisible)
768 {
715 /* if the following is the case, it must be in an container. */ 769 /* if the following is the case, it must be in an container. */
716 if (tmp->env && tmp->env->type != PLAYER) { 770 if (tmp->env && tmp->env->type != PLAYER)
771 {
717 /* Just toss the object - probably shouldn't be hanging 772 /* Just toss the object - probably shouldn't be hanging
718 * around anyways 773 * around anyways
719 */ 774 */
720 remove_ob(tmp); 775 tmp->remove ();
721 free_object(tmp); 776 tmp->destroy ();
722 return; 777 return;
723 } else { 778 }
779 else
780 {
724 while(tmp!=NULL && tmp->invisible) 781 while (tmp != NULL && tmp->invisible)
725 tmp=tmp->below; 782 tmp = tmp->below;
726 } 783 }
727 } 784 }
728 785
729 if (tmp==NULL) { 786 if (tmp == NULL)
787 {
730 new_draw_info(NDI_UNIQUE, 0,op,"You don't have anything to drop."); 788 new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
731 return; 789 return;
732 } 790 }
733 if (QUERY_FLAG(tmp, FLAG_INV_LOCKED)) { 791 if (QUERY_FLAG (tmp, FLAG_INV_LOCKED))
792 {
734 new_draw_info(NDI_UNIQUE, 0,op,"This item is locked"); 793 new_draw_info (NDI_UNIQUE, 0, op, "This item is locked");
735 return; 794 return;
736 } 795 }
737 if (QUERY_FLAG(tmp, FLAG_NO_DROP)) { 796 if (QUERY_FLAG (tmp, FLAG_NO_DROP))
797 {
738#if 0 798#if 0
739 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */ 799 /* Eneq(@csd.uu.se): Objects with NO_DROP defined can't be dropped. */
740 new_draw_info(NDI_UNIQUE, 0,op, "This item can't be dropped."); 800 new_draw_info (NDI_UNIQUE, 0, op, "This item can't be dropped.");
741#endif 801#endif
742 return; 802 return;
743 } 803 }
744 804
805 if (op->type == PLAYER)
806 {
807 if (op->contr->last_used == tmp && op->contr->last_used_id == tmp->count)
808 {
809 object *n = NULL;
810
811 if (tmp->below != NULL)
812 n = tmp->below;
813 else if (tmp->above != NULL)
814 n = tmp->above;
815 op->contr->last_used = n;
816 if (n != NULL)
817 op->contr->last_used_id = n->count;
818 else
819 op->contr->last_used_id = 0;
820 }
821 };
822
823 if (op->container)
824 {
745 if (op->type == PLAYER) 825 if (op->type == PLAYER)
746 { 826 {
747 if (op->contr->last_used==tmp && op->contr->last_used_id == tmp->count) { 827 put_object_in_sack (op, op->container, tmp, op->contr->count);
748 object *n=NULL; 828 }
749 if(tmp->below != NULL)
750 n = tmp->below;
751 else if(tmp->above != NULL)
752 n = tmp->above;
753 op->contr->last_used = n;
754 if (n != NULL)
755 op->contr->last_used_id = n->count;
756 else 829 else
757 op->contr->last_used_id = 0;
758 }
759 };
760
761 if (op->container) {
762 if (op->type == PLAYER)
763 { 830 {
764 put_object_in_sack (op, op->container, tmp, op->contr->count);
765 } else {
766 put_object_in_sack(op, op->container, tmp, 0); 831 put_object_in_sack (op, op->container, tmp, 0);
767 }; 832 };
768 } else { 833 }
834 else
835 {
769 if (op->type == PLAYER) 836 if (op->type == PLAYER)
770 { 837 {
771 drop_object (op, tmp, op->contr->count); 838 drop_object (op, tmp, op->contr->count);
839 }
772 } else { 840 else
841 {
773 drop_object(op,tmp,0); 842 drop_object (op, tmp, 0);
774 }; 843 };
775 } 844 }
776 if (op->type == PLAYER) 845 if (op->type == PLAYER)
777 op->contr->count = 0; 846 op->contr->count = 0;
778} 847}
779 848
780 849
781 850
782/* Command will drop all items that have not been locked */ 851/* Command will drop all items that have not been locked */
852int
783int command_dropall (object *op, char *params) { 853command_dropall (object *op, char *params)
854{
784 855
785 object * curinv, *nextinv; 856 object *curinv, *nextinv;
786 857
787 if(op->inv == NULL) { 858 if (op->inv == NULL)
859 {
788 new_draw_info(NDI_UNIQUE, 0,op,"Nothing to drop!"); 860 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop!");
789 return 0; 861 return 0;
790 } 862 }
791 863
792 curinv = op->inv; 864 curinv = op->inv;
793 865
794 /* 866 /*
795 This is the default. Drops everything not locked or considered 867 This is the default. Drops everything not locked or considered
796 not something that should be dropped. 868 not something that should be dropped.
797 */ 869 */
798 /* 870 /*
799 Care must be taken that the next item pointer is not to money as 871 Care must be taken that the next item pointer is not to money as
800 the drop() routine will do unknown things to it when dropping 872 the drop() routine will do unknown things to it when dropping
801 in a shop. --Tero.Pelander@utu.fi 873 in a shop. --Tero.Pelander@utu.fi
802 */ 874 */
803 875
804 if(params==NULL) { 876 if (params == NULL)
877 {
805 while(curinv != NULL) { 878 while (curinv != NULL)
879 {
806 nextinv = curinv->below; 880 nextinv = curinv->below;
807 while (nextinv && nextinv->type==MONEY) 881 while (nextinv && nextinv->type == MONEY)
808 nextinv = nextinv->below; 882 nextinv = nextinv->below;
809 if(! QUERY_FLAG(curinv,FLAG_INV_LOCKED) && curinv->type != MONEY && 883 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
810 curinv->type != FOOD && curinv->type != KEY && 884 curinv->type != FOOD && curinv->type != KEY &&
811 curinv->type != SPECIAL_KEY && curinv->type != GEM && 885 curinv->type != SPECIAL_KEY && curinv->type != GEM &&
812 !curinv->invisible && 886 !curinv->invisible && (curinv->type != CONTAINER || op->container != curinv))
813 (curinv->type!=CONTAINER || op->container!=curinv)) 887 {
814 { 888 drop (op, curinv);
815 drop(op,curinv); 889 }
890 curinv = nextinv;
816 } 891 }
817 curinv = nextinv;
818 }
819 } 892 }
820 893
821 else if(strcmp(params, "weapons") == 0) { 894 else if (strcmp (params, "weapons") == 0)
895 {
822 while(curinv != NULL) { 896 while (curinv != NULL)
897 {
823 nextinv = curinv->below; 898 nextinv = curinv->below;
824 while (nextinv && nextinv->type==MONEY) 899 while (nextinv && nextinv->type == MONEY)
825 nextinv = nextinv->below; 900 nextinv = nextinv->below;
826 if(! QUERY_FLAG(curinv,FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || 901 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == WEAPON) || (curinv->type == BOW) || (curinv->type == ARROW)))
827 (curinv->type == BOW) || (curinv->type == ARROW))) 902 {
828 { 903 drop (op, curinv);
829 drop(op,curinv); 904 }
830 }
831 curinv = nextinv; 905 curinv = nextinv;
832 } 906 }
833 } 907 }
834 908
835 else if(strcmp(params, "armor") == 0 || strcmp(params, "armour") == 0) { 909 else if (strcmp (params, "armor") == 0 || strcmp (params, "armour") == 0)
910 {
836 while(curinv != NULL) { 911 while (curinv != NULL)
912 {
837 nextinv = curinv->below; 913 nextinv = curinv->below;
838 while (nextinv && nextinv->type==MONEY) 914 while (nextinv && nextinv->type == MONEY)
839 nextinv = nextinv->below; 915 nextinv = nextinv->below;
840 if(! QUERY_FLAG(curinv,FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || 916 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && ((curinv->type == ARMOUR) || curinv->type == SHIELD || curinv->type == HELMET))
841 curinv->type == SHIELD || curinv->type==HELMET)) 917 {
842 { 918 drop (op, curinv);
843 drop(op,curinv); 919 }
844 }
845 curinv = nextinv; 920 curinv = nextinv;
846 } 921 }
847 } 922 }
848 923
849 else if(strcmp(params, "misc") == 0) { 924 else if (strcmp (params, "misc") == 0)
925 {
850 while(curinv != NULL) { 926 while (curinv != NULL)
927 {
851 nextinv = curinv->below; 928 nextinv = curinv->below;
852 while (nextinv && nextinv->type==MONEY) 929 while (nextinv && nextinv->type == MONEY)
853 nextinv = nextinv->below; 930 nextinv = nextinv->below;
854 if(! QUERY_FLAG(curinv,FLAG_INV_LOCKED) && ! QUERY_FLAG(curinv,FLAG_APPLIED)) { 931 if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && !QUERY_FLAG (curinv, FLAG_APPLIED))
855 switch(curinv->type) { 932 {
856 case HORN: 933 switch (curinv->type)
857 case BOOK: 934 {
858 case SPELLBOOK: 935 case HORN:
859 case GIRDLE: 936 case BOOK:
860 case AMULET: 937 case SPELLBOOK:
861 case RING: 938 case GIRDLE:
862 case CLOAK: 939 case AMULET:
863 case BOOTS: 940 case RING:
864 case GLOVES: 941 case CLOAK:
865 case BRACERS: 942 case BOOTS:
866 case SCROLL: 943 case GLOVES:
867 case ARMOUR_IMPROVER: 944 case BRACERS:
868 case WEAPON_IMPROVER: 945 case SCROLL:
869 case WAND: 946 case ARMOUR_IMPROVER:
870 case ROD: 947 case WEAPON_IMPROVER:
871 case POTION: 948 case WAND:
872 drop(op,curinv); 949 case ROD:
873 curinv = nextinv; 950 case POTION:
874 break; 951 drop (op, curinv);
875 default: 952 curinv = nextinv;
876 curinv = nextinv; 953 break;
877 break; 954 default:
878 } 955 curinv = nextinv;
879 } 956 break;
957 }
958 }
880 curinv = nextinv; 959 curinv = nextinv;
881 } 960 }
882 } 961 }
883 op->contr->socket.update_look=1; 962 op->contr->socket.update_look = 1;
963
884/* draw_look(op);*/ 964/* draw_look(op);*/
885 return 0; 965 return 0;
886} 966}
887 967
888/* Object op wants to drop object(s) params. params can be a 968/* Object op wants to drop object(s) params. params can be a
889 * comma seperated list. 969 * comma seperated list.
890 */ 970 */
891 971
972int
892int command_drop (object *op, char *params) 973command_drop (object *op, char *params)
893{ 974{
894 object *tmp, *next; 975 object *tmp, *next;
895 int did_one=0; 976 int did_one = 0;
896 977
897 if (!params) { 978 if (!params)
979 {
898 new_draw_info(NDI_UNIQUE,0, op, "Drop what?"); 980 new_draw_info (NDI_UNIQUE, 0, op, "Drop what?");
899 return 0; 981 return 0;
900 } else {
901 for (tmp=op->inv; tmp; tmp=next) {
902 next=tmp->below;
903 if (QUERY_FLAG(tmp,FLAG_NO_DROP) ||
904 tmp->invisible) continue;
905 if (item_matched_string(op,tmp,params)) {
906 drop(op, tmp);
907 did_one=1;
908 } 982 }
909 } 983 else
984 {
985 for (tmp = op->inv; tmp; tmp = next)
986 {
987 next = tmp->below;
988 if (QUERY_FLAG (tmp, FLAG_NO_DROP) || tmp->invisible)
989 continue;
990 if (item_matched_string (op, tmp, params))
991 {
992 drop (op, tmp);
993 did_one = 1;
994 }
995 }
996 if (!did_one)
910 if (!did_one) new_draw_info(NDI_UNIQUE, 0,op,"Nothing to drop."); 997 new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
911 } 998 }
912 if (op->type==PLAYER) 999 if (op->type == PLAYER)
913 { 1000 {
914 op->contr->count=0; 1001 op->contr->count = 0;
915 op->contr->socket.update_look=1; 1002 op->contr->socket.update_look = 1;
916 }; 1003 };
1004
917/* draw_look(op);*/ 1005/* draw_look(op);*/
918 return 0; 1006 return 0;
919} 1007}
920 1008
1009int
921int command_examine (object *op, char *params) 1010command_examine (object *op, char *params)
922{ 1011{
923 if (!params) { 1012 if (!params)
1013 {
924 object *tmp=op->below; 1014 object *tmp = op->below;
1015
925 while (tmp && !LOOK_OBJ(tmp)) tmp=tmp->below; 1016 while (tmp && !LOOK_OBJ (tmp))
926 if (tmp) examine(op,tmp); 1017 tmp = tmp->below;
927 }
928 else {
929 object *tmp=find_best_object_match(op,params);
930 if (tmp) 1018 if (tmp)
931 examine(op,tmp); 1019 examine (op, tmp);
1020 }
1021 else
1022 {
1023 object *tmp = find_best_object_match (op, params);
1024
1025 if (tmp)
1026 examine (op, tmp);
932 else 1027 else
933 new_draw_info_format(NDI_UNIQUE,0,op,"Could not find an object that matches %s",params); 1028 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params);
934 } 1029 }
935 return 0; 1030 return 0;
936} 1031}
937 1032
938/* op should be a player. 1033/* op should be a player.
939 * we return the object the player has marked with the 'mark' command 1034 * we return the object the player has marked with the 'mark' command
940 * below. If no match is found (or object has changed), we return 1035 * below. If no match is found (or object has changed), we return
941 * NULL. We leave it up to the calling function to print messages if 1036 * NULL. We leave it up to the calling function to print messages if
942 * nothing is found. 1037 * nothing is found.
943 */ 1038 */
1039object *
944object *find_marked_object(object *op) 1040find_marked_object (object *op)
945{ 1041{
946 object *tmp; 1042 object *tmp;
947 1043
948 if (!op || !op->contr) return NULL; 1044 if (!op || !op->contr)
1045 return NULL;
1046
949 if (!op->contr->mark) { 1047 if (!op->contr->mark)
1048 {
950/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/ 1049/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
951 return NULL; 1050 return 0;
952 } 1051 }
1052
953 /* This may seem like overkill, but we need to make sure that they 1053 /* This may seem like overkill, but we need to make sure that they
954 * player hasn't dropped the item. We use count on the off chance that 1054 * player hasn't dropped the item. We use count on the off chance that
955 * an item got reincarnated at some point. 1055 * an item got reincarnated at some point.
956 */ 1056 */
957 for (tmp=op->inv; tmp; tmp=tmp->below) { 1057 for (tmp = op->inv; tmp; tmp = tmp->below)
958 if (tmp->invisible) continue; 1058 {
1059 if (tmp->invisible)
1060 continue;
1061
959 if (tmp == op->contr->mark) { 1062 if (tmp == op->contr->mark)
960 if (tmp->count == op->contr->mark_count) 1063 {
961 return tmp; 1064 if (!tmp->destroyed ())
962 else { 1065 return tmp;
963 op->contr->mark=NULL; 1066 else
964 op->contr->mark_count=0; 1067 {
1068 op->contr->mark = 0;
965/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/ 1069/* new_draw_info(NDI_UNIQUE,0,op,"You have no marked object");*/
966 return NULL; 1070 return 0;
1071 }
1072 }
967 } 1073 }
968 } 1074
969 } 1075 return 0;
970 return NULL;
971} 1076}
972 1077
973 1078
974/* op should be a player, params is any params. 1079/* op should be a player, params is any params.
975 * If no params given, we print out the currently marked object. 1080 * If no params given, we print out the currently marked object.
976 * otherwise, try to find a matching object - try best match first. 1081 * otherwise, try to find a matching object - try best match first.
977 */ 1082 */
1083int
978int command_mark(object *op, char *params) 1084command_mark (object *op, char *params)
979{ 1085{
980 if (!op->contr) return 1; 1086 if (!op->contr)
981 if (!params) {
982 object *mark=find_marked_object(op);
983 if (!mark) new_draw_info(NDI_UNIQUE,0,op,"You have no marked object.");
984 else new_draw_info_format(NDI_UNIQUE,0,op,"%s is marked.", query_name(mark));
985 }
986 else {
987 object *mark1=find_best_object_match(op, params);
988 if (!mark1) {
989 new_draw_info_format(NDI_UNIQUE,0,op,"Could not find an object that matches %s",params);
990 return 1; 1087 return 1;
991 } 1088
992 else { 1089 if (!params)
1090 {
1091 object *mark = find_marked_object (op);
1092
1093 if (!mark)
1094 new_draw_info (NDI_UNIQUE, 0, op, "You have no marked object.");
1095 else
1096 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is marked.", query_name (mark));
1097 }
1098 else
1099 {
1100 object *mark1 = find_best_object_match (op, params);
1101
1102 if (!mark1)
1103 {
1104 new_draw_info_format (NDI_UNIQUE, 0, op, "Could not find an object that matches %s", params);
1105 return 1;
1106 }
1107 else
1108 {
993 op->contr->mark=mark1; 1109 op->contr->mark = mark1;
994 op->contr->mark_count=mark1->count;
995 new_draw_info_format(NDI_UNIQUE,0,op,"Marked item %s", query_name(mark1)); 1110 new_draw_info_format (NDI_UNIQUE, 0, op, "Marked item %s", query_name (mark1));
996 return 0; 1111 return 0;
997 } 1112 }
998 } 1113 }
999 return 0; /*shouldnt get here */ 1114
1115 return 0; /*shouldnt get here */
1000} 1116}
1001 1117
1002 1118
1003/* op is the player 1119/* op is the player
1004 * tmp is the monster being examined. 1120 * tmp is the monster being examined.
1005 */ 1121 */
1122void
1006void examine_monster(object *op,object *tmp) { 1123examine_monster (object *op, object *tmp)
1124{
1007 object *mon=tmp->head?tmp->head:tmp; 1125 object *mon = tmp->head ? tmp->head : tmp;
1008 1126
1009 if(QUERY_FLAG(mon,FLAG_UNDEAD)) 1127 if (QUERY_FLAG (mon, FLAG_UNDEAD))
1010 new_draw_info(NDI_UNIQUE, 0,op,"It is an undead force."); 1128 new_draw_info (NDI_UNIQUE, 0, op, "It is an undead force.");
1011 if(mon->level>op->level) 1129 if (mon->level > op->level)
1012 new_draw_info(NDI_UNIQUE, 0,op,"It is likely more powerful than you."); 1130 new_draw_info (NDI_UNIQUE, 0, op, "It is likely more powerful than you.");
1013 else if(mon->level<op->level) 1131 else if (mon->level < op->level)
1014 new_draw_info(NDI_UNIQUE, 0,op,"It is likely less powerful than you."); 1132 new_draw_info (NDI_UNIQUE, 0, op, "It is likely less powerful than you.");
1015 else 1133 else
1016 new_draw_info(NDI_UNIQUE, 0,op,"It is probably as powerful as you."); 1134 new_draw_info (NDI_UNIQUE, 0, op, "It is probably as powerful as you.");
1017 if(mon->attacktype&AT_ACID) 1135 if (mon->attacktype & AT_ACID)
1018 new_draw_info(NDI_UNIQUE, 0,op,"You seem to smell an acrid odor."); 1136 new_draw_info (NDI_UNIQUE, 0, op, "You seem to smell an acrid odor.");
1019 1137
1020 /* Anyone know why this used to use the clone value instead of the 1138 /* Anyone know why this used to use the clone value instead of the
1021 * maxhp field? This seems that it should give more accurate results. 1139 * maxhp field? This seems that it should give more accurate results.
1022 */ 1140 */
1023 switch((mon->stats.hp+1)*4/(mon->stats.maxhp+1)) { /* From 1-4 */ 1141 switch ((mon->stats.hp + 1) * 4 / (mon->stats.maxhp + 1))
1024 case 1: 1142 { /* From 1-4 */
1143 case 1:
1025 new_draw_info(NDI_UNIQUE, 0,op,"It is in a bad shape."); 1144 new_draw_info (NDI_UNIQUE, 0, op, "It is in a bad shape.");
1026 break; 1145 break;
1027 case 2: 1146 case 2:
1028 new_draw_info(NDI_UNIQUE, 0,op,"It is hurt."); 1147 new_draw_info (NDI_UNIQUE, 0, op, "It is hurt.");
1029 break; 1148 break;
1030 case 3: 1149 case 3:
1031 new_draw_info(NDI_UNIQUE, 0,op,"It is somewhat hurt."); 1150 new_draw_info (NDI_UNIQUE, 0, op, "It is somewhat hurt.");
1032 break; 1151 break;
1033 case 4: 1152 case 4:
1034 new_draw_info(NDI_UNIQUE, 0,op,"It is in excellent shape."); 1153 new_draw_info (NDI_UNIQUE, 0, op, "It is in excellent shape.");
1035 break; 1154 break;
1036 } 1155 }
1037 if(present_in_ob(POISONING,mon)!=NULL) 1156 if (present_in_ob (POISONING, mon) != NULL)
1038 new_draw_info(NDI_UNIQUE, 0,op,"It looks very ill."); 1157 new_draw_info (NDI_UNIQUE, 0, op, "It looks very ill.");
1039} 1158}
1040 1159
1041 1160
1042/* tmp is the object being described, pl is who is examing it. */ 1161/* tmp is the object being described, pl is who is examing it. */
1162char *
1043char *long_desc(object *tmp, object *pl) { 1163long_desc (object *tmp, object *pl)
1164{
1044 static char buf[VERY_BIG_BUF]; 1165 static char buf[VERY_BIG_BUF];
1045 char *cp; 1166 char *cp;
1046 1167
1047 if(tmp==NULL) 1168 if (tmp == NULL)
1048 return ""; 1169 return "";
1049 1170
1050 buf[0]='\0'; 1171 buf[0] = '\0';
1051 switch(tmp->type) { 1172 switch (tmp->type)
1052 case RING: 1173 {
1174 case RING:
1053 case SKILL: 1175 case SKILL:
1054 case WEAPON: 1176 case WEAPON:
1055 case ARMOUR: 1177 case ARMOUR:
1056 case BRACERS: 1178 case BRACERS:
1057 case HELMET: 1179 case HELMET:
1058 case SHIELD: 1180 case SHIELD:
1059 case BOOTS: 1181 case BOOTS:
1060 case GLOVES: 1182 case GLOVES:
1061 case AMULET: 1183 case AMULET:
1062 case GIRDLE: 1184 case GIRDLE:
1063 case BOW: 1185 case BOW:
1064 case ARROW: 1186 case ARROW:
1065 case CLOAK: 1187 case CLOAK:
1066 case FOOD: 1188 case FOOD:
1067 case DRINK: 1189 case DRINK:
1068 case FLESH: 1190 case FLESH:
1069 case SKILL_TOOL: 1191 case SKILL_TOOL:
1070 case POWER_CRYSTAL: 1192 case POWER_CRYSTAL:
1071 if(*(cp=describe_item(tmp, pl))!='\0') { 1193 if (*(cp = describe_item (tmp, pl)) != '\0')
1072 int len; 1194 {
1195 int len;
1073 1196
1074 strncpy(buf,query_name(tmp), VERY_BIG_BUF-1); 1197 assign (buf, query_name (tmp));
1075 buf[VERY_BIG_BUF-1]=0; 1198 len = strlen (buf);
1076 len=strlen(buf); 1199 if (len < VERY_BIG_BUF - 5)
1077 if (len<VERY_BIG_BUF-5) { 1200 {
1078 /* Since we know the length, we save a few cpu cycles by using 1201 /* Since we know the length, we save a few cpu cycles by using
1079 * it instead of calling strcat */ 1202 * it instead of calling strcat */
1080 strcpy(buf+len," "); 1203 strcpy (buf + len, " ");
1081 len++; 1204 len++;
1082 strncpy(buf+len, cp, VERY_BIG_BUF-len-1); 1205 assign (buf + len, cp, VERY_BIG_BUF - len - 1);
1083 buf[VERY_BIG_BUF-1]=0; 1206 }
1084 } 1207 }
1085 } 1208 }
1086 } 1209
1087 if(buf[0]=='\0') { 1210 if (buf[0] == '\0')
1088 strncpy(buf,query_name(tmp), VERY_BIG_BUF-1); 1211 assign (buf, query_name (tmp));
1089 buf[VERY_BIG_BUF-1]=0;
1090 }
1091 1212
1092 return buf; 1213 return buf;
1093} 1214}
1094 1215
1216void
1095void examine(object *op, object *tmp) { 1217examine (object *op, object *tmp)
1218{
1096 char buf[VERY_BIG_BUF]; 1219 char buf[VERY_BIG_BUF];
1097 int i; 1220 int i;
1098 1221
1099 if (tmp == NULL || tmp->type == CLOSE_CON) 1222 if (tmp == NULL || tmp->type == CLOSE_CON)
1100 return; 1223 return;
1101 1224
1102 strcpy(buf,"That is "); 1225 strcpy (buf, "That is ");
1103 strncat(buf, long_desc(tmp, op), VERY_BIG_BUF-strlen(buf)-1); 1226 strncat (buf, long_desc (tmp, op), VERY_BIG_BUF - strlen (buf) - 1);
1104 buf[VERY_BIG_BUF-1]=0; 1227 buf[VERY_BIG_BUF - 1] = 0;
1105 1228
1106 new_draw_info(NDI_UNIQUE, 0,op,buf); 1229 new_draw_info (NDI_UNIQUE, 0, op, buf);
1107 buf[0]='\0'; 1230 buf[0] = '\0';
1108 1231
1109 if(tmp->custom_name) { 1232 if (tmp->custom_name)
1233 {
1110 strcpy(buf,"You call it "); 1234 strcpy (buf, "You call it ");
1111 strncat(buf, tmp->custom_name, VERY_BIG_BUF-strlen(buf)-1); 1235 strncat (buf, tmp->custom_name, VERY_BIG_BUF - strlen (buf) - 1);
1112 buf[VERY_BIG_BUF-1]=0; 1236 buf[VERY_BIG_BUF - 1] = 0;
1113 new_draw_info(NDI_UNIQUE, 0,op,buf); 1237 new_draw_info (NDI_UNIQUE, 0, op, buf);
1114 buf[0]='\0'; 1238 buf[0] = '\0';
1115 } 1239 }
1116 1240
1117 switch(tmp->type) { 1241 switch (tmp->type)
1242 {
1118 case SPELLBOOK: 1243 case SPELLBOOK:
1119 if(QUERY_FLAG(tmp, FLAG_IDENTIFIED) && tmp->inv ) { 1244 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) && tmp->inv)
1120 sprintf(buf,"%s is a %s level %s spell", 1245 {
1121 tmp->inv->name, get_levelnumber(tmp->inv->level), 1246 sprintf (buf, "%s is a %s level %s spell", &tmp->inv->name, get_levelnumber (tmp->inv->level), &tmp->inv->skill);
1122 tmp->inv->skill); 1247 }
1123 }
1124 break; 1248 break;
1125 1249
1126 case BOOK: 1250 case BOOK:
1127 if(tmp->msg!=NULL) 1251 if (tmp->msg != NULL)
1128 strcpy(buf,"Something is written in it."); 1252 strcpy (buf, "Something is written in it.");
1129 break; 1253 break;
1130 1254
1131 case CONTAINER: 1255 case CONTAINER:
1132 if(tmp->race!=NULL) { 1256 if (tmp->race != NULL)
1257 {
1133 if(tmp->weight_limit && tmp->stats.Str<100) 1258 if (tmp->weight_limit && tmp->stats.Str < 100)
1134 sprintf (buf,"It can hold only %s and its weight limit is %.1f kg.", 1259 sprintf (buf, "It can hold only %s and its weight limit is %.1f kg.",
1135 tmp->race, tmp->weight_limit/(10.0 * (100 - tmp->stats.Str))); 1260 &tmp->race, tmp->weight_limit / (10.0 * (100 - tmp->stats.Str)));
1136 else 1261 else
1137 sprintf (buf,"It can hold only %s.", tmp->race); 1262 sprintf (buf, "It can hold only %s.", &tmp->race);
1138 } else 1263 }
1139 if(tmp->weight_limit && tmp->stats.Str<100) 1264 else if (tmp->weight_limit && tmp->stats.Str < 100)
1140 sprintf (buf,"Its weight limit is %.1f kg.", 1265 sprintf (buf, "Its weight limit is %.1f kg.", tmp->weight_limit / (10.0 * (100 - tmp->stats.Str)));
1141 tmp->weight_limit/(10.0 * (100 - tmp->stats.Str)));
1142 break; 1266 break;
1143 1267
1144 case WAND: 1268 case WAND:
1145 if(QUERY_FLAG(tmp, FLAG_IDENTIFIED)) 1269 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1146 sprintf(buf,"It has %d charges left.",tmp->stats.food); 1270 sprintf (buf, "It has %d charges left.", tmp->stats.food);
1147 break; 1271 break;
1148 } 1272 }
1149 1273
1150 if(buf[0]!='\0') 1274 if (buf[0] != '\0')
1151 new_draw_info(NDI_UNIQUE, 0,op,buf); 1275 new_draw_info (NDI_UNIQUE, 0, op, buf);
1152 1276
1153 if(tmp->materialname != NULL && !tmp->msg) { 1277 if (tmp->materialname != NULL && !tmp->msg)
1278 {
1154 sprintf(buf, "It is made of: %s.", tmp->materialname); 1279 sprintf (buf, "It is made of: %s.", &tmp->materialname);
1155 new_draw_info(NDI_UNIQUE, 0, op, buf); 1280 new_draw_info (NDI_UNIQUE, 0, op, buf);
1156 } 1281 }
1157 /* Where to wear this item */ 1282 /* Where to wear this item */
1158 for (i=0; i < NUM_BODY_LOCATIONS; i++) { 1283 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1284 {
1159 if (tmp->body_info[i]<-1) { 1285 if (tmp->body_info[i] < -1)
1286 {
1160 if (op->body_info[i]) 1287 if (op->body_info[i])
1161 new_draw_info_format(NDI_UNIQUE, 0,op, 1288 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s (%d)", body_locations[i].use_name, -tmp->body_info[i]);
1162 "It goes %s (%d)", body_locations[i].use_name, -tmp->body_info[i]); 1289 else
1163 else 1290 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].nonuse_name);
1164 new_draw_info_format(NDI_UNIQUE, 0,op, 1291 }
1165 "It goes %s", body_locations[i].nonuse_name);
1166 } else if (tmp->body_info[i]) { 1292 else if (tmp->body_info[i])
1293 {
1167 if (op->body_info[i]) 1294 if (op->body_info[i])
1168 new_draw_info_format(NDI_UNIQUE, 0,op, 1295 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].use_name);
1169 "It goes %s", body_locations[i].use_name); 1296 else
1170 else 1297 new_draw_info_format (NDI_UNIQUE, 0, op, "It goes %s", body_locations[i].nonuse_name);
1171 new_draw_info_format(NDI_UNIQUE, 0,op, 1298 }
1172 "It goes %s", body_locations[i].nonuse_name);
1173 }
1174 } 1299 }
1175 1300
1176 if(tmp->weight) { 1301 if (tmp->weight)
1177 sprintf(buf,tmp->nrof>1?"They weigh %3.3f kg.":"It weighs %3.3f kg.", 1302 {
1178 tmp->weight*(tmp->nrof?tmp->nrof:1)/1000.0); 1303 sprintf (buf, tmp->nrof > 1 ? "They weigh %3.3f kg." : "It weighs %3.3f kg.", tmp->weight * (tmp->nrof ? tmp->nrof : 1) / 1000.0);
1179 new_draw_info(NDI_UNIQUE, 0,op,buf); 1304 new_draw_info (NDI_UNIQUE, 0, op, buf);
1180 } 1305 }
1181 1306
1182 if (tmp->value && !QUERY_FLAG(tmp, FLAG_STARTEQUIP) && !QUERY_FLAG(tmp, FLAG_NO_PICK)) { 1307 if (tmp->value && !QUERY_FLAG (tmp, FLAG_STARTEQUIP) && !QUERY_FLAG (tmp, FLAG_NO_PICK))
1183 object *floor; 1308 {
1184 sprintf(buf,"You reckon %s worth %s.", 1309 sprintf (buf, "You reckon %s worth %s.", tmp->nrof > 1 ? "they are" : "it is", query_cost_string (tmp, op, F_TRUE | F_APPROX));
1185 tmp->nrof>1?"they are":"it is",query_cost_string(tmp,op, F_TRUE | F_APPROX));
1186 new_draw_info(NDI_UNIQUE, 0,op,buf);
1187 floor = get_map_ob (op->map, op->x, op->y);
1188 if (floor && floor->type == SHOP_FLOOR) {
1189 if(QUERY_FLAG(tmp, FLAG_UNPAID))
1190 sprintf(buf,"%s would cost you %s.",
1191 tmp->nrof>1?"They":"It",query_cost_string(tmp,op,F_BUY | F_SHOP));
1192 else
1193 sprintf(buf,"You are offered %s for %s.",
1194 query_cost_string(tmp,op,F_SELL+F_SHOP), tmp->nrof>1?"them":"it");
1195 new_draw_info(NDI_UNIQUE, 0,op,buf); 1310 new_draw_info (NDI_UNIQUE, 0, op, buf);
1196 } 1311 if (is_in_shop (op))
1312 {
1313 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1314 sprintf (buf, "%s would cost you %s.", tmp->nrof > 1 ? "They" : "It", query_cost_string (tmp, op, F_BUY | F_SHOP));
1315 else
1316 sprintf (buf, "You are offered %s for %s.", query_cost_string (tmp, op, F_SELL + F_SHOP), tmp->nrof > 1 ? "them" : "it");
1317 new_draw_info (NDI_UNIQUE, 0, op, buf);
1318 }
1197 } 1319 }
1198 1320
1199 if(QUERY_FLAG(tmp, FLAG_MONSTER)) 1321 if (QUERY_FLAG (tmp, FLAG_MONSTER))
1200 examine_monster(op,tmp); 1322 examine_monster (op, tmp);
1201 1323
1202 /* Is this item buildable? */ 1324 /* Is this item buildable? */
1203 if ( QUERY_FLAG( tmp, FLAG_IS_BUILDABLE ) ) 1325 if (QUERY_FLAG (tmp, FLAG_IS_BUILDABLE))
1204 new_draw_info( NDI_UNIQUE, 0, op, "This is a buildable item." ); 1326 new_draw_info (NDI_UNIQUE, 0, op, "This is a buildable item.");
1205 1327
1206 /* Does the object have a message? Don't show message for all object 1328 /* Does the object have a message? Don't show message for all object
1207 * types - especially if the first entry is a match 1329 * types - especially if the first entry is a match
1208 */ 1330 */
1209 if(tmp->msg && tmp->type != EXIT && tmp->type != BOOK && 1331 if (tmp->msg && tmp->type != EXIT && tmp->type != BOOK && tmp->type != CORPSE && !tmp->move_on && strncasecmp (tmp->msg, "@match", 7))
1210 tmp->type != CORPSE && !tmp->move_on && 1332 {
1211 strncasecmp(tmp->msg, "@match",7)) {
1212 1333
1213 /* This is just a hack so when identifying the items, we print 1334 /* This is just a hack so when identifying the items, we print
1214 * out the extra message 1335 * out the extra message
1215 */ 1336 */
1216 if (need_identify(tmp) && QUERY_FLAG(tmp, FLAG_IDENTIFIED)) 1337 if (need_identify (tmp) && QUERY_FLAG (tmp, FLAG_IDENTIFIED))
1217 new_draw_info(NDI_UNIQUE, 0,op, "The object has a story:"); 1338 new_draw_info (NDI_UNIQUE, 0, op, "The object has a story:");
1218 1339
1219 new_draw_info(NDI_UNIQUE, 0,op,tmp->msg); 1340 new_draw_info (NDI_UNIQUE, 0, op, tmp->msg);
1220 } 1341 }
1221 new_draw_info(NDI_UNIQUE, 0,op," "); /* Blank line */ 1342 new_draw_info (NDI_UNIQUE, 0, op, " "); /* Blank line */
1222} 1343}
1223 1344
1224/* 1345/*
1225 * inventory prints object's inventory. If inv==NULL then print player's 1346 * inventory prints object's inventory. If inv==NULL then print player's
1226 * inventory. 1347 * inventory.
1227 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ] 1348 * [ Only items which are applied are showed. Tero.Haatanen@lut.fi ]
1228 */ 1349 */
1350void
1229void inventory(object *op,object *inv) { 1351inventory (object *op, object *inv)
1352{
1230 object *tmp; 1353 object *tmp;
1231 char *in; 1354 char *in;
1232 int items = 0, length; 1355 int items = 0, length;
1233 1356
1234 if (inv==NULL && op==NULL) { 1357 if (inv == NULL && op == NULL)
1358 {
1235 new_draw_info(NDI_UNIQUE, 0,op,"Inventory of what object?"); 1359 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object?");
1360 return;
1361 }
1362 tmp = inv ? inv->inv : op->inv;
1363
1364 while (tmp)
1365 {
1366 if ((!tmp->invisible &&
1367 (inv == NULL || inv->type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED))) || (!op || QUERY_FLAG (op, FLAG_WIZ)))
1368 items++;
1369 tmp = tmp->below;
1370 }
1371 if (inv == NULL)
1372 { /* player's inventory */
1373 if (items == 0)
1374 {
1375 new_draw_info (NDI_UNIQUE, 0, op, "You carry nothing.");
1376 return;
1377 }
1378 else
1379 {
1380 length = 28;
1381 in = "";
1382 if (op)
1383 clear_win_info (op);
1384 new_draw_info (NDI_UNIQUE, 0, op, "Inventory:");
1385 }
1386 }
1387 else
1388 {
1389 if (items == 0)
1390 return;
1391 else
1392 {
1393 length = 28;
1394 in = " ";
1395 }
1396 }
1397 for (tmp = inv ? inv->inv : op->inv; tmp; tmp = tmp->below)
1398 {
1399 if ((!op || !QUERY_FLAG (op, FLAG_WIZ)) && (tmp->invisible || (inv && inv->type != CONTAINER && !QUERY_FLAG (tmp, FLAG_APPLIED))))
1400 continue;
1401 if ((!op || QUERY_FLAG (op, FLAG_WIZ)))
1402 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s (%5d) %-8s", in, length, length,
1403 query_name (tmp), tmp->count, query_weight (tmp));
1404 else
1405 new_draw_info_format (NDI_UNIQUE, 0, op, "%s- %-*.*s %-8s", in, length + 8, length + 8, query_name (tmp), query_weight (tmp));
1406 }
1407 if (!inv && op)
1408 {
1409 new_draw_info_format (NDI_UNIQUE, 0, op, "%-*s %-8s", 41, "Total weight :", query_weight (op));
1410 }
1411}
1412
1413static void
1414display_new_pickup (object *op)
1415{
1416 int i = op->contr->mode;
1417
1418 if (!(i & PU_NEWMODE))
1236 return; 1419 return;
1237 }
1238 tmp = inv ? inv->inv : op->inv;
1239 1420
1240 while (tmp) {
1241 if ((!tmp->invisible &&
1242 (inv==NULL || inv->type == CONTAINER || QUERY_FLAG(tmp, FLAG_APPLIED)))
1243 || (!op || QUERY_FLAG(op, FLAG_WIZ)))
1244 items++;
1245 tmp=tmp->below;
1246 }
1247 if (inv==NULL) { /* player's inventory */
1248 if (items==0) {
1249 new_draw_info(NDI_UNIQUE, 0,op,"You carry nothing.");
1250 return;
1251 } else {
1252 length = 28;
1253 in = "";
1254 if (op)
1255 clear_win_info(op);
1256 new_draw_info(NDI_UNIQUE, 0,op,"Inventory:");
1257 }
1258 } else {
1259 if (items==0)
1260 return;
1261 else {
1262 length = 28;
1263 in = " ";
1264 }
1265 }
1266 for (tmp=inv?inv->inv:op->inv; tmp; tmp=tmp->below) {
1267 if((!op||!QUERY_FLAG(op, FLAG_WIZ)) && (tmp->invisible ||
1268 (inv && inv->type != CONTAINER && !QUERY_FLAG(tmp, FLAG_APPLIED))))
1269 continue;
1270 if((!op || QUERY_FLAG(op, FLAG_WIZ)))
1271 new_draw_info_format(NDI_UNIQUE, 0,op ,"%s- %-*.*s (%5d) %-8s", in, length, length,
1272 query_name(tmp), tmp->count,query_weight(tmp));
1273 else
1274 new_draw_info_format(NDI_UNIQUE,0, op, "%s- %-*.*s %-8s", in, length+8,
1275 length+8, query_name(tmp),
1276 query_weight(tmp));
1277 }
1278 if(!inv && op) {
1279 new_draw_info_format(NDI_UNIQUE,0, op ,"%-*s %-8s",
1280 41,"Total weight :",query_weight(op));
1281 }
1282}
1283
1284static void display_new_pickup( object* op )
1285 {
1286 int i = op->contr->mode;
1287
1288 if(!(i & PU_NEWMODE)) return;
1289
1290 new_draw_info_format(NDI_UNIQUE, 0,op,"%d NEWMODE",i & PU_NEWMODE?1:0); 1421 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NEWMODE", i & PU_NEWMODE ? 1 : 0);
1291 new_draw_info_format(NDI_UNIQUE, 0,op,"%d DEBUG",i & PU_DEBUG?1:0); 1422 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DEBUG", i & PU_DEBUG ? 1 : 0);
1292 new_draw_info_format(NDI_UNIQUE, 0,op,"%d INHIBIT",i & PU_INHIBIT?1:0); 1423 new_draw_info_format (NDI_UNIQUE, 0, op, "%d INHIBIT", i & PU_INHIBIT ? 1 : 0);
1293 new_draw_info_format(NDI_UNIQUE, 0,op,"%d STOP",i & PU_STOP?1:0); 1424 new_draw_info_format (NDI_UNIQUE, 0, op, "%d STOP", i & PU_STOP ? 1 : 0);
1294 1425
1295 new_draw_info_format(NDI_UNIQUE, 0,op,"%d <= x pickup weight/value RATIO (0==off)",(i & PU_RATIO)*5); 1426 new_draw_info_format (NDI_UNIQUE, 0, op, "%d <= x pickup weight/value RATIO (0==off)", (i & PU_RATIO) * 5);
1296 1427
1297 new_draw_info_format(NDI_UNIQUE, 0,op,"%d FOOD",i & PU_FOOD?1:0); 1428 new_draw_info_format (NDI_UNIQUE, 0, op, "%d FOOD", i & PU_FOOD ? 1 : 0);
1298 new_draw_info_format(NDI_UNIQUE, 0,op,"%d DRINK",i & PU_DRINK?1:0); 1429 new_draw_info_format (NDI_UNIQUE, 0, op, "%d DRINK", i & PU_DRINK ? 1 : 0);
1299 new_draw_info_format(NDI_UNIQUE, 0,op,"%d VALUABLES",i & PU_VALUABLES?1:0); 1430 new_draw_info_format (NDI_UNIQUE, 0, op, "%d VALUABLES", i & PU_VALUABLES ? 1 : 0);
1300 1431
1301 new_draw_info_format(NDI_UNIQUE, 0,op,"%d BOW",i & PU_BOW?1:0); 1432 new_draw_info_format (NDI_UNIQUE, 0, op, "%d BOW", i & PU_BOW ? 1 : 0);
1302 new_draw_info_format(NDI_UNIQUE, 0,op,"%d ARROW",i & PU_ARROW?1:0); 1433 new_draw_info_format (NDI_UNIQUE, 0, op, "%d ARROW", i & PU_ARROW ? 1 : 0);
1303 1434
1304 new_draw_info_format(NDI_UNIQUE, 0,op,"%d HELMET",i & PU_HELMET?1:0); 1435 new_draw_info_format (NDI_UNIQUE, 0, op, "%d HELMET", i & PU_HELMET ? 1 : 0);
1305 new_draw_info_format(NDI_UNIQUE, 0,op,"%d SHIELD",i & PU_SHIELD?1:0); 1436 new_draw_info_format (NDI_UNIQUE, 0, op, "%d SHIELD", i & PU_SHIELD ? 1 : 0);
1306 new_draw_info_format(NDI_UNIQUE, 0,op,"%d ARMOUR",i & PU_ARMOUR?1:0); 1437 new_draw_info_format (NDI_UNIQUE, 0, op, "%d ARMOUR", i & PU_ARMOUR ? 1 : 0);
1307 1438
1308 new_draw_info_format(NDI_UNIQUE, 0,op,"%d BOOTS",i & PU_BOOTS?1:0); 1439 new_draw_info_format (NDI_UNIQUE, 0, op, "%d BOOTS", i & PU_BOOTS ? 1 : 0);
1309 new_draw_info_format(NDI_UNIQUE, 0,op,"%d GLOVES",i & PU_GLOVES?1:0); 1440 new_draw_info_format (NDI_UNIQUE, 0, op, "%d GLOVES", i & PU_GLOVES ? 1 : 0);
1310 new_draw_info_format(NDI_UNIQUE, 0,op,"%d CLOAK",i & PU_CLOAK?1:0); 1441 new_draw_info_format (NDI_UNIQUE, 0, op, "%d CLOAK", i & PU_CLOAK ? 1 : 0);
1311 new_draw_info_format(NDI_UNIQUE, 0,op,"%d KEY",i & PU_KEY?1:0); 1442 new_draw_info_format (NDI_UNIQUE, 0, op, "%d KEY", i & PU_KEY ? 1 : 0);
1312 1443
1313 new_draw_info_format(NDI_UNIQUE, 0,op,"%d MISSILEWEAPON",i & PU_MISSILEWEAPON?1:0); 1444 new_draw_info_format (NDI_UNIQUE, 0, op, "%d MISSILEWEAPON", i & PU_MISSILEWEAPON ? 1 : 0);
1314 new_draw_info_format(NDI_UNIQUE, 0,op,"%d ALLWEAPON",i & PU_ALLWEAPON?1:0); 1445 new_draw_info_format (NDI_UNIQUE, 0, op, "%d ALLWEAPON", i & PU_ALLWEAPON ? 1 : 0);
1315 new_draw_info_format(NDI_UNIQUE, 0,op,"%d MAGICAL",i & PU_MAGICAL?1:0); 1446 new_draw_info_format (NDI_UNIQUE, 0, op, "%d MAGICAL", i & PU_MAGICAL ? 1 : 0);
1316 new_draw_info_format(NDI_UNIQUE, 0,op,"%d POTION",i & PU_POTION?1:0); 1447 new_draw_info_format (NDI_UNIQUE, 0, op, "%d POTION", i & PU_POTION ? 1 : 0);
1317 1448
1318 new_draw_info_format(NDI_UNIQUE, 0,op,"%d SPELLBOOK",i & PU_SPELLBOOK?1:0); 1449 new_draw_info_format (NDI_UNIQUE, 0, op, "%d SPELLBOOK", i & PU_SPELLBOOK ? 1 : 0);
1319 new_draw_info_format(NDI_UNIQUE, 0,op,"%d SKILLSCROLL",i & PU_SKILLSCROLL?1:0); 1450 new_draw_info_format (NDI_UNIQUE, 0, op, "%d SKILLSCROLL", i & PU_SKILLSCROLL ? 1 : 0);
1320 new_draw_info_format(NDI_UNIQUE, 0,op,"%d READABLES",i & PU_READABLES?1:0); 1451 new_draw_info_format (NDI_UNIQUE, 0, op, "%d READABLES", i & PU_READABLES ? 1 : 0);
1321 new_draw_info_format(NDI_UNIQUE, 0,op,"%d MAGICDEVICE", i & PU_MAGIC_DEVICE?1:0); 1452 new_draw_info_format (NDI_UNIQUE, 0, op, "%d MAGICDEVICE", i & PU_MAGIC_DEVICE ? 1 : 0);
1322 1453
1323 new_draw_info_format(NDI_UNIQUE, 0,op,"%d NOT CURSED", i & PU_NOT_CURSED?1:0); 1454 new_draw_info_format (NDI_UNIQUE, 0, op, "%d NOT CURSED", i & PU_NOT_CURSED ? 1 : 0);
1324 1455
1325 new_draw_info_format(NDI_UNIQUE, 0,op,"%d JEWELS", i & PU_JEWELS?1:0); 1456 new_draw_info_format (NDI_UNIQUE, 0, op, "%d JEWELS", i & PU_JEWELS ? 1 : 0);
1457 new_draw_info_format (NDI_UNIQUE, 0, op, "%d FLESH", i & PU_FLESH ? 1 : 0);
1326 1458
1327 new_draw_info_format(NDI_UNIQUE, 0,op,""); 1459 new_draw_info_format (NDI_UNIQUE, 0, op, "");
1328 } 1460}
1329 1461
1462int
1330int command_pickup (object *op, char *params) 1463command_pickup (object *op, char *params)
1331{ 1464{
1332 uint32 i; 1465 uint32 i;
1333 static const char* names[ ] = { 1466 static const char *names[] = {
1334 "debug", "inhibit", "stop", "food", "drink", "valuables", "bow", "arrow", "helmet", 1467 "debug", "inhibit", "stop", "food", "drink", "valuables", "bow", "arrow", "helmet",
1335 "shield", "armour", "boots", "gloves", "cloak", "key", "missile", "allweapon", 1468 "shield", "armour", "boots", "gloves", "cloak", "key", "missile", "allweapon",
1336 "magical", "potion", "spellbook", "skillscroll", "readables", "magicdevice", "notcursed", "jewels", NULL }; 1469 "magical", "potion", "spellbook", "skillscroll", "readables", "magicdevice", "notcursed",
1470 "jewels", "flesh", NULL
1471 };
1337 static uint32 modes[ ] = { 1472 static uint32 modes[] = {
1338 PU_DEBUG, PU_INHIBIT, PU_STOP, PU_FOOD, PU_DRINK, PU_VALUABLES, PU_BOW, PU_ARROW, PU_HELMET, 1473 PU_DEBUG, PU_INHIBIT, PU_STOP, PU_FOOD, PU_DRINK, PU_VALUABLES, PU_BOW, PU_ARROW, PU_HELMET,
1339 PU_SHIELD, PU_ARMOUR, PU_BOOTS, PU_GLOVES, PU_CLOAK, PU_KEY, PU_MISSILEWEAPON, PU_ALLWEAPON, 1474 PU_SHIELD, PU_ARMOUR, PU_BOOTS, PU_GLOVES, PU_CLOAK, PU_KEY, PU_MISSILEWEAPON, PU_ALLWEAPON,
1340 PU_MAGICAL, PU_POTION, PU_SPELLBOOK, PU_SKILLSCROLL, PU_READABLES, PU_MAGIC_DEVICE, PU_NOT_CURSED, PU_JEWELS, 0 }; 1475 PU_MAGICAL, PU_POTION, PU_SPELLBOOK, PU_SKILLSCROLL, PU_READABLES, PU_MAGIC_DEVICE, PU_NOT_CURSED,
1476 PU_JEWELS, PU_FLESH, 0
1477 };
1341 1478
1342 if(!params) { 1479 if (!params)
1480 {
1343 /* if the new mode is used, just print the settings */ 1481 /* if the new mode is used, just print the settings */
1344 if(op->contr->mode & PU_NEWMODE) 1482 if (op->contr->mode & PU_NEWMODE)
1345 { 1483 {
1346 display_new_pickup( op ); 1484 display_new_pickup (op);
1347 return 1; 1485 return 1;
1348 } 1486 }
1487 if (1)
1349 if(1) LOG(llevDebug, "command_pickup: !params\n"); 1488 LOG (llevDebug, "command_pickup: !params\n");
1350 set_pickup_mode(op, (op->contr->mode > 6)? 0: op->contr->mode+1); 1489 set_pickup_mode (op, (op->contr->mode > 6) ? 0 : op->contr->mode + 1);
1351 return 0; 1490 return 0;
1352 } 1491 }
1353 1492
1354 while ( *params == ' ' && *params ) 1493 while (*params == ' ' && *params)
1355 params++; 1494 params++;
1356 1495
1357 if ( *params == '+' || *params == '-' ) 1496 if (*params == '+' || *params == '-')
1358 { 1497 {
1359 int mode; 1498 int mode;
1499
1360 for ( mode = 0; names[ mode ]; mode++ ) 1500 for (mode = 0; names[mode]; mode++)
1361 { 1501 {
1362 if ( !strcmp( names[ mode ], params + 1 ) ) 1502 if (!strcmp (names[mode], params + 1))
1363 { 1503 {
1364 i = op->contr->mode; 1504 i = op->contr->mode;
1365 if ( !( i & PU_NEWMODE ) ) 1505 if (!(i & PU_NEWMODE))
1366 i = PU_NEWMODE; 1506 i = PU_NEWMODE;
1367 if ( *params == '+' ) 1507 if (*params == '+')
1368 i = i | modes[ mode ]; 1508 i = i | modes[mode];
1369 else 1509 else
1370 i = i & ~modes[ mode ]; 1510 i = i & ~modes[mode];
1371 op->contr->mode = i; 1511 op->contr->mode = i;
1372 display_new_pickup( op ); 1512 display_new_pickup (op);
1373 return 1; 1513 return 1;
1374 } 1514 }
1375 } 1515 }
1376 new_draw_info_format( NDI_UNIQUE, 0, op, "Pickup: invalid item %s\n", params ); 1516 new_draw_info_format (NDI_UNIQUE, 0, op, "Pickup: invalid item %s\n", params);
1377 return 1; 1517 return 1;
1378 } 1518 }
1379 1519
1380 if(sscanf(params, "%u", &i) != 1) { 1520 if (sscanf (params, "%u", &i) != 1)
1521 {
1522 if (1)
1381 if(1) LOG(llevDebug, "command_pickup: params==NULL\n"); 1523 LOG (llevDebug, "command_pickup: params==NULL\n");
1382 new_draw_info(NDI_UNIQUE, 0,op,"Usage: pickup <0-7> or <value_density> ."); 1524 new_draw_info (NDI_UNIQUE, 0, op, "Usage: pickup <0-7> or <value_density> .");
1525 return 1;
1526 }
1527 set_pickup_mode (op, i);
1528
1529 return 1;
1530}
1531
1532void
1533set_pickup_mode (object *op, int i)
1534{
1535 switch (op->contr->mode = i)
1536 {
1537 case 0:
1538 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Don't pick up.");
1539 break;
1540 case 1:
1541 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item.");
1542 break;
1543 case 2:
1544 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up one item and stop.");
1545 break;
1546 case 3:
1547 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Stop before picking up.");
1548 break;
1549 case 4:
1550 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items.");
1551 break;
1552 case 5:
1553 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all items and stop.");
1554 break;
1555 case 6:
1556 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all magic items.");
1557 break;
1558 case 7:
1559 new_draw_info (NDI_UNIQUE, 0, op, "Mode: Pick up all coins and gems");
1560 break;
1561 }
1562}
1563
1564int
1565command_search_items (object *op, char *params)
1566{
1567 char buf[MAX_BUF];
1568
1569 if (settings.search_items == FALSE)
1383 return 1; 1570 return 1;
1571
1572 if (params == NULL)
1573 {
1574 if (op->contr->search_str[0] == '\0')
1575 {
1576 new_draw_info (NDI_UNIQUE, 0, op, "Example: search magic+1");
1577 new_draw_info (NDI_UNIQUE, 0, op, "Would automatically pick up all");
1578 new_draw_info (NDI_UNIQUE, 0, op, "items containing the word 'magic+1'.");
1579 return 1;
1580 }
1581 op->contr->search_str[0] = '\0';
1582 new_draw_info (NDI_UNIQUE, 0, op, "Search mode turned off.");
1583 fix_player (op);
1584 return 1;
1384 } 1585 }
1385 set_pickup_mode(op,i); 1586 if ((int) strlen (params) >= MAX_BUF)
1386 1587 {
1588 new_draw_info (NDI_UNIQUE, 0, op, "Search string too long.");
1589 return 1;
1590 }
1591 strcpy (op->contr->search_str, params);
1592 sprintf (buf, "Searching for '%s'.", op->contr->search_str);
1593 new_draw_info (NDI_UNIQUE, 0, op, buf);
1594 fix_player (op);
1387 return 1; 1595 return 1;
1388} 1596}
1389 1597
1390void set_pickup_mode(object *op,int i) {
1391 switch(op->contr->mode=i) {
1392 case 0:
1393 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Don't pick up.");
1394 break;
1395 case 1:
1396 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up one item.");
1397 break;
1398 case 2:
1399 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up one item and stop.");
1400 break;
1401 case 3:
1402 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Stop before picking up.");
1403 break;
1404 case 4:
1405 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up all items.");
1406 break;
1407 case 5:
1408 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up all items and stop.");
1409 break;
1410 case 6:
1411 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up all magic items.");
1412 break;
1413 case 7:
1414 new_draw_info(NDI_UNIQUE, 0,op,"Mode: Pick up all coins and gems");
1415 break;
1416 }
1417}
1418
1419int command_search_items (object *op, char *params)
1420{
1421 char buf[MAX_BUF];
1422
1423 if (settings.search_items == FALSE)
1424 return 1;
1425
1426 if(params == NULL) {
1427 if(op->contr->search_str[0]=='\0') {
1428 new_draw_info(NDI_UNIQUE, 0,op,"Example: search magic+1");
1429 new_draw_info(NDI_UNIQUE, 0,op,"Would automatically pick up all");
1430 new_draw_info(NDI_UNIQUE, 0,op,"items containing the word 'magic+1'.");
1431 return 1;
1432 }
1433 op->contr->search_str[0]='\0';
1434 new_draw_info(NDI_UNIQUE, 0,op,"Search mode turned off.");
1435 fix_player(op);
1436 return 1;
1437 }
1438 if((int)strlen(params) >= MAX_BUF) {
1439 new_draw_info(NDI_UNIQUE, 0,op,"Search string too long.");
1440 return 1;
1441 }
1442 strcpy(op->contr->search_str, params);
1443 sprintf(buf,"Searching for '%s'.",op->contr->search_str);
1444 new_draw_info(NDI_UNIQUE, 0,op,buf);
1445 fix_player(op);
1446 return 1;
1447}
1448
1449/*
1450 * Changing the custom name of an item
1451 *
1452 * Syntax is: rename <what object> to <new name>
1453 * if '<what object>' is omitted, marked object is used
1454 * if 'to <new name>' is omitted, custom name is cleared
1455 *
1456 * Names are considered for all purpose having a length <=127 (max length sent to client
1457 * by server) */
1458
1459int command_rename_item(object *op, char *params)
1460{
1461 char buf[VERY_BIG_BUF];
1462 int itemnumber;
1463 object *item=NULL;
1464 char *closebrace;
1465 size_t counter;
1466
1467 if (params) {
1468 /* Let's skip white spaces */
1469 while(' '==*params) params++;
1470
1471 /* Checking the first part */
1472 if ((itemnumber = atoi(params))!=0) {
1473 for (item=op->inv; item && ((item->count != itemnumber) || item->invisible); item=item->below);
1474 if (!item) {
1475 new_draw_info(NDI_UNIQUE,0,op,"Tried to rename an invalid item.");
1476 return 1;
1477 }
1478 while(isdigit(*params) || ' '==*params) params++;
1479 }
1480 else if ('<'==*params) {
1481 /* Got old name, let's get it & find appropriate matching item */
1482 closebrace=strchr(params,'>');
1483 if(!closebrace) {
1484 new_draw_info(NDI_UNIQUE,0,op,"Syntax error!");
1485 return 1;
1486 }
1487 /* Sanity check for buffer overruns */
1488 if((closebrace-params)>127) {
1489 new_draw_info(NDI_UNIQUE,0,op,"Old name too long (up to 127 characters allowed)!");
1490 return 1;
1491 }
1492 /* Copy the old name */
1493 strncpy(buf,params+1,closebrace-params-1);
1494 buf[closebrace-params-1]='\0';
1495
1496 /* Find best matching item */
1497 item=find_best_object_match(op,buf);
1498 if(!item) {
1499 new_draw_info(NDI_UNIQUE,0,op,"Could not find a matching item to rename.");
1500 return 1;
1501 }
1502
1503 /* Now need to move pointer to just after > */
1504 params=closebrace+1;
1505 while(' '==*params) params++;
1506
1507 } else {
1508 /* Use marked item */
1509 item=find_marked_object(op);
1510 if(!item) {
1511 new_draw_info(NDI_UNIQUE,0,op,"No marked item to rename.");
1512 return 1;
1513 }
1514 }
1515
1516 /* Now let's find the new name */
1517 if(!strncmp(params,"to ",3)) {
1518 params+=3;
1519 while(' '==*params) params++;
1520 if('<'!=*params) {
1521 new_draw_info(NDI_UNIQUE,0,op,"Syntax error, expecting < at start of new name!");
1522 return 1;
1523 }
1524 closebrace=strchr(params+1,'>');
1525 if(!closebrace) {
1526 new_draw_info(NDI_UNIQUE,0,op,"Syntax error, expecting > at end of new name!");
1527 return 1;
1528 }
1529
1530 /* Sanity check for buffer overruns */
1531 if((closebrace-params)>127) {
1532 new_draw_info(NDI_UNIQUE,0,op,"New name too long (up to 127 characters allowed)!");
1533 return 1;
1534 }
1535
1536 /* Copy the new name */
1537 strncpy(buf,params+1,closebrace-params-1);
1538 buf[closebrace-params-1]='\0';
1539
1540 /* Let's check it for weird characters */
1541 for(counter=0;counter<strlen(buf);counter++) {
1542 if(isalnum(buf[counter])) continue;
1543 if(' '==buf[counter]) continue;
1544 if('\''==buf[counter]) continue;
1545 if('+'==buf[counter]) continue;
1546 if('_'==buf[counter]) continue;
1547 if('-'==buf[counter]) continue;
1548
1549 /* If we come here, then the name contains an invalid character...
1550 tell the player & exit */
1551 new_draw_info(NDI_UNIQUE,0,op,"Invalid new name!");
1552 return 1;
1553 }
1554
1555 } else {
1556 /* If param contains something, then syntax error... */
1557 if(strlen(params)) {
1558 new_draw_info(NDI_UNIQUE,0,op,"Syntax error, expected 'to <' after old name!");
1559 return 1;
1560 }
1561 /* New name is empty */
1562 buf[0]='\0';
1563 }
1564 } else {
1565 /* Last case: params==NULL */
1566 item=find_marked_object(op);
1567 if(!item) {
1568 new_draw_info(NDI_UNIQUE,0,op,"No marked item to rename.");
1569 return 1;
1570 }
1571 buf[0]='\0';
1572 }
1573
1574 if (QUERY_FLAG(item, FLAG_UNPAID)) {
1575 new_draw_info(NDI_UNIQUE,0,op,"You can't rename an unpaid item! You should pay for it first.");
1576 return 1;
1577 }
1578
1579 /* Coming here, everything is fine... */
1580 if(!strlen(buf)) {
1581 /* Clear custom name */
1582 if(item->custom_name) {
1583 FREE_AND_CLEAR_STR(item->custom_name);
1584
1585 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));
1586 esrv_update_item(UPD_NAME,op,item);
1587 } else {
1588 new_draw_info(NDI_UNIQUE,0,op,"This item has no custom name.");
1589 }
1590 } else {
1591 /* Set custom name */
1592 FREE_AND_COPY(item->custom_name,buf);
1593
1594 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);
1595 esrv_update_item(UPD_NAME,op,item);
1596 }
1597
1598 return 1;
1599}

Diff Legend

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