nice spawnpoint render

This commit is contained in:
Chris Forbes
2010-02-06 22:51:22 +13:00
parent 3b1dc39d6d
commit c280304875
8 changed files with 65 additions and 34 deletions

View File

@@ -346,10 +346,8 @@ namespace OpenRa
}
bool PaletteAvailable(int index) { return Game.LobbyInfo.Clients.All(c => c.PaletteIndex != index); }
bool SpawnPointAvailable(int index) { return Game.LobbyInfo.Clients.All(c => c.SpawnPoint != index); }
void CyclePalette(bool left)
{
var d = left ? +1 : Player.PlayerColors.Count() - 1;
@@ -379,14 +377,13 @@ namespace OpenRa
void CycleSpawnPoint(bool left)
{
var d = left ? +1 : Game.world.Map.SpawnPoints.Count() - 1;
var d = left ? +1 : Game.world.Map.SpawnPoints.Count();
var newIndex = (Game.world.LocalPlayer.SpawnPointIndex + d) % Game.world.Map.SpawnPoints.Count();
var newIndex = (Game.world.LocalPlayer.SpawnPointIndex + d) % (Game.world.Map.SpawnPoints.Count()+1);
while (!SpawnPointAvailable(newIndex) && newIndex != (int)Game.world.LocalPlayer.SpawnPointIndex)
newIndex = (newIndex + d) % Game.world.Map.SpawnPoints.Count();
newIndex = (newIndex + d) % (Game.world.Map.SpawnPoints.Count()+1);
Game.world.Minimap.InvalidateSpawnPoints();
Game.IssueOrder(
Order.Chat("/spawn " + newIndex));
@@ -413,6 +410,7 @@ namespace OpenRa
var minimapRect = new Rectangle(r.Right - 322, r.Top + 45, 300, 240);
world.Minimap.Update();
world.Minimap.Draw(minimapRect, true);
world.Minimap.DrawSpawnPoints(minimapRect);
if (Game.world.LocalPlayer.Index == 0)