Skip to content

Commit 5504187

Browse files
committed
Clean up merge conflicts with the unused param warning cleanup
1 parent 23f71b3 commit 5504187

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

Lesson0/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Lesson 0: Test to make sure SDL is setup properly
66
*/
77
int main(int, char**){
8-
if (SDL_Init(SDL_INIT_EVERYTHING) != 0){
8+
if (SDL_Init(SDL_INIT_VIDEO) != 0){
99
std::cout << "SDL_Init Error: " << SDL_GetError() << std::endl;
1010
return 1;
1111
}

Lesson1/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*/
88
int main(int, char**){
99
//First we need to start up SDL, and make sure it went ok
10-
if (SDL_Init(SDL_INIT_EVERYTHING) != 0){
10+
if (SDL_Init(SDL_INIT_VIDEO) != 0){
1111
std::cout << "SDL_Init Error: " << SDL_GetError() << std::endl;
1212
return 1;
1313
}

Lesson2/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ void renderTexture(SDL_Texture *tex, SDL_Renderer *ren, int x, int y){
6363

6464
int main(int, char**){
6565
//Start up SDL and make sure it went ok
66-
if (SDL_Init(SDL_INIT_EVERYTHING) != 0){
66+
if (SDL_Init(SDL_INIT_VIDEO) != 0){
6767
logSDLError(std::cout, "SDL_Init");
6868
return 1;
6969
}

Lesson3/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ void renderTexture(SDL_Texture *tex, SDL_Renderer *ren, int x, int y){
7070

7171
int main(int, char**){
7272
//Start up SDL and make sure it went ok
73-
if (SDL_Init(SDL_INIT_EVERYTHING) != 0){
73+
if (SDL_Init(SDL_INIT_VIDEO) != 0){
7474
logSDLError(std::cout, "SDL_Init");
7575
return 1;
7676
}

Lesson4/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void renderTexture(SDL_Texture *tex, SDL_Renderer *ren, int x, int y){
6868

6969
int main(int, char**){
7070
//Start up SDL and make sure it went ok
71-
if (SDL_Init(SDL_INIT_EVERYTHING) != 0){
71+
if (SDL_Init(SDL_INIT_VIDEO) != 0){
7272
logSDLError(std::cout, "SDL_Init");
7373
return 1;
7474
}

Lesson5/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void renderTexture(SDL_Texture *tex, SDL_Renderer *ren, int x, int y, SDL_Rect *
7272

7373
int main(int, char**){
7474
//Start up SDL and make sure it went ok
75-
if (SDL_Init(SDL_INIT_EVERYTHING) != 0){
75+
if (SDL_Init(SDL_INIT_VIDEO) != 0){
7676
logSDLError(std::cout, "SDL_Init");
7777
return 1;
7878
}

Lesson6/src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ SDL_Texture* renderText(const std::string &message, const std::string &fontFile,
9494

9595
int main(int, char**){
9696
//Start up SDL and make sure it went ok
97-
if (SDL_Init(SDL_INIT_EVERYTHING) != 0){
97+
if (SDL_Init(SDL_INIT_VIDEO) != 0){
9898
logSDLError(std::cout, "SDL_Init");
9999
return 1;
100100
}

0 commit comments

Comments
 (0)