[Scummvm-git-logs] scummvm master -> 3303c605eec632b0fd95020b3d5e7bb8a12fcb68
bluegr
noreply at scummvm.org
Thu Jul 7 23:44:27 UTC 2022
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:
3303c605ee CHEWY: Fixed Nichelle's bar song sequence. Some renaming - bug #13638
Commit: 3303c605eec632b0fd95020b3d5e7bb8a12fcb68
https://github.com/scummvm/scummvm/commit/3303c605eec632b0fd95020b3d5e7bb8a12fcb68
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2022-07-08T02:44:05+03:00
Commit Message:
CHEWY: Fixed Nichelle's bar song sequence. Some renaming - bug #13638
Changed paths:
engines/chewy/defines.h
engines/chewy/rooms/room67.cpp
engines/chewy/rooms/room68.cpp
engines/chewy/rooms/room68.h
engines/chewy/t_event.cpp
engines/chewy/types.h
diff --git a/engines/chewy/defines.h b/engines/chewy/defines.h
index 475b2ef7a08..33bd588ac0f 100644
--- a/engines/chewy/defines.h
+++ b/engines/chewy/defines.h
@@ -377,8 +377,8 @@ enum SetupScreenMode {
#define SCHALL_INV 87
#define ARTE_INV 88
#define GALA_INV 89
-#define PAPAGEI_INV 90
-#define BAR_GUT_INV 91
+#define PARROT_INV 90
+#define DRINK_COUPON_INV 91
#define CLINT_500_INV 92
#define CLINT_1500_INV 93
#define CLINT_3000_INV 94
diff --git a/engines/chewy/rooms/room67.cpp b/engines/chewy/rooms/room67.cpp
index 02f6affd9eb..1860243607d 100644
--- a/engines/chewy/rooms/room67.cpp
+++ b/engines/chewy/rooms/room67.cpp
@@ -167,7 +167,7 @@ int16 Room67::talk_papagei() {
_G(det)->stopDetail(1);
_G(det)->del_static_ani(1);
_G(det)->showStaticSpr(0);
- invent_2_slot(PAPAGEI_INV);
+ invent_2_slot(PARROT_INV);
showCur();
_G(atds)->setControlBit(394, ATS_ACTIVE_BIT);
}
diff --git a/engines/chewy/rooms/room68.cpp b/engines/chewy/rooms/room68.cpp
index acadbebae46..64294df47b1 100644
--- a/engines/chewy/rooms/room68.cpp
+++ b/engines/chewy/rooms/room68.cpp
@@ -50,12 +50,12 @@ void Room68::entry() {
_G(spieler_mi)[P_HOWARD].Mode = true;
_G(spieler_mi)[P_NICHELLE].Mode = true;
- if (_G(gameState).R68Papagei) {
+ if (_G(gameState).R68Parrot) {
_G(det)->showStaticSpr(12);
_G(det)->startDetail(21, 255, ANI_FRONT);
}
- if (!_G(gameState).R68DivaWeg) {
+ if (!_G(gameState).R68DivaAway) {
_G(timer_nr)[0] = _G(room)->set_timer(255, 10);
_G(det)->set_static_ani(18, -1);
} else
@@ -82,7 +82,7 @@ void Room68::xit() {
bool Room68::timer(int16 t_nr, int16 ani_nr) {
if (t_nr == _G(timer_nr)[0])
- calc_diva();
+ calcDiva();
else
return true;
@@ -148,18 +148,18 @@ void Room68::setup_func() {
goAutoXy(ni_x, ni_y, P_NICHELLE, ANI_GO);
}
-void Room68::look_kaktus() {
+void Room68::lookAtCactus() {
hideCur();
autoMove(6, P_CHEWY);
startAadWait(383);
showCur();
}
-void Room68::talk_indigo() {
- talk_indigo(-1);
+void Room68::talkToIndigo() {
+ talkToIndigo(-1);
}
-void Room68::talk_indigo(int16 aad_nr) {
+void Room68::talkToIndigo(int16 aad_nr) {
hideCur();
autoMove(3, P_CHEWY);
_G(room)->set_timer_status(8, TIMER_STOP);
@@ -179,17 +179,17 @@ void Room68::talk_indigo(int16 aad_nr) {
showCur();
}
-int16 Room68::use_indigo() {
+int16 Room68::useIndigo() {
int16 action_flag = false;
hideCur();
if (isCurInventory(CLINT_500_INV)) {
action_flag = true;
- if (_G(gameState).R68Lied) {
+ if (_G(gameState).R68Song) {
hideCur();
autoMove(3, P_CHEWY);
auto_scroll(78, 0);
delInventory(_G(cur)->getInventoryCursor());
- talk_indigo(394);
+ talkToIndigo(394);
hideCur();
_G(room)->set_timer_status(8, TIMER_STOP);
_G(det)->del_static_ani(8);
@@ -197,7 +197,7 @@ int16 Room68::use_indigo() {
startSetAILWait(13, 3, ANI_FRONT);
startSetAILWait(25, 1, ANI_FRONT);
_G(det)->set_static_ani(12, -1);
- talk_indigo(398);
+ talkToIndigo(398);
hideCur();
_G(room)->set_timer_status(8, TIMER_STOP);
_G(det)->del_static_ani(8);
@@ -208,7 +208,7 @@ int16 Room68::use_indigo() {
new_invent_2_cur(KARTE_INV);
_G(gameState).R68KarteDa = true;
} else {
- talk_indigo(397);
+ talkToIndigo(397);
}
} else if (isCurInventory(CLINT_1500_INV) || isCurInventory(CLINT_3000_INV)) {
action_flag = true;
@@ -218,7 +218,7 @@ int16 Room68::use_indigo() {
return action_flag;
}
-void Room68::talk_keeper() {
+void Room68::talkToBartender() {
hideCur();
autoMove(2, P_CHEWY);
_G(room)->set_timer_status(20, TIMER_STOP);
@@ -238,12 +238,12 @@ void Room68::talk_keeper() {
showCur();
}
-int16 Room68::use_papagei() {
+int16 Room68::useParrot() {
int16 action_flag = false;
- if (isCurInventory(PAPAGEI_INV)) {
+ if (isCurInventory(PARROT_INV)) {
hideCur();
action_flag = true;
- _G(gameState).R68Papagei = true;
+ _G(gameState).R68Parrot = true;
delInventory(_G(cur)->getInventoryCursor());
autoMove(5, P_CHEWY);
start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
@@ -256,9 +256,9 @@ int16 Room68::use_papagei() {
return action_flag;
}
-void Room68::calc_diva() {
- if (!_G(gameState).R68DivaWeg) {
- if (!_G(gameState).R68Papagei) {
+void Room68::calcDiva() {
+ if (!_G(gameState).R68DivaAway) {
+ if (!_G(gameState).R68Parrot) {
if (_G(r68HohesC) == -1) {
_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
_G(r68HohesC) = 0;
@@ -266,22 +266,22 @@ void Room68::calc_diva() {
_G(det)->startDetail(_G(r68HohesC), 1, ANI_BACK);
_G(det)->startDetail(18, 255, ANI_FRONT);
}
- } else if (!_G(gameState).R68Gutschein && !is_chewy_busy()) {
+ } else if (!_G(gameState).R68DrinkCoupon && !is_chewy_busy()) {
hideCur();
- _G(gameState).R68Gutschein = true;
+ _G(gameState).R68DrinkCoupon = true;
autoMove(4, P_CHEWY);
startAadWait(386);
start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
- new_invent_2_cur(BAR_GUT_INV);
+ new_invent_2_cur(DRINK_COUPON_INV);
_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
showCur();
}
}
}
-int16 Room68::use_keeper() {
+int16 Room68::useBartender() {
int16 action_flag = false;
- if (isCurInventory(BAR_GUT_INV)) {
+ if (isCurInventory(DRINK_COUPON_INV)) {
hideCur();
delInventory(_G(cur)->getInventoryCursor());
action_flag = true;
@@ -298,7 +298,7 @@ int16 Room68::use_keeper() {
return action_flag;
}
-int16 Room68::use_diva() {
+int16 Room68::useDiva() {
int16 action_flag;
hideCur();
if (isCurInventory(B_MARY_INV)) {
@@ -308,14 +308,14 @@ int16 Room68::use_diva() {
_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
_G(det)->hideStaticSpr(3);
startSetAILWait(4, 1, ANI_FRONT);
- _G(gameState).R68Gutschein = false;
+ _G(gameState).R68DrinkCoupon = false;
_G(det)->showStaticSpr(3);
} else if (isCurInventory(B_MARY2_INV)) {
delInventory(_G(cur)->getInventoryCursor());
action_flag = 1;
autoMove(4, P_CHEWY);
_G(det)->hideStaticSpr(3);
- _G(gameState).R68DivaWeg = true;
+ _G(gameState).R68DivaAway = true;
startAniBlock(2, ABLOCK38);
flic_cut(FCUT_083);
_G(det)->del_static_ani(18);
@@ -327,12 +327,12 @@ int16 Room68::use_diva() {
setPersonSpr(P_RIGHT, P_CHEWY);
startAadWait(402);
} else
- action_flag = use_papagei();
+ action_flag = useParrot();
showCur();
return action_flag;
}
-void Room68::kostuem_aad(int16 aad_nr) {
+void Room68::useDressOnNichelle(int16 aad_nr) {
hideCur();
if (_G(gameState).DiaAMov != -1) {
autoMove(_G(gameState).DiaAMov, P_CHEWY);
@@ -340,9 +340,9 @@ void Room68::kostuem_aad(int16 aad_nr) {
startAadWait(aad_nr);
- if (!_G(gameState).R68DivaWeg)
+ if (!_G(gameState).R68DivaAway)
startAadWait(388);
- else if (!_G(gameState).R67LiedOk)
+ else if (!_G(gameState).R67SongOk)
startAadWait(389);
else {
_G(SetUpScreenFunc) = nullptr;
@@ -356,23 +356,24 @@ void Room68::kostuem_aad(int16 aad_nr) {
_G(gameState)._personHide[P_HOWARD] = true;
_G(det)->startDetail(27, 255, ANI_FRONT);
- if (g_engine->_sound->subtitlesEnabled())
- startSetAILWait(23, 3, ANI_FRONT);
- else {
- _G(det)->startDetail(23, 255, ANI_FRONT);
- _G(det)->playSound(109, 1);
- waitShowScreen(2);
+ g_engine->_sound->stopMusic();
- g_engine->_sound->waitForSpeechToFinish();
+ _G(det)->startDetail(23, 255, ANI_FRONT);
+ g_engine->_sound->playSound(109, 1); // piano intro
+ waitShowScreen(150);
- _G(det)->stopDetail(23);
- }
+ g_engine->_sound->waitForSpeechToFinish();
+
+ _G(det)->stopDetail(23);
+
+ g_engine->_sound->playSound(108, 1); // Nichelle singing
- _G(det)->playSound(108, 1);
-
_G(det)->startDetail(24, 255, ANI_FRONT);
setPersonPos(26, 40, P_NICHELLE, P_RIGHT);
- startAadWait(391);
+
+ waitShowScreen(100);
+ startAadWait(602);
+ waitShowScreen(100);
_G(room)->set_timer_status(8, TIMER_STOP);
_G(det)->del_static_ani(8);
@@ -391,24 +392,25 @@ void Room68::kostuem_aad(int16 aad_nr) {
startAadWait(392);
g_engine->_sound->waitForSpeechToFinish();
-
+ _G(det)->stopSound(1);
+
_G(gameState)._personHide[P_HOWARD] = false;
_G(det)->stopDetail(27);
_G(det)->stopDetail(24);
_G(det)->showStaticSpr(13);
- _G(gameState).R68Lied = true;
+ _G(gameState).R68Song = true;
autoMove(1, P_CHEWY);
auto_scroll(216, 0);
_G(det)->hideStaticSpr(13);
_G(gameState)._personHide[P_NICHELLE] = false;
- setPersonPos(150, -13, P_NICHELLE, P_RIGHT);
+ setPersonPos(140, 59, P_NICHELLE, P_RIGHT);
- g_engine->_sound->playRoomMusic(_G(gameState)._personRoomNr[0]);
+ g_engine->_sound->playRoomMusic(_G(gameState)._personRoomNr[P_CHEWY]);
}
showCur();
}
-void Room68::talk_papagei() {
+void Room68::talkWithParrot() {
hideCur();
autoMove(5, P_CHEWY);
showCur();
diff --git a/engines/chewy/rooms/room68.h b/engines/chewy/rooms/room68.h
index 17fb5efaf68..2d4f35ebeaf 100644
--- a/engines/chewy/rooms/room68.h
+++ b/engines/chewy/rooms/room68.h
@@ -28,23 +28,23 @@ namespace Rooms {
class Room68 {
private:
static void setup_func();
- static void talk_indigo(int16 aad_nr);
+ static void talkToIndigo(int16 aad_nr);
public:
static void entry();
static void xit();
static bool timer(int16 t_nr, int16 ani_nr);
- static void look_kaktus();
- static int16 use_indigo();
- static void talk_keeper();
- static void kostuem_aad(int16 aad_nr);
- static void talk_papagei();
- static int16 use_diva();
- static int16 use_keeper();
- static void calc_diva();
- static int16 use_papagei();
- static void talk_indigo();
+ static void lookAtCactus();
+ static int16 useIndigo();
+ static void talkToBartender();
+ static void useDressOnNichelle(int16 aad_nr);
+ static void talkWithParrot();
+ static int16 useDiva();
+ static int16 useBartender();
+ static void calcDiva();
+ static int16 useParrot();
+ static void talkToIndigo();
};
} // namespace Rooms
diff --git a/engines/chewy/t_event.cpp b/engines/chewy/t_event.cpp
index d4429ebb9fc..4fd2f550b1a 100644
--- a/engines/chewy/t_event.cpp
+++ b/engines/chewy/t_event.cpp
@@ -113,7 +113,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
break;
case 416:
- Room68::look_kaktus();
+ Room68::lookAtCactus();
break;
default:
@@ -587,19 +587,19 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
break;
case 406:
- retValue = Room68::use_papagei();
+ retValue = Room68::useParrot();
break;
case 407:
- retValue = Room68::use_diva();
+ retValue = Room68::useDiva();
break;
case 410:
- retValue = Room68::use_keeper();
+ retValue = Room68::useBartender();
break;
case 414:
- retValue = Room68::use_indigo();
+ retValue = Room68::useIndigo();
break;
case 425:
@@ -939,15 +939,15 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
break;
case 408:
- Room68::talk_papagei();
+ Room68::talkWithParrot();
break;
case 410:
- Room68::talk_keeper();
+ Room68::talkToBartender();
break;
case 414:
- Room68::talk_indigo();
+ Room68::talkToIndigo();
break;
case 419:
@@ -1191,7 +1191,7 @@ void selectDialogOption(int16 diaNr, int16 blkNr, int16 strEndNr) {
case 18:
case 19:
if (blkNr == 0 && strEndNr == 4)
- _G(gameState).R67LiedOk = true;
+ _G(gameState).R67SongOk = true;
break;
@@ -2502,7 +2502,7 @@ int16 calc_person_click(int16 p_nr) {
Room67::kostuem_aad(377);
action_ret = true;
} else if (_G(gameState)._personRoomNr[P_CHEWY] == 68) {
- Room68::kostuem_aad(387);
+ Room68::useDressOnNichelle(387);
action_ret = true;
}
break;
diff --git a/engines/chewy/types.h b/engines/chewy/types.h
index 28986df32bb..8cd978ee675 100644
--- a/engines/chewy/types.h
+++ b/engines/chewy/types.h
@@ -264,18 +264,18 @@ struct GameFlags {
bool flags26_10 : 1;
bool flags26_20 : 1;
bool flags26_40 : 1;
- bool R67LiedOk : 1;
+ bool R67SongOk : 1;
bool R67KommodeAuf : 1;
bool R67KostuemWeg : 1;
bool R67PapageiWeg : 1;
bool R68KarteDa : 1;
- bool R68Papagei : 1;
- bool R68DivaWeg : 1;
- bool R68Lied : 1;
+ bool R68Parrot : 1;
+ bool R68DivaAway : 1;
+ bool R68Song : 1;
bool R68IndigoDia : 1;
- bool R68Gutschein : 1;
+ bool R68DrinkCoupon : 1;
bool R71LeopardVined : 1;
bool flags28_4 : 1;
bool flags28_8 : 1;
More information about the Scummvm-git-logs
mailing list