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

Strangerke Strangerke at scummvm.org
Fri Mar 21 08:13:05 CET 2014


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:
e57a54d1c1 TUCKER: Change the type of the return value of handleSpecialObjectSelectionSequence()


Commit: e57a54d1c1f8b2e5a1681bc88dbf169e5537c4eb
    https://github.com/scummvm/scummvm/commit/e57a54d1c1f8b2e5a1681bc88dbf169e5537c4eb
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-03-21T08:11:07+01:00

Commit Message:
TUCKER: Change the type of the return value of handleSpecialObjectSelectionSequence()

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 137f58d..2fb881f 100644
--- a/engines/tucker/sequences.cpp
+++ b/engines/tucker/sequences.cpp
@@ -419,7 +419,7 @@ void TuckerEngine::copyMapRect(int x, int y, int w, int h) {
 	}
 }
 
-int TuckerEngine::handleSpecialObjectSelectionSequence() {
+bool TuckerEngine::handleSpecialObjectSelectionSequence() {
 	char filename[40];
 	if (_partNum == 1 && _selectedObjectNum == 6) {
 		strcpy(filename, "news1.pcx");
@@ -436,7 +436,7 @@ int TuckerEngine::handleSpecialObjectSelectionSequence() {
 	} else if (_currentInfoString1SourceType == 1 && _currentActionObj1Num == 91) {
 		strcpy(filename, "memo.pcx");
 	} else {
-		return 0;
+		return false;
 	}
 	while (_fadePaletteCounter > 0) {
 		fadeInPalette();
@@ -479,7 +479,7 @@ int TuckerEngine::handleSpecialObjectSelectionSequence() {
 		}
 	}
 	loadLoc();
-	return 1;
+	return true;
 }
 
 AnimationSequencePlayer::AnimationSequencePlayer(OSystem *system, Audio::Mixer *mixer, Common::EventManager *event, CompressedSound *sound, int num)
diff --git a/engines/tucker/tucker.cpp b/engines/tucker/tucker.cpp
index e80a5fc..adf4be6 100644
--- a/engines/tucker/tucker.cpp
+++ b/engines/tucker/tucker.cpp
@@ -3697,7 +3697,7 @@ void TuckerEngine::setActionForInventoryObject() {
 			}
 			_panelLockedFlag = false;
 		}
-		if (handleSpecialObjectSelectionSequence() == 1) {
+		if (handleSpecialObjectSelectionSequence()) {
 			return;
 		}
 		_speechSoundNum = _actionObj1Num + _speechSoundBaseNum;
diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index b6a1772..adcd02b 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -578,7 +578,7 @@ protected:
 	void handleMeanwhileSequence();
 	void handleMapSequence();
 	void copyMapRect(int x, int y, int w, int h);
-	int handleSpecialObjectSelectionSequence();
+	bool handleSpecialObjectSelectionSequence();
 
 	uint8 *loadFile(const char *filename, uint8 *p);
 	void loadImage(const char *filename, uint8 *dst, int a);






More information about the Scummvm-git-logs mailing list