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

- cleanup

Browse source
This commit is contained in:
Christoph Oelckers 2020-07-18 01:40:18 +02:00
parent ba69084aa5
commit ac3925f64d
3 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/games/duke/src/player.h
View file

@ -61,7 +61,6 @@ extern input_t sync[MAXPLAYERS];
# define PWEAPON(Player, Weapon, Wmember) (aplWeapon ## Wmember [Weapon][Player]) # define PWEAPON(Player, Weapon, Wmember) (aplWeapon ## Wmember [Weapon][Player])
extern playerdata_t *const g_player; extern playerdata_t *const g_player;
extern int32_t mouseyaxismode;
void P_GetInput(int playerNum); void P_GetInput(int playerNum);

4
source/games/duke/src/zz_game.cpp
View file

@ -68,6 +68,10 @@ weaponhit hittype[MAXSPRITES];
ActorInfo actorinfo[MAXTILES]; ActorInfo actorinfo[MAXTILES];
player_struct ps[MAXPLAYERS]; player_struct ps[MAXPLAYERS];
int32_t PHEIGHT = PHEIGHT_DUKE;
int32_t lastvisinc;
void app_loop() void app_loop()
{ {

31
source/games/duke/src/zz_player.cpp
View file

@ -27,26 +27,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_DUKE_NS BEGIN_DUKE_NS
enum
{
NORMALKEYMOVE = 40,
MAXVEL = ((NORMALKEYMOVE * 2) + 10),
MAXSVEL = ((NORMALKEYMOVE * 2) + 10),
MAXANGVEL = 1024,
MAXHORIZVEL = 256,
int32_t PHEIGHT = PHEIGHT_DUKE; MOTOTURN = 20,
MAXVELMOTO = 120,
int32_t lastvisinc; };
#define TURBOTURNTIME (TICRATE/8) // 7
#define NORMALTURN 15
#define PREAMBLETURN 5
#define NORMALKEYMOVE 40
#define MAXVEL ((NORMALKEYMOVE*2)+10)
#define MAXSVEL ((NORMALKEYMOVE*2)+10)
#define MAXANGVEL 1024
#define MAXHORIZVEL 256
#define ONEEIGHTYSCALE 4
#define MOTOTURN 20
#define MAXVELMOTO 120
int32_t g_myAimStat = 0, g_oldAimStat = 0;
int32_t mouseyaxismode = -1;
enum inputlock_t enum inputlock_t
{ {
@ -158,7 +149,7 @@ void FinalizeInput(int playerNum, input_t &input, bool vehicle)
{ {
loc.q16horz = fix16_clamp(fix16_sadd(loc.q16horz, input.q16horz), F16(-MAXHORIZVEL), F16(MAXHORIZVEL)); loc.q16horz = fix16_clamp(fix16_sadd(loc.q16horz, input.q16horz), F16(-MAXHORIZVEL), F16(MAXHORIZVEL));
if (!synchronized_input) if (!synchronized_input)
p->q16horiz += input.q16horz; // will be clamped below in sethorizon. p->q16horiz += input.q16horz; // will be clamped by the caller because further operations on q16horiz follow.
} }
} }
} }