From 7df50820518f52966fb842c60f743ae1b0311346 Mon Sep 17 00:00:00 2001
From: quenousimporte <quenousimporte@git.ouvaton.coop>
Date: Tue, 1 Apr 2025 13:45:08 +0200
Subject: [PATCH] put map back in code

---
 w/w.c | 47 +++++++++++++++++++----------------------------
 1 file changed, 19 insertions(+), 28 deletions(-)

diff --git a/w/w.c b/w/w.c
index 1e84493..48ef002 100644
--- a/w/w.c
+++ b/w/w.c
@@ -55,8 +55,24 @@ char pov[POV_SIZE][POV_SIZE];
 unsigned char pov3d[POV_3D_SIZE][POV_3D_SIZE];
 Gamestate state;
 
-int mapsize = 0;
-char* map = NULL;
+int mapsize = 15;
+char map[15][15] = {
+	"wwwwwwwwwwwwwww",
+	"w             w",
+	"w wwwww wwwww w",
+	"w w w d w   w w",
+	"w w w w w   w w",
+	"w w   w w   w w",
+	"wdwwwwwdw     w",
+	"w   w w wwwwwdw",
+	"w   www     w w",
+	"ws  w       w w",
+	"wwwwwww     w w",
+	"w           w w",
+	"w           w w",
+	"w           d w",
+	"wwwwwwwwwwwwwww"
+};
 
 Character monsters[1] = {
 	{ "Alien", 1, 2, 1, 1 }
@@ -73,31 +89,7 @@ char charatpos(int x, int y)
 	{
 		return ' ';
 	}
-	return map[y * mapsize + x];
-}
-
-void loadmap()
-{
-	FILE* file = fopen("w.map", "r");
-	while (fgetc(file) != '\n')
-	{
-		mapsize++;
-	}
-	rewind(file);
-
-	map = (char*)malloc(mapsize * mapsize * sizeof(char));
-
-	char c = 0;
-	int i = 0;
-	while (c != EOF)
-	{
-		c = fgetc(file);
-		if (c != '\n')
-		{
-			map[i++] = c;
-		}
-	}
-	fclose(file);
+	return map[y][x];
 }
 
 void drawmap()
@@ -403,7 +395,6 @@ void init()
 	{
 		state.screen = SC_TITLE;
 	}
-	loadmap();
 }
 
 void update(char command[CMD_LEN])