X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fsprites.rs;h=70de0c0a83ff06928d8c3b579eaf93c3d86ae92f;hb=b0137bb6d47c158bff30f2d4fd1faab9d4945d54;hp=0de34689f90aec34d1a9e127d3e074627802353e;hpb=55eb2b7d14ed296940a375f1561209ec78ac5b46;p=kaka%2Frust-sdl-test.git diff --git a/src/sprites.rs b/src/sprites.rs index 0de3468..70de0c0 100644 --- a/src/sprites.rs +++ b/src/sprites.rs @@ -7,7 +7,7 @@ use sdl2::video::WindowContext; pub struct SpriteManager { texture_creator: TextureCreator, // can't make the lifetimes work when this is owned instead of borrowed - textures: HashMap<&'static str, Texture>, + textures: HashMap, } impl SpriteManager { @@ -18,11 +18,16 @@ impl SpriteManager { } } - pub fn load(&mut self, name: &'static str, file: &str) { - self.textures.insert(name, self.texture_creator.load_texture(file).unwrap()); + pub fn load(&mut self, name: &str, file: &str) { + self.textures.insert( + name.to_string(), + self.texture_creator.load_texture(file).unwrap(), + ); } pub fn get(&self, name: &str) -> &Texture { - self.textures.get(name).unwrap_or_else(|| panic!("The sprite '{}' was not found", name)) + self.textures + .get(name) + .unwrap_or_else(|| panic!("The sprite '{}' was not found", name)) } }