From 27200125661f6a234916f6fa7ce9975f06076de4 Mon Sep 17 00:00:00 2001 From: oldmud0 Date: Sat, 27 Feb 2016 10:20:52 -0600 Subject: [PATCH] Rename SpectacleThread to SpectatorThread --- LilithPort/MainForm.cpp | 8 ++++---- LilithPort/MainForm.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/LilithPort/MainForm.cpp b/LilithPort/MainForm.cpp index 6151b48..2b98de3 100644 --- a/LilithPort/MainForm.cpp +++ b/LilithPort/MainForm.cpp @@ -1567,7 +1567,7 @@ void MainForm::ReceivePackets(IAsyncResult^ asyncResult) si->IP_EP = ep; si->FRAME = 0; - if(SpectacleThread != nullptr && SpectacleThread->IsAlive && AllowWatch){ + if(SpectatorThread != nullptr && SpectatorThread->IsAlive && AllowWatch){ // 既にはじめてる send = gcnew array(14); send[0] = PH_RES_WATCH; @@ -2233,8 +2233,8 @@ void MainForm::RunGame(Object^ obj) AllowWatch = false; InputFrame = 0; - SpectacleThread = gcnew Thread(gcnew ThreadStart(this, &MainForm::RunSpectator)); - SpectacleThread->Start(); + SpectatorThread = gcnew Thread(gcnew ThreadStart(this, &MainForm::RunSpectator)); + SpectatorThread->Start(); } // 対戦中通知 @@ -2993,7 +2993,7 @@ void MainForm::RunGame(Object^ obj) if(allow_spectator){ AllowWatch = false; - SpectacleThread->Join(); + SpectatorThread->Join(); } if(AfterCloseUDP){ diff --git a/LilithPort/MainForm.h b/LilithPort/MainForm.h index 0fa4dd2..38617d6 100644 --- a/LilithPort/MainForm.h +++ b/LilithPort/MainForm.h @@ -990,7 +990,7 @@ private: System::Windows::Forms::ContextMenu^ contextMenuStrip2; UINT32 FRAME; }; - static Thread^ SpectacleThread; + static Thread^ SpectatorThread; static Generic::List^ SpectatorList; static bool AllowWatch; // スレッド制御 static UINT WaitingWatch; // パケット待ち 1:開始待ち 2:データ待ち