| Revision | 2e9a620777ba610b86a23e9687d49347d3656f51 (tree) |
|---|---|
| Zeit | 2017-06-23 23:43:22 |
| Autor | Deskull <desull@user...> |
| Commiter | Deskull |
#37287 init1.cとmelee2.c、monster2.c内のC4457警告に対応 / Deal C4457 warning in init1.c, melee2.c and monster2.c.
src/init1.c (diff) src/melee2.c (diff) src/monster2.c (diff)| @@ -2162,7 +2162,6 @@ errr parse_k_info(char *buf, header *head) | ||
| 2162 | 2162 | /* Process 'A' for "Allocation" (one line only) */ |
| 2163 | 2163 | else if (buf[0] == 'A') |
| 2164 | 2164 | { |
| 2165 | - int i; | |
| 2166 | 2165 | |
| 2167 | 2166 | /* XXX XXX XXX Simply read each number following a colon */ |
| 2168 | 2167 | for (i = 0, s = buf+1; s && (s[0] == ':') && s[1]; ++i) |
| @@ -4259,16 +4258,16 @@ static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, in | ||
| 4259 | 4258 | /* Place player in a quest level */ |
| 4260 | 4259 | if (p_ptr->inside_quest) |
| 4261 | 4260 | { |
| 4262 | - int y, x; | |
| 4261 | + int py, px; | |
| 4263 | 4262 | |
| 4264 | 4263 | /* Delete the monster (if any) */ |
| 4265 | 4264 | delete_monster(p_ptr->y, p_ptr->x); |
| 4266 | 4265 | |
| 4267 | - y = atoi(zz[0]); | |
| 4268 | - x = atoi(zz[1]); | |
| 4266 | + py = atoi(zz[0]); | |
| 4267 | + px = atoi(zz[1]); | |
| 4269 | 4268 | |
| 4270 | - p_ptr->y = y; | |
| 4271 | - p_ptr->x = x; | |
| 4269 | + p_ptr->y = py; | |
| 4270 | + p_ptr->x = px; | |
| 4272 | 4271 | } |
| 4273 | 4272 | /* Place player in the town */ |
| 4274 | 4273 | else if (!p_ptr->oldpx && !p_ptr->oldpy) |
| @@ -362,8 +362,6 @@ void mon_take_hit_mon(int m_idx, int dam, bool *fear, cptr note, int who) | ||
| 362 | 362 | |
| 363 | 363 | if (p_ptr->riding && (p_ptr->riding == m_idx) && (dam > 0)) |
| 364 | 364 | { |
| 365 | - char m_name[80]; | |
| 366 | - | |
| 367 | 365 | /* Extract monster name */ |
| 368 | 366 | monster_desc(m_name, m_ptr, 0); |
| 369 | 367 |
| @@ -1964,8 +1964,8 @@ void sanity_blast(monster_type *m_ptr, bool necro) | ||
| 1964 | 1964 | |
| 1965 | 1965 | if (!necro && m_ptr) |
| 1966 | 1966 | { |
| 1967 | - char m_name[80]; | |
| 1968 | - monster_race *r_ptr = &r_info[m_ptr->ap_r_idx]; | |
| 1967 | + char m_name[80]; | |
| 1968 | + monster_race *r_ptr = &r_info[m_ptr->ap_r_idx]; | |
| 1969 | 1969 | |
| 1970 | 1970 | power = r_ptr->level / 2; |
| 1971 | 1971 |
| @@ -1987,8 +1987,6 @@ void sanity_blast(monster_type *m_ptr, bool necro) | ||
| 1987 | 1987 | if (!(r_ptr->flags2 & RF2_ELDRITCH_HORROR)) |
| 1988 | 1988 | return; /* oops */ |
| 1989 | 1989 | |
| 1990 | - | |
| 1991 | - | |
| 1992 | 1990 | if (is_pet(m_ptr)) |
| 1993 | 1991 | return; /* Pet eldritch horrors are safe most of the time */ |
| 1994 | 1992 |
| @@ -2010,7 +2008,6 @@ void sanity_blast(monster_type *m_ptr, bool necro) | ||
| 2010 | 2008 | funny_desc[randint0(MAX_SAN_FUNNY)], m_name); |
| 2011 | 2009 | #endif |
| 2012 | 2010 | |
| 2013 | - | |
| 2014 | 2011 | if (one_in_(3)) |
| 2015 | 2012 | { |
| 2016 | 2013 | msg_print(funny_comments[randint0(MAX_SAN_COMMENT)]); |
| @@ -2046,7 +2043,6 @@ void sanity_blast(monster_type *m_ptr, bool necro) | ||
| 2046 | 2043 | else if(!necro) |
| 2047 | 2044 | { |
| 2048 | 2045 | monster_race *r_ptr; |
| 2049 | - int power; | |
| 2050 | 2046 | char m_name[80]; |
| 2051 | 2047 | cptr desc; |
| 2052 | 2048 |
Fork