[Scummvm-git-logs] scummvm master -> fe19f7b6127fba0e3c7731d1be0438e23f8ea271
bluegr
noreply at scummvm.org
Tue Jul 14 05:10:43 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
fe19f7b612 CHEWY: Add 3x missing talking animations in room 12
Commit: fe19f7b6127fba0e3c7731d1be0438e23f8ea271
https://github.com/scummvm/scummvm/commit/fe19f7b6127fba0e3c7731d1be0438e23f8ea271
Author: Max H. Gerlach (git at maxgerlach.de)
Date: 2026-07-14T08:10:40+03:00
Commit Message:
CHEWY: Add 3x missing talking animations in room 12
Also defines CH_BORK_TALK to hold animation magic number 68.
Assisted-by: Claude:claude-opus-4.8
Changed paths:
engines/chewy/defines.h
engines/chewy/rooms/room12.cpp
engines/chewy/rooms/room13.cpp
engines/chewy/t_event.cpp
diff --git a/engines/chewy/defines.h b/engines/chewy/defines.h
index 8c2ab166891..2c7cae5ef34 100644
--- a/engines/chewy/defines.h
+++ b/engines/chewy/defines.h
@@ -271,6 +271,7 @@ enum SetupScreenMode {
#define NI_STAND_R 40
#define NI_TALK_R 41
#define NI_BACK 42
+#define CH_BORK_TALK 68
#define ROOM_0_3 3
diff --git a/engines/chewy/rooms/room12.cpp b/engines/chewy/rooms/room12.cpp
index 15c8535fc90..93d54450122 100644
--- a/engines/chewy/rooms/room12.cpp
+++ b/engines/chewy/rooms/room12.cpp
@@ -217,7 +217,7 @@ int16 Room12::use_terminal() {
_G(gameState).R12ChewyBork = true;
_G(gameState).R12RaumOk = true;
autoMove(4, P_CHEWY);
- start_spz(68, 255, false, P_CHEWY);
+ start_spz(CH_BORK_TALK, 255, false, P_CHEWY);
startAadWait(113);
} else if (_G(gameState).R12TalismanOk && !_G(gameState).R12RaumOk) {
@@ -275,6 +275,7 @@ int16 Room12::useTransformerTube() {
_G(atds)->set_ats_str(117, TXT_MARK_LOOK, 0, ATS_DATA);
} else {
autoMove(7, P_CHEWY);
+ start_spz(CH_TALK3, 255, ANI_FRONT, P_CHEWY);
startAadWait(29);
}
}
diff --git a/engines/chewy/rooms/room13.cpp b/engines/chewy/rooms/room13.cpp
index 127f672060b..ead068fe97d 100644
--- a/engines/chewy/rooms/room13.cpp
+++ b/engines/chewy/rooms/room13.cpp
@@ -129,7 +129,7 @@ void Room13::talk_bork() {
_G(flags).NoScroll = true;
auto_scroll(41, 0);
- start_spz(68, 255, false, P_CHEWY);
+ start_spz(CH_BORK_TALK, 255, false, P_CHEWY);
startAadWait(248);
flic_cut(FCUT_013);
load_chewy_taf(CHEWY_NORMAL);
diff --git a/engines/chewy/t_event.cpp b/engines/chewy/t_event.cpp
index 1b5ee072f45..7ffeb3a6cf1 100644
--- a/engines/chewy/t_event.cpp
+++ b/engines/chewy/t_event.cpp
@@ -1284,6 +1284,8 @@ void atdsStringStart(int16 diaNr, int16 strNr, int16 personNr, int16 mode) {
case 30000:
case 25:
case 34:
+ case 111: // R12: use_linke_rohr()
+ case 114: // R12: Chewy-as-Bork with terminal
case 252:
case 253:
case 259:
@@ -1325,7 +1327,7 @@ void atdsStringStart(int16 diaNr, int16 strNr, int16 personNr, int16 mode) {
break;
case CHEWY_BORK:
- aniNr = 68;
+ aniNr = CH_BORK_TALK;
break;
case CHEWY_PUMPKIN:
@@ -1720,7 +1722,7 @@ void atdsStringStart(int16 diaNr, int16 strNr, int16 personNr, int16 mode) {
break;
case CHEWY_BORK:
- aniNr = 68;
+ aniNr = CH_BORK_TALK;
break;
case CHEWY_PUMPKIN:
More information about the Scummvm-git-logs
mailing list