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.16 by root, Thu Sep 14 19:08:39 2006 UTC

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

Diff Legend

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