From 68e891b8dc856d8d96386be8d6073db5b69eda91 Mon Sep 17 00:00:00 2001
From: Janos <janol55@zedat.fu-berlin.de>
Date: Wed, 20 Mar 2024 21:03:28 +0100
Subject: [PATCH] =?UTF-8?q?=C3=BCberfl=C3=BCssige=20imports=20herrausgenom?=
 =?UTF-8?q?men?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auto.h     |  9 +++------
 charac.h   | 21 ++++++++++++---------
 gameLoop.c |  2 +-
 gameLoop.h |  4 ++--
 header.h   |  3 +++
 main.h     |  2 +-
 map.h      |  4 ++--
 menu2.h    |  4 ++--
 output.h   |  6 +++---
 rows.h     |  7 ++-----
 10 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/auto.h b/auto.h
index c443be7..64ea4da 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 8e09cb6..258b539 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 8d11f28..81e278f 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 251c6ba..8ff7abd 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 92ece71..30907e8 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 a0d3564..da30ece 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 1a1aca8..223f0ec 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 5d76ee1..065fb32 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 0c33479..f921df6 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 6a3ecbe..ca87072 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
-- 
GitLab