diff --git a/SQCSim2021/connector.cpp b/SQCSim2021/connector.cpp index 31e1b81..13c4cdc 100644 --- a/SQCSim2021/connector.cpp +++ b/SQCSim2021/connector.cpp @@ -69,7 +69,7 @@ int Connector::Connect(char* srv_addr, std::string name) { buf = new char[150] {0}; buflen = 150; int rpack = 0; - + int errors = 0; while (rpack < 2) { recv(m_sock_tcp, buf, buflen, 0); @@ -89,9 +89,12 @@ int Connector::Connect(char* srv_addr, std::string name) { ++rpack; break; default: - std::cout << "Packet invalide." << std::endl; + ++errors; + //std::cout << "Packet invalide." << std::endl; break; } + if (errors > 100) + return 1; } return 0; } diff --git a/SQCSim2021/define.h b/SQCSim2021/define.h index 67c49c3..7f4c4af 100644 --- a/SQCSim2021/define.h +++ b/SQCSim2021/define.h @@ -20,7 +20,6 @@ #include #endif -#define NETWORK_TEST false #define SRV_ADDR "127.0.0.1" #define COUNTDOWN 300 diff --git a/SQCSim2021/engine.cpp b/SQCSim2021/engine.cpp index b5fc361..b36496f 100644 --- a/SQCSim2021/engine.cpp +++ b/SQCSim2021/engine.cpp @@ -265,28 +265,28 @@ void Engine::Init() { m_whoosh[x] = nullptr; } -#ifdef NETWORK_TEST - std::cout << "Jouer en ligne? [o/N] "; - std::cin >> ch; - std::cout << std::endl; - - if (ch == 'o' || ch == 'O') { - std::cout << "Veuillez entrer un nom de joueur: "; - std::getline(std::cin, playname); + if (true) { + std::cout << "Jouer en ligne? [o/N] "; + std::cin >> ch; std::cout << std::endl; - if (!m_conn.Init()) { - if (!m_conn.Connect(SRV_ADDR, playname)) { - // setup jeu en reseau. - std::cout << "ID recu du serveur: " << std::to_string(m_conn.getId()) << "!" << std::endl; - std::cout << "Seed recu du serveur: " << std::to_string(m_conn.getSeed()) << "!" << std::endl; - seed = m_conn.getSeed(); + if (ch == 'o' || ch == 'O') { + std::cout << "Veuillez entrer un nom de joueur: "; + std::cin >> playname; + std::cout << std::endl; + + if (!m_conn.Init()) { + if (!m_conn.Connect(SRV_ADDR, playname)) { + // setup jeu en reseau. + std::cout << "ID recu du serveur: " << std::to_string(m_conn.getId()) << "!" << std::endl; + std::cout << "Seed recu du serveur: " << std::to_string(m_conn.getSeed()) << "!" << std::endl; + seed = m_conn.getSeed(); + } + else std::cout << "Erreur de connexion." << std::endl; } - else std::cout << "Erreur de connexion." << std::endl; + else std::cout << "Erreur de creation de socket." << std::endl; } - else std::cout << "Erreur de creation de socket." << std::endl; } -#endif m_world.SetSeed(seed); diff --git a/SQCSim2021/engine.h b/SQCSim2021/engine.h index 57b4e2e..a8338c1 100644 --- a/SQCSim2021/engine.h +++ b/SQCSim2021/engine.h @@ -82,11 +82,11 @@ private: //Menu enum class GameState { MAIN_MENU, OPTIONS, QUIT, NEWG, PLAY }; GameState m_gamestate = GameState::MAIN_MENU; - Texture MenuTitleTexture; - Texture MenuBGTexture; - Texture MenuStartTexture; - Texture MenuQuitTexture; - Texture MenuOptionsTexture; + Texture MenuTitleTexture, + MenuBGTexture, + MenuStartTexture, + MenuQuitTexture, + MenuOptionsTexture; float m_scale; float m_time = 0;