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