Change pSeat references to pSeatLocal where applicable.

Remove obsolete and redundant code in ReceiveEntity.
This commit is contained in:
Marco Cawthorne 2021-03-31 13:44:29 +02:00
parent 7124ce1005
commit 440e4d7269
2 changed files with 1 additions and 24 deletions

View file

@ -182,29 +182,6 @@ void
player::ReceiveEntity(float new) player::ReceiveEntity(float new)
{ {
float fl; float fl;
if (new == FALSE) {
/* Go through all the physics code between the last received frame
* and the newest frame and keep the changes this time around instead
* of rolling back, because we'll apply the new server-verified values
* right after anyway. */
/* FIXME: splitscreen */
if (entnum == player_localentnum) {
/* FIXME: splitscreen */
pSeat = &g_seats[0];
for (int i = sequence+1; i <= servercommandframe; i++) {
/* ...maybe the input state is too old? */
if (!getinputstate(i)) {
break;
}
input_sequence = i;
PMove_Run();
}
/* any differences in things that are read below are now
* officially from prediction misses. */
}
}
/* seed for our prediction table */ /* seed for our prediction table */
sequence = servercommandframe; sequence = servercommandframe;

View file

@ -218,7 +218,7 @@ w_cannon_crosshair(void)
HUD_DrawAmmo1(); HUD_DrawAmmo1();
HUD_DrawAmmo2(); HUD_DrawAmmo2();
vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42]; vector aicon_pos = g_hudmins + [g_hudres[0] - 48, g_hudres[1] - 42];
drawsubpic(aicon_pos, [24,24], g_hud7_spr, [72/256,72/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE); drawsubpic(aicon_pos, [24,24], g_hud7_spr, [72/256,72/128], [24/256, 24/128], g_hud_color, pSeatLocal->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif #endif
} }