epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

first step: Race -> string

Browse Source
This commit is contained in:
Chris Forbes
2010-02-10 14:07:40 +13:00
parent 5a95048396
commit c3f4653801
9 changed files with 40 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRa.Game/Player.cs
View File

@@ -1,11 +1,9 @@
using System;
using System.Linq;
using System.Collections.Generic;
using OpenRa.GameRules;
using OpenRa.Graphics;
using OpenRa.Traits;
using OpenRa.FileFormats;
using System.Drawing;
using System.Linq;
using OpenRa.FileFormats;
using OpenRa.Traits;
namespace OpenRa
{
@@ -18,7 +16,7 @@ namespace OpenRa
public int Kills;
public string PlayerName;
public string InternalName;
public Race Race;
public string Race;
public readonly int Index;
public int Cash = 10000;
public int Ore = 0;
@@ -64,7 +62,7 @@ namespace OpenRa
this.PaletteIndex = client != null ? client.PaletteIndex : index;
this.PlayerName = client != null ? client.Name : "Player {0}".F(index+1);
this.Race = client != null ? (Race)client.Race : Race.Allies;
this.Race = client != null ? client.Race : RaceUtil.Allies;
}
void UpdatePower()
@@ -179,10 +177,10 @@ namespace OpenRa
PlayerName = client.Name;
}
if (Race != (Race)client.Race)
if (Race != client.Race)
{
Game.chat.AddLine(this, "is now playing {0}".F((Race)client.Race));
Race = (Race)client.Race;
Game.chat.AddLine(this, "is now playing {0}".F(client.Race));
Race = client.Race;
}
if (PaletteIndex != client.PaletteIndex)