aboutsummaryrefslogtreecommitdiffstats
path: root/Game/Code/Screens
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Game/Code/Screens/UScreenEditSub.pas18
-rw-r--r--Game/Code/Screens/UScreenSong.pas5
2 files changed, 13 insertions, 10 deletions
diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index d5c7d9aa..e61cdca9 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -215,11 +215,11 @@ begin
// Increase VideoGAP
if SDL_ModState = 0 then
- temp := temp + 1;
+ temp := temp + 1; //10ms
if SDL_ModState = KMOD_LSHIFT then
- temp := temp + 10;
+ temp := temp + 10; //100ms
if SDL_ModState = KMOD_LCTRL then
- temp := temp + 100;
+ temp := temp + 100; //1000ms
AktSong.VideoGAP := temp/100;
if PlayVideo then
@@ -232,11 +232,11 @@ begin
// Decrease VideoGAP
if SDL_ModState = 0 then
- temp := temp - 1;
+ temp := temp - 1; //10ms
if SDL_ModState = KMOD_LSHIFT then
- temp := temp - 10;
+ temp := temp - 10; //100ms
if SDL_ModState = KMOD_LCTRL then
- temp := temp - 100;
+ temp := temp - 100; //1000ms
AktSong.VideoGAP := temp/100;
if PlayVideo then
@@ -495,13 +495,15 @@ begin
SDLK_D:
begin
// Divide lengths by 2
- CzesciDivide;
+ if (SDL_ModState = KMOD_LSHIFT) then
+ CzesciDivide;
end;
SDLK_M:
begin
// Multiply lengths by 2
- CzesciMultiply;
+ if (SDL_ModState = KMOD_LSHIFT) then
+ CzesciMultiply;
end;
SDLK_C:
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 54dd4563..9751b042 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -1092,7 +1092,7 @@ begin
TextTop[I] := AddText(Theme.Song.TextTop[I]);
StaticTop := AddStatic(Theme.Song.StaticTop);
- Static[StaticTop].Texture.Alpha := 0.5;
+ Static[StaticTop].Texture.Alpha := 0.4;
//for M2-MOD-mode:
TextP1 := AddText(Theme.Song.TextP1);
@@ -2229,7 +2229,8 @@ begin
end else
MP3VolumeHandler.changed := false;
- if MakeMedley or PartyMedley then
+ if MakeMedley or PartyMedley or
+ ((CatSongs.VisibleSongs > 0) and CatSongs.Song[Interaction].Main) then
begin
for I := 0 to 2 do
Text[TextTop[I]].Visible := false;