From 9d9696de6a4e4a73cfeae2683d5582d7198c14b0 Mon Sep 17 00:00:00 2001 From: pierow Date: Wed, 15 Aug 2018 03:37:54 -0400 Subject: [PATCH] revert unintentional changes to commented code --- main/source/common/const.h | 2 +- main/source/pm_shared/pm_shared.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/main/source/common/const.h b/main/source/common/const.h index 281aaf0f..2ae9cdbe 100644 --- a/main/source/common/const.h +++ b/main/source/common/const.h @@ -68,7 +68,7 @@ // edict->movetype values #define MOVETYPE_NONE 0 // never moves //#define MOVETYPE_ANGLENOCLIP 1 -//#define MOVETYPE_JUMPHELD 2 +//#define MOVETYPE_ANGLECLIP 2 #define MOVETYPE_WALK 3 // Player only - moving on the ground #define MOVETYPE_STEP 4 // gravity, special edge handling -- monsters use this #define MOVETYPE_FLY 5 // No gravity, but still collides with stuff diff --git a/main/source/pm_shared/pm_shared.cpp b/main/source/pm_shared/pm_shared.cpp index 929768d9..da4721e5 100644 --- a/main/source/pm_shared/pm_shared.cpp +++ b/main/source/pm_shared/pm_shared.cpp @@ -5341,6 +5341,7 @@ void PM_Jump (void) if (pmove->dead || GetHasUpgrade(pmove->iuser4, MASK_ENSNARED)) { + //pmove->oldbuttons |= IN_JUMP; // don't jump again until released pmove->flags |= FL_JUMPHELD; return; }