[default -> timing] Bring up to date for test.

Data/AI.ini

@@ -39,17 +39,17 @@ WeightW2=30
 WeightW1=50
 
 [Skill5]
-WeightMiss=8
+WeightMiss=2
-WeightW5=1
+WeightW5=3
-WeightW4=1
+WeightW4=5
 WeightW3=5
 WeightW2=30
 WeightW1=55
 
 [Skill6]
-WeightMiss=8
+WeightMiss=2
-WeightW5=1
+WeightW5=3
-WeightW4=1
+WeightW4=5
 WeightW3=5
 WeightW2=30
 WeightW1=55

Themes/_fallback/Languages/en.ini

@@ -372,7 +372,7 @@ MaxTextureResolution=Choose the maximum texture resolution.  Setting this to any
 MenuTimer=When &oq;ON&cq;, menus have a time limit.
 Mines=Mines
 MoveRandomToEnd=Determines if courses with random songs should be placed at the end of the course select wheel.
-MovieColorDepth=Choose the color depth of textures. 32 bit textures use more memory, but look nicer.
+MovieColorDepth=Choose the color depth of movies. 32 bit textures use more memory, but look nicer.
 MusicWheelSwitchSpeed=Adjusts the speed of the music wheel.
 MusicWheelUsesSections=&oq;Always&cq; means sections in group + ABC; &oq;Never&cq; means no sections; &oq;Title Only&cq; shows sections in ABC order.
 Network Options=Connect to a server or change server options.

Themes/_fallback/Scripts/03 Gameplay.lua

@@ -187,7 +187,11 @@ function HoldTiming()
 end
 
 function ShowHoldJudgments()
-	return not GAMESTATE:GetCurrentGame():GetName() == "pump"
+	if GAMESTATE:GetCurrentGame():GetName() == "pump" then
+		return false
+	else
+		return true
+	end
 end
 
 function HoldHeadStep()

Themes/_fallback/metrics.ini

@@ -28,7 +28,7 @@ ScreenHeight=480
 AutoSetStyle=GetUserPrefB("UserPrefAutoSetStyle")
 
 # Default modifiers and noteskin.
-DefaultModifiers=""
+DefaultModifiers="1x"
 DefaultNoteSkinName="default"
 
 # Difficulties to show. Useful for custom games where you want to hide these.
@@ -200,6 +200,8 @@ DrunkOffsetFrequency=10
 DrunkArrowMagnitude=0.5
 BeatOffsetHeight=15
 BeatPIHeight=2
+MiniPercentBase=0.5
+MiniPercentGate=1
 TinyPercentBase=0.5
 TinyPercentGate=1
 DizzyHoldHeads=false

sm-ssc.nsi

@@ -53,7 +53,15 @@
 
 	; I think it may need actual admin privs for writing to the registry... -aj
 	;RequestExecutionLevel user
-	; this folder may not be the best idea for Windows Vista/7. -aj
+
+	;GetVersion::WindowsServicePackMajor
+	;Pop $R0
+	;${If} $R0 >= 6
+	;	vista & 7
+	;${Else}
+	;	xp and below
+	;${EndIf}
+
 	InstallDir "$PROGRAMFILES\${PRODUCT_ID}"
 	InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\${PRODUCT_ID}" ""
 
@@ -846,8 +854,37 @@ Section "Uninstall"
 	RMDir "$INSTDIR"	; will delete only if empty
 
 	SetShellVarContext current
-	Delete "$DESKTOP\Play StepMania CVS.lnk"
+
-	Delete "$DESKTOP\${PRODUCT_DISPLAY}.lnk"
+	; kill shortcuts
+	!ifdef MAKE_DESKTOP_SHORTCUT
+		Delete "$DESKTOP\$(TEXT_IO_RUN).lnk"
+	!endif
+	!ifdef MAKE_DESKTOP_SHORTCUT
+		Delete "$DESKTOP\$(TEXT_IO_RUN).lnk"
+	!endif
+
+	Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_RUN).lnk"
+	Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_RUN_WITHOUT_SSE2).lnk"
+
+	!ifdef MAKE_OPEN_PROGRAM_FOLDER_SHORTCUT
+		Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_OPEN_PROGRAM_FOLDER).lnk"
+	!endif
+	!ifdef MAKE_OPEN_SETTINGS_FOLDER_SHORTCUT
+		Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_OPEN_SETTINGS_FOLDER).lnk"
+	!endif
+
+	;Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_VIEW_STATISTICS).lnk"
+	;Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_TOOLS).lnk"
+	Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_MANUAL).lnk"
+	Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_UNINSTALL).lnk"
+	Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_WEB_SITE).lnk"
+	Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_TEXTURE_FONT_GENERATOR).lnk"
+	!ifdef MAKE_UPDATES_SHORTCUT
+		Delete "$SMPROGRAMS\${PRODUCT_ID}\$(TEXT_IO_CHECK_FOR_UPDATES).lnk"
+	!endif
+	Delete "$INSTDIR\${PRODUCT_ID}.lnk"
+	Delete "$INSTDIR\${PRODUCT_ID} (non-SSE2).lnk"
+
 	; I'm being paranoid here:
 	Delete "$SMPROGRAMS\${PRODUCT_ID}\*.*"
 	RMDir "$SMPROGRAMS\${PRODUCT_ID}"

src/Player.cpp

