zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-05 21:30:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

- SW: Make game's local input buffer static within input.cpp.

Browse source
This commit is contained in:
Mitchell Richters 2020-09-06 20:12:39 +10:00
parent 290e615807
commit 0ef9da6a0c
4 changed files with 20 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/sw/src/draw.cpp
View file

@ -1650,8 +1650,7 @@ drawscreen(PLAYERp pp, double smoothratio)
tz = camerapp->oposz + xs_CRoundToInt(fmulscale16(camerapp->posz - camerapp->oposz, smoothratio)); tz = camerapp->oposz + xs_CRoundToInt(fmulscale16(camerapp->posz - camerapp->oposz, smoothratio));
// TODO: It'd be better to check pp->input.q16angvel instead, problem is that // TODO: It'd be better to check pp->input.q16angvel instead, problem is that
// it's been repurposed for the q16ang diff while tying input to framerate // it's been repurposed for the q16ang diff while tying input to framerate
if (cl_syncinput || (pp != Player+myconnectindex) || if (cl_syncinput || (pp != Player+myconnectindex) || TEST(pp->Flags, PF_DEAD))
(TEST(pp->Flags, PF_DEAD) && (loc.q16avel == 0)))
{ {
tq16ang = camerapp->oq16ang + xs_CRoundToInt(fmulscale16(NORM_Q16ANGLE(camerapp->q16ang + IntToFixed(1024) - camerapp->oq16ang) - IntToFixed(1024), smoothratio)); tq16ang = camerapp->oq16ang + xs_CRoundToInt(fmulscale16(NORM_Q16ANGLE(camerapp->q16ang + IntToFixed(1024) - camerapp->oq16ang) - IntToFixed(1024), smoothratio));
tq16horiz = camerapp->oq16horiz + xs_CRoundToInt(fmulscale16(camerapp->q16horiz - camerapp->oq16horiz, smoothratio)); tq16horiz = camerapp->oq16horiz + xs_CRoundToInt(fmulscale16(camerapp->q16horiz - camerapp->oq16horiz, smoothratio));

2
source/sw/src/game.h
View file

@ -805,8 +805,6 @@ enum
}; };
extern InputPacket loc;
#define PACK 1 #define PACK 1
extern SWBOOL CameraTestMode; extern SWBOOL CameraTestMode;

34
source/sw/src/input.cpp
View file

