From f58f3ed7356910eacb1b64c7a193dd4d0913e0c9 Mon Sep 17 00:00:00 2001 From: "PC1\\PTyTb" Date: Tue, 19 Aug 2025 13:23:58 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87?= =?UTF-8?q?=D0=B0=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4=20=D0=B2=20=D0=B8?= =?UTF-8?q?=D0=B3=D1=80=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TTW_Bot_app.dproj | 2 +- forms/uGeneral.fmx | 1 - forms/uGeneral.pas | 7 ++++--- frames/fOBS.pas | 13 ++++++++----- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/TTW_Bot_app.dproj b/TTW_Bot_app.dproj index 01e205f..82fd576 100644 --- a/TTW_Bot_app.dproj +++ b/TTW_Bot_app.dproj @@ -4,7 +4,7 @@ 20.3 FMX True - Release + Debug Win32 TTW_Bot_app 693395 diff --git a/forms/uGeneral.fmx b/forms/uGeneral.fmx index 7a43955..309bed3 100644 --- a/forms/uGeneral.fmx +++ b/forms/uGeneral.fmx @@ -642,7 +642,6 @@ object TTW_Bot: TTTW_Bot inherited btnCreateOBSGame: TButton Images = ImageList1 ImageIndex = 20 - TabOrder = 5 end object btnCreateChat: TButton Images = ImageList1 diff --git a/forms/uGeneral.pas b/forms/uGeneral.pas index 97a24d0..3a678e9 100644 --- a/forms/uGeneral.pas +++ b/forms/uGeneral.pas @@ -436,18 +436,19 @@ end; procedure TTTW_Bot.checkAndSendToGames(aNick: string; aCommand: string); var I: Integer; - j: Integer; + j: Integer; s:string; begin for I := 0 to frOBS1.GameWebServers.Count - 1 do begin for j := 0 to frOBS1.GameWebServers[I].commands.Count - 1 do begin - if frOBS1.GameWebServers[I].commands[j] = aCommand then + s:= frOBS1.GameWebServers[I].commands[j]; + if s= aCommand.Trim then begin var obj := TJSONObject.Create; obj.AddPair('user', aNick); - obj.AddPair('cmd', aCommand); + obj.AddPair('cmd', aCommand.Trim); frOBS1.GameWebServers[I].WebServerGame.Input(obj); end; end; diff --git a/frames/fOBS.pas b/frames/fOBS.pas index 9cacbe2..655e99a 100644 --- a/frames/fOBS.pas +++ b/frames/fOBS.pas @@ -596,13 +596,16 @@ begin GameWebServer.port := aPort; GameWebServer.WebServerGame := TGameWebServer.Create (myConst.GeneralPath, aPort); + GameWebServer.WebServerGame.SetGame(aGame); + commands := GameWebServer.WebServerGame.GetControlCommands; + GameWebServer.commands:= TStringList.Create; + for Cmd in commands do + GameWebServer.commands.Add(Cmd); + GameWebServers.Add(GameWebServer); GameWebServers[GameWebServers.Count - 1].WebServerGame.Start; - GameWebServers[GameWebServers.Count - 1].WebServerGame.SetGame(aGame); - commands := GameWebServers[GameWebServers.Count - 1] - .WebServerGame.GetControlCommands; - for Cmd in commands do - GameWebServers[GameWebServers.Count - 1].commands.Add(Cmd); + + end; procedure TfrOBS.CreateWebKandinsky(aRecord: TOBSKandinsky);