diff options
author | Paul Gilbert | 2016-04-26 22:18:21 -0400 |
---|---|---|
committer | Paul Gilbert | 2016-07-10 16:12:05 -0400 |
commit | 34c32e38e2659406e3556f752fcada8491860e92 (patch) | |
tree | c9f2e355504d97376cf8437133415a7f0a606dc6 /engines/titanic/pet_control | |
parent | b114c768cd592462794d4fa2a397473cf146656c (diff) | |
download | scummvm-rg350-34c32e38e2659406e3556f752fcada8491860e92.tar.gz scummvm-rg350-34c32e38e2659406e3556f752fcada8491860e92.tar.bz2 scummvm-rg350-34c32e38e2659406e3556f752fcada8491860e92.zip |
TITANIC: More font logic, beginnings of text cursor
Diffstat (limited to 'engines/titanic/pet_control')
-rw-r--r-- | engines/titanic/pet_control/pet_text.cpp | 7 | ||||
-rw-r--r-- | engines/titanic/pet_control/pet_text.h | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engines/titanic/pet_control/pet_text.cpp b/engines/titanic/pet_control/pet_text.cpp index 7f5a5eaed9..77019d7f2d 100644 --- a/engines/titanic/pet_control/pet_text.cpp +++ b/engines/titanic/pet_control/pet_text.cpp @@ -30,7 +30,7 @@ CPetText::CPetText(uint count) : _backR(0xff), _backG(0xff), _backB(0xff), _textR(0), _textG(0), _textB(200), _fontNumber2(0), _field64(0), _field68(0), _field6C(0), - _hasBorder(true), _field74(0), _field78(0), _field7C(0) { + _hasBorder(true), _field74(0), _textCursor(nullptr), _field7C(0) { setupArrays(count); } @@ -140,9 +140,8 @@ void CPetText::draw(CScreenManager *screenManager) { tempRect.grow(-2); screenManager->setFontNumber(_fontNumber2); -// int var14 = 0; -// screenManager->writeLines(0, &var14, _field74, ) - warning("TODO: CPetText_Draw"); + screenManager->writeString(0, tempRect, _field74, _lines, _textCursor); + screenManager->setFontNumber(_fontNumber1); } diff --git a/engines/titanic/pet_control/pet_text.h b/engines/titanic/pet_control/pet_text.h index 35d48974dd..6ce1903166 100644 --- a/engines/titanic/pet_control/pet_text.h +++ b/engines/titanic/pet_control/pet_text.h @@ -25,6 +25,7 @@ #include "titanic/support/simple_file.h" #include "titanic/support/screen_manager.h" +#include "titanic/support/text_cursor.h" namespace Titanic { @@ -57,7 +58,7 @@ private: int _field6C; bool _hasBorder; int _field74; - int _field78; + CTextCursor *_textCursor; int _field7C; private: void setupArrays(int count); |