[Refactor] #40742 Removed global vairable browsing_movie

diff --git a/src/cmd-io/cmd-diary.c b/src/cmd-io/cmd-diary.c
index aa03d99..9472d9a 100644 (file)
--- a/src/cmd-io/cmd-diary.c
+++ b/src/cmd-io/cmd-diary.c
@@ -117,7 +117,6 @@ static void do_cmd_erase_diary(void)
 void do_cmd_diary(player_type *creature_ptr)
 {
     screen_save();
-    int i;
     while (TRUE) {
         term_clear();
         prt(_("[ 記録の設定 ]", "[ Play Record ]"), 2, 0);
@@ -127,7 +126,7 @@ void do_cmd_diary(player_type *creature_ptr)
         prt(_("(4) 記録を消去する", "(4) Delete your record"), 7, 5);
         prt(_("(R) プレイ動画を記録する/中止する", "(R) Record playing movie / or stop it"), 9, 5);
         prt(_("コマンド:", "Command: "), 18, 0);
-        i = inkey();
+        int i = inkey();
         if (i == ESCAPE)
             break;
 

diff --git a/src/core/game-play.c b/src/core/game-play.c
index eb9bd39..fe00699 100644 (file)
--- a/src/core/game-play.c
+++ b/src/core/game-play.c
@@ -90,13 +90,16 @@
 
 /*!
  * @brief 1ゲームプレイの主要ルーチン / Actually play a game
+ * @param player_ptr プレーヤーへの参照ポインタ
+ * @param new_game 新規にゲームを始めたかどうか
+ * @param browsing_movie ムービーモードか
  * @return なし
  * @note
  * If the "new_game" parameter is true, then, after loading the
  * savefile, we will commit suicide, if necessary, to allow the
  * player to start a new game.
  */
-void play_game(player_type *player_ptr, bool new_game)
+void play_game(player_type *player_ptr, bool new_game, bool browsing_movie)
 {
     bool load_game = TRUE;
     bool init_random_seed = FALSE;

diff --git a/src/core/game-play.h b/src/core/game-play.h
index 672a1da..2881411 100644 (file)
--- a/src/core/game-play.h
+++ b/src/core/game-play.h
@@ -2,4 +2,4 @@
 
 #include "system/angband.h"
 
-void play_game(player_type* player_ptr, bool new_game);
+void play_game(player_type* player_ptr, bool new_game, bool browsing_movie);

diff --git a/src/io/chuukei.c b/src/io/chuukei.c
index 1d270ce..e893823 100644 (file)
--- a/src/io/chuukei.c
+++ b/src/io/chuukei.c
@@ -538,12 +538,9 @@ static bool flush_ringbuf_client(void)
     return TRUE;
 }
 
-void prepare_browse_movie_aux(concptr filename)
+void prepare_browse_movie_without_path_build(concptr filename)
 {
     movie_fd = fd_open(filename, O_RDONLY);
-
-    browsing_movie = TRUE;
-
     init_buffer();
 }
 
@@ -570,11 +567,10 @@ void browse_movie(void)
 }
 
 #ifndef WINDOWS
-void prepare_browse_movie(concptr filename)
+void prepare_browse_movie_with_path_build(concptr filename)
 {
     char buf[1024];
     path_build(buf, sizeof(buf), ANGBAND_DIR_USER, filename);
-
     prepare_browse_movie_aux(buf);
 }
 #endif

diff --git a/src/io/chuukei.h b/src/io/chuukei.h
index d13f888..0f7873c 100644 (file)
--- a/src/io/chuukei.h
+++ b/src/io/chuukei.h
@@ -3,8 +3,8 @@
 #include "system/angband.h"
 
 void prepare_movie_hooks(player_type *player_ptr);
-void prepare_browse_movie_aux(concptr filename);
+void prepare_browse_movie_without_path_build(concptr filename);
 void browse_movie(void);
 #ifndef WINDOWS
-void prepare_browse_movie(concptr filename);
+void prepare_browse_movie_with_path_build(concptr filename);
 #endif WINDOWS

diff --git a/src/io/inet.c b/src/io/inet.c
index f7d9fa4..c2638b9 100644 (file)
--- a/src/io/inet.c
+++ b/src/io/inet.c
@@ -28,8 +28,6 @@ static concptr errstr;
 static char *proxy;
 static int proxy_port;
 
-bool browsing_movie;
-
 /* プロキシサーバのアドレスををファイルから読んで設定する */
 void set_proxy(char *default_url, int default_port)
 {

diff --git a/src/io/inet.h b/src/io/inet.h
index 8621913..e26c744 100644 (file)
--- a/src/io/inet.h
+++ b/src/io/inet.h
@@ -2,8 +2,6 @@
 
 #include "system/angband.h"
 
-extern bool browsing_movie;
-
 int soc_write(int sd, char *buf, size_t sz);
 int soc_read(int sd, char *buf, size_t sz);
 void set_proxy(char *default_url, int default_port);

diff --git a/src/main-win.c b/src/main-win.c
index edc7141..371db89 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -2249,7 +2249,7 @@ static void check_for_save_file(player_type *player_ptr, LPSTR cmd_line)
     strcat(savefile, s);
     validate_file(savefile);
     game_in_progress = TRUE;
-    play_game(player_ptr, FALSE);
+    play_game(player_ptr, FALSE, FALSE);
 }
 
 /*
@@ -2268,7 +2268,7 @@ static void process_menus(player_type *player_ptr, WORD wCmd)
         } else {
             game_in_progress = TRUE;
             term_flush();
-            play_game(player_ptr, TRUE);
+            play_game(player_ptr, TRUE, FALSE);
             quit(NULL);
         }
 
@@ -2294,7 +2294,7 @@ static void process_menus(player_type *player_ptr, WORD wCmd)
                 validate_file(savefile);
                 game_in_progress = TRUE;
                 term_flush();
-                play_game(player_ptr, FALSE);
+                play_game(player_ptr, FALSE, FALSE);
                 quit(NULL);
             }
         }
@@ -2370,8 +2370,8 @@ static void process_menus(player_type *player_ptr, WORD wCmd)
             ofn.Flags = OFN_FILEMUSTEXIST | OFN_NOCHANGEDIR;
 
             if (GetOpenFileName(&ofn)) {
-                prepare_browse_movie_aux(savefile);
-                play_game(player_ptr, FALSE);
+                prepare_browse_movie_without_path_build(savefile);
+                play_game(player_ptr, FALSE, TRUE);
                 quit(NULL);
                 return;
             }

diff --git a/src/main.c b/src/main.c
index d883528..9fd6869 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -345,6 +345,7 @@ int main(int argc, char *argv[])
 #endif /* SET_UID */
 
     /* Process the command line arguments */
+    bool browsing_movie = FALSE;
     for (i = 1; args && (i < argc); i++) {
         /* Require proper options */
         if (argv[i][0] != '-') {
@@ -437,7 +438,8 @@ int main(int argc, char *argv[])
                 break;
             }
 
-            prepare_browse_movie(&argv[i][2]);
+            prepare_browse_movie_with_path_build(&argv[i][2]);
+            browsing_movie = TRUE;
             break;
         }
         case '-': {
@@ -533,7 +535,7 @@ int main(int argc, char *argv[])
     pause_line(23);
 
     /* Play the game */
-    play_game(p_ptr, new_game);
+    play_game(p_ptr, new_game, browsing_movie);
 
     /* Quit */
     quit(NULL);