From 34fb88a86a25016cad406be5f995dacee258f43a Mon Sep 17 00:00:00 2001 From: Stefan Neumann Date: Thu, 25 Jan 2018 10:06:49 +0100 Subject: [PATCH 1/2] h --- settings.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/settings.c b/settings.c index 9459489..6e4d55b 100644 --- a/settings.c +++ b/settings.c @@ -22,7 +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); @@ -32,17 +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; -======= -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, 8, &BT); - Settings_Texture = IMG_LoadTexture(renderer, "assets/images/settings_title.png"); - Settings_rect = (SDL_Rect) {.x = 800, .y = 180, .w = 313, .h = 100 }; - 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) { From b33a6478e60bd5f0ac59d8acd522adc8620c9982 Mon Sep 17 00:00:00 2001 From: Michael Chen Date: Thu, 25 Jan 2018 10:11:07 +0000 Subject: [PATCH 2/2] Revert "Merge branch 'dev' of collaborating.tuhh.de:czg6669/breakout into dev" This reverts commit 681b6dcd2b17abf579f437ec3ca6cf424c88c09c --- settings.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/settings.c b/settings.c index 4236f4a..6e4d55b 100644 --- a/settings.c +++ b/settings.c @@ -22,7 +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); @@ -32,17 +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; -======= -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, 8, &BT); - Settings_Texture = IMG_LoadTexture(renderer, "assets/images/settings_title.png"); - Settings_rect = (SDL_Rect) {.x = 800, .y = 180, .w = 313, .h = 100 }; - 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; ->>>>>>> 8a449ac7cd9e04dc1d5c0dbd03991ed27286f197 } void Settings_Draw(SDL_Renderer * renderer, Scenery * scenery) {