From: Habu <habu1010+github@gmail.com>
Date: Tue, 19 Oct 2021 03:31:50 +0000 (+0900)
Subject: [Fix] キャラメイクの職業選択時におかしな挙動が発生する
X-Git-Tag: vmacos3.0.0-alpha52~48^2~3^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7b1c95602d48182a8f94f01d5e078f25c23ecad7;p=hengbandforosx%2Fhengbandosx.git

[Fix] キャラメイクの職業選択時におかしな挙動が発生する

Fix #1815.
#1754 でのエンバグ。変数のスコープの狭めすぎや取り違えがあわさっておかしな
挙動となっていた。
---

diff --git a/src/birth/birth-select-class.cpp b/src/birth/birth-select-class.cpp
index 7e4c3de64..60c69a4e6 100644
--- a/src/birth/birth-select-class.cpp
+++ b/src/birth/birth-select-class.cpp
@@ -117,9 +117,10 @@ static bool select_class(player_type *player_ptr, char *cur, char *sym, int *k)
 {
     auto cs = player_ptr->pclass;
     auto os = PlayerClassType::MAX;
+    int int_os = enum2i(os);
+    int int_cs = enum2i(cs);
     while (true) {
-        int int_os = enum2i(os);
-        display_class_stat(enum2i(cs), &int_os, cur, sym);
+        display_class_stat(int_cs, &int_os, cur, sym);
         if (*k >= 0)
             break;
 
@@ -141,12 +142,11 @@ static bool select_class(player_type *player_ptr, char *cur, char *sym, int *k)
                 cs = i2enum<PlayerClassType>(*k);
                 continue;
             } else {
-                *k = enum2i(cs);
+                *k = int_cs;
                 break;
             }
         }
 
-        int int_cs = enum2i(cs);
         interpret_class_select_key_move(c, &int_cs);
         if (c == '*') {
             *k = randint0(PLAYER_CLASS_TYPE_MAX);