Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed crash on names-screen.

Browse Source
This commit is contained in:
Florian Küpper committed 2013-01-11 13:44:05 +01:00
1 parent 34a299bde5
commit 148e92a416
1 file changed
+18 -19
Download Patch File Download Diff File Expand all files Collapse all files
VocaluxeLib/Menu/CNameSelection.cs
+18 -19
View File
@@ -360,7 +360,10 @@ namespace Vocaluxe.Menu
break; break;
} }
Selection = VisibleProfiles[_Offset * _Tiles.Count + _actualSelection]; if (_Offset * _Tiles.Count + _actualSelection < VisibleProfiles.Count)
Selection = VisibleProfiles[_Offset * _Tiles.Count + _actualSelection];
else
Selection = -1;
} }
public void KeyboardSelection(bool active, int player) public void KeyboardSelection(bool active, int player)
@@ -408,28 +411,24 @@ namespace Vocaluxe.Menu
if (offset < 0) if (offset < 0)
offset = 0; offset = 0;
if ( _Tiles.Count * (offset + 1) - VisibleProfiles.Count < _Tiles.Count) for (int i = 0; i < _Tiles.Count; i++)
{ {
if ((i + offset * _Tiles.Count) < VisibleProfiles.Count)
for (int i = 0; i < _Tiles.Count; i++)
{ {
if ((i + offset * _Tiles.Count) < VisibleProfiles.Count) _Tiles[i].Avatar.Texture = _Base.Profiles.GetProfiles()[VisibleProfiles[i + offset * _Tiles.Count]].Avatar.Texture;
{ _Tiles[i].Avatar.Color = new SColorF(1, 1, 1, 1);
_Tiles[i].Avatar.Texture = _Base.Profiles.GetProfiles()[VisibleProfiles[i + offset * _Tiles.Count]].Avatar.Texture; _Tiles[i].Name.Text = _Base.Profiles.GetProfiles()[VisibleProfiles[i + offset * _Tiles.Count]].PlayerName;
_Tiles[i].Avatar.Color = new SColorF(1, 1, 1, 1); _Tiles[i].PlayerNr = VisibleProfiles[i + offset * _Tiles.Count];
_Tiles[i].Name.Text = _Base.Profiles.GetProfiles()[VisibleProfiles[i + offset * _Tiles.Count]].PlayerName; }
_Tiles[i].PlayerNr = VisibleProfiles[i + offset * _Tiles.Count]; else
} {
else _Tiles[i].Avatar.Texture = _TextureEmptyTile;
{ _Tiles[i].Avatar.Color = ColorEmptyTile;
_Tiles[i].Avatar.Texture = _TextureEmptyTile; _Tiles[i].Name.Text = "";
_Tiles[i].Avatar.Color = ColorEmptyTile; _Tiles[i].PlayerNr = -1;
_Tiles[i].Name.Text = "";
_Tiles[i].PlayerNr = -1;
}
} }
_Offset = offset;
} }
_Offset = offset;
} }
public bool isOverTile(MouseEvent mevent) public bool isOverTile(MouseEvent mevent)