actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

reimplement "SyncBias" as something that tells us the sync of the pack so we may adjust accordingly rather than the blanket sync to apply to the pack.

Browse Source
This commit is contained in:
Crash Cringle
2025-03-03 23:25:32 -08:00
committed by teejusb
parent f59a5b1e72
commit 05cd7ed922
14 changed files with 28 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Group.cpp
+3 -1
View File
@@ -43,7 +43,7 @@ Group::Group(const RString& sDir, const RString& sGroupDirName) {
RString Series = "";
RString bannerPath = "";
RString authorsNotes = "";
float fOffset = PREFSMAN->m_fDefaultGroupOffsetSeconds;
float fOffset = PREFSMAN->m_fMachineSyncBias;
if (FILEMAN->DoesFileExist(sPackIniPath)) {
IniFile ini;
@@ -83,7 +83,9 @@ Group::Group(const RString& sDir, const RString& sGroupDirName) {
ini.GetValue("Group", "AuthorsNotes", authorsNotes);
} else {
m_bHasPackIni = false;
fOffset = PREFSMAN->m_fMachineSyncBias;
}
// Look for a group banner in this group folder
std::vector<RString> arrayGroupBanners;
src/PrefsManager.cpp
+1 -1
View File
@@ -237,7 +237,7 @@ PrefsManager::PrefsManager() :
m_ShowDancingCharacters ( "ShowDancingCharacters", SDC_Random ),
m_bUseUnlockSystem ( "UseUnlockSystem", false ),
m_fGlobalOffsetSeconds ( "GlobalOffsetSeconds", -0.008f ),
m_fDefaultGroupOffsetSeconds ( "DefaultGroupOffsetSeconds", 0.0f ),
m_fMachineSyncBias ( "MachineSyncBias", -0.009f ),
m_iProgressiveLifebar ( "ProgressiveLifebar", 0 ),
m_iProgressiveStageLifebar ( "ProgressiveStageLifebar", 0 ),
m_iProgressiveNonstopLifebar ( "ProgressiveNonstopLifebar", 0 ),
src/PrefsManager.h
+1 -1
View File
@@ -240,7 +240,7 @@ public:
Preference<ShowDancingCharacters> m_ShowDancingCharacters;
Preference<bool> m_bUseUnlockSystem;
Preference<float> m_fGlobalOffsetSeconds;
Preference<float> m_fDefaultGroupOffsetSeconds;
Preference<float> m_fMachineSyncBias;
Preference<int> m_iProgressiveLifebar;
Preference<int> m_iProgressiveStageLifebar;
Preference<int> m_iProgressiveNonstopLifebar;
src/ScreenOptionsMasterPrefs.cpp
+2 -2
View File
@@ -710,7 +710,7 @@ static void GlobalOffsetSeconds( int &sel, bool ToSel, const ConfOption *pConfOp
MoveMap( sel, pConfOption, ToSel, mapping, ARRAYLEN(mapping) );
}
static void DefaultGroupOffsetSeconds( int &sel, bool ToSel, const ConfOption *pConfOption )
static void MachineSyncBias( int &sel, bool ToSel, const ConfOption *pConfOption )
{
const float mapping[] = { 0.0f, 0.009f };
MoveMap( sel, pConfOption, ToSel, mapping, ARRAYLEN(mapping) );
@@ -947,7 +947,7 @@ static void InitializeConfOptions()
c.AddOption( ssprintf("%+i ms", i) );
ADD( c );
}
ADD( ConfOption( "DefaultGroupOffsetSeconds", DefaultGroupOffsetSeconds, "Null","|ITG" ) );
ADD( ConfOption( "MachineSyncBias", MachineSyncBias, "Null","|ITG" ) );
ADD( ConfOption( "EnableAttackSounds", MovePref<bool>, "No","Yes" ) );
ADD( ConfOption( "EnableMineHitSound", MovePref<bool>, "No","Yes" ) );
ADD( ConfOption( "RateModPreservesPitch", MovePref<bool>, "No","Yes") );