ZVISION: Move initialization code from run() and into its own method

2 files changed, 9 insertions, 1 deletions

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
index 2cc0b47113..452ed00daf 100644
--- a/engines/zvision/zvision.cpp
+++ b/engines/zvision/zvision.cpp
@@ -73,7 +73,7 @@ ZVision::~ZVision() {
 	DebugMan.clearAllDebugChannels();

 }

 

-Common::Error ZVision::run() {

+void ZVision::initialize() {

 	// Find zfs archive files

 	Common::ArchiveMemberList list;

 	SearchMan.listMatchingMembers(list, "*.zfs");

@@ -92,6 +92,12 @@ Common::Error ZVision::run() {
 

 	// Create debugger console. It requires GFX to be initialized

 	_console = new Console(this);

+}

+

+Common::Error ZVision::run() {

+	initialize();

+

+	tests();

 

 	// Main loop

 	uint32 currentTime = _system->getMillis();

diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index b4664d0e29..c5ddb8ab4a 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -67,6 +67,8 @@ public:
 	virtual Common::Error run();

  

 private:

+	void initialize();

+

 	void processEvents();

 	void onMouseDown(const Common::Point &pos);
 	void onMouseMove(const Common::Point &pos);