From 119f9a106d75e9a009b546cdeb0b97415c177ee8 Mon Sep 17 00:00:00 2001
From: jonny_l480 <jonny@wwad.de>
Date: Fri, 22 Dec 2023 11:40:40 +0100
Subject: [PATCH] Fix compiler errors and warnings, Cleanup main.cpp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Remove old comments and unused code from main.cpp
- Fix the following compiler errors and warnings (compiles now):

WARNING: main.cpp:64:23: warning: comparison between ‘gameState_t’ {aka ‘enum gameState_t’} and ‘enum menus_t’ if(game.gameState == PAUSE)

WARNING: menu.c:111:9: warning: implicit declaration of function ‘renderSettings’

ERROR: multiple definitions / redefinition of 'int recordsInFile'
---
 include/files.h |  2 +-
 src/main.cpp    | 55 +++++++------------------------------------------
 src/menu.c      |  2 +-
 3 files changed, 9 insertions(+), 50 deletions(-)

diff --git a/include/files.h b/include/files.h
index 6e78608..987a834 100644
--- a/include/files.h
+++ b/include/files.h
@@ -3,7 +3,7 @@
 
 #define MAX_PRINTED_SCORES  10
 
-int recordsInFile;
+extern int recordsInFile;
 
 // struct that store player score at the end of the game
 typedef struct playerScore_t
diff --git a/src/main.cpp b/src/main.cpp
index d94499c..17b83eb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -10,28 +10,15 @@ extern "C"
 #include "menu.h"
 }
 
-//initialize SDL window
-//ruft showStartScreen
-//initialize game
-//main loop: processInputEvents, runGameCycle
-//uninitialize SDL
-
-
-
-//==========================
-//====== enabled test ======
-//==========================
-//uncomment one test at a time to run the corresponding code in main()
-//#define TEST__FOOD_PLACEMENT
-//#define TEST__SDL_INPUT
-#define TEST__GAME_WITH_CONSOLE_OUTPUT
-
-
-
+//1. initialize SDL window
+//2. call showStartScreen
+//3. initialize game
+//4. main loop: processInputEvents, runGameCycle
+//5. uninitialize SDL
 
 int main(int argc, char *argv[])
 { 
-  // gameInit();     is removed in menu.c
+  // gameInit();     moved to menu.c
 
   // Initialisiere SDL
   if (SDL_Init(SDL_INIT_VIDEO) < 0) {
@@ -45,12 +32,9 @@ int main(int argc, char *argv[])
     return 1;
   }
 
-
   CreateSDLWindow();
 
 
-
-
   time_t now;
   now = GET_TIME_MS(); // Timer startet
   game.timestampLastCycle = now;
@@ -61,7 +45,7 @@ int main(int argc, char *argv[])
     {   
         manageMenu();
     } 
-    if(game.gameState == PAUSE)
+    if(game.gameState == PAUSED)
     {
       LOGI("Spielmodus: Pause\n");
     }
@@ -78,31 +62,6 @@ int main(int argc, char *argv[])
     processInputEvent();
   }
 
-/*  time_t t;
-
-  long long ms = time(NULL) *1000;
-  game.timestampLastCycle = ms;
-
-  printf("timestamp: %lld",game.timestampLastCycle);
-  printf("ms: %lld",ms);
-
-  while(game.gameState != EXIT) {
-    if (game.gameState == RUNNING) {
-        ms = time(NULL) *1000; // Timer startet
-      
-        printf("ms2: %lld", ms);
-
-        if (ms - game.timestampLastCycle > config.cycleDurationMs){
-
-          game.timestampLastCycle = ms;
-          runGameCycle();
-        }
-    }
-    DELAY(5);     //verhindert maximale Durchlaufgeschwindigkeit der Schleife
-    processInputEvent();
-  }*/
-
-
 
 
   DestroySDLWindow();
diff --git a/src/menu.c b/src/menu.c
index c161bf5..70287eb 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -4,7 +4,7 @@
 #include "common.h"
 #include <stdio.h>
 #include <math.h>
-//#include <Windows.h>
+#include "render.h"