aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-05-16 15:09:11 +0000
committerwhiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-05-16 15:09:11 +0000
commitd77dbf438cc212a09c49e1fe6c2295b1477928ac (patch)
tree05d6f71209cf0116358a7aefe2e927afe6bb55dc
parentf64f21da0aa5838fafa6a5a4a16b0428c69d36a4 (diff)
downloadusdx-d77dbf438cc212a09c49e1fe6c2295b1477928ac.tar.gz
usdx-d77dbf438cc212a09c49e1fe6c2295b1477928ac.tar.xz
usdx-d77dbf438cc212a09c49e1fe6c2295b1477928ac.zip
Set correct player count in UParty
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1738 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--Lua/src/base/UParty.pas7
-rw-r--r--Lua/src/screens/UScreenSing.pas6
2 files changed, 9 insertions, 4 deletions
diff --git a/Lua/src/base/UParty.pas b/Lua/src/base/UParty.pas
index 856f4f40..21f604f7 100644
--- a/Lua/src/base/UParty.pas
+++ b/Lua/src/base/UParty.pas
@@ -226,6 +226,7 @@ uses
ULuaCore,
UDisplay,
USong,
+ UMain,
SysUtils;
//-------------
@@ -668,7 +669,11 @@ begin
these functions should be called here before
sing screen is shown, or it should be called
by plugin if it wants to define a custom
- singscreen start up. }
+ singscreen start up. }
+
+ //set correct playersplay
+ if (bPartyGame) then
+ PlayersPlay := Length(Teams);
end;
end;
end;
diff --git a/Lua/src/screens/UScreenSing.pas b/Lua/src/screens/UScreenSing.pas
index 1993c331..465022ed 100644
--- a/Lua/src/screens/UScreenSing.pas
+++ b/Lua/src/screens/UScreenSing.pas
@@ -330,6 +330,9 @@ begin
Log.LogStatus('Begin', 'onShow');
FadeOut := False;
+ ClearSettings;
+ Party.CallBeforeSing;
+
// reset video playback engine, to play Video Clip...
fCurrentVideoPlaybackEngine := VideoPlayback;
@@ -616,9 +619,6 @@ begin
if Lines[0].Line[P].TotalNotes = 0 then
Inc(NumEmptySentences);
- ClearSettings;
- Party.CallBeforeSing;
-
Log.LogStatus('End', 'onShow');
end;