diff options
author | Strangerke | 2015-12-20 01:21:06 +0100 |
---|---|---|
committer | Willem Jan Palenstijn | 2015-12-23 21:35:30 +0100 |
commit | b9326e3850c96539243763d7b5b67f9d94a4a397 (patch) | |
tree | fc35d9041debee95d9071261f55fd8fa44ae2aad /engines/lab/dispman.h | |
parent | a2097d2a2eb9d7abfcb4f73b1c45c3778f39f3ca (diff) | |
download | scummvm-rg350-b9326e3850c96539243763d7b5b67f9d94a4a397.tar.gz scummvm-rg350-b9326e3850c96539243763d7b5b67f9d94a4a397.tar.bz2 scummvm-rg350-b9326e3850c96539243763d7b5b67f9d94a4a397.zip |
LAB: Refactor some DispMan functions to use Common::String
Diffstat (limited to 'engines/lab/dispman.h')
-rw-r--r-- | engines/lab/dispman.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/lab/dispman.h b/engines/lab/dispman.h index 518a4f745b..e2b935927d 100644 --- a/engines/lab/dispman.h +++ b/engines/lab/dispman.h @@ -62,7 +62,7 @@ private: uint16 fadeNumIn(uint16 num, uint16 res, uint16 counter); uint16 fadeNumOut(uint16 num, uint16 res, uint16 counter); - Common::String getWord(const char *mainBuffer, uint16 *wordWidth); + Common::String getWord(const char *mainBuffer); byte _curPen; Common::File *_curBitmap; @@ -88,8 +88,8 @@ public: void createBox(uint16 y2); void drawPanel(); void setUpScreens(); - int32 longDrawMessage(const char *str); - void drawMessage(const char *str); + int32 longDrawMessage(Common::String str); + void drawMessage(Common::String str); void setPen(byte pennum); void rectFill(uint16 x1, uint16 y1, uint16 x2, uint16 y2); void rectFill(Common::Rect fillRect); @@ -131,9 +131,9 @@ public: void scrollDisplayY(int16 dy, uint16 x1, uint16 y1, uint16 x2, uint16 y2, byte *buffer); void fade(bool fadein, uint16 res); void closeFont(TextFont **font); - uint16 textLength(TextFont *font, const char *text, uint16 numChars); + uint16 textLength(TextFont *font, Common::String text); uint16 textHeight(TextFont *tf); - void drawText(TextFont *tf, uint16 x, uint16 y, uint16 color, const char *text, uint16 numChars); + void drawText(TextFont *tf, uint16 x, uint16 y, uint16 color, Common::String text); Common::String getLine(TextFont *tf, const char **mainBuffer, uint16 lineWidth); bool _longWinInFront; |