diff --git a/auto.h b/auto.h index c443be750936ff2c379c9f6f643f7f9d152bb58c..64ea4da8f24aac5372afb2e1de26b7b83b02050b 100644 --- a/auto.h +++ b/auto.h @@ -6,14 +6,11 @@ #include <stdlib.h> #include <stdbool.h> #include "output.h" -#include "map.h" -#include "rows.h" -#include "gameLoop.h" +//#include "map.h" +//#include "rows.h" +//#include "gameLoop.h" #include "header.h" - - - //Declarations of functions struct LinkedList_car* init_car_list( int, int,int,int,enum vehicle); struct Car* init_car(int,int,int,int,int,enum vehicle); diff --git a/charac.h b/charac.h index 8e09cb6c400b3ba3f0221bed9699829a9b1c4e49..258b5395c9f2224d6db42666eb03e0454ce30a19 100644 --- a/charac.h +++ b/charac.h @@ -2,19 +2,22 @@ #define CHARAC_H #include <SDL.h> -#include <SDL_error.h> +//#include <SDL_error.h> #include <SDL_render.h> -#include <SDL_video.h> -#include <stdbool.h> -#include <stdio.h> -#include <SDL_ttf.h> -#include "output.h" -#include "main.h" -#include "gameLoop.h" +//#include <SDL_video.h> +//#include <stdbool.h> +//#include <stdio.h> +//#include <SDL_ttf.h> +//#include "output.h" +//#include "main.h" +//#include "gameLoop.h" #include "init.h" -#include "header.h" +//#include "header.h" +extern SDL_Rect *player; +extern int playerhighscore; +extern int playerscore; //Declaration of functions diff --git a/gameLoop.c b/gameLoop.c index 8d11f28e2a50dd0cab4283b172a4e4dc0498ad7b..81e278f8b1e02ef02a2b594088f35b9216d034d3 100644 --- a/gameLoop.c +++ b/gameLoop.c @@ -52,7 +52,7 @@ void gameLoop(enum vehicle theme,SDL_Renderer* renderer) { // die Kammera schneller bewegen // Solange der Spieler sich noch nicht bewegt hat, bewegt sich die Karte nicht if (start_game){ - if (player->y < SCREEN_WIDTH - 6*ROW_SIZE){ + if (player->y < SCREEN_WIDTH - 5*ROW_SIZE){ speed = 7; }else{ speed = 1; diff --git a/gameLoop.h b/gameLoop.h index 251c6baf239a5e0afdeb4e5efbbf0bddbe12db6f..8ff7abd40a0a0031a319edc1979524b44ed3022b 100644 --- a/gameLoop.h +++ b/gameLoop.h @@ -6,9 +6,9 @@ #include <stdbool.h> #include <SDL_rect.h> #include <SDL_render.h> -#include "auto.h" +//#include "auto.h" #include "map.h" -#include "main.h" +//#include "main.h" #include "file_own.h" #include "header.h" #include "charac.h" diff --git a/header.h b/header.h index 92ece71546002314dff57ea0b4e63e310db405ac..30907e8f1ac58cf2dffc1647b56f54d27127d11c 100644 --- a/header.h +++ b/header.h @@ -5,6 +5,9 @@ #define SCREEN_HEIGHT 1000 #define ROW_SIZE 100 +extern SDL_Rect *player; +extern int playerscore; +extern int playerhighscore; enum row{ grassBright, diff --git a/main.h b/main.h index a0d35645c410e1346c0dea2504f4c0a8dbd32612..da30ecedf99c02657c2c0ad2ec2c0d81c5da20fc 100644 --- a/main.h +++ b/main.h @@ -7,7 +7,7 @@ #include <time.h> #include <stdlib.h> #include <SDL_ttf.h> -#include "auto.h" +//#include "auto.h" #include "menu2.h" #include "gameLoop.h" #include "init.h" diff --git a/map.h b/map.h index 1a1aca80c2a968d187083680b96c4a89736e5792..223f0ec5a3698e6bc9348f5877489fd4d2a28bed 100644 --- a/map.h +++ b/map.h @@ -5,13 +5,13 @@ #include <stdlib.h> #include <SDL.h> #include <SDL_render.h> - #include "auto.h" #include "rows.h" -#include "gameLoop.h" +//#include "gameLoop.h" #include "output.h" #include "header.h" + //Declaration of functions struct LinkedList* init_map(enum vehicle); diff --git a/menu2.h b/menu2.h index 5d76ee1d2bbc2b52bdabf4115944bb346278e43b..065fb32907cdf39011a9526fafa0df799e87d372 100644 --- a/menu2.h +++ b/menu2.h @@ -8,8 +8,8 @@ #include <string.h> #include <stdio.h> #include "main.h" -#include "rows.h" -#include "auto.h" +//#include "rows.h" +//#include "auto.h" #include "header.h" #include <stdbool.h> diff --git a/output.h b/output.h index 0c33479a8c564a996f08fdd75673f0ffc14d897e..f921df680005a1a84eef8a54d2b8b2b7e13f9212 100644 --- a/output.h +++ b/output.h @@ -7,10 +7,10 @@ #include <SDL_image.h> #include <SDL_render.h> #include <SDL_rect.h> -#include "rows.h" -#include "auto.h" +//#include "rows.h" +//#include "auto.h" #include "init.h" -#include "gameLoop.h" +//#include "gameLoop.h" #include "header.h" diff --git a/rows.h b/rows.h index 6a3ecbee6526006016ae7f0d49045fba9ef84a89..ca87072fd87fdf8c2cae946fe5a182108313bd7a 100644 --- a/rows.h +++ b/rows.h @@ -5,13 +5,10 @@ #include <stdbool.h> #include <SDL_rect.h> #include <SDL_render.h> -#include "gameLoop.h" +//#include "gameLoop.h" #include "auto.h" -#include "main.h" +//#include "main.h" -#define SCREEN_WIDTH 900 -#define SCREEN_HEIGHT 1000 -#define ROW_SIZE 100 #include "header.h" //Declaration of functions