cnml/breakout
cnml/breakout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

merge got fucked up :/

Browse Source
This commit is contained in:
Michael Chen 2018-01-25 08:00:41 +01:00
parent df535bb7d0
commit 8a449ac7cd
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
settings.c
View File

@ -22,17 +22,6 @@ Slider BT;
bool Settings_IsInit = false; 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) { void Settings_Initialize(SDL_Renderer * renderer) {
Initialize_Slider(400, 300, Scalar_width, Bar_width, Slider_height, 1, 2, &BV); 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, 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_Texture = IMG_LoadTexture(renderer, "assets/images/ball.png");
Settings_Ball_rect = (SDL_Rect) {.x = 1200, .y = 300, .w = 100, .h = 100 }; Settings_Ball_rect = (SDL_Rect) {.x = 1200, .y = 300, .w = 100, .h = 100 };
Settings_IsInit = true; Settings_IsInit = true;
>>>>>>> 1c227c0dce1e898cbd1bdf27149fdf2dcda801f3
} }
void Settings_Draw(SDL_Renderer * renderer, Scenery * scenery) { void Settings_Draw(SDL_Renderer * renderer, Scenery * scenery) {