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

[alxpnv]

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:
c5044f433c ASYLUM: fix formatting
cd11578f2b ASYLUM: fix animation of floating bodies in Chapter 4


Commit: c5044f433c47b5024b96845f5f8fa00ef37f3c37
    https://github.com/scummvm/scummvm/commit/c5044f433c47b5024b96845f5f8fa00ef37f3c37
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2022-10-06T13:41:58+03:00

Commit Message:
ASYLUM: fix formatting

Changed paths:
    engines/asylum/resources/object.cpp


diff --git a/engines/asylum/resources/object.cpp b/engines/asylum/resources/object.cpp
index 2e9b66ede26..472b91b76e1 100644
--- a/engines/asylum/resources/object.cpp
+++ b/engines/asylum/resources/object.cpp
@@ -284,7 +284,7 @@ void Object::update() {
 	// Examine flags
 	if (flags & kObjectFlag20) {
 		if (_vm->getTick() - _tickCount >= (uint32)Common::Rational(1000, _field_B4).toInt()) {
-			_frameIndex =((_frameIndex + 1) % _frameCount);
+			_frameIndex = (_frameIndex + 1) % _frameCount;
 			_tickCount = _vm->getTick();
 			doPlaySounds = true;
 		}
@@ -310,7 +310,7 @@ void Object::update() {
 
 		if (!isFirstFrame) {
 			if (_vm->getTick() - _tickCount >= (uint32)Common::Rational(1000, _field_B4).toInt()) {
-				_frameIndex =((_frameIndex + 1) % _frameCount);
+				_frameIndex = (_frameIndex + 1) % _frameCount;
 				_tickCount = _vm->getTick();
 				doPlaySounds = true;
 			}
@@ -318,7 +318,7 @@ void Object::update() {
 	} else if (BYTE1(flags) & kObjectFlag8) {
 		if (_vm->getTick() - _tickCount >= 1000 * _tickCount2) {
 			if (_vm->getRandom(_field_C0) == 1)
-				_frameIndex =((_frameIndex + 1) % _frameCount);
+				_frameIndex = (_frameIndex + 1) % _frameCount;
 
 			_tickCount = _vm->getTick();
 			doPlaySounds = true;


Commit: cd11578f2bdb78365b81b1469744287c39e1853c
    https://github.com/scummvm/scummvm/commit/cd11578f2bdb78365b81b1469744287c39e1853c
Author: alxpnv (alxpnv22 at yahoo.com)
Date: 2022-10-06T13:41:58+03:00

Commit Message:
ASYLUM: fix animation of floating bodies in Chapter 4

Bug no. 13558

Changed paths:
    engines/asylum/resources/object.cpp


diff --git a/engines/asylum/resources/object.cpp b/engines/asylum/resources/object.cpp
index 472b91b76e1..003e3babd98 100644
--- a/engines/asylum/resources/object.cpp
+++ b/engines/asylum/resources/object.cpp
@@ -380,6 +380,9 @@ void Object::update() {
 				BYTE1(flags) = (BYTE1(flags) & 0xFB) | kObjectFlag2;
 			}
 		}
+
+		_tickCount = _vm->getTick();
+		doPlaySounds = true;
 	}
 
 	if (flags & kObjectFlag40000) {