teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 00:41:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed pointless constexpr declaration on numeric constants.

Browse source
This commit is contained in:
Christoph Oelckers 2020-06-12 16:49:35 +02:00
parent 3b7f494a88
commit 4f0e3adfbb
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/common/scripting/core/dictionary.cpp
View file

@ -29,7 +29,7 @@ void Dictionary::Serialize(FSerializer &arc)
{
Super::Serialize(arc);
constexpr char key[] { "dictionary" };
static const char key[] = "dictionary";
if (arc.isWriting())
{

4
source/core/inputstate.h
View file

@ -179,8 +179,8 @@ public:
extern InputState inputState;
constexpr int analogExtent = 32767; // used as a divisor for scaling joystick input.
constexpr float joyaxesScale = (float)analogExtent * 0.75f; // used as a multiplier for scaling joystick input.
const int analogExtent = 32767; // used as a divisor for scaling joystick input.
const float joyaxesScale = (float)analogExtent * 0.75f; // used as a multiplier for scaling joystick input.
void CONTROL_GetInput(ControlInfo* info);
int32_t handleevents(void);

4
source/duke3d/src/premap.cpp
View file

@ -407,8 +407,8 @@ static void G_DoLoadScreen(const char *statustext, int percent)
if (percent != -1)
{
int const width = scale(scale(xdim-1, 288, 320), percent, 100);
int constexpr tile = 929;
int constexpr bits = 2+8+16;
int const tile = 929;
int const bits = 2+8+16;
rotatesprite(31<<16 , 145<<16, 65536, 0, tile, 15, 0, bits, 0, 0, width, ydim-1);
rotatesprite(159<<16, 145<<16, 65536, 0, tile, 15, 0, bits, 0, 0, width, ydim-1);

2
source/exhumed/src/player.cpp
View file

@ -188,7 +188,7 @@ void PlayerInterruptKeys()
int const playerRunning = G_CheckAutorun(buttonMap.ButtonDown(gamefunc_Run));
int const turnAmount = playerRunning ? 12 : 8;
int const keyMove = playerRunning ? 12 : 6;
constexpr int const analogTurnAmount = 12;
int const analogTurnAmount = 12;
if (buttonMap.ButtonDown(gamefunc_Strafe))
{

8
source/rr/src/player.cpp
View file

@ -3254,7 +3254,7 @@ void P_GetInput(int const playerNum)
int const playerRunning = G_CheckAutorun(buttonMap.ButtonDown(gamefunc_Run));
int const turnAmount = playerRunning ? (NORMALTURN << 1) : NORMALTURN;
constexpr int analogTurnAmount = (NORMALTURN << 1);
int const analogTurnAmount = (NORMALTURN << 1);
int const keyMove = playerRunning ? (NORMALKEYMOVE << 1) : NORMALKEYMOVE;
input_t input {};
@ -3668,7 +3668,7 @@ void P_GetInputMotorcycle(int playerNum)
// JBF: Run key behaviour is selectable
int const playerRunning = G_CheckAutorun(buttonMap.ButtonDown(gamefunc_Run));
constexpr int analogTurnAmount = (NORMALTURN << 1);
int const analogTurnAmount = (NORMALTURN << 1);
int const keyMove = playerRunning ? (NORMALKEYMOVE << 1) : NORMALKEYMOVE;
input_t input {};
@ -3918,7 +3918,7 @@ void P_GetInputBoat(int playerNum)
// JBF: Run key behaviour is selectable
int const playerRunning = G_CheckAutorun(buttonMap.ButtonDown(gamefunc_Run));
constexpr int analogTurnAmount = (NORMALTURN << 1);
int const analogTurnAmount = (NORMALTURN << 1);
int const keyMove = playerRunning ? (NORMALKEYMOVE << 1) : NORMALKEYMOVE;
input_t input {};
@ -4159,7 +4159,7 @@ void P_DHGetInput(int const playerNum)
int const playerCrouch = sub_299D8();
int const playerJump = buttonMap.ButtonDown(gamefunc_Jump) && !(pPlayer->cursectnum >= 0 && sector[pPlayer->cursectnum].hitag == 2003);
int const turnAmount = playerCrouch ? 2 : (playerRunning ? 16 : 8);
constexpr int analogTurnAmount = 16;
int const analogTurnAmount = 16;
int const keyMove = playerCrouch ? 3 : (playerRunning ? 24 : 12);
input_t input {};