From d44ebefd49582df2296ec6790170c4219e9d69d0 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 23 Feb 2015 19:21:28 +0100 Subject: [PATCH] Move more logic to load_overlays --- input/input_overlay.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/input/input_overlay.c b/input/input_overlay.c index 4c4d7cdf2f..399d9f57fb 100644 --- a/input/input_overlay.c +++ b/input/input_overlay.c @@ -390,11 +390,6 @@ static bool input_overlay_load_overlay(input_overlay_t *ol, overlay->load_images[overlay->load_images_size++] = overlay->descs[i].image; } - /* Assume for now that scaling center is in the middle. - * TODO: Make this configurable. */ - overlay->block_scale = false; - overlay->center_x = overlay->x + 0.5f * overlay->w; - overlay->center_y = overlay->y + 0.5f * overlay->h; return true; @@ -662,6 +657,12 @@ bool input_overlay_load_overlays(input_overlay_t *ol) overlay->h = (float)strtod(list->elems[3].data, NULL); string_list_free(list); } + + /* Assume for now that scaling center is in the middle. + * TODO: Make this configurable. */ + overlay->block_scale = false; + overlay->center_x = overlay->x + 0.5f * overlay->w; + overlay->center_y = overlay->y + 0.5f * overlay->h; } ol->state = OVERLAY_STATUS_DEFERRED_LOADING;