Skip to content

Commit 2e095e2

Browse files
fingolfinfingolfin
committed
ALL: centre -> center
1 parent 84184aa commit 2e095e2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+225
-225
lines changed

‎audio/softsynth/mt32/part.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ void RhythmPart::setBend(unsigned int midiBend) {
100100
}
101101

102102
void Part::setBend(unsigned int midiBend) {
103-
// FIXME:KG: Slightly unbalanced increments, but I wanted min -1.0, centre 0.0 and max 1.0
103+
// FIXME:KG: Slightly unbalanced increments, but I wanted min -1.0, center 0.0 and max 1.0
104104
if (midiBend <= 0x2000) {
105105
bend = ((signed int)midiBend - 0x2000) / (float)0x2000;
106106
} else {
@@ -413,7 +413,7 @@ void RhythmPart::setPan(unsigned int midiPan)
413413
}
414414

415415
void Part::setPan(unsigned int midiPan) {
416-
// FIXME:KG: Tweaked this a bit so that we have a left 100%, centre and right 100%
416+
// FIXME:KG: Tweaked this a bit so that we have a left 100%, center and right 100%
417417
// (But this makes the range somewhat skewed)
418418
// Check against the real thing
419419
// NOTE: Panning is inverted compared to GM.

‎backends/vkeybd/packs/vkeybd_default/vkeybd_default.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
2-
<keyboard initial_mode="lowercase" v_align="bottom" h_align="centre">
2+
<keyboard initial_mode="lowercase" v_align="bottom" h_align="center">
33
<!-- coords key = "start x, start y, end x, end y" -->
44
<!-- Lowercase -->
55
<mode name="lowercase" resolutions="320x240,640x480">

‎backends/vkeybd/virtual-keyboard-gui.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ void VirtualKeyboardGUI::moveToDefaultPosition()
203203
case VirtualKeyboard::kAlignLeft:
204204
x = 0;
205205
break;
206-
case VirtualKeyboard::kAlignCentre:
206+
case VirtualKeyboard::kAlignCenter:
207207
x = (_screenW - kbdW) / 2;
208208
break;
209209
case VirtualKeyboard::kAlignRight:

‎backends/vkeybd/virtual-keyboard-parser.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ bool VirtualKeyboardParser::parserCallback_keyboard(ParserNode *node) {
8484
if (h.equalsIgnoreCase("left"))
8585
_keyboard->_hAlignment = VirtualKeyboard::kAlignLeft;
8686
else if (h.equalsIgnoreCase("centre") || h.equalsIgnoreCase("center"))
87-
_keyboard->_hAlignment = VirtualKeyboard::kAlignCentre;
87+
_keyboard->_hAlignment = VirtualKeyboard::kAlignCenter;
8888
else if (h.equalsIgnoreCase("right"))
8989
_keyboard->_hAlignment = VirtualKeyboard::kAlignRight;
9090
}

‎backends/vkeybd/virtual-keyboard-parser.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ keyboard layouts for different screen resolutions.
5151
** Example keyboard pack description file **
5252
********************************************
5353
54-
<keyboard modes="normal,caps" initial_mode="normal" v_align="bottom" h_align="centre">
54+
<keyboard modes="normal,caps" initial_mode="normal" v_align="bottom" h_align="center">
5555
<mode name="normal" resolutions="640x400,320x200">
5656
<layout resolution="640x400" bitmap="normal_640x400.bmp" transparent_color="255,0,255">
5757
<map>

‎backends/vkeybd/virtual-keyboard.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void VirtualKeyboard::reset() {
7171
deleteEvents();
7272
_modes.clear();
7373
_initialMode = _currentMode = 0;
74-
_hAlignment = kAlignCentre;
74+
_hAlignment = kAlignCenter;
7575
_vAlignment = kAlignBottom;
7676
_keyQueue.clear();
7777
_loaded = false;

‎backends/vkeybd/virtual-keyboard.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class VirtualKeyboard {
134134

135135
enum HorizontalAlignment {
136136
kAlignLeft,
137-
kAlignCentre,
137+
kAlignCenter,
138138
kAlignRight
139139
};
140140

‎engines/agi/agi.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@ class AgiEngine : public AgiBase {
935935
private:
936936
// Some submethods of testIfCode
937937
uint8 testObjRight(uint8, uint8, uint8, uint8, uint8);
938-
uint8 testObjCentre(uint8, uint8, uint8, uint8, uint8);
938+
uint8 testObjCenter(uint8, uint8, uint8, uint8, uint8);
939939
uint8 testObjInBox(uint8, uint8, uint8, uint8, uint8);
940940
uint8 testPosn(uint8, uint8, uint8, uint8, uint8);
941941
uint8 testSaid(uint8, uint8 *);

‎engines/agi/op_test.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ uint8 AgiEngine::testObjInBox(uint8 n, uint8 x1, uint8 y1, uint8 x2, uint8 y2) {
132132
v->yPos >= y1 && v->xPos + v->xSize - 1 <= x2 && v->yPos <= y2;
133133
}
134134

135-
// if n is in centre of box
136-
uint8 AgiEngine::testObjCentre(uint8 n, uint8 x1, uint8 y1, uint8 x2, uint8 y2) {
135+
// if n is in center of box
136+
uint8 AgiEngine::testObjCenter(uint8 n, uint8 x1, uint8 y1, uint8 x2, uint8 y2) {
137137
VtEntry *v = &_game.viewTable[n];
138138

139139
return v->xPos + v->xSize / 2 >= x1 &&
@@ -311,7 +311,7 @@ int AgiEngine::testIfCode(int lognum) {
311311
ec = testObjInBox(p[0], p[1], p[2], p[3], p[4]);
312312
break;
313313
case 0x11:
314-
ec = testObjCentre(p[0], p[1], p[2], p[3], p[4]);
314+
ec = testObjCenter(p[0], p[1], p[2], p[3], p[4]);
315315
break;
316316
case 0x12:
317317
ec = testObjRight(p[0], p[1], p[2], p[3], p[4]);

‎engines/agi/saveload.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ int AgiEngine::selectSlot() {
597597
int hm = 1, vm = 3; // box margins
598598
int xmin, xmax, slotClicked;
599599
char desc[NUM_VISIBLE_SLOTS][40];
600-
int textCentre, buttonLength, buttonX[2], buttonY;
600+
int textCenter, buttonLength, buttonX[2], buttonY;
601601
const char *buttonText[] = { " OK ", "Cancel", NULL };
602602

603603
_noSaveLoadAllowed = true;
@@ -606,10 +606,10 @@ int AgiEngine::selectSlot() {
606606
getSavegameDescription(_firstSlot + i, desc[i]);
607607
}
608608

609-
textCentre = GFX_WIDTH / CHAR_LINES / 2;
609+
textCenter = GFX_WIDTH / CHAR_LINES / 2;
610610
buttonLength = 6;
611-
buttonX[0] = (textCentre - 3 * buttonLength / 2) * CHAR_COLS;
612-
buttonX[1] = (textCentre + buttonLength / 2) * CHAR_COLS;
611+
buttonX[0] = (textCenter - 3 * buttonLength / 2) * CHAR_COLS;
612+
buttonX[1] = (textCenter + buttonLength / 2) * CHAR_COLS;
613613
buttonY = (vm + 17) * CHAR_LINES;
614614

615615
for (i = 0; i < 2; i++)

‎engines/agos/agos.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1140,7 +1140,7 @@ class AGOSEngine : public Engine {
11401140
int getScale(int16 y, int16 x);
11411141
void checkScrollX(int16 x, int16 xpos);
11421142
void checkScrollY(int16 y, int16 ypos);
1143-
void centreScroll();
1143+
void centerScroll();
11441144

11451145
virtual void clearVideoWindow(uint16 windowNum, uint16 color);
11461146
void clearVideoBackGround(uint16 windowNum, uint16 color);
@@ -1921,7 +1921,7 @@ class AGOSEngine_Feeble : public AGOSEngine_Simon2 {
19211921
void off_mouseOff();
19221922
void off_loadVideo();
19231923
void off_playVideo();
1924-
void off_centreScroll();
1924+
void off_centerScroll();
19251925
void off_resetPVCount();
19261926
void off_setPathValues();
19271927
void off_stopClock();

‎engines/agos/debug.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2058,7 +2058,7 @@ static const char *const feeblefiles_opcodeNameTable[256] = {
20582058
"W|UNLOAD_ZONE",
20592059
NULL,
20602060
"|UNFREEZE_ZONES",
2061-
"|CENTRE_SCROLL",
2061+
"|CENTER_SCROLL",
20622062
/* 188 */
20632063
"BSJ|STRING2_IS",
20642064
"|CLEAR_MARKS",

‎engines/agos/script_dp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ void AGOSEngine_DIMP::setupOpcodes() {
271271
OPCODE(os1_unloadZone),
272272
OPCODE(o_invalid),
273273
OPCODE(os1_unfreezeZones),
274-
OPCODE(off_centreScroll),
274+
OPCODE(off_centerScroll),
275275
/* 188 */
276276
OPCODE(os2_isShortText),
277277
OPCODE(os2_clearMarks),

‎engines/agos/script_ff.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ void AGOSEngine_Feeble::setupOpcodes() {
272272
OPCODE(os1_unloadZone),
273273
OPCODE(o_invalid),
274274
OPCODE(os1_unfreezeZones),
275-
OPCODE(off_centreScroll),
275+
OPCODE(off_centerScroll),
276276
/* 188 */
277277
OPCODE(os2_isShortText),
278278
OPCODE(os2_clearMarks),
@@ -590,9 +590,9 @@ void AGOSEngine_Feeble::off_playVideo() {
590590
}
591591
}
592592

593-
void AGOSEngine_Feeble::off_centreScroll() {
593+
void AGOSEngine_Feeble::off_centerScroll() {
594594
// 187
595-
centreScroll();
595+
centerScroll();
596596
}
597597

598598
void AGOSEngine_Feeble::off_resetPVCount() {

‎engines/agos/vga_ff.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ void AGOSEngine::vc78_computeXY() {
201201
if (getGameType() == GType_FF) {
202202
setBitFlag(85, false);
203203
if (getBitFlag(74)) {
204-
centreScroll();
204+
centerScroll();
205205
}
206206
}
207207
}
@@ -348,7 +348,7 @@ void AGOSEngine::checkScrollY(int16 y, int16 ypos) {
348348
}
349349
}
350350

351-
void AGOSEngine::centreScroll() {
351+
void AGOSEngine::centerScroll() {
352352
int16 x, y, tmp;
353353

354354
if (_scrollXMax != 0) {

‎engines/groovie/script.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ void Script::o_hotspot_center() {
717717

718718
debugScript(5, true, "HOTSPOT-CENTER @0x%04X", address);
719719

720-
// Mark the centremost 240 pixels of the game area
720+
// Mark the centermost 240 pixels of the game area
721721
Common::Rect rect(200, 80, 440, 400);
722722
hotspot(rect, address, 0);
723723
}

‎engines/m4/mads_menus.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ void RexDialogView::onRefresh(RectList *rects, M4Surface *destSurface) {
699699
hLine(0, width(), MADS_Y_OFFSET - 2);
700700
hLine(0, width(), MADS_Y_OFFSET + MADS_SURFACE_HEIGHT + 2);
701701

702-
// Add in the loaded background vertically centred
702+
// Add in the loaded background vertically centerd
703703
_backgroundSurface->copyTo(this, 0, (height() - MADS_SURFACE_HEIGHT) / 2);
704704

705705
// Check whether any of the dialog text entries need to be refreshed

‎engines/sci/engine/kstring.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ reg_t kReadNumber(EngineState *s, int argc, reg_t *argv) {
175175
#define ALIGN_NONE 0
176176
#define ALIGN_RIGHT 1
177177
#define ALIGN_LEFT -1
178-
#define ALIGN_CENTRE 2
178+
#define ALIGN_CENTER 2
179179

180180
/* Format(targ_address, textresnr, index_inside_res, ...)
181181
** or
@@ -246,7 +246,7 @@ reg_t kFormat(EngineState *s, int argc, reg_t *argv) {
246246
if (xfer == '0')
247247
fillchar = '0';
248248
else if (xfer == '=')
249-
align = ALIGN_CENTRE;
249+
align = ALIGN_CENTER;
250250
else if (isdigit(xfer) || (xfer == '-'))
251251
source--; // Go to start of length argument
252252

@@ -258,7 +258,7 @@ reg_t kFormat(EngineState *s, int argc, reg_t *argv) {
258258
if (str_leng < 0) {
259259
align = ALIGN_LEFT;
260260
str_leng = -str_leng;
261-
} else if (align != ALIGN_CENTRE)
261+
} else if (align != ALIGN_CENTER)
262262
align = ALIGN_RIGHT;
263263

264264
xfer = *source++;
@@ -298,7 +298,7 @@ reg_t kFormat(EngineState *s, int argc, reg_t *argv) {
298298
*target++ = ' '; /* Format into the text */
299299
break;
300300

301-
case ALIGN_CENTRE: {
301+
case ALIGN_CENTER: {
302302
int half_extralen = extralen >> 1;
303303
while (half_extralen-- > 0)
304304
*target++ = ' '; /* Format into the text */
@@ -315,7 +315,7 @@ reg_t kFormat(EngineState *s, int argc, reg_t *argv) {
315315

316316
switch (align) {
317317

318-
case ALIGN_CENTRE: {
318+
case ALIGN_CENTER: {
319319
int half_extralen;
320320
align = 0;
321321
half_extralen = extralen - (extralen >> 1);

‎engines/sky/text.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -231,13 +231,13 @@ char Text::getTextChar(uint8 **data, uint32 *bitPos) {
231231
}
232232
}
233233

234-
DisplayedText Text::displayText(uint32 textNum, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) {
234+
DisplayedText Text::displayText(uint32 textNum, uint8 *dest, bool center, uint16 pixelWidth, uint8 color) {
235235
//Render text into buffer *dest
236236
getText(textNum);
237-
return displayText(_textBuffer, dest, centre, pixelWidth, color);
237+
return displayText(_textBuffer, dest, center, pixelWidth, color);
238238
}
239239

240-
DisplayedText Text::displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) {
240+
DisplayedText Text::displayText(char *textPtr, uint8 *dest, bool center, uint16 pixelWidth, uint8 color) {
241241
//Render text pointed to by *textPtr in buffer *dest
242242
uint32 centerTable[10];
243243
uint16 lineWidth = 0;
@@ -319,7 +319,7 @@ DisplayedText Text::displayText(char *textPtr, uint8 *dest, bool centre, uint16
319319
uint32 *centerTblPtr = centerTable;
320320

321321
do {
322-
if (centre) {
322+
if (center) {
323323
uint32 width = (pixelWidth - *centerTblPtr) >> 1;
324324
centerTblPtr++;
325325
curDest += width;
@@ -379,9 +379,9 @@ void Text::makeGameCharacter(uint8 textChar, uint8 *charSetPtr, uint8 *&dest, ui
379379
dest = startPos + charWidth + _dtCharSpacing * 2 - 1;
380380
}
381381

382-
DisplayedText Text::lowTextManager(uint32 textNum, uint16 width, uint16 logicNum, uint8 color, bool centre) {
382+
DisplayedText Text::lowTextManager(uint32 textNum, uint16 width, uint16 logicNum, uint8 color, bool center) {
383383
getText(textNum);
384-
DisplayedText textInfo = displayText(_textBuffer, NULL, centre, width, color);
384+
DisplayedText textInfo = displayText(_textBuffer, NULL, center, width, color);
385385

386386
uint32 compactNum = FIRST_TEXT_COMPACT;
387387
Compact *cpt = _skyCompact->fetchCpt(compactNum);

‎engines/sky/text.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ class Text {
5252
public:
5353
Text(Disk *skyDisk, SkyCompact *skyCompact);
5454
~Text();
55-
struct DisplayedText displayText(uint32 textNum, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color);
56-
struct DisplayedText displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color);
57-
struct DisplayedText lowTextManager(uint32 textNum, uint16 width, uint16 logicNum, uint8 color, bool centre);
55+
struct DisplayedText displayText(uint32 textNum, uint8 *dest, bool center, uint16 pixelWidth, uint8 color);
56+
struct DisplayedText displayText(char *textPtr, uint8 *dest, bool center, uint16 pixelWidth, uint8 color);
57+
struct DisplayedText lowTextManager(uint32 textNum, uint16 width, uint16 logicNum, uint8 color, bool center);
5858
void fnSetFont(uint32 fontNr);
5959
void fnTextModule(uint32 textInfoId, uint32 textNo);
6060
void fnPointerText(uint32 pointedId, uint16 mouseX, uint16 mouseY);

‎engines/sword2/maketext.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -528,13 +528,13 @@ uint32 FontRenderer::buildNewBloc(byte *ascii, int16 x, int16 y, uint16 width, u
528528
frame_head.read(_blocList[i].text_mem);
529529

530530
switch (justification) {
531-
case POSITION_AT_CENTRE_OF_BASE:
531+
case POSITION_AT_CENTER_OF_BASE:
532532
// This one is always used for SPEECH TEXT; possibly
533533
// also for pointer text
534534
x -= (frame_head.width / 2);
535535
y -= frame_head.height;
536536
break;
537-
case POSITION_AT_CENTRE_OF_TOP:
537+
case POSITION_AT_CENTER_OF_TOP:
538538
x -= (frame_head.width / 2);
539539
break;
540540
case POSITION_AT_LEFT_OF_TOP:
@@ -550,10 +550,10 @@ uint32 FontRenderer::buildNewBloc(byte *ascii, int16 x, int16 y, uint16 width, u
550550
x -= frame_head.width;
551551
y -= frame_head.height;
552552
break;
553-
case POSITION_AT_LEFT_OF_CENTRE:
553+
case POSITION_AT_LEFT_OF_CENTER:
554554
y -= (frame_head.height / 2);
555555
break;
556-
case POSITION_AT_RIGHT_OF_CENTRE:
556+
case POSITION_AT_RIGHT_OF_CENTER:
557557
x -= frame_head.width;
558558
y -= (frame_head.height) / 2;
559559
break;

‎engines/sword2/maketext.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ enum {
4747
NO_JUSTIFICATION = 0,
4848

4949
// These all force text inside the screen edge margin when necessary
50-
POSITION_AT_CENTRE_OF_BASE = 1,
51-
POSITION_AT_CENTRE_OF_TOP = 2,
50+
POSITION_AT_CENTER_OF_BASE = 1,
51+
POSITION_AT_CENTER_OF_TOP = 2,
5252
POSITION_AT_LEFT_OF_TOP = 3,
5353
POSITION_AT_RIGHT_OF_TOP = 4,
5454
POSITION_AT_LEFT_OF_BASE = 5,
5555
POSITION_AT_RIGHT_OF_BASE = 6,
56-
POSITION_AT_LEFT_OF_CENTRE = 7,
57-
POSITION_AT_RIGHT_OF_CENTRE = 8
56+
POSITION_AT_LEFT_OF_CENTER = 7,
57+
POSITION_AT_RIGHT_OF_CENTER = 8
5858
};
5959

6060
enum {

‎engines/sword2/mouse.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -1270,8 +1270,8 @@ void Mouse::createPointerText(uint32 text_id, uint32 pointer_res) {
12701270
// Above right
12711271
justification = POSITION_AT_LEFT_OF_BASE;
12721272
} else {
1273-
// Above centre
1274-
justification = POSITION_AT_CENTRE_OF_BASE;
1273+
// Above center
1274+
justification = POSITION_AT_CENTER_OF_BASE;
12751275
}
12761276
} else if (yOffset > 0) {
12771277
// Below pointer
@@ -1282,20 +1282,20 @@ void Mouse::createPointerText(uint32 text_id, uint32 pointer_res) {
12821282
// Below right
12831283
justification = POSITION_AT_LEFT_OF_TOP;
12841284
} else {
1285-
// Below centre
1286-
justification = POSITION_AT_CENTRE_OF_TOP;
1285+
// Below center
1286+
justification = POSITION_AT_CENTER_OF_TOP;
12871287
}
12881288
} else {
12891289
// Same y-coord as pointer
12901290
if (xOffset < 0) {
1291-
// Centre left
1292-
justification = POSITION_AT_RIGHT_OF_CENTRE;
1291+
// Center left
1292+
justification = POSITION_AT_RIGHT_OF_CENTER;
12931293
} else if (xOffset > 0) {
1294-
// Centre right
1295-
justification = POSITION_AT_LEFT_OF_CENTRE;
1294+
// Center right
1295+
justification = POSITION_AT_LEFT_OF_CENTER;
12961296
} else {
1297-
// Centre centre - shouldn't happen anyway!
1298-
justification = POSITION_AT_LEFT_OF_CENTRE;
1297+
// Center center - shouldn't happen anyway!
1298+
justification = POSITION_AT_LEFT_OF_CENTER;
12991299
}
13001300
}
13011301

0 commit comments

Comments
 (0)