Merge remote-tracking branch 'origin/master'

src/arenaGUI.c

@@ -136,6 +136,9 @@ int getKeyEvent()
 	    	return -1;
 	    case SDL_KEYUP:
 			switch(event.key.keysym.sym) { //La valeur de touche
+				case SDLK_ESCAPE:
+					printf("ESCAPE KEY\n");
+					return -1;
 				case SDLK_UP:
 					printf("FLECHE DU HAUT\n");
 					return 1;

src/main.h

@@ -11,8 +11,8 @@
 /*
  * Generator tiles spawn rate (in percent)
  */
-#define ROCK_GEN_RATE 30
-#define TREE_GEN_RATE 25
+#define ROCK_GEN_RATE 28
+#define TREE_GEN_RATE 22
 #define WATER_GEN_RATE 8
 #define GOLD_GEN_RATE 10