diff options
| author | Peter Kohaut | 2016-09-10 18:16:17 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2016-09-29 22:33:40 +0200 |
| commit | b67bca20b5db7f3d6473341efd7fabfa6532f465 (patch) | |
| tree | 6fbbd28dc707dac1c3cacde2e8622cceea6d1b0f /engines/bladerunner/combat.cpp | |
| parent | 2888d0b3460cdca2dd52f8d6aa94b429d46345ad (diff) | |
| download | scummvm-rg350-b67bca20b5db7f3d6473341efd7fabfa6532f465.tar.gz scummvm-rg350-b67bca20b5db7f3d6473341efd7fabfa6532f465.tar.bz2 scummvm-rg350-b67bca20b5db7f3d6473341efd7fabfa6532f465.zip | |
BLADERUNNER: Pull in changes from madmoose
Diffstat (limited to 'engines/bladerunner/combat.cpp')
| -rw-r--r-- | engines/bladerunner/combat.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/engines/bladerunner/combat.cpp b/engines/bladerunner/combat.cpp index 5fe2e3f36e..1f61d7bacc 100644 --- a/engines/bladerunner/combat.cpp +++ b/engines/bladerunner/combat.cpp @@ -1,19 +1,23 @@ #include "bladerunner/combat.h" + #include "bladerunner/bladerunner.h" + #include "bladerunner/actor.h" #include "bladerunner/settings.h" namespace BladeRunner { - Combat::Combat(BladeRunnerEngine* vm) { _vm = vm; _active = false; _enabled = true; - int i; - for (i = 0; i < 9; i++) { + _ammoDamage[0] = 10; + _ammoDamage[1] = 20; + _ammoDamage[2] = 30; + + for (int i = 0; i < 9; i++) { _hitSoundId[i] = -1; _missSoundId[i] = -1; } @@ -48,7 +52,6 @@ void Combat::disable() { _enabled = false; } - void Combat::setHitSoundId(int row, int column, int soundId) { _hitSoundId[row * 3 + column] = soundId; } @@ -56,4 +59,5 @@ void Combat::setHitSoundId(int row, int column, int soundId) { void Combat::setMissSoundId(int row, int column, int soundId) { _missSoundId[row * 3 + column] = soundId; } -}
\ No newline at end of file + +} // End of namespace BladeRunner |