From 4a79a3647ac5ff6c52cf50138dc3c5aabd0e4262 Mon Sep 17 00:00:00 2001 From: habu Date: Tue, 19 Feb 2002 00:35:52 +0000 Subject: [PATCH] =?utf8?q?malloc,=20free=E3=82=92=E4=BD=BF=E3=81=A3?= =?utf8?q?=E3=81=A6=E3=81=84=E3=81=9F=E5=A0=B4=E6=89=80=E3=82=92C=5FMAKE,?= =?utf8?q?=20C=5FKILL=E3=82=92=E4=BD=BF=E3=81=A3=E3=81=A6=E6=9B=B8?= =?utf8?q?=E3=81=8D=E5=A4=89=E3=81=88=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/rooms.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/rooms.c b/src/rooms.c index c640644b5..666694354 100644 --- a/src/rooms.c +++ b/src/rooms.c @@ -4188,7 +4188,7 @@ void build_maze_vault(int x0, int y0, int xsize, int ysize, bool is_vault) { int y, x, dy, dx; int y1, x1, y2, x2; - int i, m, n, num_vertices, *visited; + int m, n, num_vertices, *visited; bool light; cave_type *c_ptr; @@ -4237,10 +4237,7 @@ void build_maze_vault(int x0, int y0, int xsize, int ysize, bool is_vault) num_vertices = m * n; /* initialize array of visited vertices */ - /* use ralloc here ? */ - visited = (int *)malloc(num_vertices * sizeof(int)); - for (i = 0; i < num_vertices; i++) - visited[i] = 0; + C_MAKE(visited, num_vertices, int); /* traverse the graph to create a spaning tree, pick a random root */ r_visit(y1, x1, y2, x2, randint0(num_vertices), 0, visited); @@ -4248,7 +4245,7 @@ void build_maze_vault(int x0, int y0, int xsize, int ysize, bool is_vault) /* Fill with monsters and treasure, low difficulty */ if (is_vault) fill_treasure(x1, x2, y1, y2, randint1(5)); - free(visited); + C_KILL(visited, num_vertices, int); } @@ -4263,7 +4260,7 @@ static void build_mini_c_vault(int x0, int y0, int xsize, int ysize) { int dy, dx; int y1, x1, y2, x2, y, x, total; - int i, m, n, num_vertices; + int m, n, num_vertices; int *visited; if (cheat_room) msg_print("Mini Checker Board Vault"); @@ -4333,10 +4330,7 @@ static void build_mini_c_vault(int x0, int y0, int xsize, int ysize) num_vertices = m * n; /* initialize array of visited vertices */ - /* use ralloc here ? */ - visited = (int *) malloc(num_vertices * sizeof(int)); - for (i = 0; i < num_vertices; i++) - visited[i] = 0; + C_MAKE(visited, num_vertices, int); /* traverse the graph to create a spannng tree, pick a random root */ r_visit(y1, x1, y2, x2, randint0(num_vertices), 0, visited); @@ -4374,8 +4368,7 @@ static void build_mini_c_vault(int x0, int y0, int xsize, int ysize) /* Fill with monsters and treasure, highest difficulty */ fill_treasure(x1, x2, y1, y2, 10); - /* rnfree(visited, num_vertices * sizeof(int)); */ - free(visited); + C_KILL(visited, num_vertices, int); } -- 2.11.0