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

HOPKINS: Initialize censorship based on per-engine GUI option instead of optional text flag

Browse source
This commit is contained in:
Strangerke 2014-02-02 16:20:17 +01:00
parent ea9fee35e8
commit 6bcc8dfee6
3 changed files with 45 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
engines/hopkins/files.cpp
View file

@ -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");
}
/**