diff options
| -rw-r--r-- | scumm/scumm.h | 2 | ||||
| -rw-r--r-- | scumm/scummvm.cpp | 18 |
2 files changed, 0 insertions, 20 deletions
diff --git a/scumm/scumm.h b/scumm/scumm.h index 4c894b4976..1690448ade 100644 --- a/scumm/scumm.h +++ b/scumm/scumm.h @@ -265,8 +265,6 @@ public: byte _version; uint32 _features; // Should only be accessed for reading (TODO enforce it compiler-wise with making it private and creating an accessor) - void setFeatures (uint32 newFeatures); // Changes the features set. This allows some gamewide stuff to be precalculated/prepared (ie CostumeRenderer) - /** Random number generator */ Common::RandomSource _rnd; diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp index a5dc1d877d..b33f1cf502 100644 --- a/scumm/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -993,24 +993,6 @@ void ScummEngine::launch() { _saveLoadFlag = 0; } -void ScummEngine::setFeatures(uint32 newFeatures) { - bool amigaPalette = (_features & GF_AMIGA) != 0; - bool newAmigaPalette = (newFeatures & GF_AMIGA) != 0; - - if ((_features ^ newFeatures) & ~GF_AMIGA) { - error("setFeatures may only be used to toggle GF_AMIGA flag!"); - } - - _features = newFeatures; - - if ((_features & GF_16COLOR) && amigaPalette != newAmigaPalette) { - if (_features & GF_AMIGA) - setupAmigaPalette(); - else - setupEGAPalette(); - } -} - void ScummEngine::scummInit() { int i; |