diff options
| author | Filippos Karapetis | 2015-01-07 11:22:26 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2015-01-07 11:42:26 +0200 |
| commit | 2d0e9fc74afd7578b368794a40afbc06f05c92db (patch) | |
| tree | 85dce83cd4a7b70c520093db18b39fe441e7f9a5 | |
| parent | fb135b38ed25605d7b7bece9180784376e8408cc (diff) | |
| download | scummvm-rg350-2d0e9fc74afd7578b368794a40afbc06f05c92db.tar.gz scummvm-rg350-2d0e9fc74afd7578b368794a40afbc06f05c92db.tar.bz2 scummvm-rg350-2d0e9fc74afd7578b368794a40afbc06f05c92db.zip | |
ZVISION: Move the screen initialization code into a separate function
| -rw-r--r-- | engines/zvision/zvision.cpp | 24 | ||||
| -rw-r--r-- | engines/zvision/zvision.h | 2 |
2 files changed, 16 insertions, 10 deletions
diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp index 54991aced3..b05c790109 100644 --- a/engines/zvision/zvision.cpp +++ b/engines/zvision/zvision.cpp @@ -105,15 +105,6 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc) debug(1, "ZVision::ZVision"); - uint16 workingWindowWidth = (gameDesc->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_WIDTH : ZGI_WORKING_WINDOW_WIDTH; - uint16 workingWindowHeight = (gameDesc->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_HEIGHT : ZGI_WORKING_WINDOW_HEIGHT; - _workingWindow = Common::Rect( - (WINDOW_WIDTH - workingWindowWidth) / 2, - (WINDOW_HEIGHT - workingWindowHeight) / 2, - ((WINDOW_WIDTH - workingWindowWidth) / 2) + workingWindowWidth, - ((WINDOW_HEIGHT - workingWindowHeight) / 2) + workingWindowHeight - ); - memset(_cheatBuffer, 0, sizeof(_cheatBuffer)); } @@ -211,7 +202,7 @@ void ZVision::initialize() { } else if (_gameDescription->gameId == GID_NEMESIS) _searchManager->loadZix("NEMESIS.ZIX"); - initGraphics(WINDOW_WIDTH, WINDOW_HEIGHT, true, &_screenPixelFormat); + initScreen(); // Register random source _rnd = new Common::RandomSource("zvision"); @@ -358,4 +349,17 @@ void ZVision::fpsTimer() { _renderedFrameCount = 0; } +void ZVision::initScreen() { + uint16 workingWindowWidth = (_gameDescription->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_WIDTH : ZGI_WORKING_WINDOW_WIDTH; + uint16 workingWindowHeight = (_gameDescription->gameId == GID_NEMESIS) ? ZNM_WORKING_WINDOW_HEIGHT : ZGI_WORKING_WINDOW_HEIGHT; + _workingWindow = Common::Rect( + (WINDOW_WIDTH - workingWindowWidth) / 2, + (WINDOW_HEIGHT - workingWindowHeight) / 2, + ((WINDOW_WIDTH - workingWindowWidth) / 2) + workingWindowWidth, + ((WINDOW_HEIGHT - workingWindowHeight) / 2) + workingWindowHeight + ); + + initGraphics(WINDOW_WIDTH, WINDOW_HEIGHT, true, &_screenPixelFormat); +} + } // End of namespace ZVision diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h index ad22ddaaa2..a3bcb384d1 100644 --- a/engines/zvision/zvision.h +++ b/engines/zvision/zvision.h @@ -194,6 +194,8 @@ public: _clock.stop(); } + void initScreen(); + /** * Play a video until it is finished. This is a blocking call. It will call * _clock.stop() when the video starts and _clock.start() when the video finishes. |