Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'songtronix/fix-532' into 'master'

Browse Source 
rename server settings file to `server_settings.ron`

Closes #532

See merge request veloren/veloren!913
This commit is contained in:
Songtronix 2020-04-15 12:48:15 +00:00
commit d9220261ff
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -27,6 +27,7 @@
*.rar
*.log
settings.ron
server_settings.ron
run.sh
maps
screenshots

4
server/src/settings.rs
View File

@ -121,9 +121,9 @@ impl ServerSettings {
start_time: 9.0 * 3600.0,
admins: vec!["singleplayer".to_string()], /* TODO: Let the player choose if they want
* to use admin commands or not */
..load // Fill in remaining fields from settings.ron.
..load // Fill in remaining fields from server_settings.ron.
}
}
fn get_settings_path() -> PathBuf { PathBuf::from(r"settings.ron") }
fn get_settings_path() -> PathBuf { PathBuf::from(r"server_settings.ron") }
}