diff options
| author | Joseph-Eugene Winzer | 2017-07-25 23:40:23 +0200 |
|---|---|---|
| committer | Thierry Crozat | 2018-01-23 00:29:34 +0000 |
| commit | cf98468c32707d3fa93fa636dc78c151b3f8eb44 (patch) | |
| tree | b8434a029c0b895881f406eeec1a0d812864c78f /engines | |
| parent | 2ff15f37ebe34785aec6e065611a3871544c3f37 (diff) | |
| download | scummvm-rg350-cf98468c32707d3fa93fa636dc78c151b3f8eb44.tar.gz scummvm-rg350-cf98468c32707d3fa93fa636dc78c151b3f8eb44.tar.bz2 scummvm-rg350-cf98468c32707d3fa93fa636dc78c151b3f8eb44.zip | |
SUPERNOVA: Removes shadowing of variables
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/supernova/state.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/supernova/state.cpp b/engines/supernova/state.cpp index cb08c7bd2c..42e1db9a9e 100644 --- a/engines/supernova/state.cpp +++ b/engines/supernova/state.cpp @@ -234,25 +234,25 @@ GameManager::GameManager(SupernovaEngine *vm) { } void GameManager::initGui() { - int x = 0; + int commandButtonX = 0; for (int i = 0; i < ARRAYSIZE(_guiCommandButton); ++i) { int width; if (i < 9) width = _vm->textWidth(guiCommand_DE[i]) + 2; else - width = 320 - x; + width = 320 - commandButtonX; - _guiCommandButton[i].setSize(x, 150, x + width, 159); + _guiCommandButton[i].setSize(commandButtonX, 150, commandButtonX + width, 159); _guiCommandButton[i].setText(guiCommand_DE[i]); _guiCommandButton[i].setColor(kColorWhite25, kColorDarkGreen, kColorWhite44, kColorGreen); - x += width + 2; + commandButtonX += width + 2; } for (int i = 0; i < ARRAYSIZE(_guiInventory); ++i) { - int x = 136 * (i % 2); - int y = 161 + 10 * (i / 2); + int inventoryX = 136 * (i % 2); + int inventoryY = 161 + 10 * (i / 2); - _guiInventory[i].setSize(x, y, x + 135, y + 9); + _guiInventory[i].setSize(inventoryX, inventoryY, inventoryX + 135, inventoryY + 9); _guiInventory[i].setColor(kColorWhite25, kColorDarkRed, kColorWhite35, kColorRed); } } |