From 9fc416e8e26fc05d6995b2d607b07a9463df14bb Mon Sep 17 00:00:00 2001 From: Tim Sarbin Date: Tue, 29 Oct 2019 02:24:05 -0400 Subject: [PATCH] Added LevelPreset file loading --- Common/LevelPresets.go | 6 ++++-- Core/Engine.go | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Common/LevelPresets.go b/Common/LevelPresets.go index b9043c40..744f6dee 100644 --- a/Common/LevelPresets.go +++ b/Common/LevelPresets.go @@ -43,13 +43,14 @@ func LoadLevelPresets(fileProvider FileProvider) { LevelPresets[i].Animate = sr.GetInt32() != 0 LevelPresets[i].KillEdge = sr.GetInt32() != 0 LevelPresets[i].FillBlanks = sr.GetInt32() != 0 + sr.GetInt32() // What is this field? LevelPresets[i].SizeX = sr.GetInt32() LevelPresets[i].SizeY = sr.GetInt32() LevelPresets[i].AutoMap = sr.GetInt32() != 0 LevelPresets[i].Scan = sr.GetInt32() != 0 LevelPresets[i].Pops = sr.GetInt32() LevelPresets[i].PopPad = sr.GetInt32() - sr.GetInt32() + sr.GetUInt32() // Most likely NumFiles for fileIdx := 0; fileIdx < 6; fileIdx++ { strData, _ := sr.ReadBytes(60) s := strings.Trim(string(strData), string(0)) @@ -61,6 +62,7 @@ func LoadLevelPresets(fileProvider FileProvider) { } LevelPresets[i].Dt1Mask = sr.GetUInt32() + } - log.Printf("Loaded %d LevelPreset records") + log.Printf("Loaded %d LevelPreset records", len(LevelPresets)) } diff --git a/Core/Engine.go b/Core/Engine.go index a63906dc..c413d38f 100644 --- a/Core/Engine.go +++ b/Core/Engine.go @@ -62,7 +62,7 @@ func CreateEngine() *Engine { result.loadSoundEntries() Common.LoadTextDictionary(result) Common.LoadLevelTypes(result) - //Common.LoadLevelPresets(result) + Common.LoadLevelPresets(result) result.SoundManager = Sound.CreateManager(result) result.SoundManager.SetVolumes(result.Settings.BgmVolume, result.Settings.SfxVolume) result.UIManager = UI.CreateManager(result, *result.SoundManager)