using System.Drawing;\r
using System.Linq;\r
using System.Windows.Forms;\r
-using KancolleSniffer.Util;\r
using KancolleSniffer.View;\r
using static System.Math;\r
\r
public void UpdateCellInfo()\r
{\r
battleResultPanel.Spoilers = _config.Spoilers;\r
- battleResultPanel.UpdateCellInfo(_sniffer);\r
+ battleResultPanel.UpdateCellInfo(_sniffer.CellInfo);\r
}\r
\r
private void SetHeaderSortOrder()\r
private BattleState _prevBattleState;\r
private readonly BattleResultRank[] _rank = new BattleResultRank[2];\r
private readonly InformationPanel _infomationPanel;\r
+ private CellInfo _cellInfo;\r
\r
public Spoiler Spoilers { get; set; }\r
\r
var state = sniffer.Battle.BattleState;\r
var prev = _prevBattleState;\r
_prevBattleState = state;\r
+ _cellInfo = sniffer.CellInfo;\r
if (prev == BattleState.None && state != BattleState.None)\r
_result[0] = _result[1] = null;\r
if (prev != BattleState.None && state == BattleState.None &&\r
{\r
ClearResult();\r
SetPhase("結果");\r
+ UpdateCellInfo(_cellInfo);\r
return;\r
}\r
if (state != BattleState.Day && state != BattleState.Night)\r
(int)Round(0 * ShipLabel.ScaleFactor.Width) + AutoScrollPosition.X,\r
(int)Round(20 * ShipLabel.ScaleFactor.Height) + AutoScrollPosition.Y);\r
_infomationPanel.Visible = true;\r
+ UpdateCellInfo(_cellInfo);\r
}\r
\r
private string GetEqipString(ShipStatus ship)\r
_rankLabel.Text = result[(int)rank];\r
}\r
\r
- public void UpdateCellInfo(Sniffer sniffer)\r
+ public void UpdateCellInfo(CellInfo cellInfo)\r
{\r
- var text = sniffer.CellInfo;\r
- if (text == null)\r
- return;\r
- _cellLabel.Text = (Spoilers & Spoiler.NextCell) == 0 ? sniffer.CellInfo.Current : sniffer.CellInfo.Next;\r
+ _cellLabel.Text = (Spoilers & Spoiler.NextCell) == 0 ? cellInfo.Current : cellInfo.Next;\r
_cellLabel.Location = new Point(ClientSize.Width - _cellLabel.Width - 2, 4);\r
}\r
\r