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.49 by root, Mon May 7 06:01:48 2007 UTC

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