@ -40,7 +40,7 @@ double scaleAdjustmentToInterval(double x) { return x * (120 / synctics) / (1000
void DoPlayerTurn(PLAYERp pp, fixed_t *pq16ang, fixed_t q16angvel); void DoPlayerTurn(PLAYERp pp, fixed_t *pq16ang, fixed_t q16angvel);
void DoPlayerHorizon(PLAYERp pp, fixed_t *pq16horiz, fixed_t q16horz); void DoPlayerHorizon(PLAYERp pp, fixed_t *pq16horiz, fixed_t q16horz);
InputPacket loc; static InputPacket loc;
void void
InitNetVars(void) InitNetVars(void)
@ -67,7 +67,7 @@ void GameInterface::ResetFollowPos(bool)
Follow_posy = pp->posy; Follow_posy = pp->posy;
} }
static void getinput(InputPacket *loc, ControlInfo* const hidInput) static void getinput(ControlInfo* const hidInput)
{ {
int i; int i;
PLAYERp pp = Player + myconnectindex; PLAYERp pp = Player + myconnectindex;
@ -126,9 +126,9 @@ static void getinput(InputPacket *loc, ControlInfo* const hidInput)
// for dividing controller input to match speed input speed of other games. // for dividing controller input to match speed input speed of other games.
float const ticrateScale = 0.75f; float const ticrateScale = 0.75f;
ApplyGlobalInput(*loc, hidInput); ApplyGlobalInput(loc, hidInput);
bool mouseaim = !(loc->actions & SB_AIMMODE); bool mouseaim = !(loc.actions & SB_AIMMODE);
if (!CommEnabled) if (!CommEnabled)
{ {
@ -149,10 +149,10 @@ static void getinput(InputPacket *loc, ControlInfo* const hidInput)
if (buttonMap.ButtonDown(gamefunc_Toggle_Crouch)) // this shares a bit with another function so cannot be in the common code. if (buttonMap.ButtonDown(gamefunc_Toggle_Crouch)) // this shares a bit with another function so cannot be in the common code.
loc->actions |= SB_CROUCH_LOCK; loc.actions |= SB_CROUCH_LOCK;
if (loc->actions & SB_RUN) if (loc.actions & SB_RUN)
{ {
if (pp->sop_control) if (pp->sop_control)
turnamount = RUNTURN * 3; turnamount = RUNTURN * 3;
@ -272,14 +272,14 @@ static void getinput(InputPacket *loc, ControlInfo* const hidInput)
pp->oq16horiz += pp->camq16horiz - prevcamq16horiz; pp->oq16horiz += pp->camq16horiz - prevcamq16horiz;
} }
loc->fvel = clamp(loc->fvel + vel, -MAXVEL, MAXVEL); loc.fvel = clamp(loc.fvel + vel, -MAXVEL, MAXVEL);
loc->svel = clamp(loc->svel + svel, -MAXSVEL, MAXSVEL); loc.svel = clamp(loc.svel + svel, -MAXSVEL, MAXSVEL);
loc->q16avel += q16angvel; loc.q16avel += q16angvel;
loc->q16horz += q16horz; loc.q16horz += q16horz;
if (loc->getNewWeapon() == WeaponSel_Next) if (loc.getNewWeapon() == WeaponSel_Next)
{ {
USERp u = User[pp->PlayerSprite]; USERp u = User[pp->PlayerSprite];
short next_weapon = u->WeaponNum + 1; short next_weapon = u->WeaponNum + 1;
@ -313,9 +313,9 @@ static void getinput(InputPacket *loc, ControlInfo* const hidInput)
} }
} }
loc->setNewWeapon(next_weapon + 1); loc.setNewWeapon(next_weapon + 1);
} }
else if (loc->getNewWeapon() == WeaponSel_Prev) else if (loc.getNewWeapon() == WeaponSel_Prev)
{ {
USERp u = User[pp->PlayerSprite]; USERp u = User[pp->PlayerSprite];
short prev_weapon = u->WeaponNum - 1; short prev_weapon = u->WeaponNum - 1;
@ -346,19 +346,19 @@ static void getinput(InputPacket *loc, ControlInfo* const hidInput)
} }
} }
} }
loc->setNewWeapon(prev_weapon + 1); loc.setNewWeapon(prev_weapon + 1);
} }
else if (loc->getNewWeapon() == WeaponSel_Alt) else if (loc.getNewWeapon() == WeaponSel_Alt)
{ {
USERp u = User[pp->PlayerSprite]; USERp u = User[pp->PlayerSprite];
short const which_weapon = u->WeaponNum + 1; short const which_weapon = u->WeaponNum + 1;
loc->setNewWeapon(which_weapon); loc.setNewWeapon(which_weapon);
} }
} }
void GameInterface::GetInput(InputPacket *packet, ControlInfo* const hidInput) void GameInterface::GetInput(InputPacket *packet, ControlInfo* const hidInput)
{ {
getinput(&loc, hidInput); getinput(hidInput);
if (packet) if (packet)
{ {
PLAYERp pp = &Player[myconnectindex]; PLAYERp pp = &Player[myconnectindex];

5
source/sw/src/save.cpp
View file

@ -85,7 +85,6 @@ extern short BossSpriteNum[3];
#define PANEL_SAVE 1 #define PANEL_SAVE 1
#define ANIM_SAVE 1 #define ANIM_SAVE 1
extern InputPacket loc;
extern STATE s_NotRestored[]; extern STATE s_NotRestored[];
OrgTileListP otlist[] = {&orgwalllist, &orgwalloverlist, &orgsectorceilinglist, &orgsectorfloorlist}; OrgTileListP otlist[] = {&orgwalllist, &orgwalloverlist, &orgsectorceilinglist, &orgsectorfloorlist};
@ -469,7 +468,7 @@ bool GameInterface::SaveGame(FSaveGameNode *sv)
MWRITE(Track[i].TrackPoint, Track[i].NumPoints * sizeof(TRACK_POINT),1,fil); MWRITE(Track[i].TrackPoint, Track[i].NumPoints * sizeof(TRACK_POINT),1,fil);
} }
MWRITE(&loc,sizeof(loc),1,fil); // MWRITE(&loc,sizeof(loc),1,fil);
MWRITE(&screenpeek,sizeof(screenpeek),1,fil); MWRITE(&screenpeek,sizeof(screenpeek),1,fil);
MWRITE(&randomseed, sizeof(randomseed), 1, fil); MWRITE(&randomseed, sizeof(randomseed), 1, fil);
@ -860,7 +859,7 @@ bool GameInterface::LoadGame(FSaveGameNode* sv)
} }
} }
MREAD(&loc,sizeof(loc),1,fil); // MREAD(&loc,sizeof(loc),1,fil);
MREAD(&screenpeek,sizeof(screenpeek),1,fil); MREAD(&screenpeek,sizeof(screenpeek),1,fil);
MREAD(&randomseed, sizeof(randomseed), 1, fil); MREAD(&randomseed, sizeof(randomseed), 1, fil);