Fix arrows/scroll: chat awake check; block brick keys in RPG

This commit is contained in:
RallyBlock committed 2026-11-09 21:11:48 -05:00
1 parent 98d701c0b0
commit bd43fa9aa9
1 file changed
+19 -12
+19 -12
View File
@@ -270,16 +270,25 @@ function RPGClient_TextTyping()
} }
} }
} }
if (isObject(newChatText) && newChatText.isAwake())
{
return 1;
}
return 0; return 0;
} }
function RPGClient_RpgKeys()
{
return $RPGClient::Active && !RPGClient_TextTyping();
}
function RPGClient_CamInputAllowed() function RPGClient_CamInputAllowed()
{ {
return $RPGClient::CamTickOn && $RPGClient::Active && !RPGClient_TextTyping(); if (!RPGClient_RpgKeys())
{
return 0;
}
if (!$RPGClient::CamTickOn)
{
$RPGClient::CamTickOn = 1;
}
return 1;
} }
function RPGClient_BootPlay() function RPGClient_BootPlay()
@@ -679,7 +688,6 @@ function RPGClient_YawLeft(%val)
} }
if (!$RPGClient::CamTickOn) if (!$RPGClient::CamTickOn)
{ {
invLeft(%val);
return; return;
} }
$RPGClient::MvL = %val; $RPGClient::MvL = %val;
@@ -697,7 +705,6 @@ function RPGClient_YawRight(%val)
} }
if (!$RPGClient::CamTickOn) if (!$RPGClient::CamTickOn)
{ {
invRight(%val);
return; return;
} }
$RPGClient::MvR = %val; $RPGClient::MvR = %val;
@@ -1056,7 +1063,7 @@ package RPGClient_PageKeys
{ {
function PageUpNewChatHud(%val) function PageUpNewChatHud(%val)
{ {
if ($RPGClient::Active && %val) if (RPGClient_RpgKeys() && %val)
{ {
RPGClient_ZoomIn(1); RPGClient_ZoomIn(1);
return; return;
@@ -1066,7 +1073,7 @@ package RPGClient_PageKeys
function PageDownNewChatHud(%val) function PageDownNewChatHud(%val)
{ {
if ($RPGClient::Active && %val) if (RPGClient_RpgKeys() && %val)
{ {
RPGClient_ZoomOut(1); RPGClient_ZoomOut(1);
return; return;
@@ -1120,7 +1127,7 @@ package RPGClient_Input
function invLeft(%val) function invLeft(%val)
{ {
if (RPGClient_CamInputAllowed()) if (RPGClient_RpgKeys())
{ {
RPGClient_YawLeft(%val); RPGClient_YawLeft(%val);
return; return;
@@ -1130,7 +1137,7 @@ package RPGClient_Input
function invRight(%val) function invRight(%val)
{ {
if (RPGClient_CamInputAllowed()) if (RPGClient_RpgKeys())
{ {
RPGClient_YawRight(%val); RPGClient_YawRight(%val);
return; return;
@@ -1140,7 +1147,7 @@ package RPGClient_Input
function scrollInventory(%val) function scrollInventory(%val)
{ {
if (RPGClient_CamInputAllowed() && %val != 0) if (RPGClient_RpgKeys() && %val != 0)
{ {
if (%val > 0) if (%val > 0)
{ {