Deukhoofd/PkmnLib_rs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Loads of cleanup
Some checks reported errors
continuous-integration/drone/push Build was killed
Details

Browse Source
This commit is contained in:
Deukhoofd
2022-11-27 17:29:29 +01:00
parent aa3ceaed3e
commit efd1acdfa5
45 changed files with 259 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ffi/static_data/item.rs
View File

@@ -1,5 +1,5 @@
use crate::ffi::{ffi_arc_getter, ExternPointer, IdentifiablePointer, OwnedPtr};
use crate::static_data::{BattleItemCategory, Item, ItemCategory};
use crate::static_data::{BattleItemCategory, Item, ItemCategory, ItemImpl};
use crate::StringKey;
use hashbrown::HashSet;
use std::ffi::{c_char, CStr, CString};
@@ -15,36 +15,38 @@ unsafe extern "C" fn item_new(
price: i32,
flags: *const *const c_char,
flags_length: usize,
) -> IdentifiablePointer<Arc<Item>> {
) -> IdentifiablePointer<Arc<dyn Item>> {
let flags = std::slice::from_raw_parts(flags, flags_length);
let name: StringKey = CStr::from_ptr(name).to_str().unwrap().into();
let mut flags_set: HashSet<StringKey> = HashSet::with_capacity(flags_length);
for flag in flags {
flags_set.insert(CStr::from_ptr(*flag).to_str().unwrap().into());
}
Arc::new(Item::new(&name, category, battle_category, price, flags_set)).into()
let item: Arc<dyn Item> = Arc::new(ItemImpl::new(&name, category, battle_category, price, flags_set));
item.into()
}
/// Drops a reference counted item.
#[no_mangle]
unsafe extern "C" fn item_drop(ptr: OwnedPtr<Arc<Item>>) {
unsafe extern "C" fn item_drop(ptr: OwnedPtr<Arc<dyn Item>>) {
drop_in_place(ptr)
}
/// The name of the item.
#[no_mangle]
unsafe extern "C" fn item_name(ptr: ExternPointer<Arc<Item>>) -> OwnedPtr<c_char> {
unsafe extern "C" fn item_name(ptr: ExternPointer<Arc<dyn Item>>) -> OwnedPtr<c_char> {
let name = ptr.as_ref().name();
CString::new(name.str()).unwrap().into_raw()
}
ffi_arc_getter!(Item, category, ItemCategory);
ffi_arc_getter!(Item, battle_category, BattleItemCategory);
ffi_arc_getter!(Item, price, i32);
ffi_arc_getter!(dyn Item, category, ItemCategory);
ffi_arc_getter!(dyn Item, battle_category, BattleItemCategory);
ffi_arc_getter!(dyn Item, price, i32);
/// Checks whether the item has a specific flag.
#[no_mangle]
unsafe extern "C" fn item_has_flag(ptr: ExternPointer<Arc<Item>>, flag: *const c_char) -> u8 {
unsafe extern "C" fn item_has_flag(ptr: ExternPointer<Arc<dyn Item>>, flag: *const c_char) -> u8 {
let flag = CStr::from_ptr(flag).into();
u8::from(ptr.as_ref().has_flag(&flag))
}

2
src/ffi/static_data/libraries/mod.rs
View File

@@ -75,4 +75,4 @@ macro_rules! library_interface {
library_interface!(SpeciesLibrary, Species);
library_interface!(MoveLibrary, MoveData);
library_interface!(AbilityLibrary, Ability);
library_interface!(ItemLibrary, Item);
library_interface!(ItemLibrary, dyn Item);