Remove old references to Data/ in CustomSpeedMods

This commit is contained in:
AJ Kelly
2011-12-15 20:24:12 -06:00
parent d785568590
commit a3d5eaefe1
@@ -16,12 +16,6 @@ This rewrite comes with the following changes/features:
Thanks to this, we can now support reading SpeedMods from a USB stick or Thanks to this, we can now support reading SpeedMods from a USB stick or
other external storage. (I didn't test writing yet, but it should work.) other external storage. (I didn't test writing yet, but it should work.)
* Data/SpeedMods.txt is the fallback.
Previously, all speed mods were stored in {SM4 folder}/Data/SpeedMods.txt.
For compatibility reasons, this file is still read by the script.
It should be noted that this file may be the cause of problems in modern
Windows versions (Vista, 7).
This version of Custom Speed Mods will only run on StepMania 5 (due to m-mods). This version of Custom Speed Mods will only run on StepMania 5 (due to m-mods).
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
v1.4 v1.4
@@ -185,7 +179,6 @@ local function GetSpeedMods()
local baseFilename = "SpeedMods.txt" local baseFilename = "SpeedMods.txt"
local profileDirs = { local profileDirs = {
--Fallback = "Data/",
Machine = ProfileDir('ProfileSlot_Machine'), Machine = ProfileDir('ProfileSlot_Machine'),
PlayerNumber_P1 = ProfileDir('ProfileSlot_Player1'), PlayerNumber_P1 = ProfileDir('ProfileSlot_Player1'),
PlayerNumber_P2 = ProfileDir('ProfileSlot_Player2') PlayerNumber_P2 = ProfileDir('ProfileSlot_Player2')
@@ -193,8 +186,6 @@ local function GetSpeedMods()
-- figure out how many players we have to deal with. -- figure out how many players we have to deal with.
local numPlayers = GAMESTATE:GetNumPlayersEnabled() local numPlayers = GAMESTATE:GetNumPlayersEnabled()
-- load fallback
--local fallbackMods = ParseSpeedModFile(profileDirs.Fallback..baseFilename)
-- load machine -- load machine
local machineMods = ParseSpeedModFile(profileDirs.Machine..baseFilename) local machineMods = ParseSpeedModFile(profileDirs.Machine..baseFilename)
@@ -210,8 +201,7 @@ local function GetSpeedMods()
end end
end end
--finalMods = fallbackMods -- mine for duplicates, first pass
-- mine for duplicates, first pass (fallback <-> machine)
machineMods = MarkDupes(machineMods,finalMods) machineMods = MarkDupes(machineMods,finalMods)
for ply=1,#playerMods do for ply=1,#playerMods do
playerMods[ply] = MarkDupes(playerMods[ply],finalMods) playerMods[ply] = MarkDupes(playerMods[ply],finalMods)