diff options
| author | Paul Gilbert | 2016-08-28 15:46:10 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-08-28 15:46:10 -0400 |
| commit | ef6253fb19822b9a2e9a1ba00418f1d33afff65f (patch) | |
| tree | 367e064d6a1e2d7f233f624e8fe2e975d20722ff /engines/xeen/town.cpp | |
| parent | 0c199f079bc1ed62e6c13f292d569fc52eac546c (diff) | |
| download | scummvm-rg350-ef6253fb19822b9a2e9a1ba00418f1d33afff65f.tar.gz scummvm-rg350-ef6253fb19822b9a2e9a1ba00418f1d33afff65f.tar.bz2 scummvm-rg350-ef6253fb19822b9a2e9a1ba00418f1d33afff65f.zip | |
XEEN: gcc compilation fixes
Diffstat (limited to 'engines/xeen/town.cpp')
| -rw-r--r-- | engines/xeen/town.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/xeen/town.cpp b/engines/xeen/town.cpp index 9b4bfa3ab1..221f5d9978 100644 --- a/engines/xeen/town.cpp +++ b/engines/xeen/town.cpp @@ -704,7 +704,7 @@ Character *Town::doTavernOptions(Character *c) { case Common::KEYCODE_s: { // Sign In - int idx = isDarkCc ? (party._mazeId - 29) >> 1 : party._mazeId - 28; + idx = isDarkCc ? (party._mazeId - 29) >> 1 : party._mazeId - 28; assert(idx >= 0); party._mazePosition.x = TAVERN_EXIT_LIST[isDarkCc ? 1 : 0][_townActionId][idx][0]; party._mazePosition.y = TAVERN_EXIT_LIST[isDarkCc ? 1 : 0][_townActionId][idx][1]; @@ -717,7 +717,7 @@ Character *Town::doTavernOptions(Character *c) { party._mazeDirection = DIR_SOUTH; party._priorMazeId = party._mazeId; - for (uint idx = 0; idx < party._activeParty.size(); ++idx) { + for (idx = 0; idx < (int)party._activeParty.size(); ++idx) { party._activeParty[idx]._savedMazeId = party._mazeId; party._activeParty[idx]._xeenSide = map._loadDarkSide; } @@ -825,8 +825,8 @@ Character *Town::doTempleOptions(Character *c) { intf.drawParty(true); sound.playSample(nullptr, 0); - File f("ahh.voc"); - sound.playSample(&f, 1); + VOC voc("ahh.voc"); + voc.play(); _flag1 = true; _donation = 0; } @@ -1030,7 +1030,6 @@ void Town::depositWithdrawl(int choice) { } } - uint gold, gems; if (choice) { gold = party._bankGold; gems = party._bankGems; |