diff options
| author | Thanasis Antoniou | 2018-07-02 10:45:17 +0300 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-12-25 12:35:52 +0100 |
| commit | f101906bc2d654c80ccadbf560261727759eea0c (patch) | |
| tree | fc6832ffc32aca995d0a9ecee49d2bc1575b35bc /engines/bladerunner/text_resource.cpp | |
| parent | a86625700fe69ff27e0f704a41307cdd2135a6a8 (diff) | |
| download | scummvm-rg350-f101906bc2d654c80ccadbf560261727759eea0c.tar.gz scummvm-rg350-f101906bc2d654c80ccadbf560261727759eea0c.tar.bz2 scummvm-rg350-f101906bc2d654c80ccadbf560261727759eea0c.zip | |
BLADERUNNER: Removed compile time macros, added synch with GUI
Diffstat (limited to 'engines/bladerunner/text_resource.cpp')
| -rw-r--r-- | engines/bladerunner/text_resource.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/engines/bladerunner/text_resource.cpp b/engines/bladerunner/text_resource.cpp index b7ae136455..1c77baf6f4 100644 --- a/engines/bladerunner/text_resource.cpp +++ b/engines/bladerunner/text_resource.cpp @@ -43,7 +43,6 @@ TextResource::~TextResource() { delete[] _strings; } -#if SUBTITLES_SUPPORT // for TRE subtitles support bool TextResource::openFromStream(Common::ScopedPtr<Common::SeekableReadStream> &s) { @@ -85,7 +84,6 @@ bool TextResource::openFromStream(Common::ScopedPtr<Common::SeekableReadStream> return true; } -#endif bool TextResource::open(const Common::String &name) { assert(name.size() <= 8); @@ -142,19 +140,17 @@ const char *TextResource::getText(uint32 id) const { return ""; } -#if SUBTITLES_SUPPORT const char *TextResource::getOuttakeTextByFrame(uint32 frame) const { for (uint32 i = 0; i != _count; ++i) { - //debug("Checking %d - so within: %d , %d", _ids[i], (0x0000FFFF & _ids[i]), ((_ids[i] >> 16) & 0x0000FFFF ) ); + //debug("Checking %d - so within: %d , %d", _ids[i], (0x0000FFFF & _ids[i]), ((_ids[i] >> 16) & 0x0000FFFF ) ); if ((frame >= (0x0000FFFF & _ids[i]) ) && (frame < ((_ids[i] >> 16) & 0x0000FFFF ) )){ - // we found an id with lower 16bits smaller or equal to our frame key - // and with higher 16 bits higher than the frame key + // we found an id with lower 16bits smaller or equal to our frame key + // and with higher 16 bits higher than the frame key return _strings + _offsets[i]; } } return ""; } -#endif int TextResource::getCount() const { return _count; |