fin du merge avec la branche main

travail_de_groupe/jeu_appren_par_renfo/src/gest_event.c

@@ -34,11 +34,7 @@ void *EventLoop(void *arg){
     while(running){
         switch(game_state){
             case MENU : gestMenu();break;
-<<<<<<< HEAD
-            //case GAME : gestGame();break;
-=======
             case GAME : gestMenu();break;
->>>>>>> main
             default:printf("game state fault");break;
         }
     }

travail_de_groupe/jeu_appren_par_renfo/src/main.c

@@ -6,16 +6,10 @@ int game_state;
 
 int main(){
     running = 1;
-<<<<<<< HEAD
-    game_state = MENU;
-
-    MainLoop();
-=======
     game_state = GAME;
     readMapFromFile("map.txt");
     printMap();
 
     mainLoop();
->>>>>>> main
 
 } 
\ No newline at end of file

travail_de_groupe/jeu_appren_par_renfo/src/main.h

@@ -16,10 +16,7 @@
 
 #include "render.h"
 #include "gest_event.h"
-<<<<<<< HEAD
-=======
 #include "map.h"
->>>>>>> main
 
 
 #define MENU 0

travail_de_groupe/jeu_appren_par_renfo/src/render.c

@@ -4,11 +4,6 @@ SDL_Window *window;
 SDL_Renderer *renderer;
 
 TTF_Font *RobotoFont;
-<<<<<<< HEAD
-
-void CreateWindow(){
-    SDL_DisplayMode ScreenDimension;
-=======
 SDL_DisplayMode screenDimension;
 
 SDL_Rect rect;
@@ -24,22 +19,15 @@ double ra = player->angle - DR * FOV_ANGLE/4;
 // end ray casting variables
 
 void createWindow(){
->>>>>>> main
 
     if (SDL_Init(SDL_INIT_VIDEO) != 0){
         printf("Couldn't create window.");
         exit(EXIT_FAILURE);
     }
 
-<<<<<<< HEAD
-    SDL_GetCurrentDisplayMode(0, &ScreenDimension);
-
-    window = SDL_CreateWindow("Game Of Life", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, ScreenDimension.w, ScreenDimension.h, SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_SHOWN | SDL_WINDOW_FULLSCREEN_DESKTOP);
-=======
     SDL_GetCurrentDisplayMode(0, &screenDimension);
 
     window = SDL_CreateWindow("Mat Le King", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, screenDimension.w, screenDimension.h, SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_SHOWN | SDL_WINDOW_FULLSCREEN_DESKTOP);
->>>>>>> main
 
     if (window == NULL){
         printf("Couldn't create window");

travail_de_groupe/jeu_appren_par_renfo/src/render.h

@@ -3,10 +3,6 @@
 
 #include "main.h"
 #include "gest_event.h"
-<<<<<<< HEAD
-
-#define FPS_TO_GET 60
-=======
 #include "map.h"
 
 #define FPS_TO_GET 60
@@ -17,18 +13,13 @@
 #define DR 0.0174533
 #define FOV_ANGLE 60
 #define pi 3.14159265358979323846
-#define NB_RAYS (screenDimension.x)
+#define NB_RAYS (screenDimension.w)
 #define ANGLE_INC ((DR * FOV_ANGLE) / NB_RAYS)
->>>>>>> main
 
 extern SDL_Window *window;
 extern SDL_Renderer *renderer;
 
 
-<<<<<<< HEAD
-void MainLoop();
-=======
 void mainLoop();
->>>>>>> main
 
 #endif 
\ No newline at end of file