aboutsummaryrefslogtreecommitdiffstats
path: root/Game
diff options
context:
space:
mode:
authorbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-06-12 11:34:49 +0000
committerbrunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-06-12 11:34:49 +0000
commit83633ef9c0cb3fcecadc1a6b7be66190f31b8a3b (patch)
tree9228e129f86487e37031e4ff6c307affa2d0e5fb /Game
parentbcdb7aa3fe05e62feb42e9eb4071d4dfae965b59 (diff)
downloadusdx-83633ef9c0cb3fcecadc1a6b7be66190f31b8a3b.tar.gz
usdx-83633ef9c0cb3fcecadc1a6b7be66190f31b8a3b.tar.xz
usdx-83633ef9c0cb3fcecadc1a6b7be66190f31b8a3b.zip
divide sentence in duet mode if the first note is selected but the other part begins earlier
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2499 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game')
-rw-r--r--Game/Code/Screens/UScreenEditSub.pas12
1 files changed, 10 insertions, 2 deletions
diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index 11e00b31..ae1a026e 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -288,8 +288,16 @@ begin
if SDL_ModState = 0 then
begin
// Insert start of sentece
- if AktNuta[CP] > 0 then
- DivideSentence;
+ if (AktNuta[CP] > 0) then
+ DivideSentence
+ else if AktSong.isDuet and
+ (Length(Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].Nuta)>0) then
+ begin
+ if (Czesci[CP].Czesc[Czesci[CP].Akt].Nuta[AktNuta[CP]].Start >
+ Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].Nuta[0].Start+
+ Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].Nuta[0].Dlugosc) then
+ DivideSentence;
+ end;
end;
if SDL_ModState = KMOD_LSHIFT then