Small code clearance

Removed unused code from previous connection test
Added more correct logging

Author: kolyaka32

src/cycles/clientGame.cpp

@@ -27,6 +27,7 @@ bool ClientGameCycle::inputMouseDown() {
         SavedFields::addField(field.saveField());
         // Showing message of sucsessful saving
         savedInfo.reset();
+        logAdditional("Saving field");
     }
     // Normal turn
     if (field.tryClickMultiplayerCurrent(mouse)) {
@@ -50,13 +51,28 @@ void ClientGameCycle::update() {
 
     case ConnectionCode::GameNew:
         if (connection.lastPacket->isBytesAvaliable(3)) {
-            // Loading new field from connection
-            loadField();
+            // Creating new field from get data
+            const Field f = Field((char*)(connection.lastPacket->getPointer())+2);
+            // Setting it as current
+            field.setNewField(&f, window);
+            // Inverting game state
+            switch (field.getState()) {
+            case GameState::CurrentPlay:
+                field.setState(GameState::OpponentPlay);
+                break;
+
+            case GameState::OpponentPlay:
+                field.setState(GameState::CurrentPlay);
+                break;
+
+            default:
+                break;
+            }
 
             // Making sound
             sounds.play(Sounds::Reset);
             music.startFromCurrent(Music::MainCalm);
-            logAdditional("Resetting game by connection");
+            logAdditional("Starting new game by connection");
         }
         return;
 
@@ -117,22 +133,3 @@ void ClientGameCycle::draw() const {
     // Bliting all to screen
     window.render();
 }
-
-void ClientGameCycle::loadField() {
-    // Creating new field from get data
-    const Field f = Field((char*)(connection.lastPacket->getPointer())+2);
-    field.setNewField(&f, window);
-    // Inverting game state
-    switch (field.getState()) {
-    case GameState::CurrentPlay:
-        field.setState(GameState::OpponentPlay);
-        break;
-
-    case GameState::OpponentPlay:
-        field.setState(GameState::CurrentPlay);
-        break;
-
-    default:
-        break;
-    }
-}

src/cycles/clientGame.hpp

@@ -22,9 +22,6 @@ class ClientGameCycle : public InternetCycle {
     void update() override;
     void draw() const override;
 
-    // Update current field from server field
-    void loadField();
-
  public:
     explicit ClientGameCycle(Window& _window, const Connection& client);
 };

src/cycles/coopGame.cpp

@@ -27,6 +27,7 @@ bool TwoPlayerGameCycle::inputMouseDown() {
         menu.addField(field.saveField());
         // Showing message of sucsessful saving
         savedInfo.reset();
+        logAdditional("Saving field");
     }
     if (gameMenuButton.in(mouse)) {
         // Starting game menu
@@ -38,6 +39,7 @@ bool TwoPlayerGameCycle::inputMouseDown() {
         if (const Field* f = menu.click(mouse)) {
             field.setNewField(f, window);
             menu.reset();
+            logAdditional("Selecting new field");
         }
         return true;
     } else {

src/cycles/serverGame.cpp

@@ -16,7 +16,7 @@ menu(_window) {
         connection.sendConfirmed(ConnectionCode::Init);
         field.restart();
         // Sending first field
-        sendField();
+        connection.sendConfirmed<Array<char>>(ConnectionCode::GameNew, field.getSave());
     }
     logAdditional("Start server game cycle");
 }
@@ -30,6 +30,7 @@ bool ServerGameCycle::inputMouseDown() {
         menu.addField(field.saveField());
         // Showing message of sucsessful saving
         savedInfo.reset();
+        logAdditional("Saving field");
     }
     if (gameMenuButton.in(mouse)) {
         // Starting game menu
@@ -39,9 +40,12 @@ bool ServerGameCycle::inputMouseDown() {
     // Checking, if game start
     if (menu.isActive()) {
         if (const Field* f = menu.click(mouse)) {
+            // Setting new field localy
             field.setNewField(f, window);
-            sendField();
+            // Sending it
+            connection.sendConfirmed<Array<char>>(ConnectionCode::GameNew, field.getSave());
             menu.reset();
+            logAdditional("Selecting new field");
         }
         return true;
     } else {
@@ -81,11 +85,11 @@ void ServerGameCycle::update() {
         if (connection.lastPacket->isBytesAvaliable(3)) {
             // Making turn
             field.clickMultiplayerOpponent(connection.lastPacket->getData<Uint8>(2));
-            logAdditional("Turn of opponent player to %u", connection.lastPacket->getData<Uint8>(2));
 
             // Making sound
             sounds.play(Sounds::Turn);
             music.startFromCurrent(Music::MainCombat);
+            logAdditional("Turn of opponent player to %u", connection.lastPacket->getData<Uint8>(2));
         }
         return;
 
@@ -147,11 +151,3 @@ void ServerGameCycle::draw() const {
     // Bliting all to screen
     window.render();
 }
-
-void ServerGameCycle::sendField() {
-    //connection.sendConfirmed<Uint8, Uint8>(ConnectionCode::Init, field.getWidth(), field.getWinWidth());
-    // ! Need to write in correct way
-    field.saveField();
-    const Array<char> s = field.getSave();
-    connection.sendConfirmed<Array<char>>(ConnectionCode::GameNew, s);
-}

src/cycles/serverGame.hpp

@@ -12,9 +12,6 @@
 
 // Game cycle with game part of server
 class ServerGameCycle : public InternetCycle {
- private:
-    void sendField();
-
  protected:
     GameConnection connection;
     SelectingMenu menu;

src/cycles/singleplayerGame.cpp

@@ -26,6 +26,7 @@ bool SinglePlayerGameCycle::inputMouseDown() {
         menu.addField(field.saveField());
         // Showing message of sucsessful saving
         savedInfo.reset();
+        logAdditional("Saving field");
     }
     if (gameMenuButton.in(mouse)) {
         // Starting game menu
@@ -37,6 +38,7 @@ bool SinglePlayerGameCycle::inputMouseDown() {
         if (const Field* f = menu.click(mouse)) {
             field.setNewField(f, window);
             menu.reset();
+            logAdditional("Select new field");
         }
         return true;
     } else {

src/internet/connection.cpp

@@ -76,17 +76,6 @@ void Connection::send(const SendPacket& _packet) const {
     // Sending it
     NET_SendDatagram(gettingSocket, sendAddress, sendPort, _packet.getData(), _packet.getLength());
 }
-/*
-void Connection::sendRaw(ConnectionCode _code, Uint8 _index, void* data, int size) const {
-    #if (CHECK_CORRECTION)
-    if (sendAddress == nullptr || sendPort == 0) {
-        logAdditional("Can't send packet at unspecified address");
-        return;
-    }
-    #endif
-    // Sending it
-    NET_SendDatagram(gettingSocket, sendAddress, sendPort, );
-}*/
 
 const char* Connection::getLocalIP() {
     // Getting local addresses

src/internet/connection.hpp

@@ -40,7 +40,6 @@ class Connection {
     template <typename ...Args>
     void send(ConnectionCode code, Uint8 index, Args ...args);
     void send(const SendPacket& _packet) const;
-    //void sendRaw(ConnectionCode code, Uint8 index, void* data, int size) const;
     // Function for recieve new packets and update packets
     ConnectionCode getCode();
     // Packet with last getted data

src/internet/gameConnection.cpp

@@ -157,14 +157,6 @@ ConnectionCode GameConnection::checkNewMessage() {
     }
 }
 
-/*void GameConnection::sendConfirmed(ConnectionCode _code, SendPacket _packet) {
-    // Adding new message to confirme array and send it
-    Message* newMessage = new Message{*this, _code, _packet};
-    unconfirmedMessages.push_back(newMessage);
-    // Updating timer
-    needResendApplyConnection = getTime() + MESSAGE_APPLY_TIMEOUT;
-}*/
-
 void GameConnection::tryReconnect() {
     // Sending init message
     send(ConnectionCode::Init, 0);