diff options
Diffstat (limited to 'engines/bladerunner/font.h')
| -rw-r--r-- | engines/bladerunner/font.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/engines/bladerunner/font.h b/engines/bladerunner/font.h index 4d43aaa875..4f1f1e9788 100644 --- a/engines/bladerunner/font.h +++ b/engines/bladerunner/font.h @@ -24,9 +24,7 @@ #define BLADERUNNER_FONT_H #include "bladerunner/bladerunner.h" // needed for definition of Common::ScopedPtr (subtitles font external font file support) -- and for the subtitles relevant macro defines -#if SUBTITLES_SUPPORT #include "common/util.h" -#endif #include "common/str.h" namespace Graphics { @@ -65,19 +63,17 @@ public: Font(BladeRunnerEngine *vm); ~Font(); - #if SUBTITLES_SUPPORT - #if SUBTITLES_EXTERNAL_FONT + #if BLADERUNNER_SUBTITLES_EXTERNAL_FONT bool openFromStream(Common::ScopedPtr<Common::SeekableReadStream> &s, int screenWidth, int screenHeight, int spacing1, int spacing2, uint16 color); - #endif // SUBTITLES_EXTERNAL_FONT - #endif // SUBTITLES_SUPPORT + #endif // BLADERUNNER_SUBTITLES_EXTERNAL_FONT bool open(const Common::String &fileName, int screenWidth, int screenHeight, int spacing1, int spacing2, uint16 color); void close(); void setSpacing(int spacing1, int spacing2); void setColor(uint16 color); - #if SUBTITLES_SUPPORT - void setBlackColor(); // for subtitles - #endif + #if !BLADERUNNER_SUBTITLES_EXTERNAL_FONT + void setBlackColor(); // for subtitles (when using internal font) - emulate shadows + #endif // !BLADERUNNER_SUBTITLES_EXTERNAL_FONT void draw(const Common::String &text, Graphics::Surface &surface, int x, int y) const; void drawColor(const Common::String &text, Graphics::Surface &surface, int x, int y, uint16 color); |