Persson-dev/Tower-Defense
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

refactor: format all files

Browse Source
This commit is contained in:
Simon Pribylski
2021-10-10 12:28:32 +02:00
parent 587d611dc8
commit 5d7ec91ec5
16 changed files with 1930 additions and 1930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/Mobs.cpp
View File

@@ -18,9 +18,9 @@ void Mob::addEffect(EffectType effectType, float durationSec) {
if (isImmuneTo(effectType))
return;
if (hasEffect(effectType)) {
auto it = std::find_if(m_Effects.begin(), m_Effects.end(), [&effectType](EffectDuration effect){ return effect.first == effectType;});
auto it = std::find_if(m_Effects.begin(), m_Effects.end(), [&effectType](EffectDuration effect) { return effect.first == effectType;});
EffectDuration& effect = *it;
if(effect.second < durationSec)
if (effect.second < durationSec)
effect.second = durationSec; // setting new duration if it's greater then the actual
} else {
m_Effects.push_back({ effectType, durationSec });
@@ -42,7 +42,7 @@ void Mob::updateEffects(std::uint64_t delta) {
}
bool Mob::hasEffect(EffectType type) {
return std::find_if(m_Effects.begin(), m_Effects.end(), [&type](EffectDuration effect){ return effect.first == type;}) != m_Effects.end();
return std::find_if(m_Effects.begin(), m_Effects.end(), [&type](EffectDuration effect) { return effect.first == type;}) != m_Effects.end();
}

6
src/game/client/ClientGame.cpp
View File

@@ -70,9 +70,9 @@ void ClientGame::HandlePacket(protocol::UpdatePlayerTeamPacket* packet) {
game::Player* player = &m_Players[packet->getPlayerID()];
if (player->getTeamColor() == game::TeamColor::None) { //join a team
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);
} else { // change team
} else { // change team
getTeam(player->getTeamColor()).removePlayer(player);
getTeam(packet->getSelectedTeam()).addPlayer(player);
}
@@ -117,7 +117,7 @@ void ClientGame::PlaceTower(game::TowerType type, const glm::vec2& position) {
m_Client->getConnexion().sendPacket(&packet);
}
void ClientGame::HandlePacket(protocol::WorldAddTowerPacket* packet){
void ClientGame::HandlePacket(protocol::WorldAddTowerPacket* packet) {
m_WorldRenderer.addTower(m_WorldClient.placeTowerAt(packet->getTowerID(), packet->getTowerType(), packet->getTowerX(), packet->getTowerY(), packet->getBuilder()));
}

2
src/game/client/WorldClient.cpp
View File

@@ -25,7 +25,7 @@ void WorldClient::HandlePacket(protocol::SpawnMobPacket* packet) {
packet->getMobX(), packet->getMobY(), packet->getMobDirection());
}
void WorldClient::OnArrowShot(game::MobPtr target, game::Tower* tower){
void WorldClient::OnArrowShot(game::MobPtr target, game::Tower* tower) {
World::OnArrowShot(target, tower);
}

4
src/game/server/ServerWorld.cpp
View File

@@ -46,13 +46,13 @@ void ServerWorld::spawnMobs(game::MobType type, std::uint8_t level, game::Player
}
}
game::TowerPtr ServerWorld::placeTowerAt(game::TowerType type, std::int32_t x, std::int32_t y, game::PlayerID builder){
game::TowerPtr ServerWorld::placeTowerAt(game::TowerType type, std::int32_t x, std::int32_t y, game::PlayerID builder) {
game::TowerPtr tower = World::placeTowerAt(m_CurrentTowerID, type, x, y, builder);
m_CurrentTowerID++;
return tower;
}
void ServerWorld::OnArrowShot(game::MobPtr target, game::Tower* shooter){
void ServerWorld::OnArrowShot(game::MobPtr target, game::Tower* shooter) {
World::OnArrowShot(target, shooter);
}