Update

- Finish animation system
- Fix bug where leftward/upward movement was slightly faster than
downward/forward movement

1 files changed, 13 insertions, 7 deletions

diff --git a/Week1-Pacman/src/animation.c b/Week1-Pacman/src/animation.c
index 88fce7b..0747ba1 100644
--- a/Week1-Pacman/src/animation.c
+++ b/Week1-Pacman/src/animation.c
@@ -4,7 +4,7 @@
 #include "animation.h"
 #include <SDL2/SDL_image.h>
 
-SDL_Rect* current_frame(struct animation* animation) {
+const SDL_Rect* current_frame(const struct animation* animation) {
   return &animation->frames[animation->current_frame];
 }
 
@@ -22,6 +22,7 @@ void init_animation(struct animation* animation,
   if(animation->texture == NULL) {
     printf("Failed to load spritesheet %s, error: %s, exitting!\n",
            init->spritesheet, IMG_GetError());
+    exit(1);
   }
 
   animation->num_frames = initial_frame_count;
@@ -34,8 +35,9 @@ void init_animation(struct animation* animation,
   size = initial_frame_count * sizeof(SDL_Rect);
 
   animation->frames = malloc(size);
-  memcpy(animation->frames, init->initial_frame_times, size);
+  memcpy(animation->frames, init->initial_frames, size);
 
+  animation->angle = init->initial_angle;
 }
 
 void update_animation(struct animation* animation, float dt) {
@@ -52,9 +54,13 @@ void update_animation(struct animation* animation, float dt) {
 }
 
 void draw_animation(struct demo* demo,
-                    struct animation* animation,
-                    SDL_Rect* d_rect) {
-  SDL_Rect* s_rect = current_frame(animation);
-
-  demo_rendercopy(demo, animation->texture, s_rect, d_rect);
+                    const struct animation* animation,
+                    const SDL_Rect* d_rect) {
+  const SDL_Rect* s_rect = current_frame(animation);
+
+  demo_rendercopy_ex(demo, animation->texture,
+                     s_rect, d_rect,
+                     animation->angle,
+                     NULL,
+                     SDL_FLIP_NONE);
 }