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