cleanup

irrld · Jul 19, 2024 · 56377b1 · 56377b1
1 parent 46e4b8e
commit 56377b1
Show file tree

Hide file tree

Showing 7 changed files with 207 additions and 114 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/editor.xml b/.idea/editor.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/src/app/app.cpp b/src/app/app.cpp
@@ -24,7 +24,6 @@ void gApp::setup() {
   cursor_->setFiltering(2, 2);
   cursor_height_ = cursor_->getHeight();
   cursor_width_ = 16;
-  //auto* cnv = new GameCanvas(this, CreateRef<ChessConnectionDummy>(), nullptr);
   auto* cnv = new LoadingCanvas(this);
   appmanager->setCurrentCanvas(cnv);
   appmanager->getWindow()->setCursorMode(0x00034002); // GLFW_CURSOR_HIDDEN

diff --git a/src/net/chess_connection.cpp b/src/net/chess_connection.cpp
@@ -255,8 +255,8 @@ void ChessConnectionNetwork::OnEvent(znet::Event& event) {
 }
 
 bool ChessConnectionNetwork::OnClientConnectedToServerEvent(znet::ClientConnectedToServerEvent& event) {
-  auto session = event.session();
-  auto& layer = session->handler_layer();
+  Ref<znet::PeerSession> session = event.session();
+  znet::HandlerLayer& layer = session->handler_layer();
   auto update_board_handler = CreateRef<znet::PacketHandler<UpdateBoardPacket, UpdateBoardPacketSerializerV1>>();
   update_board_handler->AddReceiveCallback(ZNET_BIND_FN(OnUpdateBoardPacket));
   layer.AddPacketHandler(update_board_handler);
@@ -322,37 +322,4 @@ bool ChessConnectionNetwork::OnEndGamePacket(znet::PeerSession&, Ref<EndGamePack
 bool ChessConnectionNetwork::OnSetPiecePacket(znet::PeerSession&, Ref<SetPiecePacket> packet) {
   on_piece_change_(packet->x_, packet->y_, packet->type_, packet->color_);
   return true;
-}
-
-ChessConnectionDummy::ChessConnectionDummy() {
-  board_data_ = CreateRef<std::array<PieceData, 8 * 8>>();
-  std::array<PieceData, 8 * 8>& board_data = *board_data_.get();
-  for (int x = 0; x < 8; ++x) {
-    board_data[ChessBoard::PosToIndex(x, 1)] = {true, kPieceTypePawn, kPieceColorWhite};
-    board_data[ChessBoard::PosToIndex(x, 6)] = {true, kPieceTypePawn, kPieceColorBlack};
-  }
-  board_data[ChessBoard::PosToIndex(0, 0)] = {true, kPieceTypeRook, kPieceColorWhite};
-  board_data[ChessBoard::PosToIndex(7, 0)] = {true, kPieceTypeRook, kPieceColorWhite};
-  board_data[ChessBoard::PosToIndex(0, 7)] = {true, kPieceTypeRook, kPieceColorBlack};
-  board_data[ChessBoard::PosToIndex(7, 7)] = {true, kPieceTypeRook, kPieceColorBlack};
-
-  board_data[ChessBoard::PosToIndex(1, 0)] = {true, kPieceTypeKnight, kPieceColorWhite};
-  board_data[ChessBoard::PosToIndex(6, 0)] = {true, kPieceTypeKnight, kPieceColorWhite};
-  board_data[ChessBoard::PosToIndex(1, 7)] = {true, kPieceTypeKnight, kPieceColorBlack};
-  board_data[ChessBoard::PosToIndex(6, 7)] = {true, kPieceTypeKnight, kPieceColorBlack};
-
-  board_data[ChessBoard::PosToIndex(2, 0)] = {true, kPieceTypeBishop, kPieceColorWhite};
-  board_data[ChessBoard::PosToIndex(5, 0)] = {true, kPieceTypeBishop, kPieceColorWhite};
-  board_data[ChessBoard::PosToIndex(2, 7)] = {true, kPieceTypeBishop, kPieceColorBlack};
-  board_data[ChessBoard::PosToIndex(5, 7)] = {true, kPieceTypeBishop, kPieceColorBlack};
-
-  board_data[ChessBoard::PosToIndex(4, 0)] = {true, kPieceTypeKing, kPieceColorWhite};
-  board_data[ChessBoard::PosToIndex(3, 0)] = {true, kPieceTypeQueen, kPieceColorWhite};
-
-  board_data[ChessBoard::PosToIndex(4, 7)] = {true, kPieceTypeKing, kPieceColorBlack};
-  board_data[ChessBoard::PosToIndex(3, 7)] = {true, kPieceTypeQueen, kPieceColorBlack};
-}
-
-void ChessConnectionDummy::Promote(int x, int y, PieceType piece_type, PieceColor piece_color) {
-  on_piece_change_(x, y, piece_type, piece_color);
 }
diff --git a/src/net/chess_connection.h b/src/net/chess_connection.h
@@ -160,34 +160,3 @@ class ChessConnectionNetwork : public ChessConnection {
   bool OnEndGamePacket(znet::PeerSession&, Ref<EndGamePacket> packet);
   bool OnSetPiecePacket(znet::PeerSession&, Ref<SetPiecePacket> packet);
 };
-
-class ChessConnectionDummy : public ChessConnection {
- public:
-  ChessConnectionDummy();
-  ~ChessConnectionDummy() override = default;
-
-  void Move(int x, int y, int to_x, int to_y, bool switch_turn) override {}
-  void Promote(int x, int y, PieceType piece_type, PieceColor piece_color) override;
-  bool IsOpen() override { return false; }
-
-  Ref<std::array<PieceData, 8 * 8>> GetBoardData() override { return board_data_; }
-
-  PieceColor GetCurrentTurn() override { return current_turn_; }
-
-  void Ready() override {
-    on_start_game_();
-    current_turn_ = kPieceColorBlack;
-    on_turn_change_(kPieceColorBlack);
-  }
-
-  void Close() override {
-
-  }
-
-  void EndGame(PieceColor winner) override {
-    on_end_game_(winner);
-  }
- private:
-  PieceColor current_turn_ = kPieceColorNone;
-  Ref<std::array<PieceData, 8 * 8>> board_data_;
-};