From 0d1b5533db2ec543f34a51b9a4b0fac0231db411 Mon Sep 17 00:00:00 2001
From: lukaslw
Date: Sat, 26 Jul 2014 19:15:20 +0200
Subject: PRINCE: drawScreen() update

---
 engines/prince/prince.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'engines')

diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index d1a142fab4..14e9e2844b 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -1749,6 +1749,14 @@ void PrinceEngine::freeDrawNodes() {
 }
 
 void PrinceEngine::drawScreen() {
+
+	clsMasks();
+
+	_mainHero->showHero();
+	_secondHero->showHero();
+
+	_mainHero->scrollHero();
+
 	if (!_showInventoryFlag || _inventoryBackgroundRemember) {
 		const Graphics::Surface *roomSurface;
 		if (_locationNr != 50) {
@@ -1790,9 +1798,11 @@ void PrinceEngine::drawScreen() {
 			}
 		}
 
+		showBackAnims();
+
 		showNormAnims();
 
-		showBackAnims();
+		playNextFrame();
 
 		showObjects();
 
@@ -1811,10 +1821,6 @@ void PrinceEngine::drawScreen() {
 			delete mainHeroSurface;
 		}
 
-		clsMasks();
-
-		playNextFrame();
-
 		if (!_inventoryBackgroundRemember && !_dialogFlag) {
 			if (!_optionsFlag) {
 				_selectedMob = checkMob(_graph->_frontScreen, _mobList, true);
@@ -4465,12 +4471,6 @@ void PrinceEngine::mainLoop() {
 		if (shouldQuit())
 			return;
 
-		// TODO: Update all structures, animations, naks, heros etc.
-		_mainHero -> showHero();
-		if(_mainHero->_visible == 1) {
-			_mainHero -> scrollHero();
-		}
-
 		_interpreter->step();
 
 		drawScreen();
-- 
cgit v1.2.3