OSDN > Finden Software > Spiele/Unterhaltung > Role-Playing > 変愚蛮怒 > SCM > git > hengband > Commit

変愚蛮怒
Fork
hengband
web

hengband: Commit

変愚蛮怒のメインリポジトリです

[Refactor] #38997 build_castle_vault() に floor_type * 引数を追加． / Add floor_type * argument to build_castle_vault().

--- a/src/rooms-vault.c

+++ b/src/rooms-vault.c

		@@ -1146,7 +1146,7 @@ static void build_mini_c_vault(floor_type *floor_ptr, POSITION x0, POSITION y0,
1146	1146	*
1147	1147	*This makes a vault that looks like a castle/ city in the dungeon.
1148	1148	*/
1149		-static void build_castle_vault(POSITION x0, POSITION y0, POSITION xsize, POSITION ysize)
	1149	+static void build_castle_vault(floor_type *floor_ptr, POSITION x0, POSITION y0, POSITION xsize, POSITION ysize)
1150	1150	{
1151	1151	POSITION dy, dx;
1152	1152	POSITION y1, x1, y2, x2;

		@@ -1168,7 +1168,7 @@ static void build_castle_vault(POSITION x0, POSITION y0, POSITION xsize, POSITIO
1168	1168	{
1169	1169	for (x = x1 - 1; x <= x2 + 1; x++)
1170	1170	{
1171		- p_ptr->current_floor_ptr->grid_array[y][x].info \|= (CAVE_ROOM \| CAVE_ICKY);
	1171	+ floor_ptr->grid_array[y][x].info \|= (CAVE_ROOM \| CAVE_ICKY);
1172	1172	/* Make everything a floor */
1173	1173	place_floor_bold(y, x);
1174	1174	}

		@@ -1178,7 +1178,7 @@ static void build_castle_vault(POSITION x0, POSITION y0, POSITION xsize, POSITIO
1178	1178	build_recursive_room(x1, y1, x2, y2, randint1(5));
1179	1179
1180	1180	/* Fill with monsters and treasure, low difficulty */
1181		- fill_treasure(p_ptr->current_floor_ptr, x1, x2, y1, y2, randint1(3));
	1181	+ fill_treasure(floor_ptr, x1, x2, y1, y2, randint1(3));
1182	1182	}
1183	1183
1184	1184

		@@ -1221,7 +1221,7 @@ bool build_type10(void)
1221	1221	case 3: case 11: build_cave_vault(x0, y0, xsize, ysize); break;
1222	1222	case 4: case 12: build_maze_vault(x0, y0, xsize, ysize, TRUE); break;
1223	1223	case 5: case 13: build_mini_c_vault(p_ptr->current_floor_ptr, x0, y0, xsize, ysize); break;
1224		- case 6: case 14: build_castle_vault(x0, y0, xsize, ysize); break;
	1224	+ case 6: case 14: build_castle_vault(p_ptr->current_floor_ptr, x0, y0, xsize, ysize); break;
1225	1225	case 7: case 15: build_target_vault(p_ptr->current_floor_ptr, x0, y0, xsize, ysize); break;
1226	1226	#ifdef ALLOW_CAVERNS_AND_LAKES
1227	1227	case 8: build_elemental_vault(p_ptr->current_floor_ptr, x0, y0, xsize, ysize); break;