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.37 by root, Mon May 28 21:28:36 2007 UTC vs.
Revision 1.38 by root, Mon Jun 4 12:19:09 2007 UTC

581 581
582 if (tmp->type == MONEY) 582 if (tmp->type == MONEY)
583 { 583 {
584 for (i = 0; i < NUM_COINS; i++) 584 for (i = 0; i < NUM_COINS; i++)
585 { 585 {
586 if (tmp->value == tmp->arch->clone.value && !strcmp (coins[NUM_COINS - 1 - i], tmp->arch->name)) 586 if (tmp->value == tmp->arch->clone.value && !strcmp (coins[NUM_COINS - 1 - i], tmp->arch->archname))
587 { 587 {
588 // This should not happen, but if it does, just merge the two. 588 // This should not happen, but if it does, just merge the two.
589 if (coin_objs [i]) 589 if (coin_objs [i])
590 { 590 {
591 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]); 591 LOG (llevError, "%s has two money entries of (%s)\n", &pouch->name, coins[NUM_COINS - 1 - i]);
607 break; 607 break;
608 } 608 }
609 } 609 }
610 610
611 if (i == NUM_COINS) 611 if (i == NUM_COINS)
612 LOG (llevError, "in pay_for_item: Did not find string match for %s\n", &tmp->arch->name); 612 LOG (llevError, "in pay_for_item: Did not find string match for %s\n", &tmp->arch->archname);
613 } 613 }
614 } 614 }
615 615
616 /* Fill in any gaps in the coin_objs array - needed to make change. */ 616 /* Fill in any gaps in the coin_objs array - needed to make change. */
617 /* Note that the coin_objs array goes from least value to greatest value */ 617 /* Note that the coin_objs array goes from least value to greatest value */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines