thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALL: centre -> center

Browse source
This commit is contained in:
Max Horn 2011-04-14 14:34:28 +02:00
parent 84184aabc0
commit 2e095e25f2
56 changed files with 225 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

4
audio/softsynth/mt32/part.cpp
View file

@ -100,7 +100,7 @@ void RhythmPart::setBend(unsigned int midiBend) {
}
void Part::setBend(unsigned int midiBend) {
// FIXME:KG: Slightly unbalanced increments, but I wanted min -1.0, centre 0.0 and max 1.0
// FIXME:KG: Slightly unbalanced increments, but I wanted min -1.0, center 0.0 and max 1.0
if (midiBend <= 0x2000) {
bend = ((signed int)midiBend - 0x2000) / (float)0x2000;
} else {
@ -413,7 +413,7 @@ void RhythmPart::setPan(unsigned int midiPan)
}
void Part::setPan(unsigned int midiPan) {
// FIXME:KG: Tweaked this a bit so that we have a left 100%, centre and right 100%
// FIXME:KG: Tweaked this a bit so that we have a left 100%, center and right 100%
// (But this makes the range somewhat skewed)
// Check against the real thing
// NOTE: Panning is inverted compared to GM.

2
backends/vkeybd/packs/vkeybd_default/vkeybd_default.xml
View file

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

2
backends/vkeybd/virtual-keyboard-gui.cpp
View file

@ -203,7 +203,7 @@ void VirtualKeyboardGUI::moveToDefaultPosition()
case VirtualKeyboard::kAlignLeft:
x = 0;
break;
case VirtualKeyboard::kAlignCentre:
case VirtualKeyboard::kAlignCenter:
x = (_screenW - kbdW) / 2;
break;
case VirtualKeyboard::kAlignRight:

2
backends/vkeybd/virtual-keyboard-parser.cpp
View file

@ -84,7 +84,7 @@ bool VirtualKeyboardParser::parserCallback_keyboard(ParserNode *node) {
if (h.equalsIgnoreCase("left"))
_keyboard->_hAlignment = VirtualKeyboard::kAlignLeft;
else if (h.equalsIgnoreCase("centre") || h.equalsIgnoreCase("center"))
_keyboard->_hAlignment = VirtualKeyboard::kAlignCentre;
_keyboard->_hAlignment = VirtualKeyboard::kAlignCenter;
else if (h.equalsIgnoreCase("right"))
_keyboard->_hAlignment = VirtualKeyboard::kAlignRight;
}

2
backends/vkeybd/virtual-keyboard-parser.h
View file

@ -51,7 +51,7 @@ keyboard layouts for different screen resolutions.
** Example keyboard pack description file **
********************************************
<keyboard modes="normal,caps" initial_mode="normal" v_align="bottom" h_align="centre">
<keyboard modes="normal,caps" initial_mode="normal" v_align="bottom" h_align="center">
<mode name="normal" resolutions="640x400,320x200">
<layout resolution="640x400" bitmap="normal_640x400.bmp" transparent_color="255,0,255">
<map>

2
backends/vkeybd/virtual-keyboard.cpp
View file

@ -71,7 +71,7 @@ void VirtualKeyboard::reset() {
deleteEvents();
_modes.clear();
_initialMode = _currentMode = 0;
_hAlignment = kAlignCentre;
_hAlignment = kAlignCenter;
_vAlignment = kAlignBottom;
_keyQueue.clear();
_loaded = false;

2
backends/vkeybd/virtual-keyboard.h
View file

@ -134,7 +134,7 @@ protected:
enum HorizontalAlignment {
kAlignLeft,
kAlignCentre,
kAlignCenter,
kAlignRight
};

2
engines/agi/agi.h
View file

@ -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 *);

6
engines/agi/op_test.cpp
View file

@ -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]);

8
engines/agi/saveload.cpp
View file

@ -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++)

4
engines/agos/agos.h
View file

@ -1140,7 +1140,7 @@ protected:
int getScale(int16 y, int16 x);
void checkScrollX(int16 x, int16 xpos);
void checkScrollY(int16 y, int16 ypos);
void centreScroll();
void centerScroll();
virtual void clearVideoWindow(uint16 windowNum, uint16 color);
void clearVideoBackGround(uint16 windowNum, uint16 color);
@ -1921,7 +1921,7 @@ public:
void off_mouseOff();
void off_loadVideo();
void off_playVideo();
void off_centreScroll();
void off_centerScroll();
void off_resetPVCount();
void off_setPathValues();
void off_stopClock();

2
engines/agos/debug.h
View file

