Skip to content

Commit

Permalink
Use correct case for Oblivion and Nehrim Plugins.txt
Browse files Browse the repository at this point in the history
This makes a difference when using case-sensitive filesystems, though
files like plugins.txt and Skyrim.ccc/Fallout4.ccc may still contain
plugin names in the wrong case.

I've checked all other games (besides the VR games, which I don't own
copies of) and they all use lowercase plugins.txt. I've also checked all
the other hardcoded file and folder names used, and they're all correct.
  • Loading branch information
Ortham committed Aug 22, 2023
1 parent bce5dbb commit 24d21d3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions ffi/tests/ffi.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ void test_lo_get_active_plugins_file_path() {

assert(return_code == 0);
#ifdef _WIN32
assert(strcmp(path, "../../testing-plugins/Oblivion\\plugins.txt") == 0);
assert(strcmp(path, "../../testing-plugins/Oblivion\\Plugins.txt") == 0);
#else
assert(strcmp(path, "../../testing-plugins/Oblivion/plugins.txt") == 0);
assert(strcmp(path, "../../testing-plugins/Oblivion/Plugins.txt") == 0);
#endif
lo_free_string(path);
lo_destroy_handle(handle);
Expand Down Expand Up @@ -330,7 +330,7 @@ int main(void) {
test_lo_get_plugin_position();
test_lo_get_indexed_plugin();

remove("testing-plugins/Oblivion/plugins.txt");
remove("testing-plugins/Oblivion/Plugins.txt");
printf("SUCCESS\n");
return 0;
}
6 changes: 3 additions & 3 deletions ffi/tests/ffi.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ void test_lo_get_active_plugins_file_path() {

assert(return_code == 0);
#ifdef _WIN32
assert(strcmp(path, "../../testing-plugins/Oblivion\\plugins.txt") == 0);
assert(strcmp(path, "../../testing-plugins/Oblivion\\Plugins.txt") == 0);
#else
assert(strcmp(path, "../../testing-plugins/Oblivion/plugins.txt") == 0);
assert(strcmp(path, "../../testing-plugins/Oblivion/Plugins.txt") == 0);
#endif
lo_free_string(path);
lo_destroy_handle(handle);
Expand Down Expand Up @@ -357,7 +357,7 @@ int main(void) {

test_thread_safety();

remove("testing-plugins/Oblivion/plugins.txt");
remove("testing-plugins/Oblivion/Plugins.txt");
printf("SUCCESS\n");
return 0;
}
6 changes: 3 additions & 3 deletions src/game_settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ fn oblivion_plugins_file_path(game_path: &Path, local_path: &Path) -> PathBuf {
game_path
};

parent_path.join("plugins.txt")
parent_path.join("Plugins.txt")
}

fn use_my_games_directory(ini_path: &Path) -> bool {
Expand Down Expand Up @@ -740,7 +740,7 @@ mod tests {
)
.unwrap();
assert_eq!(
Path::new("local/plugins.txt"),
Path::new("local/Plugins.txt"),
settings.active_plugins_file()
);

Expand Down Expand Up @@ -831,7 +831,7 @@ mod tests {
GameSettings::with_local_path(GameId::Oblivion, &game_path, &Path::new("local"))
.unwrap();
assert_eq!(
game_path.join("plugins.txt"),
game_path.join("Plugins.txt"),
*settings.active_plugins_file()
);
}
Expand Down

0 comments on commit 24d21d3

Please sign in to comment.