libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-02 23:01:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SWORD1: PSX: Implement (mostly) accurate text positioning

Browse Source 
I say "mostly" because I still have off-by-one positioning inaccuracies,
and navigating the PSX disasm is very tiresome... I'm not even sure
we are rendering sprites in the correct position anymore... Argh!
This commit is contained in:
AndywinXp 2023-09-29 00:01:52 +02:00
parent 0f6773217c
commit 85f63350ba
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/sword1/logic.cpp
View File

@ -1206,7 +1206,11 @@ int Logic::fnISpeak(Object *cpt, int32 id, int32 cdt, int32 textNo, int32 spr, i
// now set text coords, above the player, usually
int textMargin = SwordEngine::_systemVars.isDemo ? 5 : 3; // distance kept from edges of screen
int aboveHead = SwordEngine::_systemVars.isDemo ? 10 : 20; // distance kept above talking sprite
if (SwordEngine::isPsx())
textMargin = 33;
int aboveHead = (SwordEngine::_systemVars.isDemo || SwordEngine::isPsx()) ? 10 : 20; // distance kept above talking sprite
uint16 textX, textY;
if (((id == GEORGE) || ((id == NICO) && (_scriptVars[SCREEN] == 10))) && (!cpt->o_anim_resource)) {
// if George is doing Voice-Over text (centered at the bottom of the screen)

18
engines/sword1/text.cpp
View File

@ -61,6 +61,10 @@ Text::Text(SwordEngine *vm, Logic *pLogic, ObjectMan *pObjMan, ResMan *pResMan,
}
_charHeight = _resMan->getUint16(_resMan->fetchFrame(_font, 0)->height); // all chars have the same height
if (SwordEngine::isPsx())
_charHeight /= 2;
for (int i = 0; i < MAX_TEXT_OBS; i++)
_textBlocks[i] = NULL;
}
@ -98,6 +102,11 @@ void Text::makeTextSprite(uint8 slot, const uint8 *text, uint16 maxWidth, uint8
sprWidth = lines[lineCnt].width;
uint16 sprHeight = _charHeight * numLines;
if (SwordEngine::isPsx()) {
sprHeight = 2 * _charHeight * numLines - 4 * (numLines - 1);
sprWidth = (sprWidth + 1) & 0xFFFE;
}
uint32 sprSize = sprWidth * sprHeight;
assert(!_textBlocks[slot]); // if this triggers, the speechDriver failed to call Text::releaseText.
_textBlocks[slot] = (FrameHeader *)malloc(sprSize + sizeof(FrameHeader));
@ -133,8 +142,8 @@ void Text::makeTextSprite(uint8 slot, const uint8 *text, uint16 maxWidth, uint8
curTextLine++; // skip space at the end of the line
text += lines[lineCnt].length + 1;
if (SwordEngine::isPsx()) //Chars are half height in psx version
linePtr += (_charHeight / 2) * sprWidth;
if (SwordEngine::isPsx())
linePtr += (_charHeight - 4) * sprWidth;
else
linePtr += _charHeight * sprWidth;
}
@ -148,8 +157,11 @@ uint16 Text::charWidth(uint8 ch) {
uint16 Text::analyzeSentence(const uint8 *text, uint16 maxWidth, LineInfo *line) {
uint16 lineNo = 0;
bool firstWord = true;
if (SwordEngine::isPsx())
maxWidth = 254;
while (*text) {
uint16 wordWidth = 0;
uint16 wordLength = 0;