[Scummvm-git-logs] scummvm master -> c95a8036b5a7c1e0c8f00ce0d679410d41b6019d
alxpnv
a04198622 at gmail.com
Wed Oct 13 13:12:56 UTC 2021
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9600ef7297 ASYLUM: fix loading screen animation too fast
493be0c7f9 ASYLUM: (Fisherman puzzle) fix sounds
80763d58b7 ASYLUM: (Fisherman puzzle) identify more variables
c95a8036b5 ASYLUM: (Fisherman puzzle) fix resetting
Commit: 9600ef729766d538fbc2187637161f4933a453b5
https://github.com/scummvm/scummvm/commit/9600ef729766d538fbc2187637161f4933a453b5
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-10-13T16:15:16+03:00
Commit Message:
ASYLUM: fix loading screen animation too fast
Reported by Attx
Changed paths:
engines/asylum/views/scenetitle.cpp
diff --git a/engines/asylum/views/scenetitle.cpp b/engines/asylum/views/scenetitle.cpp
index 3694c50b25..c1126c5d61 100644
--- a/engines/asylum/views/scenetitle.cpp
+++ b/engines/asylum/views/scenetitle.cpp
@@ -72,13 +72,8 @@ void SceneTitle::update(int32 tick) {
// of buffering the various scene resource. Since we don't actually buffer content like the original,
// but load on demand from offset/length within a ResourcePack, the progress indicator is effectively
// useless. It's just in here as "eye candy" :P
- if ((tick - _start) % 500 > 100) {
-#ifdef DEBUG
+ if ((tick - _start) % 500 > 100)
_spinnerProgress += 10;
-#else
- _spinnerProgress += 35;
-#endif
- }
_spinnerFrameIndex++;
Commit: 493be0c7f91527aa0fb953bbed6cbcc80f0233cb
https://github.com/scummvm/scummvm/commit/493be0c7f91527aa0fb953bbed6cbcc80f0233cb
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-10-13T16:15:16+03:00
Commit Message:
ASYLUM: (Fisherman puzzle) fix sounds
Changed paths:
engines/asylum/puzzles/fisherman.cpp
diff --git a/engines/asylum/puzzles/fisherman.cpp b/engines/asylum/puzzles/fisherman.cpp
index e38227214f..d2d3b377be 100644
--- a/engines/asylum/puzzles/fisherman.cpp
+++ b/engines/asylum/puzzles/fisherman.cpp
@@ -144,7 +144,7 @@ bool PuzzleFisherman::mouseLeftDown(const AsylumEvent &evt) {
for (uint32 i = 0; i < 6; i++) {
if (hitTest(&puzzleFishermanPolygons[i * 4 + 7], evt.mouse)) {
if (!_state[i]) {
- getSound()->playSound(getWorld()->graphicResourceIds[9], false, Config.sfxVolume - 10);
+ getSound()->playSound(getWorld()->soundResourceIds[9], false, Config.sfxVolume - 10);
_state[i] = true;
setFlags(i);
}
@@ -155,7 +155,7 @@ bool PuzzleFisherman::mouseLeftDown(const AsylumEvent &evt) {
&& puzzleFishermanPolygons[6][1] < evt.mouse.y
&& puzzleFishermanPolygons[6][0] + 70 > evt.mouse.x
&& puzzleFishermanPolygons[6][1] + 30 > evt.mouse.y) {
- getSound()->playSound(getWorld()->graphicResourceIds[10], false, Config.sfxVolume - 10);
+ getSound()->playSound(getWorld()->soundResourceIds[10], false, Config.sfxVolume - 10);
for (uint32 i = 0; i < 6; i++)
_vm->clearGameFlag((GameFlag)(kGameFlag801 + i));
Commit: 80763d58b7c142ee6309874e230f84fb92d13e87
https://github.com/scummvm/scummvm/commit/80763d58b7c142ee6309874e230f84fb92d13e87
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-10-13T16:15:16+03:00
Commit Message:
ASYLUM: (Fisherman puzzle) identify more variables
Changed paths:
engines/asylum/puzzles/fisherman.cpp
engines/asylum/puzzles/fisherman.h
diff --git a/engines/asylum/puzzles/fisherman.cpp b/engines/asylum/puzzles/fisherman.cpp
index d2d3b377be..010df3ffcb 100644
--- a/engines/asylum/puzzles/fisherman.cpp
+++ b/engines/asylum/puzzles/fisherman.cpp
@@ -47,11 +47,11 @@ const int16 puzzleFishermanPolygons[31][2] = {
PuzzleFisherman::PuzzleFisherman(AsylumEngine *engine) : Puzzle(engine) {
memset(&_state, 0, sizeof(_state));
- _dword_45AAD4 = false;
+ _resetPressed = false;
_counter = 0;
- _dword_45A12C = 0;
- _dword_45A130 = false;
+ _pauseTimer = 0;
+ _allowClick = false;
}
PuzzleFisherman::~PuzzleFisherman() {
@@ -61,7 +61,7 @@ void PuzzleFisherman::saveLoadWithSerializer(Common::Serializer &s) {
for (int i = 0; i < ARRAYSIZE(_state); i++)
s.syncAsSint32LE(_state[i]);
- s.syncAsSint32LE(_dword_45AAD4);
+ s.syncAsSint32LE(_resetPressed);
s.syncAsSint32LE(_counter);
}
@@ -80,7 +80,7 @@ bool PuzzleFisherman::init(const AsylumEvent &evt) {
_counter = 0;
}
- _dword_45A130 = false;
+ _allowClick = false;
getScreen()->setPalette(getWorld()->graphicResourceIds[39]);
getScreen()->setGammaLevel(getWorld()->graphicResourceIds[39]);
@@ -103,29 +103,29 @@ bool PuzzleFisherman::update(const AsylumEvent &) {
getScreen()->drawGraphicsInQueue();
- _dword_45A130 = true;
+ _allowClick = true;
getScreen()->copyBackBufferToScreen();
- if (_dword_45AAD4 == 1) {
- ++_dword_45A12C;
+ if (_resetPressed) {
+ ++_pauseTimer;
- if (_dword_45A12C > 5) {
+ if (_pauseTimer > 5) {
// Reset state
memset(&_state, 0, sizeof(_state));
for (uint32 i = 0; i < 6; i++)
_vm->clearGameFlag((GameFlag)(kGameFlag801 + i));
- _dword_45A130 = true;
- _dword_45A12C = 0;
+ _allowClick = true;
+ _pauseTimer = 0;
}
}
if (_counter == 6) {
- ++_dword_45A12C;
+ ++_pauseTimer;
- if (_dword_45A12C > 10) {
- _dword_45A12C = 0;
+ if (_pauseTimer > 10) {
+ _pauseTimer = 0;
_vm->setGameFlag(kGameFlag619);
getScreen()->setPalette(getWorld()->currentPaletteId);
@@ -138,7 +138,7 @@ bool PuzzleFisherman::update(const AsylumEvent &) {
}
bool PuzzleFisherman::mouseLeftDown(const AsylumEvent &evt) {
- if (!_dword_45A130)
+ if (!_allowClick)
return false;
for (uint32 i = 0; i < 6; i++) {
@@ -160,11 +160,11 @@ bool PuzzleFisherman::mouseLeftDown(const AsylumEvent &evt) {
for (uint32 i = 0; i < 6; i++)
_vm->clearGameFlag((GameFlag)(kGameFlag801 + i));
- _dword_45AAD4 = true;
+ _resetPressed = true;
}
- if (_dword_45AAD4)
- _dword_45A130 = false;
+ if (_resetPressed)
+ _allowClick = false;
return true;
}
@@ -237,7 +237,7 @@ void PuzzleFisherman::setFlags(uint32 index) {
case 3:
_vm->setGameFlag(kGameFlag804);
if (_counter == 5) {
- _dword_45A130 = false;
+ _allowClick = false;
_counter = 6;
} else {
_counter = 0;
diff --git a/engines/asylum/puzzles/fisherman.h b/engines/asylum/puzzles/fisherman.h
index 3f5ed431e8..dd5961a549 100644
--- a/engines/asylum/puzzles/fisherman.h
+++ b/engines/asylum/puzzles/fisherman.h
@@ -41,9 +41,9 @@ private:
bool _state[6];
int32 _counter;
- int32 _dword_45A12C;
- bool _dword_45A130;
- bool _dword_45AAD4;
+ int32 _pauseTimer;
+ bool _allowClick;
+ bool _resetPressed;
//////////////////////////////////////////////////////////////////////////
// Event Handling
Commit: c95a8036b5a7c1e0c8f00ce0d679410d41b6019d
https://github.com/scummvm/scummvm/commit/c95a8036b5a7c1e0c8f00ce0d679410d41b6019d
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2021-10-13T16:15:16+03:00
Commit Message:
ASYLUM: (Fisherman puzzle) fix resetting
Reported by Attx
Changed paths:
engines/asylum/puzzles/fisherman.cpp
diff --git a/engines/asylum/puzzles/fisherman.cpp b/engines/asylum/puzzles/fisherman.cpp
index 010df3ffcb..d7f16ca9f4 100644
--- a/engines/asylum/puzzles/fisherman.cpp
+++ b/engines/asylum/puzzles/fisherman.cpp
@@ -116,8 +116,12 @@ bool PuzzleFisherman::update(const AsylumEvent &) {
for (uint32 i = 0; i < 6; i++)
_vm->clearGameFlag((GameFlag)(kGameFlag801 + i));
+ _resetPressed = false;
_allowClick = true;
_pauseTimer = 0;
+ // Original bug: if the Sun button was pressed last,
+ // the correct order of buttons wouldn't work until another reset
+ _counter = 0;
}
}
More information about the Scummvm-git-logs
mailing list