fix crash due to resources

Author: DarthB

src/gamestate/gameover.rs

@@ -22,6 +22,6 @@ pub fn process(gs: &mut GameState) {
         DARKGRAY,
     );
     if is_key_pressed(KeyCode::Enter) {
-        *gs = GameState::new();
+        *gs = GameState::new(gs.assets.clone());
     }
 }

src/gamestate/mod.rs

@@ -13,7 +13,7 @@ use crate::entity::{EntityId, EntityStats, SpawnCommand};
 use crate::player::Player;
 use crate::projectile::{Projectile, ProjectileStats, ProjectileType};
 use crate::roto_script::{GameConstants, RotoScriptManager};
-use crate::visual_config::GameVisualConfig;
+use crate::visual_config::{Assets, GameVisualConfig};
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum GameStateEnum {
@@ -46,10 +46,11 @@ pub struct GameState {
     pub enemies_to_despawn: HashSet<EntityId>,
     pub projectiles_to_despawn: HashSet<EntityId>,
     pub message_from_elf: Option<String>,
+    pub assets: Assets,
 }
 
 impl GameState {
-    pub fn new() -> Self {
+    pub fn new(assets: Assets) -> Self {
         let mut roto_manager = RotoScriptManager::new();
 
         // Try to fetch player stats from Roto, fallback to defaults if it fails
@@ -123,6 +124,7 @@ I will summon magic to to beat the evil!.
             enemies_to_despawn: HashSet::new(),
             projectiles_to_despawn: HashSet::new(),
             message_from_elf: Some(tmp.to_owned()),
+            assets,
         }
     }
 
@@ -589,7 +591,7 @@ Just save the file and Press Return here!
 
 pub fn draw_elf_message(gs: &GameState) -> bool {
     if let Some(msg) = &gs.message_from_elf {
-        let texture = &gs.visual_config.char_tex.as_ref().unwrap();
+        let texture = &gs.assets.char_tex.as_ref().unwrap();
 
         let mut params = DrawTextureParams::default();
         let (w, h, s) = (texture.width(), texture.height(), 0.33);

src/gamestate/script_error.rs

@@ -38,6 +38,6 @@ pub fn process(gs: &mut GameState) {
         DARKGRAY,
     );
     if is_key_pressed(KeyCode::Enter) {
-        *gs = GameState::new();
+        *gs = GameState::new(gs.assets.clone());
     }
 }

src/gamestate/won.rs

@@ -80,6 +80,7 @@ pub fn process(gs: &mut GameState) {
 
     // Handle restart
     if is_key_pressed(KeyCode::Enter) {
-        *gs = GameState::new();
+        let assets = gs.assets.clone();
+        *gs = GameState::new(assets);
     }
 }

src/main.rs

@@ -14,6 +14,8 @@ mod weapon;
 
 use gamestate::{GameState, GameStateEnum};
 
+use crate::visual_config::Assets;
+
 pub const DT: f64 = 1.0 / 30.0;
 
 fn window_conf() -> Conf {
@@ -40,9 +42,9 @@ async fn main() {
         }
     }
 
-    let mut gs = GameState::new();
-
-    gs.visual_config.char_tex = Some(Rc::new(load_texture("assets/elf_char.png").await.unwrap()));
+    let mut gs = GameState::new(Assets {
+        char_tex: Some(load_texture("assets/elf_char.png").await.unwrap()),
+    });
 
     loop {
         match gs.state {

src/roto_script.rs

@@ -111,7 +111,6 @@ impl RotoScriptManager {
                         pulse: pulse.0,
                         homing_missile: homing_missile.0,
                         pulse_blend: pulse_blend.0,
-                        char_tex: None,
                     })
                 }
             }

src/visual_config.rs

@@ -1,5 +1,3 @@
-use std::rc::Rc;
-
 use macroquad::prelude::*;
 
 use crate::projectile::ProjectileType;
@@ -165,7 +163,7 @@ impl BlendConfig {
 }
 
 /// Complete visual configuration for the game
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Copy)]
 pub struct GameVisualConfig {
     pub player: PlayerVisualConfig,
     pub basic_enemy: EnemyVisualConfig,
@@ -174,7 +172,11 @@ pub struct GameVisualConfig {
     pub pulse: ProjectileVisualConfig,
     pub homing_missile: ProjectileVisualConfig,
     pub pulse_blend: BlendConfig,
-    pub char_tex: Option<Rc<Texture2D>>,
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct Assets {
+    pub char_tex: Option<Texture2D>,
 }
 
 impl GameVisualConfig {
@@ -187,7 +189,6 @@ impl GameVisualConfig {
             pulse: ProjectileVisualConfig::from(ProjectileType::Pulse),
             homing_missile: ProjectileVisualConfig::from(ProjectileType::HomingMissile),
             pulse_blend: BlendConfig::pulse_default(),
-            char_tex: None,
         }
     }
 }