From e7225bced6a83314cc67812c3097890aeff2ea6e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 1 Dec 2013 01:15:10 +0100 Subject: [PATCH 1/3] - check negative XScale on sprites to allow mirroring. --- src/r_things.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/r_things.cpp b/src/r_things.cpp index 9bdba99f9..7243ac6f9 100644 --- a/src/r_things.cpp +++ b/src/r_things.cpp @@ -608,6 +608,11 @@ void R_ProjectSprite (AActor *thing, int fakeside, F3DFloor *fakefloor, F3DFloor } } } + if (spritescaleX < 0) + { + spritescaleX = -spritescaleX; + flip = !flip; + } if (voxel == NULL && (tex == NULL || tex->UseType == FTexture::TEX_Null)) { return; From 698495efc5525fa826d77e066ca100e0231f7664 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 1 Dec 2013 01:21:43 +0100 Subject: [PATCH 2/3] - fixed: missing return in playerinfo CCMD added. --- src/d_netinfo.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/d_netinfo.cpp b/src/d_netinfo.cpp index 12fb187ae..c2fb88aaf 100644 --- a/src/d_netinfo.cpp +++ b/src/d_netinfo.cpp @@ -1018,6 +1018,7 @@ CCMD (playerinfo) if (!playeringame[i]) { Printf(TEXTCOLOR_ORANGE "Player %d is not in the game\n", i); + return; } // Print special info From 7e062f394b11c300b77cc04fe94aa2cab7b0d434 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 1 Dec 2013 01:26:30 +0100 Subject: [PATCH 3/3] - fixed: animated door textures defined by index were not added to the sequence. - fixed: animated doors should set 'no decals' for the texture. - added 'allowdecals' option to override the above. --- src/textures/animations.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/textures/animations.cpp b/src/textures/animations.cpp index 5a6f0729a..09518cd5e 100644 --- a/src/textures/animations.cpp +++ b/src/textures/animations.cpp @@ -776,8 +776,13 @@ void FTextureManager::ParseAnimatedDoor(FScanner &sc) { sc.ScriptError ("Unknown texture %s", sc.String); } - frames.Push (v); } + frames.Push(v); + if (!sc.CheckString("allowdecals")) + { + Texture(v)->bNoDecals = true; + } + } else {