Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ccgauche/fix-test-for-plugins' into 'master'

Browse Source 
Fixed tests on WIndows due to target arch wasm32

See merge request veloren/veloren!1686
This commit is contained in:
Joshua Barretto 2021-01-10 23:03:38 +00:00
commit 8539b67d9c
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugin/rt/src/lib.rs
View File

@ -7,18 +7,22 @@ pub use plugin_derive::*;
use serde::{de::DeserializeOwned, Serialize}; use serde::{de::DeserializeOwned, Serialize};
#[cfg(target_arch = "wasm32")]
extern "C" { extern "C" {
fn raw_emit_actions(ptr: *const u8, len: usize); fn raw_emit_actions(ptr: *const u8, len: usize);
} }
pub fn emit_action(action: api::Action) { emit_actions(vec![action]) } pub fn emit_action(action: api::Action) { emit_actions(vec![action]) }
pub fn emit_actions(actions: Vec<api::Action>) { pub fn emit_actions(_actions: Vec<api::Action>) {
let ret = bincode::serialize(&actions).expect("Can't serialize action in emit"); #[cfg(target_arch = "wasm32")]
{
let ret = bincode::serialize(&_actions).expect("Can't serialize action in emit");
unsafe { unsafe {
raw_emit_actions(ret.as_ptr(), ret.len()); raw_emit_actions(ret.as_ptr(), ret.len());
} }
} }
}
pub fn read_input<T>(ptr: i32, len: u32) -> Result<T, &'static str> pub fn read_input<T>(ptr: i32, len: u32) -> Result<T, &'static str>
where where