Merge branch 'master' into memory

- Camera struct used to contain pointer to Sprite_font, but we changed
  to the value
- In camera.h we removed camera_font() and added effective_scale()

diff --cc src/game.c
Simple merge

diff --cc src/game/camera.c
index 0a9bfcd4ceffb0b322bc2aedd6b0822011ee148a,09b67c03d0c482a4b56ea0e70bfbdd92d42eb33c..be3d665190506fc00a7b42097f0fea50ee561ed6
--- 1/src/game/camera.c
--- 2/src/game/camera.c
+++ b/src/game/camera.c
@@@ -171,16 -167,18 +166,16 @@@ int camera_render_text(const Camera *ca
      SDL_Rect view_port;
      SDL_RenderGetViewport(camera->renderer, &view_port);
  
-     const Vec2f scale = effective_scale(&view_port);
+     const Vec2f scale = camera->effective_scale;
      const Vec2f screen_position = camera_point(camera, position);
  
 -    if (sprite_font_render_text(
 -            camera->font,
 -            camera->renderer,
 -            screen_position,
 -            vec(size.x * scale.x * camera->scale, size.y * scale.y * camera->scale),
 -            camera->blackwhite_mode ? color_desaturate(c) : c,
 -            text) < 0) {
 -        return -1;
 -    }
 +    sprite_font_render_text(
 +        &camera->font,
 +        camera->renderer,
 +        screen_position,
 +        vec(size.x * scale.x * camera->scale, size.y * scale.y * camera->scale),
 +        camera->blackwhite_mode ? color_desaturate(c) : c,
 +        text);
  
      return 0;
  }

diff --cc src/game/camera.h
index e07c518a94c7f6ffa46200b8af4480ecd8ad8571,70908b836bb08d01cc8e206074c6162944881ddd..e2cd6b4df630a7cd232af55989d5edae858d99f3
--- 1/src/game/camera.h
--- 2/src/game/camera.h
+++ b/src/game/camera.h
@@@ -15,7 -16,8 +16,8 @@@ typedef struct 
      Vec2f position;
      float scale;
      SDL_Renderer *renderer;
 -    Sprite_font *font;
 +    Sprite_font font;
+     Vec2f effective_scale;
  } Camera;
  
  Camera create_camera(SDL_Renderer *renderer,
@@@ -99,4 -101,8 +101,7 @@@ int camera_fill_rect_screen(const Camer
                              Rect rect,
                              Color color);
  
 -const Sprite_font *camera_font(const Camera *camera);
+ 
+ Vec2f effective_scale(const SDL_Rect *view_port);
+ 
  #endif  // CAMERA_H_

diff --cc src/ui/console.c
Simple merge