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.47 by root, Sun Apr 13 01:34:09 2008 UTC vs.
Revision 1.65 by root, Sun Apr 26 19:42:45 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * 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
… …
74 74
75sint64 75sint64
76query_cost (const object *tmp, object *who, int flag) 76query_cost (const object *tmp, object *who, int flag)
77{ 77{
78 double val; 78 double val;
79 int number; /* used to better calculate value */
80 int no_bargain; 79 int no_bargain;
81 int identified; 80 int identified;
82 int not_cursed; 81 int not_cursed;
83 int approximate; 82 int approximate;
84 int shop; 83 int shop;
… …
109 108
110 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 ());
111 return 0; 110 return 0;
112 } 111 }
113 112
114 number = tmp->nrof; 113 int number = tmp->number_of ();
115 if (number == 0) 114
116 number = 1;
117 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified) 115 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified)
118 { 116 {
119 if (!not_cursed && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))) 117 if (!not_cursed && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)))
120 return 0; 118 return 0;
121 else 119 else
122 val = tmp->value * number; 120 val = tmp->value * number;
123 } 121 }
124 /* 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 */
125 else 123 else
126 { 124 {
127 if (tmp->arch != NULL) 125 if (flag == F_BUY)
128 { 126 {
129 if (flag == F_BUY) 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
130 { 135 {
131 LOG (llevError, "Asking for buy-value of unidentified object.\n"); 136 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
132 val = tmp->arch->value * 50 * number; 137 * unknown objects
138 */
139 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED))
140 val = number * tmp->arch->value * 2 / 3;
141 else
142 val = number * tmp->arch->value / 3;
133 } 143 }
134 else
135 { /* Trying to sell something, or get true value */
136 if (tmp->type == POTION)
137 val = number * 40; /* Don't want to give anything away */
138 else
139 {
140 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
141 * unknown objects
142 */
143 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED))
144 val = number * tmp->arch->value * 2 / 3;
145 else
146 val = number * tmp->arch->value / 3;
147 }
148 }
149 }
150 else
151 { /* No archetype with this object */
152 LOG (llevDebug, "In sell item: Have object with no archetype: %s\n", &tmp->name);
153 if (flag == F_BUY)
154 {
155 LOG (llevError, "Asking for buy-value of unidentified object without arch.\n");
156 val = number * tmp->value * 10;
157 }
158 else
159 val = number * tmp->value / 5;
160 } 144 }
161 } 145 }
162 146
163 /* 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
164 * identified, AND the object is magical and the archetype is non 148 * identified, AND the object is magical and the archetype is non
… …
206 * AND Cha = 30 will get optimal price. 190 * AND Cha = 30 will get optimal price.
207 * Thus charisma will never get useless. 191 * Thus charisma will never get useless.
208 * -b.e. edler@heydernet.de 192 * -b.e. edler@heydernet.de
209 */ 193 */
210 194
211 if (who != NULL && who->type == PLAYER) 195 if (who && who->type == PLAYER)
212 { 196 {
213 int lev_bargain = 0; 197 int lev_bargain = 0;
214 int lev_identify = 0; 198 int lev_identify = 0;
215 int idskill1 = 0;
216 int idskill2 = 0;
217 const typedata *tmptype;
218
219 tmptype = get_typedata (tmp->type);
220 199
221 if (find_skill_by_number (who, SK_BARGAINING)) 200 if (find_skill_by_number (who, SK_BARGAINING))
222 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level; 201 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level;
223 202
224 if (tmptype) 203 if (const typedata *tmptype = get_typedata (tmp->type))
225 { 204 {
226 idskill1 = tmptype->identifyskill; 205 if (int idskill1 = tmptype->identifyskill)
227
228 if (idskill1)
229 { 206 {
230 idskill2 = tmptype->identifyskill2; 207 int idskill2 = tmptype->identifyskill2;
231 208
232 if (find_skill_by_number (who, idskill1)) 209 if (find_skill_by_number (who, idskill1))
233 lev_identify = find_skill_by_number (who, idskill1)->level; 210 lev_identify = find_skill_by_number (who, idskill1)->level;
234 211
235 if (idskill2 && find_skill_by_number (who, idskill2)) 212 if (idskill2 && find_skill_by_number (who, idskill2))
236 lev_identify += find_skill_by_number (who, idskill2)->level; 213 lev_identify += find_skill_by_number (who, idskill2)->level;
237 } 214 }
238 } 215 }
239 else
240 LOG (llevError, "Query_cost: item %s hasn't got a valid type\n", tmp->debug_desc ());
241 216
242 /* ratio determines how much of the price modification 217 /* ratio determines how much of the price modification
243 * will come from the basic stat charisma 218 * will come from the basic stat charisma
244 * the rest will come from the level in bargaining skill 219 * the rest will come from the level in bargaining skill
245 */ 220 */
… …
418 393
419 if (coin == NULL) 394 if (coin == NULL)
420 return "nothing"; 395 return "nothing";
421 396
422 num = real_value / coin->value; 397 num = real_value / coin->value;
398
423 if (num == 1) 399 if (num == 1)
424 sprintf (buf, "about one %s", &coin->object::name); 400 sprintf (buf, "about one %s", &coin->object::name);
425 else if (num < 5) 401 else if (num < 5)
426 sprintf (buf, "a few %s", &coin->object::name_pl); 402 sprintf (buf, "a few %s", &coin->object::name_pl);
427 else if (num < 10) 403 else if (num < 10)
… …
432 sprintf (buf, "lots of %s", &coin->object::name_pl); 408 sprintf (buf, "lots of %s", &coin->object::name_pl);
433 else if (num < 1000) 409 else if (num < 1000)
434 sprintf (buf, "a great many %s", &coin->object::name_pl); 410 sprintf (buf, "a great many %s", &coin->object::name_pl);
435 else 411 else
436 sprintf (buf, "a vast quantity of %s", &coin->object::name_pl); 412 sprintf (buf, "a vast quantity of %s", &coin->object::name_pl);
413
437 return buf; 414 return buf;
438 } 415 }
439 } 416 }
440 } 417 }
441 418
… …
472 } 449 }
473 450
474 for (tmp = op->inv; tmp; tmp = tmp->below) 451 for (tmp = op->inv; tmp; tmp = tmp->below)
475 if (tmp->type == MONEY) 452 if (tmp->type == MONEY)
476 total += tmp->nrof * (sint64)tmp->value; 453 total += tmp->nrof * (sint64)tmp->value;
477 else if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && (tmp->race == NULL || strstr (tmp->race, "gold"))) 454 else if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && (!tmp->race || tmp->race.contains ("gold")))
478 total += query_money (tmp); 455 total += query_money (tmp);
479 456
480 return total; 457 return total;
481} 458}
482 459
… …
497 return 0; 474 return 0;
498 475
499 pay_from_container (pl, pl, to_pay); 476 pay_from_container (pl, pl, to_pay);
500 477
501 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 478 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
502 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold"))) 479 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (!pouch->race || pouch->race.contains ("gold")))
503 pay_from_container (pl, pouch, to_pay); 480 pay_from_container (pl, pouch, to_pay);
504 481
505 pl->update_stats (); 482 pl->update_stats ();
506 return 1; 483 return 1;
507} 484}
… …
534 change_exp (pl, saved_money, "bargaining", SK_EXP_NONE); 511 change_exp (pl, saved_money, "bargaining", SK_EXP_NONE);
535 512
536 pay_from_container (pl, pl, to_pay); 513 pay_from_container (pl, pl, to_pay);
537 514
538 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 515 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
539 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold"))) 516 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (!pouch->race || pouch->race.contains ("gold")))
540 pay_from_container (pl, pouch, to_pay); 517 pay_from_container (pl, pouch, to_pay);
541 518
542 pl->update_stats (); 519 pl->update_stats ();
543 520
544 return 1; 521 return 1;
… …
583 { 560 {
584 // This should not happen, but if it does, just merge the two. 561 // This should not happen, but if it does, just merge the two.
585 if (coin_objs [i]) 562 if (coin_objs [i])
586 { 563 {
587 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]); 564 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]);
588 tmp->remove ();
589 coin_objs[i]->nrof += tmp->nrof; 565 coin_objs[i]->nrof += tmp->nrof;
590 esrv_del_item (pl->contr, tmp->count);
591 tmp->destroy (); 566 tmp->destroy ();
592 } 567 }
593 else 568 else
594 { 569 {
595 tmp->remove (); 570 tmp->remove ();
596
597 if (pouch->type == PLAYER)
598 esrv_del_item (pl->contr, tmp->count);
599
600 coin_objs[i] = tmp; 571 coin_objs[i] = tmp;
601 } 572 }
602 573
603 break; 574 break;
604 } 575 }
… …
644 count--; 615 count--;
645 } 616 }
646 } 617 }
647 618
648 for (i = 0; i < NUM_COINS; i++) 619 for (i = 0; i < NUM_COINS; i++)
649 {
650 if (coin_objs[i]->nrof) 620 if (coin_objs[i]->nrof)
651 {
652 object *tmp = insert_ob_in_ob (coin_objs[i], pouch); 621 insert_ob_in_ob (coin_objs [i], pouch);
653
654 esrv_send_item (pl, tmp);
655 esrv_send_item (pl, pouch);
656
657 if (pl != pouch)
658 esrv_update_item (UPD_WEIGHT, pl, pouch);
659
660 if (pl->type != PLAYER)
661 esrv_send_item (pl, pl);
662 }
663 else 622 else
664 coin_objs[i]->destroy (); 623 coin_objs[i]->destroy ();
665 }
666} 624}
667 625
668/* Checks all unpaid items in op's inventory, adds up all the money they 626/* Checks all unpaid items in op's inventory, adds up all the money they
669 * have, and checks that they can actually afford what they want to buy. 627 * have, and checks that they can actually afford what they want to buy.
670 * Returns 1 if they can, and 0 if they can't. also prints an appropriate message 628 * Returns 1 if they can, and 0 if they can't. also prints an appropriate message
… …
690 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP); 648 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP);
691 } 649 }
692 650
693 if (unpaid_price > player_wealth) 651 if (unpaid_price > player_wealth)
694 { 652 {
695 char buf[MAX_BUF]; 653 dynbuf_text buf;
696 char cost[MAX_BUF];
697 char missing[MAX_BUF];
698 654
699 snprintf (cost, MAX_BUF, "%s", cost_string_from_value (unpaid_price, 0)); 655 buf << "You have " << unpaid_count
700 snprintf (missing, MAX_BUF, "%s", cost_string_from_value (unpaid_price - player_wealth, 0)); 656 << " unpaid item(s) that would cost you " << cost_string_from_value (unpaid_price, 0)
657 << ". You need another " << cost_string_from_value (unpaid_price - player_wealth, 0)
658 << " to be able to afford that. "
659 "H<You cannot leave a shop without paying - drop unpaid items first to be able to leave.>";
701 660
702 snprintf (buf, MAX_BUF, "You have %d unpaid items that would cost you %s. You need another %s to be able to afford that.", 661 pl->failmsg (buf);
703 unpaid_count, cost, missing);
704 new_draw_info (NDI_UNIQUE, 0, pl, buf);
705 662
706 return 0; 663 return 0;
707 } 664 }
708 else 665 else
709 return 1; 666 return 1;
… …
738 SET_FLAG (op, FLAG_UNPAID); 695 SET_FLAG (op, FLAG_UNPAID);
739 return 0; 696 return 0;
740 } 697 }
741 else 698 else
742 { 699 {
743 object *tmp;
744
745 CLEAR_FLAG (op, FLAG_UNPAID); 700 CLEAR_FLAG (op, FLAG_UNPAID);
746 CLEAR_FLAG (op, FLAG_PLAYER_SOLD); 701 CLEAR_FLAG (op, FLAG_PLAYER_SOLD);
747 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op)); 702 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op));
748 tmp = merge_ob (op, NULL);
749 703
750 if (pl->type == PLAYER) 704 if (!merge_ob (op, op->env->inv))
751 {
752 if (tmp)
753 { /* it was merged */
754 esrv_del_item (pl->contr, op->count);
755 op = tmp;
756 }
757
758 esrv_send_item (pl, op); 705 esrv_update_item (UPD_FLAGS, pl, op);
759 }
760 706
761 goto next_item; 707 goto next_item;
762 } 708 }
763 } 709 }
764 } 710 }
… …
793 LOG (llevError, "Could not find %s archetype\n", coins[count]); 739 LOG (llevError, "Could not find %s archetype\n", coins[count]);
794 else if ((amount / at->value) > 0) 740 else if ((amount / at->value) > 0)
795 { 741 {
796 for (pouch = pl->inv; pouch; pouch = pouch->below) 742 for (pouch = pl->inv; pouch; pouch = pouch->below)
797 { 743 {
798 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race && strstr (pouch->race, "gold")) 744 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race.contains ("gold"))
799 { 745 {
800 int w = at->weight * (100 - pouch->stats.Str) / 100; 746 int w = at->weight * (100 - pouch->stats.Str) / 100;
801 int n = amount / at->value; 747 int n = amount / at->value;
802 748
803 if (w == 0) 749 if (w == 0)
… …
806 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit)) 752 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit))
807 { 753 {
808 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n) 754 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n)
809 n = (pouch->weight_limit - pouch->carrying) / w; 755 n = (pouch->weight_limit - pouch->carrying) / w;
810 756
811 tmp = arch_to_object (at); 757 object *tmp = arch_to_object (at);
812 tmp->nrof = n; 758 tmp->nrof = n;
813 amount -= tmp->nrof * tmp->value; 759 amount -= tmp->nrof * tmp->value;
814 tmp = insert_ob_in_ob (tmp, pouch); 760 pouch->insert (tmp);
815 esrv_send_item (pl, tmp);
816 esrv_send_item (pl, pouch);
817 esrv_update_item (UPD_WEIGHT, pl, pouch);
818 esrv_send_item (pl, pl);
819 } 761 }
820 } 762 }
821 } 763 }
822 764
823 if (amount / at->value > 0) 765 if (amount / at->value > 0)
824 { 766 {
825 tmp = arch_to_object (at); 767 object *tmp = arch_to_object (at);
826 tmp->nrof = amount / tmp->value; 768 tmp->nrof = amount / tmp->value;
827 amount -= tmp->nrof * tmp->value; 769 amount -= tmp->nrof * tmp->value;
828 tmp = insert_ob_in_ob (tmp, pl); 770 pl->insert (tmp);
829 esrv_send_item (pl, tmp);
830 esrv_send_item (pl, pl);
831 } 771 }
832 } 772 }
833 } 773 }
834 774
835 if (amount != 0) 775 if (amount != 0)
… …
838 778
839/* elmex: this is for the bank plugin :( */ 779/* elmex: this is for the bank plugin :( */
840sint64 780sint64
841pay_player_arch (object *pl, const char *arch, sint64 amount) 781pay_player_arch (object *pl, const char *arch, sint64 amount)
842{ 782{
843 archetype *at = archetype::find (arch);
844
845 if (!at)
846 return 0;
847
848 if (amount > 0) 783 if (amount)
849 { 784 {
850 object *tmp = arch_to_object (at); 785 object *ob = archetype::get (arch);
786
787 if (!ob)
788 return 0;
789
851 tmp->nrof = amount; 790 ob->nrof = amount;
852 tmp = insert_ob_in_ob (tmp, pl); 791 pl->insert (ob);
853 esrv_send_item (pl, tmp);
854 esrv_send_item (pl, pl);
855 } 792 }
856 793
857 return 1; 794 return 1;
858} 795}
859 796
… …
862 * buy item. 799 * buy item.
863 * 800 *
864 * Modified to fill available race: gold containers before dumping 801 * Modified to fill available race: gold containers before dumping
865 * remaining coins in character's inventory. 802 * remaining coins in character's inventory.
866 */ 803 */
867void 804bool
868sell_item (object *op, object *pl) 805sell_item (object *op, object *pl)
869{ 806{
870 sint64 amount = query_cost (op, pl, F_SELL | F_SHOP), extra_gain; 807 sint64 amount = query_cost (op, pl, F_SELL | F_SHOP), extra_gain;
871 808
872 if (pl == NULL || pl->type != PLAYER) 809 if (pl == NULL || pl->type != PLAYER)
873 { 810 {
874 LOG (llevDebug, "Object other than player tried to sell something.\n"); 811 LOG (llevDebug, "Object other than player tried to sell something.\n");
875 return; 812 return false;
876 } 813 }
877 814
878 op->custom_name = 0; 815 op->custom_name = 0;
879 816
880 if (!amount) 817 if (!amount)
881 { 818 {
882 new_draw_info_format (NDI_UNIQUE, 0, pl, "We're not interested in %s.", query_name (op)); 819 new_draw_info_format (NDI_UNIQUE, 0, pl, "We're not interested in %s.",
883 820 query_name (op));
884 /* Even if the character doesn't get anything for it, it may still be 821 // elmex: change: the player now gets the item back if the shop is not
885 * worth something. If so, make it unpaid 822 // interested in it.
886 */
887 if (op->value)
888 {
889 SET_FLAG (op, FLAG_UNPAID);
890 SET_FLAG (op, FLAG_PLAYER_SOLD);
891 }
892
893 identify (op);
894 return; 823 return false;
895 } 824 }
896 825
897 /* We compare the price with the one for a player 826 /* We compare the price with the one for a player
898 * without bargaining skill. 827 * without bargaining skill.
899 * This determins the amount of exp (if any) gained for bargaining. 828 * This determins the amount of exp (if any) gained for bargaining.
… …
904 if (extra_gain > 0) 833 if (extra_gain > 0)
905 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE); 834 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE);
906 835
907 pay_player (pl, amount); 836 pay_player (pl, amount);
908 837
909 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)); 838 new_draw_info_format (NDI_UNIQUE, 0, pl, "You receive %s for %s.",
839 query_cost_string (op, pl, F_SELL | F_SHOP), query_name (op));
910 pl->play_sound (sound_find ("shop_sell")); 840 pl->play_sound (sound_find ("shop_sell"));
911 841
912 SET_FLAG (op, FLAG_UNPAID); 842 SET_FLAG (op, FLAG_UNPAID);
913 identify (op); 843 identify (op);
844
845 return true;
914} 846}
915 847
916/* returns a double that is the ratio of the price that a shop will offer for 848/* returns a double that is the ratio of the price that a shop will offer for
917 * item based on the shops specialisation. Does not take account of greed, 849 * item based on the shops specialisation. Does not take account of greed,
918 * returned value is between SPECIALISATION_EFFECT and 1. 850 * returned value is between SPECIALISATION_EFFECT and 1.
… …
1116{ 1048{
1117 shopinv *s1 = (shopinv *) a1, *s2 = (shopinv *) a2; 1049 shopinv *s1 = (shopinv *) a1, *s2 = (shopinv *) a2;
1118 1050
1119 if (s1->type < s2->type) 1051 if (s1->type < s2->type)
1120 return -1; 1052 return -1;
1053
1121 if (s1->type > s2->type) 1054 if (s1->type > s2->type)
1122 return 1; 1055 return 1;
1123 1056
1124 /* the type is the same (what atoi gets), so do a strcasecmp to sort 1057 /* the type is the same (what atoi gets), so do a strcasecmp to sort
1125 * via alphabetical order 1058 * via alphabetical order
… …
1174} 1107}
1175 1108
1176void 1109void
1177shop_listing (object *sign, object *op) 1110shop_listing (object *sign, object *op)
1178{ 1111{
1179 int i, j, numitems = 0, numallocated = 0, x1, x2, y1, y2; 1112 int i, j, x1, x2, y1, y2;
1180 const char *shop_coords = get_ob_key_value (sign, "shop_coords"); 1113 const char *shop_coords = sign->kv (shstr_shop_coords);
1181 object *stack; 1114 object *stack;
1182 shopinv *items; 1115 shopinv *items;
1183 1116
1184 /* Should never happen, but just in case a monster does apply a sign */ 1117 /* Should never happen, but just in case a monster does apply a sign */
1185 if (op->type != PLAYER) 1118 if (!op->is_player ())
1186 return; 1119 return;
1120
1121 dynbuf_text buf (4096, 4096);
1187 1122
1188 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2))) 1123 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2)))
1189 { 1124 {
1190 x1 = 0; 1125 x1 = 0;
1191 y1 = 0; 1126 y1 = 0;
1192 x2 = op->map->width - 1; 1127 x2 = op->map->width - 1;
1193 y2 = op->map->height - 1; 1128 y2 = op->map->height - 1;
1194 } 1129 }
1195 1130
1196 items = (shopinv *) malloc (40 * sizeof (shopinv));
1197 numallocated = 40; 1131 int numallocated = 40;
1132 int numitems = 0;
1133 items = (shopinv *)malloc (sizeof (shopinv) * numallocated);
1198 1134
1199 /* Find all the appropriate items */ 1135 /* Find all the appropriate items */
1200 for (i = x1; i <= x2; i++) 1136 for (i = x1; i <= x2; i++)
1201 {
1202 for (j = y1; j < y2; j++) 1137 for (j = y1; j < y2; j++)
1138 if (is_in_shop (op->map, i, j))
1203 { 1139 {
1204 if (is_in_shop (op->map, i, j)) 1140 stack = GET_MAP_OB (op->map, i, j);
1141
1142 while (stack)
1205 { 1143 {
1206 stack = GET_MAP_OB (op->map, i, j); 1144 if (QUERY_FLAG (stack, FLAG_UNPAID))
1207
1208 while (stack)
1209 { 1145 {
1210 if (QUERY_FLAG (stack, FLAG_UNPAID))
1211 {
1212 if (numitems == numallocated) 1146 if (numitems == numallocated)
1213 {
1214 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10)); 1147 items = (shopinv *)realloc (items, sizeof (shopinv) * (numallocated *= 2));
1215 numallocated += 10;
1216 }
1217 1148
1218 add_shop_item (stack, items, &numitems, &numallocated); 1149 add_shop_item (stack, items, &numitems, &numallocated);
1219 }
1220
1221 stack = stack->above;
1222 } 1150 }
1151
1152 stack = stack->above;
1223 } 1153 }
1224 } 1154 }
1225 }
1226 1155
1227 if (numitems == 0) 1156 buf << (numitems ? "T<This shop contains:>\n\n"
1228 { 1157 : "T<This shop is currently empty.>");
1229 new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n");
1230 free (items);
1231 return;
1232 }
1233 1158
1234 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort); 1159 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort);
1235
1236 new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:");
1237 1160
1238 for (i = 0; i < numitems; i++) 1161 for (i = 0; i < numitems; i++)
1239 { 1162 {
1240 /* Collapse items of the same name together */ 1163 /* Collapse items of the same name together */
1241 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real)) 1164 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real))
1242 {
1243 items[i + 1].nrof += items[i].nrof; 1165 items[i + 1].nrof += items[i].nrof;
1244 free (items[i].item_sort);
1245 free (items[i].item_real);
1246 }
1247 else 1166 else
1248 {
1249 new_draw_info_format (NDI_UNIQUE, 0, op, "%d %s",
1250 items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real); 1167 buf.printf (" C<%4d %s>\n", items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real);
1168
1251 free (items[i].item_sort); 1169 free (items[i].item_sort);
1252 free (items[i].item_real); 1170 free (items[i].item_real);
1253 }
1254 } 1171 }
1172
1173 op->contr->infobox (MSG_CHANNEL ("shopitems"), buf);
1255 1174
1256 free (items); 1175 free (items);
1257} 1176}
1258 1177
1259/* elmex: this function checks whether the object is in a shop */ 1178/* elmex: this function checks whether the object is in a shop */
1260bool 1179bool
1261is_in_shop (object *o) 1180is_in_shop (object *o)
1262{ 1181{
1263 if (!o->map) 1182 if (!o->is_on_map ())
1264 return false; 1183 return false;
1265 1184
1266 return is_in_shop (o->map, o->x, o->y); 1185 return is_in_shop (o->map, o->x, o->y);
1267} 1186}
1268 1187
… …
1276is_in_shop (maptile *map, int x, int y) 1195is_in_shop (maptile *map, int x, int y)
1277{ 1196{
1278 for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above) 1197 for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above)
1279 if (QUERY_FLAG (floor, FLAG_IS_FLOOR)) 1198 if (QUERY_FLAG (floor, FLAG_IS_FLOOR))
1280 return floor->type == SHOP_FLOOR; 1199 return floor->type == SHOP_FLOOR;
1200
1281 return false; 1201 return false;
1282} 1202}
1283 1203

Diff Legend

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