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