From 8a449ac7cd9e04dc1d5c0dbd03991ed27286f197 Mon Sep 17 00:00:00 2001 From: Michael Chen Date: Thu, 25 Jan 2018 08:00:41 +0100 Subject: [PATCH] merge got fucked up :/ --- settings.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/settings.c b/settings.c index 9459489..195cd7e 100644 --- a/settings.c +++ b/settings.c @@ -22,17 +22,6 @@ Slider BT; bool Settings_IsInit = false; -<<<<<<< HEAD -void Settings_Initialize (SDL_Renderer* renderer) { - Initialize_Slider(400,300,Scalar_width,Bar_width,Slider_height,1,2,&BV); - Initialize_Slider(400,500,Scalar_width,Bar_width,Slider_height,10.0f,20.0f,&BS); - Initialize_Slider(400,700,Scalar_width,Bar_width,Slider_height,0,1,&BT); - Settings_Texture = IMG_LoadTexture(renderer, "assets/images/settings_title.png"); - Settings_rect = (SDL_Rect){.x = 800, .y = 130, .w=470, .h=150}; - Settings_Ball_Texture = IMG_LoadTexture(renderer, "assets/images/ball.png"); - Settings_Ball_rect = (SDL_Rect){.x = 1200, .y = 300, .w=100, .h=100}; - Settings_IsInit = true; -======= void Settings_Initialize(SDL_Renderer * renderer) { Initialize_Slider(400, 300, Scalar_width, Bar_width, Slider_height, 1, 2, &BV); Initialize_Slider(400, 500, Scalar_width, Bar_width, Slider_height, 10.0f, 20.0f, &BS); @@ -42,7 +31,6 @@ void Settings_Initialize(SDL_Renderer * renderer) { Settings_Ball_Texture = IMG_LoadTexture(renderer, "assets/images/ball.png"); Settings_Ball_rect = (SDL_Rect) {.x = 1200, .y = 300, .w = 100, .h = 100 }; Settings_IsInit = true; ->>>>>>> 1c227c0dce1e898cbd1bdf27149fdf2dcda801f3 } void Settings_Draw(SDL_Renderer * renderer, Scenery * scenery) {