@ -2058,7 +2058,7 @@ static const char *const feeblefiles_opcodeNameTable[256] = {
"W|UNLOAD_ZONE",
NULL,
"|UNFREEZE_ZONES",
"|CENTRE_SCROLL",
"|CENTER_SCROLL",
/* 188 */
"BSJ|STRING2_IS",
"|CLEAR_MARKS",

2
engines/agos/script_dp.cpp
View file

@ -271,7 +271,7 @@ void AGOSEngine_DIMP::setupOpcodes() {
OPCODE(os1_unloadZone),
OPCODE(o_invalid),
OPCODE(os1_unfreezeZones),
OPCODE(off_centreScroll),
OPCODE(off_centerScroll),
/* 188 */
OPCODE(os2_isShortText),
OPCODE(os2_clearMarks),

6
engines/agos/script_ff.cpp
View file

@ -272,7 +272,7 @@ void AGOSEngine_Feeble::setupOpcodes() {
OPCODE(os1_unloadZone),
OPCODE(o_invalid),
OPCODE(os1_unfreezeZones),
OPCODE(off_centreScroll),
OPCODE(off_centerScroll),
/* 188 */
OPCODE(os2_isShortText),
OPCODE(os2_clearMarks),
@ -590,9 +590,9 @@ void AGOSEngine_Feeble::off_playVideo() {
}
}
void AGOSEngine_Feeble::off_centreScroll() {
void AGOSEngine_Feeble::off_centerScroll() {
// 187
centreScroll();
centerScroll();
}
void AGOSEngine_Feeble::off_resetPVCount() {

4
engines/agos/vga_ff.cpp
View file

@ -201,7 +201,7 @@ void AGOSEngine::vc78_computeXY() {
if (getGameType() == GType_FF) {
setBitFlag(85, false);
if (getBitFlag(74)) {
centreScroll();
centerScroll();
}
}
}
@ -348,7 +348,7 @@ void AGOSEngine::checkScrollY(int16 y, int16 ypos) {
}
}
void AGOSEngine::centreScroll() {
void AGOSEngine::centerScroll() {
int16 x, y, tmp;
if (_scrollXMax != 0) {

2
engines/groovie/script.cpp
View file

@ -717,7 +717,7 @@ void Script::o_hotspot_center() {
debugScript(5, true, "HOTSPOT-CENTER @0x%04X", address);
// Mark the centremost 240 pixels of the game area
// Mark the centermost 240 pixels of the game area
Common::Rect rect(200, 80, 440, 400);
hotspot(rect, address, 0);
}

2
engines/m4/mads_menus.cpp
View file

@ -699,7 +699,7 @@ void RexDialogView::onRefresh(RectList *rects, M4Surface *destSurface) {
hLine(0, width(), MADS_Y_OFFSET - 2);
hLine(0, width(), MADS_Y_OFFSET + MADS_SURFACE_HEIGHT + 2);
// Add in the loaded background vertically centred
// Add in the loaded background vertically centerd
_backgroundSurface->copyTo(this, 0, (height() - MADS_SURFACE_HEIGHT) / 2);
// Check whether any of the dialog text entries need to be refreshed

10
engines/sci/engine/kstring.cpp
View file

@ -175,7 +175,7 @@ reg_t kReadNumber(EngineState *s, int argc, reg_t *argv) {
#define ALIGN_NONE 0
#define ALIGN_RIGHT 1
#define ALIGN_LEFT -1
#define ALIGN_CENTRE 2
#define ALIGN_CENTER 2
/* Format(targ_address, textresnr, index_inside_res, ...)
** or
@ -246,7 +246,7 @@ reg_t kFormat(EngineState *s, int argc, reg_t *argv) {
if (xfer == '0')
fillchar = '0';
else if (xfer == '=')
align = ALIGN_CENTRE;
align = ALIGN_CENTER;
else if (isdigit(xfer) || (xfer == '-'))
source--; // Go to start of length argument
@ -258,7 +258,7 @@ reg_t kFormat(EngineState *s, int argc, reg_t *argv) {
if (str_leng < 0) {
align = ALIGN_LEFT;
str_leng = -str_leng;
} else if (align != ALIGN_CENTRE)
} else if (align != ALIGN_CENTER)
align = ALIGN_RIGHT;
xfer = *source++;
@ -298,7 +298,7 @@ reg_t kFormat(EngineState *s, int argc, reg_t *argv) {
*target++ = ' '; /* Format into the text */
break;
case ALIGN_CENTRE: {
case ALIGN_CENTER: {
int half_extralen = extralen >> 1;
while (half_extralen-- > 0)
*target++ = ' '; /* Format into the text */
@ -315,7 +315,7 @@ reg_t kFormat(EngineState *s, int argc, reg_t *argv) {
switch (align) {
case ALIGN_CENTRE: {
case ALIGN_CENTER: {
int half_extralen;
align = 0;
half_extralen = extralen - (extralen >> 1);

12
engines/sky/text.cpp
View file

@ -231,13 +231,13 @@ char Text::getTextChar(uint8 **data, uint32 *bitPos) {
}
}
DisplayedText Text::displayText(uint32 textNum, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) {
DisplayedText Text::displayText(uint32 textNum, uint8 *dest, bool center, uint16 pixelWidth, uint8 color) {
//Render text into buffer *dest
getText(textNum);
return displayText(_textBuffer, dest, centre, pixelWidth, color);
return displayText(_textBuffer, dest, center, pixelWidth, color);
}
DisplayedText Text::displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color) {
DisplayedText Text::displayText(char *textPtr, uint8 *dest, bool center, uint16 pixelWidth, uint8 color) {
//Render text pointed to by *textPtr in buffer *dest
uint32 centerTable[10];
uint16 lineWidth = 0;
@ -319,7 +319,7 @@ DisplayedText Text::displayText(char *textPtr, uint8 *dest, bool centre, uint16
uint32 *centerTblPtr = centerTable;
do {
if (centre) {
if (center) {
uint32 width = (pixelWidth - *centerTblPtr) >> 1;
centerTblPtr++;
curDest += width;
@ -379,9 +379,9 @@ void Text::makeGameCharacter(uint8 textChar, uint8 *charSetPtr, uint8 *&dest, ui
dest = startPos + charWidth + _dtCharSpacing * 2 - 1;
}
DisplayedText Text::lowTextManager(uint32 textNum, uint16 width, uint16 logicNum, uint8 color, bool centre) {
DisplayedText Text::lowTextManager(uint32 textNum, uint16 width, uint16 logicNum, uint8 color, bool center) {
getText(textNum);
DisplayedText textInfo = displayText(_textBuffer, NULL, centre, width, color);
DisplayedText textInfo = displayText(_textBuffer, NULL, center, width, color);
uint32 compactNum = FIRST_TEXT_COMPACT;
Compact *cpt = _skyCompact->fetchCpt(compactNum);

6
engines/sky/text.h
View file

@ -52,9 +52,9 @@ class Text {
public:
Text(Disk *skyDisk, SkyCompact *skyCompact);
~Text();
struct DisplayedText displayText(uint32 textNum, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color);
struct DisplayedText displayText(char *textPtr, uint8 *dest, bool centre, uint16 pixelWidth, uint8 color);
struct DisplayedText lowTextManager(uint32 textNum, uint16 width, uint16 logicNum, uint8 color, bool centre);
struct DisplayedText displayText(uint32 textNum, uint8 *dest, bool center, uint16 pixelWidth, uint8 color);
struct DisplayedText displayText(char *textPtr, uint8 *dest, bool center, uint16 pixelWidth, uint8 color);
struct DisplayedText lowTextManager(uint32 textNum, uint16 width, uint16 logicNum, uint8 color, bool center);
void fnSetFont(uint32 fontNr);
void fnTextModule(uint32 textInfoId, uint32 textNo);
void fnPointerText(uint32 pointedId, uint16 mouseX, uint16 mouseY);

8
engines/sword2/maketext.cpp
View file

@ -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;

8
engines/sword2/maketext.h
View file

@ -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 {

20
engines/sword2/mouse.cpp
View file

@ -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;
}
}

2
engines/sword2/scroll.cpp
View file

@ -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;

8
engines/sword2/speech.cpp
View file

@ -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);

8
engines/testbed/graphics.cpp
View file

@ -606,7 +606,7 @@ TestExitStatus GFXtests::mouseMovements() {
Common::String info = "Testing Automated Mouse movements.\n"
"You should expect cursor hotspot(top-left corner) to automatically move from (0, 0) to (100, 100).\n"
"There we have a rectangle drawn, finally the cursor would lie centred in that rectangle.";
"There we have a rectangle drawn, finally the cursor would lie centerd in that rectangle.";
if (Testsuite::handleInteractiveInput(info, "OK", "Skip", kOptionRight)) {
Testsuite::logPrintf("Info! Skipping test : Mouse Movements\n");
@ -637,7 +637,7 @@ TestExitStatus GFXtests::mouseMovements() {
g_system->delayMillis(1500);
CursorMan.showMouse(false);
if (Testsuite::handleInteractiveInput("Was the cursor centred in the rectangle at (100, 100)?", "Yes", "No", kOptionRight)) {
if (Testsuite::handleInteractiveInput("Was the cursor centerd in the rectangle at (100, 100)?", "Yes", "No", kOptionRight)) {
return kTestFailed;
}
@ -654,7 +654,7 @@ TestExitStatus GFXtests::copyRectToScreen() {
Testsuite::clearScreen();
Common::String info = "Testing Blitting a Bitmap to screen.\n"
"You should expect to see a 20x40 yellow horizontal rectangle centred at the screen.";
"You should expect to see a 20x40 yellow horizontal rectangle centerd at the screen.";
if (Testsuite::handleInteractiveInput(info, "OK", "Skip", kOptionRight)) {
Testsuite::logPrintf("Info! Skipping test : Blitting Bitmap\n");
@ -1113,7 +1113,7 @@ TestExitStatus GFXtests::pixelFormats() {
Graphics::Surface *screen = g_system->lockScreen();
// Draw 6 rectangles centred at (50, 160), piled over one another
// Draw 6 rectangles centerd at (50, 160), piled over one another
// each with color in colors[]
for (int i = 0; i < 6; i++) {
screen->fillRect(Common::Rect::center(160, 20 + i * 10, 100, 10), colors[i]);

4
engines/tinsel/background.cpp
View file

@ -127,11 +127,11 @@ void PlayfieldGetPos(int which, int *pXpos, int *pYpos) {
}
/**
* Returns the x position of the centre of the specified playfield
* Returns the x position of the center of the specified playfield
* @param which Which playfield
*/
int PlayfieldGetCentreX(int which) {
int PlayfieldGetCenterX(int which) {
PLAYFIELD *pPlayfield; // pointer to relavent playfield
// make sure there is a background

2
engines/tinsel/background.h
View file

@ -93,7 +93,7 @@ void PlayfieldGetPos( // Returns the xy position of the specified playfield in
int *pXpos, // returns current x position
int *pYpos); // returns current y position
int PlayfieldGetCentreX( // Returns the xy position of the specified playfield in the current background
int PlayfieldGetCenterX( // Returns the xy position of the specified playfield in the current background
int which); // which playfield
OBJECT *GetPlayfieldList( // Returns the display list for the specified playfield

2
engines/tinsel/bmv.cpp
View file

@ -519,7 +519,7 @@ void BMVPlayer::MovieText(CORO_PARAM, int stringId, int x, int y, int fontId, CO
0,
x, y,
hFont,
TXT_CENTRE, 0);
TXT_CENTER, 0);
KeepOnScreen(texts[index].pText, &x, &y);
}

36
engines/tinsel/dialogs.cpp
View file

@ -259,7 +259,7 @@ enum PARTS_INDEX {
#define MD_XLBUTR (TinselV2 ? 26 : 10)
#define MD_XRBUTL (TinselV2 ? 173 : 105)
#define MD_XRBUTR (TinselV2 ? 195 : 114)
#define ROTX1 60 // Rotate button's offsets from the centre
#define ROTX1 60 // Rotate button's offsets from the center
// Number of objects that makes up an empty window
#define MAX_WCOMP 21 // 4 corners + (3+3) sides + (2+2) extra sides
@ -2239,7 +2239,7 @@ static int WhichMenuBox(int curX, int curY, bool bSlides) {
/***/
/**************************************************************************/
#define ROTX1 60 // Rotate button's offsets from the centre
#define ROTX1 60 // Rotate button's offsets from the center
/**
* InvBoxes
@ -2638,14 +2638,14 @@ static void AddBackground(OBJECT **rect, OBJECT **title, int extraH, int extraV,
LoadStringRes(InvD[ino].hInvTitle, TextBufferAddr(), TBUFSZ);
*title = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), TextBufferAddr(), 0,
InvD[ino].inventoryX + width/2, InvD[ino].inventoryY + M_TOFF,
GetTagFontHandle(), TXT_CENTRE);
GetTagFontHandle(), TXT_CENTER);
assert(*title); // Inventory title string produced NULL text
MultiSetZPosition(*title, Z_INV_HTEXT);
} else if (textFrom == FROM_STRING && cd.ixHeading != NO_HEADING) {
LoadStringRes(configStrings[cd.ixHeading], TextBufferAddr(), TBUFSZ);
*title = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), TextBufferAddr(), 0,
InvD[ino].inventoryX + width/2, InvD[ino].inventoryY + M_TOFF,
GetTagFontHandle(), TXT_CENTRE);
GetTagFontHandle(), TXT_CENTER);
assert(*title); // Inventory title string produced NULL text
MultiSetZPosition(*title, Z_INV_HTEXT);
}
@ -2669,7 +2669,7 @@ static void AddTitle(POBJECT *title, int extraH) {
LoadStringRes(InvD[ino].hInvTitle, TextBufferAddr(), TBUFSZ);
*title = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), TextBufferAddr(), 0,
InvD[ino].inventoryX + (width/2)+NM_BG_POS_X, InvD[ino].inventoryY + NM_TOFF,
GetTagFontHandle(), TXT_CENTRE, 0);
GetTagFontHandle(), TXT_CENTER, 0);
assert(*title);
MultiSetZPosition(*title, Z_INV_HTEXT);
}
@ -2758,9 +2758,9 @@ static void AddBox(int *pi, const int i) {
iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), cd.box[i].boxText, 0,
#ifdef JAPAN
// Note: it never seems to go here!
x + cd.box[i].w/2, y+2, GetTagFontHandle(), TXT_CENTRE);
x + cd.box[i].w/2, y+2, GetTagFontHandle(), TXT_CENTER);
#else
x + cd.box[i].w / 2, y + TYOFF, GetTagFontHandle(), TXT_CENTRE);
x + cd.box[i].w / 2, y + TYOFF, GetTagFontHandle(), TXT_CENTER);
#endif
}
@ -2787,9 +2787,9 @@ static void AddBox(int *pi, const int i) {
iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
TextBufferAddr(), 0,
#ifdef JAPAN
x + cd.box[i].w/2, y+2, GetTagFontHandle(), TXT_CENTRE);
x + cd.box[i].w/2, y+2, GetTagFontHandle(), TXT_CENTER);
#else
x + cd.box[i].w / 2, y + TYOFF, GetTagFontHandle(), TXT_CENTRE);
x + cd.box[i].w / 2, y + TYOFF, GetTagFontHandle(), TXT_CENTER);
#endif
MultiSetZPosition(iconArray[*pi], Z_INV_ITEXT);
*pi += 1;
@ -2870,7 +2870,7 @@ static void AddBox(int *pi, const int i) {
if (cd.box[i].boxType == TOGGLE2) {
iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
TextBufferAddr(), 0, x + cd.box[i].w / 2, y + TOG2_YOFF,
GetTagFontHandle(), TXT_CENTRE, 0);
GetTagFontHandle(), TXT_CENTER, 0);
} else {
iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
TextBufferAddr(), 0, x + MDTEXT_XOFF, y + MDTEXT_YOFF,
@ -2934,7 +2934,7 @@ static void AddBox(int *pi, const int i) {
LoadStringRes(SysString(cd.box[i].ixText), TextBufferAddr(), TBUFSZ);
iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
TextBufferAddr(), 0, x + cd.box[i].w / 2, y + TOG2_YOFF,
GetTagFontHandle(), TXT_CENTRE, 0);
GetTagFontHandle(), TXT_CENTER, 0);
MultiSetZPosition(iconArray[*pi], Z_INV_ITEXT);
*pi += 1;
}
@ -2945,7 +2945,7 @@ static void AddBox(int *pi, const int i) {
LoadStringRes(LanguageDesc(displayedLanguage), TextBufferAddr(), TBUFSZ);
iconArray[*pi] = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), TextBufferAddr(), 0,
x + cd.box[i].w / 2, y + ROT_YOFF, GetTagFontHandle(), TXT_CENTRE, 0);
x + cd.box[i].w / 2, y + ROT_YOFF, GetTagFontHandle(), TXT_CENTER, 0);
MultiSetZPosition(iconArray[*pi], Z_INV_ITEXT);
*pi += 1;
@ -3683,15 +3683,15 @@ extern void HideConversation(bool bHide) {
/*
* First time, position it appropriately
*/
int left, centre;
int left, center;
int x, y, deltay;
// Only do it once per conversation
bMoveOnUnHide = false;
// Current centre of the window
// Current center of the window
left = MultiLeftmost(RectObject);
centre = (MultiRightmost(RectObject) + left) / 2;
center = (MultiRightmost(RectObject) + left) / 2;
// Get the x-offset for the conversation window
if (thisConvActor) {
@ -3731,12 +3731,12 @@ extern void HideConversation(bool bHide) {
// Move it all
for (i = 0; objArray[i] && i < MAX_WCOMP; i++) {
MultiMoveRelXY(objArray[i], x - centre, deltay);
MultiMoveRelXY(objArray[i], x - center, deltay);
}
for (i = 0; iconArray[i] && i < MAX_ICONS; i++) {
MultiMoveRelXY(iconArray[i], x - centre, deltay);
MultiMoveRelXY(iconArray[i], x - center, deltay);
}
InvD[INV_CONV].inventoryX += x - centre;
InvD[INV_CONV].inventoryX += x - center;
/*
* Now positioned as worked out

28
engines/tinsel/move.cpp
View file

@ -584,7 +584,7 @@ static void SetMoverUltDest(PMOVER pActor, int x, int y) {
* If in a neighbouring path to the final destination, if the target path
* is a follow nodes path, head for the end node, otherwise head straight
* for the target.
* Otherwise, head towards the pseudo-centre or end node of the first
* Otherwise, head towards the pseudo-center or end node of the first
* en-route path.
*/
static void SetMoverIntDest(PMOVER pMover, int x, int y) {
@ -636,7 +636,7 @@ static void SetMoverIntDest(PMOVER pMover, int x, int y) {
} else if (hIpath != NOPOLY) {
/* Head for an en-route path */
if (PolySubtype(hIpath) != NODE) {
/* En-route path is normal - head for pseudo centre. */
/* En-route path is normal - head for pseudo center. */
if (CanGetThere(pMover, x, y) == GT_OK) {
pMover->ItargetX = x;
pMover->ItargetY = y;
@ -644,8 +644,8 @@ static void SetMoverIntDest(PMOVER pMover, int x, int y) {
// make damn sure that Itarget is in hIpath
pMover->hIpath = InPolygon(x, y, PATH);
} else {
pMover->ItargetX = PolyCentreX(hIpath);
pMover->ItargetY = PolyCentreY(hIpath);
pMover->ItargetX = PolyCenterX(hIpath);
pMover->ItargetY = PolyCenterY(hIpath);
if (TinselV2)
// make damn sure that Itarget is in hIpath
pMover->hIpath = InPolygon(pMover->ItargetX, pMover->ItargetY, PATH);
@ -943,12 +943,12 @@ static void SetNextDest(PMOVER pMover) {
assert(hPath == pMover->hIpath);
if (pMover->InDifficulty == NO_PROB) {
x = PolyCentreX(hPath);
y = PolyCentreY(hPath);
x = PolyCenterX(hPath);
y = PolyCenterY(hPath);
SetMoverDest(pMover, x, y);
pMover->InDifficulty = TRY_CENTRE;
pMover->InDifficulty = TRY_CENTER;
pMover->over = false;
} else if (pMover->InDifficulty == TRY_CENTRE) {
} else if (pMover->InDifficulty == TRY_CENTER) {
NearestCorner(&x, &y, pMover->hCpath, pMover->hIpath);
SetMoverDest(pMover, x, y);
pMover->InDifficulty = TRY_CORNER;
@ -986,7 +986,7 @@ static void SetNextDest(PMOVER pMover) {
!IsAdjacentPath(pMover->hCpath, pMover->hIpath)) {
/*----------------------------------------------------------
If just entering a follow nodes polygon, go to first node.|
Else if just going to pass through, go to pseudo-centre. |
Else if just going to pass through, go to pseudo-center. |
----------------------------------------------------------*/
if (PolySubtype(hPath) == NODE && pMover->hFnpath != hPath && pMover->npstatus != LEAVING) {
int node = NearestEndNode(hPath, x, y);
@ -995,7 +995,7 @@ static void SetNextDest(PMOVER pMover) {
pMover->over = true;
} else if (!IsInPolygon(pMover->ItargetX, pMover->ItargetY, hPath) &&
!IsInPolygon(pMover->ItargetX, pMover->ItargetY, pMover->hCpath)) {
SetMoverDest(pMover, PolyCentreX(hPath), PolyCentreY(hPath));
SetMoverDest(pMover, PolyCenterX(hPath), PolyCenterY(hPath));
pMover->over = true;
} else {
SetMoverDest(pMover, pMover->ItargetX, pMover->ItargetY);
@ -1258,8 +1258,8 @@ static void SetOffWithinNodePath(PMOVER pMover, HPOLYGON StartPath, HPOLYGON Des
endnode = NearestEndNode(StartPath, targetX, targetY);
} else {
if (PolySubtype(hIpath) != NODE) {
x = PolyCentreX(hIpath);
y = PolyCentreY(hIpath);
x = PolyCenterX(hIpath);
y = PolyCenterY(hIpath);
endnode = NearestEndNode(StartPath, x, y);
} else {
endnode = NearEndNode(StartPath, hIpath);
@ -1278,7 +1278,7 @@ static void SetOffWithinNodePath(PMOVER pMover, HPOLYGON StartPath, HPOLYGON Des
{
// could go for its end node if it's an NPATH
// but we probably will when we hit it anyway!
SetMoverDest(pMover, PolyCentreX(hIpath), PolyCentreY(hIpath));
SetMoverDest(pMover, PolyCenterX(hIpath), PolyCenterY(hIpath));
}
}
} else
@ -1500,7 +1500,7 @@ static void EnteringNewPath(PMOVER pMover, HPOLYGON hPath, int x, int y) {
assert(hIpath != NOPOLY); // No path on the way
if (PolySubtype(hIpath) != NODE) {
lastnode = NearestEndNode(hPath, PolyCentreX(hIpath), PolyCentreY(hIpath));
lastnode = NearestEndNode(hPath, PolyCenterX(hIpath), PolyCenterY(hIpath));
} else {
lastnode = NearEndNode(hPath, hIpath);
}

22
engines/tinsel/pdisplay.cpp
View file

@ -59,8 +59,8 @@ extern int newestString; // The overrun counter, in STRRES.C
#define LPOSX 295 // X-co-ord of lead actor's position display
#define CPOSX 24 // X-co-ord of cursor's position display
#define OPOSX SCRN_CENTRE_X // X-co-ord of overrun counter's display
#define SPOSX SCRN_CENTRE_X // X-co-ord of string numbner's display
#define OPOSX SCRN_CENTER_X // X-co-ord of overrun counter's display
#define SPOSX SCRN_CENTER_X // X-co-ord of string numbner's display
#define POSY 0 // Y-co-ord of these position displays
@ -158,7 +158,7 @@ void CursorPositionProcess(CORO_PARAM, const void *) {
// New text objects
sprintf(PositionString, "%d %d", aniX + Loffset, aniY + Toffset);
_ctx->cpText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), PositionString,
0, CPOSX, POSY, GetTagFontHandle(), TXT_CENTRE);
0, CPOSX, POSY, GetTagFontHandle(), TXT_CENTER);
if (DispPath) {
HPOLYGON hp = InPolygon(aniX + Loffset, aniY + Toffset, PATH);
if (hp == NOPOLY)
@ -190,7 +190,7 @@ void CursorPositionProcess(CORO_PARAM, const void *) {
sprintf(PositionString, "%d", Overrun);
_ctx->opText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), PositionString,
0, OPOSX, POSY, GetTagFontHandle(), TXT_CENTRE);
0, OPOSX, POSY, GetTagFontHandle(), TXT_CENTER);
// update previous value
_ctx->prevOver = Overrun;
@ -216,7 +216,7 @@ void CursorPositionProcess(CORO_PARAM, const void *) {
// create new text object list
sprintf(PositionString, "%d %d", aniX, aniY);
_ctx->rpText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), PositionString,
0, LPOSX, POSY, GetTagFontHandle(), TXT_CENTRE);
0, LPOSX, POSY, GetTagFontHandle(), TXT_CENTER);
// update previous position
_ctx->prevlX = aniX;
@ -235,7 +235,7 @@ void CursorPositionProcess(CORO_PARAM, const void *) {
sprintf(PositionString, "String: %d", newestString);
_ctx->spText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), PositionString,
0, SPOSX, POSY+10, GetTalkFontHandle(), TXT_CENTRE);
0, SPOSX, POSY+10, GetTalkFontHandle(), TXT_CENTER);
// update previous value
_ctx->prevString = newestString;
@ -411,7 +411,7 @@ static bool ActorTag(int curX, int curY, HotSpotTag *pTag, OBJECT **ppText) {
// May have buggered cursor
EndCursorFollowed();
*ppText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), tagBuffer,
0, tagX, tagY, GetTagFontHandle(), TXT_CENTRE, 0);
0, tagX, tagY, GetTagFontHandle(), TXT_CENTER, 0);
assert(*ppText);
MultiSetZPosition(*ppText, Z_TAG_TEXT);
} else
@ -456,7 +456,7 @@ static bool ActorTag(int curX, int curY, HotSpotTag *pTag, OBJECT **ppText) {
PlayfieldGetPos(FIELD_WORLD, &tagX, &tagY);
LoadStringRes(GetActorTag(ano), TextBufferAddr(), TBUFSZ);
*ppText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), TextBufferAddr(),
0, xtext - tagX, ytext - tagY, GetTagFontHandle(), TXT_CENTRE);
0, xtext - tagX, ytext - tagY, GetTagFontHandle(), TXT_CENTER);
assert(*ppText); // Actor tag string produced NULL text
MultiSetZPosition(*ppText, Z_TAG_TEXT);
} else {
@ -561,7 +561,7 @@ static bool PolyTag(HotSpotTag *pTag, OBJECT **ppText) {
*ppText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
TextBufferAddr(), 0, tagx - Loffset, tagy - Toffset,
GetTagFontHandle(), TXT_CENTRE, 0);
GetTagFontHandle(), TXT_CENTER, 0);
} else if (TinselV2) {
// Bugger cursor
const char *tagPtr = TextBufferAddr();
@ -570,12 +570,12 @@ static bool PolyTag(HotSpotTag *pTag, OBJECT **ppText) {
GetCursorXYNoWait(&curX, &curY, false);
*ppText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), TextBufferAddr(),
0, curX, curY, GetTagFontHandle(), TXT_CENTRE, 0);
0, curX, curY, GetTagFontHandle(), TXT_CENTER, 0);
} else {
// Handle displaying the tag text on-screen
*ppText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), TextBufferAddr(),
0, tagx - Loffset, tagy - Toffset,
GetTagFontHandle(), TXT_CENTRE);
GetTagFontHandle(), TXT_CENTER);
assert(*ppText); // Polygon tag string produced NULL text
}

38
engines/tinsel/polygons.cpp
View file

@ -98,10 +98,10 @@ struct POLYGON {
/*
* Internal derived data for speed and conveniance
* set up by PseudoCentre()
* set up by PseudoCenter()
*/
int pcentrex; // Pseudo-centre
int pcentrey; //
int pcenterx; // Pseudo-center
int pcentery; //
/**
* List of adjacent polygons. For Path polygons only.
@ -1624,34 +1624,34 @@ static PPOLYGON CommonInits(PTYPE polyType, int pno, const Poly &ptp, bool bRest
}
/**
* Calculate a point approximating to the centre of a polygon.
* Calculate a point approximating to the center of a polygon.
* Not very sophisticated.
*/
static void PseudoCentre(POLYGON *p) {
p->pcentrex = (p->cx[0] + p->cx[1] + p->cx[2] + p->cx[3])/4;
p->pcentrey = (p->cy[0] + p->cy[1] + p->cy[2] + p->cy[3])/4;
static void PseudoCenter(POLYGON *p) {
p->pcenterx = (p->cx[0] + p->cx[1] + p->cx[2] + p->cx[3])/4;
p->pcentery = (p->cy[0] + p->cy[1] + p->cy[2] + p->cy[3])/4;
if (!IsInPolygon(p->pcentrex, p->pcentrey, PolygonIndex(p))) {
if (!IsInPolygon(p->pcenterx, p->pcentery, PolygonIndex(p))) {
int i, top = 0, bot = 0;
for (i = p->ptop; i <= p->pbottom; i++) {
if (IsInPolygon(p->pcentrex, i, PolygonIndex(p))) {
if (IsInPolygon(p->pcenterx, i, PolygonIndex(p))) {
top = i;
break;
}
}
for (i = p->pbottom; i >= p->ptop; i--) {
if (IsInPolygon(p->pcentrex, i, PolygonIndex(p))) {
if (IsInPolygon(p->pcenterx, i, PolygonIndex(p))) {
bot = i;
break;
}
}
p->pcentrex = (top+bot)/2;
p->pcenterx = (top+bot)/2;
}
#ifdef DEBUG
// assert(IsInPolygon(p->pcentrex, p->pcentrey, PolygonIndex(p))); // Pseudo-centre is not in path
if (!IsInPolygon(p->pcentrex, p->pcentrey, PolygonIndex(p))) {
sprintf(TextBufferAddr(), "Pseudo-centre is not in path (starting (%d, %d)) - polygon reversed?",
// assert(IsInPolygon(p->pcenterx, p->pcentery, PolygonIndex(p))); // Pseudo-center is not in path
if (!IsInPolygon(p->pcenterx, p->pcentery, PolygonIndex(p))) {
sprintf(TextBufferAddr(), "Pseudo-center is not in path (starting (%d, %d)) - polygon reversed?",
p->cx[0], p->cy[0]);
error(TextBufferAddr());
}
@ -1673,7 +1673,7 @@ static void InitPath(const Poly &ptp, bool NodePath, int pno, bool bRestart) {
p->subtype = NodePath ? NODE : NORMAL;
PseudoCentre(p);
PseudoCenter(p);
}
@ -1918,16 +1918,16 @@ int PolySubtype(HPOLYGON hp) {
return Polys[hp]->subtype;
}
int PolyCentreX(HPOLYGON hp) {
int PolyCenterX(HPOLYGON hp) {
CHECK_HP(hp, "Out of range polygon handle (27)");
return Polys[hp]->pcentrex;
return Polys[hp]->pcenterx;
}
int PolyCentreY(HPOLYGON hp) {
int PolyCenterY(HPOLYGON hp) {
CHECK_HP(hp, "Out of range polygon handle (28)");
return Polys[hp]->pcentrey;
return Polys[hp]->pcentery;
}
int PolyCornerX(HPOLYGON hp, int n) {

4
engines/tinsel/polygons.h
View file

@ -127,8 +127,8 @@ void RestorePolygonStuff(POLY_VOLATILE *sps);
PTYPE PolyType(HPOLYGON hp); // ->type
int PolySubtype(HPOLYGON hp); // ->subtype
int PolyCentreX(HPOLYGON hp); // ->pcentrex
int PolyCentreY(HPOLYGON hp); // ->pcentrey
int PolyCenterX(HPOLYGON hp); // ->pcenterx
int PolyCenterY(HPOLYGON hp); // ->pcentery
int PolyCornerX(HPOLYGON hp, int n); // ->cx[n]
int PolyCornerY(HPOLYGON hp, int n); // ->cy[n]
PSTATE PolyPointState(HPOLYGON hp); // ->pointState

2
engines/tinsel/rince.h
View file

@ -38,7 +38,7 @@ struct PROCESS;
enum NPS {NOT_IN, GOING_UP, GOING_DOWN, LEAVING, ENTERING};
enum IND {NO_PROB, TRY_CENTRE, TRY_CORNER, TRY_NEXTCORNER};
enum IND {NO_PROB, TRY_CENTER, TRY_CORNER, TRY_NEXTCORNER};
enum DIRECTION { LEFTREEL, RIGHTREEL, FORWARD, AWAY };

6
engines/tinsel/sound.cpp
View file

@ -364,8 +364,8 @@ bool SoundManager::offscreenChecks(int x, int &y) {
if (x == -1)
return true;
// convert x to offset from screen centre
x -= PlayfieldGetCentreX(FIELD_WORLD);
// convert x to offset from screen center
x -= PlayfieldGetCenterX(FIELD_WORLD);
if (x < -SCREEN_WIDTH || x > SCREEN_WIDTH) {
// A long way offscreen, ignore it
@ -385,7 +385,7 @@ int8 SoundManager::getPan(int x) {
if (x == -1)
return 0;
x -= PlayfieldGetCentreX(FIELD_WORLD);
x -= PlayfieldGetCenterX(FIELD_WORLD);
if (x == 0)
return 0;

4
engines/tinsel/text.cpp
View file

@ -78,8 +78,8 @@ int StringLengthPix(char *szStr, const FONT *pFont) {
* @param mode Mode flags for the string
*/
int JustifyText(char *szStr, int xPos, const FONT *pFont, int mode) {
if (mode & TXT_CENTRE) {
// centre justify the text
if (mode & TXT_CENTER) {
// center justify the text
// adjust x positioning by half the length of line in pixels
xPos -= StringLengthPix(szStr, pFont) / 2;

2
engines/tinsel/text.h
View file

@ -34,7 +34,7 @@ namespace Tinsel {
/** text mode flags - defaults to left justify */
enum {
TXT_CENTRE = 0x0001, ///< centre justify text
TXT_CENTER = 0x0001, ///< center justify text
TXT_RIGHT = 0x0002, ///< right justify text
TXT_SHADOW = 0x0004, ///< shadow each character
TXT_ABSOLUTE = 0x0008 ///< position of text is absolute (only for object text)

12
engines/tinsel/tinlib.cpp
View file

@ -1952,7 +1952,7 @@ static void Print(CORO_PARAM, int x, int y, SCNHANDLE text, int time, bool bSust
PlayfieldGetPos(FIELD_WORLD, &Loffset, &Toffset);
_ctx->pText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
TextBufferAddr(), 0, x - Loffset, y - Toffset, GetTagFontHandle(),
TXT_CENTRE, 0);
TXT_CENTER, 0);
assert(_ctx->pText);
// Adjust x, y, or z if necessary
@ -1965,7 +1965,7 @@ static void Print(CORO_PARAM, int x, int y, SCNHANDLE text, int time, bool bSust
PlayfieldGetPos(FIELD_WORLD, &Loffset, &Toffset);
_ctx->pText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), TextBufferAddr(),
0, x - Loffset, y - Toffset,
TinselV2 ? GetTagFontHandle() : GetTalkFontHandle(), TXT_CENTRE);
TinselV2 ? GetTagFontHandle() : GetTalkFontHandle(), TXT_CENTER);
assert(_ctx->pText); // string produced NULL text
if (IsTopWindow())
MultiSetZPosition(_ctx->pText, Z_TOPW_TEXT);
@ -2128,7 +2128,7 @@ static void PrintObj(CORO_PARAM, const SCNHANDLE hText, const INV_OBJECT *pinvo,
LoadStringRes(hText, TextBufferAddr(), TBUFSZ);
_ctx->pText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), TextBufferAddr(),
0, _ctx->textx, _ctx->texty, GetTagFontHandle(), TXT_CENTRE);
0, _ctx->textx, _ctx->texty, GetTagFontHandle(), TXT_CENTER);
assert(_ctx->pText); // PrintObj() string produced NULL text
MultiSetZPosition(_ctx->pText, Z_INV_ITEXT);
@ -2181,7 +2181,7 @@ static void PrintObj(CORO_PARAM, const SCNHANDLE hText, const INV_OBJECT *pinvo,
LoadStringRes(hText, TextBufferAddr(), TBUFSZ);
_ctx->pText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
TextBufferAddr(), 0, _ctx->textx, _ctx->texty, GetTagFontHandle(),
TXT_CENTRE, 0);
TXT_CENTER, 0);
assert(_ctx->pText);
KeepOnScreen(_ctx->pText, &_ctx->textx, &_ctx->texty);
@ -2297,7 +2297,7 @@ static void PrintObjPointed(CORO_PARAM, const SCNHANDLE text, const INV_OBJECT *
// Re-display in the same place
LoadStringRes(text, TextBufferAddr(), TBUFSZ);
pText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS), TextBufferAddr(),
0, textx, texty, GetTagFontHandle(), TXT_CENTRE);
0, textx, texty, GetTagFontHandle(), TXT_CENTER);
assert(pText); // PrintObj() string produced NULL text
MultiSetZPosition(pText, Z_INV_ITEXT);
}
@ -3367,7 +3367,7 @@ static void TalkOrSay(CORO_PARAM, SPEECH_TYPE speechType, SCNHANDLE hText, int x
_ctx->pText = ObjectTextOut(GetPlayfieldList(FIELD_STATUS),
TextBufferAddr(), 0, _ctx->x - _ctx->Loffset, _ctx->y - _ctx->Toffset,
GetTalkFontHandle(), TXT_CENTRE);
GetTalkFontHandle(), TXT_CENTER);
assert(_ctx->pText); // talk() string produced NULL text;
if (IsTopWindow())

4
engines/tinsel/tinsel.h
View file

@ -125,8 +125,8 @@ typedef bool (*KEYFPTR)(const Common::KeyState &);
#define SCREEN_WIDTH (_vm->screen().w) // PC screen dimensions
#define SCREEN_HEIGHT (_vm->screen().h)
#define SCRN_CENTRE_X ((SCREEN_WIDTH - 1) / 2) // screen centre x
#define SCRN_CENTRE_Y ((SCREEN_HEIGHT - 1) / 2) // screen centre y
#define SCRN_CENTER_X ((SCREEN_WIDTH - 1) / 2) // screen center x
#define SCRN_CENTER_Y ((SCREEN_HEIGHT - 1) / 2) // screen center y
#define UNUSED_LINES 48
#define EXTRA_UNUSED_LINES 3
//#define SCREEN_BOX_HEIGHT1 (SCREEN_HEIGHT - UNUSED_LINES)

8
engines/tsage/converse.cpp
View file

@ -871,7 +871,7 @@ void Speaker::removeText() {
SpeakerGameText::SpeakerGameText() : Speaker() {
_speakerName = "GAMETEXT";
_textPos = Common::Point(40, 40);
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
_color1 = 7;
_textWidth = 230;
_hideObjects = false;
@ -881,7 +881,7 @@ SpeakerGameText::SpeakerGameText() : Speaker() {
ScreenSpeaker::ScreenSpeaker() : Speaker() {
_npc = NULL;
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
}
void ScreenSpeaker::setText(const Common::String &msg) {
@ -892,9 +892,9 @@ void ScreenSpeaker::setText(const Common::String &msg) {
_globals->gfxManager().getStringBounds(msg.c_str(), textRect, _textWidth);
if (_npc) {
textRect.centre(_npc->_position.x, _npc->_bounds.top - (textRect.height() / 2 + 10));
textRect.center(_npc->_position.x, _npc->_bounds.top - (textRect.height() / 2 + 10));
} else {
textRect.centre(_globals->_sceneManager._scene->_sceneBounds.left +
textRect.center(_globals->_sceneManager._scene->_sceneBounds.left +
(_globals->_sceneManager._scene->_sceneBounds.width() / 2),
_globals->_sceneManager._scene->_sceneBounds.top);
}

10
engines/tsage/core.cpp
View file

@ -1496,7 +1496,7 @@ void SceneItem::display(int resNum, int lineNum, ...) {
Rect textRect;
int maxWidth = 120;
bool keepOnscreen = false;
bool centreText = true;
bool centerText = true;
if (resNum) {
va_list va;
@ -1559,7 +1559,7 @@ void SceneItem::display(int resNum, int lineNum, ...) {
}
case SET_POS_MODE:
// Set whether a custom x/y is used
centreText = va_arg(va, int) != 0;
centerText = va_arg(va, int) != 0;
break;
case SET_TEXT_MODE:
// Set the text mode
@ -1576,17 +1576,17 @@ void SceneItem::display(int resNum, int lineNum, ...) {
if (resNum) {
// Get required bounding size
_globals->gfxManager().getStringBounds(msg.c_str(), textRect, maxWidth);
textRect.centre(pos.x, pos.y);
textRect.center(pos.x, pos.y);
textRect.contain(_globals->gfxManager()._bounds);
if (centreText) {
if (centerText) {
_globals->_sceneText._color1 = _globals->_sceneText._color2;
_globals->_sceneText._color2 = 0;
_globals->_sceneText._color3 = 0;
}
_globals->_sceneText.setup(msg);
if (centreText) {
if (centerText) {
_globals->_sceneText.setPosition(Common::Point(
_globals->_sceneManager._scene->_sceneBounds.left + textRect.left,
_globals->_sceneManager._scene->_sceneBounds.top + textRect.top), 0);

10
engines/tsage/dialogs.cpp
View file

@ -64,8 +64,8 @@ MessageDialog::MessageDialog(const Common::String &message, const Common::String
// Do post setup for the dialog
setDefaults();
// Set the dialog's centre
setCentre(_globals->_dialogCentre.x, _globals->_dialogCentre.y);
// Set the dialog's center
setCenter(_globals->_dialogCenter.x, _globals->_dialogCenter.y);
}
int MessageDialog::show(const Common::String &message, const Common::String &btn1Message, const Common::String &btn2Message) {
@ -167,7 +167,7 @@ RightClickDialog::RightClickDialog() : GfxDialog(),
// Set the dialog position
dialogRect.resize(_surface, 0, 0, 100);
dialogRect.centre(_globals->_events._mousePos.x, _globals->_events._mousePos.y);
dialogRect.center(_globals->_events._mousePos.x, _globals->_events._mousePos.y);
// Ensure the dialog will be entirely on-screen
Rect screenRect = _globals->gfxManager()._bounds;
@ -457,7 +457,7 @@ InventoryDialog::InventoryDialog(bool allFlag) {
addElements(&_btnLook, &_btnOk, NULL);
frame();
setCentre(SCREEN_CENTRE_X, SCREEN_CENTRE_Y);
setCenter(SCREEN_CENTER_X, SCREEN_CENTER_Y);
}
void InventoryDialog::execute() {
@ -591,7 +591,7 @@ OptionsDialog::OptionsDialog() {
// Set the dialog size and position
frame();
setCentre(160, 100);
setCenter(160, 100);
}

4
engines/tsage/globals.cpp
View file

@ -47,7 +47,7 @@ static SavedObject *classFactoryProc(const Common::String &className) {
/*--------------------------------------------------------------------------*/
Globals::Globals() :
_dialogCentre(160, 140),
_dialogCenter(160, 140),
_gfxManagerInstance(_screenSurface) {
reset();
_stripNum = 0;
@ -89,7 +89,7 @@ void Globals::synchronise(Serialiser &s) {
s.syncAsSint32LE(_fontColors.background);
s.syncAsSint32LE(_fontColors.foreground);
s.syncAsSint16LE(_dialogCentre.x); s.syncAsSint16LE(_dialogCentre.y);
s.syncAsSint16LE(_dialogCenter.x); s.syncAsSint16LE(_dialogCenter.y);
_sceneListeners.synchronise(s);
for (int i = 0; i < 256; ++i)
s.syncAsByte(_flags[i]);

2
engines/tsage/globals.h
View file

@ -55,7 +55,7 @@ public:
GfxColors _gfxColors;
GfxColors _fontColors;
SoundManager _soundManager;
Common::Point _dialogCentre;
Common::Point _dialogCenter;
WalkRegions _walkRegions;
SynchronisedList<EventHandler *> _sceneListeners;
bool _flags[256];

24
engines/tsage/graphics.cpp
View file

@ -147,22 +147,22 @@ void Rect::collapse(int dx, int dy) {
}
/**
* Centres the rectangle at a given position
* Centers the rectangle at a given position
*
* @xp x position for new centre
* @yp y position for new centre
* @xp x position for new center
* @yp y position for new center
*/
void Rect::centre(int xp, int yp) {
void Rect::center(int xp, int yp) {
moveTo(xp - (width() / 2), yp - (height() / 2));
}
/**
* Centres the rectangle at the centre of a second passed rectangle
* Centers the rectangle at the center of a second passed rectangle
*
* @r Second rectangle whose centre to use
* @r Second rectangle whose center to use
*/
void Rect::centre(const Rect &r) {
centre(r.left + (r.width() / 2), r.top + (r.height() / 2));
void Rect::center(const Rect &r) {
center(r.left + (r.width() / 2), r.top + (r.height() / 2));
}
/*
@ -355,7 +355,7 @@ bool GfxSurface::displayText(const Common::String &msg, const Common::Point &pt)
// Get the area for text display
Rect textRect;
gfxManager.getStringBounds(msg.c_str(), textRect, 200);
textRect.centre(pt.x, pt.y);
textRect.center(pt.x, pt.y);
// Make a backup copy of the area the text will occupy
Rect saveRect = textRect;
@ -798,7 +798,7 @@ void GfxButton::draw() {
// Display the button's text
Rect tempRect(_bounds);
tempRect.collapse(3, 3);
gfxManager._font.writeLines(_message.c_str(), tempRect, ALIGN_CENTRE);
gfxManager._font.writeLines(_message.c_str(), tempRect, ALIGN_CENTER);
gfxManager.unlockSurface();
}
@ -928,7 +928,7 @@ void GfxDialog::setTopLeft(int xp, int yp) {
_bounds.moveTo(xp - 6, yp - 6);
}
void GfxDialog::setCentre(int xp, int yp) {
void GfxDialog::setCenter(int xp, int yp) {
setTopLeft(xp - (_bounds.width() / 2), yp - (_bounds.height() / 2));
}
@ -1355,7 +1355,7 @@ void GfxFont::writeLines(const char *s, const Rect &bounds, TextAlign align) {
writeString(s, numChars);
break;
case ALIGN_CENTRE:
case ALIGN_CENTER:
// Center aligned text
_position.x = bounds.left + (bounds.width() / 2) - (getStringWidth(s, numChars) / 2);
writeString(s, numChars);

10
engines/tsage/graphics.h
View file

@ -48,9 +48,9 @@ public:
void set(int16 x1, int16 y1, int16 x2, int16 y2);
void collapse(int dx, int dy);
void centre(int dx, int dy);
void centre(const Rect &r);
void centre(const Common::Point &pt) { centre(pt.x, pt.y); }
void center(int dx, int dy);
void center(const Rect &r);
void center(const Common::Point &pt) { center(pt.x, pt.y); }
void contain(const Rect &r);
void resize(const GfxSurface &surface, int xp, int yp, int percent);
void expandPanes();
@ -115,7 +115,7 @@ public:
static bool displayText(const Common::String &msg, const Common::Point &pt = Common::Point(160, 100));
};
enum TextAlign {ALIGN_LEFT = 0, ALIGN_CENTRE = 1, ALIGN_RIGHT = 2, ALIGN_JUSTIFIED = 3};
enum TextAlign {ALIGN_LEFT = 0, ALIGN_CENTER = 1, ALIGN_RIGHT = 2, ALIGN_JUSTIFIED = 3};
class GfxFont {
friend class GfxFontBackup;
@ -325,7 +325,7 @@ public:
void add(GfxElement *element);
void addElements(GfxElement *ge, ...);
void setTopLeft(int xp, int yp);
void setCentre(int xp, int yp);
void setCenter(int xp, int yp);
void frame() {
setDefaults();
_bounds.collapse(6, 6);

34
engines/tsage/ringworld_logic.cpp
View file

@ -331,7 +331,7 @@ void SpeakerGText::setText(const Common::String &msg) {
// Set the text
Rect textRect;
_globals->gfxManager()._font.getStringBounds(msg.c_str(), textRect, _textWidth);
textRect.centre(_sceneObject._position.x, _sceneObject._position.y);
textRect.center(_sceneObject._position.x, _sceneObject._position.y);
_textPos.x = textRect.left;
Speaker::setText(msg);
}
@ -438,7 +438,7 @@ SpeakerQText::SpeakerQText() : ScreenSpeaker() {
_textPos = Common::Point(160, 40);
_color1 = 35;
_textWidth = 240;
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
_hideObjects = false;
}
@ -448,7 +448,7 @@ SpeakerSText::SpeakerSText() : ScreenSpeaker() {
_speakerName = "STEXT";
_color1 = 13;
_textWidth = 240;
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
_hideObjects = false;
}
@ -457,7 +457,7 @@ SpeakerSText::SpeakerSText() : ScreenSpeaker() {
SpeakerPOText::SpeakerPOText() : ScreenSpeaker() {
_speakerName = "POTEXT";
_textWidth = 240;
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
_color1 = 41;
_hideObjects = false;
}
@ -468,7 +468,7 @@ SpeakerMText::SpeakerMText() {
_speakerName = "MTEXT";
_color1 = 11;
_textWidth = 160;
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
_hideObjects = false;
}
@ -478,7 +478,7 @@ SpeakerCText::SpeakerCText() {
_speakerName = "CTEXT";
_color1 = 4;
_textWidth = 240;
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
_hideObjects = false;
}
@ -515,7 +515,7 @@ SpeakerHText::SpeakerHText() {
SpeakerSKText::SpeakerSKText() : ScreenSpeaker() {
_speakerName = "SKTEXT";
_textWidth = 240;
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
_color1 = 5;
_hideObjects = false;
}
@ -525,7 +525,7 @@ SpeakerSKText::SpeakerSKText() : ScreenSpeaker() {
SpeakerPText::SpeakerPText() {
_speakerName = "PTEXT";
_textWidth = 240;
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
_color1 = 5;
_hideObjects = false;
}
@ -535,7 +535,7 @@ SpeakerPText::SpeakerPText() {
SpeakerCHFText::SpeakerCHFText() {
_speakerName = "CHFTEXT";
_textWidth = 240;
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
_color1 = 56;
_hideObjects = false;
}
@ -545,7 +545,7 @@ SpeakerCHFText::SpeakerCHFText() {
SpeakerCDRText::SpeakerCDRText() {
_speakerName = "CDRTEXT";
_textWidth = 240;
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
_color1 = 52;
_hideObjects = false;
}
@ -564,7 +564,7 @@ SpeakerFLText::SpeakerFLText() {
SpeakerBatText::SpeakerBatText() {
_speakerName = "BATTEXT";
_textWidth = 240;
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
_color1 = 3;
_hideObjects = false;
}
@ -607,7 +607,7 @@ SpeakerQL::SpeakerQL() : AnimatedSpeaker() {
_newSceneNumber = 2610;
_textPos = Common::Point(160, 30);
_color1 = 35;
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
}
void SpeakerQL::setText(const Common::String &msg) {
@ -639,7 +639,7 @@ SpeakerSR::SpeakerSR() {
_newSceneNumber = 2811;
_textPos = Common::Point(10, 30);
_color1 = 13;
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
}
void SpeakerSR::setText(const Common::String &msg) {
@ -680,7 +680,7 @@ SpeakerSL::SpeakerSL() {
_textPos = Common::Point(140, 30);
_textWidth = 160;
_color1 = 13;
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
}
void SpeakerSL::setText(const Common::String &msg) {
@ -712,7 +712,7 @@ SpeakerQR::SpeakerQR() {
_newSceneNumber = 2611;
_textPos = Common::Point(10, 30);
_color1 = 13;
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
}
void SpeakerQR::setText(const Common::String &msg) {
@ -744,7 +744,7 @@ SpeakerQU::SpeakerQU() {
_newSceneNumber = 7020;
_textPos = Common::Point(160, 30);
_color1 = 35;
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
}
void SpeakerQU::setText(const Common::String &msg) {
@ -833,7 +833,7 @@ SpeakerSAL::SpeakerSAL() {
_newSceneNumber = 2851;
_textPos = Common::Point(10, 30);
_color1 = 13;
_textMode = ALIGN_CENTRE;
_textMode = ALIGN_CENTER;
}
void SpeakerSAL::setText(const Common::String &msg) {

4
engines/tsage/ringworld_scenes1.cpp
View file

@ -605,7 +605,7 @@ void Scene20::postInit(SceneObjectList *OwnerList) {
setAction(&_action4);
}
_sceneBounds.centre(_globals->_player._position.x, _globals->_player._position.y);
_sceneBounds.center(_globals->_player._position.x, _globals->_player._position.y);
}
_globals->_player.disableControl();
@ -2397,7 +2397,7 @@ void Scene60::signal() {
_globals->_events.setCursor(CURSOR_USE);
_gfxButton.setText(EXIT_MSG);
_gfxButton._bounds.centre(160, 193);
_gfxButton._bounds.center(160, 193);
_gfxButton.draw();
_gfxButton._bounds.expandPanes();
} else {

8
engines/tsage/ringworld_scenes10.cpp
View file

@ -1228,7 +1228,7 @@ void Scene9700::signal() {
case 9701:
case 9702:
_gfxButton1.setText(EXIT_MSG);
_gfxButton1._bounds.centre(50, 190);
_gfxButton1._bounds.center(50, 190);
_gfxButton1.draw();
_gfxButton1._bounds.expandPanes();
_globals->_player.enableControl();
@ -1702,7 +1702,7 @@ void Scene9900::strAction2::signal() {
_txtArray1Index = (_txtArray1Index + 1) % 2;
}
_var3 = 1;
_txtArray1[_txtArray1Index]._textMode = ALIGN_CENTRE;
_txtArray1[_txtArray1Index]._textMode = ALIGN_CENTER;
_txtArray1[_txtArray1Index]._width = 240;
_txtArray1[_txtArray1Index]._fontNumber = 2;
_txtArray1[_txtArray1Index]._color1 = 7;
@ -1717,7 +1717,7 @@ void Scene9900::strAction2::signal() {
Common::Point pt2(_txtArray1[_txtArray1Index]._position.x, 100);
_txtArray1[_txtArray1Index].addMover(mover2, &pt2, 0);
_txtArray2[_txtArray1Index]._textMode = ALIGN_CENTRE;
_txtArray2[_txtArray1Index]._textMode = ALIGN_CENTER;
_txtArray2[_txtArray1Index]._width = 240;
_txtArray2[_txtArray1Index]._fontNumber = 2;
_txtArray2[_txtArray1Index]._color1 = 23;
@ -2048,7 +2048,7 @@ void Scene9999::postInit(SceneObjectList *OwnerList) {
else
setAction(&_action1);
_globals->_sceneManager._scene->_sceneBounds.centre(_globals->_player._position.x, _globals->_player._position.y);
_globals->_sceneManager._scene->_sceneBounds.center(_globals->_player._position.x, _globals->_player._position.y);
_globals->_sceneManager._scene->_sceneBounds.contain(_globals->_sceneManager._scene->_backgroundBounds);
_globals->_sceneOffset.x = (_globals->_sceneManager._scene->_sceneBounds.left / 160) * 160;

8
engines/tsage/ringworld_scenes2.cpp
View file

@ -266,7 +266,7 @@ void Scene1000::postInit(SceneObjectList *OwnerList) {
setAction(&_action2);
_globals->_sceneManager._scene->_sceneBounds.centre(_object1._position.x, _object1._position.y);
_globals->_sceneManager._scene->_sceneBounds.center(_object1._position.x, _object1._position.y);
_globals->_sceneManager._scene->_sceneBounds.contain(_globals->_sceneManager._scene->_backgroundBounds);
_globals->_sceneOffset.x = (_globals->_sceneManager._scene->_sceneBounds.left / 160) * 160;
@ -280,7 +280,7 @@ void Scene1000::postInit(SceneObjectList *OwnerList) {
_object1._moveDiff = Common::Point(2, 2);
_object1.setPosition(Common::Point(120, 180));
_globals->_sceneManager._scene->_sceneBounds.centre(_object1._position.x, _object1._position.y);
_globals->_sceneManager._scene->_sceneBounds.center(_object1._position.x, _object1._position.y);
_globals->_sceneManager._scene->_sceneBounds.contain(_globals->_sceneManager._scene->_backgroundBounds);
_globals->_sceneOffset.x = (_globals->_sceneManager._scene->_sceneBounds.left / 160) * 160;
@ -301,7 +301,7 @@ void Scene1000::postInit(SceneObjectList *OwnerList) {
_globals->_player.hide();
_globals->_player.disableControl();
_globals->_sceneManager._scene->_sceneBounds.centre(_object3._position.x, _object3._position.y);
_globals->_sceneManager._scene->_sceneBounds.center(_object3._position.x, _object3._position.y);
setAction(&_action3);
}
@ -776,7 +776,7 @@ void Scene1400::postInit(SceneObjectList *OwnerList) {
_globals->_player._moveDiff = Common::Point(4, 2);
_globals->_player.setPosition(Common::Point(160, 800));
_globals->_sceneManager._scene->_sceneBounds.centre(_globals->_player._position);
_globals->_sceneManager._scene->_sceneBounds.center(_globals->_player._position);
_globals->_sceneManager._scene->_sceneBounds.contain(_globals->_sceneManager._scene->_backgroundBounds);
_globals->_sceneOffset.y = (_globals->_sceneManager._scene->_sceneBounds.top / 100) * 100;

8
engines/tsage/ringworld_scenes3.cpp
View file

@ -3118,7 +3118,7 @@ void Scene2222::postInit(SceneObjectList *OwnerList) {
}
_soundHandler.startSound(116);
_globals->_sceneManager._scene->_sceneBounds.centre(_hotspot1._position);
_globals->_sceneManager._scene->_sceneBounds.center(_hotspot1._position);
_globals->_sceneManager._scene->_sceneBounds.contain(_globals->_sceneManager._scene->_backgroundBounds);
_globals->_sceneOffset.x = (_globals->_sceneManager._scene->_sceneBounds.left / 160) * 160;
@ -4875,7 +4875,7 @@ void Scene2310::signal() {
Common::String msg = Common::String::format(fmtString.c_str(), _pageList[_pageIndex]._pageNumber);
_sceneText._width = 280;
_sceneText._textMode = ALIGN_CENTRE;
_sceneText._textMode = ALIGN_CENTER;
_sceneText._color1 = 35;
_sceneText._fontNumber = 2;
_sceneText.setup(msg);
@ -5971,7 +5971,7 @@ void Scene2320::postInit(SceneObjectList *OwnerList) {
}
_globals->_stripNum = 0;
_globals->_sceneManager._scene->_sceneBounds.centre(_globals->_player._position);
_globals->_sceneManager._scene->_sceneBounds.center(_globals->_player._position);
loadScene(2320);
_hotspot14._sceneRegionId = 8;
@ -6088,7 +6088,7 @@ void Scene2400::postInit(SceneObjectList *OwnerList) {
setAction(&_action1);
_globals->_sceneManager._scene->_sceneBounds.centre(_globals->_player._position.x, _globals->_player._position.y);
_globals->_sceneManager._scene->_sceneBounds.center(_globals->_player._position.x, _globals->_player._position.y);
_globals->_sceneManager._scene->_sceneBounds.contain(_globals->_sceneManager._scene->_backgroundBounds);
_globals->_sceneOffset.x = (_globals->_sceneManager._scene->_sceneBounds.left / 160) * 160;

4
engines/tsage/ringworld_scenes5.cpp
View file

@ -1594,7 +1594,7 @@ void Scene4025::signal() {
if (_sceneMode != 4027) {
if (_sceneMode != 4028) {
_gfxButton.setText(EXIT_MSG);
_gfxButton._bounds.centre(144, 107);
_gfxButton._bounds.center(144, 107);
_gfxButton.draw();
_gfxButton._bounds.expandPanes();
}
@ -4108,7 +4108,7 @@ void Scene4300::signal() {
_hotspot14.setPosition(Common::Point(60, 199));
_gfxButton.setText(EXIT_MSG);
_gfxButton._bounds.centre(60, 193);
_gfxButton._bounds.center(60, 193);
_gfxButton.draw();
_gfxButton._bounds.expandPanes();

4
engines/tsage/ringworld_scenes6.cpp
View file

@ -1277,7 +1277,7 @@ void Scene5100::postInit(SceneObjectList *OwnerList) {
_hotspot15.setPosition(Common::Point(977, 173));
_hotspot15.setPriority2(1);
_globals->_sceneManager._scene->_sceneBounds.centre(_globals->_player._position);
_globals->_sceneManager._scene->_sceneBounds.center(_globals->_player._position);
loadScene(5100);
_globals->_soundHandler.startSound(205);
}
@ -1703,7 +1703,7 @@ void Scene5200::postInit(SceneObjectList *OwnerList) {
_hotspot10._sceneRegionId = 9;
_globals->_sceneItems.addItems(&_hotspot12, &_hotspot13, &_hotspot9, &_hotspot10, &_hotspot11, NULL);
_globals->_sceneManager._scene->_sceneBounds.centre(_globals->_player._position);
_globals->_sceneManager._scene->_sceneBounds.center(_globals->_player._position);
loadScene(5200);
}

6
engines/tsage/ringworld_scenes8.cpp
View file

@ -1578,7 +1578,7 @@ void Scene7600::postInit(SceneObjectList *OwnerList) {
_globals->_player.setPosition(Common::Point(-50, 195));
setAction(&_action1);
}
_sceneBounds.centre(_globals->_player._position.x, _globals->_player._position.y);
_sceneBounds.center(_globals->_player._position.x, _globals->_player._position.y);
loadScene(7600);
_soundHandler2.startSound(255);
_soundHandler1.startSound(251);
@ -2045,7 +2045,7 @@ void Scene7700::Object8::doAction(int action) {
scene->_object14.setPosition(Common::Point(139, 151), 0);
scene->_gfxButton.setText(EXIT_MSG);
scene->_gfxButton._bounds.centre(140, 189);
scene->_gfxButton._bounds.center(140, 189);
scene->_gfxButton.draw();
scene->_gfxButton._bounds.expandPanes();
@ -2059,7 +2059,7 @@ void Scene7700::Object8::doAction(int action) {
scene->_object15.setPriority2(200);
scene->_gfxButton.setText(EXIT_MSG);
scene->_gfxButton._bounds.centre(140, 186);
scene->_gfxButton._bounds.center(140, 186);
scene->_gfxButton.draw();
scene->_gfxButton._bounds.expandPanes();

4
engines/tsage/tsage.h
View file

@ -61,8 +61,8 @@ struct tSageGameDescription;
#define SCREEN_WIDTH 320
#define SCREEN_HEIGHT 200
#define SCREEN_CENTRE_X 160
#define SCREEN_CENTRE_Y 100
#define SCREEN_CENTER_X 160
#define SCREEN_CENTER_Y 100
class TSageEngine : public Engine {
private: