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

Merge remote-tracking branch 'remotes/origin/master'

This commit is contained in:
Christoph Oelckers 2017-02-12 21:57:46 +01:00
parent 9ece757cb3 9482c3e639
commit 7d96f85fe8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/r_things.cpp
View File

@ -2071,7 +2071,7 @@ void R_DrawSprite (vissprite_t *spr)
// [RH] rewrote this to be based on which part of the sector is really visible
double scale = InvZtoScale * spr->idepth;
double hzb = DBL_MIN, hzt = DBL_MAX;
double hzb = -DBL_MAX, hzt = DBL_MAX;
if (spr->bIsVoxel && spr->floorclip != 0)
{

2
src/s_sound.cpp
View File

@ -692,6 +692,7 @@ static void CalcPosVel(int type, const AActor *actor, const sector_t *sector,
else
{
listenpos.Zero();
pos->Zero();
pgroup = 0;
}
@ -711,7 +712,6 @@ static void CalcPosVel(int type, const AActor *actor, const sector_t *sector,
{
case SOURCE_None:
default:
pos->Zero();
break;
case SOURCE_Actor:

2
src/scripting/zscript/zcc_compile.cpp
View File

@ -69,7 +69,7 @@ static FString GetStringConst(FxExpression *ex, FCompileContext &ctx)
{
ex = new FxStringCast(ex);
ex = ex->Resolve(ctx);
return static_cast<FxConstant*>(ex)->GetValue().GetString();
return ex ? static_cast<FxConstant*>(ex)->GetValue().GetString() : FString();
}
int ZCCCompiler::IntConstFromNode(ZCC_TreeNode *node, PStruct *cls)