diff --git a/ffi/src/plugin.rs b/ffi/src/plugin.rs index 5193dea..aeed19a 100644 --- a/ffi/src/plugin.rs +++ b/ffi/src/plugin.rs @@ -83,7 +83,7 @@ pub unsafe extern "C" fn esp_plugin_free(plugin_ptr: *mut Plugin) { /// * [esp_plugin_count_override_records] /// * [esp_plugin_do_records_overlap] /// * [esp_plugin_records_overlap_size] -/// * [esp_plugin_is_valid_as_light_master] / [esp_plugin_is_valid_as_light_plugin] +/// * [esp_plugin_is_valid_as_light_plugin] /// * [esp_plugin_is_valid_as_override_plugin] /// /// Returns [ESP_OK] if successful, otherwise an `ESP_ERROR_*` code is returned. @@ -229,15 +229,6 @@ pub unsafe extern "C" fn esp_plugin_is_master( .unwrap_or(ESP_ERROR_PANICKED) } -#[no_mangle] -#[deprecated = "This has been renamed to esp_plugin_is_light_plugin() for clarity."] -pub unsafe extern "C" fn esp_plugin_is_light_master( - plugin_ptr: *const Plugin, - is_light_master: *mut bool, -) -> u32 { - esp_plugin_is_light_plugin(plugin_ptr, is_light_master) -} - #[no_mangle] pub unsafe extern "C" fn esp_plugin_is_light_plugin( plugin_ptr: *const Plugin, @@ -491,15 +482,6 @@ pub unsafe extern "C" fn esp_plugin_records_overlap_size( .unwrap_or(ESP_ERROR_PANICKED) } -#[no_mangle] -#[deprecated = "This has been renamed to esp_plugin_is_valid_as_light_plugin() for clarity."] -pub unsafe extern "C" fn esp_plugin_is_valid_as_light_master( - plugin_ptr: *const Plugin, - is_valid: *mut bool, -) -> u32 { - esp_plugin_is_valid_as_light_plugin(plugin_ptr, is_valid) -} - #[no_mangle] pub unsafe extern "C" fn esp_plugin_is_valid_as_light_plugin( plugin_ptr: *const Plugin, diff --git a/ffi/tests/ffi.cpp b/ffi/tests/ffi.cpp index d35a9a5..65d8028 100644 --- a/ffi/tests/ffi.cpp +++ b/ffi/tests/ffi.cpp @@ -124,20 +124,6 @@ void test_esp_plugin_is_master() { esp_plugin_free(plugin); } -void test_esp_plugin_is_light_master() { - printf("testing esp_plugin_is_light_master()...\n"); - Plugin * plugin; - auto return_code = esp_plugin_new(&plugin, ESP_GAME_FALLOUT4, "../../testing-plugins/Skyrim/Data/Blank.esl"); - assert(return_code == ESP_OK); - - bool is_light_master; - return_code = esp_plugin_is_light_master(plugin, &is_light_master); - assert(return_code == ESP_OK); - assert(is_light_master); - - esp_plugin_free(plugin); -} - void test_esp_plugin_is_light_plugin() { printf("testing esp_plugin_is_light_plugin()...\n"); Plugin * plugin; @@ -294,23 +280,6 @@ void test_esp_plugin_records_overlap_size() { esp_plugin_free(plugin); } -void test_esp_plugin_is_valid_as_light_master() { - printf("testing esp_plugin_is_valid_as_light_master()...\n"); - Plugin * plugin; - auto return_code = esp_plugin_new(&plugin, ESP_GAME_SKYRIMSE, "../../testing-plugins/SkyrimSE/Data/Blank.esm"); - assert(return_code == ESP_OK); - - return_code = esp_plugin_parse(plugin, true); - assert(return_code == ESP_OK); - - bool is_valid; - return_code = esp_plugin_is_valid_as_light_master(plugin, &is_valid); - assert(return_code == ESP_OK); - assert(is_valid); - - esp_plugin_free(plugin); -} - void test_esp_plugin_is_valid_as_light_plugin() { printf("testing esp_plugin_is_valid_as_light_plugin()...\n"); Plugin * plugin; @@ -372,7 +341,6 @@ int main() { test_esp_plugin_filename(); test_esp_plugin_masters(); test_esp_plugin_is_master(); - test_esp_plugin_is_light_master(); test_esp_plugin_is_light_plugin(); test_esp_plugin_is_valid(); test_esp_plugin_description(); @@ -382,7 +350,6 @@ int main() { test_esp_plugin_count_override_records(); test_esp_plugin_do_records_overlap(); test_esp_plugin_records_overlap_size(); - test_esp_plugin_is_valid_as_light_master(); test_esp_plugin_is_valid_as_light_plugin(); test_esp_plugin_is_valid_as_medium_plugin(); test_esp_plugin_is_valid_as_override_plugin(); diff --git a/src/plugin.rs b/src/plugin.rs index cd286da..83c7610 100644 --- a/src/plugin.rs +++ b/src/plugin.rs @@ -246,11 +246,6 @@ impl Plugin { } } - #[deprecated = "This has been renamed to Plugin::is_light_plugin() for clarity."] - pub fn is_light_master_file(&self) -> bool { - self.is_light_plugin() - } - pub fn is_light_plugin(&self) -> bool { if self.game_id.supports_light_plugins() { if self.game_id == GameId::Starfield { @@ -404,11 +399,6 @@ impl Plugin { } } - #[deprecated = "This has been renamed to Plugin::is_valid_as_light_plugin() for clarity."] - pub fn is_valid_as_light_master(&self) -> Result { - self.is_valid_as_light_plugin() - } - pub fn is_valid_as_light_plugin(&self) -> Result { if self.game_id.supports_light_plugins() { match &self.data.record_ids {