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

Merge branch 'master' of git://github.com/chrisforbes/OpenRA

Browse Source
This commit is contained in:
Chris Forbes
2009-12-21 18:15:27 +13:00
parent dbe962364b 9532029b21
commit 9a0b15ac23
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRa.Game/Graphics/WorldRenderer.cs
View File

@@ -190,10 +190,18 @@ namespace OpenRa.Game.Graphics
pipImages.PlayRepeating(pipStrings[(int)pip]); pipImages.PlayRepeating(pipStrings[(int)pip]);
spriteRenderer.DrawSprite(pipImages.Image, pipxyBase + pipxyOffset, 0); spriteRenderer.DrawSprite(pipImages.Image, pipxyBase + pipxyOffset, 0);
pipxyOffset += new float2(4, 0); pipxyOffset += new float2(4, 0);
if (pipxyOffset.X+5 > selectedUnit.SelectedSize.X)
{
//spriteRenderer.Flush();
pipxyOffset.X = 0;
pipxyOffset.Y -= 4;
}
} }
// Increment row // Increment row
pipxyOffset.X = 0; pipxyOffset.X = 0;
pipxyOffset.Y -= 5; pipxyOffset.Y -= 5;
//spriteRenderer.Flush();
} }
} }

2
OpenRa.Game/MainWindow.cs
View File

@@ -104,7 +104,7 @@ namespace OpenRa.Game
{ {
base.OnMouseMove(e); base.OnMouseMove(e);
if (e.Button == MouseButtons.Middle) if (e.Button == MouseButtons.Middle || e.Button == (MouseButtons.Left | MouseButtons.Right))
{ {
int2 p = new int2(e.Location); int2 p = new int2(e.Location);
Game.viewport.Scroll(lastPos - p); Game.viewport.Scroll(lastPos - p);

2
OpenRa.Game/Traits/Harvester.cs
View File

@@ -57,7 +57,7 @@ namespace OpenRa.Game.Traits
public IEnumerable<PipType> GetPips() public IEnumerable<PipType> GetPips()
{ {
const int numPips = 7; const int numPips = 20;
for (int i = 0; i < numPips; i++) for (int i = 0; i < numPips; i++)
{ {
if (gemsCarried * 1.0f / Rules.General.BailCount > i * 1.0f / numPips) if (gemsCarried * 1.0f / Rules.General.BailCount > i * 1.0f / numPips)