diff options
Diffstat (limited to '')
| -rw-r--r-- | src/hl2h.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/hl2h.cpp b/src/hl2h.cpp index a4a1a88..c6c0aeb 100644 --- a/src/hl2h.cpp +++ b/src/hl2h.cpp | |||
| @@ -152,21 +152,11 @@ static void do_move(int seq) { | |||
| 152 | bool onground = (flags & FL_ONGROUND) != 0; | 152 | bool onground = (flags & FL_ONGROUND) != 0; |
| 153 | bool inwater = (flags & FL_INWATER) != 0; | 153 | bool inwater = (flags & FL_INWATER) != 0; |
| 154 | 154 | ||
| 155 | bool climb_on = feature_active(FEAT_CLIMB); // bind held (or middle mouse when unbound) | ||
| 156 | bool bhop_on = feature_active(FEAT_BHOP); | 155 | bool bhop_on = feature_active(FEAT_BHOP); |
| 157 | 156 | ||
| 158 | static bool lastground = false; | 157 | static bool lastground = false; |
| 159 | 158 | ||
| 160 | if (climb_on) { | 159 | if (bhop_on && (cmd->buttons & IN_JUMP)) { |
| 161 | if (cmd->command_number % 2) { | ||
| 162 | cmd->buttons &= ~IN_JUMP; | ||
| 163 | cmd->buttons |= IN_USE; | ||
| 164 | } else { | ||
| 165 | cmd->buttons &= ~IN_USE; | ||
| 166 | cmd->buttons |= IN_JUMP; | ||
| 167 | } | ||
| 168 | note_modified(cmd, flags, (float *)(e + g_net.velocity)); | ||
| 169 | } else if (bhop_on && (cmd->buttons & IN_JUMP)) { | ||
| 170 | if (inwater && (cmd->buttons & IN_DUCK)) { | 160 | if (inwater && (cmd->buttons & IN_DUCK)) { |
| 171 | lastground = onground; | 161 | lastground = onground; |
| 172 | return; | 162 | return; |
| @@ -282,7 +272,6 @@ static void install_hook() { | |||
| 282 | extern void find_modules(); | 272 | extern void find_modules(); |
| 283 | extern void resolve_netvars(); | 273 | extern void resolve_netvars(); |
| 284 | extern bool find_input_global(); | 274 | extern bool find_input_global(); |
| 285 | extern void init_x11(); | ||
| 286 | extern void init_conmsg(); | 275 | extern void init_conmsg(); |
| 287 | extern void install_menu(); | 276 | extern void install_menu(); |
| 288 | 277 | ||
