diff --git a/src/client/hud.qc b/src/client/hud.qc index 6a0a095..ba54373 100644 --- a/src/client/hud.qc +++ b/src/client/hud.qc @@ -129,14 +129,14 @@ HUD_DrawHealth(void) vector pos; player pl = (player)pSeat->m_ePlayer; - if (pl.health != pSeat->m_iHealthOld) { - pSeat->m_flHealthAlpha = 1.0; + if (pl.health != pSeatLocal->m_iHealthOld) { + pSeatLocal->m_flHealthAlpha = 1.0; } - if (pSeat->m_flHealthAlpha >= HUD_ALPHA) { - pSeat->m_flHealthAlpha -= clframetime * 0.5; + if (pSeatLocal->m_flHealthAlpha >= HUD_ALPHA) { + pSeatLocal->m_flHealthAlpha -= clframetime * 0.5; } else { - pSeat->m_flHealthAlpha = HUD_ALPHA; + pSeatLocal->m_flHealthAlpha = HUD_ALPHA; } pos = g_hudmins + [14, g_hudres[1] - 42]; @@ -145,11 +145,11 @@ HUD_DrawHealth(void) "sprites/640_cross.spr_0.tga", [32,32], [1,1,1], - pSeat->m_flHealthAlpha + pSeatLocal->m_flHealthAlpha ); - HUD_DrawNums(pl.health, pos + [96], pSeat->m_flHealthAlpha, g_hud_color); + HUD_DrawNums(pl.health, pos + [96], pSeatLocal->m_flHealthAlpha, g_hud_color); - pSeat->m_iHealthOld = pl.health; + pSeatLocal->m_iHealthOld = pl.health; } /* armor/suit charge */ @@ -161,14 +161,14 @@ HUD_DrawArmor(void) pos = g_hudmins + [198, g_hudres[1] - 42]; - if (pl.armor != pSeat->m_iArmorOld) { - pSeat->m_flArmorAlpha = 1.0; + if (pl.armor != pSeatLocal->m_iArmorOld) { + pSeatLocal->m_flArmorAlpha = 1.0; } - if (pSeat->m_flArmorAlpha >= HUD_ALPHA) { - pSeat->m_flArmorAlpha -= clframetime * 0.5; + if (pSeatLocal->m_flArmorAlpha >= HUD_ALPHA) { + pSeatLocal->m_flArmorAlpha -= clframetime * 0.5; } else { - pSeat->m_flArmorAlpha = HUD_ALPHA; + pSeatLocal->m_flArmorAlpha = HUD_ALPHA; } drawsubpic( @@ -194,8 +194,8 @@ HUD_DrawArmor(void) ); } - HUD_DrawNums(pl.armor, pos + [48] , pSeat->m_flArmorAlpha, g_hud_color); - pSeat->m_iArmorOld = pl.armor; + HUD_DrawNums(pl.armor, pos + [48] , pSeatLocal->m_flArmorAlpha, g_hud_color); + pSeatLocal->m_iArmorOld = pl.armor; } /* magazine/clip ammo */ @@ -205,19 +205,19 @@ HUD_DrawAmmo1(void) player pl = (player)pSeat->m_ePlayer; vector pos; - if (pl.a_ammo1 != pSeat->m_iAmmo1Old) { - pSeat->m_flAmmo1Alpha = 1.0; - pSeat->m_iAmmo1Old = pl.a_ammo1; + if (pl.a_ammo1 != pSeatLocal->m_iAmmo1Old) { + pSeatLocal->m_flAmmo1Alpha = 1.0; + pSeatLocal->m_iAmmo1Old = pl.a_ammo1; } - if (pSeat->m_flAmmo1Alpha >= HUD_ALPHA) { - pSeat->m_flAmmo1Alpha -= clframetime * 0.5; + if (pSeatLocal->m_flAmmo1Alpha >= HUD_ALPHA) { + pSeatLocal->m_flAmmo1Alpha -= clframetime * 0.5; } else { - pSeat->m_flAmmo1Alpha = HUD_ALPHA; + pSeatLocal->m_flAmmo1Alpha = HUD_ALPHA; } pos = g_hudmins + [g_hudres[0] - 152, g_hudres[1] - 42]; - HUD_DrawNums(pl.a_ammo1, pos, pSeat->m_flAmmo1Alpha, g_hud_color); + HUD_DrawNums(pl.a_ammo1, pos, pSeatLocal->m_flAmmo1Alpha, g_hud_color); } /* leftover type ammo */ @@ -227,19 +227,19 @@ HUD_DrawAmmo2(void) player pl = (player)pSeat->m_ePlayer; vector pos; - if (pl.a_ammo2 != pSeat->m_iAmmo2Old) { - pSeat->m_flAmmo2Alpha = 1.0; - pSeat->m_iAmmo2Old = pl.a_ammo2; + if (pl.a_ammo2 != pSeatLocal->m_iAmmo2Old) { + pSeatLocal->m_flAmmo2Alpha = 1.0; + pSeatLocal->m_iAmmo2Old = pl.a_ammo2; } - if (pSeat->m_flAmmo2Alpha >= HUD_ALPHA) { - pSeat->m_flAmmo2Alpha -= clframetime * 0.5; + if (pSeatLocal->m_flAmmo2Alpha >= HUD_ALPHA) { + pSeatLocal->m_flAmmo2Alpha -= clframetime * 0.5; } else { - pSeat->m_flAmmo2Alpha = HUD_ALPHA; + pSeatLocal->m_flAmmo2Alpha = HUD_ALPHA; } pos = g_hudmins + [g_hudres[0] - 72, g_hudres[1] - 42]; - HUD_DrawNums(pl.a_ammo2, pos, pSeat->m_flAmmo2Alpha, g_hud_color); + HUD_DrawNums(pl.a_ammo2, pos, pSeatLocal->m_flAmmo2Alpha, g_hud_color); } /* special ammo */ @@ -249,19 +249,19 @@ HUD_DrawAmmo3(void) player pl = (player)pSeat->m_ePlayer; vector pos; - if (pl.a_ammo3 != pSeat->m_iAmmo3Old) { - pSeat->m_flAmmo3Alpha = 1.0; - pSeat->m_iAmmo3Old = pl.a_ammo3; + if (pl.a_ammo3 != pSeatLocal->m_iAmmo3Old) { + pSeatLocal->m_flAmmo3Alpha = 1.0; + pSeatLocal->m_iAmmo3Old = pl.a_ammo3; } - if (pSeat->m_flAmmo3Alpha >= HUD_ALPHA) { - pSeat->m_flAmmo3Alpha -= clframetime * 0.5; + if (pSeatLocal->m_flAmmo3Alpha >= HUD_ALPHA) { + pSeatLocal->m_flAmmo3Alpha -= clframetime * 0.5; } else { - pSeat->m_flAmmo3Alpha = HUD_ALPHA; + pSeatLocal->m_flAmmo3Alpha = HUD_ALPHA; } pos = g_hudmins + [g_hudres[0] - 72, g_hudres[1] - 74]; - HUD_DrawNums(pl.a_ammo3, pos, pSeat->m_flAmmo3Alpha, g_hud_color); + HUD_DrawNums(pl.a_ammo3, pos, pSeatLocal->m_flAmmo3Alpha, g_hud_color); } /* ammo bar */ @@ -360,20 +360,20 @@ HUD_DrawNotify(void) { vector pos; - if (pSeat->m_flPickupAlpha <= 0.0f) { + if (pSeatLocal->m_flPickupAlpha <= 0.0f) { return; } pos = g_hudmins + [g_hudres[0] - 192, g_hudres[1] - 128]; - Weapons_HUDPic(pSeat->m_iPickupWeapon, 1, pos, pSeat->m_flPickupAlpha); - pSeat->m_flPickupAlpha -= clframetime; + Weapons_HUDPic(pSeatLocal->m_iPickupWeapon, 1, pos, pSeatLocal->m_flPickupAlpha); + pSeatLocal->m_flPickupAlpha -= clframetime; } void HUD_WeaponPickupNotify(int w) { - pSeat->m_iPickupWeapon = w; - pSeat->m_flPickupAlpha = 1.0f; + pSeatLocal->m_iPickupWeapon = w; + pSeatLocal->m_flPickupAlpha = 1.0f; } /* main entry */ diff --git a/src/shared/player.qc b/src/shared/player.qc index d846602..d2ee17e 100644 --- a/src/shared/player.qc +++ b/src/shared/player.qc @@ -86,29 +86,6 @@ void player::ReceiveEntity(float new) { 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 */ sequence = servercommandframe; diff --git a/src/shared/w_forks.qc b/src/shared/w_forks.qc index 16aacdb..5f73192 100644 --- a/src/shared/w_forks.qc +++ b/src/shared/w_forks.qc @@ -268,7 +268,7 @@ w_forks_crosshair(void) "sprites/hud_fork.spr_0.tga", [32,64], [1,1,1], - pSeat->m_flAmmo2Alpha, + pSeatLocal->m_flAmmo2Alpha, 0 ); #endif diff --git a/src/shared/w_hairspray.qc b/src/shared/w_hairspray.qc index 7b94dc3..dae0d63 100644 --- a/src/shared/w_hairspray.qc +++ b/src/shared/w_hairspray.qc @@ -206,7 +206,7 @@ w_hairspray_crosshair(void) "sprites/hud_haircan.spr_0.tga", [32,64], [1,1,1], - pSeat->m_flAmmo2Alpha, + pSeatLocal->m_flAmmo2Alpha, 0 ); #endif diff --git a/src/shared/w_knife.qc b/src/shared/w_knife.qc index 0b97af4..f7eadfd 100644 --- a/src/shared/w_knife.qc +++ b/src/shared/w_knife.qc @@ -234,7 +234,7 @@ w_knife_crosshair(void) "sprites/hud_knife.spr_0.tga", [32,64], [1,1,1], - pSeat->m_flAmmo2Alpha, + pSeatLocal->m_flAmmo2Alpha, 0 ); #endif diff --git a/src/shared/w_lego.qc b/src/shared/w_lego.qc index d24600e..a0f85a8 100644 --- a/src/shared/w_lego.qc +++ b/src/shared/w_lego.qc @@ -180,7 +180,7 @@ void w_lego_hud(void) "sprites/hud_lego.spr_0.tga", [32,64], [1,1,1], - pSeat->m_flAmmo2Alpha, + pSeatLocal->m_flAmmo2Alpha, 0 ); #endif diff --git a/src/shared/w_legolauncher.qc b/src/shared/w_legolauncher.qc index e9c52ee..cd17103 100644 --- a/src/shared/w_legolauncher.qc +++ b/src/shared/w_legolauncher.qc @@ -219,7 +219,7 @@ w_legolauncher_crosshair(void) [0/128,100/128], [60/128,20/128], [1,1,1], - pSeat->m_flAmmo2Alpha, + pSeatLocal->m_flAmmo2Alpha, 0 ); #endif diff --git a/src/shared/w_sodalauncher.qc b/src/shared/w_sodalauncher.qc index ffb1760..554f529 100644 --- a/src/shared/w_sodalauncher.qc +++ b/src/shared/w_sodalauncher.qc @@ -278,7 +278,7 @@ w_sodalauncher_crosshair(void) "sprites/hud_sodacan.spr_0.tga", [32,64], [1,1,1], - pSeat->m_flAmmo2Alpha, + pSeatLocal->m_flAmmo2Alpha, 0 ); #endif