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.3 by elmex, Tue Aug 15 06:23:45 2006 UTC vs.
Revision 1.25 by root, Tue Dec 12 21:39:57 2006 UTC

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

Diff Legend

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