[Scummvm-git-logs] scummvm master -> 3b42457228b331a1d7eb7fae4f8abf9c673bc7d9

[dreammaster]

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:
3b42457228 CHEWY: Fix slime dripping animation in room 0


Commit: 3b42457228b331a1d7eb7fae4f8abf9c673bc7d9
    https://github.com/scummvm/scummvm/commit/3b42457228b331a1d7eb7fae4f8abf9c673bc7d9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-07-06T19:13:26-07:00

Commit Message:
CHEWY: Fix slime dripping animation in room 0

Changed paths:
    engines/chewy/detail.cpp
    engines/chewy/r_event.cpp
    engines/chewy/rooms/room00.cpp


diff --git a/engines/chewy/detail.cpp b/engines/chewy/detail.cpp
index f6062f28a05..665f1720aeb 100644
--- a/engines/chewy/detail.cpp
+++ b/engines/chewy/detail.cpp
@@ -380,7 +380,7 @@ void Detail::plot_ani_details(int16 scrx, int16 scry, int16 start, int16 end, in
 		AniDetailInfo *adiptr = &_rdi.Ainfo[i];
 		if ((adiptr->start_flag) && (adiptr->start_ani != -1) && (adiptr->end_ani != -1)) {
 			int16 sprnr = adiptr->ani_count;
-			int16 *Cxy = _rdi.dptr->correction + (sprnr << 1);
+			int16 *Cxy = _rdi.dptr->correction + sprnr * 2;
 			int16 kx = Cxy[0];
 			int16 ky = Cxy[1];
 			if (zoomx != 0 || zoomy != 0)
diff --git a/engines/chewy/r_event.cpp b/engines/chewy/r_event.cpp
index f8f704618e4..c599bb95b81 100644
--- a/engines/chewy/r_event.cpp
+++ b/engines/chewy/r_event.cpp
@@ -94,7 +94,7 @@ void timer_action(int16 t_nr) {
 	if (g_engine->_sound->isSpeechActive())
 		return;
 
-#define TIMER(NUM) case NUM: Room##NUM::timer(t_nr, ani_nr); break;
+#define TIMER(NUM) case NUM: default_flag = Room##NUM::timer(t_nr, ani_nr); break;
 	switch (_G(gameState)._personRoomNr[P_CHEWY]) {
 	TIMER(0);
 	TIMER(11);
diff --git a/engines/chewy/rooms/room00.cpp b/engines/chewy/rooms/room00.cpp
index f146f357f62..c4de91f8f38 100644
--- a/engines/chewy/rooms/room00.cpp
+++ b/engines/chewy/rooms/room00.cpp
@@ -113,8 +113,9 @@ bool Room0::timer(int16 timerNr, int16 aniNr) {
 			_G(uhr)->resetTimer(timerNr, 0);
 			_G(flags).AutoAniPlay = false;
 		}
-	} else if (timerNr == 3)
+	} else if (timerNr != 3) {
 		retval = true;
+	}
 
 	return retval;
 }