From 957f41517f228e4cfec06c8274ac7ece41033e7c Mon Sep 17 00:00:00 2001
From: Anselme <anselme16@hotmail.fr>
Date: Tue, 13 Jan 2015 09:54:27 +0100
Subject: [PATCH] added alternative map generator, for testing purposes, type
 'make anselme' to use it

---
 Makefile            |  3 +++
 generator_anselme.c | 65 +++++++++++++++++++++++++++++++++++++++++++++
 main.c              | 12 ---------
 3 files changed, 68 insertions(+), 12 deletions(-)
 create mode 100644 generator_anselme.c

diff --git a/Makefile b/Makefile
index 5d23f2e..0be5ad9 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,9 @@ main : main.o generator.o
 $(BINARY) : orange.o purple.o main.o generator.o
 	$(CC) main.o generator.o orange.o purple.o -o $(BINARY) $(LIB)
 
+anselme : orange.o purple.o main.o generator_anselme.o
+	$(CC) main.o generator_anselme.o orange.o purple.o -o $(BINARY) $(LIB)
+
 %.o: %.c
 	$(CC) -o $@ -c $< $(FLAGS)
 	
diff --git a/generator_anselme.c b/generator_anselme.c
new file mode 100644
index 0000000..2ced43f
--- /dev/null
+++ b/generator_anselme.c
@@ -0,0 +1,65 @@
+#include "main.h"
+
+// functions
+int distance_manhattan(int x1,int y1, int x2, int y2);
+	
+int absolute(int val);
+
+int min(int a, int b)
+{
+	return a < b ? a : b;
+}
+
+int max(int a, int b)
+{
+	return a > b ? a : b;
+}
+
+void create_map(t_pixel** map, t_team* teams, int w, int h){
+	int i,j, k;
+	int r = (w/NB_TEAMS < h ? w/NB_TEAMS : h)/2;
+	
+	for(i=0; i<NB_TEAMS; i++){
+		teams[i].spawn.x = (w/(NB_TEAMS*2))*(1+i*2);
+		teams[i].spawn.y = h/2;
+	}
+	
+	//génération de la carte
+	for (i=0;i<w;i++){
+		for(j=0;j<h;j++){
+			map[i][j].data = NULL;
+			if (i == 0 || j == 0 || i == w-1 || j == h-1){
+				map[i][j].type = BEDROCK;
+			}else{
+				int d = max(w, h);
+				for(k=0; k<NB_TEAMS; k++){
+					d = min(d, distance_manhattan(teams[k].spawn.x, teams[k].spawn.y, i, j));
+					if(!d) break;
+				}
+				if(d == 0){
+					map[i][j].type = SPAWN;
+					map[i][j].data = malloc(sizeof(int));
+					*(int*)(map[i][j].data) = k;
+				}else{
+					int l = (d-20)+(rand()%40);
+					if(l > r+15){
+						map[i][j].type = rand()%8 ? ROCK : IRON_ORE;
+					}else if(l < r-15){
+						map[i][j].type = rand()%15 ? GRASS : BERRIES;
+					}else{
+						l = rand()%10;
+						map[i][j].type = l > 5 ? TREE : l ? GRASS : BERRIES;
+					}
+				}
+			}
+		}
+	}
+}
+
+int distance_manhattan(int x1,int y1, int x2, int y2){
+	return absolute(x1-x2) + absolute(y1-y2);
+}
+	
+int absolute(int val){
+	return val > 0 ? val : -val;
+}
diff --git a/main.c b/main.c
index af4cdd6..25bf36d 100755
--- a/main.c
+++ b/main.c
@@ -208,18 +208,6 @@ void generateImg(){
 	}
 }
 
-int min(int a, int b)
-{
-	if (a<b) return a;
-	else return b;
-}
-
-int max(int a, int b)
-{
-	if (a>b) return a;
-	else return b;
-}
-
 Uint32 getpixel(SDL_Surface *surface, int x, int y)
 {
     int bpp = surface->format->BytesPerPixel;