gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2025-01-12 04:17:25 -05:00
Code Issues Releases Wiki Activity

common: use inc closure to handle indices of SoundEntry props (#109)

Browse Source
This commit is contained in:
Robin Eklind 2019-11-07 22:33:10 -06:00 committed by Tim Sarbin
parent e26946bd35
commit d04f07606b
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
common/Sounds.go
View File

@ -39,32 +39,37 @@ type SoundEntry struct {
// CreateSoundEntry creates a sound entry based on a sound row on sounds.txt
func createSoundEntry(soundLine string) SoundEntry {
props := strings.Split(soundLine, "\t")
i := -1
inc := func() int {
i++
return i
}
result := SoundEntry{
Handle: props[0],
Index: StringToInt(props[1]),
FileName: props[2],
Volume: StringToUint8(props[3]),
GroupSize: StringToUint8(props[4]),
Loop: StringToUint8(props[5]) == 1,
FadeIn: StringToUint8(props[6]),
FadeOut: StringToUint8(props[7]),
DeferInst: StringToUint8(props[8]),
StopInst: StringToUint8(props[9]),
Duration: StringToUint8(props[10]),
Compound: StringToInt8(props[11]),
Reverb: StringToUint8(props[12]) == 1,
Falloff: StringToUint8(props[13]),
Cache: StringToUint8(props[14]),
AsyncOnly: StringToUint8(props[15]) == 1,
Priority: StringToUint8(props[16]),
Stream: StringToUint8(props[17]),
Stereo: StringToUint8(props[18]),
Tracking: StringToUint8(props[19]),
Solo: StringToUint8(props[20]),
MusicVol: StringToUint8(props[21]),
Block1: StringToInt(props[22]),
Block2: StringToInt(props[23]),
Block3: StringToInt(props[24]),
Handle: props[inc()],
Index: StringToInt(props[inc()]),
FileName: props[inc()],
Volume: StringToUint8(props[inc()]),
GroupSize: StringToUint8(props[inc()]),
Loop: StringToUint8(props[inc()]) == 1,
FadeIn: StringToUint8(props[inc()]),
FadeOut: StringToUint8(props[inc()]),
DeferInst: StringToUint8(props[inc()]),
StopInst: StringToUint8(props[inc()]),
Duration: StringToUint8(props[inc()]),
Compound: StringToInt8(props[inc()]),
Reverb: StringToUint8(props[inc()]) == 1,
Falloff: StringToUint8(props[inc()]),
Cache: StringToUint8(props[inc()]),
AsyncOnly: StringToUint8(props[inc()]) == 1,
Priority: StringToUint8(props[inc()]),
Stream: StringToUint8(props[inc()]),
Stereo: StringToUint8(props[inc()]),
Tracking: StringToUint8(props[inc()]),
Solo: StringToUint8(props[inc()]),
MusicVol: StringToUint8(props[inc()]),
Block1: StringToInt(props[inc()]),
Block2: StringToInt(props[inc()]),
Block3: StringToInt(props[inc()]),
}
return result
}