fixed start_battle to accept gstring

Lamby777 · Aug 18, 2024 · 3a7a0d6 · 3a7a0d6
1 parent ac85c13
commit 3a7a0d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pets-lib/src/world/enemy_node.rs b/pets-lib/src/world/enemy_node.rs
@@ -115,7 +115,7 @@ impl WalkingEnemy {
         self.touched_player = true;
 
         godot_print!("Player touched enemy: {}", self.enemy_id);
-        World::start_battle(&self.enemy_id);
+        World::start_battle(self.enemy_id.to_godot());
     }
 }
 

diff --git a/pets-lib/src/world/mod.rs b/pets-lib/src/world/mod.rs
@@ -126,8 +126,10 @@ impl World {
         srv.set_bus_mute(unmuted, false);
     }
 
-    pub fn start_battle(eid: &EnemyID) {
-        let enemy_data = EnemyData::from_id(*eid);
+    #[func]
+    pub fn start_battle(eid: GString) {
+        let eid = EnemyID::from_godot(eid);
+        let enemy_data = EnemyData::from_id(eid);
         pcb()
             .bind_mut()
             .battling