X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fmain.c;h=d741c807abc3fb75533a18c4ea34255389b42890;hb=57f8ef6e42a487dc2af160c8f28a9caf956b223c;hp=ce7e7a4588e81f551eeaae14c849c83b55d831d3;hpb=3f13248dbcb93b546da2b33c066248f98d410be9;p=hengband%2Fhengband.git

diff --git a/src/main.c b/src/main.c
index ce7e7a458..d741c807a 100644
--- 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
@@ -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,13 +99,6 @@ static void init_stuff(void)
 {
 	char path[1024];
 
-#if defined(AMIGA) || defined(VM)
-
-	/* Hack -- prepare "path" */
-	strcpy(path, "Angband:");
-
-#else /* AMIGA / VM */
-
 	cptr tail;
 
 	/* Get the environment variable */
@@ -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);
 }
@@ -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;
-
 	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 */
@@ -475,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 */
@@ -592,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);
 			}
@@ -712,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'!");