thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BLADERUNNER: Removed compile time macros, added synch with GUI

Browse source
This commit is contained in:
Thanasis Antoniou 2018-07-02 10:45:17 +03:00 • committed by Eugene Sandulenko
parent a86625700f
commit f101906bc2
17 changed files with 129 additions and 243 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engines/bladerunner/text_resource.cpp
View file

@ -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;