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