[Scummvm-cvs-logs] scummvm master -> 009f75318758af7b5e5cb63cf82dbd865fa0f7bf

[salty-horse]

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

Summary:
009f753187 TUCKER: Hide cursor in cutscenes


Commit: 009f75318758af7b5e5cb63cf82dbd865fa0f7bf
    https://github.com/scummvm/scummvm/commit/009f75318758af7b5e5cb63cf82dbd865fa0f7bf
Author: Ori Avtalion (ori at avtalion.name)
Date: 2016-02-24T00:13:53+02:00

Commit Message:
TUCKER: Hide cursor in cutscenes

Changed paths:
    engines/tucker/sequences.cpp
    engines/tucker/tucker.cpp
    engines/tucker/tucker.h



diff --git a/engines/tucker/sequences.cpp b/engines/tucker/sequences.cpp
index e2a25b3..0151c55 100644
--- a/engines/tucker/sequences.cpp
+++ b/engines/tucker/sequences.cpp
@@ -54,6 +54,7 @@ void TuckerEngine::handleCreditsSequence() {
 	int counter2 = 0;
 	int counter1 = 0;
 	loadCharset2();
+	showCursor(false);
 	stopSounds();
 	_locationNum = 74;
 	_flagsTable[236] = 74;
@@ -159,12 +160,16 @@ void TuckerEngine::handleCreditsSequence() {
 		redrawScreen(0);
 		waitForTimer(2);
 	} while (_fadePaletteCounter > 0);
+	showCursor(true);
 }
 
 void TuckerEngine::handleCongratulationsSequence() {
+	// This method is only called right before the program terminates,
+	// so it doesn't bother restoring the palette
 	_timerCounter2 = 0;
 	_fadePaletteCounter = 0;
 	stopSounds();
+	showCursor(false);
 	loadImage("congrat.pcx", _loadTempBuf, 1);
 	Graphics::copyRect(_locationBackgroundGfxBuf, 640, _loadTempBuf, 320, 320, 200);
 	_fullRedraw = true;
@@ -176,11 +181,13 @@ void TuckerEngine::handleCongratulationsSequence() {
 		}
 		waitForTimer(3);
 	}
+	showCursor(true);
 }
 
 void TuckerEngine::handleNewPartSequence() {
 	char filename[40];
 
+	showCursor(false);
 	stopSounds();
 	if (_flagsTable[219] == 1) {
 		_flagsTable[219] = 0;
@@ -259,6 +266,7 @@ void TuckerEngine::handleNewPartSequence() {
 		waitForTimer(3);
 	} while (_fadePaletteCounter > 0 && !_quitGame);
 	_locationNum = currentLocation;
+	showCursor(true);
 }
 
 void TuckerEngine::handleMeanwhileSequence() {
@@ -280,6 +288,7 @@ void TuckerEngine::handleMeanwhileSequence() {
 		strcpy(filename, "loc80.pcx");
 	}
 	loadImage(filename, _quadBackgroundGfxBuf + 89600, 1);
+	showCursor(false);
 	_fadePaletteCounter = 0;
 	for (int i = 0; i < 60 && !_quitGame; ++i) {
 		if (_fadePaletteCounter < 16) {
@@ -307,6 +316,7 @@ void TuckerEngine::handleMeanwhileSequence() {
 	} while (_fadePaletteCounter > 0 && !_quitGame);
 	memcpy(_currentPalette, backupPalette, 256 * 3);
 	_fullRedraw = true;
+	showCursor(true);
 }
 
 void TuckerEngine::handleMapSequence() {
diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index de555cd..ad455c5 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -710,6 +710,10 @@ void TuckerEngine::setCursorType(int type) {
 	CursorMan.showMouse(_cursorType < 2);
 }
 
+void TuckerEngine::showCursor(bool visible) {
+	CursorMan.showMouse(visible);
+}
+
 void TuckerEngine::setupNewLocation() {
 	debug(2, "setupNewLocation() current %d next %d", _locationNum, _nextLocationNum);
 	_locationNum = _nextLocationNum;
diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index 3bbf6a5..2ab94de 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -300,6 +300,7 @@ protected:
 	void updateCursorPos(int x, int y);
 	void setCursorNum(int num);
 	void setCursorType(int type);
+	void showCursor(bool visible);
 	void setupNewLocation();
 	void copyLocBitmap(const char *filename, int offset, bool isMask);
 	void updateMouseState();