teamnwah/tes3mp-rs
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix OnCellLoad and OnCellUnload

Browse source
This commit is contained in:
eater 2020-03-03 17:43:43 +01:00
parent 9bf63533e1
commit 9fe0052c2e
Signed by: eater
GPG key ID: AD2560A0F84F0759
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tes3mp-plugin/src/plugin/mod.rs
View file

@ -96,7 +96,9 @@ macro_rules! maybe_string {
#[macro_export]
macro_rules! use_events {
($events:ident) => {
#[allow(unused_imports)]
use std::ffi::CStr;
#[allow(unused_imports)]
use std::os::raw::*;
static mut EVENTS_INSTANCE: Option<$events> = None;
@ -169,14 +171,14 @@ macro_rules! use_events {
#[no_mangle]
#[allow(non_snake_case)]
pub fn OnCellLoad(description: *const i8) {
call_instance!(on_cell_load, maybe_string!(description));
pub fn OnCellLoad(player_id: c_ushort, description: *const i8) {
call_instance!(on_cell_load, player_id, maybe_string!(description));
}
#[no_mangle]
#[allow(non_snake_case)]
pub fn OnCellUnload(description: *const i8) {
call_instance!(on_cell_unload, maybe_string!(description));
pub fn OnCellUnload(player_id: c_ushort, description: *const i8) {
call_instance!(on_cell_unload, player_id, maybe_string!(description));
}
#[no_mangle]
@ -469,8 +471,8 @@ pub trait Events: Sized {
fn on_actor_test(&mut self, player_id: c_ushort, description: Option<&str>) {}
fn on_cell_deletion(&mut self, description: Option<&str>) {}
fn on_cell_load(&mut self, description: Option<&str>) {}
fn on_cell_unload(&mut self, description: Option<&str>) {}
fn on_cell_load(&mut self, player_id: c_ushort, description: Option<&str>) {}
fn on_cell_unload(&mut self, player_id: c_ushort, description: Option<&str>) {}
fn on_container(&mut self, player_id: c_ushort, description: Option<&str>) {}
fn on_door_state(&mut self, player_id: c_ushort, description: Option<&str>) {}