aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2004-01-04 13:46:53 +0000
committerMax Horn2004-01-04 13:46:53 +0000
commitb8a260c967ad10c1fbd5ff434113c2d71ae4f044 (patch)
treee3b4e35acb4c23b50095a5ea53d0e558b13cef3d /scumm
parent805f5124529dc3c1faf1eaae23d797b1c5eed1eb (diff)
downloadscummvm-rg350-b8a260c967ad10c1fbd5ff434113c2d71ae4f044.tar.gz
scummvm-rg350-b8a260c967ad10c1fbd5ff434113c2d71ae4f044.tar.bz2
scummvm-rg350-b8a260c967ad10c1fbd5ff434113c2d71ae4f044.zip
removed setFeatures (not needed anymore)
svn-id: r12132
Diffstat (limited to 'scumm')
-rw-r--r--scumm/scumm.h2
-rw-r--r--scumm/scummvm.cpp18
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;