diff options
| author | Stijn Buys <ingar@osirion.org> | 2012-11-14 16:03:49 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2012-11-14 16:03:49 +0000 |
| commit | 5a3ac6c9f437290e88fa2ac2f194f91d4cb8a2a8 (patch) | |
| tree | 045b94ab47ed1fda70b717db24e5f4811e055b76 /src | |
| parent | 0cf596e0505f1198748931787b93f469f3e58db7 (diff) | |
Corrected a bug in fire control handling.
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/input.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/client/input.cc b/src/client/input.cc index 2c03c64..5c5a71d 100644 --- a/src/client/input.cc +++ b/src/client/input.cc @@ -353,7 +353,7 @@ void shutdown() void action_press(Key *key) { - switch(key->action()->id()) { + switch(key->action()->id()) { case Action::None: case Action::Console: return; @@ -438,7 +438,7 @@ void action_press(Key *key) /* -- fire control -------------------------------- */ case Action::Fire: - local_controlflags = local_controlflags & core::EntityControlable::ControlFlagFire; + local_controlflags = local_controlflags | core::EntityControlable::ControlFlagFire; break; } } @@ -696,8 +696,7 @@ void reset() local_roll = 0.0f; local_vstrafe = 0.0f; local_strafe = 0.0f; - local_afterburner = 0.0f; - + local_afterburner = 0.0f; local_controlflags = core::EntityControlable::ControlFlagNone; if (core::localcontrol()) { |