@@ -2965,12 +2965,12 @@ void Player::CrossedRows( int iLastRowCrossed, const RageTimer &now )
 		if( iCheckpointFrequencyRows > 0 )
 		{
 			// "the first row after the start of the range that lands on a beat"
-			int iFirstCheckpointInRange = QuantizeUp(m_iFirstUncrossedRow,
+			int iFirstCheckpointInRange = ((m_iFirstUncrossedRow+iCheckpointFrequencyRows-1)
-													 iCheckpointFrequencyRows);
+				/iCheckpointFrequencyRows) * iCheckpointFrequencyRows;
 
 			// "the last row or first row earlier that lands on a beat"
-			int iLastCheckpointInRange = QuantizeDown(iLastRowCrossed,
+			int iLastCheckpointInRange = ((iLastRowCrossed)/iCheckpointFrequencyRows)
-													  iCheckpointFrequencyRows);
+				* iCheckpointFrequencyRows;
 
 			for( int r = iFirstCheckpointInRange; r <= iLastCheckpointInRange; r += iCheckpointFrequencyRows )
 			{
@@ -2992,12 +2992,12 @@ void Player::CrossedRows( int iLastRowCrossed, const RageTimer &now )
 					int iTrack = nIter.Track();
 
 					// "the first row after the hold head that lands on a beat"
-					int iFirstCheckpointOfHold = QuantizeUp(iStartRow,
+					int iFirstCheckpointOfHold = ((iStartRow+iCheckpointFrequencyRows)/iCheckpointFrequencyRows)
-															iCheckpointFrequencyRows);
+						* iCheckpointFrequencyRows;
 
 					// "the end row or the first earlier row that lands on a beat"
-					int iLastCheckpointOfHold = QuantizeDown(iEndRow,
+					int iLastCheckpointOfHold = ((iEndRow)/iCheckpointFrequencyRows)
-															 iCheckpointFrequencyRows);
+						* iCheckpointFrequencyRows;
 
 					// count the end of the hold as a checkpoint
 					bool bHoldOverlapsRow = iFirstCheckpointOfHold <= r  &&   r <= iLastCheckpointOfHold;

src/ScreenOptionsToggleSongs.cpp

@@ -11,7 +11,6 @@
 
 // main page (group list)
 REGISTER_SCREEN_CLASS( ScreenOptionsToggleSongs );
-REGISTER_SCREEN_CLASS( ScreenOptionsToggleSongsSubPage );
 
 void ScreenOptionsToggleSongs::BeginScreen()
 {
@@ -49,8 +48,7 @@ void ScreenOptionsToggleSongs::ProcessMenuStart( const InputEventPlus &input )
 
 	// switch to the subpage with the specified group
 	int iRow = GetCurrentRow();
-	OptionRow &row = *m_pRows[iRow];
+	if( m_pRows[iRow]->GetRowType() == OptionRow::RowType_Exit )
-	if( row.GetRowType() == OptionRow::RowType_Exit )
 	{
 		ScreenOptions::ProcessMenuStart( input );
 		return;
@@ -70,6 +68,7 @@ void ScreenOptionsToggleSongs::ExportOptions( int row, const vector<PlayerNumber
 }
 
 // subpage (has the songs in a specific group)
+REGISTER_SCREEN_CLASS( ScreenOptionsToggleSongsSubPage );
 void ScreenOptionsToggleSongsSubPage::BeginScreen()
 {
 	m_apSongs.clear();

src/StatsManager.cpp

@@ -242,10 +242,14 @@ void StatsManager::CommitStatsToProfiles( const StageStats *pSS )
 				pPlayerProfile->m_iNumTotalSongsPlayed += pSS->m_vpPlayedSongs.size();
 			}
 
+			LOG->Trace("Adding stats to machine profile...");
 			AddPlayerStatsToProfile( pMachineProfile, *pSS, pn );
 
 			if( pPlayerProfile )
+			{
+				LOG->Trace("Adding stats to player profile...");
 				AddPlayerStatsToProfile( pPlayerProfile, *pSS, pn );
+			}
 
 			CHECKPOINT;
 		}

src/StepMania-net2008.vcproj

@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="sm-ssc"
+	Name="StepMania"
 	ProjectGUID="{AF209DBD-24BD-4356-8DFE-41751B221195}"
 	RootNamespace="StepMania"
 	Keyword="MFCProj"

src/StepMania-net2010.vcxproj

@@ -19,7 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectName>sm-ssc</ProjectName>
+    <ProjectName>StepMania</ProjectName>
     <ProjectGuid>{AF209DBD-24BD-4356-8DFE-41751B221195}</ProjectGuid>
     <RootNamespace>StepMania</RootNamespace>
     <Keyword>MFCProj</Keyword>

src/StepMania.cpp

@@ -1106,7 +1106,7 @@ int main(int argc, char* argv[])
 	STATSMAN	= new StatsManager;
 
 	// Initialize which courses are ranking courses here.
-	pLoadingWindow->SetText("Updating cource rankings...");
+	pLoadingWindow->SetText("Updating course rankings...");
 	SONGMAN->UpdateRankingCourses();
 
 	SAFE_DELETE( pLoadingWindow );		// destroy this before init'ing Display

src/TimingSegments.h

@@ -356,7 +356,7 @@ struct ComboSegment : public TimingSegment
 	 * It is best to override the values as soon as possible.
 	 */
 	ComboSegment() : 
-		TimingSegment(-1), combo(1) { }
+		TimingSegment(-1), combo(1), missCombo(1) { }
 
 	ComboSegment(const ComboSegment &other) : 
 		TimingSegment(other.GetRow()),