diff options
| author | Filippos Karapetis | 2007-05-01 21:40:56 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2007-05-01 21:40:56 +0000 |
| commit | d08eeff7002d7296b2367242b66ca2e03c1ce4a1 (patch) | |
| tree | 47472179a8ac372153eb12c50151e49b72e9c4e7 | |
| parent | 40f43a687be84baec357e55f9d1a01ecfe829bfa (diff) | |
| download | scummvm-rg350-d08eeff7002d7296b2367242b66ca2e03c1ce4a1.tar.gz scummvm-rg350-d08eeff7002d7296b2367242b66ca2e03c1ce4a1.tar.bz2 scummvm-rg350-d08eeff7002d7296b2367242b66ca2e03c1ce4a1.zip | |
Renamed decodeILBM to decodePBM, removed a TODO
svn-id: r26731
| -rw-r--r-- | engines/saga/scene.cpp | 2 | ||||
| -rw-r--r-- | graphics/iff.cpp | 2 | ||||
| -rw-r--r-- | graphics/iff.h | 6 |
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); /* |