From 7a5d3ff36db18cbcf6a53530a64838ccdc3a76cb Mon Sep 17 00:00:00 2001
From: brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 2 Mar 2010 18:04:13 +0000
Subject: some corrections; remapping of M and D to Shift+D and Shift+M in
 editor

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2165 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Screens/UScreenEditSub.pas | 18 ++++++++++--------
 Game/Code/Screens/UScreenSong.pas    |  5 +++--
 Game/Code/UltraStar.dpr              |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'Game/Code')

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;
diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index f03783e6..76e2f441 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -124,7 +124,7 @@ uses
   acinerella in 'lib\acinerella\acinerella.pas';
 
 const
-  Version = 'UltraStar Deluxe v1.0.1a Challenge-MOD r7 beta 3 2010-03-01';
+  Version = 'UltraStar Deluxe v1.0.1a Challenge-MOD r7 beta 4 2010-03-02';
 
 var
   WndTitle: string;
-- 
cgit v1.2.3