aboutsummaryrefslogtreecommitdiff
path: root/engines/bladerunner/text_resource.h
diff options
context:
space:
mode:
authorThanasis Antoniou2018-07-02 10:45:17 +0300
committerEugene Sandulenko2018-12-25 12:35:52 +0100
commitf101906bc2d654c80ccadbf560261727759eea0c (patch)
treefc6832ffc32aca995d0a9ecee49d2bc1575b35bc /engines/bladerunner/text_resource.h
parenta86625700fe69ff27e0f704a41307cdd2135a6a8 (diff)
downloadscummvm-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.h')
-rw-r--r--engines/bladerunner/text_resource.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/engines/bladerunner/text_resource.h b/engines/bladerunner/text_resource.h
index be399bf2d8..33a8f98de8 100644
--- a/engines/bladerunner/text_resource.h
+++ b/engines/bladerunner/text_resource.h
@@ -23,10 +23,8 @@
#ifndef BLADERUNNER_TEXT_RESOURCE_H
#define BLADERUNNER_TEXT_RESOURCE_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 "bladerunner/bladerunner.h" // needed for definition of Common::ScopedPtr (subtitles font external font file support)
#include "common/util.h"
-#endif
#include "common/str.h"
namespace BladeRunner {
@@ -47,14 +45,10 @@ public:
~TextResource();
bool open(const Common::String &name);
- #if SUBTITLES_SUPPORT
bool openFromStream(Common::ScopedPtr<Common::SeekableReadStream> &s);
- #endif
-
+
const char *getText(uint32 id) const;
- #if SUBTITLES_SUPPORT
const char *getOuttakeTextByFrame(uint32 frame) const;
- #endif
int getCount() const;
};