[Scummvm-git-logs] scummvm master -> f4fa6efad1ff41b3ed50c43ceec6904cfd3efa08

[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:
1dec8d7668 SKY: Decrease cursor redraw delay in menu
f4fa6efad1 SKY: Add defines for delay();


Commit: 1dec8d7668651066593be63344d81a1c6b20c09d
    https://github.com/scummvm/scummvm/commit/1dec8d7668651066593be63344d81a1c6b20c09d
Author: Lothar Serra Mari (serra at scummvm.org)
Date: 2019-02-16T22:47:55+02:00

Commit Message:
SKY: Decrease cursor redraw delay in menu

Changed paths:
    engines/sky/control.cpp


diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index a3fef3c..c9e00b7 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -488,7 +488,7 @@ void Control::doControlPanel() {
 		_text->drawToScreen(WITH_MASK);
 		_system->updateScreen();
 		_mouseClicked = false;
-		delay(50);
+		delay(20);
 		if (!_controlPanel)
 			return;
 		if (_keyPressed.keycode == Common::KEYCODE_ESCAPE) { // escape pressed
@@ -635,7 +635,7 @@ bool Control::getYesNo(char *text) {
 			_skyMouse->spriteMouse(mouseType, 0, 0);
 		}
 		_system->updateScreen();
-		delay(50);
+		delay(20);
 		if (!_controlPanel) {
 			free(dlgTextDat);
 			delete dlgText;
@@ -672,7 +672,7 @@ uint16 Control::doMusicSlide() {
 	int ofsY = _slide2->_y - mouse.y;
 	uint8 volume;
 	while (_mouseClicked) {
-		delay(50);
+		delay(20);
 		if (!_controlPanel)
 			return 0;
 		mouse = _system->getEventManager()->getMousePos();
@@ -703,7 +703,7 @@ uint16 Control::doSpeedSlide() {
 	speedDelay *= SPEED_MULTIPLY;
 	speedDelay += 2;
 	while (_mouseClicked) {
-		delay(50);
+		delay(20);
 		if (!_controlPanel)
 			return SPEED_CHANGED;
 		mouse = _system->getEventManager()->getMousePos();
@@ -896,7 +896,7 @@ uint16 Control::saveRestorePanel(bool allowSave) {
 		_text->drawToScreen(WITH_MASK);
 		_system->updateScreen();
 		_mouseClicked = false;
-		delay(50);
+		delay(20);
 		if (!_controlPanel)
 			return clickRes;
 		if (_keyPressed.keycode == Common::KEYCODE_ESCAPE) { // escape pressed


Commit: f4fa6efad1ff41b3ed50c43ceec6904cfd3efa08
    https://github.com/scummvm/scummvm/commit/f4fa6efad1ff41b3ed50c43ceec6904cfd3efa08
Author: Lothar Serra Mari (serra at scummvm.org)
Date: 2019-02-16T22:47:55+02:00

Commit Message:
SKY: Add defines for delay();

Changed paths:
    engines/sky/control.cpp


diff --git a/engines/sky/control.cpp b/engines/sky/control.cpp
index c9e00b7..83088db 100644
--- a/engines/sky/control.cpp
+++ b/engines/sky/control.cpp
@@ -43,6 +43,9 @@
 #include "sky/text.h"
 #include "sky/compact.h"
 
+#define ANIM_DELAY 20
+#define CLICK_DELAY 150
+
 namespace Sky {
 
 ConResource::ConResource(void *pSpData, uint32 pNSprites, uint32 pCurSprite, uint16 pX, uint16 pY, uint32 pText, uint8 pOnClick, OSystem *system, uint8 *screen) {
@@ -388,7 +391,7 @@ void Control::animClick(ConResource *pButton) {
 		pButton->drawToScreen(NO_MASK);
 		_text->drawToScreen(WITH_MASK);
 		_system->updateScreen();
-		delay(150);
+		delay(CLICK_DELAY);
 		if (!_controlPanel)
 			return;
 		pButton->_curSprite--;
@@ -488,7 +491,7 @@ void Control::doControlPanel() {
 		_text->drawToScreen(WITH_MASK);
 		_system->updateScreen();
 		_mouseClicked = false;
-		delay(20);
+		delay(ANIM_DELAY);
 		if (!_controlPanel)
 			return;
 		if (_keyPressed.keycode == Common::KEYCODE_ESCAPE) { // escape pressed
@@ -635,7 +638,7 @@ bool Control::getYesNo(char *text) {
 			_skyMouse->spriteMouse(mouseType, 0, 0);
 		}
 		_system->updateScreen();
-		delay(20);
+		delay(ANIM_DELAY);
 		if (!_controlPanel) {
 			free(dlgTextDat);
 			delete dlgText;
@@ -672,7 +675,7 @@ uint16 Control::doMusicSlide() {
 	int ofsY = _slide2->_y - mouse.y;
 	uint8 volume;
 	while (_mouseClicked) {
-		delay(20);
+		delay(ANIM_DELAY);
 		if (!_controlPanel)
 			return 0;
 		mouse = _system->getEventManager()->getMousePos();
@@ -703,7 +706,7 @@ uint16 Control::doSpeedSlide() {
 	speedDelay *= SPEED_MULTIPLY;
 	speedDelay += 2;
 	while (_mouseClicked) {
-		delay(20);
+		delay(ANIM_DELAY);
 		if (!_controlPanel)
 			return SPEED_CHANGED;
 		mouse = _system->getEventManager()->getMousePos();
@@ -896,7 +899,7 @@ uint16 Control::saveRestorePanel(bool allowSave) {
 		_text->drawToScreen(WITH_MASK);
 		_system->updateScreen();
 		_mouseClicked = false;
-		delay(20);
+		delay(ANIM_DELAY);
 		if (!_controlPanel)
 			return clickRes;
 		if (_keyPressed.keycode == Common::KEYCODE_ESCAPE) { // escape pressed