From 2c888165777235fbc3d4e5f830c7a5aa89d4b4ae Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 4 May 2016 13:25:26 +0200 Subject: [PATCH 1/2] - fixed parameters for warp type 2. --- src/textures/warptexture.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/textures/warptexture.cpp b/src/textures/warptexture.cpp index 2d9663dbcc..a8a2ddb9e1 100644 --- a/src/textures/warptexture.cpp +++ b/src/textures/warptexture.cpp @@ -45,6 +45,7 @@ FWarpTexture::FWarpTexture (FTexture *source, int warptype) : GenTime (0), SourcePic (source), Pixels (0), Spans (0), Speed (1.f) { CopyInfo(source); + if (warptype == 2) SetupMultipliers(256, 128); SetupMultipliers(128, 128); // [mxd] bWarped = warptype; } From 0b833be06e10f7f6a7c7b122f3b63774289cff99 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 4 May 2016 14:37:52 +0200 Subject: [PATCH 2/2] - removed accidentally added GZDoom specials. --- src/p_lnspec.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/p_lnspec.cpp b/src/p_lnspec.cpp index 103ac1264f..c7d801cbb9 100644 --- a/src/p_lnspec.cpp +++ b/src/p_lnspec.cpp @@ -75,9 +75,6 @@ */ static const BYTE ChangeMap[8] = { 0, 1, 5, 3, 7, 2, 6, 0 }; -int LS_Sector_SetPlaneReflection(line_t *ln, AActor *it, bool backSide, int arg0, int arg1, int arg2, int arg3, int arg4); -int LS_SetGlobalFogParameter(line_t *ln, AActor *it, bool backSide, int arg0, int arg1, int arg2, int arg3, int arg4); - #define FUNC(a) static int a (line_t *ln, AActor *it, bool backSide, \ int arg0, int arg1, int arg2, int arg3, int arg4) @@ -3444,9 +3441,9 @@ static lnSpecFunc LineSpecials[] = /* 154 */ LS_Teleport_NoStop, /* 155 */ LS_NOP, /* 156 */ LS_NOP, - /* 157 */ LS_SetGlobalFogParameter, + /* 157 */ LS_NOP, // SetGlobalFogParameter /* 158 */ LS_FS_Execute, - /* 159 */ LS_Sector_SetPlaneReflection, + /* 159 */ LS_NOP, // Sector_SetPlaneReflection /* 160 */ LS_NOP, // Sector_Set3DFloor /* 161 */ LS_NOP, // Sector_SetContents /* 162 */ LS_NOP, // Reserved Doom64 branch