Merge with default

Docs/Luadoc/Lua.xsd

@@ -143,7 +143,6 @@
 	<xs:group ref="DocumentationGroup" minOccurs="0" maxOccurs="unbounded" />
 	<xs:attribute name="name" type="Identifier" use="required" />
 	<xs:attribute name="renamed" type="Identifier" use="optional" />
-	<xs:attribute name="sm-ssc" type="Identifier" use="optional" />
 	<xs:attribute name="theme" type="Identifier" use="optional" />
 	<xs:attribute name="return" type="IdentifierOrTable" use="optional" />
 	<xs:attribute name="arguments" type="ArgumentList" use="optional" />

Docs/Luadoc/Lua.xsl

@@ -78,16 +78,6 @@
 				margin: 1px 2px 1px 2px;
 				border: 1px solid #777;
 			}
-			.sm-ssc{
-				text-align: justify;
-				vertical-align: text-top;
-				background: #FFDDEE url(./bgline.png) repeat-x scroll 0 0;
-				padding: 1px;
-			}
-			fieldset div.sm-ssc{
-				margin: 1px 2px 1px 2px;
-				border: 1px solid #777;
-			}
 			._fallbackTheme{
 				text-align: justify;
 				vertical-align: text-top;
@@ -243,9 +233,8 @@
 	<div>
 		<fieldset>
 		<legend>Function Colors</legend>
-		<div class="descriptionCell">Available in SM4 alphas, sm-ssc, and StepMania 5</div>
+		<div class="descriptionCell">Available in sm-ssc and StepMania 5</div>
 		<div class="renamed">Renamed or changed from StepMania 4 alphas</div>
-		<div class="sm-ssc">New bindings (since StepMania 4 alphas)</div>
 		<div class="_fallbackTheme">Defined in the _fallback theme</div>
 		<div class="defaultTheme">Defined in the default theme</div>
 		</fieldset>
@@ -487,7 +476,6 @@
 				<xsl:choose>
 					<!-- "renamed" also covers functions with modified behavior -->
 					<xsl:when test="$elmt/@renamed='true'">renamed</xsl:when>
-					<xsl:when test="$elmt/@sm-ssc='true'">sm-ssc</xsl:when>
 					<xsl:when test="$elmt/@theme='_fallback'">_fallbackTheme</xsl:when>
 					<xsl:when test="$elmt/@theme='default'">defaultTheme</xsl:when>
 					<xsl:otherwise>descriptionCell</xsl:otherwise>
@@ -524,7 +512,6 @@
 			<td>
 			<xsl:attribute name="class">
 				<xsl:choose>
-					<xsl:when test="$elmt/@sm-ssc='true'">sm-ssc</xsl:when>
 					<xsl:otherwise>descriptionCell</xsl:otherwise>
 				</xsl:choose>
 			</xsl:attribute>

Docs/credits.txt

@@ -68,7 +68,7 @@ David Santamar
  * Various patches (see Changelog_sm-ssc.txt for more details and links)
 
 Kita K./D. Trucks
- * sm-ssc default theme music
+ * default theme music
 
 kurisu
  * Dance-threepanel gametype code (3.9; re-adapted for sm-ssc)

Themes/default/Graphics/ScreenGameplay BPMDisplay.lua

@@ -1,8 +1,62 @@
-return Def.SongBPMDisplay {
+-- check if players are playing steps with different timingdata.
+local numPlayers = GAMESTATE:GetNumPlayersEnabled()
+
+local displaySingle = Def.SongBPMDisplay {
 	File=THEME:GetPathF("BPMDisplay", "bpm");
 	Name="BPMDisplay";
 	InitCommand=cmd(zoom,0.675;shadowlength,1);
 	SetCommand=function(self) self:SetFromGameState() end;
 	CurrentSongChangedMessageCommand=cmd(playcommand,"Set");
 	CurrentCourseChangedMessageCommand=cmd(playcommand,"Set");
-};
+};
+
+if numPlayers == 1 then
+	return displaySingle
+else
+	-- check if both players are playing the same steps
+	local stepsP1 = GAMESTATE:GetCurrentSteps(PLAYER_1)
+	local stepsP2 = GAMESTATE:GetCurrentSteps(PLAYER_2)
+
+	local stP1 = stepsP1:GetStepsType()
+	local stP2 = stepsP2:GetStepsType()
+
+	local diffP1 = stepsP1:GetDifficulty()
+	local diffP2 = stepsP2:GetDifficulty()
+
+	if stP1 == stP2 and diffP1 == diffP2 then
+		-- both players are using the same steps; only need one.
+		return displaySingle
+	end
+
+	-- otherwise, we have some more work to do.
+	local timingP1 = stepsP1:GetTimingData()
+	local timingP2 = stepsP2:GetTimingData()
+
+	local function UpdateBPM(self)
+		local dispP1 = self:GetChild("DisplayP1")
+		local dispP2 = self:GetChild("DisplayP2")
+
+		-- needs current bpm for p1 and p2
+		for pn in ivalues(PlayerNumber) do
+			local bpmDisplay = (pn == PLAYER_1) and dispP1 or dispP2
+			local pState = GAMESTATE:GetPlayerState(pn);
+			local songPosition = pState:GetSongPosition()
+			local bpm = songPosition:GetCurBPS() * 60
+			bpmDisplay:SetText( string.format(%.2f,bpm) )
+		end
+	end
+
+	local displayTwoPlayers = Def.ActorFrame{
+		-- manual bpm displays
+		LoadFont("BPMDisplay", "bpm")..{
+			Name="DisplayP1";
+			InitCommand=cmd(zoom,0.675;shadowlength,1);
+		};
+		LoadFont("BPMDisplay", "bpm")..{
+			Name="DisplayP2";
+			InitCommand=cmd(zoom,0.675;shadowlength,1);
+		};
+	};
+
+	displayTwoPlayers.InitCommand=cmd(SetUpdateFunction,UpdateBPM);
+end