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.56 by root, Tue Jun 5 13:05:02 2007 UTC

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