[Scummvm-git-logs] scummvm master -> 0d4999cc7ffaa622e9fdffb247434e974e381be9
neuromancer
noreply at scummvm.org
Tue May 31 06:58:26 UTC 2022
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d85a1c53b0 HYPNO: added sound action implementation, needed to fix some missing sounds in spider
f8ad38b44e HYPNO: added missing click sounds in the levels level in spider
ac0aec6eb6 HYPNO: added missing click sounds in the mainmenu level in spider
0d4999cc7f HYPNO: added missing click sounds when selecting ingredients in the bus level in spider
Commit: d85a1c53b08cc04ff197e139a5db06fbf41dc7a6
https://github.com/scummvm/scummvm/commit/d85a1c53b08cc04ff197e139a5db06fbf41dc7a6
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-05-31T08:58:37+02:00
Commit Message:
HYPNO: added sound action implementation, needed to fix some missing sounds in spider
Changed paths:
engines/hypno/actions.cpp
engines/hypno/grammar.h
engines/hypno/hypno.h
engines/hypno/scene.cpp
diff --git a/engines/hypno/actions.cpp b/engines/hypno/actions.cpp
index 58f527c9ccd..f54933d4c57 100644
--- a/engines/hypno/actions.cpp
+++ b/engines/hypno/actions.cpp
@@ -174,6 +174,10 @@ void HypnoEngine::runPlay(Play *a) {
}
}
+void HypnoEngine::runSound(Sound *a) {
+ playSound(a->path, 1);
+}
+
void HypnoEngine::runAmbient(Ambient *a) {
if (a->flag == "/BITMAP") {
Graphics::Surface *frame = decodeFrame(a->path, a->frameNumber);
diff --git a/engines/hypno/grammar.h b/engines/hypno/grammar.h
index 2c0f3773f5b..0f6390ed14f 100644
--- a/engines/hypno/grammar.h
+++ b/engines/hypno/grammar.h
@@ -80,6 +80,7 @@ enum ActionType {
GlobalAction,
TalkAction,
SwapPointerAction,
+ SoundAction,
ChangeLevelAction
};
@@ -235,6 +236,15 @@ public:
Filename path;
};
+class Sound : public Action {
+public:
+ Sound(Filename path_) {
+ type = SoundAction;
+ path = path_;
+ }
+ Filename path;
+};
+
class Intro : public Action {
public:
Intro(Filename path_) {
diff --git a/engines/hypno/hypno.h b/engines/hypno/hypno.h
index 24942326800..ca43f685c0b 100644
--- a/engines/hypno/hypno.h
+++ b/engines/hypno/hypno.h
@@ -189,6 +189,7 @@ public:
void runCutscene(Cutscene *a);
void runIntro(Intro *a);
void runPlay(Play *a);
+ void runSound(Sound *a);
void runPalette(Palette *a);
void runAmbient(Ambient *a);
void runWalN(WalN *a);
diff --git a/engines/hypno/scene.cpp b/engines/hypno/scene.cpp
index 9760e56bdf7..f04774cfad3 100644
--- a/engines/hypno/scene.cpp
+++ b/engines/hypno/scene.cpp
@@ -172,6 +172,10 @@ void HypnoEngine::clickedHotspot(Common::Point mousePos) {
runPlay((Play *)action);
break;
+ case SoundAction:
+ runSound((Sound *)action);
+ break;
+
case WalNAction:
runWalN((WalN *)action);
break;
Commit: f8ad38b44ef60a6b9c876e627d44a01f9a2089e0
https://github.com/scummvm/scummvm/commit/f8ad38b44ef60a6b9c876e627d44a01f9a2089e0
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-05-31T08:58:37+02:00
Commit Message:
HYPNO: added missing click sounds in the levels level in spider
Changed paths:
engines/hypno/spider/spider.cpp
diff --git a/engines/hypno/spider/spider.cpp b/engines/hypno/spider/spider.cpp
index c54e671bbad..cc96237b678 100644
--- a/engines/hypno/spider/spider.cpp
+++ b/engines/hypno/spider/spider.cpp
@@ -89,6 +89,15 @@ void SpiderEngine::loadAssetsFullGame() {
loadSceneLevel("options.mi_", "", prefix);
loadSceneLevel("levels.mi_", "mv0t.mi_", prefix);
+ Sound *snd = new Sound("mouse.raw");
+ sc = (Scene *) _levels["levels.mi_"];
+ sc->hots[1].actions.push_back(snd);
+ sc->hots[2].actions.push_back(snd);
+ sc->hots[3].actions.push_back(snd);
+ sc->hots[4].actions.push_back(snd);
+ sc->hots[5].actions.push_back(snd);
+ sc->hots[6].actions.push_back(snd);
+
loadSceneLevel("combmenu.mi_", "", prefix);
// start level
Commit: ac0aec6eb68445ea77a28d2725d223f8cd2afb29
https://github.com/scummvm/scummvm/commit/ac0aec6eb68445ea77a28d2725d223f8cd2afb29
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-05-31T08:58:37+02:00
Commit Message:
HYPNO: added missing click sounds in the mainmenu level in spider
Changed paths:
engines/hypno/spider/spider.cpp
diff --git a/engines/hypno/spider/spider.cpp b/engines/hypno/spider/spider.cpp
index cc96237b678..3850de8f725 100644
--- a/engines/hypno/spider/spider.cpp
+++ b/engines/hypno/spider/spider.cpp
@@ -77,7 +77,15 @@ void SpiderEngine::loadAssetsFullGame() {
ChangeLevel *cl;
Global *gl;
+ Sound *snd = new Sound("mouse.raw");
loadSceneLevel("mainmenu.mi_", "", prefix);
+ sc = (Scene *) _levels["mainmenu.mi_"];
+ sc->hots[1].actions.push_back(snd);
+ sc->hots[2].actions.push_back(snd);
+ sc->hots[3].actions.push_back(snd);
+ sc->hots[4].actions.push_back(snd);
+ sc->hots[5].actions.push_back(snd);
+ sc->hots[6].actions.push_back(snd);
loadSceneLevel("tryagain.mi_", "", prefix);
cl = new ChangeLevel("<give_up>");
@@ -89,7 +97,6 @@ void SpiderEngine::loadAssetsFullGame() {
loadSceneLevel("options.mi_", "", prefix);
loadSceneLevel("levels.mi_", "mv0t.mi_", prefix);
- Sound *snd = new Sound("mouse.raw");
sc = (Scene *) _levels["levels.mi_"];
sc->hots[1].actions.push_back(snd);
sc->hots[2].actions.push_back(snd);
Commit: 0d4999cc7ffaa622e9fdffb247434e974e381be9
https://github.com/scummvm/scummvm/commit/0d4999cc7ffaa622e9fdffb247434e974e381be9
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2022-05-31T08:58:37+02:00
Commit Message:
HYPNO: added missing click sounds when selecting ingredients in the bus level in spider
Changed paths:
engines/hypno/spider/spider.cpp
diff --git a/engines/hypno/spider/spider.cpp b/engines/hypno/spider/spider.cpp
index 3850de8f725..e27737327d7 100644
--- a/engines/hypno/spider/spider.cpp
+++ b/engines/hypno/spider/spider.cpp
@@ -333,69 +333,81 @@ void SpiderEngine::loadAssetsFullGame() {
sc->hots[2].actions.push_back(cl);
cl = new ChangeLevel("<add_ingredient>");
+ sc->hots[3].actions.push_back(snd);
sc->hots[3].actions.push_back(cl);
gl = new Global("", "CLEAR");
+ sc->hots[4].actions.push_back(snd);
sc->hots[4].actions.push_back(gl);
gl = new Global("GS_SWITCH1", "TURNON"); // hairspray
sc->hots[4].actions.push_back(gl);
gl = new Global("", "CLEAR");
+ sc->hots[5].actions.push_back(snd);
sc->hots[5].actions.push_back(gl);
gl = new Global("GS_SWITCH2", "TURNON"); // spot remover
sc->hots[5].actions.push_back(gl);
gl = new Global("", "CLEAR");
+ sc->hots[6].actions.push_back(snd);
sc->hots[6].actions.push_back(gl);
gl = new Global("GS_SWITCH3", "TURNON"); // rubbing alcohol
sc->hots[6].actions.push_back(gl);
gl = new Global("", "CLEAR");
+ sc->hots[7].actions.push_back(snd);
sc->hots[7].actions.push_back(gl);
gl = new Global("GS_SWITCH4", "TURNON"); // turpentine
sc->hots[7].actions.push_back(gl);
gl = new Global("", "CLEAR");
+ sc->hots[8].actions.push_back(snd);
sc->hots[8].actions.push_back(gl);
gl = new Global("GS_SWITCH5", "TURNON"); // spray paint
sc->hots[8].actions.push_back(gl);
gl = new Global("", "CLEAR");
+ sc->hots[9].actions.push_back(snd);
sc->hots[9].actions.push_back(gl);
gl = new Global("GS_SWITCH0", "TURNON"); // other
sc->hots[9].actions.push_back(gl);
gl = new Global("", "CLEAR");
+ sc->hots[10].actions.push_back(snd);
sc->hots[10].actions.push_back(gl);
gl = new Global("GS_SWITCH0", "TURNON"); // other
sc->hots[10].actions.push_back(gl);
gl = new Global("", "CLEAR");
+ sc->hots[11].actions.push_back(snd);
sc->hots[11].actions.push_back(gl);
gl = new Global("GS_SWITCH0", "TURNON"); // other
sc->hots[11].actions.push_back(gl);
gl = new Global("", "CLEAR");
+ sc->hots[12].actions.push_back(snd);
sc->hots[12].actions.push_back(gl);
gl = new Global("GS_SWITCH6", "TURNON"); // fingernail polish
sc->hots[12].actions.push_back(gl);
gl = new Global("", "CLEAR");
+ sc->hots[13].actions.push_back(snd);
sc->hots[13].actions.push_back(gl);
gl = new Global("GS_SWITCH0", "TURNON"); // other
sc->hots[13].actions.push_back(gl);
gl = new Global("", "CLEAR");
+ sc->hots[14].actions.push_back(snd);
sc->hots[14].actions.push_back(gl);
gl = new Global("GS_SWITCH0", "TURNON"); // other
More information about the Scummvm-git-logs
mailing list