1 files changed, 14 insertions, 6 deletions
diff --git a/engines/bladerunner/combat.cpp b/engines/bladerunner/combat.cpp
index 79ea2ad7bf..79491e702a 100644
--- a/engines/bladerunner/combat.cpp
+++ b/engines/bladerunner/combat.cpp
@@ -22,14 +22,14 @@
 
 #include "bladerunner/combat.h"
 
-#include "bladerunner/bladerunner.h"
 
 #include "bladerunner/actor.h"
+#include "bladerunner/bladerunner.h"
 #include "bladerunner/settings.h"
 
 namespace BladeRunner {
 
-Combat::Combat(BladeRunnerEngine* vm) {
+Combat::Combat(BladeRunnerEngine *vm) {
 	_vm = vm;
 
 	_active = false;
@@ -74,12 +74,20 @@ void Combat::disable() {
 	_enabled = false;
 }
 
-void Combat::setHitSoundId(int row, int column, int soundId) {
-	_hitSoundId[row * 3 + column] = soundId;
+void Combat::setHitSound(int ammoType, int column, int soundId) {
+	_hitSoundId[ammoType * 3 + column] = soundId;
+}
+
+void Combat::setMissSound(int ammoType, int column, int soundId) {
+	_missSoundId[ammoType * 3 + column] = soundId;
+}
+
+int Combat::getHitSound() {
+	return _hitSoundId[3 * _vm->_settings->getAmmoType() + _vm->_rnd.getRandomNumber(2)];
 }
 
-void Combat::setMissSoundId(int row, int column, int soundId) {
-	_missSoundId[row * 3 + column] = soundId;
+int Combat::getMissSound() {
+	return _hitSoundId[3 * _vm->_settings->getAmmoType() + _vm->_rnd.getRandomNumber(2)];
 }
 
 } // End of namespace BladeRunner