diff --git a/Makefile b/Makefile index 87fb62f..0d4e600 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,8 @@ OBJS = src/Main.c src/Controls.c src/Debug.c src/Copying.c #compiler to use -CC = cc +CC = gcc -#gimmie dem warnings yo - -COMPILER_FLAGS = -Wall #libs we linkin bro diff --git a/README.md b/README.md index 2beeef8..d6f2c30 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,19 @@ # Tux Vs X ENGINE -A remake of the first game I made. -

This time made with C and raylib.

- -

Sprites made by Jelly_poi.

-

Programming and design by M-C-O-B.

- -Make sure to read the LICENSE file - - -# TO-DO - -* More clean code -* Build Guide -* Hitboxes working in .h files -* Screen Boundaries -* Projectiles -* Portable Binaries of the game - -# BRANCHES - -

To see new code use

- -git checkout unstable +A remake of the first game I made. +

This time made with C and raylib.

+ +

Sprites made by Jelly_poi.

+

Programming and design by M-C-O-B.

+ +Make sure to read the LICENSE file + + +# TO-DO + +* More clean code +* Build Guide +* Hitboxes working in .h files +* Screen Boundaries +* Projectiles +* Portable Binaries of the game diff --git a/src/Controls.c b/src/Controls.c index 32a0196..d236194 100644 --- a/src/Controls.c +++ b/src/Controls.c @@ -6,8 +6,8 @@ // Controls void Func_Controls() { - if (IsKeyDown(KEY_LEFT)) TuxPos_x -= GetFrameTime() * 800.0f; - if (IsKeyDown(KEY_RIGHT)) TuxPos_x += GetFrameTime() * 800.0f; - if (IsKeyDown(KEY_UP)) TuxPos_y -= GetFrameTime() * 800.0f; - if (IsKeyDown(KEY_DOWN)) TuxPos_y += GetFrameTime() * 800.0f; + if (IsKeyDown(KEY_LEFT)) {TuxPos_x -= GetFrameTime() * 800.0f;} + if (IsKeyDown(KEY_RIGHT)) {TuxPos_x += GetFrameTime() * 800.0f;} + if (IsKeyDown(KEY_UP)) {TuxPos_y -= GetFrameTime() * 800.0f;} + if (IsKeyDown(KEY_DOWN)) {TuxPos_y += GetFrameTime() * 800.0f;} } diff --git a/src/Copying.c b/src/Copying.c index cd618b6..fdb54b6 100644 --- a/src/Copying.c +++ b/src/Copying.c @@ -10,6 +10,5 @@ void Func_License() "This program comes with ABSOLUTELY NO WARRANTY; \n" "This is free software, and you are welcome to redistribute it\n" "under certain conditions; for details read the LICENSE.\n" - "For the source code go to https://gitdab.com/Canneddonuts/Tux_Vs_X_ENGINE.git\n" ); } diff --git a/src/Main.c b/src/Main.c index 8c9ff1d..6ad4e7a 100644 --- a/src/Main.c +++ b/src/Main.c @@ -4,9 +4,6 @@ #include "Debug.h" #include "Copying.h" -// Functions -void Func_CheckHitboxToggle(); - // Globles // Position Varaibles @@ -15,7 +12,6 @@ float TuxPos_x = 32.0f, TuxPos_y = 62.0f; // Toggle bools bool ShowHitbox = false; -bool ShowPos = false; // Setup Code void Func_Setup() @@ -44,13 +40,10 @@ void Func_MainGameLoop() Rectangle boxCollision = { 0 }; bool collision = false; - // GameLoop + // GameLoop while (!WindowShouldClose()) { - // Checks and calls the Pos show function - if (IsKeyPressed(KEY_P)) ShowPos = !ShowPos; - if (ShowPos==true) Func_ShowPos(); - + Func_ShowPos(); Func_Controls(); TuxHitbox.x = TuxPos_x+50; @@ -77,13 +70,12 @@ void Func_MainGameLoop() } if (collision) { - DrawText("FINALY BASIC AWFUL COLLISION", 50, 18, 20, MAROON); + DrawText("FINALY BASIC AWFUL COLLISION", 50, 18, 20, BLACK); } else { DrawText("Tux Vs X ENGINE PROTOTYPE please read the LINCENSE", 50, 18, 20, BLACK); } - DrawText("Press 'H' to toggle hitboxes", 50, 72, 20, DARKGREEN); - DrawText("Press 'P' to toggle printing of the positions", 50, 95, 20, DARKGREEN); + DrawText("Press 'H' to toggle hitboxes", 50, 72, 20, BLACK); EndDrawing(); }