[Scummvm-git-logs] scummvm master -> 7e28f2d6430b1edac4734de471e8e177a4ca8dbb

antoniou79 noreply at scummvm.org
Sat Jan 15 22:12:07 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:
7e28f2d643 BLADERUNNER: Add sound to buttons in KIA save


Commit: 7e28f2d6430b1edac4734de471e8e177a4ca8dbb
    https://github.com/scummvm/scummvm/commit/7e28f2d6430b1edac4734de471e8e177a4ca8dbb
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2022-01-16T00:10:39+02:00

Commit Message:
BLADERUNNER: Add sound to buttons in KIA save

The original has sound there, so this is a ScummVM specific fix

Changed paths:
    engines/bladerunner/ui/kia_section_save.cpp
    engines/bladerunner/ui/kia_section_save.h


diff --git a/engines/bladerunner/ui/kia_section_save.cpp b/engines/bladerunner/ui/kia_section_save.cpp
index 33ed51c8011..fc823a01b41 100644
--- a/engines/bladerunner/ui/kia_section_save.cpp
+++ b/engines/bladerunner/ui/kia_section_save.cpp
@@ -101,7 +101,7 @@ void KIASectionSave::open() {
 
 	if (!_saveList.empty() || ableToSaveGame) {
 
-		_buttons->activate(nullptr, nullptr, nullptr, onButtonPressed, this);
+		_buttons->activate(onButtonHovered, nullptr, nullptr, onButtonPressed, this);
 		_inputBox->show();
 
 		_scrollBox->clearLines();
@@ -314,28 +314,27 @@ void  KIASectionSave::inputBoxCallback(void *callbackData, void *source) {
 	}
 }
 
+void KIASectionSave::onButtonHovered(int buttonId, void *callbackData) {
+	KIASectionSave *self = (KIASectionSave *)callbackData;
+	self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxTEXT3), 100, 0, 0, 50, 0);
+}
+
 void KIASectionSave::onButtonPressed(int buttonId, void *callbackData) {
 	KIASectionSave *self = (KIASectionSave *)callbackData;
 
 	if (buttonId == 0) {
-		if (self->_selectedLineId == self->_newSaveLineId)
-		{
+		if (self->_selectedLineId == self->_newSaveLineId) {
 			self->save();
-		}
-		else
-		{
+		} else {
 			self->changeState(kStateOverwrite);
 		}
 	} else if (buttonId == 1) {
 		self->changeState(kStateNormal);
 		self->_vm->_audioPlayer->playAud(self->_vm->_gameInfo->getSfxTrack(kSfxSPNBEEP6), 90, -50, -50, 50, 0);
 	} else if (buttonId == 2) {
-		if (self->_state == kStateOverwrite)
-		{
+		if (self->_state == kStateOverwrite) {
 			self->save();
-		}
-		else if (self->_state == kStateDelete)
-		{
+		} else if (self->_state == kStateDelete) {
 			self->deleteSave();
 		}
 	}
diff --git a/engines/bladerunner/ui/kia_section_save.h b/engines/bladerunner/ui/kia_section_save.h
index 89c3402605b..ba5978b89f2 100644
--- a/engines/bladerunner/ui/kia_section_save.h
+++ b/engines/bladerunner/ui/kia_section_save.h
@@ -87,6 +87,7 @@ private:
 	static void scrollBoxCallback(void *callbackData, void *source, int lineData, int mouseButton);
 	static void inputBoxCallback(void *callbackData, void *source);
 
+	static void onButtonHovered(int buttonId, void *callbackData);
 	static void onButtonPressed(int buttonId, void *callbackData);
 
 	void changeState(State state);




More information about the Scummvm-git-logs mailing list