diff options
| author | Joost Peters | 2003-05-31 23:42:23 +0000 |
|---|---|---|
| committer | Joost Peters | 2003-05-31 23:42:23 +0000 |
| commit | 6b64849acd337a3be4433bf79fe89f8bb2e30289 (patch) | |
| tree | 02fa7a0dbb160d1ba3f62094f7289681517539d4 /sky | |
| parent | 3323aa4212d33dc87bf02c2824e92e8b8a181ca7 (diff) | |
| download | scummvm-rg350-6b64849acd337a3be4433bf79fe89f8bb2e30289.tar.gz scummvm-rg350-6b64849acd337a3be4433bf79fe89f8bb2e30289.tar.bz2 scummvm-rg350-6b64849acd337a3be4433bf79fe89f8bb2e30289.zip | |
fixed sillty mistakes - must've been on crack when I coded this..
svn-id: r8199
Diffstat (limited to 'sky')
| -rw-r--r-- | sky/logic.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sky/logic.cpp b/sky/logic.cpp index e96937670b..feea4c0dd5 100644 --- a/sky/logic.cpp +++ b/sky/logic.cpp @@ -2091,10 +2091,10 @@ void SkyLogic::stdSpeak(Compact *target, uint32 textNum, uint32 animNum, uint32 xPos += width - (FIXED_TEXT_WIDTH / 2); //middle of talker - if (xPos > TOP_LEFT_X) + if (xPos < TOP_LEFT_X) xPos = TOP_LEFT_X; - width += FIXED_TEXT_WIDTH; + width = xPos + FIXED_TEXT_WIDTH; if ((TOP_LEFT_X + FULL_SCREEN_WIDTH) <= width) { xPos = TOP_LEFT_X + FULL_SCREEN_WIDTH; xPos -= FIXED_TEXT_WIDTH; @@ -2103,7 +2103,7 @@ void SkyLogic::stdSpeak(Compact *target, uint32 textNum, uint32 animNum, uint32 _compact->xcood = xPos; uint16 yPos = target->ycood + ((struct dataFileHeader *)targetGfx)->s_offset_y - 6 - ((struct dataFileHeader *)textGfx)->s_height; - if (yPos > TOP_LEFT_Y) + if (yPos < TOP_LEFT_Y) yPos = TOP_LEFT_Y; _compact->ycood = yPos; |