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.31 by root, Fri Dec 22 16:34:00 2006 UTC

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