zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

This commit is contained in:
Christoph Oelckers 2016-02-01 01:50:41 +01:00
parent e73e26c15a 52a6f40eff
commit 0d5386f923
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/d_player.h
View File

@ -487,12 +487,15 @@ public:
void Uncrouch()
{
crouchfactor = FRACUNIT;
crouchoffset = 0;
crouchdir = 0;
crouching = 0;
crouchviewdelta = 0;
viewheight = mo->ViewHeight;
if (crouchfactor != FRACUNIT)
{
crouchfactor = FRACUNIT;
crouchoffset = 0;
crouchdir = 0;
crouching = 0;
crouchviewdelta = 0;
viewheight = mo->ViewHeight;
}
}
bool CanCrouch() const

1
src/g_mapinfo.cpp
View File

@ -240,6 +240,7 @@ void level_info_t::Reset()
flags2 = 0;
else
flags2 = LEVEL2_LAXMONSTERACTIVATION;
flags3 = 0;
Music = "";
LevelName = "";
FadeTable = "COLORMAP";

2
src/m_cheat.cpp
View File

@ -136,7 +136,7 @@ void cht_DoCheat (player_t *player, int cheat)
player->cheats &= ~CF_NOCLIP;
msg = GStrings("STSTR_NCOFF");
}
player->mo->velx = 1; // force some lateral movement so that internal variables are up to date
if (player->mo->velx == 0) player->mo->velx = 1; // force some lateral movement so that internal variables are up to date
break;
case CHT_NOVELOCITY: