diff options
| author | Paul Gilbert | 2016-09-16 23:41:19 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-09-16 23:41:19 -0400 |
| commit | 589794f082449c7ad05e7ab94cbea5357b394811 (patch) | |
| tree | 851f80afd79261528a940b0ce195c613e4b2c289 | |
| parent | 42894542330d79990b340fb5425b71ac7eaf140e (diff) | |
| download | scummvm-rg350-589794f082449c7ad05e7ab94cbea5357b394811.tar.gz scummvm-rg350-589794f082449c7ad05e7ab94cbea5357b394811.tar.bz2 scummvm-rg350-589794f082449c7ad05e7ab94cbea5357b394811.zip | |
XEEN: Fix some compiler warnings
| -rw-r--r-- | engines/xeen/dialogs_char_info.cpp | 8 | ||||
| -rw-r--r-- | engines/xeen/dialogs_items.cpp | 2 | ||||
| -rw-r--r-- | engines/xeen/music.cpp | 3 |
3 files changed, 6 insertions, 7 deletions
diff --git a/engines/xeen/dialogs_char_info.cpp b/engines/xeen/dialogs_char_info.cpp index 0494c22b9c..5a4e3ccd30 100644 --- a/engines/xeen/dialogs_char_info.cpp +++ b/engines/xeen/dialogs_char_info.cpp @@ -474,14 +474,14 @@ bool CharacterInfo::expandStat(int attrib, const Character &c) { case 16: // Gold - msg = Common::String::format(IN_PARTY_IN_BANK, STAT_NAMES[attrib], + msg = Common::String::format(IN_PARTY_IN_BANK, CONSUMABLE_NAMES[0], party._gold, party._bankGold); bounds.setHeight(43); break; case 17: // Gems - msg = Common::String::format(IN_PARTY_IN_BANK, STAT_NAMES[attrib], + msg = Common::String::format(IN_PARTY_IN_BANK, CONSUMABLE_NAMES[1], party._gems, party._bankGems); bounds.setHeight(43); break; @@ -489,7 +489,7 @@ bool CharacterInfo::expandStat(int attrib, const Character &c) { case 18: { // Food int food = (party._food / party._activeParty.size()) / 3; - msg = Common::String::format(FOOD_TEXT, STAT_NAMES[attrib], + msg = Common::String::format(FOOD_TEXT, CONSUMABLE_NAMES[2], party._food, food, food != 1 ? "s" : ""); break; } @@ -528,7 +528,7 @@ bool CharacterInfo::expandStat(int attrib, const Character &c) { lines[19] = Common::String::format(HEROISM, party._heroism); msg = Common::String::format("\x2\x3""c%s\x3l%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\x1", - STAT_NAMES[attrib], lines[0].c_str(), lines[1].c_str(), + CONSUMABLE_NAMES[3], lines[0].c_str(), lines[1].c_str(), lines[2].c_str(), lines[3].c_str(), lines[4].c_str(), lines[5].c_str(), lines[6].c_str(), lines[7].c_str(), lines[8].c_str(), lines[9].c_str(), lines[10].c_str(), diff --git a/engines/xeen/dialogs_items.cpp b/engines/xeen/dialogs_items.cpp index ed9f7f560d..23d7071500 100644 --- a/engines/xeen/dialogs_items.cpp +++ b/engines/xeen/dialogs_items.cpp @@ -718,7 +718,7 @@ int ItemsDialog::calcItemCost(Character *c, int itemIndex, ItemsMode mode, if (i._material < 37) amount2 = ELEMENTAL_DAMAGE[i._material] * 100; else if (i._material > 58) - amount3 = METAL_BASE_MULTIPLIERS[i._material] * 100; + amount3 = METAL_BASE_MULTIPLIERS[i._material - 37] * 100; switch (mode) { case ITEMMODE_BLACKSMITH: diff --git a/engines/xeen/music.cpp b/engines/xeen/music.cpp index c2e85707e6..36118242d2 100644 --- a/engines/xeen/music.cpp +++ b/engines/xeen/music.cpp @@ -123,9 +123,8 @@ bool MusicDriver::musSkipWord(const byte *&srcP, byte param) { return false; } - bool MusicDriver::cmdFreezeFrequency(const byte *&srcP, byte param) { - debugC(3, kDebugSound, "cmdFreezeFrequency %d"); + debugC(3, kDebugSound, "cmdFreezeFrequency %d", param); _channels[param]._changeFrequency = false; return false; } |