[Scummvm-git-logs] scummvm master -> 4daf3e4ea544a5c087bd42eac5c15a5d916ed82f

sev- sev at scummvm.org
Wed Jan 31 19:07:00 CET 2018


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:
4daf3e4ea5 TUCKER: Fix bubbles in Plugs shop


Commit: 4daf3e4ea544a5c087bd42eac5c15a5d916ed82f
    https://github.com/scummvm/scummvm/commit/4daf3e4ea544a5c087bd42eac5c15a5d916ed82f
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-01-31T19:06:57+01:00

Commit Message:
TUCKER: Fix bubbles in Plugs shop

Fixes Trac#6641.

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


diff --git a/engines/tucker/locations.cpp b/engines/tucker/locations.cpp
index 1a72790..5131b85 100644
--- a/engines/tucker/locations.cpp
+++ b/engines/tucker/locations.cpp
@@ -972,9 +972,12 @@ void TuckerEngine::updateSprite_locationNum14(int i) {
 }
 
 void TuckerEngine::execData3PreUpdate_locationNum14() {
-	if (_yPosCurrent >= 127)
-		return;
+	if (_yPosCurrent >= 127) {
+		execData3Update_locationNum14();
+	}
+}
 
+void TuckerEngine::execData3Update_locationNum14() {
 	if (!isSoundPlaying(0)) {
 		int num = -1;
 		const int i = getRandomNumber();
@@ -1058,7 +1061,7 @@ void TuckerEngine::execData3PreUpdate_locationNum14Helper2(int i) {
 
 void TuckerEngine::execData3PostUpdate_locationNum14() {
 	if (_yPosCurrent < 127) {
-		execData3PreUpdate_locationNum14();
+		execData3Update_locationNum14();
 	}
 }
 
diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index 1be4682..6046804 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -440,6 +440,7 @@ protected:
 	void updateSprite_locationNum13(int i);
 	void execData3PreUpdate_locationNum13();
 	void updateSprite_locationNum14(int i);
+	void execData3Update_locationNum14();
 	void execData3PreUpdate_locationNum14();
 	void execData3PreUpdate_locationNum14Helper1(int i);
 	void execData3PreUpdate_locationNum14Helper2(int i);





More information about the Scummvm-git-logs mailing list