Server-only cam; no pan; no client orbit fight

This commit is contained in:
RallyBlock committed 2026-11-10 06:17:16 -05:00
1 parent 7e9d219678
commit d8289b9507
1 file changed
+8 -44
+8 -44
View File
@@ -166,10 +166,10 @@ function RPGClient_EyeRay(%nx, %ny)
{ {
return ""; return "";
} }
%p = %body.getPosition(); %p = %body.getHackPosition();
%cx = getWord(%p, 0) + $RPGClient::PanX; %cx = getWord(%p, 0);
%cy = getWord(%p, 1) + $RPGClient::PanY; %cy = getWord(%p, 1);
%cz = getWord(%p, 2) + 1.5; %cz = getWord(%p, 2) + 1.0;
%yaw = $RPGClient::Yaw; %yaw = $RPGClient::Yaw;
%dist = $RPGClient::Dist; %dist = $RPGClient::Dist;
%pitch = $RPGClient::Pitch > 0 ? $RPGClient::Pitch : $RPGClient::TopDownPitch; %pitch = $RPGClient::Pitch > 0 ? $RPGClient::Pitch : $RPGClient::TopDownPitch;
@@ -260,7 +260,7 @@ function RPGClient_SendClick(%button, %pos, %guiNorm)
%norm = %guiNorm ? RPGClient_NormPos(RPGClient_Mouse, %pos) : RPGClient_NormScreenPos(%pos); %norm = %guiNorm ? RPGClient_NormPos(RPGClient_Mouse, %pos) : RPGClient_NormScreenPos(%pos);
%nx = getWord(%norm, 0); %nx = getWord(%norm, 0);
%ny = getWord(%norm, 1); %ny = getWord(%norm, 1);
commandToServer('RPG_Click', %button, %nx, %ny, RPGClient_Aspect(), $RPGClient::Yaw, $RPGClient::Dist, $RPGClient::Pitch, $RPGClient::PanX, $RPGClient::PanY); commandToServer('RPG_Click', %button, %nx, %ny, RPGClient_Aspect(), $RPGClient::Yaw, $RPGClient::Dist, $RPGClient::Pitch, 0, 0);
if (%button == 0) if (%button == 0)
{ {
%gnd = RPGClient_PickGround(%nx, %ny); %gnd = RPGClient_PickGround(%nx, %ny);
@@ -706,45 +706,9 @@ function RPGClient_ApplyCamera(%forceSync)
return; return;
} }
$RPGClient::LastCamSync = %now; $RPGClient::LastCamSync = %now;
commandToServer('RPG_CamSync', $RPGClient::Yaw, $RPGClient::Dist, $RPGClient::PanX, $RPGClient::PanY, $RPGClient::Pitch); $RPGClient::PanX = 0;
if (RPGClient_NetCam()) $RPGClient::PanY = 0;
{ commandToServer('RPG_CamSync', $RPGClient::Yaw, $RPGClient::Dist, 0, 0, $RPGClient::Pitch);
return;
}
%conn = RPGClient_GetConn();
if (!isObject(%conn))
{
return;
}
%body = RPGClient_BodyForCamera(%conn);
if (!isObject(%body))
{
return;
}
%cam = %conn.Camera;
if (!isObject(%cam))
{
%cam = %conn.camera;
}
if (!isObject(%cam))
{
return;
}
%conn.setControlObject(%cam);
$mvFreeLook = 0;
$firstPerson = 0;
%xfm = RPGClient_ViewTransform(%body, $RPGClient::Yaw, $RPGClient::Dist, $RPGClient::PanX, $RPGClient::PanY);
%cam.unmountImage(0);
if (!$RPGClient::OrbitInit)
{
%cam.setMode("Corpse", %body);
%cam.mode = "Corpse";
%cam.thirdPersonOnly = 1;
$RPGClient::OrbitInit = 1;
}
%cam.setOrbitMode(%body, %xfm, 0, 32, $RPGClient::Dist);
%cam.setTransform(%xfm);
%cam.setOrbitDist($RPGClient::Dist);
} }
function RPGClient_ScheduleCamera() function RPGClient_ScheduleCamera()