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.h | |
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.h')
-rw-r--r-- | engines/bladerunner/combat.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/engines/bladerunner/combat.h b/engines/bladerunner/combat.h index 5860fd76d0..79de69d726 100644 --- a/engines/bladerunner/combat.h +++ b/engines/bladerunner/combat.h @@ -23,10 +23,10 @@ #ifndef BLADERUNNER_COMBAT_H #define BLADERUNNER_COMBAT_H -#include "bladerunner/bladerunner.h" - namespace BladeRunner { +class BladeRunnerEngine; + class Combat { BladeRunnerEngine *_vm; @@ -38,7 +38,7 @@ class Combat { int _random2; public: - int _ammoDamage[3] = { 10, 20, 30 }; + int _ammoDamage[3]; public: Combat(BladeRunnerEngine *vm); @@ -53,9 +53,8 @@ public: void setHitSoundId(int row, int column, int soundId); void setMissSoundId(int row, int column, int soundId); - }; -} +} // End of namespace BladeRunner #endif |