| … | |
… | |
| 948 | item->nrof *= nr; |
948 | item->nrof *= nr; |
| 949 | |
949 | |
| 950 | if (converter->flag [FLAG_PRECIOUS]) |
950 | if (converter->flag [FLAG_PRECIOUS]) |
| 951 | SET_FLAG (item, FLAG_UNPAID); |
951 | SET_FLAG (item, FLAG_UNPAID); |
| 952 | |
952 | |
| 953 | if (is_in_shop (converter)) |
953 | if (converter->is_in_shop ()) |
| 954 | { |
954 | { |
| 955 | // converters on shop floors don't work anymore, bug lets check for it |
955 | // converters on shop floors don't work anymore, bug lets check for it |
| 956 | // and report in case someone still does it. |
956 | // and report in case someone still does it. |
| 957 | LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n", |
957 | LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n", |
| 958 | converter->debug_desc ()); |
958 | converter->debug_desc ()); |
| … | |
… | |
| 1161 | /* this is only used for players */ |
1161 | /* this is only used for players */ |
| 1162 | rv = teleport (shop_mat, SHOP_MAT, op); |
1162 | rv = teleport (shop_mat, SHOP_MAT, op); |
| 1163 | |
1163 | |
| 1164 | if (has_unpaid) |
1164 | if (has_unpaid) |
| 1165 | op->contr->play_sound (sound_find ("shop_buy")); |
1165 | op->contr->play_sound (sound_find ("shop_buy")); |
| 1166 | else if (is_in_shop (op)) |
1166 | else if (op->is_in_shop ()) |
| 1167 | op->contr->play_sound (sound_find ("shop_enter")); |
1167 | op->contr->play_sound (sound_find ("shop_enter")); |
| 1168 | else |
1168 | else |
| 1169 | op->contr->play_sound (sound_find ("shop_leave")); |
1169 | op->contr->play_sound (sound_find ("shop_leave")); |
| 1170 | |
1170 | |
| 1171 | if (shop_mat->msg) |
1171 | if (shop_mat->msg) |
| 1172 | op->statusmsg (shop_mat->msg); |
1172 | op->statusmsg (shop_mat->msg); |
| 1173 | /* This check below is a bit simplistic - generally it should be correct, |
1173 | /* This check below is a bit simplistic - generally it should be correct, |
| 1174 | * but there is never a guarantee that the bottom space on the map is |
1174 | * but there is never a guarantee that the bottom space on the map is |
| 1175 | * actually the shop floor. |
1175 | * actually the shop floor. |
| 1176 | */ |
1176 | */ |
| 1177 | else if (!rv && !is_in_shop (op)) |
1177 | else if (!rv && !op->is_in_shop ()) |
| 1178 | { |
1178 | { |
| 1179 | opinion = shopkeeper_approval (op->map, op); |
1179 | opinion = shopkeeper_approval (op->map, op); |
| 1180 | |
1180 | |
| 1181 | op->statusmsg ( |
1181 | op->statusmsg ( |
| 1182 | opinion >= 0.90 ? "The shopkeeper gives you a friendly wave." |
1182 | opinion >= 0.90 ? "The shopkeeper gives you a friendly wave." |
