zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-29 15:32:57 +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-09-06 22:35:27 +02:00
commit 77a79048f8
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_strife/a_strifeweapons.cpp
View file

@ -552,7 +552,7 @@ DEFINE_ACTION_FUNCTION(AActor, A_MaulerTorpedoWave)
// If the torpedo hit the ceiling, it should still spawn the wave // If the torpedo hit the ceiling, it should still spawn the wave
savedz = self->Z(); savedz = self->Z();
if (wavedef && self->ceilingz < wavedef->Top()) if (wavedef && self->ceilingz < self->Z() + wavedef->height)
{ {
self->SetZ(self->ceilingz - wavedef->Height); self->SetZ(self->ceilingz - wavedef->Height);
} }

5
src/thingdef/thingdef_exp.cpp
View file

@ -309,7 +309,8 @@ static FxExpression *ParseExpressionC (FScanner &sc, PClassActor *cls)
static FxExpression *ParseExpressionB (FScanner &sc, PClassActor *cls) static FxExpression *ParseExpressionB (FScanner &sc, PClassActor *cls)
{ {
sc.GetToken(); sc.GetToken();
switch(sc.TokenType) int token = sc.TokenType;
switch(token)
{ {
case '~': case '~':
return new FxUnaryNotBitwise(ParseExpressionA (sc, cls)); return new FxUnaryNotBitwise(ParseExpressionA (sc, cls));
@ -325,7 +326,7 @@ static FxExpression *ParseExpressionB (FScanner &sc, PClassActor *cls)
case TK_Incr: case TK_Incr:
case TK_Decr: case TK_Decr:
return new FxPreIncrDecr(ParseExpressionA(sc, cls), sc.TokenType); return new FxPreIncrDecr(ParseExpressionA(sc, cls), token);
default: default:
sc.UnGet(); sc.UnGet();