From: nothere Date: Fri, 1 Aug 2003 21:53:09 +0000 (+0000) Subject: 最初からf_info[].mimicを見て代入する変更を破棄. X-Git-Tag: v2.1.2~1235 X-Git-Url: http://git.osdn.net/view?p=hengbandforosx%2Fhengbandosx.git;a=commitdiff_plain;h=6d6d15dda26b686f4d69c4f2ca973eb5c7bcbfe7 最初からf_info[].mimicを見て代入する変更を破棄. --- diff --git a/src/init1.c b/src/init1.c index 7c00a2603..cef87a91e 100644 --- a/src/init1.c +++ b/src/init1.c @@ -3430,7 +3430,7 @@ static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, in /* Hidden trap (or door) */ else if (letter[idx].trap) { - c_ptr->mimic = f_info[c_ptr->feat].mimic; + c_ptr->mimic = c_ptr->feat; c_ptr->feat = letter[idx].trap; } else if (object_index) diff --git a/src/load.c b/src/load.c index b7dddb8fd..412835774 100644 --- a/src/load.c +++ b/src/load.c @@ -2389,7 +2389,7 @@ static errr rd_dungeon_old(void) /* Old CAVE_IN_MIRROR flag */ if (c_ptr->info & CAVE_OBJECT) { - c_ptr->mimic = f_info[FEAT_MIRROR].mimic; + c_ptr->mimic = FEAT_MIRROR; } /* Runes will be mimics and flags */ @@ -2397,7 +2397,7 @@ static errr rd_dungeon_old(void) c_ptr->feat == FEAT_GLYPH) { c_ptr->info |= CAVE_OBJECT; - c_ptr->mimic = f_info[c_ptr->feat].mimic; + c_ptr->mimic = c_ptr->feat; c_ptr->feat = FEAT_FLOOR; } @@ -2405,14 +2405,14 @@ static errr rd_dungeon_old(void) else if (c_ptr->info & CAVE_TRAP) { c_ptr->info &= ~CAVE_TRAP; - c_ptr->mimic = f_info[c_ptr->feat].mimic; + c_ptr->mimic = c_ptr->feat; c_ptr->feat = choose_random_trap(); } /* Another hidden trap */ else if (c_ptr->feat == FEAT_INVIS) { - c_ptr->mimic = f_info[FEAT_FLOOR].mimic; + c_ptr->mimic = FEAT_FLOOR; c_ptr->feat = FEAT_TRAP_OPEN; } @@ -2420,7 +2420,7 @@ static errr rd_dungeon_old(void) else if (c_ptr->feat == FEAT_SECRET) { place_closed_door(y, x); - c_ptr->mimic = f_info[FEAT_WALL_EXTRA].mimic; + c_ptr->mimic = FEAT_WALL_EXTRA; } } } diff --git a/src/object2.c b/src/object2.c index 5bec9e447..15a0b6788 100644 --- a/src/object2.c +++ b/src/object2.c @@ -5363,7 +5363,7 @@ void place_trap(int y, int x) if (!cave_naked_bold(y, x)) return; /* Place an invisible trap */ - c_ptr->mimic = f_info[c_ptr->feat].mimic; + c_ptr->mimic = c_ptr->feat; c_ptr->feat = choose_random_trap(); } diff --git a/src/rooms.c b/src/rooms.c index 87c8aeb1f..817a75413 100644 --- a/src/rooms.c +++ b/src/rooms.c @@ -5540,10 +5540,8 @@ static void build_type13(int by0, int bx0) } } - /* Pre-apply default mimic field */ - cave[yval][xval].mimic = f_info[cave[yval][xval].feat].mimic; - /* Place the wall open trap */ + cave[yval][xval].mimic = cave[yval][xval].feat; cave[yval][xval].feat = FEAT_TRAP_OPEN; /* Prepare allocation table */ @@ -5718,7 +5716,7 @@ static void build_type14(int by0, int bx0) /* Place a special trap */ c_ptr = &cave[rand_spread(yval, ysize/4)][rand_spread(xval, xsize/4)]; - c_ptr->mimic = f_info[c_ptr->feat].mimic; + c_ptr->mimic = c_ptr->feat; c_ptr->feat = trap; /* Message */ diff --git a/src/spells1.c b/src/spells1.c index 9d047576b..d8764c39d 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -1070,11 +1070,11 @@ msg_print(" /* Create a glyph */ cave[y][x].info |= CAVE_OBJECT; - cave[y][x].mimic = f_info[FEAT_GLYPH].mimic; + cave[y][x].mimic = FEAT_GLYPH; /* Notice */ note_spot(y, x); - + /* Redraw */ lite_spot(y, x); diff --git a/src/spells3.c b/src/spells3.c index 87fd6f4a7..35f25b746 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -1561,7 +1561,7 @@ static bool vanish_dungeon(void) c_ptr->info &= ~(CAVE_ROOM | CAVE_ICKY); /* Set boundary mimic if needed */ - if (c_ptr->mimic && vanishable_feat(c_ptr->mimic)) c_ptr->mimic = f_info[floor_type[randint0(100)]].mimic; + if (c_ptr->mimic && vanishable_feat(c_ptr->mimic)) c_ptr->mimic = floor_type[randint0(100)]; c_ptr = &cave[cur_hgt - 1][x]; @@ -1569,7 +1569,7 @@ static bool vanish_dungeon(void) c_ptr->info &= ~(CAVE_ROOM | CAVE_ICKY); /* Set boundary mimic if needed */ - if (c_ptr->mimic && vanishable_feat(c_ptr->mimic)) c_ptr->mimic = f_info[floor_type[randint0(100)]].mimic; + if (c_ptr->mimic && vanishable_feat(c_ptr->mimic)) c_ptr->mimic = floor_type[randint0(100)]; } /* Special boundary walls -- Left and right */ @@ -1581,7 +1581,7 @@ static bool vanish_dungeon(void) c_ptr->info &= ~(CAVE_ROOM | CAVE_ICKY); /* Set boundary mimic if needed */ - if (c_ptr->mimic && vanishable_feat(c_ptr->mimic)) c_ptr->mimic = f_info[floor_type[randint0(100)]].mimic; + if (c_ptr->mimic && vanishable_feat(c_ptr->mimic)) c_ptr->mimic = floor_type[randint0(100)]; c_ptr = &cave[y][cur_wid - 1]; @@ -1589,7 +1589,7 @@ static bool vanish_dungeon(void) c_ptr->info &= ~(CAVE_ROOM | CAVE_ICKY); /* Set boundary mimic if needed */ - if (c_ptr->mimic && vanishable_feat(c_ptr->mimic)) c_ptr->mimic = f_info[floor_type[randint0(100)]].mimic; + if (c_ptr->mimic && vanishable_feat(c_ptr->mimic)) c_ptr->mimic = floor_type[randint0(100)]; } /* Mega-Hack -- Forget the view and lite */ @@ -1893,7 +1893,7 @@ msg_print(" /* Create a glyph */ cave[py][px].info |= CAVE_OBJECT; - cave[py][px].mimic = f_info[FEAT_GLYPH].mimic; + cave[py][px].mimic = FEAT_GLYPH; /* Notice */ note_spot(py, px); @@ -1920,7 +1920,7 @@ msg_print(" /* Create a mirror */ cave[py][px].info |= CAVE_OBJECT; - cave[py][px].mimic = f_info[FEAT_MIRROR].mimic; + cave[py][px].mimic = FEAT_MIRROR; /* Turn on the light */ cave[py][px].info |= CAVE_GLOW; @@ -1954,7 +1954,7 @@ msg_print(" /* Create a glyph */ cave[py][px].info |= CAVE_OBJECT; - cave[py][px].mimic = f_info[FEAT_MINOR_GLYPH].mimic; + cave[py][px].mimic = FEAT_MINOR_GLYPH; /* Notice */ note_spot(py, px); diff --git a/src/wild.c b/src/wild.c index 50778159a..669f0c171 100644 --- a/src/wild.c +++ b/src/wild.c @@ -760,41 +760,41 @@ void wilderness_gen(void) for (i = 0; i < MAX_WID; i++) { cave[0][i].feat = FEAT_PERM_SOLID; - cave[0][i].mimic = f_info[border.north[i]].mimic; + cave[0][i].mimic = border.north[i]; } /* Special boundary walls -- South */ for (i = 0; i < MAX_WID; i++) { cave[MAX_HGT - 1][i].feat = FEAT_PERM_SOLID; - cave[MAX_HGT - 1][i].mimic = f_info[border.south[i]].mimic; + cave[MAX_HGT - 1][i].mimic = border.south[i]; } /* Special boundary walls -- West */ for (i = 0; i < MAX_HGT; i++) { cave[i][0].feat = FEAT_PERM_SOLID; - cave[i][0].mimic = f_info[border.west[i]].mimic; + cave[i][0].mimic = border.west[i]; } /* Special boundary walls -- East */ for (i = 0; i < MAX_HGT; i++) { cave[i][MAX_WID - 1].feat = FEAT_PERM_SOLID; - cave[i][MAX_WID - 1].mimic = f_info[border.east[i]].mimic; + cave[i][MAX_WID - 1].mimic = border.east[i]; } /* North west corner */ - cave[0][0].mimic = f_info[border.north_west].mimic; + cave[0][0].mimic = border.north_west; /* North east corner */ - cave[0][MAX_WID - 1].mimic = f_info[border.north_east].mimic; + cave[0][MAX_WID - 1].mimic = border.north_east; /* South west corner */ - cave[MAX_HGT - 1][0].mimic = f_info[border.south_west].mimic; + cave[MAX_HGT - 1][0].mimic = border.south_west; /* South east corner */ - cave[MAX_HGT - 1][MAX_WID - 1].mimic = f_info[border.south_east].mimic; + cave[MAX_HGT - 1][MAX_WID - 1].mimic = border.south_east; /* Light up or darken the area */ for (y = 0; y < cur_hgt; y++)