fn/hunger
fn/hunger
3
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

Change pSeat references to pSeatLocal where applicable.

Browse source 
Remove obsolete and redundant code in ReceiveEntity.
This commit is contained in:
Marco Cawthorne 2021-03-31 13:43:47 +02:00
parent f13ce6c910
commit c7986d7d59
6 changed files with 5 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/shared/player.qc
View file

@ -183,29 +183,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;

2
src/shared/w_flame.qc
View file

@ -174,7 +174,7 @@ w_flame_crosshair(void)
drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [72/128,48/128], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL); drawsubpic(cross_pos, [24,24], "sprites/crosshairs.spr_0.tga", [72/128,48/128], [0.1875, 0.1875], [1,1,1], 1, DRAWFLAG_NORMAL);
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], "sprites/640hud7.spr_0.tga", [0,96/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE); drawsubpic(aicon_pos, [24,24], "sprites/640hud7.spr_0.tga", [0,96/128], [24/256, 24/128], g_hud_color, pSeatLocal->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif #endif
} }

2
src/shared/w_medkit.qc
View file

@ -172,7 +172,7 @@ w_medkit_crosshair(void)
[24/256,96/128], [24/256,96/128],
[24/256, 24/128], [24/256, 24/128],
g_hud_color, g_hud_color,
pSeat->m_flAmmo2Alpha, pSeatLocal->m_flAmmo2Alpha,
DRAWFLAG_ADDITIVE DRAWFLAG_ADDITIVE
); );
#endif #endif

2
src/shared/w_rpg.qc
View file

@ -327,7 +327,7 @@ void w_rpg_hud(void)
[120/256,72/128], [120/256,72/128],
[24/256, 24/128], [24/256, 24/128],
g_hud_color, g_hud_color,
pSeat->m_flAmmo2Alpha, pSeatLocal->m_flAmmo2Alpha,
DRAWFLAG_ADDITIVE DRAWFLAG_ADDITIVE
); );
#endif #endif

2
src/shared/w_sniper.qc
View file

@ -272,7 +272,7 @@ w_sniper_crosshair(void)
[24/256,72/128], [24/256,72/128],
[24/256, 24/128], [24/256, 24/128],
g_hud_color, g_hud_color,
pSeat->m_flAmmo2Alpha, pSeatLocal->m_flAmmo2Alpha,
DRAWFLAG_ADDITIVE DRAWFLAG_ADDITIVE
); );
#endif #endif

2
src/shared/w_tnt.qc
View file

@ -142,7 +142,7 @@ void w_tnt_hud(void)
#ifdef CLIENT #ifdef CLIENT
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, [16,24], "sprites/640hud7.spr_0.tga", [48/256,96/128], [24/256, 24/128], g_hud_color, pSeat->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE); drawsubpic(aicon_pos, [16,24], "sprites/640hud7.spr_0.tga", [48/256,96/128], [24/256, 24/128], g_hud_color, pSeatLocal->m_flAmmo2Alpha, DRAWFLAG_ADDITIVE);
#endif #endif
} }