refactor: format code

This commit is contained in:
2021-09-19 17:33:16 +02:00
parent 52a143769e
commit 0856ca47ca
71 changed files with 1102 additions and 1110 deletions

View File

@@ -69,12 +69,10 @@ void ClientGame::HandlePacket(protocol::UpdatePlayerTeamPacket* packet){
game::Player* player = &m_Players[packet->getPlayerID()]; game::Player* player = &m_Players[packet->getPlayerID()];
if (player->getTeamColor() == game::TeamColor::None) { //join a team if (player->getTeamColor() == game::TeamColor::None) { //join a team
getTeam(packet->getSelectedTeam()).addPlayer(player); getTeam(packet->getSelectedTeam()).addPlayer(player);
} } else if (packet->getSelectedTeam() == game::TeamColor::None) { // leave a team
else if (packet->getSelectedTeam() == game::TeamColor::None){ // leave a team
getTeam(player->getTeamColor()).removePlayer(player); getTeam(player->getTeamColor()).removePlayer(player);
player->setTeamColor(game::TeamColor::None); player->setTeamColor(game::TeamColor::None);
} } else { // change team
else{ // change team
getTeam(player->getTeamColor()).removePlayer(player); getTeam(player->getTeamColor()).removePlayer(player);
getTeam(packet->getSelectedTeam()).addPlayer(player); getTeam(packet->getSelectedTeam()).addPlayer(player);
} }

View File

@@ -51,8 +51,7 @@ void ServerConnexion::checkKeepAlive(){
if (time - m_KeepAlive.sendTime > KEEP_ALIVE_TIMEOUT) { if (time - m_KeepAlive.sendTime > KEEP_ALIVE_TIMEOUT) {
if (m_KeepAlive.recievedResponse) { if (m_KeepAlive.recievedResponse) {
sendKeepAlive(); sendKeepAlive();
} } else {
else{
protocol::DisconnectPacket packet("Time out"); protocol::DisconnectPacket packet("Time out");
sendPacket(&packet); sendPacket(&packet);
closeConnection(); closeConnection();

View File

@@ -223,8 +223,7 @@ void WorldDataPacket::Deserialize(DataBuffer& data){
game::ChunkData::value_type value; game::ChunkData::value_type value;
if (startLong == endLong) { if (startLong == endLong) {
value = (chunkData[startLong] >> startOffset); value = (chunkData[startLong] >> startOffset);
} } else {
else{
int endOffset = BITS_IN_LONG - startOffset; int endOffset = BITS_IN_LONG - startOffset;
value = (chunkData[startLong] >> startOffset | chunkData[endLong] << endOffset); value = (chunkData[startLong] >> startOffset | chunkData[endLong] << endOffset);
} }

View File

@@ -122,8 +122,7 @@ void renderMainMenu(){
ImGui::Text("Impossible de se connecter"); ImGui::Text("Impossible de se connecter");
} }
ImGui::EndPopup(); ImGui::EndPopup();
} } else {
else{
triedToConnect = false; triedToConnect = false;
} }
@@ -145,16 +144,14 @@ void renderMainMenu(){
if (ImGui::Button("Créer")) { if (ImGui::Button("Créer")) {
if (!startServer(port, worldFilePath)) { if (!startServer(port, worldFilePath)) {
triedToCreate = true; triedToCreate = true;
} } else {
else{
client->connect("localhost", port); client->connect("localhost", port);
} }
} }
if (triedToCreate) if (triedToCreate)
ImGui::Text("Failed to launch server"); ImGui::Text("Failed to launch server");
ImGui::EndPopup(); ImGui::EndPopup();
} } else {
else{
triedToCreate = false; triedToCreate = false;
} }
@@ -212,8 +209,7 @@ void showLobbyProgress(){
ImGui::ProgressBar(progress, ImVec2(0.0f, 0.0f), std::string(std::to_string(client->getGame().getLobbyTime() / 1000) + "s").c_str()); ImGui::ProgressBar(progress, ImVec2(0.0f, 0.0f), std::string(std::to_string(client->getGame().getLobbyTime() / 1000) + "s").c_str());
ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x); ImGui::SameLine(0.0f, ImGui::GetStyle().ItemInnerSpacing.x);
ImGui::Text("Time Remaining"); ImGui::Text("Time Remaining");
} } else {
else{
ImGui::Text("Waiting for players ...\n"); ImGui::Text("Waiting for players ...\n");
} }
} }