diff options
author | Peter Kohaut | 2018-01-14 12:12:06 +0100 |
---|---|---|
committer | Peter Kohaut | 2018-01-28 10:57:16 +0100 |
commit | 1e5f9d3078f236f306b5d868bcd52f4e47f7b512 (patch) | |
tree | 0d402af27d75064d60e4674ab3bd4c9ad08759f1 /engines/bladerunner/combat.cpp | |
parent | 3a937f19c0a5e347c801c62d345475be082f9e41 (diff) | |
download | scummvm-rg350-1e5f9d3078f236f306b5d868bcd52f4e47f7b512.tar.gz scummvm-rg350-1e5f9d3078f236f306b5d868bcd52f4e47f7b512.tar.bz2 scummvm-rg350-1e5f9d3078f236f306b5d868bcd52f4e47f7b512.zip |
BLADERUNNER: Added basic KIA interface
Settings works
Help works
Clue database works
Fixed code for inserting objects into scene
Reorganization of few files
Unification & code formatting of few older files
Diffstat (limited to 'engines/bladerunner/combat.cpp')
-rw-r--r-- | engines/bladerunner/combat.cpp | 20 |
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 |