zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-25 21:41:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Christoph Oelckers 2016-02-01 01:50:41 +01:00
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() void Uncrouch()
{ {
crouchfactor = FRACUNIT; if (crouchfactor != FRACUNIT)
crouchoffset = 0; {
crouchdir = 0; crouchfactor = FRACUNIT;
crouching = 0; crouchoffset = 0;
crouchviewdelta = 0; crouchdir = 0;
viewheight = mo->ViewHeight; crouching = 0;
crouchviewdelta = 0;
viewheight = mo->ViewHeight;
}
} }
bool CanCrouch() const bool CanCrouch() const

1
src/g_mapinfo.cpp
View file

@ -240,6 +240,7 @@ void level_info_t::Reset()
flags2 = 0; flags2 = 0;
else else
flags2 = LEVEL2_LAXMONSTERACTIVATION; flags2 = LEVEL2_LAXMONSTERACTIVATION;
flags3 = 0;
Music = ""; Music = "";
LevelName = ""; LevelName = "";
FadeTable = "COLORMAP"; 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; player->cheats &= ~CF_NOCLIP;
msg = GStrings("STSTR_NCOFF"); 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; break;
case CHT_NOVELOCITY: case CHT_NOVELOCITY: