Merge pull request #3 from Sreyas-Sreelal/capi

New SDK using open.mp Capi

Author: Sreyas-Sreelal

.github/workflows/build.yml

@@ -40,7 +40,7 @@ jobs:
           sudo apt update
           sudo apt install gcc-multilib libssl-dev:i386 zlib1g:i386 -y
         if: matrix.os == 'ubuntu-latest'
-      - run: rustup update ${{ matrix.toolchain }}  --no-self-update && rustup default ${{ matrix.toolchain }}
+      - run: rustup update ${{ matrix.toolchain }}  --no-self-update --force-non-host && rustup default ${{ matrix.toolchain }} --force-non-host
       - run: cargo build --verbose
 
   rustfmt:

Cargo.lock

@@ -9,10 +9,10 @@ use std::{
 };
 
 use omp::{
-    classes::CreateClass,
+    classes,
     core::{
-        DisableInteriorEnterExits, EnableStuntBonusForAll, SetGameModeText, SetNameTagDrawDistance,
-        SetWeather, SetWorldTime, ShowNameTags, ShowPlayerMarkers,
+        DisableInteriorEnterExits, EnableStuntBonusForAll, SetGameModeText,
+        SetNameTagsDrawDistance, SetWeather, SetWorldTime, ShowNameTags, ShowPlayerMarkers,
     },
     events::Events,
     main,
@@ -43,7 +43,7 @@ struct PlayerData {
 
 struct GrandLarc {
     colour_white: Colour,
-    players_data: HashMap<usize, PlayerData>,
+    players_data: HashMap<i32, PlayerData>,
     class_selection_helper_td: TextDraw,
     los_santos_td: TextDraw,
     san_fierro_td: TextDraw,
@@ -239,7 +239,7 @@ impl GrandLarc {
 
 impl Events for GrandLarc {
     fn on_player_connect(&mut self, player: Player) {
-        player.game_text("~w~Grand Larceny", 3000, 4);
+        player.show_game_text("~w~Grand Larceny", 3000, 4);
         player.send_client_message(
             self.colour_white,
             "Welcome to {88AA88}G{FFFFFF}rand {88AA88}L{FFFFFF}arceny",
@@ -287,23 +287,23 @@ impl Events for GrandLarc {
         player.toggle_clock(false);
     }
 
-    fn on_player_death(&mut self, player: Player, killer: Option<Player>, _reason: isize) {
+    fn on_player_death(&mut self, player: Player, killer: Option<Player>, _reason: i32) {
         self.players_data
             .get_mut(&player.get_id())
             .unwrap()
             .has_city_selected = false;
-        if killer.is_none() {
-            player.reset_money();
-        } else {
+        if let Some(killer) = killer {
             let playercash = player.get_money();
             if playercash > 0 {
-                killer.unwrap().give_money(playercash);
+                killer.give_money(playercash);
                 player.reset_money();
             }
+        } else {
+            player.reset_money();
         }
     }
 
-    fn on_player_request_class(&mut self, player: Player, _class_id: usize) -> bool {
+    fn on_player_request_class(&mut self, player: Player, _class_id: i32) -> bool {
         if player.is_npc() {
             return true;
         }
@@ -321,7 +321,7 @@ impl Events for GrandLarc {
         false
     }
 
-    fn on_player_update(&mut self, player: Player, _now: isize) -> bool {
+    fn on_player_update(&mut self, player: Player) -> bool {
         if player.is_npc() {
             return true;
         }
@@ -349,7 +349,7 @@ fn create_all_class() {
         82, 83, 84, 85, 87, 88, 89, 91, 92, 93, 95, 96, 97, 98, 99,
     ];
     for x in skins {
-        CreateClass(
+        classes::Class::add(
             255,
             x,
             Vector3::new(1759.0189, -1_898.126, 13.5622),
@@ -365,13 +365,13 @@ fn load_static_vehicles_from_file(path: &str) -> Result<isize, Box<dyn std::erro
     let mut count = 0;
     for line in lines.map_while(Result::ok) {
         let mut seperator = line.split(',');
-        let modelid: isize = seperator.next().unwrap().parse()?;
+        let modelid: i32 = seperator.next().unwrap().parse()?;
         let x: f32 = seperator.next().unwrap().parse()?;
         let y: f32 = seperator.next().unwrap().parse()?;
         let z: f32 = seperator.next().unwrap().parse()?;
         let rotation: f32 = seperator.next().unwrap().parse()?;
-        let colour1: isize = seperator.next().unwrap().parse()?;
-        let colour2: isize = seperator
+        let colour1: i32 = seperator.next().unwrap().parse()?;
+        let colour2: i32 = seperator
             .next()
             .unwrap()
             .split(' ')
@@ -425,7 +425,7 @@ pub fn game_entry() -> Result<(), Box<dyn std::error::Error>> {
     SetGameModeText("Grand Larceny");
     ShowPlayerMarkers(1);
     ShowNameTags(true);
-    SetNameTagDrawDistance(40.0);
+    SetNameTagsDrawDistance(40.0);
     EnableStuntBonusForAll(false);
     DisableInteriorEnterExits();
     SetWeather(2);
@@ -467,10 +467,11 @@ pub fn game_entry() -> Result<(), Box<dyn std::error::Error>> {
 
     let mut total_vehicles = 0;
     for file in vehicle_file_list {
-        total_vehicles += load_static_vehicles_from_file(&format!("vehicles/{file}.txt"))?;
+        total_vehicles +=
+            load_static_vehicles_from_file(&format!("scriptfiles/vehicles/{file}.txt"))?;
     }
 
-    omp::core::Print(&format!("Total vehicles from files: {total_vehicles}"));
+    omp::core::Log(&format!("Total vehicles from files: {total_vehicles}"));
 
     Ok(())
 }

examples/grandlarc/src/lib.rs

@@ -0,0 +1,19 @@
+use omp::{
+    events::Events,
+    players::{Player, PlayerBulletData, PlayerWeapon},
+    terminate_event,
+};
+
+pub struct MiniGunDetector {
+    pub on_player_shot_minigun: fn(player: Player),
+}
+
+impl Events for MiniGunDetector {
+    fn on_player_shot_missed(&mut self, player: Player, bullet_data: PlayerBulletData) -> bool {
+        if bullet_data.weapon == PlayerWeapon::Minigun {
+            (self.on_player_shot_minigun)(player);
+            terminate_event!(true);
+        }
+        true
+    }
+}