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

- Exhumed: Clean out some old bools regarding old panning code.

Browse source
This commit is contained in:
Mitchell Richters 2020-09-21 20:44:02 +10:00
parent d46787cd96
commit f8210ef8ee
3 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/exhumed/src/exhumed.cpp
View file

@ -50,10 +50,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_PS_NS BEGIN_PS_NS
extern short bPlayerPan;
extern short bLockPan;
static MapRecord* NextMap; static MapRecord* NextMap;
void uploadCinemaPalettes(); void uploadCinemaPalettes();

3
source/exhumed/src/input.cpp
View file

@ -25,9 +25,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
BEGIN_PS_NS BEGIN_PS_NS
extern short bPlayerPan;
extern short bLockPan;
static int turn; static int turn;
static int counter; static int counter;

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

@ -52,8 +52,6 @@ struct PlayerSave
int lPlayerXVel = 0; int lPlayerXVel = 0;
int lPlayerYVel = 0; int lPlayerYVel = 0;
short obobangle = 0, bobangle = 0; short obobangle = 0, bobangle = 0;
short bPlayerPan = 0;
short bLockPan = 0;
static actionSeq ActionSeq[] = { static actionSeq ActionSeq[] = {
{18, 0}, {0, 0}, {9, 0}, {27, 0}, {63, 0}, {18, 0}, {0, 0}, {9, 0}, {27, 0}, {63, 0},
@ -460,9 +458,6 @@ void RestartPlayer(short nPlayer)
SetMagicFrame(); SetMagicFrame();
RestoreGreenPal(); RestoreGreenPal();
bPlayerPan = 0;
bLockPan = 0;
} }
sprintf(playerNames[nPlayer], "JOE%d", nPlayer); sprintf(playerNames[nPlayer], "JOE%d", nPlayer);
@ -1106,8 +1101,8 @@ void FuncPlayer(int a, int nDamage, int nRun)
zVelB = -zVelB; zVelB = -zVelB;
} }
if (zVelB > 512 && !bLockPan) { if (zVelB > 512 && PlayerList[nPlayer].q16angle != IntToFixed(100) && !(sPlayerInput[nPlayer].actions & (SB_AIM_UP|SB_AIM_DOWN))) {
playerSetHoriz(&PlayerList[nPlayer].q16horiz, &PlayerList[nPlayer].horizTarget, 100); sPlayerInput[nPlayer].actions |= SB_CENTERVIEW;
} }
} }
@ -2852,8 +2847,6 @@ static SavegameHelper sgh("player",
SV(lPlayerYVel), SV(lPlayerYVel),
SV(obobangle), SV(obobangle),
SV(bobangle), SV(bobangle),
SV(bPlayerPan),
SV(bLockPan),
SV(nStandHeight), SV(nStandHeight),
SV(PlayerCount), SV(PlayerCount),
SV(nNetStartSprites), SV(nNetStartSprites),