components/sound: correct variable shadowing

oakmound · Jan 11, 2022 · 874993c · 874993c
1 parent 4f346d6
commit 874993c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/components/sound/bar.go b/components/sound/bar.go
@@ -39,13 +39,13 @@ func NewBar(kind BarKind, pos floatgeom.Point2, w, h int) *entities.Solid {
 	var eventName string
 	switch kind {
 	case BarKindMaster:
-		eventName = "MasterVolumeChanged"
+		eventName = EventMasterVolumeChanged
 		dl.Progress = volume
 	case BarKindMusic:
-		eventName = "MusicVolumeChanged"
+		eventName = EventMusicVolumeChanged
 		dl.Progress = musicVolume
 	case BarKindSFX:
-		eventName = "SFXVolumeChanged"
+		eventName = EventSFXVolumeChanged
 		dl.Progress = sfxVolume
 	}
 	solid.CID.Bind(eventName, func(id event.CID, payload interface{}) int {

diff --git a/components/sound/sound.go b/components/sound/sound.go
@@ -16,14 +16,14 @@ var initOnce sync.Once
 
 // Init loads assets and initializes volume levels. It will do nothing
 // after it has been called once.
-func Init(masterVolume, musicVolume, sfxVolume float64) {
+func Init(masterVolume, mVolume, sVolume float64) {
 	initOnce.Do(func() {
 		ReloadMusicAssets()
 		ReloadSFXAssets()
 
 		volume = masterVolume
-		musicVolume = musicVolume
-		sfxVolume = sfxVolume
+		musicVolume = mVolume
+		sfxVolume = sVolume
 
 		updateSFXVolume(volume, sfxVolume)
 		updateMusicVolume(volume, musicVolume)