[Refactor] monster_name() で一部 cmd2.c の投擲対象処理を整理。

[hengband/hengband.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 028506a..5738716 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,4 +1,4 @@
-/* File: main.c */
+/* File: main.c */
 
 /*
  * Copyright (c) 1997 Ben Harrison, and others
@@ -25,7 +25,7 @@
  *
  * Close down, then fall back into "quit()".
  */
-static void quit_hook(cptr s)
+static void quit_hook(concptr s)
 {
        int j;
 
@@ -44,25 +44,9 @@ static void quit_hook(cptr s)
 }
 
 
-
-/*
- * Set the stack size (for the Amiga)
- */
-#ifdef AMIGA
-# include <dos.h>
-__near long __stack = 32768L;
-#endif
-
-
 /*
  * Set the stack size and overlay buffer (see main-286.c")
  */
-#ifdef USE_286
-# include <dos.h>
-extern unsigned _stklen = 32768U;
-extern unsigned _ovrbuffer = 0x1500;
-#endif
-
 #ifdef PRIVATE_USER_PATH
 
 /*
@@ -107,9 +91,6 @@ static void create_user_dir(void)
  * since the "init_file_paths()" function will simply append the
  * relevant "sub-directory names" to the given path.
  *
- * Note that the "path" must be "Angband:" for the Amiga, and it
- * is ignored for "VM/ESA", so I just combined the two.
- *
  * Make sure that the path doesn't overflow the buffer.  We have
  * to leave enough space for the path separator, directory, and
  * filenames.
@@ -118,14 +99,7 @@ static void init_stuff(void)
 {
        char path[1024];
 
-#if defined(AMIGA) || defined(VM)
-
-       /* Hack -- prepare "path" */
-       strcpy(path, "Angband:");
-
-#else /* AMIGA / VM */
-
-       cptr tail;
+       concptr tail;
 
        /* Get the environment variable */
        tail = getenv("ANGBAND_PATH");
@@ -139,8 +113,6 @@ static void init_stuff(void)
        /* Hack -- Add a path separator (only if needed) */
        if (!suffix(path, PATH_SEP)) strcat(path, PATH_SEP);
 
-#endif /* AMIGA / VM */
-
        /* Initialize */
        init_file_paths(path);
 }
@@ -156,9 +128,9 @@ static void init_stuff(void)
  * The "<path>" can be any legal path for the given system, and should
  * not end in any special path separator (i.e. "/tmp" or "~/.ang-info").
  */
-static void change_path(cptr info)
+static void change_path(concptr info)
 {
-       cptr s;
+       concptr s;
 
        /* Find equal sign */
        s = my_strchr(info, '=');
@@ -280,28 +252,14 @@ int main(int argc, char *argv[])
        int i;
 
        bool done = FALSE;
-
        bool new_game = FALSE;
-
        int show_score = 0;
-
-       cptr mstr = NULL;
-
+       concptr mstr = NULL;
        bool args = TRUE;
 
-
        /* Save the "program name" XXX XXX XXX */
        argv0 = argv[0];
 
-#ifdef USE_286
-       /* Attempt to use XMS (or EMS) memory for swap space */
-       if (_OvrInitExt(0L, 0L))
-       {
-               _OvrInitEms(0, 0, 64);
-       }
-#endif
-
-
 #ifdef SET_UID
 
        /* Default permissions on files */
@@ -381,7 +339,7 @@ int main(int argc, char *argv[])
 
        /* Acquire the "user name" as a default player name */
 #ifdef ANGBAND_2_8_1
-       user_name(player_name, player_uid);
+       user_name(p_ptr->name, player_uid);
 #else /* ANGBAND_2_8_1 */
        user_name(op_ptr->full_name, player_uid);
 #endif /* ANGBAND_2_8_1 */
@@ -426,6 +384,13 @@ int main(int argc, char *argv[])
                                break;
                        }
 
+                       case 'B':
+                       case 'b':
+                       {
+                               arg_music = TRUE;
+                               break;
+                       }
+
                        case 'V':
                        case 'v':
                        {
@@ -468,7 +433,7 @@ int main(int argc, char *argv[])
                        {
                                if (!argv[i][2]) goto usage;
 #ifdef ANGBAND_2_8_1
-                               strcpy(player_name, &argv[i][2]);
+                               strcpy(p_ptr->name, &argv[i][2]);
 #else /* ANGBAND_2_8_1 */
 
                                /* Get the savefile name */
@@ -545,6 +510,7 @@ int main(int argc, char *argv[])
                                puts("  -n       Start a new character");
                                puts("  -f       Request fiddle mode");
                                puts("  -w       Request wizard mode");
+                               puts("  -b       Request BGM mode");
                                puts("  -v       Request sound mode");
                                puts("  -g       Request graphics mode");
                                puts("  -o       Request original keyset");
@@ -584,22 +550,6 @@ int main(int argc, char *argv[])
                                puts("  -mibm    To use IBM (BIOS text mode)");
 #endif /* USE_IBM */
 
-#ifdef USE_SLA
-                               puts("  -msla    To use SLA (SLANG)");
-#endif /* USE_SLA */
-
-#ifdef USE_LSL
-                               puts("  -mlsl    To use LSL (Linux-SVGALIB)");
-#endif /* USE_LSL */
-
-#ifdef USE_AMI
-                               puts("  -mami    To use AMI (Amiga)");
-#endif /* USE_AMI */
-
-#ifdef USE_VME
-                               puts("  -mvme    To use VME (VAX/ESA)");
-#endif /* USE_VME */
-
                                /* Actually abort the process */
                                quit(NULL);
                        }
@@ -704,76 +654,6 @@ int main(int argc, char *argv[])
 #endif
 
 
-#ifdef USE_EMX
-       /* Attempt to use the "main-emx.c" support */
-       if (!done && (!mstr || (streq(mstr, "emx"))))
-       {
-               extern errr init_emx(void);
-               if (0 == init_emx())
-               {
-                       ANGBAND_SYS = "emx";
-                       done = TRUE;
-               }
-       }
-#endif
-
-
-#ifdef USE_SLA
-       /* Attempt to use the "main-sla.c" support */
-       if (!done && (!mstr || (streq(mstr, "sla"))))
-       {
-               extern errr init_sla(void);
-               if (0 == init_sla())
-               {
-                       ANGBAND_SYS = "sla";
-                       done = TRUE;
-               }
-       }
-#endif
-
-
-#ifdef USE_LSL
-       /* Attempt to use the "main-lsl.c" support */
-       if (!done && (!mstr || (streq(mstr, "lsl"))))
-       {
-               extern errr init_lsl(void);
-               if (0 == init_lsl())
-               {
-                       ANGBAND_SYS = "lsl";
-                       done = TRUE;
-               }
-       }
-#endif
-
-
-#ifdef USE_AMI
-       /* Attempt to use the "main-ami.c" support */
-       if (!done && (!mstr || (streq(mstr, "ami"))))
-       {
-               extern errr init_ami(void);
-               if (0 == init_ami())
-               {
-                       ANGBAND_SYS = "ami";
-                       done = TRUE;
-               }
-       }
-#endif
-
-
-#ifdef USE_VME
-       /* Attempt to use the "main-vme.c" support */
-       if (!done && (!mstr || (streq(mstr, "vme"))))
-       {
-               extern errr init_vme(void);
-               if (0 == init_vme())
-               {
-                       ANGBAND_SYS = "vme";
-                       done = TRUE;
-               }
-       }
-#endif
-
-
        /* Make sure we have a display! */
        if (!done) quit("Unable to prepare any 'display module'!");