[Scummvm-git-logs] scummvm branch-2-6 -> 0fe9e930b394b036b2ebd102e4f9a2ad6067d52d

[bluegr]

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:
7e07b5cdbc CHEWY: Rename some actions in room 82 (film set)
0fe9e930b3 CHEWY: Disable unfinished dynamic hotspot code


Commit: 7e07b5cdbcacc3230e835e1ef22f74e1f2f8f669
    https://github.com/scummvm/scummvm/commit/7e07b5cdbcacc3230e835e1ef22f74e1f2f8f669
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-07-03T22:15:04+03:00

Commit Message:
CHEWY: Rename some actions in room 82 (film set)

Changed paths:
    engines/chewy/rooms/room82.cpp
    engines/chewy/rooms/room82.h
    engines/chewy/t_event.cpp


diff --git a/engines/chewy/rooms/room82.cpp b/engines/chewy/rooms/room82.cpp
index 01a588b1901..5830c6a3be4 100644
--- a/engines/chewy/rooms/room82.cpp
+++ b/engines/chewy/rooms/room82.cpp
@@ -110,7 +110,7 @@ void Room82::setup_func() {
 	goAutoXy(nicDestX, 110, P_NICHELLE, ANI_GO);
 }
 
-void Room82::talk1() {
+void Room82::talkWithDirector() {
 	if (_G(gameState).flags30_40)
 		return;
 
@@ -133,7 +133,7 @@ void Room82::talk1() {
 	Room66::proc8(2, 7, transitionAniNr, transitionDiaNr);
 }
 
-void Room82::talk2() {
+void Room82::talkWithFilmDiva() {
 	hideCur();
 	autoMove(3, P_CHEWY);
 	startAadWait(453);
@@ -242,7 +242,7 @@ void Room82::proc8() {
 	showCur();
 }
 
-int Room82::proc9() {
+int Room82::procClimbLadderToGorilla() {
 	if (_G(cur)->usingInventoryCursor() || !_G(gameState).flags30_40)
 		return 0;
 
diff --git a/engines/chewy/rooms/room82.h b/engines/chewy/rooms/room82.h
index 9f74437778a..a7b9c36a5e5 100644
--- a/engines/chewy/rooms/room82.h
+++ b/engines/chewy/rooms/room82.h
@@ -30,14 +30,14 @@ public:
 	static void entry();
 	static void xit(int16 eib_nr);
 	static void setup_func();
-	static void talk1();
-	static void talk2();
+	static void talkWithDirector();
+	static void talkWithFilmDiva();
 	static void talk3();
 	static int proc3();
 	static void proc4();
 	static int proc6();
 	static void proc8();
-	static int proc9();
+	static int procClimbLadderToGorilla();
 };
 
 } // namespace Rooms
diff --git a/engines/chewy/t_event.cpp b/engines/chewy/t_event.cpp
index 0a82e7d8bb4..e0bdac8a17b 100644
--- a/engines/chewy/t_event.cpp
+++ b/engines/chewy/t_event.cpp
@@ -645,7 +645,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
 
 					case 467:
 					case 473:
-						retValue = Room82::proc9();
+						retValue = Room82::procClimbLadderToGorilla();
 						break;
 
 					case 468:
@@ -977,11 +977,11 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
 						break;
 
 					case 468:
-						Room82::talk1();
+						Room82::talkWithDirector();
 						break;
 
 					case 469:
-						Room82::talk2();
+						Room82::talkWithFilmDiva();
 						break;
 
 					case 471:


Commit: 0fe9e930b394b036b2ebd102e4f9a2ad6067d52d
    https://github.com/scummvm/scummvm/commit/0fe9e930b394b036b2ebd102e4f9a2ad6067d52d
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-07-03T22:15:04+03:00

Commit Message:
CHEWY: Disable unfinished dynamic hotspot code

This removes the description in some hotspots at the moment

Changed paths:
    engines/chewy/text.cpp


diff --git a/engines/chewy/text.cpp b/engines/chewy/text.cpp
index 17c7d22026d..7352cc15b9c 100644
--- a/engines/chewy/text.cpp
+++ b/engines/chewy/text.cpp
@@ -320,7 +320,8 @@ uint8 Text::updateTextStatus(int16 entry, int16 subEntry, int16 strNr, int16 typ
 
 	const uint8 status = buffer[(entry * MAX_ATS_STATUS) + (subEntry + 1) / 2];
 	if (strNr >= 0) {
-		buffer[(entry * MAX_ATS_STATUS) + (subEntry + 1) / 2] = strNr; // getTextStatus(status, subEntry, strNr);
+		// TODO: This is buggy
+		//buffer[(entry * MAX_ATS_STATUS) + (subEntry + 1) / 2] = strNr; // getTextStatus(status, subEntry, strNr);
 		return strNr;
 	}