zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2024-11-11 07:12:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: ThrustThing should add to the velocity, not set it.

Browse source
This commit is contained in:
Christoph Oelckers 2016-05-03 10:26:29 +02:00
parent 4fbe77fb82
commit a576243ff2
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/p_lnspec.cpp
View file

@ -75,6 +75,10 @@
*/ */
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)
@ -1128,7 +1132,7 @@ FUNC(LS_Teleport_Line)
static void ThrustThingHelper(AActor *it, DAngle angle, double force, INTBOOL nolimit) static void ThrustThingHelper(AActor *it, DAngle angle, double force, INTBOOL nolimit)
{ {
it->VelFromAngle(angle, force); it->Thrust(angle, force);
if (!nolimit) if (!nolimit)
{ {
it->Vel.X = clamp(it->Vel.X, -MAXMOVE, MAXMOVE); it->Vel.X = clamp(it->Vel.X, -MAXMOVE, MAXMOVE);
@ -3440,9 +3444,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_NOP, // SetGlobalFogParameter // in GZDoom /* 157 */ LS_SetGlobalFogParameter,
/* 158 */ LS_FS_Execute, /* 158 */ LS_FS_Execute,
/* 159 */ LS_NOP, // Sector_SetPlaneReflection in GZDoom /* 159 */ LS_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