diff options
| author | Ben Boeckel <MathStuf@gmail.com> | 2009-02-09 05:06:51 -0500 |
|---|---|---|
| committer | Ben Boeckel <MathStuf@gmail.com> | 2009-02-09 05:06:51 -0500 |
| commit | e3228b55f6b456d6aa627b7ecc8548a390cb6e4c (patch) | |
| tree | 6af2e0d334a6b19e1067a755f70e1af621cccb32 /sigencore/Player.cpp | |
| parent | dfa97018d242a736ce4d73803a52f70e701b7f2f (diff) | |
| download | sigen-e3228b55f6b456d6aa627b7ecc8548a390cb6e4c.tar.gz sigen-e3228b55f6b456d6aa627b7ecc8548a390cb6e4c.tar.xz sigen-e3228b55f6b456d6aa627b7ecc8548a390cb6e4c.zip | |
Fix calls in Player
Diffstat (limited to 'sigencore/Player.cpp')
| -rw-r--r-- | sigencore/Player.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sigencore/Player.cpp b/sigencore/Player.cpp index 4b2a3eaf..1f9e6057 100644 --- a/sigencore/Player.cpp +++ b/sigencore/Player.cpp @@ -76,7 +76,7 @@ int Sigencore::Player::giveItems(Sigscript::ItemWrapper* item, const int count, valueOfType(QString("weight-item-type-minimum-%1").arg(typeName), &minWeightType); valueOfType("weight-item-total-minimum", &minWeightTotal); const int diffWeight = (itemWeight(id) + addWeight) - minWeight; - const int diffWeightType = (itemTypeWeight(typeId) + addWeight) - minWeightType; + const int diffWeightType = (itemWeightType(typeId) + addWeight) - minWeightType; const int diffWeightTotal = (itemWeight() + addWeight) - minWeightTotal; int minCount = 0; int minCountType = 0; @@ -85,7 +85,7 @@ int Sigencore::Player::giveItems(Sigscript::ItemWrapper* item, const int count, valueOfType(QString("count-item-type-minimum-%1").arg(typeName), &minCountType); valueOfType("count-item-total-minimum", &minCountTotal); const int diffCount = qMax(0, itemCount(id) + count) - minCount; - const int diffCountType = qMax(0, itemTypeCount(typeId) + count) - minCountType; + const int diffCountType = qMax(0, itemCountType(typeId) + count) - minCountType; const int diffCountTotal = qMax(0, itemCount(-1) + count) - minCountTotal; if ((0 < diffWeight) && (0 < diffWeightType) && (0 < diffWeightTotal) && (0 < diffCount) && (0 < diffCountType) && (0 < diffCountTotal)) end = count; @@ -107,7 +107,7 @@ int Sigencore::Player::giveItems(Sigscript::ItemWrapper* item, const int count, valueOfType(QString("weight-item-type-maximum-%1").arg(typeName), &maxWeightType); valueOfType("weight-item-total-maximum", &maxWeightTotal); const int diffWeight = maxWeight - (itemWeight(id) + addWeight); - const int diffWeightType = maxWeight - (itemTypeWeight(typeId) + addWeight); + const int diffWeightType = maxWeight - (itemWeightType(typeId) + addWeight); const int diffWeightTotal = maxWeight - (itemWeight() + addWeight); int maxCount = item->type()->player(); int maxCountType = item->type()->player(); @@ -117,7 +117,7 @@ int Sigencore::Player::giveItems(Sigscript::ItemWrapper* item, const int count, valueOfType(QString("count-item-type-maximum-%1").arg(typeName), &maxCountType); valueOfType("count-item-total-maximum", &maxCountTotal); const int diffCount = maxCount - (itemCount(id) + count); - const int diffCountType = maxCountType - (itemTypeCount(typeId) + count); + const int diffCountType = maxCountType - (itemCountType(typeId) + count); const int diffCountTotal = maxCountTotal - (itemCount(-1) + count); if ((0 < diffWeight) && (0 < diffWeightType) && (0 < diffWeightTotal) && (0 < diffCount) && (0 < diffCountType) && (0 < diffCountTotal)) end = count; |