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

Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop

Browse Source
This commit is contained in:
Florian Kuepper committed 2012-12-23 14:50:47 +01:00
2 parents 3992f19118 561185167f
commit dfa623a53b
2 files changed
+2 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

PartyModeChallenge/PartyModeChallenge.cs
+1 -1
View File
@@ -479,6 +479,7 @@ namespace Vocaluxe.PartyModes
public override void LeavingHighscore() public override void LeavingHighscore()
{ {
GameData.CurrentRoundNr++;
_Base.Graphics.FadeTo(EScreens.ScreenPartyDummy); _Base.Graphics.FadeTo(EScreens.ScreenPartyDummy);
} }
@@ -489,7 +490,6 @@ namespace Vocaluxe.PartyModes
SetNumJokers(); SetNumJokers();
SetTeamNames(); SetTeamNames();
GameData.CatSongIndices = null; GameData.CatSongIndices = null;
GameData.CurrentRoundNr++;
_Base.Graphics.FadeTo(EScreens.ScreenSong); _Base.Graphics.FadeTo(EScreens.ScreenSong);
} }
VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs
+1 -3
View File
@@ -105,8 +105,6 @@ namespace Vocaluxe.Menu.SongMenu
{ {
base.Update(SongOptions); base.Update(SongOptions);
UpdateList(_Offset);
if (SongOptions.Selection.RandomOnly) if (SongOptions.Selection.RandomOnly)
{ {
_Locked = _PreviewSelected; _Locked = _PreviewSelected;
@@ -828,7 +826,7 @@ namespace Vocaluxe.Menu.SongMenu
_ScrollRect = new SRectF(0, 0, _Base.Settings.GetRenderW(), _Base.Settings.GetRenderH(), _Theme.songMenuTileBoard.TileRect.Z); _ScrollRect = new SRectF(0, 0, _Base.Settings.GetRenderW(), _Base.Settings.GetRenderH(), _Theme.songMenuTileBoard.TileRect.Z);
} }
UpdateList(_Offset); UpdateList((_Locked / _NumW) * _NumW - (_NumW * (_NumH - 2)));
} }
public override bool IsSmallView() public override bool IsSmallView()