diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-12-18 20:33:34 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2007-12-18 20:33:34 +0000 |
| commit | 723057e8c9b4de4fff782fba543e87ef7577ca1c (patch) | |
| tree | 048c984b96c015107c99110276f5eff90c585bc9 /src/game/server/gs_server.cpp | |
| parent | e988e3c1615a18f0abdaec9b3d5a3467c38a882a (diff) | |
| download | zcatch-723057e8c9b4de4fff782fba543e87ef7577ca1c.tar.gz zcatch-723057e8c9b4de4fff782fba543e87ef7577ca1c.zip | |
fixed fullauto on shotgun and rockets. fixed animation problem with 25 snaprate on hammer
Diffstat (limited to 'src/game/server/gs_server.cpp')
| -rw-r--r-- | src/game/server/gs_server.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp index 530727f6..a45e52ab 100644 --- a/src/game/server/gs_server.cpp +++ b/src/game/server/gs_server.cpp @@ -920,9 +920,13 @@ int player::handle_weapons() return handle_sniper(); */ - if(count_input(previnput.fire, input.fire).presses) //previnput.fire != input.fire && (input.fire&1)) + if(reload_timer == 0) { - if(reload_timer == 0) + bool fullauto = false; + if(active_weapon == WEAPON_ROCKET || active_weapon == WEAPON_SHOTGUN) + fullauto = true; + + if(count_input(previnput.fire, input.fire).presses || (fullauto && input.fire&1)) { // fire! if(weapons[active_weapon].ammo) |