[Scummvm-cvs-logs] scummvm master -> d76fe85af4c160a83dd82e6df0fc6cb5e9f68790

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
38df43fe55 LAB: Prevent excessive screen updates when checking for events
d76fe85af4 LAB: Prevent duplicate processing of input


Commit: 38df43fe55a699b491e8e716762abea8b779cd92
    https://github.com/scummvm/scummvm/commit/38df43fe55a699b491e8e716762abea8b779cd92
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-01-11T01:50:10+02:00

Commit Message:
LAB: Prevent excessive screen updates when checking for events

Changed paths:
    engines/lab/dispman.cpp
    engines/lab/eventman.cpp
    engines/lab/lab.cpp



diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp
index 17623d4..41f51dd 100644
--- a/engines/lab/dispman.cpp
+++ b/engines/lab/dispman.cpp
@@ -404,6 +404,7 @@ void DisplayMan::drawHLine(uint16 x1, uint16 y, uint16 x2, byte color) {
 
 void DisplayMan::screenUpdate() {
 	_vm->_system->copyRectToScreen(_displayBuffer, _screenWidth, 0, 0, _screenWidth, _screenHeight);
+	_vm->_console->onFrame();
 	_vm->_system->updateScreen();
 
 	_vm->_event->processInput();
diff --git a/engines/lab/eventman.cpp b/engines/lab/eventman.cpp
index f9b3d2f..969cb8d 100644
--- a/engines/lab/eventman.cpp
+++ b/engines/lab/eventman.cpp
@@ -185,10 +185,6 @@ void EventManager::processInput() {
 			break;
 		}
 	}
-
-	_vm->_system->copyRectToScreen(_vm->_graphics->_displayBuffer, _vm->_graphics->_screenWidth, 0, 0, _vm->_graphics->_screenWidth, _vm->_graphics->_screenHeight);
-	_vm->_console->onFrame();
-	_vm->_system->updateScreen();
 }
 
 Common::Point EventManager::updateAndGetMousePos() {
diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp
index 47b864d..d94c8bf 100644
--- a/engines/lab/lab.cpp
+++ b/engines/lab/lab.cpp
@@ -225,10 +225,8 @@ void LabEngine::changeVolume(int delta) {
 }
 
 void LabEngine::waitTOF() {
-	_system->copyRectToScreen(_graphics->_displayBuffer, _graphics->_screenWidth, 0, 0, _graphics->_screenWidth, _graphics->_screenHeight);
-	_system->updateScreen();
-
 	_event->processInput();
+	_graphics->screenUpdate();
 
 	uint32 now;
 


Commit: d76fe85af4c160a83dd82e6df0fc6cb5e9f68790
    https://github.com/scummvm/scummvm/commit/d76fe85af4c160a83dd82e6df0fc6cb5e9f68790
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2016-01-11T01:50:11+02:00

Commit Message:
LAB: Prevent duplicate processing of input

Changed paths:
    engines/lab/dispman.cpp
    engines/lab/lab.cpp



diff --git a/engines/lab/dispman.cpp b/engines/lab/dispman.cpp
index 41f51dd..8be1772 100644
--- a/engines/lab/dispman.cpp
+++ b/engines/lab/dispman.cpp
@@ -403,11 +403,11 @@ void DisplayMan::drawHLine(uint16 x1, uint16 y, uint16 x2, byte color) {
 }
 
 void DisplayMan::screenUpdate() {
+	_vm->_event->processInput();
+
 	_vm->_system->copyRectToScreen(_displayBuffer, _screenWidth, 0, 0, _screenWidth, _screenHeight);
 	_vm->_console->onFrame();
 	_vm->_system->updateScreen();
-
-	_vm->_event->processInput();
 }
 
 void DisplayMan::createScreen(bool hiRes) {
diff --git a/engines/lab/lab.cpp b/engines/lab/lab.cpp
index d94c8bf..03ef06e 100644
--- a/engines/lab/lab.cpp
+++ b/engines/lab/lab.cpp
@@ -225,7 +225,6 @@ void LabEngine::changeVolume(int delta) {
 }
 
 void LabEngine::waitTOF() {
-	_event->processInput();
 	_graphics->screenUpdate();
 
 	uint32 now;