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.58 by root, Tue Dec 16 23:25:25 2008 UTC vs.
Revision 1.81 by root, Wed Apr 28 19:20:48 2010 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,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <spells.h> 26#include <spells.h>
26#include <skills.h> 27#include <skills.h>
27#include <living.h> 28#include <living.h>
28#include <sproto.h> 29#include <sproto.h>
29#include <math.h>
30 30
31/* this is a measure of how effective store specialisation is. A general store 31/* this is a measure of how effective store specialisation is. A general store
32 * will offer this proportion of the 'maximum' price, a specialised store will 32 * will offer this proportion of the 'maximum' price, a specialised store will
33 * offer a range of prices around it such that the maximum price is always one 33 * offer a range of prices around it such that the maximum price is always one
34 * therefore making this number higher, makes specialisation less effective. 34 * therefore making this number higher, makes specialisation less effective.
… …
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;
… …
91 not_cursed = flag & F_NOT_CURSED; 90 not_cursed = flag & F_NOT_CURSED;
92 approximate = flag & F_APPROX; 91 approximate = flag & F_APPROX;
93 shop = flag & F_SHOP; 92 shop = flag & F_SHOP;
94 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);
95 94
95 int number = tmp->number_of ();
96
96 if (tmp->type == MONEY) 97 if (tmp->type == MONEY)
97 return tmp->nrof * tmp->value; 98 return number * tmp->value;
98 99
99 if (tmp->type == GEM) 100 if (tmp->type == GEM)
100 { 101 {
101 if (flag == F_TRUE) 102 if (flag == F_TRUE)
102 return (tmp->nrof * tmp->value); 103 return number * tmp->value;
103 104
104 if (flag == F_BUY) 105 if (flag == F_BUY)
105 return (sint64) (1.03 * tmp->nrof * tmp->value); 106 return 1.03 * number * tmp->value;
106 107
107 if (flag == F_SELL) 108 if (flag == F_SELL)
108 return (sint64) (0.97 * tmp->nrof * tmp->value); 109 return 0.97 * number * tmp->value;
109 110
110 LOG (llevError, "Query_cost: Gem type with unknown flag %d: %s\n", flag, tmp->debug_desc ()); 111 LOG (llevError, "Query_cost: Gem type with unknown flag %d: %s\n", flag, tmp->debug_desc ());
111 return 0; 112 return 0;
112 } 113 }
113 114
114 number = tmp->nrof;
115 if (number == 0)
116 number = 1;
117 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified) 115 if (tmp->flag [FLAG_IDENTIFIED] || !tmp->need_identify () || identified)
118 { 116 {
119 if (!not_cursed && (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))) 117 if (!not_cursed && (tmp->flag [FLAG_CURSED] || tmp->flag [FLAG_DAMNED]))
120 return 0; 118 return 0;
121 else 119 else
122 val = tmp->value * number; 120 val = number * tmp->value;
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)
128 {
129 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
130 { 135 {
131 LOG (llevError | logBacktrace, "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 (tmp->flag [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 | logBacktrace, "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
… …
167 * tmp->arch->magic for any magic. The check for archetype 151 * tmp->arch->magic for any magic. The check for archetype
168 * 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
169 * default magical. This is because the archetype value should have 153 * default magical. This is because the archetype value should have
170 * already figured in that value. 154 * already figured in that value.
171 */ 155 */
172 if ((QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified || 156 if ((tmp->flag [FLAG_IDENTIFIED] || !tmp->need_identify () || identified || tmp->flag [FLAG_BEEN_APPLIED])
173 QUERY_FLAG (tmp, FLAG_BEEN_APPLIED)) && tmp->magic && (tmp->arch == NULL || !tmp->arch->magic)) 157 && tmp->magic && (!tmp->arch || !tmp->arch->magic))
174 { 158 {
175 if (tmp->magic > 0) 159 if (tmp->magic > 0)
176 val *= (3 * tmp->magic * tmp->magic * tmp->magic); 160 val *= 3 * tmp->magic * tmp->magic * tmp->magic;
177 else 161 else
178 /* Note that tmp->magic is negative, so that this 162 /* Note that tmp->magic is negative, so that this
179 * will actually be something like val /=2, /=3, etc. 163 * will actually be something like val /=2, /=3, etc.
180 */ 164 */
181 val /= (1 - tmp->magic); 165 val /= 1 - tmp->magic;
182 } 166 }
183 167
184 if (tmp->type == WAND) 168 if (tmp->type == WAND)
185 { 169 {
186 /* Value of the wand is multiplied by the number of 170 /* Value of the wand is multiplied by the number of
187 * charges. the treasure code already sets up the value 171 * charges. the treasure code already sets up the value
188 * 50 charges is used as the baseline. 172 * 50 charges is used as the baseline.
189 */ 173 */
190 if (QUERY_FLAG (tmp, FLAG_IDENTIFIED) || !need_identify (tmp) || identified) 174 if (tmp->flag [FLAG_IDENTIFIED] || !tmp->need_identify () || identified)
191 val = (val * tmp->stats.food) / 50; 175 val *= tmp->stats.food / 50;
192 else /* if not identified, presume one charge */ 176 else /* if not identified, presume one charge */
193 val /= 50; 177 val /= 50;
194 } 178 }
195 179
196 /* Limit amount of money you can get for really great items. */ 180 /* Limit amount of money you can get for really great items. */
197 if (flag == F_SELL) 181 if (flag == F_SELL)
198 val = value_limit ((sint64) val, number, who, shop); 182 val = value_limit (val, number, who, shop);
199 183
200 // 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
201 // 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.
202 //val = pow (val, 1.05); 186 //val = pow (val, 1.05);
203 187
… …
234 * will come from the basic stat charisma 218 * will come from the basic stat charisma
235 * the rest will come from the level in bargaining skill 219 * the rest will come from the level in bargaining skill
236 */ 220 */
237 const double cha_ratio = 0.40; 221 const double cha_ratio = 0.40;
238 222
239 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 / MAXLEVEL_TREASURE, 0.25);
240 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.);
241 diff = .02 + (.80 - .02) * diff; 225 diff = .02 + (.80 - .02) * diff;
242 226
243 if (flag == F_BUY) 227 if (flag == F_BUY)
244 val += val * diff; 228 val += val * diff;
… …
246 val -= val * diff; 230 val -= val * diff;
247 231
248 // 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
249 // then the range is adjusted randomly around the correct value 233 // then the range is adjusted randomly around the correct value
250 if (approximate) 234 if (approximate)
251 approx_range = sint64 (val / sqrt (lev_identify * 3 + 1)); 235 approx_range = val / sqrt (lev_identify * 3 + 1);
252 } 236 }
253 237
254 /* 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
255 * overflow of diff above. That should only happen if 239 * overflow of diff above. That should only happen if
256 * we are selling objects - in that case, the person just 240 * we are selling objects - in that case, the person just
257 * gets no money. 241 * gets no money.
258 */ 242 */
259 if ((sint64) val < 0) 243 if ((sint64) val < 0)
260 val = 0; 244 val = 0;
261 245
262 /* Unidentified stuff won't sell for more than 60gp */ 246 /* Unidentified stuff won't sell for more than 10gp */
263 if (flag == F_SELL && !QUERY_FLAG (tmp, FLAG_IDENTIFIED) && need_identify (tmp) && !identified) 247 if (flag == F_SELL && !tmp->flag [FLAG_IDENTIFIED] && tmp->need_identify () && !identified)
264 { 248 min_it (val, 1000);
265 val = (val > 600) ? 600 : val;
266 }
267 249
268 /* if we are in a shop, check how the type of shop should affect the price */ 250 /* if we are in a shop, check how the type of shop should affect the price */
269 if (shop && who) 251 if (shop && who)
270 { 252 {
271 if (flag == F_SELL) 253 if (flag == F_SELL)
272 val = (val * shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who) / shop_greed (who->map)); 254 val *= shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who) / shop_greed (who->map);
273 else if (flag == F_BUY) 255 else if (flag == F_BUY)
274 { 256 {
275 /* 257 /*
276 * when buying, if the item was sold by another player, it is ok to 258 * when buying, if the item was sold by another player, it is ok to
277 * let the item be sold cheaper, according to the specialisation of 259 * let the item be sold cheaper, according to the specialisation of
… …
283 * be sold for (otherwise players could camp map resets to make money). 265 * be sold for (otherwise players could camp map resets to make money).
284 * In game terms, a non-specialist shop, might not recognise the true 266 * In game terms, a non-specialist shop, might not recognise the true
285 * value of the items they sell (much like how people sometimes find 267 * value of the items they sell (much like how people sometimes find
286 * antiques in a junk shop in real life). 268 * antiques in a junk shop in real life).
287 */ 269 */
288 if (QUERY_FLAG (tmp, FLAG_PLAYER_SOLD)) 270 if (tmp->flag [FLAG_PLAYER_SOLD])
289 val = (val * shop_greed (who->map) * shop_specialisation_ratio (tmp, who->map) / shopkeeper_approval (who->map, who)); 271 val *= shop_specialisation_ratio (tmp, who->map);
290 else 272 else
291 val = (val * shop_greed (who->map) / (shop_specialisation_ratio (tmp, who->map) * shopkeeper_approval (who->map, who))); 273 val /= shop_specialisation_ratio (tmp, who->map);
274
275 val *= shop_greed (who->map) / shopkeeper_approval (who->map, who);
292 } 276 }
293 277
294 /* 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
295 * 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
296 * pointful, and could give fun with rounding. 280 * pointful, and could give fun with rounding.
297 */ 281 */
298 //TODO: why use cosf at all, just % and scale linearly, gives more even distribution 282 //TODO: why use cosf at all, just % and scale linearly, gives more even distribution
299 if (val > 50) 283 if (val > 50)
300 val += float (val) * .05f * cosf ((tmp->uuid.seq & 0xffff) * float (M_PI * 2. / 0x10000)); 284 val *= 1 + .05f * cosf ((tmp->uuid.seq & 0xffff) * M_PI * 2. / 0x10000);
301 } 285 }
302 286
303 return (sint64) val; 287 return val;
304} 288}
305 289
306/* 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
307 * cointype placement. 291 * cointype placement.
308 */ 292 */
… …
312{ 296{
313 archetype *coin; 297 archetype *coin;
314 298
315 do 299 do
316 { 300 {
317 if (coins[*cointype] == NULL) 301 if (!coins [*cointype])
318 return NULL; 302 return 0;
303
319 coin = archetype::find (coins[*cointype]); 304 coin = archetype::find (coins [*cointype]);
305
320 if (coin == NULL) 306 if (!coin)
321 return NULL; 307 return 0;
308
322 *cointype += 1; 309 *cointype += 1;
323 } 310 }
324 while (coin->value > c); 311 while (coin->value > c);
325 312
326 return coin; 313 return coin;
… …
337 * 10,000 silver or something) 324 * 10,000 silver or something)
338 */ 325 */
339const char * 326const char *
340cost_string_from_value (sint64 cost, int approx) 327cost_string_from_value (sint64 cost, int approx)
341{ 328{
342 static char buf[MAX_BUF];
343 archetype *coin, *next_coin; 329 archetype *coin, *next_coin;
344 int num, cointype = 0; 330 int num, cointype = 0;
345 331
346 coin = find_next_coin (cost, &cointype); 332 coin = find_next_coin (cost, &cointype);
347 if (coin == NULL) 333 if (!coin)
348 return "nothing"; 334 return "nothing";
349 335
350 num = cost / coin->value; 336 num = cost / coin->value;
351 /* so long as nrof is 32 bit, this is true. 337 /* so long as nrof is 32 bit, this is true.
352 * If it takes more coins than a person can possibly carry, this 338 * If it takes more coins than a person can possibly carry, this
353 * is basically true. 339 * is basically true.
354 */ 340 */
355 if ((cost / coin->value) > UINT32_MAX) 341 if (cost / coin->value > UINT32_MAX)
356 {
357 strcpy (buf, "an unimaginable sum of money"); 342 return "an unimaginable sum of money";
358 return buf;
359 }
360 343
361 cost -= num * (sint64)coin->value; 344 cost -= num * (sint64)coin->value;
362 345
363 sprintf (buf, "%d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name); 346 char *buf = format ("%d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name);
364 347
365 next_coin = find_next_coin (cost, &cointype); 348 next_coin = find_next_coin (cost, &cointype);
366 if (next_coin == NULL || approx) 349 if (!next_coin || approx)
367 return buf; 350 return buf;
368 351
369 coin = next_coin; 352 coin = next_coin;
370 num = cost / coin->value; 353 num = cost / coin->value;
371 cost -= num * (sint64)coin->value; 354 cost -= num * (sint64)coin->value;
372 355
373 sprintf (buf + strlen (buf), " and %d %s", num, num > 1 ? &coin->object::name_pl : &coin->object::name); 356 return format ("%s and %d %s", buf, num, num > 1 ? &coin->object::name_pl : &coin->object::name);
374
375 return buf;
376} 357}
377 358
378const char * 359const char *
379query_cost_string (const object *tmp, object *who, int flag) 360query_cost_string (const object *tmp, object *who, int flag)
380{ 361{
… …
401 { 382 {
402 if (!idskill2 || !find_skill_by_number (who, idskill2)) 383 if (!idskill2 || !find_skill_by_number (who, idskill2))
403 { 384 {
404 if (!find_skill_by_number (who, SK_BARGAINING)) 385 if (!find_skill_by_number (who, SK_BARGAINING))
405 { 386 {
406 static char buf[MAX_BUF];
407 int num, cointype = 0; 387 int num, cointype = 0;
408 archetype *coin = find_next_coin (real_value, &cointype); 388 archetype *coin = find_next_coin (real_value, &cointype);
409 389
410 if (coin == NULL) 390 if (!coin)
411 return "nothing"; 391 return "nothing";
412 392
413 num = real_value / coin->value; 393 num = real_value / coin->value;
414 394
415 if (num == 1) 395 if (num == 1)
416 sprintf (buf, "about one %s", &coin->object::name); 396 return format ("about one %s", &coin->object::name);
417 else if (num < 5) 397 else if (num < 5)
418 sprintf (buf, "a few %s", &coin->object::name_pl); 398 return format ("a few %s", &coin->object::name_pl);
419 else if (num < 10) 399 else if (num < 10)
420 sprintf (buf, "several %s", &coin->object::name_pl); 400 return format ("several %s", &coin->object::name_pl);
421 else if (num < 25) 401 else if (num < 25)
422 sprintf (buf, "a moderate amount of %s", &coin->object::name_pl); 402 return format ("a moderate amount of %s", &coin->object::name_pl);
423 else if (num < 100) 403 else if (num < 100)
424 sprintf (buf, "lots of %s", &coin->object::name_pl); 404 return format ("lots of %s", &coin->object::name_pl);
425 else if (num < 1000) 405 else if (num < 1000)
426 sprintf (buf, "a great many %s", &coin->object::name_pl); 406 return format ("a great many %s", &coin->object::name_pl);
427 else 407 else
428 sprintf (buf, "a vast quantity of %s", &coin->object::name_pl); 408 return format ("a vast quantity of %s", &coin->object::name_pl);
429
430 return buf;
431 } 409 }
432 } 410 }
433 } 411 }
434 412
435 int hash = ((unsigned int) tmp->count * 174364621) & 1023;
436
437 if (approx_range) 413 if (approx_range)
438 { 414 {
415 int hash = tmp->random_seed () & 1023;
439 sint64 lo = (sint64) real_value - (approx_range * hash >> 10); 416 sint64 lo = real_value - (approx_range * hash >> 10);
440 static char buf[MAX_BUF];
441 417
442 sprintf (buf, "between %s", cost_string_from_value (lo, 1)); 418 return format ("between %s and %s",
443 sprintf (buf + strlen (buf), " and %s", cost_string_from_value (lo + approx_range, 1)); 419 cost_string_from_value (lo, 1),
444 420 cost_string_from_value (lo + approx_range, 1));
445 return buf;
446 } 421 }
447 } 422 }
448 423
449 return cost_string_from_value (real_value, 0); 424 return cost_string_from_value (real_value, 0);
450} 425}
… …
465 } 440 }
466 441
467 for (tmp = op->inv; tmp; tmp = tmp->below) 442 for (tmp = op->inv; tmp; tmp = tmp->below)
468 if (tmp->type == MONEY) 443 if (tmp->type == MONEY)
469 total += tmp->nrof * (sint64)tmp->value; 444 total += tmp->nrof * (sint64)tmp->value;
470 else if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && (tmp->race == NULL || strstr (tmp->race, "gold"))) 445 else if (tmp->type == CONTAINER && tmp->flag [FLAG_APPLIED] && (!tmp->race || tmp->race.contains ("gold")))
471 total += query_money (tmp); 446 total += query_money (tmp);
472 447
473 return total; 448 return total;
474} 449}
475 450
… …
490 return 0; 465 return 0;
491 466
492 pay_from_container (pl, pl, to_pay); 467 pay_from_container (pl, pl, to_pay);
493 468
494 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 469 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
495 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold"))) 470 if (pouch->type == CONTAINER && pouch->flag [FLAG_APPLIED] && (!pouch->race || pouch->race.contains ("gold")))
496 pay_from_container (pl, pouch, to_pay); 471 pay_from_container (pl, pouch, to_pay);
497 472
498 pl->update_stats (); 473 pl->update_stats ();
499 return 1; 474 return 1;
500} 475}
… …
527 change_exp (pl, saved_money, "bargaining", SK_EXP_NONE); 502 change_exp (pl, saved_money, "bargaining", SK_EXP_NONE);
528 503
529 pay_from_container (pl, pl, to_pay); 504 pay_from_container (pl, pl, to_pay);
530 505
531 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below) 506 for (pouch = pl->inv; pouch && to_pay; pouch = pouch->below)
532 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && (pouch->race == NULL || strstr (pouch->race, "gold"))) 507 if (pouch->type == CONTAINER && pouch->flag [FLAG_APPLIED] && (!pouch->race || pouch->race.contains ("gold")))
533 pay_from_container (pl, pouch, to_pay); 508 pay_from_container (pl, pouch, to_pay);
534 509
535 pl->update_stats (); 510 pl->update_stats ();
536 511
537 return 1; 512 return 1;
… …
604 at = archetype::find (coins[NUM_COINS - 1 - i]); 579 at = archetype::find (coins[NUM_COINS - 1 - i]);
605 580
606 if (at == NULL) 581 if (at == NULL)
607 LOG (llevError, "Could not find %s archetype\n", coins[NUM_COINS - 1 - i]); 582 LOG (llevError, "Could not find %s archetype\n", coins[NUM_COINS - 1 - i]);
608 583
609 coin_objs[i] = arch_to_object (at); 584 coin_objs[i] = at->instance ();
610 coin_objs[i]->nrof = 0; 585 coin_objs[i]->nrof = 0;
611 } 586 }
612 587
613 for (i = 0; i < NUM_COINS; i++) 588 for (i = 0; i < NUM_COINS; i++)
614 { 589 {
615 object &coin = *coin_objs[i]; 590 object &coin = *coin_objs[i];
616 sint64 num_coins = min ((to_pay + coin.value - 1) / coin.value, coin.nrof); 591 sint64 num_coins = min ((to_pay + coin.value - 1) / coin.value, (sint64) coin.nrof);
617 to_pay -= num_coins * coin.value; 592 to_pay -= num_coins * coin.value;
618 593
619 coin.nrof -= num_coins; 594 coin.nrof -= num_coins;
620 /* Now start making change. Start at the coin value 595 /* Now start making change. Start at the coin value
621 * below the one we just did, and work down to 596 * below the one we just did, and work down to
… …
656 LOG (llevError, "can_pay(): called against something that isn't a player\n"); 631 LOG (llevError, "can_pay(): called against something that isn't a player\n");
657 return 0; 632 return 0;
658 } 633 }
659 634
660 for (object::depth_iterator item = pl->begin (); item != pl->end (); ++item) 635 for (object::depth_iterator item = pl->begin (); item != pl->end (); ++item)
661 if (QUERY_FLAG (item, FLAG_UNPAID)) 636 if (item->flag [FLAG_UNPAID])
662 { 637 {
663 unpaid_count++; 638 unpaid_count++;
664 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP); 639 unpaid_price += query_cost (item, pl, F_BUY | F_SHOP);
665 } 640 }
666 641
667 if (unpaid_price > player_wealth) 642 if (unpaid_price > player_wealth)
668 { 643 {
669 dynbuf_text buf; 644 dynbuf_text &buf = msg_dynbuf; buf.clear ();
670 645
671 buf << "You have " << unpaid_count 646 buf << "You have " << unpaid_count
672 << " unpaid item(s) that would cost you " << cost_string_from_value (unpaid_price, 0) 647 << " unpaid item(s) that would cost you " << cost_string_from_value (unpaid_price, 0)
673 << ". You need another " << cost_string_from_value (unpaid_price - player_wealth, 0) 648 << ". You need another " << cost_string_from_value (unpaid_price - player_wealth, 0)
674 << " to be able to afford that. " 649 << " to be able to afford that. "
675 "H<You cannot leave a shop with items you cannot pay - drop those unpaid items first.>"; 650 "H<You cannot leave a shop without paying - drop unpaid items first to be able to leave.>";
676 651
677 pl->failmsg (buf); 652 pl->failmsg (buf);
678 653
679 return 0; 654 return 0;
680 } 655 }
… …
695 { 670 {
696 next_item: 671 next_item:
697 672
698 for (object::depth_iterator op = pl->begin (); op != pl->end (); ++op) 673 for (object::depth_iterator op = pl->begin (); op != pl->end (); ++op)
699 { 674 {
700 if (QUERY_FLAG (op, FLAG_UNPAID)) 675 if (op->flag [FLAG_UNPAID])
701 { 676 {
702 char buf[MAX_BUF];
703 snprintf (buf, MAX_BUF, "%s", query_cost_string (op, pl, F_BUY | F_SHOP)); 677 const char *buf = query_cost_string (op, pl, F_BUY | F_SHOP);
704 678
705 if (!pay_for_item (op, pl)) 679 if (!pay_for_item (op, pl))
706 { 680 {
707 sint64 i = query_cost (op, pl, F_BUY | F_SHOP) - query_money (pl); 681 sint64 i = query_cost (op, pl, F_BUY | F_SHOP) - query_money (pl);
708 682
709 CLEAR_FLAG (op, FLAG_UNPAID); 683 op->clr_flag (FLAG_UNPAID);
710 new_draw_info_format (NDI_UNIQUE, 0, pl, "You lack %s to buy %s.", cost_string_from_value (i, 0), query_name (op)); 684 new_draw_info_format (NDI_UNIQUE, 0, pl, "You lack %s to buy %s.", cost_string_from_value (i, 0), query_name (op));
711 SET_FLAG (op, FLAG_UNPAID); 685 op->set_flag (FLAG_UNPAID);
712 return 0; 686 return 0;
713 } 687 }
714 else 688 else
715 { 689 {
716 CLEAR_FLAG (op, FLAG_UNPAID); 690 op->clr_flag (FLAG_UNPAID);
717 CLEAR_FLAG (op, FLAG_PLAYER_SOLD); 691 op->clr_flag (FLAG_PLAYER_SOLD);
718 new_draw_info_format (NDI_UNIQUE, 0, op, "You paid %s for %s.", buf, query_name (op)); 692 new_draw_info_format (NDI_UNIQUE, 0, pl, "You paid %s for %s.", buf, query_name (op));
719 693
720 if (!merge_ob (op, op->env->inv)) 694 if (!merge_ob (op, op->env->inv))
721 esrv_update_item (UPD_FLAGS, pl, op); 695 esrv_update_item (UPD_FLAGS, pl, op);
722 696
723 goto next_item; 697 goto next_item;
… …
755 LOG (llevError, "Could not find %s archetype\n", coins[count]); 729 LOG (llevError, "Could not find %s archetype\n", coins[count]);
756 else if ((amount / at->value) > 0) 730 else if ((amount / at->value) > 0)
757 { 731 {
758 for (pouch = pl->inv; pouch; pouch = pouch->below) 732 for (pouch = pl->inv; pouch; pouch = pouch->below)
759 { 733 {
760 if (pouch->type == CONTAINER && QUERY_FLAG (pouch, FLAG_APPLIED) && pouch->race && strstr (pouch->race, "gold")) 734 if (pouch->type == CONTAINER && pouch->flag [FLAG_APPLIED] && pouch->race.contains ("gold"))
761 { 735 {
762 int w = at->weight * (100 - pouch->stats.Str) / 100; 736 int w = at->weight * (100 - pouch->stats.Str) / 100;
763 int n = amount / at->value; 737 int n = amount / at->value;
764 738
765 if (w == 0) 739 if (w == 0)
… …
768 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit)) 742 if (n > 0 && (!pouch->weight_limit || pouch->carrying + w <= pouch->weight_limit))
769 { 743 {
770 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n) 744 if (pouch->weight_limit && (pouch->weight_limit - pouch->carrying) / w < n)
771 n = (pouch->weight_limit - pouch->carrying) / w; 745 n = (pouch->weight_limit - pouch->carrying) / w;
772 746
773 object *tmp = arch_to_object (at); 747 object *tmp = at->instance ();
774 tmp->nrof = n; 748 tmp->nrof = n;
775 amount -= tmp->nrof * tmp->value; 749 amount -= tmp->nrof * tmp->value;
776 pouch->insert (tmp); 750 pouch->insert (tmp);
777 } 751 }
778 } 752 }
779 } 753 }
780 754
781 if (amount / at->value > 0) 755 if (amount / at->value > 0)
782 { 756 {
783 object *tmp = arch_to_object (at); 757 object *tmp = at->instance ();
784 tmp->nrof = amount / tmp->value; 758 tmp->nrof = amount / tmp->value;
785 amount -= tmp->nrof * tmp->value; 759 amount -= tmp->nrof * tmp->value;
786 pl->insert (tmp); 760 pl->insert (tmp);
787 } 761 }
788 } 762 }
… …
853 827
854 new_draw_info_format (NDI_UNIQUE, 0, pl, "You receive %s for %s.", 828 new_draw_info_format (NDI_UNIQUE, 0, pl, "You receive %s for %s.",
855 query_cost_string (op, pl, F_SELL | F_SHOP), query_name (op)); 829 query_cost_string (op, pl, F_SELL | F_SHOP), query_name (op));
856 pl->play_sound (sound_find ("shop_sell")); 830 pl->play_sound (sound_find ("shop_sell"));
857 831
858 SET_FLAG (op, FLAG_UNPAID); 832 op->set_flag (FLAG_UNPAID);
859 identify (op); 833 identify (op);
860 834
861 return true; 835 return true;
862} 836}
863 837
… …
867 */ 841 */
868static double 842static double
869shop_specialisation_ratio (const object *item, const maptile *map) 843shop_specialisation_ratio (const object *item, const maptile *map)
870{ 844{
871 shopitems *items = map->shopitems; 845 shopitems *items = map->shopitems;
872 double likedness = 0.; 846 int likedness = 0;
873 int i; 847 int i;
874 848
875 if (item == NULL) 849 if (item == NULL)
876 { 850 {
877 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", &map->path); 851 LOG (llevError, "shop_specialisation_ratio: passed a NULL item for map %s\n", &map->path);
… …
887 */ 861 */
888 return SPECIALISATION_EFFECT; 862 return SPECIALISATION_EFFECT;
889 } 863 }
890 864
891 if (map->shopitems) 865 if (map->shopitems)
892 {
893 for (i = 0; i < items[0].index; i++) 866 for (i = 0; i < items[0].index; i++)
894 if (items[i].typenum == item->type || (!items[i].typenum && likedness == 0.001)) 867 if (items[i].typenum == item->type || (!items[i].typenum && !likedness))
895 likedness = items[i].strength / 100.0; 868 likedness = items[i].strength;
896 }
897 869
898 if (likedness > 1.0) 870 if (likedness > 100)
899 { /* someone has been rather silly with the map headers. */ 871 { /* someone has been rather silly with the map headers. */
900 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, &map->path); 872 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is above 100%%\n", item->type, &map->path);
901 likedness = 1.0; 873 likedness = 100;
902 } 874 }
903 875
904 if (likedness < -1.0) 876 if (likedness < -100)
905 { 877 {
906 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, &map->path); 878 LOG (llevDebug, "shop_specialisation ratio: item type %d on map %s is below -100%%\n", item->type, &map->path);
907 likedness = -1.0; 879 likedness = -100;
908 } 880 }
909 881
910 return lerp (likedness, -1., 1., SPECIALISATION_EFFECT, 1.); 882 return lerp (double (likedness), -100., 100., SPECIALISATION_EFFECT, 1.);
911} 883}
912 884
913/*returns the greed of the shop on map, or 1 if it isn't specified. */ 885/*returns the greed of the shop on map, or 1 if it isn't specified. */
914static double 886static double
915shop_greed (const maptile *map) 887shop_greed (const maptile *map)
… …
965 tmpshopmax = map->shopmax ? map->shopmax : 100000; // 20 royalties default 937 tmpshopmax = map->shopmax ? map->shopmax : 100000; // 20 royalties default
966 938
967 if (map->shopmin && unit_price < map->shopmin) 939 if (map->shopmin && unit_price < map->shopmin)
968 return 0; 940 return 0;
969 else if (unit_price > tmpshopmax / 2) 941 else if (unit_price > tmpshopmax / 2)
970 newval = MIN ((tmpshopmax / 2) + isqrt (unit_price - tmpshopmax / 2), tmpshopmax); 942 newval = min ((tmpshopmax / 2) + isqrt (unit_price - tmpshopmax / 2), tmpshopmax);
971 else 943 else
972 newval = unit_price; 944 newval = unit_price;
973 } 945 }
974 946
975 newval *= quantity; 947 newval *= quantity;
… …
979 951
980/* gives a desciption of the shop on their current map to the player op. */ 952/* gives a desciption of the shop on their current map to the player op. */
981int 953int
982describe_shop (const object *op) 954describe_shop (const object *op)
983{ 955{
956 dynbuf_text buf;
984 maptile *map = op->map; 957 maptile *map = op->map;
985 958
986 /*shopitems *items=map->shopitems; */ 959 /*shopitems *items=map->shopitems; */
987 int pos = 0, i; 960 int pos = 0, i;
988 double opinion = 0; 961 double opinion = 0;
989 char tmp[MAX_BUF] = "\0";
990 962
991 if (op->type != PLAYER) 963 if (op->type != PLAYER)
992 return 0; 964 return 0;
993 965
994 /*check if there is a shop specified for this map */ 966 /*check if there is a shop specified for this map */
995 if (map->shopitems || map->shopgreed || map->shoprace || map->shopmin || map->shopmax) 967 if (map->shopitems || map->shopgreed || map->shoprace || map->shopmin || map->shopmax)
996 { 968 {
997 new_draw_info (NDI_UNIQUE, 0, op, "From looking at the nearby shop you determine that it trades in:"); 969 buf << "From looking at the nearby shop you determine that it trades in ";
970 int lastcomma = 0, prevcomma = 0;
998 971
999 if (map->shopitems) 972 if (map->shopitems)
1000 for (i = 0; i < map->shopitems[0].index; i++) 973 for (i = 0; i < map->shopitems[0].index; i++)
1001 if (map->shopitems[i].name && map->shopitems[i].strength > 10) 974 if (map->shopitems[i].name && map->shopitems[i].strength > 10)
1002 { 975 {
1003 snprintf (tmp + pos, sizeof (tmp) - pos, "%s, ", map->shopitems[i].name_pl); 976 buf << map->shopitems[i].name_pl;
1004 pos += strlen (tmp + pos); 977 prevcomma = lastcomma;
978 lastcomma = buf.size (); // remember offset
979 buf << ", ";
1005 } 980 }
1006 981
1007 if (!pos) 982 if (lastcomma)
983 {
984 buf.splice (lastcomma, 2);
985
986 if (prevcomma)
987 buf.splice (prevcomma, 2, " and ");
988 }
989 else
1008 strcat (tmp, "a little of everything."); 990 buf << "a little of everything.";
1009 991
1010 /* format the string into a list */ 992 buf << ".\n\n";
1011 make_list_like (tmp);
1012 new_draw_info_format (NDI_UNIQUE, 0, op, "%s", tmp);
1013 993
1014 if (map->shopmax) 994 if (map->shopmax)
1015 new_draw_info_format (NDI_UNIQUE, 0, op, "It won't trade for items above %s.", cost_string_from_value (map->shopmax, 0)); 995 buf << "It won't trade for items above " << cost_string_from_value (map->shopmax, 0) << ".\n\n";
1016 996
1017 if (map->shopmin) 997 if (map->shopmin)
1018 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)); 998 buf << "It won't trade in items worth less than " << cost_string_from_value (map->shopmin, 0) << ".\n\n";
1019 999
1020 if (map->shopgreed) 1000 if (map->shopgreed)
1021 { 1001 {
1022 if (map->shopgreed > 2.0) 1002 if (map->shopgreed > 2.0)
1023 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge massively."); 1003 buf << "It tends to overcharge massively.\n\n";
1024 else if (map->shopgreed > 1.5) 1004 else if (map->shopgreed > 1.5)
1025 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge substantially."); 1005 buf << "It tends to overcharge substantially.\n\n";
1026 else if (map->shopgreed > 1.1) 1006 else if (map->shopgreed > 1.1)
1027 new_draw_info (NDI_UNIQUE, 0, op, "It tends to overcharge slightly."); 1007 buf << "It tends to overcharge slightly.\n\n";
1028 else if (map->shopgreed < 0.9) 1008 else if (map->shopgreed < 0.9)
1029 new_draw_info (NDI_UNIQUE, 0, op, "It tends to undercharge."); 1009 buf << "It tends to undercharge.\n\n";
1030 } 1010 }
1031 1011
1032 if (map->shoprace) 1012 if (map->shoprace)
1033 { 1013 {
1034 opinion = shopkeeper_approval (map, op); 1014 opinion = shopkeeper_approval (map, op);
1015
1035 if (opinion > 0.8) 1016 if (opinion > 0.8)
1036 new_draw_info (NDI_UNIQUE, 0, op, "You think the shopkeeper likes you."); 1017 buf << "You think the shopkeeper likes you.\n\n";
1037 else if (opinion > 0.5) 1018 else if (opinion > 0.5)
1038 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper seems unconcerned by you."); 1019 buf << "The shopkeeper seems unconcerned by you.\n\n";
1039 else 1020 else
1040 new_draw_info (NDI_UNIQUE, 0, op, "The shopkeeper seems to have taken a dislike to you."); 1021 buf << "The shopkeeper seems to have taken a dislike to you.\n\n";
1041 } 1022 }
1042 } 1023 }
1043 else 1024 else
1044 new_draw_info (NDI_UNIQUE, 0, op, "There is no shop nearby."); 1025 buf << "There is no shop nearby.\n\n";
1026
1027 op->contr->infobox (MSG_CHANNEL ("shopinfo"), buf);
1045 1028
1046 return 1; 1029 return 1;
1047} 1030}
1048 1031
1049struct shopinv 1032struct shopinv
… …
1077} 1060}
1078 1061
1079static void 1062static void
1080add_shop_item (object *tmp, shopinv * items, int *numitems, int *numallocated) 1063add_shop_item (object *tmp, shopinv * items, int *numitems, int *numallocated)
1081{ 1064{
1082#if 0
1083 char buf[MAX_BUF];
1084#endif
1085 /* clear unpaid flag so that doesn't come up in query 1065 /* clear unpaid flag so that doesn't come up in query
1086 * string. We clear nrof so that we can better sort 1066 * string. We clear nrof so that we can better sort
1087 * the object names. 1067 * the object names.
1088 */ 1068 */
1089 1069
1090 CLEAR_FLAG (tmp, FLAG_UNPAID); 1070 tmp->clr_flag (FLAG_UNPAID);
1091 items[*numitems].nrof = tmp->nrof; 1071 items[*numitems].nrof = tmp->nrof;
1092 /* Non mergable items have nrof of 0, but count them as one 1072 /* Non mergable items have nrof of 0, but count them as one
1093 * so the display is properly. 1073 * so the display is properly.
1094 */ 1074 */
1095 if (tmp->nrof == 0) 1075 if (tmp->nrof == 0)
… …
1117 items[*numitems].item_sort = strdup (query_base_name (tmp, 0)); 1097 items[*numitems].item_sort = strdup (query_base_name (tmp, 0));
1118 items[*numitems].item_real = strdup (query_base_name (tmp, 1)); 1098 items[*numitems].item_real = strdup (query_base_name (tmp, 1));
1119 (*numitems)++; 1099 (*numitems)++;
1120 break; 1100 break;
1121 } 1101 }
1122 SET_FLAG (tmp, FLAG_UNPAID); 1102
1103 tmp->set_flag (FLAG_UNPAID);
1123} 1104}
1124 1105
1125void 1106void
1126shop_listing (object *sign, object *op) 1107shop_listing (object *sign, object *op)
1127{ 1108{
1128 int i, j, numitems = 0, numallocated = 0, x1, x2, y1, y2; 1109 int i, j, x1, x2, y1, y2;
1129 const char *shop_coords = sign->kv (shstr_shop_coords); 1110 const char *shop_coords = sign->kv (shstr_shop_coords);
1130 object *stack; 1111 object *stack;
1131 shopinv *items; 1112 shopinv *items;
1132 1113
1133 /* Should never happen, but just in case a monster does apply a sign */ 1114 /* Should never happen, but just in case a monster does apply a sign */
1134 if (op->type != PLAYER) 1115 if (!op->is_player ())
1135 return; 1116 return;
1117
1118 dynbuf_text &buf = msg_dynbuf; buf.clear ();
1136 1119
1137 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2))) 1120 if (!(shop_coords && sscanf (shop_coords, "%d,%d,%d,%d", &x1, &y1, &x2, &y2)))
1138 { 1121 {
1139 x1 = 0; 1122 x1 = 0;
1140 y1 = 0; 1123 y1 = 0;
1141 x2 = op->map->width - 1; 1124 x2 = op->map->width - 1;
1142 y2 = op->map->height - 1; 1125 y2 = op->map->height - 1;
1143 } 1126 }
1144 1127
1145 items = (shopinv *) malloc (40 * sizeof (shopinv));
1146 numallocated = 40; 1128 int numallocated = 40;
1129 int numitems = 0;
1130 items = (shopinv *)malloc (sizeof (shopinv) * numallocated);
1147 1131
1148 /* Find all the appropriate items */ 1132 /* Find all the appropriate items */
1149 for (i = x1; i <= x2; i++) 1133 for (i = x1; i <= x2; i++)
1150 {
1151 for (j = y1; j < y2; j++) 1134 for (j = y1; j < y2; j++)
1135 if (op->map->is_in_shop (i, j))
1152 { 1136 {
1153 if (is_in_shop (op->map, i, j)) 1137 stack = GET_MAP_OB (op->map, i, j);
1138
1139 while (stack)
1154 { 1140 {
1155 stack = GET_MAP_OB (op->map, i, j); 1141 if (stack->flag [FLAG_UNPAID])
1156
1157 while (stack)
1158 { 1142 {
1159 if (QUERY_FLAG (stack, FLAG_UNPAID))
1160 {
1161 if (numitems == numallocated) 1143 if (numitems == numallocated)
1162 {
1163 items = (shopinv *) realloc (items, sizeof (shopinv) * (numallocated + 10)); 1144 items = (shopinv *)realloc (items, sizeof (shopinv) * (numallocated *= 2));
1164 numallocated += 10;
1165 }
1166 1145
1167 add_shop_item (stack, items, &numitems, &numallocated); 1146 add_shop_item (stack, items, &numitems, &numallocated);
1168 }
1169
1170 stack = stack->above;
1171 } 1147 }
1148
1149 stack = stack->above;
1172 } 1150 }
1173 } 1151 }
1174 }
1175 1152
1176 if (numitems == 0) 1153 buf << (numitems ? "T<This shop contains:>\n\n"
1177 { 1154 : "T<This shop is currently empty.>");
1178 new_draw_info (NDI_UNIQUE, 0, op, "The shop is currently empty.\n");
1179 free (items);
1180 return;
1181 }
1182 1155
1183 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort); 1156 qsort (items, numitems, sizeof (shopinv), (int (*)(const void *, const void *)) shop_sort);
1184
1185 new_draw_info (NDI_UNIQUE, 0, op, "\nThe shop contains:");
1186 1157
1187 for (i = 0; i < numitems; i++) 1158 for (i = 0; i < numitems; i++)
1188 { 1159 {
1189 /* Collapse items of the same name together */ 1160 /* Collapse items of the same name together */
1190 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real)) 1161 if ((i + 1) < numitems && !strcmp (items[i].item_real, items[i + 1].item_real))
1191 {
1192 items[i + 1].nrof += items[i].nrof; 1162 items[i + 1].nrof += items[i].nrof;
1193 free (items[i].item_sort);
1194 free (items[i].item_real);
1195 }
1196 else 1163 else
1197 {
1198 new_draw_info_format (NDI_UNIQUE, 0, op, "%d %s",
1199 items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real); 1164 buf.printf (" %4d %s\n", items[i].nrof ? items[i].nrof : 1, items[i].nrof == 1 ? items[i].item_sort : items[i].item_real);
1165
1200 free (items[i].item_sort); 1166 free (items[i].item_sort);
1201 free (items[i].item_real); 1167 free (items[i].item_real);
1202 }
1203 } 1168 }
1169
1170 op->contr->infobox (MSG_CHANNEL ("shopitems"), buf);
1204 1171
1205 free (items); 1172 free (items);
1206}
1207
1208/* elmex: this function checks whether the object is in a shop */
1209bool
1210is_in_shop (object *o)
1211{
1212 if (!o->is_on_map ())
1213 return false;
1214
1215 return is_in_shop (o->map, o->x, o->y);
1216} 1173}
1217 1174
1218/* elmex: this function checks whether we are in a shop or not 1175/* elmex: this function checks whether we are in a shop or not
1219 - change 2007-11-26: enhanced the O(n) case by stopping at the first 1176 - change 2007-11-26: enhanced the O(n) case by stopping at the first
1220 floor tile. this possibly will make map bugs where shopfloors are above 1177 floor tile. this possibly will make map bugs where shopfloors are above
1221 floors more obvious. 1178 floors more obvious.
1222*/ 1179*/
1223
1224bool 1180bool
1225is_in_shop (maptile *map, int x, int y) 1181maptile::is_in_shop (int x, int y) const
1226{ 1182{
1227 for (object *floor = GET_MAP_OB (map, x, y); floor; floor = floor->above) 1183 for (object *floor = at (x, y).bot; floor; floor = floor->above)
1228 if (QUERY_FLAG (floor, FLAG_IS_FLOOR)) 1184 if (floor->flag [FLAG_IS_FLOOR])
1229 return floor->type == SHOP_FLOOR; 1185 return floor->type == SHOP_FLOOR;
1230 1186
1231 return false; 1187 return false;
1232} 1188}
1233 1189

Diff Legend

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