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/sword2 | |
| 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/sword2')
| -rw-r--r-- | engines/sword2/maketext.cpp | 8 | ||||
| -rw-r--r-- | engines/sword2/maketext.h | 8 | ||||
| -rw-r--r-- | engines/sword2/mouse.cpp | 20 | ||||
| -rw-r--r-- | engines/sword2/scroll.cpp | 2 | ||||
| -rw-r--r-- | engines/sword2/speech.cpp | 8 |
5 files changed, 23 insertions, 23 deletions
diff --git a/engines/sword2/maketext.cpp b/engines/sword2/maketext.cpp index 7acfc63adc..648d1d761b 100644 --- a/engines/sword2/maketext.cpp +++ b/engines/sword2/maketext.cpp @@ -528,13 +528,13 @@ uint32 FontRenderer::buildNewBloc(byte *ascii, int16 x, int16 y, uint16 width, u frame_head.read(_blocList[i].text_mem); switch (justification) { - case POSITION_AT_CENTRE_OF_BASE: + case POSITION_AT_CENTER_OF_BASE: // This one is always used for SPEECH TEXT; possibly // also for pointer text x -= (frame_head.width / 2); y -= frame_head.height; break; - case POSITION_AT_CENTRE_OF_TOP: + case POSITION_AT_CENTER_OF_TOP: x -= (frame_head.width / 2); break; case POSITION_AT_LEFT_OF_TOP: @@ -550,10 +550,10 @@ uint32 FontRenderer::buildNewBloc(byte *ascii, int16 x, int16 y, uint16 width, u x -= frame_head.width; y -= frame_head.height; break; - case POSITION_AT_LEFT_OF_CENTRE: + case POSITION_AT_LEFT_OF_CENTER: y -= (frame_head.height / 2); break; - case POSITION_AT_RIGHT_OF_CENTRE: + case POSITION_AT_RIGHT_OF_CENTER: x -= frame_head.width; y -= (frame_head.height) / 2; break; diff --git a/engines/sword2/maketext.h b/engines/sword2/maketext.h index 840f5e5fa1..52740d9de9 100644 --- a/engines/sword2/maketext.h +++ b/engines/sword2/maketext.h @@ -47,14 +47,14 @@ enum { NO_JUSTIFICATION = 0, // These all force text inside the screen edge margin when necessary - POSITION_AT_CENTRE_OF_BASE = 1, - POSITION_AT_CENTRE_OF_TOP = 2, + POSITION_AT_CENTER_OF_BASE = 1, + POSITION_AT_CENTER_OF_TOP = 2, POSITION_AT_LEFT_OF_TOP = 3, POSITION_AT_RIGHT_OF_TOP = 4, POSITION_AT_LEFT_OF_BASE = 5, POSITION_AT_RIGHT_OF_BASE = 6, - POSITION_AT_LEFT_OF_CENTRE = 7, - POSITION_AT_RIGHT_OF_CENTRE = 8 + POSITION_AT_LEFT_OF_CENTER = 7, + POSITION_AT_RIGHT_OF_CENTER = 8 }; enum { diff --git a/engines/sword2/mouse.cpp b/engines/sword2/mouse.cpp index d3dcf10f55..b6e9b169c3 100644 --- a/engines/sword2/mouse.cpp +++ b/engines/sword2/mouse.cpp @@ -1270,8 +1270,8 @@ void Mouse::createPointerText(uint32 text_id, uint32 pointer_res) { // Above right justification = POSITION_AT_LEFT_OF_BASE; } else { - // Above centre - justification = POSITION_AT_CENTRE_OF_BASE; + // Above center + justification = POSITION_AT_CENTER_OF_BASE; } } else if (yOffset > 0) { // Below pointer @@ -1282,20 +1282,20 @@ void Mouse::createPointerText(uint32 text_id, uint32 pointer_res) { // Below right justification = POSITION_AT_LEFT_OF_TOP; } else { - // Below centre - justification = POSITION_AT_CENTRE_OF_TOP; + // Below center + justification = POSITION_AT_CENTER_OF_TOP; } } else { // Same y-coord as pointer if (xOffset < 0) { - // Centre left - justification = POSITION_AT_RIGHT_OF_CENTRE; + // Center left + justification = POSITION_AT_RIGHT_OF_CENTER; } else if (xOffset > 0) { - // Centre right - justification = POSITION_AT_LEFT_OF_CENTRE; + // Center right + justification = POSITION_AT_LEFT_OF_CENTER; } else { - // Centre centre - shouldn't happen anyway! - justification = POSITION_AT_LEFT_OF_CENTRE; + // Center center - shouldn't happen anyway! + justification = POSITION_AT_LEFT_OF_CENTER; } } diff --git a/engines/sword2/scroll.cpp b/engines/sword2/scroll.cpp index eb080eb4b3..11ba546cf3 100644 --- a/engines/sword2/scroll.cpp +++ b/engines/sword2/scroll.cpp @@ -73,7 +73,7 @@ void Screen::setScrolling() { return; } - // George's offset from the centre - the desired position for him + // George's offset from the center - the desired position for him int16 offset_x = _thisScreen.player_feet_x - _thisScreen.feet_x; int16 offset_y = _thisScreen.player_feet_y - _thisScreen.feet_y; diff --git a/engines/sword2/speech.cpp b/engines/sword2/speech.cpp index a0ddc333c2..b67f079a83 100644 --- a/engines/sword2/speech.cpp +++ b/engines/sword2/speech.cpp @@ -104,16 +104,16 @@ void Logic::locateTalker(int32 *params) { uint16 scale = obMega.calcScale(); - // Calc suitable centre point above the head, based on scaled + // Calc suitable center point above the head, based on scaled // height - // just use 'feet_x' as centre + // just use 'feet_x' as center _textX = obMega.getFeetX(); // Add scaled y-offset to feet_y coord to get top of sprite _textY = obMega.getFeetY() + (cdt_entry.y * scale) / 256; } else { - // It's a non-scaling anim - calc suitable centre point above + // It's a non-scaling anim - calc suitable center point above // the head, based on scaled width // x-coord + half of width @@ -185,7 +185,7 @@ void Logic::formText(int32 *params) { text + 2, _textX, _textY, textWidth, obSpeech.getPen(), RDSPR_TRANS | RDSPR_DISPLAYALIGN, - _vm->_speechFontId, POSITION_AT_CENTRE_OF_BASE); + _vm->_speechFontId, POSITION_AT_CENTER_OF_BASE); _vm->_resman->closeResource(text_res); |
