zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-30 13:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: Comment out unused enum values but leave behind for reference purposes.

Browse source 
* In line with SW, should have been done with fb91fc49a3.
This commit is contained in:
Mitchell Richters 2021-01-02 10:09:42 +11:00
parent 4aae71f0ee
commit 5f33b0087f
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
source/games/duke/src/input.cpp
View file

@ -497,8 +497,10 @@ void hud_input(int plnum)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#if 0
enum enum
{ {
TURBOTURNTIME = (TICRATE/8), // 7 TURBOTURNTIME = (TICRATE/8), // 7
NORMALTURN = 15, NORMALTURN = 15,
PREAMBLETURN = 5, PREAMBLETURN = 5,
@ -507,7 +509,11 @@ enum
MAXSVEL = ((NORMALKEYMOVE*2)+10), MAXSVEL = ((NORMALKEYMOVE*2)+10),
MAXANGVEL = 1024, // 127 MAXANGVEL = 1024, // 127
MAXHORIZVEL = 256, // 127 MAXHORIZVEL = 256, // 127
};
#endif
enum
{
MAXVELMOTO = 120, MAXVELMOTO = 120,
VEHICLETURN = 20 VEHICLETURN = 20
}; };
@ -777,14 +783,11 @@ static void FinalizeInput(int playerNum, InputPacket& input, bool vehicle)
{ {
if (p->on_crane == nullptr) if (p->on_crane == nullptr)
{ {
if (!vehicle) if (vehicle)
{ {
loc.fvel = clamp(loc.fvel + input.fvel, -MAXVEL, MAXVEL);
loc.svel = clamp(loc.svel + input.svel, -MAXSVEL, MAXSVEL);
}
else
loc.fvel = clamp(input.fvel, -(MAXVELMOTO >> 3), MAXVELMOTO); loc.fvel = clamp(input.fvel, -(MAXVELMOTO >> 3), MAXVELMOTO);
} }
}
else else
{ {
loc.fvel = input.fvel = 0; loc.fvel = input.fvel = 0;
@ -793,8 +796,6 @@ static void FinalizeInput(int playerNum, InputPacket& input, bool vehicle)
if (p->on_crane == nullptr && p->newOwner == nullptr) if (p->on_crane == nullptr && p->newOwner == nullptr)
{ {
// input.avel already added to loc in processMovement()
loc.avel = clamp(loc.avel, -MAXANGVEL, MAXANGVEL);
if (!SyncInput() && input.avel) if (!SyncInput() && input.avel)
{ {
p->angle.spin = bamlook(0); p->angle.spin = bamlook(0);
@ -805,12 +806,7 @@ static void FinalizeInput(int playerNum, InputPacket& input, bool vehicle)
loc.avel = input.avel = 0; loc.avel = input.avel = 0;
} }
if (p->newOwner == nullptr && (!(p->sync.actions & SB_CENTERVIEW) || p->sync.actions & SB_CENTERVIEW && abs(p->horizon.horiz.asbuild()) <= 5)) if (p->newOwner != nullptr && ((p->sync.actions & SB_CENTERVIEW) || !(p->sync.actions & SB_CENTERVIEW) && abs(p->horizon.horiz.asbuild()) > 5))
{
// input.horz already added to loc in processMovement()
loc.horz = clamp(loc.horz, -MAXHORIZVEL, MAXHORIZVEL);
}
else
{ {
loc.horz = input.horz = 0; loc.horz = input.horz = 0;
} }