ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/c_object.C
(Generate patch)

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.5 by elmex, Sun Aug 20 21:26:03 2006 UTC vs.
Revision 1.32 by root, Tue Dec 26 08:54:59 2006 UTC

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

Diff Legend

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