diff options
| author | Max Horn | 2011-04-14 14:34:28 +0200 |
|---|---|---|
| committer | Max Horn | 2011-04-14 14:34:28 +0200 |
| commit | 2e095e25f2435f0d066d2826176e394bda5c4a9c (patch) | |
| tree | 81d2c4d9e26e4a7644087a13c61b785ae3e431c8 /engines/agi | |
| parent | 84184aabc00251374a181fe296487619afa779ed (diff) | |
| download | scummvm-rg350-2e095e25f2435f0d066d2826176e394bda5c4a9c.tar.gz scummvm-rg350-2e095e25f2435f0d066d2826176e394bda5c4a9c.tar.bz2 scummvm-rg350-2e095e25f2435f0d066d2826176e394bda5c4a9c.zip | |
ALL: centre -> center
Diffstat (limited to 'engines/agi')
| -rw-r--r-- | engines/agi/agi.h | 2 | ||||
| -rw-r--r-- | engines/agi/op_test.cpp | 6 | ||||
| -rw-r--r-- | engines/agi/saveload.cpp | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engines/agi/agi.h b/engines/agi/agi.h index eb3f3bc052..1bee78e765 100644 --- a/engines/agi/agi.h +++ b/engines/agi/agi.h @@ -935,7 +935,7 @@ public: private: // Some submethods of testIfCode uint8 testObjRight(uint8, uint8, uint8, uint8, uint8); - uint8 testObjCentre(uint8, uint8, uint8, uint8, uint8); + uint8 testObjCenter(uint8, uint8, uint8, uint8, uint8); uint8 testObjInBox(uint8, uint8, uint8, uint8, uint8); uint8 testPosn(uint8, uint8, uint8, uint8, uint8); uint8 testSaid(uint8, uint8 *); diff --git a/engines/agi/op_test.cpp b/engines/agi/op_test.cpp index ab4f6cadc5..f5234d4e6c 100644 --- a/engines/agi/op_test.cpp +++ b/engines/agi/op_test.cpp @@ -132,8 +132,8 @@ uint8 AgiEngine::testObjInBox(uint8 n, uint8 x1, uint8 y1, uint8 x2, uint8 y2) { v->yPos >= y1 && v->xPos + v->xSize - 1 <= x2 && v->yPos <= y2; } -// if n is in centre of box -uint8 AgiEngine::testObjCentre(uint8 n, uint8 x1, uint8 y1, uint8 x2, uint8 y2) { +// if n is in center of box +uint8 AgiEngine::testObjCenter(uint8 n, uint8 x1, uint8 y1, uint8 x2, uint8 y2) { VtEntry *v = &_game.viewTable[n]; return v->xPos + v->xSize / 2 >= x1 && @@ -311,7 +311,7 @@ int AgiEngine::testIfCode(int lognum) { ec = testObjInBox(p[0], p[1], p[2], p[3], p[4]); break; case 0x11: - ec = testObjCentre(p[0], p[1], p[2], p[3], p[4]); + ec = testObjCenter(p[0], p[1], p[2], p[3], p[4]); break; case 0x12: ec = testObjRight(p[0], p[1], p[2], p[3], p[4]); diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp index 4801efa808..13e7215180 100644 --- a/engines/agi/saveload.cpp +++ b/engines/agi/saveload.cpp @@ -597,7 +597,7 @@ int AgiEngine::selectSlot() { int hm = 1, vm = 3; // box margins int xmin, xmax, slotClicked; char desc[NUM_VISIBLE_SLOTS][40]; - int textCentre, buttonLength, buttonX[2], buttonY; + int textCenter, buttonLength, buttonX[2], buttonY; const char *buttonText[] = { " OK ", "Cancel", NULL }; _noSaveLoadAllowed = true; @@ -606,10 +606,10 @@ int AgiEngine::selectSlot() { getSavegameDescription(_firstSlot + i, desc[i]); } - textCentre = GFX_WIDTH / CHAR_LINES / 2; + textCenter = GFX_WIDTH / CHAR_LINES / 2; buttonLength = 6; - buttonX[0] = (textCentre - 3 * buttonLength / 2) * CHAR_COLS; - buttonX[1] = (textCentre + buttonLength / 2) * CHAR_COLS; + buttonX[0] = (textCenter - 3 * buttonLength / 2) * CHAR_COLS; + buttonX[1] = (textCenter + buttonLength / 2) * CHAR_COLS; buttonY = (vm + 17) * CHAR_LINES; for (i = 0; i < 2; i++) |