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.11 by root, Mon Sep 11 20:26:41 2006 UTC vs.
Revision 1.76 by root, Fri Mar 26 01:04:45 2010 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.11 2006/09/11 20:26:41 root Exp $"; 3 *
5 */ 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 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 Mark Wedel & Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 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 it under
14 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
15 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
16 (at your option) any later version. 11 * 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 Affero GNU General Public License
24 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
26 21 *
27 The authors can be reached via e-mail at crossfire-devel@real-time.com 22 * The authors can be reached via e-mail to <support@deliantra.net>
28*/ 23 */
29 24
30#include <global.h> 25#include <global.h>
31#include <spells.h> 26#include <spells.h>
32#include <skills.h> 27#include <skills.h>
33#include <living.h> 28#include <living.h>
34#include <newclient.h>
35#ifndef __CEXTRACT__
36# include <sproto.h> 29#include <sproto.h>
37#endif
38#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 uint64 pay_from_container (object *pl, object *pouch, uint64 to_pay); 43static void pay_from_container (object *pl, object *pouch, sint64 &to_pay);
53static uint64 value_limit (uint64 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
… …
80 * thus remained 0. 68 * thus remained 0.
81 * 69 *
82 * Mark Wedel (mwedel@pyramid.com) 70 * Mark Wedel (mwedel@pyramid.com)
83 */ 71 */
84 72
85static uint64 approx_range; 73static sint64 approx_range;
86 74
87uint64 75sint64
88query_cost (const object *tmp, object *who, int flag) 76query_cost (const object *tmp, object *who, int flag)
89{ 77{
90 double val; 78 double val;
91 int number; /* used to better calculate value */
92 int no_bargain; 79 int no_bargain;
93 int identified; 80 int identified;
94 int not_cursed; 81 int not_cursed;
95 int approximate; 82 int approximate;
96 int shop; 83 int shop;
… …
104 approximate = flag & F_APPROX; 91 approximate = flag & F_APPROX;
105 shop = flag & F_SHOP; 92 shop = flag & F_SHOP;
106 flag &= ~(F_NO_BARGAIN | F_IDENTIFIED | F_NOT_CURSED | F_APPROX | F_SHOP); 93 flag &= ~(F_NO_BARGAIN | F_IDENTIFIED | F_NOT_CURSED | F_APPROX | F_SHOP);
107 94
108 if (tmp->type == MONEY) 95 if (tmp->type == MONEY)
109 return (tmp->nrof * tmp->value); 96 return tmp->nrof * tmp->value;
97
110 if (tmp->type == GEM) 98 if (tmp->type == GEM)
111 { 99 {
112 if (flag == F_TRUE) 100 if (flag == F_TRUE)
113 return (tmp->nrof * tmp->value); 101 return (tmp->nrof * tmp->value);
102
114 if (flag == F_BUY) 103 if (flag == F_BUY)
115 return (uint64) (1.03 * tmp->nrof * tmp->value); 104 return (sint64) (1.03 * tmp->nrof * tmp->value);
105
116 if (flag == F_SELL) 106 if (flag == F_SELL)
117 return (uint64) (0.97 * tmp->nrof * tmp->value); 107 return (sint64) (0.97 * tmp->nrof * tmp->value);
108
118 LOG (llevError, "Query_cost: Gem type with unknown flag : %d\n", flag); 109 LOG (llevError, "Query_cost: Gem type with unknown flag %d: %s\n", flag, tmp->debug_desc ());
119 return 0; 110 return 0;
120 } 111 }
112
121 number = tmp->nrof; 113 int number = tmp->number_of ();
122 if (number == 0) 114
123 number = 1;
124 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified) 115 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified)
125 { 116 {
126 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)))
127 return 0; 118 return 0;
128 else 119 else
129 val = tmp->value * number; 120 val = tmp->value * number;
130 } 121 }
131 /* 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 */
132 else 123 else
133 { 124 {
134 if (tmp->arch != NULL)
135 {
136 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
137 { 135 {
138 LOG (llevError, "Asking for buy-value of unidentified object.\n"); 136 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
139 val = tmp->arch->clone.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;
140 } 143 }
141 else
142 { /* Trying to sell something, or get true value */
143 if (tmp->type == POTION)
144 val = number * 40; /* Don't want to give anything away */
145 else
146 {
147 /* Get 2/3'rd value for applied objects, 1/3'rd for totally
148 * unknown objects
149 */
150 if (QUERY_FLAG (tmp, FLAG_BEEN_APPLIED))
151 val = number * tmp->arch->clone.value * 2 / 3;
152 else
153 val = number * tmp->arch->clone.value / 3;
154 }
155 }
156 }
157 else
158 { /* No archetype with this object */
159 LOG (llevDebug, "In sell item: Have object with no archetype: %s\n", &tmp->name);
160 if (flag == F_BUY)
161 {
162 LOG (llevError, "Asking for buy-value of unidentified object without arch.\n");
163 val = number * tmp->value * 10;
164 }
165 else
166 val = number * tmp->value / 5;
167 } 144 }
168 } 145 }
169 146
170 /* 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
171 * identified, AND the object is magical and the archetype is non 148 * identified, AND the object is magical and the archetype is non
172 * magical, then change values accordingly. The tmp->arch==NULL is 149 * magical, then change values accordingly. The tmp->arch==NULL is
173 * really just a check to prevent core dumps for when it checks 150 * really just a check to prevent core dumps for when it checks
174 * tmp->arch->clone.magic for any magic. The check for archetype 151 * tmp->arch->magic for any magic. The check for archetype
175 * 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
176 * default magical. This is because the archetype value should have 153 * default magical. This is because the archetype value should have
177 * already figured in that value. 154 * already figured in that value.
178 */ 155 */
179 if ((QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified || 156 if ((QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified ||
180 QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) && tmp->magic && (tmp->arch == NULL || !tmp->arch->clone.magic)) 157 QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) && tmp->magic && (tmp->arch == NULL || !tmp->arch->magic))
181 { 158 {
182 if (tmp->magic > 0) 159 if (tmp->magic > 0)
183 val *= (3 * tmp->magic * tmp->magic * tmp->magic); 160 val *= (3 * tmp->magic * tmp->magic * tmp->magic);
184 else 161 else
185 /* Note that tmp->magic is negative, so that this 162 /* Note that tmp->magic is negative, so that this
… …
200 val /= 50; 177 val /= 50;
201 } 178 }
202 179
203 /* Limit amount of money you can get for really great items. */ 180 /* Limit amount of money you can get for really great items. */
204 if (flag == F_SELL) 181 if (flag == F_SELL)
205 val = value_limit ((uint64) val, number, who, shop); 182 val = value_limit ((sint64) val, number, who, shop);
206 183
207 // use a nonlinear price adjustment. as my predecessor said, don't change 184 // use a nonlinear price adjustment. as my predecessor said, don't change
208 // the archetypes, its work required for balancing, and we don't care. 185 // the archetypes, its work required for balancing, and we don't care.
209 //val = pow (val, 1.05); 186 //val = pow (val, 1.05);
210 187
… …
213 * AND Cha = 30 will get optimal price. 190 * AND Cha = 30 will get optimal price.
214 * Thus charisma will never get useless. 191 * Thus charisma will never get useless.
215 * -b.e. edler@heydernet.de 192 * -b.e. edler@heydernet.de
216 */ 193 */
217 194
218 if (who != NULL && who->type == PLAYER) 195 if (who && who->type == PLAYER)
219 { 196 {
220 int lev_bargain = 0; 197 int lev_bargain = 0;
221 int lev_identify = 0; 198 int lev_identify = 0;
222 int idskill1 = 0;
223 int idskill2 = 0;
224 const typedata *tmptype;
225
226 tmptype = get_typedata (tmp->type);
227 199
228 if (find_skill_by_number (who, SK_BARGAINING)) 200 if (find_skill_by_number (who, SK_BARGAINING))
229 {
230 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level; 201 lev_bargain = find_skill_by_number (who, SK_BARGAINING)->level;
202
203 if (const typedata *tmptype = get_typedata (tmp->type))
231 } 204 {
232 if (tmptype)
233 {
234 idskill1 = tmptype->identifyskill; 205 if (int idskill1 = tmptype->identifyskill)
235 if (idskill1)
236 { 206 {
237 idskill2 = tmptype->identifyskill2; 207 int idskill2 = tmptype->identifyskill2;
208
238 if (find_skill_by_number (who, idskill1)) 209 if (find_skill_by_number (who, idskill1))
239 {
240 lev_identify = find_skill_by_number (who, idskill1)->level; 210 lev_identify = find_skill_by_number (who, idskill1)->level;
241 } 211
242 if (idskill2 && find_skill_by_number (who, idskill2)) 212 if (idskill2 && find_skill_by_number (who, idskill2))
243 {
244 lev_identify += find_skill_by_number (who, idskill2)->level; 213 lev_identify += find_skill_by_number (who, idskill2)->level;
245 }
246 } 214 }
247 } 215 }
248 else
249 LOG (llevError, "Query_cost: item %s hasn't got a valid type\n", &tmp->name);
250 216
251 /* ratio determines how much of the price modification 217 /* ratio determines how much of the price modification
252 * will come from the basic stat charisma 218 * will come from the basic stat charisma
253 * the rest will come from the level in bargaining skill 219 * the rest will come from the level in bargaining skill
254 */ 220 */
255 const double cha_ratio = 0.40; 221 const double cha_ratio = 0.40;
256 222
257 diff = no_bargain ? 1.0 : 1. - pow (lev_bargain / (double) settings.max_level, 0.25); 223 diff = no_bargain ? 1.0 : 1. - pow (lev_bargain / (double) settings.max_level, 0.25);
258
259 diff = (1. - cha_ratio) * diff + cha_ratio * (cha_bonus[who->stats.Cha] - 1.) / (cha_bonus[who->stats.Cha] + 1.); 224 diff = (1. - cha_ratio) * diff + cha_ratio * (cha_bonus[who->stats.Cha] - 1.) / (cha_bonus[who->stats.Cha] + 1.);
260
261 diff = .02 + (.80 - .02) * diff; 225 diff = .02 + (.80 - .02) * diff;
262 226
263 if (flag == F_BUY) 227 if (flag == F_BUY)
264 val += (val * diff); 228 val += val * diff;
265 else if (flag == F_SELL) 229 else if (flag == F_SELL)
266 val -= (val * diff); 230 val -= val * diff;
267 231
268 // now find a price range. the less good we can judge, the larger the range is 232 // now find a price range. the less good we can judge, the larger the range is
269 // then the range is adjusted randomly around the correct value 233 // then the range is adjusted randomly around the correct value
270 if (approximate) 234 if (approximate)
271 approx_range = uint64 (val / sqrt (lev_identify * 3 + 1)); 235 approx_range = sint64 (val / sqrt (lev_identify * 3 + 1));
272 } 236 }
273 237
274 /* I don't think this should really happen - if it does, it indicates and 238 /* I don't think this should really happen - if it does, it indicates and
275 * overflow of diff above. That shoudl only happen if 239 * overflow of diff above. That should only happen if
276 * we are selling objects - in that case, the person just 240 * we are selling objects - in that case, the person just
277 * gets no money. 241 * gets no money.
278 */ 242 */
279 if ((sint64) val < 0) 243 if ((sint64) val < 0)
280 val = 0; 244 val = 0;
… …
308 if (QUERY_FLAG (tmp, FLAG_PLAYER_SOLD)) 272 if (QUERY_FLAG (tmp, FLAG_PLAYER_SOLD))
309 val = (val * shop_greed (who->map) * shop_specialisation_ratio (tmp, who->map) / shopkeeper_approval (who->map, who)); 273 val = (val * shop_greed (who->map) * shop_specialisation_ratio (tmp, who->map) / shopkeeper_approval (who->map, who));
310 else 274 else
311 val = (val * shop_greed (who->map) / (shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who))); 275 val = (val * shop_greed (who->map) / (shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who)));
312 } 276 }
277
313 /* we will also have an extra 0-5% variation between shops of the same type 278 /* we will also have an extra 0-5% variation between shops of the same type
314 * for valuable items (below a value of 50 this effect wouldn't be very 279 * for valuable items (below a value of 50 this effect wouldn't be very
315 * pointful, and could give fun with rounding. 280 * pointful, and could give fun with rounding.
316 */ 281 */
317 if (who->map->path != NULL && val > 50) 282 //TODO: why use cosf at all, just % and scale linearly, gives more even distribution
318 val = (val + 0.05 * (sint64) val * cos (tmp->count + strlen (who->map->path))); 283 if (val > 50)
284 val += float (val) * .05f * cosf ((tmp->uuid.seq & 0xffff) * float (M_PI * 2. / 0x10000));
319 } 285 }
286
320 return (uint64) val; 287 return (sint64) val;
321} 288}
322 289
323/* Find the coin type that is worth more the 'c'. Starts at the 290/* Find the coin type that is worth more the 'c'. Starts at the
324 * cointype placement. 291 * cointype placement.
325 */ 292 */
326 293
327static archetype * 294static archetype *
328find_next_coin (uint64 c, int *cointype) 295find_next_coin (sint64 c, int *cointype)
329{ 296{
330 archetype *coin; 297 archetype *coin;
331 298
332 do 299 do
333 { 300 {
334 if (coins[*cointype] == NULL) 301 if (coins[*cointype] == NULL)
335 return NULL; 302 return NULL;
336 coin = find_archetype (coins[*cointype]); 303 coin = archetype::find (coins[*cointype]);
337 if (coin == NULL) 304 if (coin == NULL)
338 return NULL; 305 return NULL;
339 *cointype += 1; 306 *cointype += 1;
340 } 307 }
341 while ((uint64) coin->clone.value > c); 308 while (coin->value > c);
342 309
343 return coin; 310 return coin;
344} 311}
345 312
346/* This returns a string of how much something is worth based on 313/* This returns a string of how much something is worth based on
… …
352 * coins, there are certainly issues - the easiest fix at that 319 * coins, there are certainly issues - the easiest fix at that
353 * time is to add a higher denomination (mithril piece with 320 * time is to add a higher denomination (mithril piece with
354 * 10,000 silver or something) 321 * 10,000 silver or something)
355 */ 322 */
356const char * 323const char *
357cost_string_from_value (uint64 cost, int approx) 324cost_string_from_value (sint64 cost, int approx)
358{ 325{
359 static char buf[MAX_BUF]; 326 static char buf[MAX_BUF];
360 archetype *coin, *next_coin; 327 archetype *coin, *next_coin;
361 int num, cointype = 0; 328 int num, cointype = 0;
362 329
363 coin = find_next_coin (cost, &cointype); 330 coin = find_next_coin (cost, &cointype);
364 if (coin == NULL) 331 if (coin == NULL)
365 return "nothing"; 332 return "nothing";
366 333
367 num = cost / coin->clone.value; 334 num = cost / coin->value;
368 /* so long as nrof is 32 bit, this is true. 335 /* so long as nrof is 32 bit, this is true.
369 * If it takes more coins than a person can possibly carry, this 336 * If it takes more coins than a person can possibly carry, this
370 * is basically true. 337 * is basically true.
371 */ 338 */
372 if ((cost / coin->clone.value) > UINT32_MAX) 339 if ((cost / coin->value) > UINT32_MAX)
373 { 340 {
374 strcpy (buf, "an unimaginable sum of money"); 341 strcpy (buf, "an unimaginable sum of money");
375 return buf; 342 return buf;
376 } 343 }
377 344
378 cost -= (uint64) num *(uint64) coin->clone.value; 345 cost -= num * (sint64)coin->value;
379 346
380 sprintf (buf, "%d %s", num, num > 1 ? &coin->clone.name_pl : &coin->clone.name); 347 sprintf (buf, "%d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name);
381 348
382 next_coin = find_next_coin (cost, &cointype); 349 next_coin = find_next_coin (cost, &cointype);
383 if (next_coin == NULL || approx) 350 if (next_coin == NULL || approx)
384 return buf; 351 return buf;
385 352
386 coin = next_coin; 353 coin = next_coin;
387 num = cost / coin->clone.value; 354 num = cost / coin->value;
388 cost -= (uint64) num *(uint64) coin->clone.value; 355 cost -= num * (sint64)coin->value;
389 356
390 sprintf (buf + strlen (buf), " and %d %s", num, num > 1 ? &coin->clone.name_pl : &coin->clone.name); 357 sprintf (buf + strlen (buf), " and %d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name);
391 358
392 return buf; 359 return buf;
393} 360}
394 361
395const char * 362const char *
396query_cost_string (const object *tmp, object *who, int flag) 363query_cost_string (const object *tmp, object *who, int flag)
397{ 364{
398 uint64 real_value = query_cost (tmp, who, flag); 365 sint64 real_value = query_cost (tmp, who, flag);
399 int idskill1 = 0; 366 int idskill1 = 0;
400 int idskill2 = 0; 367 int idskill2 = 0;
401 const typedata *tmptype; 368 const typedata *tmptype;
402 369
403 tmptype = get_typedata (tmp->type); 370 tmptype = get_typedata (tmp->type);
… …
425 archetype *coin = find_next_coin (real_value, &cointype); 392 archetype *coin = find_next_coin (real_value, &cointype);
426 393
427 if (coin == NULL) 394 if (coin == NULL)
428 return "nothing"; 395 return "nothing";
429 396
430 num = real_value / coin->clone.value; 397 num = real_value / coin->value;
398
431 if (num == 1) 399 if (num == 1)
432 sprintf (buf, "about one %s", &coin->clone.name); 400 sprintf (buf, "about one %s", &coin->object::name);
433 else if (num < 5) 401 else if (num < 5)
434 sprintf (buf, "a few %s", &coin->clone.name_pl); 402 sprintf (buf, "a few %s", &coin->object::name_pl);
435 else if (num < 10) 403 else if (num < 10)
436 sprintf (buf, "several %s", &coin->clone.name_pl); 404 sprintf (buf, "several %s", &coin->object::name_pl);
437 else if (num < 25) 405 else if (num < 25)
438 sprintf (buf, "a moderate amount of %s", &coin->clone.name_pl); 406 sprintf (buf, "a moderate amount of %s", &coin->object::name_pl);
439 else if (num < 100) 407 else if (num < 100)
440 sprintf (buf, "lots of %s", &coin->clone.name_pl); 408 sprintf (buf, "lots of %s", &coin->object::name_pl);
441 else if (num < 1000) 409 else if (num < 1000)
442 sprintf (buf, "a great many %s", &coin->clone.name_pl); 410 sprintf (buf, "a great many %s", &coin->object::name_pl);
443 else 411 else
444 sprintf (buf, "a vast quantity of %s", &coin->clone.name_pl); 412 sprintf (buf, "a vast quantity of %s", &coin->object::name_pl);
413
445 return buf; 414 return buf;
446 } 415 }
447 } 416 }
448 } 417 }
449 418
450 int hash = ((unsigned int) tmp->count * 174364621) & 1023; 419 int hash = ((unsigned int) tmp->count * 174364621) & 1023;
451 420
452 if (approx_range) 421 if (approx_range)
453 { 422 {
454 uint64 lo = (sint64) real_value - (approx_range * hash >> 10); 423 sint64 lo = (sint64) real_value - (approx_range * hash >> 10);
455 static char buf[MAX_BUF]; 424 static char buf[MAX_BUF];
456 425
457 sprintf (buf, "between %s", cost_string_from_value (lo, 1)); 426 sprintf (buf, "between %s", cost_string_from_value (lo, 1));
458 sprintf (buf + strlen (buf), " and %s", cost_string_from_value (lo + approx_range, 1)); 427 sprintf (buf + strlen (buf), " and %s", cost_string_from_value (lo + approx_range, 1));
459 428
… …
465} 434}
466 435
467/* This function finds out how much money the player is carrying, 436/* This function finds out how much money the player is carrying,
468 * including what is in containers. 437 * including what is in containers.
469 */ 438 */
470uint64 439sint64
471query_money (const object *op) 440query_money (const object *op)
472{ 441{
473 object *tmp; 442 object *tmp;
474 uint64 total = 0; 443 sint64 total = 0;
475 444
476 if (op->type != PLAYER && op->type != CONTAINER) 445 if (op->type != PLAYER && op->type != CONTAINER)
477 { 446 {
478 LOG (llevError, "Query money called with non player/container\n"); 447 LOG (llevError, "Query money called with non player/container\n");
479 return 0; 448 return 0;
480 } 449 }
450
481 for (tmp = op->inv; tmp; tmp = tmp->below) 451 for (tmp = op->inv; tmp; tmp = tmp->below)
482 {
483 if (tmp->type == MONEY) 452 if (tmp->type == MONEY)
484 {
485 total += (uint64) tmp->nrof * (uint64) tmp->value; 453 total += tmp->nrof * (sint64)tmp->value;
486 }
487 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")))
488 {
489 total += query_money (tmp); 455 total += query_money (tmp);
490 } 456
491 }
492 return total; 457 return total;
493} 458}
494 459
495/* TCHIZE: This function takes the amount of money from the 460/* TCHIZE: This function takes the amount of money from the
496 * the player inventory and from it's various pouches using the 461 * the player inventory and from it's various pouches using the
497 * pay_from_container function. 462 * pay_from_container function.
498 * returns 0 if not possible. 1 if success 463 * returns 0 if not possible. 1 if success
499 */ 464 */
500int 465int
501pay_for_amount (uint64 to_pay, object *pl) 466pay_for_amount (sint64 to_pay, object *pl)
502{ 467{
503 object *pouch; 468 object *pouch;
504 469
505 if (to_pay == 0) 470 if (to_pay == 0)
506 return 1; 471 return 1;
472
507 if (to_pay > query_money (pl)) 473 if (to_pay > query_money (pl))
508 return 0; 474 return 0;
509 475
510 to_pay = pay_from_container (pl, pl, to_pay); 476 pay_from_container (pl, pl, to_pay);
511 477
512 for (pouch = pl->inv; (pouch != NULL) && (to_pay > 0); pouch = pouch->below) 478 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
513 {
514 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")))
515 {
516 to_pay = pay_from_container (pl, pouch, to_pay); 480 pay_from_container (pl, pouch, to_pay);
517 } 481
518 } 482 pl->update_stats ();
519 fix_player (pl);
520 return 1; 483 return 1;
521} 484}
522 485
523/* DAMN: This is now a wrapper for pay_from_container, which is 486/* DAMN: This is now a wrapper for pay_from_container, which is
524 * called for the player, then for each active container that can hold 487 * called for the player, then for each active container that can hold
… …
526 * of the price was paid from. 489 * of the price was paid from.
527 */ 490 */
528int 491int
529pay_for_item (object *op, object *pl) 492pay_for_item (object *op, object *pl)
530{ 493{
531 uint64 to_pay = query_cost (op, pl, F_BUY | F_SHOP); 494 sint64 to_pay = query_cost (op, pl, F_BUY | F_SHOP);
532 object *pouch; 495 object *pouch;
533 uint64 saved_money; 496 sint64 saved_money;
534 497
535 if (to_pay == 0) 498 if (to_pay == 0)
536 return 1; 499 return 1;
500
537 if (to_pay > query_money (pl)) 501 if (to_pay > query_money (pl))
538 return 0; 502 return 0;
539 503
540 /* We compare the paid price with the one for a player 504 /* We compare the paid price with the one for a player
541 * without bargaining skill. 505 * without bargaining skill.
… …
544 saved_money = query_cost (op, pl, F_BUY | F_NO_BARGAIN | F_SHOP) - to_pay; 508 saved_money = query_cost (op, pl, F_BUY | F_NO_BARGAIN | F_SHOP) - to_pay;
545 509
546 if (saved_money > 0) 510 if (saved_money > 0)
547 change_exp (pl, saved_money, "bargaining", SK_EXP_NONE); 511 change_exp (pl, saved_money, "bargaining", SK_EXP_NONE);
548 512
549 to_pay = pay_from_container (pl, pl, to_pay); 513 pay_from_container (pl, pl, to_pay);
550 514
551 for (pouch = pl->inv; (pouch != NULL) && (to_pay > 0); pouch = pouch->below) 515 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
552 {
553 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")))
554 {
555 to_pay = pay_from_container (pl, pouch, to_pay); 517 pay_from_container (pl, pouch, to_pay);
556 } 518
557 } 519 pl->update_stats ();
558 if (settings.real_wiz == FALSE && QUERY_FLAG (pl, FLAG_WAS_WIZ)) 520
559 SET_FLAG (op, FLAG_WAS_WIZ);
560 fix_player (pl);
561 return 1; 521 return 1;
562} 522}
563 523
564/* This pays for the item, and takes the proper amount of money off 524/* This pays for the item, and takes the proper amount of money off
565 * the player. 525 * the player.
… …
573 * 533 *
574 * pouch is the container (pouch or player) to remove the coins from. 534 * pouch is the container (pouch or player) to remove the coins from.
575 * to_pay is the required amount. 535 * to_pay is the required amount.
576 * returns the amount still missing after using "pouch". 536 * returns the amount still missing after using "pouch".
577 */ 537 */
578static uint64 538static void
579pay_from_container (object *pl, object *pouch, uint64 to_pay) 539pay_from_container (object *pl, object *pouch, sint64 &to_pay)
580{ 540{
581 int count, i; 541 int count, i;
582 uint64 remain; 542 object *tmp, *next;
583 object *tmp, *coin_objs[NUM_COINS], *next;
584 archetype *at; 543 archetype *at;
585 544
586 if (pouch->type != PLAYER && pouch->type != CONTAINER) 545 if (pouch->type != PLAYER && pouch->type != CONTAINER)
587 return to_pay; 546 return;
588 547
589 remain = to_pay; 548 object *coin_objs[NUM_COINS] = { 0 };
590 for (i = 0; i < NUM_COINS; i++)
591 coin_objs[i] = NULL;
592 549
593 /* This hunk should remove all the money objects from the player/container */ 550 /* This hunk should remove all the money objects from the player/container */
594 for (tmp = pouch->inv; tmp; tmp = next) 551 for (tmp = pouch->inv; tmp; tmp = next)
595 { 552 {
596 next = tmp->below; 553 next = tmp->below;
597 554
598 if (tmp->type == MONEY) 555 if (tmp->type == MONEY)
599 { 556 {
600 for (i = 0; i < NUM_COINS; i++) 557 for (i = 0; i < NUM_COINS; i++)
601 { 558 {
602 if (!strcmp (coins[NUM_COINS - 1 - i], tmp->arch->name) && (tmp->value == tmp->arch->clone.value)) 559 if (tmp->value == tmp->arch->value && !strcmp (coins[NUM_COINS - 1 - i], tmp->arch->archname))
603 { 560 {
604
605 /* This should not happen, but if it does, just * 561 // This should not happen, but if it does, just merge the two.
606 * merge the two. */
607 if (coin_objs[i] != NULL) 562 if (coin_objs [i])
608 { 563 {
609 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]);
610 remove_ob (tmp);
611 coin_objs[i]->nrof += tmp->nrof; 565 coin_objs[i]->nrof += tmp->nrof;
612 esrv_del_item (pl->contr, tmp->count); 566 tmp->destroy ();
613 free_object (tmp);
614 } 567 }
615 else 568 else
616 { 569 {
617 remove_ob (tmp); 570 tmp->remove ();
618 if (pouch->type == PLAYER)
619 esrv_del_item (pl->contr, tmp->count);
620 coin_objs[i] = tmp; 571 coin_objs[i] = tmp;
621 } 572 }
573
622 break; 574 break;
623 } 575 }
624 } 576 }
577
625 if (i == NUM_COINS) 578 if (i == NUM_COINS)
626 LOG (llevError, "in pay_for_item: Did not find string match for %s\n", &tmp->arch->name); 579 LOG (llevError, "in pay_for_item: Did not find string match for %s\n", &tmp->arch->archname);
627 } 580 }
628 } 581 }
629 582
630 /* Fill in any gaps in the coin_objs array - needed to make change. */ 583 /* Fill in any gaps in the coin_objs array - needed to make change. */
631 /* Note that the coin_objs array goes from least value to greatest value */ 584 /* Note that the coin_objs array goes from least value to greatest value */
632 for (i = 0; i < NUM_COINS; i++) 585 for (i = 0; i < NUM_COINS; i++)
633 if (coin_objs[i] == NULL) 586 if (!coin_objs[i])
634 { 587 {
635 at = find_archetype (coins[NUM_COINS - 1 - i]); 588 at = archetype::find (coins[NUM_COINS - 1 - i]);
589
636 if (at == NULL) 590 if (at == NULL)
637 LOG (llevError, "Could not find %s archetype\n", coins[NUM_COINS - 1 - i]); 591 LOG (llevError, "Could not find %s archetype\n", coins[NUM_COINS - 1 - i]);
638 coin_objs[i] = arch_to_object (at); 592
593 coin_objs[i] = at->instance ();
639 coin_objs[i]->nrof = 0; 594 coin_objs[i]->nrof = 0;
640 } 595 }
641 596
642 for (i = 0; i < NUM_COINS; i++) 597 for (i = 0; i < NUM_COINS; i++)
643 { 598 {
644 int num_coins; 599 object &coin = *coin_objs[i];
600 sint64 num_coins = min ((to_pay + coin.value - 1) / coin.value, (sint64) coin.nrof);
601 to_pay -= num_coins * coin.value;
645 602
646 if (coin_objs[i]->nrof * coin_objs[i]->value > remain)
647 {
648 num_coins = remain / coin_objs[i]->value;
649 if ((uint64) num_coins * (uint64) coin_objs[i]->value < remain)
650 num_coins++;
651 }
652 else
653 {
654 num_coins = coin_objs[i]->nrof;
655 }
656 remain -= (sint64) num_coins *(sint64) coin_objs[i]->value;
657
658 coin_objs[i]->nrof -= num_coins; 603 coin.nrof -= num_coins;
659 /* Now start making change. Start at the coin value 604 /* Now start making change. Start at the coin value
660 * below the one we just did, and work down to 605 * below the one we just did, and work down to
661 * the lowest value. 606 * the lowest value.
662 */ 607 */
663 count = i - 1; 608 count = i - 1;
609
664 while (remain < 0 && count >= 0) 610 while (to_pay < 0 && count >= 0)
665 { 611 {
666 num_coins = -remain / coin_objs[count]->value; 612 num_coins = (-to_pay) / coin_objs[count]->value;
667 coin_objs[count]->nrof += num_coins; 613 coin_objs[count]->nrof += num_coins;
668 remain += num_coins * coin_objs[count]->value; 614 to_pay += num_coins * coin_objs[count]->value;
669 count--; 615 count--;
670 } 616 }
671 } 617 }
618
672 for (i = 0; i < NUM_COINS; i++) 619 for (i = 0; i < NUM_COINS; i++)
673 {
674 if (coin_objs[i]->nrof) 620 if (coin_objs[i]->nrof)
675 {
676 object *tmp = insert_ob_in_ob (coin_objs[i], pouch); 621 insert_ob_in_ob (coin_objs [i], pouch);
677
678 esrv_send_item (pl, tmp);
679 esrv_send_item (pl, pouch);
680
681 if (pl != pouch)
682 esrv_update_item (UPD_WEIGHT, pl, pouch);
683
684 if (pl->type != PLAYER)
685 esrv_send_item (pl, pl);
686 }
687 else 622 else
688 free_object (coin_objs[i]); 623 coin_objs[i]->destroy ();
689 }
690
691 return (remain);
692} 624}
693 625
694/* 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
695 * 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.
696 * 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
697 * to the player 629 * to the player
698 */ 630 */
699
700int 631int
701can_pay (object *pl) 632can_pay (object *pl)
702{ 633{
703 int unpaid_count = 0, i; 634 int unpaid_count = 0;
704 uint64 unpaid_price = 0; 635 sint64 unpaid_price = 0;
705 uint64 player_wealth = query_money (pl); 636 sint64 player_wealth = query_money (pl);
706 object *item;
707 uint32 coincount[NUM_COINS];
708 637
709 if (!pl || pl->type != PLAYER) 638 if (!pl || pl->type != PLAYER)
710 { 639 {
711 LOG (llevError, "can_pay(): called against something that isn't a player\n"); 640 LOG (llevError, "can_pay(): called against something that isn't a player\n");
712 return 0; 641 return 0;
713 } 642 }
714 643
715 for (i = 0; i < NUM_COINS; i++) 644 for (object::depth_iterator item = pl->begin (); item != pl->end (); ++item)
716 coincount[i] = 0;
717
718 for (item = pl->inv; item;)
719 {
720 if (QUERY_FLAG (item, FLAG_UNPAID)) 645 if (QUERY_FLAG (item, FLAG_UNPAID))
721 { 646 {
722 unpaid_count++; 647 unpaid_count++;
723 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP); 648 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP);
724 } 649 }
725
726 /* merely converting the player's monetary wealth won't do, if we did that,
727 * we could print the wrong numbers for the coins, so we count the money instead
728 */
729 for (i = 0; i < NUM_COINS; i++)
730 if (!strcmp (coins[i], item->arch->name))
731 coincount[i] += item->nrof;
732
733 if (item->inv)
734 item = item->inv;
735 else if (item->below)
736 item = item->below;
737 else if (item->env && item->env != pl && item->env->below)
738 item = item->env->below;
739 else
740 item = NULL;
741 }
742 650
743 if (unpaid_price > player_wealth) 651 if (unpaid_price > player_wealth)
744 { 652 {
745 char buf[MAX_BUF]; 653 dynbuf_text &buf = msg_dynbuf; buf.clear ();
746 char cost[MAX_BUF];
747 char missing[MAX_BUF];
748 654
749 sprintf (cost, "%s", cost_string_from_value (unpaid_price, 0)); 655 buf << "You have " << unpaid_count
750 sprintf (missing, "%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.>";
751 660
752 sprintf (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);
753 unpaid_count, cost, missing); 662
754 new_draw_info (NDI_UNIQUE, 0, pl, buf);
755 return 0; 663 return 0;
756 } 664 }
757 else 665 else
758 return 1; 666 return 1;
759} 667}
760
761 668
762/* Better get_payment, descends containers looking for 669/* Better get_payment, descends containers looking for
763 * unpaid items, and pays for them. 670 * unpaid items, and pays for them.
764 * returns 0 if the player still has unpaid items. 671 * returns 0 if the player still has unpaid items.
765 * returns 1 if the player has paid for everything. 672 * returns 1 if the player has paid for everything.
766 * pl is the player buying the stuff. 673 * pl is the player buying the stuff.
767 * op is the object we are examining. If op has
768 * and inventory, we examine that. IF there are objects
769 * below op, we descend down.
770 */ 674 */
771int 675int
772get_payment (object *pl, object *op) 676get_payment (object *pl)
773{ 677{
774 char buf[MAX_BUF]; 678 for (;;)
775 int ret = 1;
776
777 if (op != NULL && op->inv)
778 ret = get_payment (pl, op->inv);
779
780 if (!ret)
781 return 0;
782
783 if (op != NULL && op->below)
784 ret = get_payment (pl, op->below);
785
786 if (!ret)
787 return 0;
788
789 if (op != NULL && QUERY_FLAG (op, FLAG_UNPAID))
790 { 679 {
791 strncpy (buf, query_cost_string (op, pl, F_BUY | F_SHOP), MAX_BUF); 680 next_item:
792 buf[MAX_BUF - 1] = '\0';
793 if (!pay_for_item (op, pl))
794 {
795 uint64 i = query_cost (op, pl, F_BUY | F_SHOP) - query_money (pl);
796 681
797 CLEAR_FLAG (op, FLAG_UNPAID); 682 for (object::depth_iterator op = pl->begin (); op != pl->end (); ++op)
798 new_draw_info_format (NDI_UNIQUE, 0, pl, "You lack %s to buy %s.", cost_string_from_value (i, 0), query_name (op));
799 SET_FLAG (op, FLAG_UNPAID);
800 return 0;
801 } 683 {
802 else
803 {
804 object *tmp;
805 tag_t c = op->count;
806
807 CLEAR_FLAG (op, FLAG_UNPAID); 684 if (QUERY_FLAG (op, FLAG_UNPAID))
808 CLEAR_FLAG (op, FLAG_PLAYER_SOLD);
809 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op));
810 tmp = merge_ob (op, NULL);
811 if (pl->type == PLAYER)
812 { 685 {
813 if (tmp) 686 char buf[MAX_BUF];
814 { /* it was merged */ 687 snprintf (buf, MAX_BUF, "%s", query_cost_string (op, pl, F_BUY | F_SHOP));
815 esrv_del_item (pl->contr, c); 688
816 op = tmp; 689 if (!pay_for_item (op, pl))
690 {
691 sint64 i = query_cost (op, pl, F_BUY | F_SHOP) - query_money (pl);
692
693 CLEAR_FLAG (op, FLAG_UNPAID);
694 new_draw_info_format (NDI_UNIQUE, 0, pl, "You lack %s to buy %s.", cost_string_from_value (i, 0), query_name (op));
695 SET_FLAG (op, FLAG_UNPAID);
696 return 0;
817 } 697 }
818 esrv_send_item (pl, op); 698 else
699 {
700 CLEAR_FLAG (op, FLAG_UNPAID);
701 CLEAR_FLAG (op, FLAG_PLAYER_SOLD);
702 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op));
703
704 if (!merge_ob (op, op->env->inv))
705 esrv_update_item (UPD_FLAGS, pl, op);
706
707 goto next_item;
708 }
819 } 709 }
820 } 710 }
821 } 711
822 return 1; 712 return 1;
713 }
823} 714}
824 715
825/* written by elmex: 716/* written by elmex:
826 * moved this code from sell_item () here to have a function 717 * moved this code from sell_item () here to have a function
827 * that pays the player an amount. Mainly put the code here to 718 * that pays the player an amount. Mainly put the code here to
… …
832 * or put it on the ground under the player. This way the player can still 723 * or put it on the ground under the player. This way the player can still
833 * go somewhere and unload the money at a safe place. 724 * go somewhere and unload the money at a safe place.
834 * 725 *
835 */ 726 */
836void 727void
837pay_player (object *pl, uint64 amount) 728pay_player (object *pl, sint64 amount)
838{ 729{
839 int count = 0; 730 int count = 0;
840 archetype *at = 0; 731 archetype *at = 0;
841 object *pouch = 0, *tmp = 0; 732 object *pouch = 0, *tmp = 0;
842 733
843 for (count = 0; coins[count] != NULL; count++) 734 for (count = 0; coins[count]; count++)
844 { 735 {
845 at = find_archetype (coins[count]); 736 at = archetype::find (coins[count]);
846 737
847 if (at == NULL) 738 if (at == NULL)
848 LOG (llevError, "Could not find %s archetype\n", coins[count]); 739 LOG (llevError, "Could not find %s archetype\n", coins[count]);
849 else if ((amount / at->clone.value) > 0) 740 else if ((amount / at->value) > 0)
850 { 741 {
851 for (pouch = pl->inv; pouch; pouch = pouch->below) 742 for (pouch = pl->inv; pouch; pouch = pouch->below)
852 { 743 {
853 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"))
854 { 745 {
855 int w = at->clone.weight * (100 - pouch->stats.Str) / 100; 746 int w = at->weight * (100 - pouch->stats.Str) / 100;
856 int n = amount / at->clone.value; 747 int n = amount / at->value;
857 748
858 if (w == 0) 749 if (w == 0)
859 w = 1; /* Prevent divide by zero */ 750 w = 1; /* Prevent divide by zero */
860 751
861 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))
862 { 753 {
863 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n) 754 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n)
864 n = (pouch->weight_limit - pouch->carrying) / w; 755 n = (pouch->weight_limit - pouch->carrying) / w;
865 756
866 tmp = arch_to_object (at); 757 object *tmp = at->instance ();
867 tmp->nrof = n; 758 tmp->nrof = n;
868 amount -= (uint64) tmp->nrof * (uint64) tmp->value; 759 amount -= tmp->nrof * tmp->value;
869 tmp = insert_ob_in_ob (tmp, pouch); 760 pouch->insert (tmp);
870 esrv_send_item (pl, tmp);
871 esrv_send_item (pl, pouch);
872 esrv_update_item (UPD_WEIGHT, pl, pouch);
873 esrv_send_item (pl, pl);
874 } 761 }
875 } 762 }
876 } 763 }
877 764
878 if (amount / at->clone.value > 0) 765 if (amount / at->value > 0)
879 { 766 {
880 tmp = arch_to_object (at); 767 object *tmp = at->instance ();
881 tmp->nrof = amount / tmp->value; 768 tmp->nrof = amount / tmp->value;
882 amount -= (uint64) tmp->nrof * (uint64) tmp->value; 769 amount -= tmp->nrof * tmp->value;
883 tmp = insert_ob_in_ob (tmp, pl); 770 pl->insert (tmp);
884 esrv_send_item (pl, tmp);
885 esrv_send_item (pl, pl);
886 } 771 }
887 } 772 }
888 } 773 }
889 774
890 if (amount != 0) 775 if (amount != 0)
891#ifndef WIN32
892 LOG (llevError, "Warning - payment in pay_player () not zero: %llu\n", amount); 776 LOG (llevError, "Warning - payment in pay_player () not zero: %llu\n", amount);
893#else
894 LOG (llevError, "Warning - payment in pay_player () not zero: %I64u\n", amount);
895#endif
896} 777}
897 778
898/* elmex: this is for the bank plugin :( */ 779/* elmex: this is for the bank plugin :( */
899uint64 780sint64
900pay_player_arch (object *pl, const char *arch, uint64 amount) 781pay_player_arch (object *pl, const char *arch, sint64 amount)
901{ 782{
902 archetype *at = find_archetype (arch);
903 object *tmp = NULL;
904
905 if (at == NULL)
906 return 0;
907
908 if (amount > 0) 783 if (amount)
909 { 784 {
910 tmp = arch_to_object (at); 785 object *ob = archetype::get (arch);
786
787 if (!ob)
788 return 0;
789
911 tmp->nrof = amount; 790 ob->nrof = amount;
912 tmp = insert_ob_in_ob (tmp, pl); 791 pl->insert (ob);
913 esrv_send_item (pl, tmp);
914 esrv_send_item (pl, pl);
915 } 792 }
916 793
917 return 1; 794 return 1;
918} 795}
919 796
… …
922 * buy item. 799 * buy item.
923 * 800 *
924 * Modified to fill available race: gold containers before dumping 801 * Modified to fill available race: gold containers before dumping
925 * remaining coins in character's inventory. 802 * remaining coins in character's inventory.
926 */ 803 */
927void 804bool
928sell_item (object *op, object *pl) 805sell_item (object *op, object *pl)
929{ 806{
930 uint64 amount = query_cost (op, pl, F_SELL | F_SHOP), extra_gain; 807 sint64 amount = query_cost (op, pl, F_SELL | F_SHOP), extra_gain;
931 808
932 if (pl == NULL || pl->type != PLAYER) 809 if (pl == NULL || pl->type != PLAYER)
933 { 810 {
934 LOG (llevDebug, "Object other than player tried to sell something.\n"); 811 LOG (llevDebug, "Object other than player tried to sell something.\n");
935 return; 812 return false;
936 } 813 }
937 814
938 op->custom_name = 0; 815 op->custom_name = 0;
939 816
940 if (!amount) 817 if (!amount)
941 { 818 {
942 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.",
943 820 query_name (op));
944 /* 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
945 * worth something. If so, make it unpaid 822 // interested in it.
946 */
947 if (op->value)
948 {
949 SET_FLAG (op, FLAG_UNPAID);
950 SET_FLAG (op, FLAG_PLAYER_SOLD);
951 }
952
953 identify (op);
954 return; 823 return false;
955 } 824 }
956 825
957 /* We compare the price with the one for a player 826 /* We compare the price with the one for a player
958 * without bargaining skill. 827 * without bargaining skill.
959 * This determins the amount of exp (if any) gained for bargaining. 828 * This determins the amount of exp (if any) gained for bargaining.
… …
964 if (extra_gain > 0) 833 if (extra_gain > 0)
965 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE); 834 change_exp (pl, extra_gain / 10, "bargaining", SK_EXP_NONE);
966 835
967 pay_player (pl, amount); 836 pay_player (pl, amount);
968 837
969 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));
840 pl->play_sound (sound_find ("shop_sell"));
970 841
971 SET_FLAG (op, FLAG_UNPAID); 842 SET_FLAG (op, FLAG_UNPAID);
972 identify (op); 843 identify (op);
973}
974 844
845 return true;
846}
975 847
976/* 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
977 * 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,
978 * returned value is between (2*SPECIALISATION_EFFECT-1) and 1 and in any 850 * returned value is between SPECIALISATION_EFFECT and 1.
979 * event is never less than 0.1 (calling functions divide by it)
980 */ 851 */
981static double 852static double
982shop_specialisation_ratio (const object *item, const mapstruct *map) 853shop_specialisation_ratio (const object *item, const maptile *map)
983{ 854{
984 shopitems *items = map->shopitems; 855 shopitems *items = map->shopitems;
985 double ratio = SPECIALISATION_EFFECT, likedness = 0.001; 856 int likedness = 0;
986 int i; 857 int i;
987 858
988 if (item == NULL) 859 if (item == NULL)
989 { 860 {
990 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", map->path); 861 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", &map->path);
991 return 0; 862 return 0;
992 } 863 }
864
993 if (!item->type) 865 if (!item->type)
994 { 866 {
995 LOG (llevError, "shop_specialisation_ratio: passed an item with an invalid type\n"); 867 LOG (llevError, "shop_specialisation_ratio: passed an item with an invalid type\n");
996 /* 868 /*
997 * I'm not really sure what the /right/ thing to do here is, these types of 869 * I'm not really sure what the /right/ thing to do here is, these types of
998 * item shouldn't exist anyway, but returning the ratio is probably the best bet.." 870 * item shouldn't exist anyway, but returning the ratio is probably the best bet.."
999 */ 871 */
1000 return ratio; 872 return SPECIALISATION_EFFECT;
1001 } 873 }
874
1002 if (map->shopitems) 875 if (map->shopitems)
1003 {
1004 for (i = 0; i < items[0].index; i++) 876 for (i = 0; i < items[0].index; i++)
1005 if (items[i].typenum == item->type || (!items[i].typenum && likedness == 0.001)) 877 if (items[i].typenum == item->type || (!items[i].typenum && !likedness))
1006 likedness = items[i].strength / 100.0; 878 likedness = items[i].strength;
1007 } 879
1008 if (likedness > 1.0) 880 if (likedness > 100)
1009 { /* someone has been rather silly with the map headers. */ 881 { /* someone has been rather silly with the map headers. */
1010 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, map->path); 882 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, &map->path);
1011 likedness = 1.0; 883 likedness = 100;
1012 } 884 }
885
1013 if (likedness < -1.0) 886 if (likedness < -100)
1014 { 887 {
1015 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, map->path); 888 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, &map->path);
1016 likedness = -1.0; 889 likedness = -100;
1017 } 890 }
1018 ratio = ratio + (1.0 - ratio) * likedness; 891
1019 if (ratio <= 0.1) 892 return lerp (double (likedness), -100., 100., SPECIALISATION_EFFECT, 1.);
1020 ratio = 0.1; /* if the ratio were much lower than this, we would get silly prices */
1021 return ratio;
1022} 893}
1023 894
1024/*returns the greed of the shop on map, or 1 if it isn't specified. */ 895/*returns the greed of the shop on map, or 1 if it isn't specified. */
1025static double 896static double
1026shop_greed (const mapstruct *map) 897shop_greed (const maptile *map)
1027{ 898{
1028 double greed = 1.0;
1029
1030 if (map->shopgreed)
1031 return map->shopgreed; 899 return map->shopgreed
1032 return greed; 900 ? map->shopgreed
901 : 1.;
1033} 902}
1034 903
1035/* Returns a double based on how much the shopkeeper approves of the player. 904/* Returns a double based on how much the shopkeeper approves of the player.
1036 * this is based on the race of the shopkeeper and that of the player. 905 * this is based on the race of the shopkeeper and that of the player.
1037 */ 906 */
1038double 907double
1039shopkeeper_approval (const mapstruct *map, const object *player) 908shopkeeper_approval (const maptile *map, const object *player)
1040{ 909{
1041 double approval = 1.0; 910 return map->shoprace && player->race != map->shoprace
1042 911 ? DISLIKE_RATIO
1043 if (map->shoprace) 912 : 1.;
1044 {
1045 approval = NEUTRAL_RATIO;
1046 if (player->race && !strcmp (player->race, map->shoprace))
1047 approval = 1.0;
1048 }
1049 return approval;
1050} 913}
1051 914
1052/* limit the value of items based on the wealth of the shop. If the item is close 915/* limit the value of items based on the wealth of the shop. If the item is close
1053 * to the maximum value a shop will offer, we start to reduce it, if the item is 916 * to the maximum value a shop will offer, we start to reduce it, if the item is
1054 * below the minimum value the shop is prepared to trade in, then we don't 917 * below the minimum value the shop is prepared to trade in, then we don't
1055 * want it and offer nothing. If it isn't a shop, check whether we should do generic 918 * want it and offer nothing. If it isn't a shop, check whether we should do generic
1056 * value reduction. 919 * value reduction.
1057 * 920 *
1058 */ 921 */
1059static uint64 922static sint64
1060value_limit (uint64 val, int quantity, const object *who, int isshop) 923value_limit (sint64 val, int quantity, const object *who, int isshop)
1061{ 924{
1062 uint64 newval, unit_price, tmpshopmax; 925 sint64 newval, unit_price, tmpshopmax;
1063 mapstruct *map; 926 maptile *map;
1064 927
1065 unit_price = val / quantity; 928 unit_price = val / quantity;
1066 929
1067 if (!isshop || !who) 930 if (!isshop || !who)
1068 { 931 {
1069 if (unit_price > 250000) 932 if (unit_price > 250000)
1070 newval = (uint64) (250000. - pow (250000., .75) * 65. + pow (unit_price, .75) * 65.); 933 newval = (sint64) (250000. - pow (250000., .75) * 65. + pow (unit_price, .75) * 65.);
1071 else 934 else
1072 newval = unit_price; 935 newval = unit_price;
1073 } 936 }
1074 else 937 else
1075 { 938 {
… …
1084 tmpshopmax = map->shopmax ? map->shopmax : 100000; // 20 royalties default 947 tmpshopmax = map->shopmax ? map->shopmax : 100000; // 20 royalties default
1085 948
1086 if (map->shopmin && unit_price < map->shopmin) 949 if (map->shopmin && unit_price < map->shopmin)
1087 return 0; 950 return 0;
1088 else if (unit_price > tmpshopmax / 2) 951 else if (unit_price > tmpshopmax / 2)
1089 newval = MIN ((tmpshopmax / 2) + isqrt (unit_price - tmpshopmax / 2), tmpshopmax); 952 newval = min ((tmpshopmax / 2) + isqrt (unit_price - tmpshopmax / 2), tmpshopmax);
1090 else 953 else
1091 newval = unit_price; 954 newval = unit_price;
1092 } 955 }
1093 956
1094 newval *= quantity; 957 newval *= quantity;
… …
1098 961
1099/* gives a desciption of the shop on their current map to the player op. */ 962/* gives a desciption of the shop on their current map to the player op. */
1100int 963int
1101describe_shop (const object *op) 964describe_shop (const object *op)
1102{ 965{
966 dynbuf_text buf;
1103 mapstruct *map = op->map; 967 maptile *map = op->map;
1104 968
1105 /*shopitems *items=map->shopitems; */ 969 /*shopitems *items=map->shopitems; */
1106 int pos = 0, i; 970 int pos = 0, i;
1107 double opinion = 0; 971 double opinion = 0;
1108 char tmp[MAX_BUF] = "\0";
1109 972
1110 if (op->type != PLAYER) 973 if (op->type != PLAYER)
1111 return 0; 974 return 0;
1112 975
1113 /*check if there is a shop specified for this map */ 976 /*check if there is a shop specified for this map */
1114 if (map->shopitems || map->shopgreed || map->shoprace || map->shopmin || map->shopmax) 977 if (map->shopitems || map->shopgreed || map->shoprace || map->shopmin || map->shopmax)
1115 { 978 {
1116 new_draw_info (NDI_UNIQUE, 0, op, "From looking at the nearby shop you determine that it trades in:"); 979 buf << "From looking at the nearby shop you determine that it trades in ";
980 int lastcomma = 0, prevcomma = 0;
981
1117 if (map->shopitems) 982 if (map->shopitems)
1118 {
1119 for (i = 0; i < map->shopitems[0].index; i++) 983 for (i = 0; i < map->shopitems[0].index; i++)
984 if (map->shopitems[i].name && map->shopitems[i].strength > 10)
1120 { 985 {
1121 if (map->shopitems[i].name && map->shopitems[i].strength > 10) 986 buf << map->shopitems[i].name_pl;
1122 { 987 prevcomma = lastcomma;
1123 snprintf (tmp + pos, sizeof (tmp) - pos, "%s, ", map->shopitems[i].name_pl); 988 lastcomma = buf.size (); // remember offset
1124 pos += strlen (tmp + pos); 989 buf << ", ";
1125 }
1126 } 990 }
991
992 if (lastcomma)
1127 } 993 {
1128 if (!pos) 994 buf.splice (lastcomma, 2);
995
996 if (prevcomma)
997 buf.splice (prevcomma, 2, " and ");
998 }
999 else
1129 strcat (tmp, "a little of everything."); 1000 buf << "a little of everything.";
1130 1001
1131 /* format the string into a list */ 1002 buf << ".\n\n";
1132 make_list_like (tmp);
1133 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", tmp);
1134 1003
1135 if (map->shopmax) 1004 if (map->shopmax)
1136 new_draw_info_format (NDI_UNIQUE, 0, op, "It won't trade for items above %s.", cost_string_from_value (map->shopmax, 0)); 1005 buf << "It won't trade for items above " << cost_string_from_value (map->shopmax, 0) << ".\n\n";
1006
1137 if (map->shopmin) 1007 if (map->shopmin)
1138 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)); 1008 buf << "It won't trade in items worth less than " << cost_string_from_value (map->shopmin, 0) << ".\n\n";
1009
1139 if (map->shopgreed) 1010 if (map->shopgreed)
1140 { 1011 {
1141 if (map->shopgreed > 2.0) 1012 if (map->shopgreed > 2.0)
1142 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge massively."); 1013 buf << "It tends to overcharge massively.\n\n";
1143 else if (map->shopgreed > 1.5) 1014 else if (map->shopgreed > 1.5)
1144 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge substantially."); 1015 buf << "It tends to overcharge substantially.\n\n";
1145 else if (map->shopgreed > 1.1) 1016 else if (map->shopgreed > 1.1)
1146 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge slightly."); 1017 buf << "It tends to overcharge slightly.\n\n";
1147 else if (map->shopgreed < 0.9) 1018 else if (map->shopgreed < 0.9)
1148 new_draw_info (NDI_UNIQUE, 0, op, "It tends to undercharge."); 1019 buf << "It tends to undercharge.\n\n";
1149 } 1020 }
1021
1150 if (map->shoprace) 1022 if (map->shoprace)
1151 { 1023 {
1152 opinion = shopkeeper_approval (map, op); 1024 opinion = shopkeeper_approval (map, op);
1025
1153 if (opinion > 0.8) 1026 if (opinion > 0.8)
1154 new_draw_info (NDI_UNIQUE, 0, op, "You think the shopkeeper likes you."); 1027 buf << "You think the shopkeeper likes you.\n\n";
1155 else if (opinion > 0.5) 1028 else if (opinion > 0.5)
1156 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper seems unconcerned by you."); 1029 buf << "The shopkeeper seems unconcerned by you.\n\n";
1157 else 1030 else
1158 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper seems to have taken a dislike to you."); 1031 buf << "The shopkeeper seems to have taken a dislike to you.\n\n";
1159 } 1032 }
1160 } 1033 }
1161 else 1034 else
1162 new_draw_info (NDI_UNIQUE, 0, op, "There is no shop nearby."); 1035 buf << "There is no shop nearby.\n\n";
1036
1037 op->contr->infobox (MSG_CHANNEL ("shopinfo"), buf);
1163 1038
1164 return 1; 1039 return 1;
1165} 1040}
1041
1166typedef struct shopinv 1042struct shopinv
1167{ 1043{
1168 char *item_sort; 1044 char *item_sort;
1169 char *item_real; 1045 char *item_real;
1170 uint16 type; 1046 uint16 type;
1171 uint32 nrof; 1047 uint32 nrof;
1172} shopinv; 1048};
1173 1049
1174/* There are a lot fo extra casts in here just to suppress warnings - it 1050/* There are a lot fo extra casts in here just to suppress warnings - it
1175 * makes it look uglier than it really it. 1051 * makes it look uglier than it really it.
1176 * The format of the strings we get is type:name. So we first want to 1052 * The format of the strings we get is type:name. So we first want to
1177 * sort by type (numerical) - if the same type, then sort by name. 1053 * sort by type (numerical) - if the same type, then sort by name.
… …
1181{ 1057{
1182 shopinv *s1 = (shopinv *) a1, *s2 = (shopinv *) a2; 1058 shopinv *s1 = (shopinv *) a1, *s2 = (shopinv *) a2;
1183 1059
1184 if (s1->type < s2->type) 1060 if (s1->type < s2->type)
1185 return -1; 1061 return -1;
1062
1186 if (s1->type > s2->type) 1063 if (s1->type > s2->type)
1187 return 1; 1064 return 1;
1065
1188 /* the type is the same (what atoi gets), so do a strcasecmp to sort 1066 /* the type is the same (what atoi gets), so do a strcasecmp to sort
1189 * via alphabetical order 1067 * via alphabetical order
1190 */ 1068 */
1191 return strcasecmp (s1->item_sort, s2->item_sort); 1069 return strcasecmp (s1->item_sort, s2->item_sort);
1192} 1070}
… …
1219 case RING: 1097 case RING:
1220 case AMULET: 1098 case AMULET:
1221 case BRACERS: 1099 case BRACERS:
1222 case GIRDLE: 1100 case GIRDLE:
1223 sprintf (buf, "%s %s", query_base_name (tmp, 0), describe_item (tmp, NULL)); 1101 sprintf (buf, "%s %s", query_base_name (tmp, 0), describe_item (tmp, NULL));
1224 items[*numitems].item_sort = strdup_local (buf); 1102 items[*numitems].item_sort = strdup (buf);
1225 sprintf (buf, "%s %s", query_name (tmp), describe_item (tmp, NULL)); 1103 sprintf (buf, "%s %s", query_name (tmp), describe_item (tmp, NULL));
1226 items[*numitems].item_real = strdup_local (buf); 1104 items[*numitems].item_real = strdup (buf);
1227 (*numitems)++; 1105 (*numitems)++;
1228 break; 1106 break;
1229#endif 1107#endif
1230 1108
1231 default: 1109 default:
1232 items[*numitems].item_sort = strdup_local (query_base_name (tmp, 0)); 1110 items[*numitems].item_sort = strdup (query_base_name (tmp, 0));
1233 items[*numitems].item_real = strdup_local (query_base_name (tmp, 1)); 1111 items[*numitems].item_real = strdup (query_base_name (tmp, 1));
1234 (*numitems)++; 1112 (*numitems)++;
1235 break; 1113 break;
1236 } 1114 }
1115
1237 SET_FLAG (tmp, FLAG_UNPAID); 1116 SET_FLAG (tmp, FLAG_UNPAID);
1238} 1117}
1239 1118
1240void 1119void
1241shop_listing (object *op) 1120shop_listing (object *sign, object *op)
1242{ 1121{
1243 int i, j, numitems = 0, numallocated = 0, nx, ny; 1122 int i, j, x1, x2, y1, y2;
1244 char *map_mark = (char *) calloc (MAGIC_MAP_SIZE * MAGIC_MAP_SIZE, 1); 1123 const char *shop_coords = sign->kv (shstr_shop_coords);
1245 object *stack; 1124 object *stack;
1246 shopinv *items; 1125 shopinv *items;
1247 1126
1248 /* Should never happen, but just in case a monster does apply a sign */ 1127 /* Should never happen, but just in case a monster does apply a sign */
1249 if (op->type != PLAYER) 1128 if (!op->is_player ())
1250 return; 1129 return;
1251 1130
1252 new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:"); 1131 dynbuf_text &buf = msg_dynbuf; buf.clear ();
1253 1132
1254 magic_mapping_mark (op, map_mark, 3); 1133 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2)))
1255 items = (shopinv *) malloc (40 * sizeof (shopinv)); 1134 {
1135 x1 = 0;
1136 y1 = 0;
1137 x2 = op->map->width - 1;
1138 y2 = op->map->height - 1;
1139 }
1140
1256 numallocated = 40; 1141 int numallocated = 40;
1142 int numitems = 0;
1143 items = (shopinv *)malloc (sizeof (shopinv) * numallocated);
1257 1144
1258 /* Find all the appropriate items */ 1145 /* Find all the appropriate items */
1259 for (i = 0; i < MAP_WIDTH (op->map); i++) 1146 for (i = x1; i <= x2; i++)
1260 { 1147 for (j = y1; j < y2; j++)
1261 for (j = 0; j < MAP_HEIGHT (op->map); j++) 1148 if (is_in_shop (op->map, i, j))
1262 {
1263 /* magic map code now centers the map on the object at MAGIC_MAP_HALF.
1264 * 1149 {
1265 */ 1150 stack = GET_MAP_OB (op->map, i, j);
1266 nx = i - op->x + MAGIC_MAP_HALF;
1267 ny = j - op->y + MAGIC_MAP_HALF;
1268 /* unlikely, but really big shops could run into this issue */
1269 if (nx < 0 || ny < 0 || nx > MAGIC_MAP_SIZE || ny > MAGIC_MAP_SIZE)
1270 continue;
1271 1151
1272 if (map_mark[nx + MAGIC_MAP_SIZE * ny] & FACE_FLOOR) 1152 while (stack)
1273 { 1153 {
1274 stack = get_map_ob (op->map, i, j); 1154 if (QUERY_FLAG (stack, FLAG_UNPAID))
1275
1276 while (stack)
1277 { 1155 {
1278 if (QUERY_FLAG (stack, FLAG_UNPAID))
1279 {
1280 if (numitems == numallocated) 1156 if (numitems == numallocated)
1281 {
1282 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10)); 1157 items = (shopinv *)realloc (items, sizeof (shopinv) * (numallocated *= 2));
1283 numallocated += 10; 1158
1284 }
1285 add_shop_item (stack, items, &numitems, &numallocated); 1159 add_shop_item (stack, items, &numitems, &numallocated);
1286 }
1287 stack = stack->above;
1288 } 1160 }
1161
1162 stack = stack->above;
1289 } 1163 }
1290 } 1164 }
1291 } 1165
1292 free (map_mark); 1166 buf << (numitems ? "T<This shop contains:>\n\n"
1293 if (numitems == 0) 1167 : "T<This shop is currently empty.>");
1294 { 1168
1295 new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n");
1296 free (items);
1297 return;
1298 }
1299 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort); 1169 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort);
1300 1170
1301 for (i = 0; i < numitems; i++) 1171 for (i = 0; i < numitems; i++)
1302 { 1172 {
1303 /* Collapse items of the same name together */ 1173 /* Collapse items of the same name together */
1304 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real)) 1174 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real))
1305 {
1306 items[i + 1].nrof += items[i].nrof; 1175 items[i + 1].nrof += items[i].nrof;
1307 free (items[i].item_sort);
1308 free (items[i].item_real);
1309 }
1310 else 1176 else
1311 {
1312 new_draw_info_format (NDI_UNIQUE, 0, op, "%d %s",
1313 items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real); 1177 buf.printf (" %4d %s\n", items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real);
1178
1314 free (items[i].item_sort); 1179 free (items[i].item_sort);
1315 free (items[i].item_real); 1180 free (items[i].item_real);
1316 }
1317 } 1181 }
1182
1183 op->contr->infobox (MSG_CHANNEL ("shopitems"), buf);
1184
1318 free (items); 1185 free (items);
1319} 1186}
1320 1187
1321/* elmex: this function checks whether the object is in a shop */ 1188/* elmex: this function checks whether the object is in a shop */
1322bool 1189bool
1323is_in_shop (object *o) 1190is_in_shop (object *o)
1324{ 1191{
1325 if (!o->map) 1192 if (!o->is_on_map ())
1326 return false; 1193 return false;
1327 1194
1328 return is_in_shop (o->map, o->x, o->y); 1195 return is_in_shop (o->map, o->x, o->y);
1329} 1196}
1330 1197
1331/* elmex: this function checks whether we are in a shop or not */ 1198/* elmex: this function checks whether we are in a shop or not
1199 - change 2007-11-26: enhanced the O(n) case by stopping at the first
1200 floor tile. this possibly will make map bugs where shopfloors are above
1201 floors more obvious.
1202*/
1203
1332bool 1204bool
1333is_in_shop (mapstruct *map, int x, int y) 1205is_in_shop (maptile *map, int x, int y)
1334{ 1206{
1335 for (object *floor = get_map_ob (map, x, y); floor; floor = floor->above) 1207 for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above)
1208 if (QUERY_FLAG (floor, FLAG_IS_FLOOR))
1336 if (floor->type == SHOP_FLOOR) 1209 return floor->type == SHOP_FLOOR;
1337 return true;
1338 1210
1339 return false; 1211 return false;
1340} 1212}
1213

Diff Legend

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