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

Merge branch 'master' into localization

This commit is contained in:
Christoph Oelckers 2019-02-14 22:24:12 +01:00
parent 868ac5adf8 914818cb88
commit 6e9b62a43e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wadsrc/static/zscript/base.txt
View File

@ -15,7 +15,7 @@ struct _ native // These are the global variables, the struct is only here to av
native readonly ui bool netgame;
native readonly bool automapactive;
native play uint gameaction;
native readonly uint gameaction;
native readonly int gamestate;
native readonly TextureID skyflatnum;
native readonly Font smallfont;

4
wadsrc/static/zscript/shared/player.txt
View File

@ -1169,8 +1169,8 @@ class PlayerPawn : Actor
// Strife's player can't run when its health is below 10
if (health <= RunHealth)
{
forward = clamp(forward, -gameinfo.normforwardmove[0], gameinfo.normforwardmove[0]);
side = clamp(side, -gameinfo.normsidemove[0], gameinfo.normsidemove[0]);
forward = clamp(forward, -gameinfo.normforwardmove[0]*256, gameinfo.normforwardmove[0]*256);
side = clamp(side, -gameinfo.normsidemove[0]*256, gameinfo.normsidemove[0]*256);
}
// [GRB]