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.5 by elmex, Sun Aug 20 21:26:03 2006 UTC vs.
Revision 1.14 by root, Sun Sep 10 15:59:57 2006 UTC

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

Diff Legend

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