diff options
| author | Strangerke | 2014-02-02 16:20:17 +0100 |
|---|---|---|
| committer | Strangerke | 2014-02-02 16:20:17 +0100 |
| commit | 6bcc8dfee62b9781758017a3a54df0b69c77479e (patch) | |
| tree | 47f637af72a1596c14ccf9f538f2ba1b39acc7f6 /engines/hopkins/files.cpp | |
| parent | ea9fee35e80bcbb5040da4ea7d8de48d2fa339ae (diff) | |
| download | scummvm-rg350-6bcc8dfee62b9781758017a3a54df0b69c77479e.tar.gz scummvm-rg350-6bcc8dfee62b9781758017a3a54df0b69c77479e.tar.bz2 scummvm-rg350-6bcc8dfee62b9781758017a3a54df0b69c77479e.zip | |
HOPKINS: Initialize censorship based on per-engine GUI option instead of optional text flag
Diffstat (limited to 'engines/hopkins/files.cpp')
| -rw-r--r-- | engines/hopkins/files.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/engines/hopkins/files.cpp b/engines/hopkins/files.cpp index 2390ebbdf8..51d11afd91 100644 --- a/engines/hopkins/files.cpp +++ b/engines/hopkins/files.cpp @@ -25,6 +25,7 @@ #include "hopkins/hopkins.h" #include "hopkins/globals.h" +#include "common/config-manager.h" #include "common/system.h" #include "common/debug.h" #include "common/file.h" @@ -68,20 +69,11 @@ int FileManager::readStream(Common::ReadStream &stream, void *buf, size_t nbytes } /** - * Initialize censorship based on blood.dat file + * The original censorship was based on blood.dat file. + * It's now using the config manager and a per-engine GUI option. */ void FileManager::initCensorship() { - _vm->_globals->_censorshipFl = false; - - // If file doesn't exist, fallback to uncensored - if (fileExists("BLOOD.DAT")) { - char *data = (char *)loadFile("BLOOD.DAT"); - - if ((data[6] == 'u' && data[7] == 'k') || (data[6] == 'U' && data[7] == 'K')) - _vm->_globals->_censorshipFl = true; - - _vm->_globals->freeMemory((byte *)data); - } + _vm->_globals->_censorshipFl = ConfMan.getBool("enable_gore"); } /** |