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

Various fixes for FFI
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2023-01-03 13:56:20 +01:00
parent bd804ea280
commit 62a3ffb2bf
7 changed files with 51 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ffi/static_data/move_data.rs
View File

@@ -1,4 +1,4 @@
use crate::ffi::{ffi_arc_getter, BorrowedPtr, ExternPointer, IdentifiablePointer, OwnedPtr};
use crate::ffi::{ffi_arc_dyn_getter, BorrowedPtr, ExternPointer, IdentifiablePointer, OwnedPtr};
use crate::static_data::{
EffectParameter, MoveCategory, MoveData, MoveDataImpl, MoveTarget, SecondaryEffect, SecondaryEffectImpl,
TypeIdentifier,
@@ -63,13 +63,13 @@ unsafe extern "C" fn move_data_name(ptr: ExternPointer<Arc<dyn MoveData>>) -> Ow
CString::new(name.str()).unwrap().into_raw()
}
ffi_arc_getter!(dyn MoveData, move_type, TypeIdentifier);
ffi_arc_getter!(dyn MoveData, category, MoveCategory);
ffi_arc_getter!(dyn MoveData, base_power, u8);
ffi_arc_getter!(dyn MoveData, accuracy, u8);
ffi_arc_getter!(dyn MoveData, base_usages, u8);
ffi_arc_getter!(dyn MoveData, target, MoveTarget);
ffi_arc_getter!(dyn MoveData, priority, i8);
ffi_arc_dyn_getter!(MoveData, move_type, TypeIdentifier);
ffi_arc_dyn_getter!(MoveData, category, MoveCategory);
ffi_arc_dyn_getter!(MoveData, base_power, u8);
ffi_arc_dyn_getter!(MoveData, accuracy, u8);
ffi_arc_dyn_getter!(MoveData, base_usages, u8);
ffi_arc_dyn_getter!(MoveData, target, MoveTarget);
ffi_arc_dyn_getter!(MoveData, priority, i8);
/// The optional secondary effect the move has.
#[no_mangle]