zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-14 08:30:49 +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-01-04 00:46:57 +01:00
commit 1197df828c
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/p_lnspec.cpp
View file

@ -2587,6 +2587,7 @@ FUNC(LS_Line_SetBlocking)
ML_BLOCKUSE, ML_BLOCKUSE,
ML_BLOCKSIGHT, ML_BLOCKSIGHT,
ML_BLOCKHITSCAN, ML_BLOCKHITSCAN,
ML_SOUNDBLOCK,
-1 -1
}; };

4
src/p_pspr.cpp
View file

@ -83,8 +83,8 @@ static FRandom pr_gunshot ("GunShot");
static const FGenericButtons ButtonChecks[] = static const FGenericButtons ButtonChecks[] =
{ {
{ WRF_AllowReload, WF_WEAPONZOOMOK, BT_ZOOM, NAME_Zoom }, { WRF_AllowZoom, WF_WEAPONZOOMOK, BT_ZOOM, NAME_Zoom },
{ WRF_AllowZoom, WF_WEAPONRELOADOK, BT_RELOAD, NAME_Reload }, { WRF_AllowReload, WF_WEAPONRELOADOK, BT_RELOAD, NAME_Reload },
{ WRF_AllowUser1, WF_USER1OK, BT_USER1, NAME_User1 }, { WRF_AllowUser1, WF_USER1OK, BT_USER1, NAME_User1 },
{ WRF_AllowUser2, WF_USER2OK, BT_USER2, NAME_User2 }, { WRF_AllowUser2, WF_USER2OK, BT_USER2, NAME_User2 },
{ WRF_AllowUser3, WF_USER3OK, BT_USER3, NAME_User3 }, { WRF_AllowUser3, WF_USER3OK, BT_USER3, NAME_User3 },