changed team structure
This commit is contained in:
@@ -41,13 +41,13 @@ bool World::loadMap(const protocol::WorldBeginDataPacket* worldHeader){
|
||||
m_WalkablePalette = worldHeader->getWalkableTileColor();
|
||||
m_DecorationPalette = worldHeader->getDecorationPalette();
|
||||
|
||||
m_Spawns[(std::size_t) TeamColor::Red] = worldHeader->getRedSpawn();
|
||||
m_Spawns[(std::size_t) TeamColor::Blue] = worldHeader->getBlueSpawn();
|
||||
getRedTeam().getSpawn() = worldHeader->getRedSpawn();
|
||||
getBlueTeam().getSpawn() = worldHeader->getBlueSpawn();
|
||||
|
||||
m_SpawnColorPalette = worldHeader->getSpawnPalette();
|
||||
|
||||
m_Castles[(std::size_t) TeamColor::Red] = worldHeader->getRedCastle();
|
||||
m_Castles[(std::size_t) TeamColor::Blue] = worldHeader->getBlueCastle();
|
||||
getRedTeam().getCastle() = worldHeader->getRedCastle();
|
||||
getBlueTeam().getCastle() = worldHeader->getBlueCastle();
|
||||
|
||||
m_TilePalette = worldHeader->getTilePalette();
|
||||
}
|
||||
@@ -382,5 +382,29 @@ const Color& World::getTileColor(TilePtr tile) const{
|
||||
return m_DecorationPalette[0];
|
||||
}
|
||||
|
||||
Team& World::getRedTeam(){
|
||||
return m_Game->getRedTeam();
|
||||
}
|
||||
|
||||
const Team& World::getRedTeam() const{
|
||||
return m_Game->getRedTeam();
|
||||
}
|
||||
|
||||
Team& World::getBlueTeam(){
|
||||
return m_Game->getBlueTeam();
|
||||
}
|
||||
|
||||
const Team& World::getBlueTeam() const{
|
||||
return m_Game->getBlueTeam();
|
||||
}
|
||||
|
||||
Team& World::getTeam(TeamColor team){
|
||||
return m_Game->getTeam(team);
|
||||
}
|
||||
|
||||
const Team& World::getTeam(TeamColor team) const{
|
||||
return m_Game->getTeam(team);
|
||||
}
|
||||
|
||||
} // namespace game
|
||||
} // namespace td
|
||||
|
||||
@@ -17,9 +17,9 @@ void ServerWorld::spawnMobs(game::MobType type, std::uint8_t level, game::Player
|
||||
game::Spawn* enemyMobSpawn;
|
||||
|
||||
if(senderTeam == game::TeamColor::Red){
|
||||
enemyMobSpawn = &m_Spawns[(std::size_t) game::TeamColor::Blue];
|
||||
enemyMobSpawn = &getTeam(game::TeamColor::Blue).getSpawn();
|
||||
}else{
|
||||
enemyMobSpawn = &m_Spawns[(std::size_t) game::TeamColor::Red];
|
||||
enemyMobSpawn = &getTeam(game::TeamColor::Red).getSpawn();
|
||||
}
|
||||
|
||||
std::int32_t spawnCenterX = enemyMobSpawn->x;
|
||||
|
||||
Reference in New Issue
Block a user