mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-11 23:32:02 +00:00
Merge branch 'master' of https://github.com/rheit/zdoom
This commit is contained in:
commit
0d5386f923
3 changed files with 11 additions and 7 deletions
|
@ -486,6 +486,8 @@ public:
|
|||
}
|
||||
|
||||
void Uncrouch()
|
||||
{
|
||||
if (crouchfactor != FRACUNIT)
|
||||
{
|
||||
crouchfactor = FRACUNIT;
|
||||
crouchoffset = 0;
|
||||
|
@ -494,6 +496,7 @@ public:
|
|||
crouchviewdelta = 0;
|
||||
viewheight = mo->ViewHeight;
|
||||
}
|
||||
}
|
||||
|
||||
bool CanCrouch() const
|
||||
{
|
||||
|
|
|
@ -240,6 +240,7 @@ void level_info_t::Reset()
|
|||
flags2 = 0;
|
||||
else
|
||||
flags2 = LEVEL2_LAXMONSTERACTIVATION;
|
||||
flags3 = 0;
|
||||
Music = "";
|
||||
LevelName = "";
|
||||
FadeTable = "COLORMAP";
|
||||
|
|
|
@ -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:
|
||||
|
|
Loading…
Reference in a new issue