From e8d980b34aa39134bd9291b2ca016c6e63f051ec Mon Sep 17 00:00:00 2001 From: JappaWakkaP3D Date: Sun, 25 Oct 2020 23:36:14 +0100 Subject: [PATCH] Fixed scriptblocks not showing the text in AdditionalValue when the Action value is set to 2 --- P3D/Entites/Enviroment/ScriptBlock.vb | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/P3D/Entites/Enviroment/ScriptBlock.vb b/P3D/Entites/Enviroment/ScriptBlock.vb index 65d6226b2..1a0e19f60 100644 --- a/P3D/Entites/Enviroment/ScriptBlock.vb +++ b/P3D/Entites/Enviroment/ScriptBlock.vb @@ -54,12 +54,12 @@ End Function Public Overrides Sub ClickFunction() - If Me.TriggerID = 1 Then - ActionScript.TempInputDirection = -1 - Me.clickedToActivate = True - TriggerScript(False) - End If - End Sub + If Me.TriggerID = 1 Or Me.TriggerID = 2 Then + ActionScript.TempInputDirection = -1 + Me.clickedToActivate = True + TriggerScript(False) + End If + End Sub Public Overrides Sub Update() If Me.ActivateScript = True And Screen.Camera.Position.X = Me.Position.X And Screen.Camera.Position.Z = Me.Position.Z And CInt(Screen.Camera.Position.Y) = CInt(Me.Position.Y) Then @@ -81,10 +81,13 @@ Me.clickedToActivate = False SoundManager.PlaySound("select") End If - - oS.ActionScript.StartScript(Me._scriptID, GetActivationID()) - ActionScript.TempSpin = True - End If + If Me.TriggerID = 2 Then + oS.ActionScript.StartScript(Me.AdditionalValue, GetActivationID()) + Else + oS.ActionScript.StartScript(Me._scriptID, GetActivationID()) + ActionScript.TempSpin = True + End If + End If End If End If TriggeredScriptBlock = False