From 4eefd550b7a62abe7a4e4b9de8814c1ecb42ce7a Mon Sep 17 00:00:00 2001 From: Deskull Date: Thu, 26 Feb 2015 22:55:54 +0900 Subject: [PATCH] =?utf8?q?=E6=9C=AA=E5=88=9D=E6=9C=9F=E5=8C=96=E5=A4=89?= =?utf8?q?=E6=95=B0=E3=81=AE=E8=AD=A6=E5=91=8A=E9=99=A4=E5=8E=BB=20/=20Fix?= =?utf8?q?=20warning=20of=20uninitialized=20variables.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/bldg.c | 2 +- src/cmd2.c | 1 - src/cmd6.c | 2 +- src/do-spell.c | 4 ++-- src/floors.c | 4 ++-- src/generate.c | 2 +- src/grid.c | 2 +- src/main-win.c | 6 +++--- 8 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/bldg.c b/src/bldg.c index e0fa5e06b..7d74831d1 100644 --- a/src/bldg.c +++ b/src/bldg.c @@ -2370,7 +2370,7 @@ static void town_history(void) * @param dam 基本ダメージ量 * @return ダメージ期待値 */ -s16b calc_crit_ratio_shot(int weight, int plus_ammo, int plus_bow, int dam) +s16b calc_crit_ratio_shot(int weight, int plus_ammo, int plus_bow, int dam) { int i; object_type *j_ptr = &inventory[INVEN_BOW]; diff --git a/src/cmd2.c b/src/cmd2.c index 4078c2be0..b0d2e8507 100644 --- a/src/cmd2.c +++ b/src/cmd2.c @@ -4137,7 +4137,6 @@ bool do_cmd_throw_aux(int mult, bool boomerang, int shuriken) cave_type *c_ptr = &cave[y][x]; monster_type *m_ptr = &m_list[c_ptr->m_idx]; - monster_race *r_ptr = &r_info[m_ptr->r_idx]; /* Check the visibility */ visible = m_ptr->ml; diff --git a/src/cmd6.c b/src/cmd6.c index 6cd97633d..e07f024ae 100644 --- a/src/cmd6.c +++ b/src/cmd6.c @@ -2133,7 +2133,7 @@ static int staff_effect(int sval, bool *use_charge, bool powerful, bool magic, b case SV_STAFF_STARLITE: { int num = damroll(5, 3); - int y, x; + int y = 0, x = 0; int attempts; if (!p_ptr->blind && !magic) diff --git a/src/do-spell.c b/src/do-spell.c index 8a750ec9c..3af36016f 100644 --- a/src/do-spell.c +++ b/src/do-spell.c @@ -781,7 +781,7 @@ static void cast_meteor(int dam, int rad) for (i = 0; i < b; i++) { - int y, x; + int y = 0, x = 0; int count; for (count = 0; count <= 20; count++) @@ -6950,7 +6950,7 @@ static cptr do_crusade_spell(int spell, int mode) for (i = 0; i < 12; i++) { int attempt = 10; - int my, mx; + int my = 0, mx = 0; while (attempt--) { diff --git a/src/floors.c b/src/floors.c index 628205a7c..b04f424ad 100644 --- a/src/floors.c +++ b/src/floors.c @@ -237,7 +237,7 @@ static void kill_saved_floor(saved_floor_type *sf_ptr) */ s16b get_new_floor_id(void) { - saved_floor_type *sf_ptr; + saved_floor_type *sf_ptr = NULL; int i; /* Look for empty space */ @@ -523,7 +523,7 @@ static void place_pet(void) for (i = 0; i < max_num; i++) { - int cy, cx, m_idx; + int cy = 0, cx = 0, m_idx; if (!(party_mon[i].r_idx)) continue; diff --git a/src/generate.c b/src/generate.c index 71539c94f..3eea2f87e 100644 --- a/src/generate.c +++ b/src/generate.c @@ -525,7 +525,7 @@ bool place_quest_monsters(void) for (k = 0; k < SAFE_MAX_ATTEMPTS; k++) { - int x, y; + int x = 0, y = 0; int l; /* Find an empty grid */ diff --git a/src/grid.c b/src/grid.c index 17b1e4903..96e70ebca 100644 --- a/src/grid.c +++ b/src/grid.c @@ -23,7 +23,7 @@ */ bool new_player_spot(void) { - int y, x; + int y = 0, x = 0; int max_attempts = 10000; cave_type *c_ptr; diff --git a/src/main-win.c b/src/main-win.c index 8a8edb451..dceef12c3 100644 --- a/src/main-win.c +++ b/src/main-win.c @@ -2484,7 +2484,7 @@ static errr Term_xtra_win_sound(int v) static errr Term_xtra_win_music(int n, int v) { #ifdef USE_MUSIC - int i; + int i = 0; char buf[1024]; #endif /* USE_MUSIC */ @@ -3020,10 +3020,10 @@ static errr Term_pict_win(int x, int y, int n, const byte *ap, const char *cp, c int i; int x1, y1, w1, h1, tw1, th1; - int x2, y2, w2, h2, tw2; + int x2, y2, w2, h2, tw2 = 0; int x3, y3; - HDC hdcMask; + HDC hdcMask = NULL; HDC hdc; HDC hdcSrc; -- 2.11.0