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.42 by root, Sat Jul 21 19:18:02 2007 UTC vs.
Revision 1.79 by root, Thu Apr 15 02:51:40 2010 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <spells.h> 26#include <spells.h>
26#include <skills.h> 27#include <skills.h>
27#include <living.h> 28#include <living.h>
28#include <sproto.h> 29#include <sproto.h>
29#include <math.h>
30 30
31/* 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
32 * 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
33 * 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
34 * therefore making this number higher, makes specialisation less effective. 34 * therefore making this number higher, makes specialisation less effective.
… …
42 42
43static void pay_from_container (object *pl, object *pouch, sint64 &to_pay); 43static void pay_from_container (object *pl, object *pouch, sint64 &to_pay);
44static 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);
45static double shop_specialisation_ratio (const object *item, const maptile *map); 45static double shop_specialisation_ratio (const object *item, const maptile *map);
46static double shop_greed (const maptile *map); 46static double shop_greed (const maptile *map);
47
48#define NUM_COINS 4 /* number of coin types */
49static const char *const coins[] = { "royalty", "platinacoin", "goldcoin", "silvercoin", NULL };
50 47
51/* 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
52 * 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
53 * 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.
54 * 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
… …
77 74
78sint64 75sint64
79query_cost (const object *tmp, object *who, int flag) 76query_cost (const object *tmp, object *who, int flag)
80{ 77{
81 double val; 78 double val;
82 int number; /* used to better calculate value */
83 int no_bargain; 79 int no_bargain;
84 int identified; 80 int identified;
85 int not_cursed; 81 int not_cursed;
86 int approximate; 82 int approximate;
87 int shop; 83 int shop;
… …
112 108
113 LOG (llevError, "Query_cost: Gem type with unknown flag %d: %s\n", flag, tmp->debug_desc ()); 109 LOG (llevError, "Query_cost: Gem type with unknown flag %d: %s\n", flag, tmp->debug_desc ());
114 return 0; 110 return 0;
115 } 111 }
116 112
117 number = tmp->nrof; 113 int number = tmp->number_of ();
118 if (number == 0) 114
119 number = 1;
120 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified) 115 if (tmp->flag [FLAG_IDENTIFIED] || !tmp->need_identify () || identified)
121 { 116 {
122 if (!not_cursed && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))) 117 if (!not_cursed && (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]))
123 return 0; 118 return 0;
124 else 119 else
125 val = tmp->value * number; 120 val = tmp->value * number;
126 } 121 }
127 /* This area deals with objects that are not identified, but can be */ 122 /* This area deals with objects that are not identified, but can be */
128 else 123 else
129 { 124 {
130 if (tmp->arch != NULL)
131 {
132 if (flag == F_BUY) 125 if (flag == F_BUY)
126 {
127 LOG (llevError | logBacktrace, "Asking for buy-value of unidentified object: %s\n", tmp->debug_desc ());
128 val = tmp->arch->value * 50 * number;
129 }
130 else
131 { /* Trying to sell something, or get true value */
132 if (tmp->type == POTION)
133 val = number * 40; /* Don't want to give anything away */
134 else
133 { 135 {
134 LOG (llevError, "Asking for buy-value of unidentified object.\n"); 136 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
135 val = tmp->arch->value * 50 * number; 137 * unknown objects
138 */
139 if (tmp->flag [FLAG_BEEN_APPLIED])
140 val = number * tmp->arch->value * 2 / 3;
141 else
142 val = number * tmp->arch->value / 3;
136 } 143 }
137 else
138 { /* Trying to sell something, or get true value */
139 if (tmp->type == POTION)
140 val = number * 40; /* Don't want to give anything away */
141 else
142 {
143 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
144 * unknown objects
145 */
146 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED))
147 val = number * tmp->arch->value * 2 / 3;
148 else
149 val = number * tmp->arch->value / 3;
150 }
151 }
152 }
153 else
154 { /* No archetype with this object */
155 LOG (llevDebug, "In sell item: Have object with no archetype: %s\n", &tmp->name);
156 if (flag == F_BUY)
157 {
158 LOG (llevError, "Asking for buy-value of unidentified object without arch.\n");
159 val = number * tmp->value * 10;
160 }
161 else
162 val = number * tmp->value / 5;
163 } 144 }
164 } 145 }
165 146
166 /* If the item has been applied or identifed or does not need to be 147 /* If the item has been applied or identifed or does not need to be
167 * identified, AND the object is magical and the archetype is non 148 * identified, AND the object is magical and the archetype is non
… …
170 * tmp->arch->magic for any magic. The check for archetype 151 * tmp->arch->magic for any magic. The check for archetype
171 * magic is to not give extra money for archetypes that are by 152 * magic is to not give extra money for archetypes that are by
172 * default magical. This is because the archetype value should have 153 * default magical. This is because the archetype value should have
173 * already figured in that value. 154 * already figured in that value.
174 */ 155 */
175 if ((QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified || 156 if ((tmp->flag [FLAG_IDENTIFIED] || !tmp->need_identify () || identified || tmp->flag [FLAG_BEEN_APPLIED])
176 QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) && tmp->magic && (tmp->arch == NULL || !tmp->arch->magic)) 157 && tmp->magic && (!tmp->arch || !tmp->arch->magic))
177 { 158 {
178 if (tmp->magic > 0) 159 if (tmp->magic > 0)
179 val *= (3 * tmp->magic * tmp->magic * tmp->magic); 160 val *= (3 * tmp->magic * tmp->magic * tmp->magic);
180 else 161 else
181 /* Note that tmp->magic is negative, so that this 162 /* Note that tmp->magic is negative, so that this
… …
188 { 169 {
189 /* Value of the wand is multiplied by the number of 170 /* Value of the wand is multiplied by the number of
190 * charges. the treasure code already sets up the value 171 * charges. the treasure code already sets up the value
191 * 50 charges is used as the baseline. 172 * 50 charges is used as the baseline.
192 */ 173 */
193 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified) 174 if (tmp->flag [FLAG_IDENTIFIED] || !tmp->need_identify () || identified)
194 val = (val * tmp->stats.food) / 50; 175 val = (val * tmp->stats.food) / 50;
195 else /* if not identified, presume one charge */ 176 else /* if not identified, presume one charge */
196 val /= 50; 177 val /= 50;
197 } 178 }
198 179
… …
209 * AND Cha = 30 will get optimal price. 190 * AND Cha = 30 will get optimal price.
210 * Thus charisma will never get useless. 191 * Thus charisma will never get useless.
211 * -b.e. edler@heydernet.de 192 * -b.e. edler@heydernet.de
212 */ 193 */
213 194
214 if (who != NULL && who->type == PLAYER) 195 if (who && who->type == PLAYER)
215 { 196 {
216 int lev_bargain = 0; 197 int lev_bargain = 0;
217 int lev_identify = 0; 198 int lev_identify = 0;
218 int idskill1 = 0;
219 int idskill2 = 0;
220 const typedata *tmptype;
221
222 tmptype = get_typedata (tmp->type);
223 199
224 if (find_skill_by_number (who, SK_BARGAINING)) 200 if (find_skill_by_number (who, SK_BARGAINING))
225 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level; 201 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level;
226 202
227 if (tmptype) 203 if (const typedata *tmptype = get_typedata (tmp->type))
228 { 204 {
229 idskill1 = tmptype->identifyskill; 205 if (int idskill1 = tmptype->identifyskill)
230
231 if (idskill1)
232 { 206 {
233 idskill2 = tmptype->identifyskill2; 207 int idskill2 = tmptype->identifyskill2;
234 208
235 if (find_skill_by_number (who, idskill1)) 209 if (find_skill_by_number (who, idskill1))
236 lev_identify = find_skill_by_number (who, idskill1)->level; 210 lev_identify = find_skill_by_number (who, idskill1)->level;
237 211
238 if (idskill2 && find_skill_by_number (who, idskill2)) 212 if (idskill2 && find_skill_by_number (who, idskill2))
239 lev_identify += find_skill_by_number (who, idskill2)->level; 213 lev_identify += find_skill_by_number (who, idskill2)->level;
240 } 214 }
241 } 215 }
242 else
243 LOG (llevError, "Query_cost: item %s hasn't got a valid type\n", tmp->debug_desc ());
244 216
245 /* ratio determines how much of the price modification 217 /* ratio determines how much of the price modification
246 * will come from the basic stat charisma 218 * will come from the basic stat charisma
247 * the rest will come from the level in bargaining skill 219 * the rest will come from the level in bargaining skill
248 */ 220 */
… …
270 */ 242 */
271 if ((sint64) val < 0) 243 if ((sint64) val < 0)
272 val = 0; 244 val = 0;
273 245
274 /* Unidentified stuff won't sell for more than 60gp */ 246 /* Unidentified stuff won't sell for more than 60gp */
275 if (flag == F_SELL && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && need_identify (tmp) && !identified) 247 if (flag == F_SELL && !tmp->flag [FLAG_IDENTIFIED] && tmp->need_identify () && !identified)
276 { 248 min_it (val, 600);
277 val = (val > 600) ? 600 : val;
278 }
279 249
280 /* if we are in a shop, check how the type of shop should affect the price */ 250 /* if we are in a shop, check how the type of shop should affect the price */
281 if (shop && who) 251 if (shop && who)
282 { 252 {
283 if (flag == F_SELL) 253 if (flag == F_SELL)
… …
295 * be sold for (otherwise players could camp map resets to make money). 265 * be sold for (otherwise players could camp map resets to make money).
296 * In game terms, a non-specialist shop, might not recognise the true 266 * In game terms, a non-specialist shop, might not recognise the true
297 * value of the items they sell (much like how people sometimes find 267 * value of the items they sell (much like how people sometimes find
298 * antiques in a junk shop in real life). 268 * antiques in a junk shop in real life).
299 */ 269 */
300 if (QUERY_FLAG (tmp, FLAG_PLAYER_SOLD)) 270 if (tmp->flag [FLAG_PLAYER_SOLD])
301 val = (val * shop_greed (who->map) * shop_specialisation_ratio (tmp, who->map) / shopkeeper_approval (who->map, who)); 271 val = (val * shop_greed (who->map) * shop_specialisation_ratio (tmp, who->map) / shopkeeper_approval (who->map, who));
302 else 272 else
303 val = (val * shop_greed (who->map) / (shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who))); 273 val = (val * shop_greed (who->map) / (shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who)));
304 } 274 }
305 275
… …
421 391
422 if (coin == NULL) 392 if (coin == NULL)
423 return "nothing"; 393 return "nothing";
424 394
425 num = real_value / coin->value; 395 num = real_value / coin->value;
396
426 if (num == 1) 397 if (num == 1)
427 sprintf (buf, "about one %s", &coin->object::name); 398 sprintf (buf, "about one %s", &coin->object::name);
428 else if (num < 5) 399 else if (num < 5)
429 sprintf (buf, "a few %s", &coin->object::name_pl); 400 sprintf (buf, "a few %s", &coin->object::name_pl);
430 else if (num < 10) 401 else if (num < 10)
… …
435 sprintf (buf, "lots of %s", &coin->object::name_pl); 406 sprintf (buf, "lots of %s", &coin->object::name_pl);
436 else if (num < 1000) 407 else if (num < 1000)
437 sprintf (buf, "a great many %s", &coin->object::name_pl); 408 sprintf (buf, "a great many %s", &coin->object::name_pl);
438 else 409 else
439 sprintf (buf, "a vast quantity of %s", &coin->object::name_pl); 410 sprintf (buf, "a vast quantity of %s", &coin->object::name_pl);
411
440 return buf; 412 return buf;
441 } 413 }
442 } 414 }
443 } 415 }
444 416
… …
475 } 447 }
476 448
477 for (tmp = op->inv; tmp; tmp = tmp->below) 449 for (tmp = op->inv; tmp; tmp = tmp->below)
478 if (tmp->type == MONEY) 450 if (tmp->type == MONEY)
479 total += tmp->nrof * (sint64)tmp->value; 451 total += tmp->nrof * (sint64)tmp->value;
480 else if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && (tmp->race == NULL || strstr (tmp->race, "gold"))) 452 else if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && (!tmp->race || tmp->race.contains ("gold")))
481 total += query_money (tmp); 453 total += query_money (tmp);
482 454
483 return total; 455 return total;
484} 456}
485 457
… …
500 return 0; 472 return 0;
501 473
502 pay_from_container (pl, pl, to_pay); 474 pay_from_container (pl, pl, to_pay);
503 475
504 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 476 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
505 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold"))) 477 if (pouch->type == CONTAINER && pouch->flag [FLAG_APPLIED] && (!pouch->race || pouch->race.contains ("gold")))
506 pay_from_container (pl, pouch, to_pay); 478 pay_from_container (pl, pouch, to_pay);
507 479
508 pl->update_stats (); 480 pl->update_stats ();
509 return 1; 481 return 1;
510} 482}
… …
537 change_exp (pl, saved_money, "bargaining", SK_EXP_NONE); 509 change_exp (pl, saved_money, "bargaining", SK_EXP_NONE);
538 510
539 pay_from_container (pl, pl, to_pay); 511 pay_from_container (pl, pl, to_pay);
540 512
541 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 513 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
542 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold"))) 514 if (pouch->type == CONTAINER && pouch->flag [FLAG_APPLIED] && (!pouch->race || pouch->race.contains ("gold")))
543 pay_from_container (pl, pouch, to_pay); 515 pay_from_container (pl, pouch, to_pay);
544 516
545 pl->update_stats (); 517 pl->update_stats ();
546 518
547 return 1; 519 return 1;
… …
586 { 558 {
587 // This should not happen, but if it does, just merge the two. 559 // This should not happen, but if it does, just merge the two.
588 if (coin_objs [i]) 560 if (coin_objs [i])
589 { 561 {
590 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]); 562 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]);
591 tmp->remove ();
592 coin_objs[i]->nrof += tmp->nrof; 563 coin_objs[i]->nrof += tmp->nrof;
593 esrv_del_item (pl->contr, tmp->count);
594 tmp->destroy (); 564 tmp->destroy ();
595 } 565 }
596 else 566 else
597 { 567 {
598 tmp->remove (); 568 tmp->remove ();
599
600 if (pouch->type == PLAYER)
601 esrv_del_item (pl->contr, tmp->count);
602
603 coin_objs[i] = tmp; 569 coin_objs[i] = tmp;
604 } 570 }
605 571
606 break; 572 break;
607 } 573 }
… …
620 at = archetype::find (coins[NUM_COINS - 1 - i]); 586 at = archetype::find (coins[NUM_COINS - 1 - i]);
621 587
622 if (at == NULL) 588 if (at == NULL)
623 LOG (llevError, "Could not find %s archetype\n", coins[NUM_COINS - 1 - i]); 589 LOG (llevError, "Could not find %s archetype\n", coins[NUM_COINS - 1 - i]);
624 590
625 coin_objs[i] = arch_to_object (at); 591 coin_objs[i] = at->instance ();
626 coin_objs[i]->nrof = 0; 592 coin_objs[i]->nrof = 0;
627 } 593 }
628 594
629 for (i = 0; i < NUM_COINS; i++) 595 for (i = 0; i < NUM_COINS; i++)
630 { 596 {
631 object &coin = *coin_objs[i]; 597 object &coin = *coin_objs[i];
632 sint64 num_coins = min ((to_pay + coin.value - 1) / coin.value, coin.nrof); 598 sint64 num_coins = min ((to_pay + coin.value - 1) / coin.value, (sint64) coin.nrof);
633 to_pay -= num_coins * coin.value; 599 to_pay -= num_coins * coin.value;
634 600
635 coin.nrof -= num_coins; 601 coin.nrof -= num_coins;
636 /* Now start making change. Start at the coin value 602 /* Now start making change. Start at the coin value
637 * below the one we just did, and work down to 603 * below the one we just did, and work down to
… …
647 count--; 613 count--;
648 } 614 }
649 } 615 }
650 616
651 for (i = 0; i < NUM_COINS; i++) 617 for (i = 0; i < NUM_COINS; i++)
652 {
653 if (coin_objs[i]->nrof) 618 if (coin_objs[i]->nrof)
654 {
655 object *tmp = insert_ob_in_ob (coin_objs[i], pouch); 619 insert_ob_in_ob (coin_objs [i], pouch);
656
657 esrv_send_item (pl, tmp);
658 esrv_send_item (pl, pouch);
659
660 if (pl != pouch)
661 esrv_update_item (UPD_WEIGHT, pl, pouch);
662
663 if (pl->type != PLAYER)
664 esrv_send_item (pl, pl);
665 }
666 else 620 else
667 coin_objs[i]->destroy (); 621 coin_objs[i]->destroy ();
668 }
669} 622}
670 623
671/* Checks all unpaid items in op's inventory, adds up all the money they 624/* Checks all unpaid items in op's inventory, adds up all the money they
672 * have, and checks that they can actually afford what they want to buy. 625 * have, and checks that they can actually afford what they want to buy.
673 * Returns 1 if they can, and 0 if they can't. also prints an appropriate message 626 * Returns 1 if they can, and 0 if they can't. also prints an appropriate message
… …
685 LOG (llevError, "can_pay(): called against something that isn't a player\n"); 638 LOG (llevError, "can_pay(): called against something that isn't a player\n");
686 return 0; 639 return 0;
687 } 640 }
688 641
689 for (object::depth_iterator item = pl->begin (); item != pl->end (); ++item) 642 for (object::depth_iterator item = pl->begin (); item != pl->end (); ++item)
690 if (QUERY_FLAG (item, FLAG_UNPAID)) 643 if (item->flag [FLAG_UNPAID])
691 { 644 {
692 unpaid_count++; 645 unpaid_count++;
693 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP); 646 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP);
694 } 647 }
695 648
696 if (unpaid_price > player_wealth) 649 if (unpaid_price > player_wealth)
697 { 650 {
698 char buf[MAX_BUF]; 651 dynbuf_text &buf = msg_dynbuf; buf.clear ();
699 char cost[MAX_BUF];
700 char missing[MAX_BUF];
701 652
702 snprintf (cost, MAX_BUF, "%s", cost_string_from_value (unpaid_price, 0)); 653 buf << "You have " << unpaid_count
703 snprintf (missing, MAX_BUF, "%s", cost_string_from_value (unpaid_price - player_wealth, 0)); 654 << " unpaid item(s) that would cost you " << cost_string_from_value (unpaid_price, 0)
655 << ". You need another " << cost_string_from_value (unpaid_price - player_wealth, 0)
656 << " to be able to afford that. "
657 "H<You cannot leave a shop without paying - drop unpaid items first to be able to leave.>";
704 658
705 snprintf (buf, MAX_BUF, "You have %d unpaid items that would cost you %s. You need another %s to be able to afford that.", 659 pl->failmsg (buf);
706 unpaid_count, cost, missing);
707 new_draw_info (NDI_UNIQUE, 0, pl, buf);
708 660
709 return 0; 661 return 0;
710 } 662 }
711 else 663 else
712 return 1; 664 return 1;
… …
725 { 677 {
726 next_item: 678 next_item:
727 679
728 for (object::depth_iterator op = pl->begin (); op != pl->end (); ++op) 680 for (object::depth_iterator op = pl->begin (); op != pl->end (); ++op)
729 { 681 {
730 if (QUERY_FLAG (op, FLAG_UNPAID)) 682 if (op->flag [FLAG_UNPAID])
731 { 683 {
732 char buf[MAX_BUF]; 684 char buf[MAX_BUF];
733 snprintf (buf, MAX_BUF, "%s", query_cost_string (op, pl, F_BUY | F_SHOP)); 685 snprintf (buf, MAX_BUF, "%s", query_cost_string (op, pl, F_BUY | F_SHOP));
734 686
735 if (!pay_for_item (op, pl)) 687 if (!pay_for_item (op, pl))
736 { 688 {
737 sint64 i = query_cost (op, pl, F_BUY | F_SHOP) - query_money (pl); 689 sint64 i = query_cost (op, pl, F_BUY | F_SHOP) - query_money (pl);
738 690
739 CLEAR_FLAG (op, FLAG_UNPAID); 691 op->clr_flag (FLAG_UNPAID);
740 new_draw_info_format (NDI_UNIQUE, 0, pl, "You lack %s to buy %s.", cost_string_from_value (i, 0), query_name (op)); 692 new_draw_info_format (NDI_UNIQUE, 0, pl, "You lack %s to buy %s.", cost_string_from_value (i, 0), query_name (op));
741 SET_FLAG (op, FLAG_UNPAID); 693 op->set_flag (FLAG_UNPAID);
742 return 0; 694 return 0;
743 } 695 }
744 else 696 else
745 { 697 {
746 object *tmp; 698 op->clr_flag (FLAG_UNPAID);
747 699 op->clr_flag (FLAG_PLAYER_SOLD);
748 CLEAR_FLAG (op, FLAG_UNPAID);
749 CLEAR_FLAG (op, FLAG_PLAYER_SOLD);
750 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op)); 700 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op));
751 tmp = merge_ob (op, NULL);
752 701
753 if (pl->type == PLAYER) 702 if (!merge_ob (op, op->env->inv))
754 {
755 if (tmp)
756 { /* it was merged */
757 esrv_del_item (pl->contr, op->count);
758 op = tmp;
759 }
760
761 esrv_send_item (pl, op); 703 esrv_update_item (UPD_FLAGS, pl, op);
762 }
763 704
764 goto next_item; 705 goto next_item;
765 } 706 }
766 } 707 }
767 } 708 }
… …
786{ 727{
787 int count = 0; 728 int count = 0;
788 archetype *at = 0; 729 archetype *at = 0;
789 object *pouch = 0, *tmp = 0; 730 object *pouch = 0, *tmp = 0;
790 731
791 for (count = 0; coins[count] != NULL; count++) 732 for (count = 0; coins[count]; count++)
792 { 733 {
793 at = archetype::find (coins[count]); 734 at = archetype::find (coins[count]);
794 735
795 if (at == NULL) 736 if (at == NULL)
796 LOG (llevError, "Could not find %s archetype\n", coins[count]); 737 LOG (llevError, "Could not find %s archetype\n", coins[count]);
797 else if ((amount / at->value) > 0) 738 else if ((amount / at->value) > 0)
798 { 739 {
799 for (pouch = pl->inv; pouch; pouch = pouch->below) 740 for (pouch = pl->inv; pouch; pouch = pouch->below)
800 { 741 {
801 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race && strstr (pouch->race, "gold")) 742 if (pouch->type == CONTAINER && pouch->flag [FLAG_APPLIED] && pouch->race.contains ("gold"))
802 { 743 {
803 int w = at->weight * (100 - pouch->stats.Str) / 100; 744 int w = at->weight * (100 - pouch->stats.Str) / 100;
804 int n = amount / at->value; 745 int n = amount / at->value;
805 746
806 if (w == 0) 747 if (w == 0)
… …
809 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit)) 750 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit))
810 { 751 {
811 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n) 752 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n)
812 n = (pouch->weight_limit - pouch->carrying) / w; 753 n = (pouch->weight_limit - pouch->carrying) / w;
813 754
814 tmp = arch_to_object (at); 755 object *tmp = at->instance ();
815 tmp->nrof = n; 756 tmp->nrof = n;
816 amount -= tmp->nrof * tmp->value; 757 amount -= tmp->nrof * tmp->value;
817 tmp = insert_ob_in_ob (tmp, pouch); 758 pouch->insert (tmp);
818 esrv_send_item (pl, tmp);
819 esrv_send_item (pl, pouch);
820 esrv_update_item (UPD_WEIGHT, pl, pouch);
821 esrv_send_item (pl, pl);
822 } 759 }
823 } 760 }
824 } 761 }
825 762
826 if (amount / at->value > 0) 763 if (amount / at->value > 0)
827 { 764 {
828 tmp = arch_to_object (at); 765 object *tmp = at->instance ();
829 tmp->nrof = amount / tmp->value; 766 tmp->nrof = amount / tmp->value;
830 amount -= tmp->nrof * tmp->value; 767 amount -= tmp->nrof * tmp->value;
831 tmp = insert_ob_in_ob (tmp, pl); 768 pl->insert (tmp);
832 esrv_send_item (pl, tmp);
833 esrv_send_item (pl, pl);
834 } 769 }
835 } 770 }
836 } 771 }
837 772
838 if (amount != 0) 773 if (amount != 0)
… …
841 776
842/* elmex: this is for the bank plugin :( */ 777/* elmex: this is for the bank plugin :( */
843sint64 778sint64
844pay_player_arch (object *pl, const char *arch, sint64 amount) 779pay_player_arch (object *pl, const char *arch, sint64 amount)
845{ 780{
846 archetype *at = archetype::find (arch);
847 object *tmp = NULL;
848
849 if (at == NULL)
850 return 0;
851
852 if (amount > 0) 781 if (amount)
853 { 782 {
854 tmp = arch_to_object (at); 783 object *ob = archetype::get (arch);
784
785 if (!ob)
786 return 0;
787
855 tmp->nrof = amount; 788 ob->nrof = amount;
856 tmp = insert_ob_in_ob (tmp, pl); 789 pl->insert (ob);
857 esrv_send_item (pl, tmp);
858 esrv_send_item (pl, pl);
859 } 790 }
860 791
861 return 1; 792 return 1;
862} 793}
863 794
… …
866 * buy item. 797 * buy item.
867 * 798 *
868 * Modified to fill available race: gold containers before dumping 799 * Modified to fill available race: gold containers before dumping
869 * remaining coins in character's inventory. 800 * remaining coins in character's inventory.
870 */ 801 */
871void 802bool
872sell_item (object *op, object *pl) 803sell_item (object *op, object *pl)
873{ 804{
874 sint64 amount = query_cost (op, pl, F_SELL | F_SHOP), extra_gain; 805 sint64 amount = query_cost (op, pl, F_SELL | F_SHOP), extra_gain;
875 806
876 if (pl == NULL || pl->type != PLAYER) 807 if (pl == NULL || pl->type != PLAYER)
877 { 808 {
878 LOG (llevDebug, "Object other than player tried to sell something.\n"); 809 LOG (llevDebug, "Object other than player tried to sell something.\n");
879 return; 810 return false;
880 } 811 }
881 812
882 op->custom_name = 0; 813 op->custom_name = 0;
883 814
884 if (!amount) 815 if (!amount)
885 { 816 {
886 new_draw_info_format (NDI_UNIQUE, 0, pl, "We're not interested in %s.", query_name (op)); 817 new_draw_info_format (NDI_UNIQUE, 0, pl, "We're not interested in %s.",
887 818 query_name (op));
888 /* Even if the character doesn't get anything for it, it may still be 819 // elmex: change: the player now gets the item back if the shop is not
889 * worth something. If so, make it unpaid 820 // interested in it.
890 */
891 if (op->value)
892 {
893 SET_FLAG (op, FLAG_UNPAID);
894 SET_FLAG (op, FLAG_PLAYER_SOLD);
895 }
896
897 identify (op);
898 return; 821 return false;
899 } 822 }
900 823
901 /* We compare the price with the one for a player 824 /* We compare the price with the one for a player
902 * without bargaining skill. 825 * without bargaining skill.
903 * This determins the amount of exp (if any) gained for bargaining. 826 * This determins the amount of exp (if any) gained for bargaining.
… …
908 if (extra_gain > 0) 831 if (extra_gain > 0)
909 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE); 832 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE);
910 833
911 pay_player (pl, amount); 834 pay_player (pl, amount);
912 835
913 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)); 836 new_draw_info_format (NDI_UNIQUE, 0, pl, "You receive %s for %s.",
837 query_cost_string (op, pl, F_SELL | F_SHOP), query_name (op));
838 pl->play_sound (sound_find ("shop_sell"));
914 839
915 SET_FLAG (op, FLAG_UNPAID); 840 op->set_flag (FLAG_UNPAID);
916 identify (op); 841 identify (op);
917}
918 842
843 return true;
844}
919 845
920/* returns a double that is the ratio of the price that a shop will offer for 846/* returns a double that is the ratio of the price that a shop will offer for
921 * item based on the shops specialisation. Does not take account of greed, 847 * item based on the shops specialisation. Does not take account of greed,
922 * returned value is between SPECIALISATION_EFFECT and 1. 848 * returned value is between SPECIALISATION_EFFECT and 1.
923 */ 849 */
924static double 850static double
925shop_specialisation_ratio (const object *item, const maptile *map) 851shop_specialisation_ratio (const object *item, const maptile *map)
926{ 852{
927 shopitems *items = map->shopitems; 853 shopitems *items = map->shopitems;
928 double likedness = 0.; 854 int likedness = 0;
929 int i; 855 int i;
930 856
931 if (item == NULL) 857 if (item == NULL)
932 { 858 {
933 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", &map->path); 859 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", &map->path);
… …
943 */ 869 */
944 return SPECIALISATION_EFFECT; 870 return SPECIALISATION_EFFECT;
945 } 871 }
946 872
947 if (map->shopitems) 873 if (map->shopitems)
948 {
949 for (i = 0; i < items[0].index; i++) 874 for (i = 0; i < items[0].index; i++)
950 if (items[i].typenum == item->type || (!items[i].typenum && likedness == 0.001)) 875 if (items[i].typenum == item->type || (!items[i].typenum && !likedness))
951 likedness = items[i].strength / 100.0; 876 likedness = items[i].strength;
952 }
953 877
954 if (likedness > 1.0) 878 if (likedness > 100)
955 { /* someone has been rather silly with the map headers. */ 879 { /* someone has been rather silly with the map headers. */
956 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, &map->path); 880 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, &map->path);
957 likedness = 1.0; 881 likedness = 100;
958 } 882 }
959 883
960 if (likedness < -1.0) 884 if (likedness < -100)
961 { 885 {
962 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, &map->path); 886 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, &map->path);
963 likedness = -1.0; 887 likedness = -100;
964 } 888 }
965 889
966 return lerp (likedness, -1., 1., SPECIALISATION_EFFECT, 1.); 890 return lerp (double (likedness), -100., 100., SPECIALISATION_EFFECT, 1.);
967} 891}
968 892
969/*returns the greed of the shop on map, or 1 if it isn't specified. */ 893/*returns the greed of the shop on map, or 1 if it isn't specified. */
970static double 894static double
971shop_greed (const maptile *map) 895shop_greed (const maptile *map)
… …
1021 tmpshopmax = map->shopmax ? map->shopmax : 100000; // 20 royalties default 945 tmpshopmax = map->shopmax ? map->shopmax : 100000; // 20 royalties default
1022 946
1023 if (map->shopmin && unit_price < map->shopmin) 947 if (map->shopmin && unit_price < map->shopmin)
1024 return 0; 948 return 0;
1025 else if (unit_price > tmpshopmax / 2) 949 else if (unit_price > tmpshopmax / 2)
1026 newval = MIN ((tmpshopmax / 2) + isqrt (unit_price - tmpshopmax / 2), tmpshopmax); 950 newval = min ((tmpshopmax / 2) + isqrt (unit_price - tmpshopmax / 2), tmpshopmax);
1027 else 951 else
1028 newval = unit_price; 952 newval = unit_price;
1029 } 953 }
1030 954
1031 newval *= quantity; 955 newval *= quantity;
… …
1035 959
1036/* gives a desciption of the shop on their current map to the player op. */ 960/* gives a desciption of the shop on their current map to the player op. */
1037int 961int
1038describe_shop (const object *op) 962describe_shop (const object *op)
1039{ 963{
964 dynbuf_text buf;
1040 maptile *map = op->map; 965 maptile *map = op->map;
1041 966
1042 /*shopitems *items=map->shopitems; */ 967 /*shopitems *items=map->shopitems; */
1043 int pos = 0, i; 968 int pos = 0, i;
1044 double opinion = 0; 969 double opinion = 0;
1045 char tmp[MAX_BUF] = "\0";
1046 970
1047 if (op->type != PLAYER) 971 if (op->type != PLAYER)
1048 return 0; 972 return 0;
1049 973
1050 /*check if there is a shop specified for this map */ 974 /*check if there is a shop specified for this map */
1051 if (map->shopitems || map->shopgreed || map->shoprace || map->shopmin || map->shopmax) 975 if (map->shopitems || map->shopgreed || map->shoprace || map->shopmin || map->shopmax)
1052 { 976 {
1053 new_draw_info (NDI_UNIQUE, 0, op, "From looking at the nearby shop you determine that it trades in:"); 977 buf << "From looking at the nearby shop you determine that it trades in ";
978 int lastcomma = 0, prevcomma = 0;
1054 979
1055 if (map->shopitems) 980 if (map->shopitems)
1056 for (i = 0; i < map->shopitems[0].index; i++) 981 for (i = 0; i < map->shopitems[0].index; i++)
1057 if (map->shopitems[i].name && map->shopitems[i].strength > 10) 982 if (map->shopitems[i].name && map->shopitems[i].strength > 10)
1058 { 983 {
1059 snprintf (tmp + pos, sizeof (tmp) - pos, "%s, ", map->shopitems[i].name_pl); 984 buf << map->shopitems[i].name_pl;
1060 pos += strlen (tmp + pos); 985 prevcomma = lastcomma;
986 lastcomma = buf.size (); // remember offset
987 buf << ", ";
1061 } 988 }
1062 989
1063 if (!pos) 990 if (lastcomma)
991 {
992 buf.splice (lastcomma, 2);
993
994 if (prevcomma)
995 buf.splice (prevcomma, 2, " and ");
996 }
997 else
1064 strcat (tmp, "a little of everything."); 998 buf << "a little of everything.";
1065 999
1066 /* format the string into a list */ 1000 buf << ".\n\n";
1067 make_list_like (tmp);
1068 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", tmp);
1069 1001
1070 if (map->shopmax) 1002 if (map->shopmax)
1071 new_draw_info_format (NDI_UNIQUE, 0, op, "It won't trade for items above %s.", cost_string_from_value (map->shopmax, 0)); 1003 buf << "It won't trade for items above " << cost_string_from_value (map->shopmax, 0) << ".\n\n";
1072 1004
1073 if (map->shopmin) 1005 if (map->shopmin)
1074 new_draw_info_format (NDI_UNIQUE, 0, op, "It won't trade in items worth less than %s.", cost_string_from_value (map->shopmin, 0)); 1006 buf << "It won't trade in items worth less than " << cost_string_from_value (map->shopmin, 0) << ".\n\n";
1075 1007
1076 if (map->shopgreed) 1008 if (map->shopgreed)
1077 { 1009 {
1078 if (map->shopgreed > 2.0) 1010 if (map->shopgreed > 2.0)
1079 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge massively."); 1011 buf << "It tends to overcharge massively.\n\n";
1080 else if (map->shopgreed > 1.5) 1012 else if (map->shopgreed > 1.5)
1081 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge substantially."); 1013 buf << "It tends to overcharge substantially.\n\n";
1082 else if (map->shopgreed > 1.1) 1014 else if (map->shopgreed > 1.1)
1083 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge slightly."); 1015 buf << "It tends to overcharge slightly.\n\n";
1084 else if (map->shopgreed < 0.9) 1016 else if (map->shopgreed < 0.9)
1085 new_draw_info (NDI_UNIQUE, 0, op, "It tends to undercharge."); 1017 buf << "It tends to undercharge.\n\n";
1086 } 1018 }
1087 1019
1088 if (map->shoprace) 1020 if (map->shoprace)
1089 { 1021 {
1090 opinion = shopkeeper_approval (map, op); 1022 opinion = shopkeeper_approval (map, op);
1023
1091 if (opinion > 0.8) 1024 if (opinion > 0.8)
1092 new_draw_info (NDI_UNIQUE, 0, op, "You think the shopkeeper likes you."); 1025 buf << "You think the shopkeeper likes you.\n\n";
1093 else if (opinion > 0.5) 1026 else if (opinion > 0.5)
1094 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper seems unconcerned by you."); 1027 buf << "The shopkeeper seems unconcerned by you.\n\n";
1095 else 1028 else
1096 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper seems to have taken a dislike to you."); 1029 buf << "The shopkeeper seems to have taken a dislike to you.\n\n";
1097 } 1030 }
1098 } 1031 }
1099 else 1032 else
1100 new_draw_info (NDI_UNIQUE, 0, op, "There is no shop nearby."); 1033 buf << "There is no shop nearby.\n\n";
1034
1035 op->contr->infobox (MSG_CHANNEL ("shopinfo"), buf);
1101 1036
1102 return 1; 1037 return 1;
1103} 1038}
1104 1039
1105struct shopinv 1040struct shopinv
… …
1120{ 1055{
1121 shopinv *s1 = (shopinv *) a1, *s2 = (shopinv *) a2; 1056 shopinv *s1 = (shopinv *) a1, *s2 = (shopinv *) a2;
1122 1057
1123 if (s1->type < s2->type) 1058 if (s1->type < s2->type)
1124 return -1; 1059 return -1;
1060
1125 if (s1->type > s2->type) 1061 if (s1->type > s2->type)
1126 return 1; 1062 return 1;
1127 1063
1128 /* the type is the same (what atoi gets), so do a strcasecmp to sort 1064 /* the type is the same (what atoi gets), so do a strcasecmp to sort
1129 * via alphabetical order 1065 * via alphabetical order
… …
1140 /* clear unpaid flag so that doesn't come up in query 1076 /* clear unpaid flag so that doesn't come up in query
1141 * string. We clear nrof so that we can better sort 1077 * string. We clear nrof so that we can better sort
1142 * the object names. 1078 * the object names.
1143 */ 1079 */
1144 1080
1145 CLEAR_FLAG (tmp, FLAG_UNPAID); 1081 tmp->clr_flag (FLAG_UNPAID);
1146 items[*numitems].nrof = tmp->nrof; 1082 items[*numitems].nrof = tmp->nrof;
1147 /* Non mergable items have nrof of 0, but count them as one 1083 /* Non mergable items have nrof of 0, but count them as one
1148 * so the display is properly. 1084 * so the display is properly.
1149 */ 1085 */
1150 if (tmp->nrof == 0) 1086 if (tmp->nrof == 0)
… …
1172 items[*numitems].item_sort = strdup (query_base_name (tmp, 0)); 1108 items[*numitems].item_sort = strdup (query_base_name (tmp, 0));
1173 items[*numitems].item_real = strdup (query_base_name (tmp, 1)); 1109 items[*numitems].item_real = strdup (query_base_name (tmp, 1));
1174 (*numitems)++; 1110 (*numitems)++;
1175 break; 1111 break;
1176 } 1112 }
1177 SET_FLAG (tmp, FLAG_UNPAID); 1113
1114 tmp->set_flag (FLAG_UNPAID);
1178} 1115}
1179 1116
1180void 1117void
1181shop_listing (object *sign, object *op) 1118shop_listing (object *sign, object *op)
1182{ 1119{
1183 int i, j, numitems = 0, numallocated = 0, x1, x2, y1, y2; 1120 int i, j, x1, x2, y1, y2;
1184 const char *shop_coords = get_ob_key_value (sign, "shop_coords"); 1121 const char *shop_coords = sign->kv (shstr_shop_coords);
1185 object *stack; 1122 object *stack;
1186 shopinv *items; 1123 shopinv *items;
1187 1124
1188 /* Should never happen, but just in case a monster does apply a sign */ 1125 /* Should never happen, but just in case a monster does apply a sign */
1189 if (op->type != PLAYER) 1126 if (!op->is_player ())
1190 return; 1127 return;
1128
1129 dynbuf_text &buf = msg_dynbuf; buf.clear ();
1191 1130
1192 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2))) 1131 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2)))
1193 { 1132 {
1194 x1 = 0; 1133 x1 = 0;
1195 y1 = 0; 1134 y1 = 0;
1196 x2 = op->map->width - 1; 1135 x2 = op->map->width - 1;
1197 y2 = op->map->height - 1; 1136 y2 = op->map->height - 1;
1198 } 1137 }
1199 1138
1200 items = (shopinv *) malloc (40 * sizeof (shopinv));
1201 numallocated = 40; 1139 int numallocated = 40;
1140 int numitems = 0;
1141 items = (shopinv *)malloc (sizeof (shopinv) * numallocated);
1202 1142
1203 /* Find all the appropriate items */ 1143 /* Find all the appropriate items */
1204 for (i = x1; i <= x2; i++) 1144 for (i = x1; i <= x2; i++)
1205 {
1206 for (j = y1; j < y2; j++) 1145 for (j = y1; j < y2; j++)
1146 if (op->map->is_in_shop (i, j))
1207 { 1147 {
1208 if (is_in_shop (op->map, i, j)) 1148 stack = GET_MAP_OB (op->map, i, j);
1149
1150 while (stack)
1209 { 1151 {
1210 stack = GET_MAP_OB (op->map, i, j); 1152 if (stack->flag [FLAG_UNPAID])
1211
1212 while (stack)
1213 { 1153 {
1214 if (QUERY_FLAG (stack, FLAG_UNPAID))
1215 {
1216 if (numitems == numallocated) 1154 if (numitems == numallocated)
1217 {
1218 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10)); 1155 items = (shopinv *)realloc (items, sizeof (shopinv) * (numallocated *= 2));
1219 numallocated += 10;
1220 }
1221 1156
1222 add_shop_item (stack, items, &numitems, &numallocated); 1157 add_shop_item (stack, items, &numitems, &numallocated);
1223 }
1224
1225 stack = stack->above;
1226 } 1158 }
1159
1160 stack = stack->above;
1227 } 1161 }
1228 } 1162 }
1229 }
1230 1163
1231 if (numitems == 0) 1164 buf << (numitems ? "T<This shop contains:>\n\n"
1232 { 1165 : "T<This shop is currently empty.>");
1233 new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n");
1234 free (items);
1235 return;
1236 }
1237 1166
1238 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort); 1167 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort);
1239
1240 new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:");
1241 1168
1242 for (i = 0; i < numitems; i++) 1169 for (i = 0; i < numitems; i++)
1243 { 1170 {
1244 /* Collapse items of the same name together */ 1171 /* Collapse items of the same name together */
1245 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real)) 1172 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real))
1246 {
1247 items[i + 1].nrof += items[i].nrof; 1173 items[i + 1].nrof += items[i].nrof;
1248 free (items[i].item_sort);
1249 free (items[i].item_real);
1250 }
1251 else 1174 else
1252 {
1253 new_draw_info_format (NDI_UNIQUE, 0, op, "%d %s",
1254 items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real); 1175 buf.printf (" %4d %s\n", items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real);
1176
1255 free (items[i].item_sort); 1177 free (items[i].item_sort);
1256 free (items[i].item_real); 1178 free (items[i].item_real);
1257 }
1258 } 1179 }
1180
1181 op->contr->infobox (MSG_CHANNEL ("shopitems"), buf);
1259 1182
1260 free (items); 1183 free (items);
1261} 1184}
1262 1185
1263/* elmex: this function checks whether the object is in a shop */ 1186/* elmex: this function checks whether we are in a shop or not
1187 - change 2007-11-26: enhanced the O(n) case by stopping at the first
1188 floor tile. this possibly will make map bugs where shopfloors are above
1189 floors more obvious.
1190*/
1264bool 1191bool
1265is_in_shop (object *o) 1192maptile::is_in_shop (int x, int y) const
1266{ 1193{
1267 if (!o->map)
1268 return false;
1269
1270 return is_in_shop (o->map, o->x, o->y);
1271}
1272
1273/* elmex: this function checks whether we are in a shop or not */
1274bool
1275is_in_shop (maptile *map, int x, int y)
1276{
1277 for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above) 1194 for (object *floor = at (x, y).bot; floor; floor = floor->above)
1195 if (floor->flag [FLAG_IS_FLOOR])
1278 if (floor->type == SHOP_FLOOR) 1196 return floor->type == SHOP_FLOOR;
1279 return true;
1280 1197
1281 return false; 1198 return false;
1282} 1199}
1200

Diff Legend

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