zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +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-05-04 14:38:57 +02:00
commit bb378f2d94
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/p_lnspec.cpp
View file

@ -75,9 +75,6 @@
*/ */
static const BYTE ChangeMap[8] = { 0, 1, 5, 3, 7, 2, 6, 0 }; 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, \ #define FUNC(a) static int a (line_t *ln, AActor *it, bool backSide, \
int arg0, int arg1, int arg2, int arg3, int arg4) int arg0, int arg1, int arg2, int arg3, int arg4)
@ -3444,9 +3441,9 @@ static lnSpecFunc LineSpecials[] =
/* 154 */ LS_Teleport_NoStop, /* 154 */ LS_Teleport_NoStop,
/* 155 */ LS_NOP, /* 155 */ LS_NOP,
/* 156 */ LS_NOP, /* 156 */ LS_NOP,
/* 157 */ LS_SetGlobalFogParameter, /* 157 */ LS_NOP, // SetGlobalFogParameter
/* 158 */ LS_FS_Execute, /* 158 */ LS_FS_Execute,
/* 159 */ LS_Sector_SetPlaneReflection, /* 159 */ LS_NOP, // Sector_SetPlaneReflection
/* 160 */ LS_NOP, // Sector_Set3DFloor /* 160 */ LS_NOP, // Sector_Set3DFloor
/* 161 */ LS_NOP, // Sector_SetContents /* 161 */ LS_NOP, // Sector_SetContents
/* 162 */ LS_NOP, // Reserved Doom64 branch /* 162 */ LS_NOP, // Reserved Doom64 branch

1
src/textures/warptexture.cpp
View file

@ -45,6 +45,7 @@ FWarpTexture::FWarpTexture (FTexture *source, int warptype)
: GenTime (0), SourcePic (source), Pixels (0), Spans (0), Speed (1.f) : GenTime (0), SourcePic (source), Pixels (0), Spans (0), Speed (1.f)
{ {
CopyInfo(source); CopyInfo(source);
if (warptype == 2) SetupMultipliers(256, 128);
SetupMultipliers(128, 128); // [mxd] SetupMultipliers(128, 128); // [mxd]
bWarped = warptype; bWarped = warptype;
} }