summaryrefslogtreecommitdiff
path: root/src/player.rs
diff options
context:
space:
mode:
authortom barrett <spalf0@gmail.com>2019-07-04 03:51:15 -0500
committertom barrett <spalf0@gmail.com>2019-07-04 03:51:15 -0500
commitc9ce92e1830505269b631ba1fdd864a173bacf48 (patch)
tree0223704e95a04fd1d430876ac4a4d9a57e84a1ab /src/player.rs
parentc04c59c7dd5ee6e3982a8ba45e42072b34f2be8a (diff)
better naming
Diffstat (limited to 'src/player.rs')
-rw-r--r--src/player.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/player.rs b/src/player.rs
index ae43d80..2941934 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -2,21 +2,21 @@ use ggez::event::KeyCode;
use ggez::graphics::{spritebatch::SpriteBatch, DrawParam};
use ggez::nalgebra::{Point2, Vector2};
-use crate::animation::Animation;
+use crate::animation::Animations;
use crate::constants;
use crate::entity::{Action, Entity, Operable};
use crate::tileset::Tileset;
pub struct Player {
entity: Entity,
- animation: Animation,
+ animations: Animations,
}
impl Operable for Player {
fn draw(&self, spritebatch: &mut SpriteBatch) {
spritebatch.add(
DrawParam::default()
- .src(self.animation.source)
+ .src(self.animations.current.current.source)
.dest(self.entity.position)
.scale(Vector2::new(constants::TILE_SCALE, constants::TILE_SCALE)),
);
@@ -24,7 +24,7 @@ impl Operable for Player {
fn update(&mut self) {
self.move_position();
- self.animation.update(&self.entity.action);
+ self.animations.update(&self.entity.action);
}
}
@@ -32,7 +32,7 @@ impl Player {
pub fn new(tileset: &Tileset, dimensions: (f32, f32)) -> Player {
Player {
entity: Entity::new(Point2::new(0.0, 0.0), dimensions),
- animation: Animation::new(tileset),
+ animations: Animations::new(tileset),
}
}