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.38 by root, Wed Feb 7 23:50:01 2007 UTC

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