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.14 by root, Tue Sep 12 19:20:08 2006 UTC vs.
Revision 1.56 by root, Mon Sep 29 10:20:49 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.14 2006/09/12 19:20:08 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
… …
138 { 126 {
139 if (tmp->arch != NULL) 127 if (tmp->arch != NULL)
140 { 128 {
141 if (flag == F_BUY) 129 if (flag == F_BUY)
142 { 130 {
143 LOG (llevError, "Asking for buy-value of unidentified object.\n"); 131 LOG (llevError | logBacktrace, "Asking for buy-value of unidentified object.\n");
144 val = tmp->arch->clone.value * 50 * number; 132 val = tmp->arch->value * 50 * number;
145 } 133 }
146 else 134 else
147 { /* Trying to sell something, or get true value */ 135 { /* Trying to sell something, or get true value */
148 if (tmp->type == POTION) 136 if (tmp->type == POTION)
149 val = number * 40; /* Don't want to give anything away */ 137 val = number * 40; /* Don't want to give anything away */
… …
151 { 139 {
152 /* 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
153 * unknown objects 141 * unknown objects
154 */ 142 */
155 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) 143 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED))
156 val = number * tmp->arch->clone.value * 2 / 3; 144 val = number * tmp->arch->value * 2 / 3;
157 else 145 else
158 val = number * tmp->arch->clone.value / 3; 146 val = number * tmp->arch->value / 3;
159 } 147 }
160 } 148 }
161 } 149 }
162 else 150 else
163 { /* No archetype with this object */ 151 { /* No archetype with this object */
164 LOG (llevDebug, "In sell item: Have object with no archetype: %s\n", &tmp->name); 152 LOG (llevDebug, "In sell item: Have object with no archetype: %s\n", &tmp->name);
165 if (flag == F_BUY) 153 if (flag == F_BUY)
166 { 154 {
167 LOG (llevError, "Asking for buy-value of unidentified object without arch.\n"); 155 LOG (llevError | logBacktrace, "Asking for buy-value of unidentified object without arch.\n");
168 val = number * tmp->value * 10; 156 val = number * tmp->value * 10;
169 } 157 }
170 else 158 else
171 val = number * tmp->value / 5; 159 val = number * tmp->value / 5;
172 } 160 }
… …
174 162
175 /* 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
176 * identified, AND the object is magical and the archetype is non 164 * identified, AND the object is magical and the archetype is non
177 * magical, then change values accordingly. The tmp->arch==NULL is 165 * magical, then change values accordingly. The tmp->arch==NULL is
178 * 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
179 * tmp->arch->clone.magic for any magic. The check for archetype 167 * tmp->arch->magic for any magic. The check for archetype
180 * 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
181 * default magical. This is because the archetype value should have 169 * default magical. This is because the archetype value should have
182 * already figured in that value. 170 * already figured in that value.
183 */ 171 */
184 if ((QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified || 172 if ((QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified ||
185 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))
186 { 174 {
187 if (tmp->magic > 0) 175 if (tmp->magic > 0)
188 val *= (3 * tmp->magic * tmp->magic * tmp->magic); 176 val *= (3 * tmp->magic * tmp->magic * tmp->magic);
189 else 177 else
190 /* Note that tmp->magic is negative, so that this 178 /* Note that tmp->magic is negative, so that this
… …
218 * AND Cha = 30 will get optimal price. 206 * AND Cha = 30 will get optimal price.
219 * Thus charisma will never get useless. 207 * Thus charisma will never get useless.
220 * -b.e. edler@heydernet.de 208 * -b.e. edler@heydernet.de
221 */ 209 */
222 210
223 if (who != NULL && who->type == PLAYER) 211 if (who && who->type == PLAYER)
224 { 212 {
225 int lev_bargain = 0; 213 int lev_bargain = 0;
226 int lev_identify = 0; 214 int lev_identify = 0;
227 int idskill1 = 0;
228 int idskill2 = 0;
229 const typedata *tmptype;
230
231 tmptype = get_typedata (tmp->type);
232 215
233 if (find_skill_by_number (who, SK_BARGAINING)) 216 if (find_skill_by_number (who, SK_BARGAINING))
234 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level; 217 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level;
235 218
236 if (tmptype) 219 if (const typedata *tmptype = get_typedata (tmp->type))
237 { 220 {
238 idskill1 = tmptype->identifyskill; 221 if (int idskill1 = tmptype->identifyskill)
239
240 if (idskill1)
241 { 222 {
242 idskill2 = tmptype->identifyskill2; 223 int idskill2 = tmptype->identifyskill2;
243 224
244 if (find_skill_by_number (who, idskill1)) 225 if (find_skill_by_number (who, idskill1))
245 lev_identify = find_skill_by_number (who, idskill1)->level; 226 lev_identify = find_skill_by_number (who, idskill1)->level;
246 227
247 if (idskill2 && find_skill_by_number (who, idskill2)) 228 if (idskill2 && find_skill_by_number (who, idskill2))
248 lev_identify += find_skill_by_number (who, idskill2)->level; 229 lev_identify += find_skill_by_number (who, idskill2)->level;
249 } 230 }
250 } 231 }
251 else
252 LOG (llevError, "Query_cost: item %s hasn't got a valid type\n", tmp->debug_desc ());
253 232
254 /* ratio determines how much of the price modification 233 /* ratio determines how much of the price modification
255 * will come from the basic stat charisma 234 * will come from the basic stat charisma
256 * the rest will come from the level in bargaining skill 235 * the rest will come from the level in bargaining skill
257 */ 236 */
258 const double cha_ratio = 0.40; 237 const double cha_ratio = 0.40;
259 238
260 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);
261
262 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.);
263
264 diff = .02 + (.80 - .02) * diff; 241 diff = .02 + (.80 - .02) * diff;
265 242
266 if (flag == F_BUY) 243 if (flag == F_BUY)
267 val += (val * diff); 244 val += val * diff;
268 else if (flag == F_SELL) 245 else if (flag == F_SELL)
269 val -= (val * diff); 246 val -= val * diff;
270 247
271 // 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
272 // then the range is adjusted randomly around the correct value 249 // then the range is adjusted randomly around the correct value
273 if (approximate) 250 if (approximate)
274 approx_range = sint64 (val / sqrt (lev_identify * 3 + 1)); 251 approx_range = sint64 (val / sqrt (lev_identify * 3 + 1));
275 } 252 }
276 253
277 /* 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
278 * overflow of diff above. That shoudl only happen if 255 * overflow of diff above. That should only happen if
279 * we are selling objects - in that case, the person just 256 * we are selling objects - in that case, the person just
280 * gets no money. 257 * gets no money.
281 */ 258 */
282 if ((sint64) val < 0) 259 if ((sint64) val < 0)
283 val = 0; 260 val = 0;
… …
311 if (QUERY_FLAG (tmp, FLAG_PLAYER_SOLD)) 288 if (QUERY_FLAG (tmp, FLAG_PLAYER_SOLD))
312 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));
313 else 290 else
314 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)));
315 } 292 }
293
316 /* 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
317 * 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
318 * pointful, and could give fun with rounding. 296 * pointful, and could give fun with rounding.
319 */ 297 */
320 if (who->map->path != NULL && val > 50) 298 //TODO: why use cosf at all, just % and scale linearly, gives more even distribution
321 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));
322 } 301 }
302
323 return (sint64) val; 303 return (sint64) val;
324} 304}
325 305
326/* 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
327 * cointype placement. 307 * cointype placement.
… …
334 314
335 do 315 do
336 { 316 {
337 if (coins[*cointype] == NULL) 317 if (coins[*cointype] == NULL)
338 return NULL; 318 return NULL;
339 coin = find_archetype (coins[*cointype]); 319 coin = archetype::find (coins[*cointype]);
340 if (coin == NULL) 320 if (coin == NULL)
341 return NULL; 321 return NULL;
342 *cointype += 1; 322 *cointype += 1;
343 } 323 }
344 while (coin->clone.value > c); 324 while (coin->value > c);
345 325
346 return coin; 326 return coin;
347} 327}
348 328
349/* 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
… …
365 345
366 coin = find_next_coin (cost, &cointype); 346 coin = find_next_coin (cost, &cointype);
367 if (coin == NULL) 347 if (coin == NULL)
368 return "nothing"; 348 return "nothing";
369 349
370 num = cost / coin->clone.value; 350 num = cost / coin->value;
371 /* so long as nrof is 32 bit, this is true. 351 /* so long as nrof is 32 bit, this is true.
372 * 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
373 * is basically true. 353 * is basically true.
374 */ 354 */
375 if ((cost / coin->clone.value) > UINT32_MAX) 355 if ((cost / coin->value) > UINT32_MAX)
376 { 356 {
377 strcpy (buf, "an unimaginable sum of money"); 357 strcpy (buf, "an unimaginable sum of money");
378 return buf; 358 return buf;
379 } 359 }
380 360
381 cost -= num * (sint64)coin->clone.value; 361 cost -= num * (sint64)coin->value;
382 362
383 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);
384 364
385 next_coin = find_next_coin (cost, &cointype); 365 next_coin = find_next_coin (cost, &cointype);
386 if (next_coin == NULL || approx) 366 if (next_coin == NULL || approx)
387 return buf; 367 return buf;
388 368
389 coin = next_coin; 369 coin = next_coin;
390 num = cost / coin->clone.value; 370 num = cost / coin->value;
391 cost -= num * (sint64)coin->clone.value; 371 cost -= num * (sint64)coin->value;
392 372
393 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);
394 374
395 return buf; 375 return buf;
396} 376}
397 377
398const char * 378const char *
… …
428 archetype *coin = find_next_coin (real_value, &cointype); 408 archetype *coin = find_next_coin (real_value, &cointype);
429 409
430 if (coin == NULL) 410 if (coin == NULL)
431 return "nothing"; 411 return "nothing";
432 412
433 num = real_value / coin->clone.value; 413 num = real_value / coin->value;
414
434 if (num == 1) 415 if (num == 1)
435 sprintf (buf, "about one %s", &coin->clone.name); 416 sprintf (buf, "about one %s", &coin->object::name);
436 else if (num < 5) 417 else if (num < 5)
437 sprintf (buf, "a few %s", &coin->clone.name_pl); 418 sprintf (buf, "a few %s", &coin->object::name_pl);
438 else if (num < 10) 419 else if (num < 10)
439 sprintf (buf, "several %s", &coin->clone.name_pl); 420 sprintf (buf, "several %s", &coin->object::name_pl);
440 else if (num < 25) 421 else if (num < 25)
441 sprintf (buf, "a moderate amount of %s", &coin->clone.name_pl); 422 sprintf (buf, "a moderate amount of %s", &coin->object::name_pl);
442 else if (num < 100) 423 else if (num < 100)
443 sprintf (buf, "lots of %s", &coin->clone.name_pl); 424 sprintf (buf, "lots of %s", &coin->object::name_pl);
444 else if (num < 1000) 425 else if (num < 1000)
445 sprintf (buf, "a great many %s", &coin->clone.name_pl); 426 sprintf (buf, "a great many %s", &coin->object::name_pl);
446 else 427 else
447 sprintf (buf, "a vast quantity of %s", &coin->clone.name_pl); 428 sprintf (buf, "a vast quantity of %s", &coin->object::name_pl);
429
448 return buf; 430 return buf;
449 } 431 }
450 } 432 }
451 } 433 }
452 434
… …
511 493
512 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 494 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
513 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")))
514 pay_from_container (pl, pouch, to_pay); 496 pay_from_container (pl, pouch, to_pay);
515 497
516 fix_player (pl); 498 pl->update_stats ();
517 return 1; 499 return 1;
518} 500}
519 501
520/* 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
521 * 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
… …
548 530
549 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 531 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
550 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")))
551 pay_from_container (pl, pouch, to_pay); 533 pay_from_container (pl, pouch, to_pay);
552 534
553 if (settings.real_wiz == FALSE && QUERY_FLAG (pl, FLAG_WAS_WIZ)) 535 pl->update_stats ();
554 SET_FLAG (op, FLAG_WAS_WIZ);
555 536
556 fix_player (pl);
557 return 1; 537 return 1;
558} 538}
559 539
560/* 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
561 * the player. 541 * the player.
… …
590 570
591 if (tmp->type == MONEY) 571 if (tmp->type == MONEY)
592 { 572 {
593 for (i = 0; i < NUM_COINS; i++) 573 for (i = 0; i < NUM_COINS; i++)
594 { 574 {
595 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))
596 { 576 {
597 // 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.
598 if (coin_objs [i]) 578 if (coin_objs [i])
599 { 579 {
600 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]);
601 remove_ob (tmp);
602 coin_objs[i]->nrof += tmp->nrof; 581 coin_objs[i]->nrof += tmp->nrof;
603 esrv_del_item (pl->contr, tmp->count); 582 tmp->destroy (true);
604 free_object (tmp);
605 } 583 }
606 else 584 else
607 { 585 {
608 remove_ob (tmp); 586 tmp->remove ();
609
610 if (pouch->type == PLAYER)
611 esrv_del_item (pl->contr, tmp->count);
612
613 coin_objs[i] = tmp; 587 coin_objs[i] = tmp;
614 } 588 }
615 589
616 break; 590 break;
617 } 591 }
618 } 592 }
619 593
620 if (i == NUM_COINS) 594 if (i == NUM_COINS)
621 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);
622 } 596 }
623 } 597 }
624 598
625 /* 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. */
626 /* 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 */
627 for (i = 0; i < NUM_COINS; i++) 601 for (i = 0; i < NUM_COINS; i++)
628 if (!coin_objs[i]) 602 if (!coin_objs[i])
629 { 603 {
630 at = find_archetype (coins[NUM_COINS - 1 - i]); 604 at = archetype::find (coins[NUM_COINS - 1 - i]);
631 605
632 if (at == NULL) 606 if (at == NULL)
633 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]);
634 608
635 coin_objs[i] = arch_to_object (at); 609 coin_objs[i] = arch_to_object (at);
… …
657 count--; 631 count--;
658 } 632 }
659 } 633 }
660 634
661 for (i = 0; i < NUM_COINS; i++) 635 for (i = 0; i < NUM_COINS; i++)
662 {
663 if (coin_objs[i]->nrof) 636 if (coin_objs[i]->nrof)
664 {
665 object *tmp = insert_ob_in_ob (coin_objs[i], pouch); 637 insert_ob_in_ob (coin_objs [i], pouch);
666
667 esrv_send_item (pl, tmp);
668 esrv_send_item (pl, pouch);
669
670 if (pl != pouch)
671 esrv_update_item (UPD_WEIGHT, pl, pouch);
672
673 if (pl->type != PLAYER)
674 esrv_send_item (pl, pl);
675 }
676 else 638 else
677 free_object (coin_objs[i]); 639 coin_objs[i]->destroy (true);
678 }
679} 640}
680 641
681/* Checks all unpaid items in op's inventory, adds up all the money they 642/* Checks all unpaid items in op's inventory, adds up all the money they
682 * have, and checks that they can actually afford what they want to buy. 643 * have, and checks that they can actually afford what they want to buy.
683 * Returns 1 if they can, and 0 if they can't. also prints an appropriate message 644 * Returns 1 if they can, and 0 if they can't. also prints an appropriate message
… …
687can_pay (object *pl) 648can_pay (object *pl)
688{ 649{
689 int unpaid_count = 0; 650 int unpaid_count = 0;
690 sint64 unpaid_price = 0; 651 sint64 unpaid_price = 0;
691 sint64 player_wealth = query_money (pl); 652 sint64 player_wealth = query_money (pl);
692 object *item;
693 653
694 if (!pl || pl->type != PLAYER) 654 if (!pl || pl->type != PLAYER)
695 { 655 {
696 LOG (llevError, "can_pay(): called against something that isn't a player\n"); 656 LOG (llevError, "can_pay(): called against something that isn't a player\n");
697 return 0; 657 return 0;
… …
704 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP); 664 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP);
705 } 665 }
706 666
707 if (unpaid_price > player_wealth) 667 if (unpaid_price > player_wealth)
708 { 668 {
709 char buf[MAX_BUF]; 669 dynbuf_text buf;
710 char cost[MAX_BUF];
711 char missing[MAX_BUF];
712 670
713 snprintf (cost, MAX_BUF, "%s", cost_string_from_value (unpaid_price, 0)); 671 buf << "You have " << unpaid_count
714 snprintf (missing, MAX_BUF, "%s", cost_string_from_value (unpaid_price - player_wealth, 0)); 672 << " unpaid item(s) that would cost you " << cost_string_from_value (unpaid_price, 0)
673 << ". You need another " << cost_string_from_value (unpaid_price - player_wealth, 0)
674 << " to be able to afford that.";
715 675
716 snprintf (buf, MAX_BUF, "You have %d unpaid items that would cost you %s. You need another %s to be able to afford that.", 676 pl->failmsg (buf);
717 unpaid_count, cost, missing);
718 new_draw_info (NDI_UNIQUE, 0, pl, buf);
719 677
720 return 0; 678 return 0;
721 } 679 }
722 else 680 else
723 return 1; 681 return 1;
… …
752 SET_FLAG (op, FLAG_UNPAID); 710 SET_FLAG (op, FLAG_UNPAID);
753 return 0; 711 return 0;
754 } 712 }
755 else 713 else
756 { 714 {
757 object *tmp;
758 tag_t c = op->count;
759
760 CLEAR_FLAG (op, FLAG_UNPAID); 715 CLEAR_FLAG (op, FLAG_UNPAID);
761 CLEAR_FLAG (op, FLAG_PLAYER_SOLD); 716 CLEAR_FLAG (op, FLAG_PLAYER_SOLD);
762 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op)); 717 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op));
763 tmp = merge_ob (op, NULL);
764 718
765 if (pl->type == PLAYER) 719 if (!merge_ob (op, op->env->inv))
766 {
767 if (tmp)
768 { /* it was merged */
769 esrv_del_item (pl->contr, c);
770 op = tmp;
771 }
772
773 esrv_send_item (pl, op); 720 esrv_update_item (UPD_FLAGS, pl, op);
774 }
775 721
776 goto next_item; 722 goto next_item;
777 } 723 }
778 } 724 }
779 } 725 }
… …
798{ 744{
799 int count = 0; 745 int count = 0;
800 archetype *at = 0; 746 archetype *at = 0;
801 object *pouch = 0, *tmp = 0; 747 object *pouch = 0, *tmp = 0;
802 748
803 for (count = 0; coins[count] != NULL; count++) 749 for (count = 0; coins[count]; count++)
804 { 750 {
805 at = find_archetype (coins[count]); 751 at = archetype::find (coins[count]);
806 752
807 if (at == NULL) 753 if (at == NULL)
808 LOG (llevError, "Could not find %s archetype\n", coins[count]); 754 LOG (llevError, "Could not find %s archetype\n", coins[count]);
809 else if ((amount / at->clone.value) > 0) 755 else if ((amount / at->value) > 0)
810 { 756 {
811 for (pouch = pl->inv; pouch; pouch = pouch->below) 757 for (pouch = pl->inv; pouch; pouch = pouch->below)
812 { 758 {
813 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race && strstr (pouch->race, "gold")) 759 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race && strstr (pouch->race, "gold"))
814 { 760 {
815 int w = at->clone.weight * (100 - pouch->stats.Str) / 100; 761 int w = at->weight * (100 - pouch->stats.Str) / 100;
816 int n = amount / at->clone.value; 762 int n = amount / at->value;
817 763
818 if (w == 0) 764 if (w == 0)
819 w = 1; /* Prevent divide by zero */ 765 w = 1; /* Prevent divide by zero */
820 766
821 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit)) 767 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit))
822 { 768 {
823 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n) 769 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n)
824 n = (pouch->weight_limit - pouch->carrying) / w; 770 n = (pouch->weight_limit - pouch->carrying) / w;
825 771
826 tmp = arch_to_object (at); 772 object *tmp = arch_to_object (at);
827 tmp->nrof = n; 773 tmp->nrof = n;
828 amount -= tmp->nrof * tmp->value; 774 amount -= tmp->nrof * tmp->value;
829 tmp = insert_ob_in_ob (tmp, pouch); 775 pouch->insert (tmp);
830 esrv_send_item (pl, tmp);
831 esrv_send_item (pl, pouch);
832 esrv_update_item (UPD_WEIGHT, pl, pouch);
833 esrv_send_item (pl, pl);
834 } 776 }
835 } 777 }
836 } 778 }
837 779
838 if (amount / at->clone.value > 0) 780 if (amount / at->value > 0)
839 { 781 {
840 tmp = arch_to_object (at); 782 object *tmp = arch_to_object (at);
841 tmp->nrof = amount / tmp->value; 783 tmp->nrof = amount / tmp->value;
842 amount -= tmp->nrof * tmp->value; 784 amount -= tmp->nrof * tmp->value;
843 tmp = insert_ob_in_ob (tmp, pl); 785 pl->insert (tmp);
844 esrv_send_item (pl, tmp);
845 esrv_send_item (pl, pl);
846 } 786 }
847 } 787 }
848 } 788 }
849 789
850 if (amount != 0) 790 if (amount != 0)
851#ifndef WIN32
852 LOG (llevError, "Warning - payment in pay_player () not zero: %llu\n", amount); 791 LOG (llevError, "Warning - payment in pay_player () not zero: %llu\n", amount);
853#else
854 LOG (llevError, "Warning - payment in pay_player () not zero: %I64u\n", amount);
855#endif
856} 792}
857 793
858/* elmex: this is for the bank plugin :( */ 794/* elmex: this is for the bank plugin :( */
859sint64 795sint64
860pay_player_arch (object *pl, const char *arch, sint64 amount) 796pay_player_arch (object *pl, const char *arch, sint64 amount)
861{ 797{
862 archetype *at = find_archetype (arch);
863 object *tmp = NULL;
864
865 if (at == NULL)
866 return 0;
867
868 if (amount > 0) 798 if (amount)
869 { 799 {
870 tmp = arch_to_object (at); 800 object *ob = archetype::get (arch);
801
802 if (!ob)
803 return 0;
804
871 tmp->nrof = amount; 805 ob->nrof = amount;
872 tmp = insert_ob_in_ob (tmp, pl); 806 pl->insert (ob);
873 esrv_send_item (pl, tmp);
874 esrv_send_item (pl, pl);
875 } 807 }
876 808
877 return 1; 809 return 1;
878} 810}
879 811
… …
882 * buy item. 814 * buy item.
883 * 815 *
884 * Modified to fill available race: gold containers before dumping 816 * Modified to fill available race: gold containers before dumping
885 * remaining coins in character's inventory. 817 * remaining coins in character's inventory.
886 */ 818 */
887void 819bool
888sell_item (object *op, object *pl) 820sell_item (object *op, object *pl)
889{ 821{
890 sint64 amount = query_cost (op, pl, F_SELL | F_SHOP), extra_gain; 822 sint64 amount = query_cost (op, pl, F_SELL | F_SHOP), extra_gain;
891 823
892 if (pl == NULL || pl->type != PLAYER) 824 if (pl == NULL || pl->type != PLAYER)
893 { 825 {
894 LOG (llevDebug, "Object other than player tried to sell something.\n"); 826 LOG (llevDebug, "Object other than player tried to sell something.\n");
895 return; 827 return false;
896 } 828 }
897 829
898 op->custom_name = 0; 830 op->custom_name = 0;
899 831
900 if (!amount) 832 if (!amount)
901 { 833 {
902 new_draw_info_format (NDI_UNIQUE, 0, pl, "We're not interested in %s.", query_name (op)); 834 new_draw_info_format (NDI_UNIQUE, 0, pl, "We're not interested in %s.",
903 835 query_name (op));
904 /* Even if the character doesn't get anything for it, it may still be 836 // elmex: change: the player now gets the item back if the shop is not
905 * worth something. If so, make it unpaid 837 // interested in it.
906 */
907 if (op->value)
908 {
909 SET_FLAG (op, FLAG_UNPAID);
910 SET_FLAG (op, FLAG_PLAYER_SOLD);
911 }
912
913 identify (op);
914 return; 838 return false;
915 } 839 }
916 840
917 /* We compare the price with the one for a player 841 /* We compare the price with the one for a player
918 * without bargaining skill. 842 * without bargaining skill.
919 * This determins the amount of exp (if any) gained for bargaining. 843 * This determins the amount of exp (if any) gained for bargaining.
… …
924 if (extra_gain > 0) 848 if (extra_gain > 0)
925 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE); 849 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE);
926 850
927 pay_player (pl, amount); 851 pay_player (pl, amount);
928 852
929 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)); 853 new_draw_info_format (NDI_UNIQUE, 0, pl, "You receive %s for %s.",
854 query_cost_string (op, pl, F_SELL | F_SHOP), query_name (op));
855 pl->play_sound (sound_find ("shop_sell"));
930 856
931 SET_FLAG (op, FLAG_UNPAID); 857 SET_FLAG (op, FLAG_UNPAID);
932 identify (op); 858 identify (op);
933}
934 859
860 return true;
861}
935 862
936/* returns a double that is the ratio of the price that a shop will offer for 863/* returns a double that is the ratio of the price that a shop will offer for
937 * item based on the shops specialisation. Does not take account of greed, 864 * item based on the shops specialisation. Does not take account of greed,
938 * returned value is between (2*SPECIALISATION_EFFECT-1) and 1 and in any 865 * returned value is between SPECIALISATION_EFFECT and 1.
939 * event is never less than 0.1 (calling functions divide by it)
940 */ 866 */
941static double 867static double
942shop_specialisation_ratio (const object *item, const mapstruct *map) 868shop_specialisation_ratio (const object *item, const maptile *map)
943{ 869{
944 shopitems *items = map->shopitems; 870 shopitems *items = map->shopitems;
945 double ratio = SPECIALISATION_EFFECT, likedness = 0.001; 871 double likedness = 0.;
946 int i; 872 int i;
947 873
948 if (item == NULL) 874 if (item == NULL)
949 { 875 {
950 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", map->path); 876 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", &map->path);
951 return 0; 877 return 0;
952 } 878 }
953 879
954 if (!item->type) 880 if (!item->type)
955 { 881 {
956 LOG (llevError, "shop_specialisation_ratio: passed an item with an invalid type\n"); 882 LOG (llevError, "shop_specialisation_ratio: passed an item with an invalid type\n");
957 /* 883 /*
958 * I'm not really sure what the /right/ thing to do here is, these types of 884 * I'm not really sure what the /right/ thing to do here is, these types of
959 * item shouldn't exist anyway, but returning the ratio is probably the best bet.." 885 * item shouldn't exist anyway, but returning the ratio is probably the best bet.."
960 */ 886 */
961 return ratio; 887 return SPECIALISATION_EFFECT;
962 } 888 }
963 889
964 if (map->shopitems) 890 if (map->shopitems)
965 { 891 {
966 for (i = 0; i < items[0].index; i++) 892 for (i = 0; i < items[0].index; i++)
… …
968 likedness = items[i].strength / 100.0; 894 likedness = items[i].strength / 100.0;
969 } 895 }
970 896
971 if (likedness > 1.0) 897 if (likedness > 1.0)
972 { /* someone has been rather silly with the map headers. */ 898 { /* someone has been rather silly with the map headers. */
973 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, map->path); 899 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, &map->path);
974 likedness = 1.0; 900 likedness = 1.0;
975 } 901 }
976 902
977 if (likedness < -1.0) 903 if (likedness < -1.0)
978 { 904 {
979 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, map->path); 905 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, &map->path);
980 likedness = -1.0; 906 likedness = -1.0;
981 } 907 }
982 908
983 ratio = ratio + (1.0 - ratio) * likedness; 909 return lerp (likedness, -1., 1., SPECIALISATION_EFFECT, 1.);
984
985 if (ratio <= 0.1)
986 ratio = 0.1; /* if the ratio were much lower than this, we would get silly prices */
987
988 return ratio;
989} 910}
990 911
991/*returns the greed of the shop on map, or 1 if it isn't specified. */ 912/*returns the greed of the shop on map, or 1 if it isn't specified. */
992static double 913static double
993shop_greed (const mapstruct *map) 914shop_greed (const maptile *map)
994{ 915{
995 double greed = 1.0;
996
997 if (map->shopgreed)
998 return map->shopgreed; 916 return map->shopgreed
999 return greed; 917 ? map->shopgreed
918 : 1.;
1000} 919}
1001 920
1002/* Returns a double based on how much the shopkeeper approves of the player. 921/* Returns a double based on how much the shopkeeper approves of the player.
1003 * this is based on the race of the shopkeeper and that of the player. 922 * this is based on the race of the shopkeeper and that of the player.
1004 */ 923 */
1005double 924double
1006shopkeeper_approval (const mapstruct *map, const object *player) 925shopkeeper_approval (const maptile *map, const object *player)
1007{ 926{
1008 double approval = 1.0; 927 return map->shoprace && player->race != map->shoprace
1009 928 ? DISLIKE_RATIO
1010 if (map->shoprace) 929 : 1.;
1011 {
1012 approval = NEUTRAL_RATIO;
1013 if (player->race && !strcmp (player->race, map->shoprace))
1014 approval = 1.0;
1015 }
1016
1017 return approval;
1018} 930}
1019 931
1020/* limit the value of items based on the wealth of the shop. If the item is close 932/* limit the value of items based on the wealth of the shop. If the item is close
1021 * to the maximum value a shop will offer, we start to reduce it, if the item is 933 * to the maximum value a shop will offer, we start to reduce it, if the item is
1022 * below the minimum value the shop is prepared to trade in, then we don't 934 * below the minimum value the shop is prepared to trade in, then we don't
… …
1026 */ 938 */
1027static sint64 939static sint64
1028value_limit (sint64 val, int quantity, const object *who, int isshop) 940value_limit (sint64 val, int quantity, const object *who, int isshop)
1029{ 941{
1030 sint64 newval, unit_price, tmpshopmax; 942 sint64 newval, unit_price, tmpshopmax;
1031 mapstruct *map; 943 maptile *map;
1032 944
1033 unit_price = val / quantity; 945 unit_price = val / quantity;
1034 946
1035 if (!isshop || !who) 947 if (!isshop || !who)
1036 { 948 {
… …
1066 978
1067/* gives a desciption of the shop on their current map to the player op. */ 979/* gives a desciption of the shop on their current map to the player op. */
1068int 980int
1069describe_shop (const object *op) 981describe_shop (const object *op)
1070{ 982{
1071 mapstruct *map = op->map; 983 maptile *map = op->map;
1072 984
1073 /*shopitems *items=map->shopitems; */ 985 /*shopitems *items=map->shopitems; */
1074 int pos = 0, i; 986 int pos = 0, i;
1075 double opinion = 0; 987 double opinion = 0;
1076 char tmp[MAX_BUF] = "\0"; 988 char tmp[MAX_BUF] = "\0";
… …
1151{ 1063{
1152 shopinv *s1 = (shopinv *) a1, *s2 = (shopinv *) a2; 1064 shopinv *s1 = (shopinv *) a1, *s2 = (shopinv *) a2;
1153 1065
1154 if (s1->type < s2->type) 1066 if (s1->type < s2->type)
1155 return -1; 1067 return -1;
1068
1156 if (s1->type > s2->type) 1069 if (s1->type > s2->type)
1157 return 1; 1070 return 1;
1158 1071
1159 /* the type is the same (what atoi gets), so do a strcasecmp to sort 1072 /* the type is the same (what atoi gets), so do a strcasecmp to sort
1160 * via alphabetical order 1073 * via alphabetical order
… …
1190 case RING: 1103 case RING:
1191 case AMULET: 1104 case AMULET:
1192 case BRACERS: 1105 case BRACERS:
1193 case GIRDLE: 1106 case GIRDLE:
1194 sprintf (buf, "%s %s", query_base_name (tmp, 0), describe_item (tmp, NULL)); 1107 sprintf (buf, "%s %s", query_base_name (tmp, 0), describe_item (tmp, NULL));
1195 items[*numitems].item_sort = strdup_local (buf); 1108 items[*numitems].item_sort = strdup (buf);
1196 sprintf (buf, "%s %s", query_name (tmp), describe_item (tmp, NULL)); 1109 sprintf (buf, "%s %s", query_name (tmp), describe_item (tmp, NULL));
1197 items[*numitems].item_real = strdup_local (buf); 1110 items[*numitems].item_real = strdup (buf);
1198 (*numitems)++; 1111 (*numitems)++;
1199 break; 1112 break;
1200#endif 1113#endif
1201 1114
1202 default: 1115 default:
1203 items[*numitems].item_sort = strdup_local (query_base_name (tmp, 0)); 1116 items[*numitems].item_sort = strdup (query_base_name (tmp, 0));
1204 items[*numitems].item_real = strdup_local (query_base_name (tmp, 1)); 1117 items[*numitems].item_real = strdup (query_base_name (tmp, 1));
1205 (*numitems)++; 1118 (*numitems)++;
1206 break; 1119 break;
1207 } 1120 }
1208 SET_FLAG (tmp, FLAG_UNPAID); 1121 SET_FLAG (tmp, FLAG_UNPAID);
1209} 1122}
1210 1123
1211void 1124void
1212shop_listing (object *op) 1125shop_listing (object *sign, object *op)
1213{ 1126{
1214 int i, j, numitems = 0, numallocated = 0, nx, ny; 1127 int i, j, numitems = 0, numallocated = 0, x1, x2, y1, y2;
1215 char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 1128 const char *shop_coords = sign->kv (shstr_shop_coords);
1216 object *stack; 1129 object *stack;
1217 shopinv *items; 1130 shopinv *items;
1218 1131
1219 /* Should never happen, but just in case a monster does apply a sign */ 1132 /* Should never happen, but just in case a monster does apply a sign */
1220 if (op->type != PLAYER) 1133 if (op->type != PLAYER)
1221 return; 1134 return;
1222 1135
1223 new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:"); 1136 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2)))
1137 {
1138 x1 = 0;
1139 y1 = 0;
1140 x2 = op->map->width - 1;
1141 y2 = op->map->height - 1;
1142 }
1224 1143
1225 magic_mapping_mark (op, map_mark, 3);
1226 items = (shopinv *) malloc (40 * sizeof (shopinv)); 1144 items = (shopinv *) malloc (40 * sizeof (shopinv));
1227 numallocated = 40; 1145 numallocated = 40;
1228 1146
1229 /* Find all the appropriate items */ 1147 /* Find all the appropriate items */
1230 for (i = 0; i < MAP_WIDTH (op->map); i++) 1148 for (i = x1; i <= x2; i++)
1231 { 1149 {
1232 for (j = 0; j < MAP_HEIGHT (op->map); j++) 1150 for (j = y1; j < y2; j++)
1233 {
1234 /* magic map code now centers the map on the object at MAGIC_MAP_HALF.
1235 * 1151 {
1236 */ 1152 if (is_in_shop (op->map, i, j))
1237 nx = i - op->x + MAGIC_MAP_HALF;
1238 ny = j - op->y + MAGIC_MAP_HALF;
1239 /* unlikely, but really big shops could run into this issue */
1240 if (nx < 0 || ny < 0 || nx > MAGIC_MAP_SIZE || ny > MAGIC_MAP_SIZE)
1241 continue;
1242
1243 if (map_mark[nx + MAGIC_MAP_SIZE * ny] & FACE_FLOOR)
1244 { 1153 {
1245 stack = get_map_ob (op->map, i, j); 1154 stack = GET_MAP_OB (op->map, i, j);
1246 1155
1247 while (stack) 1156 while (stack)
1248 { 1157 {
1249 if (QUERY_FLAG (stack, FLAG_UNPAID)) 1158 if (QUERY_FLAG (stack, FLAG_UNPAID))
1250 { 1159 {
1251 if (numitems == numallocated) 1160 if (numitems == numallocated)
1252 { 1161 {
1253 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10)); 1162 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10));
1254 numallocated += 10; 1163 numallocated += 10;
1255 } 1164 }
1165
1256 add_shop_item (stack, items, &numitems, &numallocated); 1166 add_shop_item (stack, items, &numitems, &numallocated);
1257 } 1167 }
1168
1258 stack = stack->above; 1169 stack = stack->above;
1259 } 1170 }
1260 } 1171 }
1261 } 1172 }
1262 } 1173 }
1263 1174
1264 free (map_mark);
1265
1266 if (numitems == 0) 1175 if (numitems == 0)
1267 { 1176 {
1268 new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n"); 1177 new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n");
1269 free (items); 1178 free (items);
1270 return; 1179 return;
1271 } 1180 }
1272 1181
1273 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort); 1182 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort);
1183
1184 new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:");
1274 1185
1275 for (i = 0; i < numitems; i++) 1186 for (i = 0; i < numitems; i++)
1276 { 1187 {
1277 /* Collapse items of the same name together */ 1188 /* Collapse items of the same name together */
1278 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real)) 1189 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real))
… …
1287 items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real); 1198 items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real);
1288 free (items[i].item_sort); 1199 free (items[i].item_sort);
1289 free (items[i].item_real); 1200 free (items[i].item_real);
1290 } 1201 }
1291 } 1202 }
1203
1292 free (items); 1204 free (items);
1293} 1205}
1294 1206
1295/* elmex: this function checks whether the object is in a shop */ 1207/* elmex: this function checks whether the object is in a shop */
1296bool 1208bool
1297is_in_shop (object *o) 1209is_in_shop (object *o)
1298{ 1210{
1299 if (!o->map) 1211 if (!o->is_on_map ())
1300 return false; 1212 return false;
1301 1213
1302 return is_in_shop (o->map, o->x, o->y); 1214 return is_in_shop (o->map, o->x, o->y);
1303} 1215}
1304 1216
1305/* elmex: this function checks whether we are in a shop or not */ 1217/* elmex: this function checks whether we are in a shop or not
1218 - change 2007-11-26: enhanced the O(n) case by stopping at the first
1219 floor tile. this possibly will make map bugs where shopfloors are above
1220 floors more obvious.
1221*/
1222
1306bool 1223bool
1307is_in_shop (mapstruct *map, int x, int y) 1224is_in_shop (maptile *map, int x, int y)
1308{ 1225{
1309 for (object *floor = get_map_ob (map, x, y); floor; floor = floor->above) 1226 for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above)
1227 if (QUERY_FLAG (floor, FLAG_IS_FLOOR))
1310 if (floor->type == SHOP_FLOOR) 1228 return floor->type == SHOP_FLOOR;
1311 return true;
1312 1229
1313 return false; 1230 return false;
1314} 1231}
1232

Diff Legend

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