teambeef/jkxr
0
0
Fork 0
mirror of https://github.com/DrBeef/JKXR.git synced 2024-11-21 19:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix crash when entering AT-ST in JKA

Browse source
This commit is contained in:
Simon 2023-05-27 00:14:10 +01:00
parent ff6827a4ed
commit 2a3efff83e
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Projects/Android/jni/OpenJK/code/cgame/cg_view.cpp
View file

@ -1318,7 +1318,6 @@ qboolean CG_CalcFOVFromX( float fov_x )
} }
// set it // set it
cg.refdef.override_fov = inwater;
cg.refdef.fov_x = fov_x; cg.refdef.fov_x = fov_x;
cg.refdef.fov_y = fov_y; cg.refdef.fov_y = fov_y;
@ -2179,7 +2178,14 @@ void CG_DrawActiveFrame( int serverTime, stereoFrame_t stereoView ) {
vr->vehicle_type = VH_NONE; vr->vehicle_type = VH_NONE;
if (vr->in_vehicle) if (vr->in_vehicle)
{ {
vr->vehicle_type = (int)g_entities[g_entities[0].s.m_iVehicleNum].m_pVehicle->m_pVehicleInfo->type; if (g_entities[0].client->NPC_class == CLASS_ATST)
{
vr->vehicle_type = VH_WALKER;
}
else if (g_entities[0].s.m_iVehicleNum != 0 && g_entities[g_entities[0].s.m_iVehicleNum].m_pVehicle)
{
vr->vehicle_type = (int) g_entities[g_entities[0].s.m_iVehicleNum].m_pVehicle->m_pVehicleInfo->type;
}
} }
vr->remote_npc = !Q_stricmp( "NPC", g_entities[cg.snap->ps.viewEntity].classname ); vr->remote_npc = !Q_stricmp( "NPC", g_entities[cg.snap->ps.viewEntity].classname );