Initial work on rune as scripting library
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
This commit is contained in:
@@ -5,7 +5,7 @@ use crate::static_data::{
|
||||
};
|
||||
use crate::StringKey;
|
||||
use anyhow::anyhow;
|
||||
use hashbrown::HashSet;
|
||||
use hashbrown::{HashMap, HashSet};
|
||||
use std::ffi::{c_char, CStr, CString};
|
||||
use std::sync::Arc;
|
||||
|
||||
@@ -99,13 +99,16 @@ unsafe extern "C" fn move_data_has_flag(ptr: FFIHandle<Arc<dyn MoveData>>, flag:
|
||||
unsafe extern "C" fn secondary_effect_new(
|
||||
chance: f32,
|
||||
effect_name: NonOwnedPtrString,
|
||||
parameter_keys: *const NonOwnedPtrString,
|
||||
parameters: *mut FFIHandle<Arc<Parameter>>,
|
||||
parameters_length: usize,
|
||||
) -> FFIHandle<Box<dyn SecondaryEffect>> {
|
||||
let parameter_key_slice = std::slice::from_raw_parts(parameter_keys, parameters_length);
|
||||
let parameter_slice = std::slice::from_raw_parts(parameters, parameters_length);
|
||||
let mut parameters = Vec::with_capacity(parameters_length);
|
||||
for parameter in parameter_slice {
|
||||
parameters.push(parameter.from_ffi_handle())
|
||||
let mut parameters = HashMap::with_capacity(parameters_length);
|
||||
for (index, parameter) in parameter_slice.iter().enumerate() {
|
||||
let key = CStr::from_ptr(parameter_key_slice[index]).into();
|
||||
parameters.insert(key, parameter.from_ffi_handle());
|
||||
}
|
||||
|
||||
let b: Arc<dyn SecondaryEffect> = Arc::new(SecondaryEffectImpl::new(
|
||||
@@ -146,9 +149,10 @@ unsafe extern "C" fn secondary_effect_parameter_length(ptr: FFIHandle<Arc<dyn Se
|
||||
#[no_mangle]
|
||||
unsafe extern "C" fn secondary_effect_parameter_get(
|
||||
ptr: FFIHandle<Arc<dyn SecondaryEffect>>,
|
||||
index: usize,
|
||||
name: NonOwnedPtrString,
|
||||
) -> FFIHandle<Arc<Parameter>> {
|
||||
if let Some(v) = ptr.from_ffi_handle().parameters().get(index) {
|
||||
let string: StringKey = CStr::from_ptr(name).into();
|
||||
if let Some(v) = ptr.from_ffi_handle().parameters().get(&string) {
|
||||
FFIHandle::get_handle(v.clone().into())
|
||||
} else {
|
||||
FFIHandle::none()
|
||||
|
||||
Reference in New Issue
Block a user