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

Comparing deliantra/server/server/shop.C (file contents):
Revision 1.13 by root, Tue Sep 12 01:09:54 2006 UTC vs.
Revision 1.54 by root, Sat Aug 30 02:26:46 2008 UTC

1
2/* 1/*
3 * static char *rcsid_shop_c = 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
4 * "$Id: shop.C,v 1.13 2006/09/12 01:09:54 root Exp $"; 3 *
5 */ 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
6
7/*
8 CrossFire, A Multiplayer game for X-windows
9
10 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
12 7 *
13 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
14 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
15 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
16 (at your option) any later version. 11 * (at your option) any later version.
17 12 *
18 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
19 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
20 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 GNU General Public License for more details. 16 * GNU General Public License for more details.
22 17 *
23 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
24 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
26 21 * The authors can be reached via e-mail to <support@deliantra.net>
27 The authors can be reached via e-mail at crossfire-devel@real-time.com
28*/ 22 */
29 23
30#include <global.h> 24#include <global.h>
31#include <spells.h> 25#include <spells.h>
32#include <skills.h> 26#include <skills.h>
33#include <living.h> 27#include <living.h>
34#include <newclient.h>
35#ifndef __CEXTRACT__
36# include <sproto.h> 28#include <sproto.h>
37#endif
38#include <math.h> 29#include <math.h>
39 30
40/* this is a measure of how effective store specialisation is. A general store 31/* this is a measure of how effective store specialisation is. A general store
41 * will offer this proportion of the 'maximum' price, a specialised store will 32 * will offer this proportion of the 'maximum' price, a specialised store will
42 * offer a range of prices around it such that the maximum price is always one 33 * offer a range of prices around it such that the maximum price is always one
43 * therefore making this number higher, makes specialisation less effective. 34 * therefore making this number higher, makes specialisation less effective.
44 * setting this value above 1 or to a negative value would have interesting, 35 * setting this value above 1 or to a negative value would have interesting,
45 * (though not useful) effects. 36 * (though not useful) effects.
46 */ 37 */
47#define SPECIALISATION_EFFECT 0.5 38#define SPECIALISATION_EFFECT .5
48 39
49/* price a shopkeeper will give someone they neither like nor dislike */ 40// price a shopkeeper will give someone that is not of their race
50#define NEUTRAL_RATIO 0.8 41#define DISLIKE_RATIO 0.8
51 42
52static void pay_from_container (object *pl, object *pouch, sint64 &to_pay); 43static void pay_from_container (object *pl, object *pouch, sint64 &to_pay);
53static sint64 value_limit (sint64 val, int quantity, const object *who, int isshop); 44static sint64 value_limit (sint64 val, int quantity, const object *who, int isshop);
54static double shop_specialisation_ratio (const object *item, const mapstruct *map); 45static double shop_specialisation_ratio (const object *item, const maptile *map);
55static double shop_greed (const mapstruct *map); 46static double shop_greed (const maptile *map);
56
57#define NUM_COINS 4 /* number of coin types */
58static const char *const coins[] = { "royalty", "platinacoin", "goldcoin", "silvercoin", NULL };
59 47
60/* Added F_TRUE flag to define.h to mean that the price should not 48/* Added F_TRUE flag to define.h to mean that the price should not
61 * be adjusted by players charisma. With F_TRUE, it returns the amount 49 * be adjusted by players charisma. With F_TRUE, it returns the amount
62 * that the item is worth, if it was sold, but unadjusted by charisma. 50 * that the item is worth, if it was sold, but unadjusted by charisma.
63 * This is needed for alchemy, to to determine what value of gold nuggets 51 * This is needed for alchemy, to to determine what value of gold nuggets
… …
104 approximate = flag & F_APPROX; 92 approximate = flag & F_APPROX;
105 shop = flag & F_SHOP; 93 shop = flag & F_SHOP;
106 flag &= ~(F_NO_BARGAIN | F_IDENTIFIED | F_NOT_CURSED | F_APPROX | F_SHOP); 94 flag &= ~(F_NO_BARGAIN | F_IDENTIFIED | F_NOT_CURSED | F_APPROX | F_SHOP);
107 95
108 if (tmp->type == MONEY) 96 if (tmp->type == MONEY)
109 return (tmp->nrof * tmp->value); 97 return tmp->nrof * tmp->value;
98
110 if (tmp->type == GEM) 99 if (tmp->type == GEM)
111 { 100 {
112 if (flag == F_TRUE) 101 if (flag == F_TRUE)
113 return (tmp->nrof * tmp->value); 102 return (tmp->nrof * tmp->value);
103
114 if (flag == F_BUY) 104 if (flag == F_BUY)
115 return (sint64) (1.03 * tmp->nrof * tmp->value); 105 return (sint64) (1.03 * tmp->nrof * tmp->value);
106
116 if (flag == F_SELL) 107 if (flag == F_SELL)
117 return (sint64) (0.97 * tmp->nrof * tmp->value); 108 return (sint64) (0.97 * tmp->nrof * tmp->value);
109
118 LOG (llevError, "Query_cost: Gem type with unknown flag : %d\n", flag); 110 LOG (llevError, "Query_cost: Gem type with unknown flag %d: %s\n", flag, tmp->debug_desc ());
119 return 0; 111 return 0;
120 } 112 }
113
121 number = tmp->nrof; 114 number = tmp->nrof;
122 if (number == 0) 115 if (number == 0)
123 number = 1; 116 number = 1;
124 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified) 117 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified)
125 { 118 {
… …
134 if (tmp->arch != NULL) 127 if (tmp->arch != NULL)
135 { 128 {
136 if (flag == F_BUY) 129 if (flag == F_BUY)
137 { 130 {
138 LOG (llevError, "Asking for buy-value of unidentified object.\n"); 131 LOG (llevError, "Asking for buy-value of unidentified object.\n");
139 val = tmp->arch->clone.value * 50 * number; 132 val = tmp->arch->value * 50 * number;
140 } 133 }
141 else 134 else
142 { /* Trying to sell something, or get true value */ 135 { /* Trying to sell something, or get true value */
143 if (tmp->type == POTION) 136 if (tmp->type == POTION)
144 val = number * 40; /* Don't want to give anything away */ 137 val = number * 40; /* Don't want to give anything away */
… …
146 { 139 {
147 /* Get 2/3'rd value for applied objects, 1/3'rd for totally 140 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
148 * unknown objects 141 * unknown objects
149 */ 142 */
150 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) 143 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED))
151 val = number * tmp->arch->clone.value * 2 / 3; 144 val = number * tmp->arch->value * 2 / 3;
152 else 145 else
153 val = number * tmp->arch->clone.value / 3; 146 val = number * tmp->arch->value / 3;
154 } 147 }
155 } 148 }
156 } 149 }
157 else 150 else
158 { /* No archetype with this object */ 151 { /* No archetype with this object */
… …
169 162
170 /* If the item has been applied or identifed or does not need to be 163 /* If the item has been applied or identifed or does not need to be
171 * identified, AND the object is magical and the archetype is non 164 * identified, AND the object is magical and the archetype is non
172 * magical, then change values accordingly. The tmp->arch==NULL is 165 * magical, then change values accordingly. The tmp->arch==NULL is
173 * really just a check to prevent core dumps for when it checks 166 * really just a check to prevent core dumps for when it checks
174 * tmp->arch->clone.magic for any magic. The check for archetype 167 * tmp->arch->magic for any magic. The check for archetype
175 * magic is to not give extra money for archetypes that are by 168 * magic is to not give extra money for archetypes that are by
176 * default magical. This is because the archetype value should have 169 * default magical. This is because the archetype value should have
177 * already figured in that value. 170 * already figured in that value.
178 */ 171 */
179 if ((QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified || 172 if ((QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified ||
180 QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) && tmp->magic && (tmp->arch == NULL || !tmp->arch->clone.magic)) 173 QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) && tmp->magic && (tmp->arch == NULL || !tmp->arch->magic))
181 { 174 {
182 if (tmp->magic > 0) 175 if (tmp->magic > 0)
183 val *= (3 * tmp->magic * tmp->magic * tmp->magic); 176 val *= (3 * tmp->magic * tmp->magic * tmp->magic);
184 else 177 else
185 /* Note that tmp->magic is negative, so that this 178 /* Note that tmp->magic is negative, so that this
… …
213 * AND Cha = 30 will get optimal price. 206 * AND Cha = 30 will get optimal price.
214 * Thus charisma will never get useless. 207 * Thus charisma will never get useless.
215 * -b.e. edler@heydernet.de 208 * -b.e. edler@heydernet.de
216 */ 209 */
217 210
218 if (who != NULL && who->type == PLAYER) 211 if (who && who->type == PLAYER)
219 { 212 {
220 int lev_bargain = 0; 213 int lev_bargain = 0;
221 int lev_identify = 0; 214 int lev_identify = 0;
222 int idskill1 = 0;
223 int idskill2 = 0;
224 const typedata *tmptype;
225
226 tmptype = get_typedata (tmp->type);
227 215
228 if (find_skill_by_number (who, SK_BARGAINING)) 216 if (find_skill_by_number (who, SK_BARGAINING))
229 {
230 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level; 217 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level;
218
219 if (const typedata *tmptype = get_typedata (tmp->type))
231 } 220 {
232 if (tmptype)
233 {
234 idskill1 = tmptype->identifyskill; 221 if (int idskill1 = tmptype->identifyskill)
235 if (idskill1)
236 { 222 {
237 idskill2 = tmptype->identifyskill2; 223 int idskill2 = tmptype->identifyskill2;
224
238 if (find_skill_by_number (who, idskill1)) 225 if (find_skill_by_number (who, idskill1))
239 {
240 lev_identify = find_skill_by_number (who, idskill1)->level; 226 lev_identify = find_skill_by_number (who, idskill1)->level;
241 } 227
242 if (idskill2 && find_skill_by_number (who, idskill2)) 228 if (idskill2 && find_skill_by_number (who, idskill2))
243 {
244 lev_identify += find_skill_by_number (who, idskill2)->level; 229 lev_identify += find_skill_by_number (who, idskill2)->level;
245 }
246 } 230 }
247 } 231 }
248 else
249 LOG (llevError, "Query_cost: item %s hasn't got a valid type\n", &tmp->name);
250 232
251 /* ratio determines how much of the price modification 233 /* ratio determines how much of the price modification
252 * will come from the basic stat charisma 234 * will come from the basic stat charisma
253 * the rest will come from the level in bargaining skill 235 * the rest will come from the level in bargaining skill
254 */ 236 */
255 const double cha_ratio = 0.40; 237 const double cha_ratio = 0.40;
256 238
257 diff = no_bargain ? 1.0 : 1. - pow (lev_bargain / (double) settings.max_level, 0.25); 239 diff = no_bargain ? 1.0 : 1. - pow (lev_bargain / (double) settings.max_level, 0.25);
258
259 diff = (1. - cha_ratio) * diff + cha_ratio * (cha_bonus[who->stats.Cha] - 1.) / (cha_bonus[who->stats.Cha] + 1.); 240 diff = (1. - cha_ratio) * diff + cha_ratio * (cha_bonus[who->stats.Cha] - 1.) / (cha_bonus[who->stats.Cha] + 1.);
260
261 diff = .02 + (.80 - .02) * diff; 241 diff = .02 + (.80 - .02) * diff;
262 242
263 if (flag == F_BUY) 243 if (flag == F_BUY)
264 val += (val * diff); 244 val += val * diff;
265 else if (flag == F_SELL) 245 else if (flag == F_SELL)
266 val -= (val * diff); 246 val -= val * diff;
267 247
268 // now find a price range. the less good we can judge, the larger the range is 248 // now find a price range. the less good we can judge, the larger the range is
269 // then the range is adjusted randomly around the correct value 249 // then the range is adjusted randomly around the correct value
270 if (approximate) 250 if (approximate)
271 approx_range = sint64 (val / sqrt (lev_identify * 3 + 1)); 251 approx_range = sint64 (val / sqrt (lev_identify * 3 + 1));
272 } 252 }
273 253
274 /* I don't think this should really happen - if it does, it indicates and 254 /* I don't think this should really happen - if it does, it indicates and
275 * overflow of diff above. That shoudl only happen if 255 * overflow of diff above. That should only happen if
276 * we are selling objects - in that case, the person just 256 * we are selling objects - in that case, the person just
277 * gets no money. 257 * gets no money.
278 */ 258 */
279 if ((sint64) val < 0) 259 if ((sint64) val < 0)
280 val = 0; 260 val = 0;
… …
308 if (QUERY_FLAG (tmp, FLAG_PLAYER_SOLD)) 288 if (QUERY_FLAG (tmp, FLAG_PLAYER_SOLD))
309 val = (val * shop_greed (who->map) * shop_specialisation_ratio (tmp, who->map) / shopkeeper_approval (who->map, who)); 289 val = (val * shop_greed (who->map) * shop_specialisation_ratio (tmp, who->map) / shopkeeper_approval (who->map, who));
310 else 290 else
311 val = (val * shop_greed (who->map) / (shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who))); 291 val = (val * shop_greed (who->map) / (shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who)));
312 } 292 }
293
313 /* we will also have an extra 0-5% variation between shops of the same type 294 /* we will also have an extra 0-5% variation between shops of the same type
314 * for valuable items (below a value of 50 this effect wouldn't be very 295 * for valuable items (below a value of 50 this effect wouldn't be very
315 * pointful, and could give fun with rounding. 296 * pointful, and could give fun with rounding.
316 */ 297 */
317 if (who->map->path != NULL && val > 50) 298 //TODO: why use cosf at all, just % and scale linearly, gives more even distribution
318 val = (val + 0.05 * (sint64) val * cos (tmp->count + strlen (who->map->path))); 299 if (val > 50)
300 val += float (val) * .05f * cosf ((tmp->uuid.seq & 0xffff) * float (M_PI * 2. / 0x10000));
319 } 301 }
302
320 return (sint64) val; 303 return (sint64) val;
321} 304}
322 305
323/* Find the coin type that is worth more the 'c'. Starts at the 306/* Find the coin type that is worth more the 'c'. Starts at the
324 * cointype placement. 307 * cointype placement.
… …
331 314
332 do 315 do
333 { 316 {
334 if (coins[*cointype] == NULL) 317 if (coins[*cointype] == NULL)
335 return NULL; 318 return NULL;
336 coin = find_archetype (coins[*cointype]); 319 coin = archetype::find (coins[*cointype]);
337 if (coin == NULL) 320 if (coin == NULL)
338 return NULL; 321 return NULL;
339 *cointype += 1; 322 *cointype += 1;
340 } 323 }
341 while (coin->clone.value > c); 324 while (coin->value > c);
342 325
343 return coin; 326 return coin;
344} 327}
345 328
346/* This returns a string of how much something is worth based on 329/* This returns a string of how much something is worth based on
… …
362 345
363 coin = find_next_coin (cost, &cointype); 346 coin = find_next_coin (cost, &cointype);
364 if (coin == NULL) 347 if (coin == NULL)
365 return "nothing"; 348 return "nothing";
366 349
367 num = cost / coin->clone.value; 350 num = cost / coin->value;
368 /* so long as nrof is 32 bit, this is true. 351 /* so long as nrof is 32 bit, this is true.
369 * If it takes more coins than a person can possibly carry, this 352 * If it takes more coins than a person can possibly carry, this
370 * is basically true. 353 * is basically true.
371 */ 354 */
372 if ((cost / coin->clone.value) > UINT32_MAX) 355 if ((cost / coin->value) > UINT32_MAX)
373 { 356 {
374 strcpy (buf, "an unimaginable sum of money"); 357 strcpy (buf, "an unimaginable sum of money");
375 return buf; 358 return buf;
376 } 359 }
377 360
378 cost -= num * (sint64)coin->clone.value; 361 cost -= num * (sint64)coin->value;
379 362
380 sprintf (buf, "%d %s", num, num > 1 ? &coin->clone.name_pl : &coin->clone.name); 363 sprintf (buf, "%d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name);
381 364
382 next_coin = find_next_coin (cost, &cointype); 365 next_coin = find_next_coin (cost, &cointype);
383 if (next_coin == NULL || approx) 366 if (next_coin == NULL || approx)
384 return buf; 367 return buf;
385 368
386 coin = next_coin; 369 coin = next_coin;
387 num = cost / coin->clone.value; 370 num = cost / coin->value;
388 cost -= num * (sint64)coin->clone.value; 371 cost -= num * (sint64)coin->value;
389 372
390 sprintf (buf + strlen (buf), " and %d %s", num, num > 1 ? &coin->clone.name_pl : &coin->clone.name); 373 sprintf (buf + strlen (buf), " and %d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name);
391 374
392 return buf; 375 return buf;
393} 376}
394 377
395const char * 378const char *
… …
425 archetype *coin = find_next_coin (real_value, &cointype); 408 archetype *coin = find_next_coin (real_value, &cointype);
426 409
427 if (coin == NULL) 410 if (coin == NULL)
428 return "nothing"; 411 return "nothing";
429 412
430 num = real_value / coin->clone.value; 413 num = real_value / coin->value;
414
431 if (num == 1) 415 if (num == 1)
432 sprintf (buf, "about one %s", &coin->clone.name); 416 sprintf (buf, "about one %s", &coin->object::name);
433 else if (num < 5) 417 else if (num < 5)
434 sprintf (buf, "a few %s", &coin->clone.name_pl); 418 sprintf (buf, "a few %s", &coin->object::name_pl);
435 else if (num < 10) 419 else if (num < 10)
436 sprintf (buf, "several %s", &coin->clone.name_pl); 420 sprintf (buf, "several %s", &coin->object::name_pl);
437 else if (num < 25) 421 else if (num < 25)
438 sprintf (buf, "a moderate amount of %s", &coin->clone.name_pl); 422 sprintf (buf, "a moderate amount of %s", &coin->object::name_pl);
439 else if (num < 100) 423 else if (num < 100)
440 sprintf (buf, "lots of %s", &coin->clone.name_pl); 424 sprintf (buf, "lots of %s", &coin->object::name_pl);
441 else if (num < 1000) 425 else if (num < 1000)
442 sprintf (buf, "a great many %s", &coin->clone.name_pl); 426 sprintf (buf, "a great many %s", &coin->object::name_pl);
443 else 427 else
444 sprintf (buf, "a vast quantity of %s", &coin->clone.name_pl); 428 sprintf (buf, "a vast quantity of %s", &coin->object::name_pl);
429
445 return buf; 430 return buf;
446 } 431 }
447 } 432 }
448 } 433 }
449 434
… …
508 493
509 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 494 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
510 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold"))) 495 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold")))
511 pay_from_container (pl, pouch, to_pay); 496 pay_from_container (pl, pouch, to_pay);
512 497
513 fix_player (pl); 498 pl->update_stats ();
514 return 1; 499 return 1;
515} 500}
516 501
517/* DAMN: This is now a wrapper for pay_from_container, which is 502/* DAMN: This is now a wrapper for pay_from_container, which is
518 * called for the player, then for each active container that can hold 503 * called for the player, then for each active container that can hold
… …
545 530
546 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 531 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
547 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold"))) 532 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold")))
548 pay_from_container (pl, pouch, to_pay); 533 pay_from_container (pl, pouch, to_pay);
549 534
550 if (settings.real_wiz == FALSE && QUERY_FLAG (pl, FLAG_WAS_WIZ)) 535 pl->update_stats ();
551 SET_FLAG (op, FLAG_WAS_WIZ);
552 536
553 fix_player (pl);
554 return 1; 537 return 1;
555} 538}
556 539
557/* This pays for the item, and takes the proper amount of money off 540/* This pays for the item, and takes the proper amount of money off
558 * the player. 541 * the player.
… …
587 570
588 if (tmp->type == MONEY) 571 if (tmp->type == MONEY)
589 { 572 {
590 for (i = 0; i < NUM_COINS; i++) 573 for (i = 0; i < NUM_COINS; i++)
591 { 574 {
592 if (tmp->value == tmp->arch->clone.value && !strcmp (coins[NUM_COINS - 1 - i], tmp->arch->name)) 575 if (tmp->value == tmp->arch->value && !strcmp (coins[NUM_COINS - 1 - i], tmp->arch->archname))
593 { 576 {
594 // This should not happen, but if it does, just merge the two. 577 // This should not happen, but if it does, just merge the two.
595 if (coin_objs [i]) 578 if (coin_objs [i])
596 { 579 {
597 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]); 580 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]);
598 remove_ob (tmp);
599 coin_objs[i]->nrof += tmp->nrof; 581 coin_objs[i]->nrof += tmp->nrof;
600 esrv_del_item (pl->contr, tmp->count); 582 tmp->destroy ();
601 free_object (tmp);
602 } 583 }
603 else 584 else
604 { 585 {
605 remove_ob (tmp); 586 tmp->remove ();
606
607 if (pouch->type == PLAYER)
608 esrv_del_item (pl->contr, tmp->count);
609
610 coin_objs[i] = tmp; 587 coin_objs[i] = tmp;
611 } 588 }
612 589
613 break; 590 break;
614 } 591 }
615 } 592 }
616 593
617 if (i == NUM_COINS) 594 if (i == NUM_COINS)
618 LOG (llevError, "in pay_for_item: Did not find string match for %s\n", &tmp->arch->name); 595 LOG (llevError, "in pay_for_item: Did not find string match for %s\n", &tmp->arch->archname);
619 } 596 }
620 } 597 }
621 598
622 /* Fill in any gaps in the coin_objs array - needed to make change. */ 599 /* Fill in any gaps in the coin_objs array - needed to make change. */
623 /* Note that the coin_objs array goes from least value to greatest value */ 600 /* Note that the coin_objs array goes from least value to greatest value */
624 for (i = 0; i < NUM_COINS; i++) 601 for (i = 0; i < NUM_COINS; i++)
625 if (!coin_objs[i]) 602 if (!coin_objs[i])
626 { 603 {
627 at = find_archetype (coins[NUM_COINS - 1 - i]); 604 at = archetype::find (coins[NUM_COINS - 1 - i]);
628 605
629 if (at == NULL) 606 if (at == NULL)
630 LOG (llevError, "Could not find %s archetype\n", coins[NUM_COINS - 1 - i]); 607 LOG (llevError, "Could not find %s archetype\n", coins[NUM_COINS - 1 - i]);
631 608
632 coin_objs[i] = arch_to_object (at); 609 coin_objs[i] = arch_to_object (at);
… …
656 } 633 }
657 634
658 for (i = 0; i < NUM_COINS; i++) 635 for (i = 0; i < NUM_COINS; i++)
659 { 636 {
660 if (coin_objs[i]->nrof) 637 if (coin_objs[i]->nrof)
661 {
662 object *tmp = insert_ob_in_ob (coin_objs[i], pouch); 638 insert_ob_in_ob (coin_objs [i], pouch);
663
664 esrv_send_item (pl, tmp);
665 esrv_send_item (pl, pouch);
666
667 if (pl != pouch)
668 esrv_update_item (UPD_WEIGHT, pl, pouch);
669
670 if (pl->type != PLAYER)
671 esrv_send_item (pl, pl);
672 }
673 else 639 else
674 free_object (coin_objs[i]); 640 coin_objs[i]->destroy ();
675 } 641 }
676} 642}
677 643
678/* Checks all unpaid items in op's inventory, adds up all the money they 644/* Checks all unpaid items in op's inventory, adds up all the money they
679 * have, and checks that they can actually afford what they want to buy. 645 * have, and checks that they can actually afford what they want to buy.
… …
684can_pay (object *pl) 650can_pay (object *pl)
685{ 651{
686 int unpaid_count = 0; 652 int unpaid_count = 0;
687 sint64 unpaid_price = 0; 653 sint64 unpaid_price = 0;
688 sint64 player_wealth = query_money (pl); 654 sint64 player_wealth = query_money (pl);
689 object *item;
690 655
691 if (!pl || pl->type != PLAYER) 656 if (!pl || pl->type != PLAYER)
692 { 657 {
693 LOG (llevError, "can_pay(): called against something that isn't a player\n"); 658 LOG (llevError, "can_pay(): called against something that isn't a player\n");
694 return 0; 659 return 0;
… …
701 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP); 666 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP);
702 } 667 }
703 668
704 if (unpaid_price > player_wealth) 669 if (unpaid_price > player_wealth)
705 { 670 {
706 char buf[MAX_BUF]; 671 dynbuf_text buf;
707 char cost[MAX_BUF];
708 char missing[MAX_BUF];
709 672
710 snprintf (cost, MAX_BUF, "%s", cost_string_from_value (unpaid_price, 0)); 673 buf << "You have " << unpaid_count
711 snprintf (missing, MAX_BUF, "%s", cost_string_from_value (unpaid_price - player_wealth, 0)); 674 << " unpaid item(s) that would cost you " << cost_string_from_value (unpaid_price, 0)
675 << ". You need another " << cost_string_from_value (unpaid_price - player_wealth, 0)
676 << " to be able to afford that.";
712 677
713 snprintf (buf, MAX_BUF, "You have %d unpaid items that would cost you %s. You need another %s to be able to afford that.", 678 pl->failmsg (buf);
714 unpaid_count, cost, missing);
715 new_draw_info (NDI_UNIQUE, 0, pl, buf);
716 679
717 return 0; 680 return 0;
718 } 681 }
719 else 682 else
720 return 1; 683 return 1;
… …
749 SET_FLAG (op, FLAG_UNPAID); 712 SET_FLAG (op, FLAG_UNPAID);
750 return 0; 713 return 0;
751 } 714 }
752 else 715 else
753 { 716 {
754 object *tmp;
755 tag_t c = op->count;
756
757 CLEAR_FLAG (op, FLAG_UNPAID); 717 CLEAR_FLAG (op, FLAG_UNPAID);
758 CLEAR_FLAG (op, FLAG_PLAYER_SOLD); 718 CLEAR_FLAG (op, FLAG_PLAYER_SOLD);
759 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op)); 719 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op));
760 tmp = merge_ob (op, NULL);
761 720
762 if (pl->type == PLAYER) 721 if (!merge_ob (op, op->env->inv))
763 {
764 if (tmp)
765 { /* it was merged */
766 esrv_del_item (pl->contr, c);
767 op = tmp;
768 }
769
770 esrv_send_item (pl, op); 722 esrv_update_item (UPD_FLAGS, pl, op);
771 }
772 723
773 goto next_item; 724 goto next_item;
774 } 725 }
775 } 726 }
776 } 727 }
… …
795{ 746{
796 int count = 0; 747 int count = 0;
797 archetype *at = 0; 748 archetype *at = 0;
798 object *pouch = 0, *tmp = 0; 749 object *pouch = 0, *tmp = 0;
799 750
800 for (count = 0; coins[count] != NULL; count++) 751 for (count = 0; coins[count]; count++)
801 { 752 {
802 at = find_archetype (coins[count]); 753 at = archetype::find (coins[count]);
803 754
804 if (at == NULL) 755 if (at == NULL)
805 LOG (llevError, "Could not find %s archetype\n", coins[count]); 756 LOG (llevError, "Could not find %s archetype\n", coins[count]);
806 else if ((amount / at->clone.value) > 0) 757 else if ((amount / at->value) > 0)
807 { 758 {
808 for (pouch = pl->inv; pouch; pouch = pouch->below) 759 for (pouch = pl->inv; pouch; pouch = pouch->below)
809 { 760 {
810 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race && strstr (pouch->race, "gold")) 761 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race && strstr (pouch->race, "gold"))
811 { 762 {
812 int w = at->clone.weight * (100 - pouch->stats.Str) / 100; 763 int w = at->weight * (100 - pouch->stats.Str) / 100;
813 int n = amount / at->clone.value; 764 int n = amount / at->value;
814 765
815 if (w == 0) 766 if (w == 0)
816 w = 1; /* Prevent divide by zero */ 767 w = 1; /* Prevent divide by zero */
817 768
818 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit)) 769 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit))
819 { 770 {
820 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n) 771 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n)
821 n = (pouch->weight_limit - pouch->carrying) / w; 772 n = (pouch->weight_limit - pouch->carrying) / w;
822 773
823 tmp = arch_to_object (at); 774 object *tmp = arch_to_object (at);
824 tmp->nrof = n; 775 tmp->nrof = n;
825 amount -= tmp->nrof * tmp->value; 776 amount -= tmp->nrof * tmp->value;
826 tmp = insert_ob_in_ob (tmp, pouch); 777 pouch->insert (tmp);
827 esrv_send_item (pl, tmp);
828 esrv_send_item (pl, pouch);
829 esrv_update_item (UPD_WEIGHT, pl, pouch);
830 esrv_send_item (pl, pl);
831 } 778 }
832 } 779 }
833 } 780 }
834 781
835 if (amount / at->clone.value > 0) 782 if (amount / at->value > 0)
836 { 783 {
837 tmp = arch_to_object (at); 784 object *tmp = arch_to_object (at);
838 tmp->nrof = amount / tmp->value; 785 tmp->nrof = amount / tmp->value;
839 amount -= tmp->nrof * tmp->value; 786 amount -= tmp->nrof * tmp->value;
840 tmp = insert_ob_in_ob (tmp, pl); 787 pl->insert (tmp);
841 esrv_send_item (pl, tmp);
842 esrv_send_item (pl, pl);
843 } 788 }
844 } 789 }
845 } 790 }
846 791
847 if (amount != 0) 792 if (amount != 0)
848#ifndef WIN32
849 LOG (llevError, "Warning - payment in pay_player () not zero: %llu\n", amount); 793 LOG (llevError, "Warning - payment in pay_player () not zero: %llu\n", amount);
850#else
851 LOG (llevError, "Warning - payment in pay_player () not zero: %I64u\n", amount);
852#endif
853} 794}
854 795
855/* elmex: this is for the bank plugin :( */ 796/* elmex: this is for the bank plugin :( */
856sint64 797sint64
857pay_player_arch (object *pl, const char *arch, sint64 amount) 798pay_player_arch (object *pl, const char *arch, sint64 amount)
858{ 799{
859 archetype *at = find_archetype (arch);
860 object *tmp = NULL;
861
862 if (at == NULL)
863 return 0;
864
865 if (amount > 0) 800 if (amount)
866 { 801 {
867 tmp = arch_to_object (at); 802 object *ob = archetype::get (arch);
803
804 if (!ob)
805 return 0;
806
868 tmp->nrof = amount; 807 ob->nrof = amount;
869 tmp = insert_ob_in_ob (tmp, pl); 808 pl->insert (ob);
870 esrv_send_item (pl, tmp);
871 esrv_send_item (pl, pl);
872 } 809 }
873 810
874 return 1; 811 return 1;
875} 812}
876 813
… …
879 * buy item. 816 * buy item.
880 * 817 *
881 * Modified to fill available race: gold containers before dumping 818 * Modified to fill available race: gold containers before dumping
882 * remaining coins in character's inventory. 819 * remaining coins in character's inventory.
883 */ 820 */
884void 821bool
885sell_item (object *op, object *pl) 822sell_item (object *op, object *pl)
886{ 823{
887 sint64 amount = query_cost (op, pl, F_SELL | F_SHOP), extra_gain; 824 sint64 amount = query_cost (op, pl, F_SELL | F_SHOP), extra_gain;
888 825
889 if (pl == NULL || pl->type != PLAYER) 826 if (pl == NULL || pl->type != PLAYER)
890 { 827 {
891 LOG (llevDebug, "Object other than player tried to sell something.\n"); 828 LOG (llevDebug, "Object other than player tried to sell something.\n");
892 return; 829 return false;
893 } 830 }
894 831
895 op->custom_name = 0; 832 op->custom_name = 0;
896 833
897 if (!amount) 834 if (!amount)
898 { 835 {
899 new_draw_info_format (NDI_UNIQUE, 0, pl, "We're not interested in %s.", query_name (op)); 836 new_draw_info_format (NDI_UNIQUE, 0, pl, "We're not interested in %s.",
900 837 query_name (op));
901 /* Even if the character doesn't get anything for it, it may still be 838 // elmex: change: the player now gets the item back if the shop is not
902 * worth something. If so, make it unpaid 839 // interested in it.
903 */
904 if (op->value)
905 {
906 SET_FLAG (op, FLAG_UNPAID);
907 SET_FLAG (op, FLAG_PLAYER_SOLD);
908 }
909
910 identify (op);
911 return; 840 return false;
912 } 841 }
913 842
914 /* We compare the price with the one for a player 843 /* We compare the price with the one for a player
915 * without bargaining skill. 844 * without bargaining skill.
916 * This determins the amount of exp (if any) gained for bargaining. 845 * This determins the amount of exp (if any) gained for bargaining.
… …
921 if (extra_gain > 0) 850 if (extra_gain > 0)
922 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE); 851 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE);
923 852
924 pay_player (pl, amount); 853 pay_player (pl, amount);
925 854
926 new_draw_info_format (NDI_UNIQUE, 0, pl, "You receive %s for %s.", query_cost_string (op, pl, F_SELL | F_SHOP), query_name (op)); 855 new_draw_info_format (NDI_UNIQUE, 0, pl, "You receive %s for %s.",
856 query_cost_string (op, pl, F_SELL | F_SHOP), query_name (op));
857 pl->play_sound (sound_find ("shop_sell"));
927 858
928 SET_FLAG (op, FLAG_UNPAID); 859 SET_FLAG (op, FLAG_UNPAID);
929 identify (op); 860 identify (op);
930}
931 861
862 return true;
863}
932 864
933/* returns a double that is the ratio of the price that a shop will offer for 865/* returns a double that is the ratio of the price that a shop will offer for
934 * item based on the shops specialisation. Does not take account of greed, 866 * item based on the shops specialisation. Does not take account of greed,
935 * returned value is between (2*SPECIALISATION_EFFECT-1) and 1 and in any 867 * returned value is between SPECIALISATION_EFFECT and 1.
936 * event is never less than 0.1 (calling functions divide by it)
937 */ 868 */
938static double 869static double
939shop_specialisation_ratio (const object *item, const mapstruct *map) 870shop_specialisation_ratio (const object *item, const maptile *map)
940{ 871{
941 shopitems *items = map->shopitems; 872 shopitems *items = map->shopitems;
942 double ratio = SPECIALISATION_EFFECT, likedness = 0.001; 873 double likedness = 0.;
943 int i; 874 int i;
944 875
945 if (item == NULL) 876 if (item == NULL)
946 { 877 {
947 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", map->path); 878 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", &map->path);
948 return 0; 879 return 0;
949 } 880 }
950 881
951 if (!item->type) 882 if (!item->type)
952 { 883 {
953 LOG (llevError, "shop_specialisation_ratio: passed an item with an invalid type\n"); 884 LOG (llevError, "shop_specialisation_ratio: passed an item with an invalid type\n");
954 /* 885 /*
955 * I'm not really sure what the /right/ thing to do here is, these types of 886 * I'm not really sure what the /right/ thing to do here is, these types of
956 * item shouldn't exist anyway, but returning the ratio is probably the best bet.." 887 * item shouldn't exist anyway, but returning the ratio is probably the best bet.."
957 */ 888 */
958 return ratio; 889 return SPECIALISATION_EFFECT;
959 } 890 }
960 891
961 if (map->shopitems) 892 if (map->shopitems)
962 { 893 {
963 for (i = 0; i < items[0].index; i++) 894 for (i = 0; i < items[0].index; i++)
… …
965 likedness = items[i].strength / 100.0; 896 likedness = items[i].strength / 100.0;
966 } 897 }
967 898
968 if (likedness > 1.0) 899 if (likedness > 1.0)
969 { /* someone has been rather silly with the map headers. */ 900 { /* someone has been rather silly with the map headers. */
970 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, map->path); 901 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, &map->path);
971 likedness = 1.0; 902 likedness = 1.0;
972 } 903 }
973 904
974 if (likedness < -1.0) 905 if (likedness < -1.0)
975 { 906 {
976 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, map->path); 907 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, &map->path);
977 likedness = -1.0; 908 likedness = -1.0;
978 } 909 }
979 910
980 ratio = ratio + (1.0 - ratio) * likedness; 911 return lerp (likedness, -1., 1., SPECIALISATION_EFFECT, 1.);
981
982 if (ratio <= 0.1)
983 ratio = 0.1; /* if the ratio were much lower than this, we would get silly prices */
984
985 return ratio;
986} 912}
987 913
988/*returns the greed of the shop on map, or 1 if it isn't specified. */ 914/*returns the greed of the shop on map, or 1 if it isn't specified. */
989static double 915static double
990shop_greed (const mapstruct *map) 916shop_greed (const maptile *map)
991{ 917{
992 double greed = 1.0;
993
994 if (map->shopgreed)
995 return map->shopgreed; 918 return map->shopgreed
996 return greed; 919 ? map->shopgreed
920 : 1.;
997} 921}
998 922
999/* Returns a double based on how much the shopkeeper approves of the player. 923/* Returns a double based on how much the shopkeeper approves of the player.
1000 * this is based on the race of the shopkeeper and that of the player. 924 * this is based on the race of the shopkeeper and that of the player.
1001 */ 925 */
1002double 926double
1003shopkeeper_approval (const mapstruct *map, const object *player) 927shopkeeper_approval (const maptile *map, const object *player)
1004{ 928{
1005 double approval = 1.0; 929 return map->shoprace && player->race != map->shoprace
1006 930 ? DISLIKE_RATIO
1007 if (map->shoprace) 931 : 1.;
1008 {
1009 approval = NEUTRAL_RATIO;
1010 if (player->race && !strcmp (player->race, map->shoprace))
1011 approval = 1.0;
1012 }
1013
1014 return approval;
1015} 932}
1016 933
1017/* limit the value of items based on the wealth of the shop. If the item is close 934/* limit the value of items based on the wealth of the shop. If the item is close
1018 * to the maximum value a shop will offer, we start to reduce it, if the item is 935 * to the maximum value a shop will offer, we start to reduce it, if the item is
1019 * below the minimum value the shop is prepared to trade in, then we don't 936 * below the minimum value the shop is prepared to trade in, then we don't
… …
1023 */ 940 */
1024static sint64 941static sint64
1025value_limit (sint64 val, int quantity, const object *who, int isshop) 942value_limit (sint64 val, int quantity, const object *who, int isshop)
1026{ 943{
1027 sint64 newval, unit_price, tmpshopmax; 944 sint64 newval, unit_price, tmpshopmax;
1028 mapstruct *map; 945 maptile *map;
1029 946
1030 unit_price = val / quantity; 947 unit_price = val / quantity;
1031 948
1032 if (!isshop || !who) 949 if (!isshop || !who)
1033 { 950 {
… …
1063 980
1064/* gives a desciption of the shop on their current map to the player op. */ 981/* gives a desciption of the shop on their current map to the player op. */
1065int 982int
1066describe_shop (const object *op) 983describe_shop (const object *op)
1067{ 984{
1068 mapstruct *map = op->map; 985 maptile *map = op->map;
1069 986
1070 /*shopitems *items=map->shopitems; */ 987 /*shopitems *items=map->shopitems; */
1071 int pos = 0, i; 988 int pos = 0, i;
1072 double opinion = 0; 989 double opinion = 0;
1073 char tmp[MAX_BUF] = "\0"; 990 char tmp[MAX_BUF] = "\0";
… …
1148{ 1065{
1149 shopinv *s1 = (shopinv *) a1, *s2 = (shopinv *) a2; 1066 shopinv *s1 = (shopinv *) a1, *s2 = (shopinv *) a2;
1150 1067
1151 if (s1->type < s2->type) 1068 if (s1->type < s2->type)
1152 return -1; 1069 return -1;
1070
1153 if (s1->type > s2->type) 1071 if (s1->type > s2->type)
1154 return 1; 1072 return 1;
1155 1073
1156 /* the type is the same (what atoi gets), so do a strcasecmp to sort 1074 /* the type is the same (what atoi gets), so do a strcasecmp to sort
1157 * via alphabetical order 1075 * via alphabetical order
… …
1187 case RING: 1105 case RING:
1188 case AMULET: 1106 case AMULET:
1189 case BRACERS: 1107 case BRACERS:
1190 case GIRDLE: 1108 case GIRDLE:
1191 sprintf (buf, "%s %s", query_base_name (tmp, 0), describe_item (tmp, NULL)); 1109 sprintf (buf, "%s %s", query_base_name (tmp, 0), describe_item (tmp, NULL));
1192 items[*numitems].item_sort = strdup_local (buf); 1110 items[*numitems].item_sort = strdup (buf);
1193 sprintf (buf, "%s %s", query_name (tmp), describe_item (tmp, NULL)); 1111 sprintf (buf, "%s %s", query_name (tmp), describe_item (tmp, NULL));
1194 items[*numitems].item_real = strdup_local (buf); 1112 items[*numitems].item_real = strdup (buf);
1195 (*numitems)++; 1113 (*numitems)++;
1196 break; 1114 break;
1197#endif 1115#endif
1198 1116
1199 default: 1117 default:
1200 items[*numitems].item_sort = strdup_local (query_base_name (tmp, 0)); 1118 items[*numitems].item_sort = strdup (query_base_name (tmp, 0));
1201 items[*numitems].item_real = strdup_local (query_base_name (tmp, 1)); 1119 items[*numitems].item_real = strdup (query_base_name (tmp, 1));
1202 (*numitems)++; 1120 (*numitems)++;
1203 break; 1121 break;
1204 } 1122 }
1205 SET_FLAG (tmp, FLAG_UNPAID); 1123 SET_FLAG (tmp, FLAG_UNPAID);
1206} 1124}
1207 1125
1208void 1126void
1209shop_listing (object *op) 1127shop_listing (object *sign, object *op)
1210{ 1128{
1211 int i, j, numitems = 0, numallocated = 0, nx, ny; 1129 int i, j, numitems = 0, numallocated = 0, x1, x2, y1, y2;
1212 char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 1130 const char *shop_coords = sign->kv (shstr_shop_coords);
1213 object *stack; 1131 object *stack;
1214 shopinv *items; 1132 shopinv *items;
1215 1133
1216 /* Should never happen, but just in case a monster does apply a sign */ 1134 /* Should never happen, but just in case a monster does apply a sign */
1217 if (op->type != PLAYER) 1135 if (op->type != PLAYER)
1218 return; 1136 return;
1219 1137
1220 new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:"); 1138 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2)))
1139 {
1140 x1 = 0;
1141 y1 = 0;
1142 x2 = op->map->width - 1;
1143 y2 = op->map->height - 1;
1144 }
1221 1145
1222 magic_mapping_mark (op, map_mark, 3);
1223 items = (shopinv *) malloc (40 * sizeof (shopinv)); 1146 items = (shopinv *) malloc (40 * sizeof (shopinv));
1224 numallocated = 40; 1147 numallocated = 40;
1225 1148
1226 /* Find all the appropriate items */ 1149 /* Find all the appropriate items */
1227 for (i = 0; i < MAP_WIDTH (op->map); i++) 1150 for (i = x1; i <= x2; i++)
1228 { 1151 {
1229 for (j = 0; j < MAP_HEIGHT (op->map); j++) 1152 for (j = y1; j < y2; j++)
1230 {
1231 /* magic map code now centers the map on the object at MAGIC_MAP_HALF.
1232 * 1153 {
1233 */ 1154 if (is_in_shop (op->map, i, j))
1234 nx = i - op->x + MAGIC_MAP_HALF;
1235 ny = j - op->y + MAGIC_MAP_HALF;
1236 /* unlikely, but really big shops could run into this issue */
1237 if (nx < 0 || ny < 0 || nx > MAGIC_MAP_SIZE || ny > MAGIC_MAP_SIZE)
1238 continue;
1239
1240 if (map_mark[nx + MAGIC_MAP_SIZE * ny] & FACE_FLOOR)
1241 { 1155 {
1242 stack = get_map_ob (op->map, i, j); 1156 stack = GET_MAP_OB (op->map, i, j);
1243 1157
1244 while (stack) 1158 while (stack)
1245 { 1159 {
1246 if (QUERY_FLAG (stack, FLAG_UNPAID)) 1160 if (QUERY_FLAG (stack, FLAG_UNPAID))
1247 { 1161 {
1248 if (numitems == numallocated) 1162 if (numitems == numallocated)
1249 { 1163 {
1250 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10)); 1164 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10));
1251 numallocated += 10; 1165 numallocated += 10;
1252 } 1166 }
1167
1253 add_shop_item (stack, items, &numitems, &numallocated); 1168 add_shop_item (stack, items, &numitems, &numallocated);
1254 } 1169 }
1170
1255 stack = stack->above; 1171 stack = stack->above;
1256 } 1172 }
1257 } 1173 }
1258 } 1174 }
1259 } 1175 }
1260 1176
1261 free (map_mark);
1262
1263 if (numitems == 0) 1177 if (numitems == 0)
1264 { 1178 {
1265 new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n"); 1179 new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n");
1266 free (items); 1180 free (items);
1267 return; 1181 return;
1268 } 1182 }
1269 1183
1270 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort); 1184 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort);
1185
1186 new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:");
1271 1187
1272 for (i = 0; i < numitems; i++) 1188 for (i = 0; i < numitems; i++)
1273 { 1189 {
1274 /* Collapse items of the same name together */ 1190 /* Collapse items of the same name together */
1275 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real)) 1191 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real))
… …
1284 items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real); 1200 items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real);
1285 free (items[i].item_sort); 1201 free (items[i].item_sort);
1286 free (items[i].item_real); 1202 free (items[i].item_real);
1287 } 1203 }
1288 } 1204 }
1205
1289 free (items); 1206 free (items);
1290} 1207}
1291 1208
1292/* elmex: this function checks whether the object is in a shop */ 1209/* elmex: this function checks whether the object is in a shop */
1293bool 1210bool
1294is_in_shop (object *o) 1211is_in_shop (object *o)
1295{ 1212{
1296 if (!o->map) 1213 if (!o->is_on_map ())
1297 return false; 1214 return false;
1298 1215
1299 return is_in_shop (o->map, o->x, o->y); 1216 return is_in_shop (o->map, o->x, o->y);
1300} 1217}
1301 1218
1302/* elmex: this function checks whether we are in a shop or not */ 1219/* elmex: this function checks whether we are in a shop or not
1220 - change 2007-11-26: enhanced the O(n) case by stopping at the first
1221 floor tile. this possibly will make map bugs where shopfloors are above
1222 floors more obvious.
1223*/
1224
1303bool 1225bool
1304is_in_shop (mapstruct *map, int x, int y) 1226is_in_shop (maptile *map, int x, int y)
1305{ 1227{
1306 for (object *floor = get_map_ob (map, x, y); floor; floor = floor->above) 1228 for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above)
1229 if (QUERY_FLAG (floor, FLAG_IS_FLOOR))
1307 if (floor->type == SHOP_FLOOR) 1230 return floor->type == SHOP_FLOOR;
1308 return true;
1309 1231
1310 return false; 1232 return false;
1311} 1233}
1234

Diff Legend

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