[Scummvm-cvs-logs] scummvm master -> 4d3748fb24950d3d62b84bd7655742608e606894

[Strangerke]

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:
11183ee982 HOPKINS: Fix initialization of timers in EventsManager
4d3748fb24 HOPKINS: Make Hopkins sleep a bit in order to reduce CPU usage


Commit: 11183ee982bdb8597c19b0809f5a2de1701d0abb
    https://github.com/scummvm/scummvm/commit/11183ee982bdb8597c19b0809f5a2de1701d0abb
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-04-08T23:31:46-07:00

Commit Message:
HOPKINS: Fix initialization of timers in EventsManager

Changed paths:
    engines/hopkins/events.cpp



diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp
index 2a0137d..dffe480 100644
--- a/engines/hopkins/events.cpp
+++ b/engines/hopkins/events.cpp
@@ -54,8 +54,7 @@ EventsManager::EventsManager(HopkinsEngine *vm) {
 	_objectBuf = NULL;
 
 	Common::fill(&_keyState[0], &_keyState[256], false);
-	_priorCounterTime = 0;
-	_priorFrameTime = 0;
+	_priorCounterTime = _priorFrameTime = g_system->getMillis();
 }
 
 EventsManager::~EventsManager() {


Commit: 4d3748fb24950d3d62b84bd7655742608e606894
    https://github.com/scummvm/scummvm/commit/4d3748fb24950d3d62b84bd7655742608e606894
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-04-08T23:31:47-07:00

Commit Message:
HOPKINS: Make Hopkins sleep a bit in order to reduce CPU usage

Changed paths:
    engines/hopkins/events.cpp



diff --git a/engines/hopkins/events.cpp b/engines/hopkins/events.cpp
index dffe480..c37e367 100644
--- a/engines/hopkins/events.cpp
+++ b/engines/hopkins/events.cpp
@@ -212,6 +212,10 @@ void EventsManager::refreshEvents() {
 }
 
 void EventsManager::checkForNextFrameCounter() {
+	int32 delay = 10 - (g_system->getMillis() - _priorCounterTime);
+	if (delay > 0)
+		_vm->_system->delayMillis(delay);
+
 	// Check for whether to increment the game counter
 	uint32 milli = g_system->getMillis();
 	while ((milli - _priorCounterTime) >= 10) {