FIX: typo
This commit is contained in:
@@ -90,6 +90,10 @@ func ReadIni(path string) (RoomIni, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if room == nil {
|
||||||
|
room = meta
|
||||||
|
}
|
||||||
|
|
||||||
roomIni, err := loadIni(meta, room)
|
roomIni, err := loadIni(meta, room)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return RoomIni{}, fmt.Errorf("ERROR: error loading ini from %s: %+v", path, err)
|
return RoomIni{}, fmt.Errorf("ERROR: error loading ini from %s: %+v", path, err)
|
||||||
@@ -117,31 +121,31 @@ func loadIni(meta *ini.Section, room *ini.Section) (RoomIni, error) {
|
|||||||
return RoomIni{}, fmt.Errorf("night is set but room is not set")
|
return RoomIni{}, fmt.Errorf("night is set but room is not set")
|
||||||
}
|
}
|
||||||
|
|
||||||
if val, err := loatFloat(room, "size", 1); err != nil {
|
if val, err := loadFloat(room, "size", 1); err != nil {
|
||||||
return RoomIni{}, err
|
return RoomIni{}, err
|
||||||
} else {
|
} else {
|
||||||
roomini.size = val
|
roomini.size = val
|
||||||
}
|
}
|
||||||
|
|
||||||
if val, err := loatFloat(room, "speed", 1); err != nil {
|
if val, err := loadFloat(room, "speed", 1); err != nil {
|
||||||
return RoomIni{}, err
|
return RoomIni{}, err
|
||||||
} else {
|
} else {
|
||||||
roomini.speed = val
|
roomini.speed = val
|
||||||
}
|
}
|
||||||
|
|
||||||
if val, err := loatFloat(room, "fov", 55); err != nil {
|
if val, err := loadFloat(room, "fov", 55); err != nil {
|
||||||
return RoomIni{}, err
|
return RoomIni{}, err
|
||||||
} else {
|
} else {
|
||||||
roomini.fov = val
|
roomini.fov = val
|
||||||
}
|
}
|
||||||
|
|
||||||
if val, err := loatFloat(room, "texture_repeat", 3); err != nil {
|
if val, err := loadFloat(room, "texture_repeat", 3); err != nil {
|
||||||
return RoomIni{}, err
|
return RoomIni{}, err
|
||||||
} else {
|
} else {
|
||||||
roomini.textureRepeat = val
|
roomini.textureRepeat = val
|
||||||
}
|
}
|
||||||
|
|
||||||
if val, err := loatFloat(room, "room_height", 350); err != nil {
|
if val, err := loadFloat(room, "room_height", 350); err != nil {
|
||||||
return RoomIni{}, err
|
return RoomIni{}, err
|
||||||
} else {
|
} else {
|
||||||
roomini.roomHeight = val
|
roomini.roomHeight = val
|
||||||
@@ -159,13 +163,13 @@ func loadIni(meta *ini.Section, room *ini.Section) (RoomIni, error) {
|
|||||||
roomini.fogColor = val
|
roomini.fogColor = val
|
||||||
}
|
}
|
||||||
|
|
||||||
if val, err := loatFloat(room, "fog_end", -1); err != nil {
|
if val, err := loadFloat(room, "fog_end", -1); err != nil {
|
||||||
return RoomIni{}, err
|
return RoomIni{}, err
|
||||||
} else {
|
} else {
|
||||||
roomini.fogEnd = val
|
roomini.fogEnd = val
|
||||||
}
|
}
|
||||||
|
|
||||||
if val, err := loatFloat(room, "mini_speed", 1); err != nil {
|
if val, err := loadFloat(room, "mini_speed", 1); err != nil {
|
||||||
return RoomIni{}, err
|
return RoomIni{}, err
|
||||||
} else {
|
} else {
|
||||||
roomini.miniSpeed = val
|
roomini.miniSpeed = val
|
||||||
@@ -187,7 +191,7 @@ func loadInt(sec *ini.Section, key string, def int) (int, error) {
|
|||||||
return valint, nil
|
return valint, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func loatFloat(sec *ini.Section, key string, def float64) (float64, error) {
|
func loadFloat(sec *ini.Section, key string, def float64) (float64, error) {
|
||||||
val, err := sec.GetKey(key)
|
val, err := sec.GetKey(key)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return def, nil
|
return def, nil
|
||||||
|
|||||||
Reference in New Issue
Block a user