diff options
author | richiesams | 2013-07-29 15:05:37 -0500 |
---|---|---|
committer | richiesams | 2013-08-04 13:32:44 -0500 |
commit | 564379d3eed127fd6c41a9a42bb149afbc7fb75e (patch) | |
tree | fc3875a8843e513db374e32453137962a2659a24 | |
parent | 48b9741f413fb32ed5efedfe248093be811678c6 (diff) | |
download | scummvm-rg350-564379d3eed127fd6c41a9a42bb149afbc7fb75e.tar.gz scummvm-rg350-564379d3eed127fd6c41a9a42bb149afbc7fb75e.tar.bz2 scummvm-rg350-564379d3eed127fd6c41a9a42bb149afbc7fb75e.zip |
ZVISION: Create method to get RenderTable object pointer from RenderManager
Remove passthrough methods
-rw-r--r-- | engines/zvision/console.cpp | 6 | ||||
-rw-r--r-- | engines/zvision/render_manager.cpp | 4 | ||||
-rw-r--r-- | engines/zvision/render_manager.h | 7 |
3 files changed, 6 insertions, 11 deletions
diff --git a/engines/zvision/console.cpp b/engines/zvision/console.cpp index bfe2609777..12555fe3cc 100644 --- a/engines/zvision/console.cpp +++ b/engines/zvision/console.cpp @@ -108,11 +108,11 @@ bool Console::cmdSetRenderState(int argc, const char **argv) { Common::String renderState(argv[1]); if (renderState.matchString("panorama", true)) - _engine->getRenderManager()->setRenderState(RenderTable::PANORAMA); + _engine->getRenderManager()->getRenderTable()->setRenderState(RenderTable::PANORAMA); else if (renderState.matchString("tilt", true)) - _engine->getRenderManager()->setRenderState(RenderTable::TILT); + _engine->getRenderManager()->getRenderTable()->setRenderState(RenderTable::TILT); else if (renderState.matchString("flat", true)) - _engine->getRenderManager()->setRenderState(RenderTable::FLAT); + _engine->getRenderManager()->getRenderTable()->setRenderState(RenderTable::FLAT); else DebugPrintf("Use setrenderstate <RenderState: panorama, tilt, flat> to change the current render state\n"); diff --git a/engines/zvision/render_manager.cpp b/engines/zvision/render_manager.cpp index cfd53fdc4b..10afe1f201 100644 --- a/engines/zvision/render_manager.cpp +++ b/engines/zvision/render_manager.cpp @@ -146,8 +146,8 @@ void RenderManager::renderImageToScreen(const Common::String &fileName, uint32 d _needsScreenUpdate = true; } -void RenderManager::setRenderState(RenderTable::RenderState state) { - _renderTable.setRenderState(state); +RenderTable *RenderManager::getRenderTable() { + return &_renderTable; } } // End of namespace ZVision diff --git a/engines/zvision/render_manager.h b/engines/zvision/render_manager.h index db0088811f..8b4d7e840b 100644 --- a/engines/zvision/render_manager.h +++ b/engines/zvision/render_manager.h @@ -89,12 +89,7 @@ public: */ void renderImageToScreen(const Common::String &fileName, uint32 destinationX, uint32 destinationY, Common::Rect subRectangle = Common::Rect(0, 0, 0, 0)); - /** - * Set how the frame should be rendered - * - * @param state One of the RenderStates - */ - void setRenderState(RenderTable::RenderState state); + RenderTable *getRenderTable(); bool needsScreenUpdate() { return _needsScreenUpdate; }; |