diff --git a/client.cs b/client.cs index 11283c4..f11ba0a 100644 --- a/client.cs +++ b/client.cs @@ -270,16 +270,25 @@ function RPGClient_TextTyping() } } } - if (isObject(newChatText) && newChatText.isAwake()) - { - return 1; - } return 0; } +function RPGClient_RpgKeys() +{ + return $RPGClient::Active && !RPGClient_TextTyping(); +} + 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() @@ -679,7 +688,6 @@ function RPGClient_YawLeft(%val) } if (!$RPGClient::CamTickOn) { - invLeft(%val); return; } $RPGClient::MvL = %val; @@ -697,7 +705,6 @@ function RPGClient_YawRight(%val) } if (!$RPGClient::CamTickOn) { - invRight(%val); return; } $RPGClient::MvR = %val; @@ -1056,7 +1063,7 @@ package RPGClient_PageKeys { function PageUpNewChatHud(%val) { - if ($RPGClient::Active && %val) + if (RPGClient_RpgKeys() && %val) { RPGClient_ZoomIn(1); return; @@ -1066,7 +1073,7 @@ package RPGClient_PageKeys function PageDownNewChatHud(%val) { - if ($RPGClient::Active && %val) + if (RPGClient_RpgKeys() && %val) { RPGClient_ZoomOut(1); return; @@ -1120,7 +1127,7 @@ package RPGClient_Input function invLeft(%val) { - if (RPGClient_CamInputAllowed()) + if (RPGClient_RpgKeys()) { RPGClient_YawLeft(%val); return; @@ -1130,7 +1137,7 @@ package RPGClient_Input function invRight(%val) { - if (RPGClient_CamInputAllowed()) + if (RPGClient_RpgKeys()) { RPGClient_YawRight(%val); return; @@ -1140,7 +1147,7 @@ package RPGClient_Input function scrollInventory(%val) { - if (RPGClient_CamInputAllowed() && %val != 0) + if (RPGClient_RpgKeys() && %val != 0) { if (%val > 0) {