aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--engines/saga/scene.cpp2
-rw-r--r--graphics/iff.cpp2
-rw-r--r--graphics/iff.h6
3 files changed, 3 insertions, 7 deletions
diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp
index bbe6b92c2b..20dab8023f 100644
--- a/engines/saga/scene.cpp
+++ b/engines/saga/scene.cpp
@@ -437,7 +437,7 @@ void Scene::changeScene(int16 sceneNumber, int actorsEntrance, SceneTransitionTy
_vm->_interface->setMode(kPanelSceneSubstitute);
if (file.open(sceneSubstitutes[i].image)) {
- Graphics::decodeILBM(file, bbmBuffer, pal);
+ Graphics::decodePBM(file, bbmBuffer, pal);
colors = pal;
rect.setWidth(bbmBuffer.w);
rect.setHeight(bbmBuffer.h);
diff --git a/graphics/iff.cpp b/graphics/iff.cpp
index c45a9eb850..7ab34e2989 100644
--- a/graphics/iff.cpp
+++ b/graphics/iff.cpp
@@ -304,7 +304,7 @@ void PackBitsReadStream::unpack() {
}
-void decodeILBM(Common::ReadStream &input, Surface &surface, byte *&colors) {
+void decodePBM(Common::ReadStream &input, Surface &surface, byte *&colors) {
PBMDecoder decoder(input, surface, colors);
decoder.decode();
}
diff --git a/graphics/iff.h b/graphics/iff.h
index 740f4b6d8c..322c372592 100644
--- a/graphics/iff.h
+++ b/graphics/iff.h
@@ -92,11 +92,7 @@ public:
void decode();
};
-/*
- TODO: rename this routine to decodePBM, and update the SAGA code that's
- using it. The routine has already been implemented using the above PBMDecoder.
-*/
-void decodeILBM(Common::ReadStream &input, Surface &surface, byte *&colors);
+void decodePBM(Common::ReadStream &input, Surface &surface, byte *&colors);
/*