Skip to content

Fix destroying vehicles #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sreyas-Sreelal merged 2 commits into from
May 18, 2025
Merged

Fix destroying vehicles #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6c514b
Fix destroying vehicles
0x617374726F May 10, 2025
c36b27f
Don't rely on borrow checker in script events at all
0x617374726F May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions omp-gdk/src/scripting/actors/events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![allow(clippy::all)]
use std::mem::transmute;
use std::{mem::transmute, rc::Rc};

use crate::{events::EventArgs, players::Player};

Expand All @@ -23,8 +23,9 @@ pub unsafe extern "C" fn OMPRS_OnPlayerGiveDamageActor(
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script.borrow_mut().on_player_give_damage_actor(
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_player_give_damage_actor(
Player::new(*(*(*args).list).player),
Actor::new(*(*(*args).list).actor),
*(*(*args).list).amount,
Expand All @@ -47,8 +48,9 @@ pub unsafe extern "C" fn OMPRS_OnActorStreamIn(args: *const EventArgs<OnActorStr
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script.borrow_mut().on_actor_stream_in(
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_actor_stream_in(
Actor::new(*(*(*args).list).actor),
Player::new(*(*(*args).list).forPlayer),
);
Expand All @@ -68,8 +70,9 @@ pub unsafe extern "C" fn OMPRS_OnActorStreamOut(args: *const EventArgs<OnActorSt
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script.borrow_mut().on_actor_stream_out(
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_actor_stream_out(
Actor::new(*(*(*args).list).actor),
Player::new(*(*(*args).list).forPlayer),
);
Expand Down
30 changes: 14 additions & 16 deletions omp-gdk/src/scripting/checkpoints/events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#![allow(clippy::all)]
use std::rc::Rc;

use crate::{events::EventArgs, players::Player};

#[repr(C)]
Expand All @@ -15,10 +17,9 @@ pub unsafe extern "C" fn OMPRS_OnPlayerEnterCheckpoint(
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script
.borrow_mut()
.on_player_enter_checkpoint(Player::new(*(*(*args).list).player));
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_player_enter_checkpoint(Player::new(*(*(*args).list).player));
}
}

Expand All @@ -36,10 +37,9 @@ pub unsafe extern "C" fn OMPRS_OnPlayerLeaveCheckpoint(
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script
.borrow_mut()
.on_player_leave_checkpoint(Player::new(*(*(*args).list).player));
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_player_leave_checkpoint(Player::new(*(*(*args).list).player));
}
}

Expand All @@ -57,10 +57,9 @@ pub unsafe extern "C" fn OMPRS_OnPlayerEnterRaceCheckpoint(
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script
.borrow_mut()
.on_player_enter_race_checkpoint(Player::new(*(*(*args).list).player));
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_player_enter_race_checkpoint(Player::new(*(*(*args).list).player));
}
}

Expand All @@ -78,9 +77,8 @@ pub unsafe extern "C" fn OMPRS_OnPlayerLeaveRaceCheckpoint(
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script
.borrow_mut()
.on_player_leave_race_checkpoint(Player::new(*(*(*args).list).player));
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_player_leave_race_checkpoint(Player::new(*(*(*args).list).player));
}
}
7 changes: 5 additions & 2 deletions omp-gdk/src/scripting/classes/events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#![allow(clippy::all)]
use std::rc::Rc;

use crate::{events::EventArgs, players::Player};

#[repr(C)]
Expand All @@ -17,8 +19,9 @@ pub unsafe extern "C" fn OMPRS_OnPlayerRequestClass(
.as_mut()
.unwrap();
let mut ret = false;
for script in scripts.iter_mut() {
ret = script.borrow_mut().on_player_request_class(
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
ret = script.on_player_request_class(
Player::new(*(*(*args).list).player),
*(*(*args).list).classId,
);
Expand Down
12 changes: 8 additions & 4 deletions omp-gdk/src/scripting/core/events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#![allow(clippy::all)]
use std::rc::Rc;

use crate::{events::EventArgs, types::stringview::StringView};

#[repr(C)]
Expand All @@ -13,8 +15,9 @@ pub unsafe extern "C" fn OMPRS_OnTick(args: *const EventArgs<OnTickArgs>) {
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script.borrow_mut().on_tick(*(*(*args).list).elapsed);
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_tick(*(*(*args).list).elapsed);
}
}

Expand Down Expand Up @@ -58,8 +61,9 @@ pub unsafe extern "C" fn OMPRS_OnRconLoginAttempt(
.as_mut()
.unwrap();
let mut ret = false;
for script in scripts.iter_mut() {
ret = script.borrow_mut().on_rcon_login_attempt(
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
ret = script.on_rcon_login_attempt(
(*(*(*args).list).address).get_data(),
(*(*(*args).list).password).get_data(),
*(*(*args).list).success,
Expand Down
7 changes: 4 additions & 3 deletions omp-gdk/src/scripting/dialogs/events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![allow(clippy::all)]
use crate::{events::EventArgs, players::Player, types::stringview::StringView};
use std::mem::transmute;
use std::{mem::transmute, rc::Rc};

#[repr(C)]
pub struct OnDialogResponseArgs {
Expand All @@ -18,8 +18,9 @@ pub unsafe extern "C" fn OMPRS_OnDialogResponse(args: *const EventArgs<OnDialogR
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script.borrow_mut().on_dialog_response(
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_dialog_response(
Player::new(*(*(*args).list).player),
*(*(*args).list).dialogId,
transmute(*(*(*args).list).response),
Expand Down
17 changes: 11 additions & 6 deletions omp-gdk/src/scripting/gangzones/events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#![allow(clippy::all)]
use std::rc::Rc;

use crate::{events::EventArgs, players::Player};

use super::GangZone;
Expand All @@ -18,8 +20,9 @@ pub unsafe extern "C" fn OMPRS_OnPlayerEnterGangZone(
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script.borrow_mut().on_player_enter_gang_zone(
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_player_enter_gang_zone(
Player::new(*(*(*args).list).player),
GangZone::new(*(*(*args).list).zone),
);
Expand All @@ -41,8 +44,9 @@ pub unsafe extern "C" fn OMPRS_OnPlayerLeaveGangZone(
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script.borrow_mut().on_player_leave_gang_zone(
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_player_leave_gang_zone(
Player::new(*(*(*args).list).player),
GangZone::new(*(*(*args).list).zone),
);
Expand All @@ -64,8 +68,9 @@ pub unsafe extern "C" fn OMPRS_OnPlayerClickGangZone(
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script.borrow_mut().on_player_click_gang_zone(
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_player_click_gang_zone(
Player::new(*(*(*args).list).player),
GangZone::new(*(*(*args).list).zone),
);
Expand Down
14 changes: 8 additions & 6 deletions omp-gdk/src/scripting/menus/events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#![allow(clippy::all)]
use std::rc::Rc;

use crate::{events::EventArgs, players::Player};

#[repr(C)]
Expand All @@ -16,8 +18,9 @@ pub unsafe extern "C" fn OMPRS_OnPlayerSelectedMenuRow(
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script.borrow_mut().on_player_selected_menu_row(
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_player_selected_menu_row(
Player::new(*(*(*args).list).player),
*(*(*args).list).row,
);
Expand All @@ -36,9 +39,8 @@ pub unsafe extern "C" fn OMPRS_OnPlayerExitedMenu(args: *const EventArgs<OnPlaye
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script
.borrow_mut()
.on_player_exited_menu(Player::new(*(*(*args).list).player));
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_player_exited_menu(Player::new(*(*(*args).list).player));
}
}
14 changes: 7 additions & 7 deletions omp-gdk/src/scripting/models/events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#![allow(clippy::all)]
use crate::{events::EventArgs, players::Player};
use std::mem::transmute;
use std::{mem::transmute, rc::Rc};

#[repr(C)]
pub struct OnPlayerFinishedDownloadingArgs {
Expand All @@ -17,10 +17,9 @@ pub unsafe extern "C" fn OMPRS_OnPlayerFinishedDownloading(
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script
.borrow_mut()
.on_player_finished_downloading(Player::new(*(*(*args).list).player));
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_player_finished_downloading(Player::new(*(*(*args).list).player));
}
}

Expand All @@ -40,8 +39,9 @@ pub unsafe extern "C" fn OMPRS_OnPlayerRequestDownload(
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script.borrow_mut().on_player_request_download(
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_player_request_download(
Player::new(*(*(*args).list).player),
transmute(*(*(*args).list).model_type),
*(*(*args).list).checksum,
Expand Down
29 changes: 16 additions & 13 deletions omp-gdk/src/scripting/objects/events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#![allow(clippy::all)]
use std::mem::transmute;
use std::{mem::transmute, rc::Rc};

use crate::{events::EventArgs, players::Player, types::vector::Vector3};

Expand All @@ -17,10 +17,9 @@ pub unsafe extern "C" fn OMPRS_OnObjectMove(args: *const EventArgs<OnObjectMoveA
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script
.borrow_mut()
.on_object_moved(Object::new(*(*(*args).list).object));
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_object_moved(Object::new(*(*(*args).list).object));
}
}

Expand All @@ -37,8 +36,9 @@ pub unsafe extern "C" fn OMPRS_OnPlayerObjectMove(args: *const EventArgs<OnPlaye
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script.borrow_mut().on_player_object_moved(
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_player_object_moved(
Player::new(*(*(*args).list).player),
PlayerObject::new(
*(*(*args).list).object,
Expand Down Expand Up @@ -68,8 +68,9 @@ pub unsafe extern "C" fn OMPRS_OnPlayerEditObject(args: *const EventArgs<OnPlaye
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script.borrow_mut().on_player_edit_object(
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_player_edit_object(
Player::new(*(*(*args).list).player),
Object::new(*(*(*args).list).object),
transmute(*(*(*args).list).response),
Expand Down Expand Up @@ -127,8 +128,9 @@ pub unsafe extern "C" fn OMPRS_OnPlayerEditAttachedObject(
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script.borrow_mut().on_player_edit_attached_object(
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_player_edit_attached_object(
Player::new(*(*(*args).list).player),
*(*(*args).list).index,
*(*(*args).list).saved,
Expand Down Expand Up @@ -175,8 +177,9 @@ pub unsafe extern "C" fn OMPRS_OnPlayerSelectObject(
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script.borrow_mut().on_player_select_object(
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_player_select_object(
Player::new(*(*(*args).list).player),
Object::new(*(*(*args).list).object),
*(*(*args).list).model,
Expand Down
7 changes: 5 additions & 2 deletions omp-gdk/src/scripting/pickups/events.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#![allow(clippy::all)]
use std::rc::Rc;

use crate::{events::EventArgs, players::Player};

use super::Pickup;
Expand All @@ -18,8 +20,9 @@ pub unsafe extern "C" fn OMPRS_OnPlayerPickUpPickup(
.unwrap()
.as_mut()
.unwrap();
for script in scripts.iter_mut() {
script.borrow_mut().on_player_pick_up_pickup(
for script in scripts.iter() {
let script = &mut *(*Rc::as_ptr(script)).as_ptr();
script.on_player_pick_up_pickup(
Player::new(*(*(*args).list).player),
Pickup::new(*(*(*args).list).pickup),
);
Expand Down
Loading
Loading