X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=49478464d427b114e7ebb2fb75218f0814988167;hb=3836649c663e70e503686c52c67f71d21c00bb84;hp=1aac4c96c76a7a6f84b43f17406ec3a2e62d7986;hpb=b2a0ff1ddd4430110b331129469dabb8ea7b6ba7;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 1aac4c96..49478464 100644
--- a/src/main.c
+++ b/src/main.c
@@ -17,6 +17,7 @@
 #include "events.h"
 #include "sound.h"
 #include "joystick.h"
+#include "misc.h"
 
 #ifdef MSDOS
 #include <fcntl.h>
@@ -45,13 +46,17 @@ char	       *joystick_device_name[2] = { DEV_JOYSTICK_0, DEV_JOYSTICK_1 };
 char	       *level_directory = LEVEL_PATH;
 int     	width, height;
 
+char	       *program_name = NULL;
+char	       *display_name = NULL;
 char	       *server_host = NULL;
 int		server_port = 0;
-int		networking = FALSE;
-int		standalone = TRUE;
+int		serveronly = FALSE;
+int		network = FALSE;
+int		verbose = FALSE;
 
 int		game_status = MAINMENU;
 int		game_emulation = EMU_NONE;
+int		network_playing = FALSE;
 int		button_status = MB_NOT_PRESSED, motion_status = FALSE;
 int		key_joystick_mapping = 0;
 int	    	global_joystick_status = JOYSTICK_STATUS;
@@ -102,6 +107,8 @@ int		AllPlayersGone;
 int		FrameCounter, TimeFrames, TimeLeft;
 int		MampferNr, SiebAktiv;
 
+byte		network_player_action[MAX_PLAYERS];
+BOOL		network_player_action_received = FALSE;
 int		TestPlayer = 0;
 
 struct LevelDirInfo	leveldir[MAX_LEVDIR_ENTRIES];
@@ -190,36 +197,17 @@ int background_loop[] =
 };
 int num_bg_loops = sizeof(background_loop)/sizeof(int);
 
-char 		*progname;
-
 int main(int argc, char *argv[])
 {
-  progname = argv[0];
-
-
-
-  /*
-  if (argc>1)
-    level_directory = argv[1];
-    */
-
-
-
-  if (argc > 1)
-    server_host = argv[1];
-
-  if (argc > 2)
-    server_port = atoi(argv[2]);
-
-
+  program_name = (strrchr(argv[0],'/') ? strrchr(argv[0],'/') + 1 : argv[0]);
 
 #ifdef MSDOS
   _fmode = O_BINARY;
 #endif
 
+  GetOptions(argv);
   OpenAll(argc,argv);
   EventLoop();
-  CloseAll();
-
-  exit(0);
+  CloseAllAndExit(0);
+  exit(0);	/* to keep compilers happy */
 }