X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=4d2ca8f0f9a6d1a42e716ab353ec81a516615fbc;hb=2ae6ae8ed951e87fcba7c363705cd6ddea8de91c;hp=94287fa08d729657518c51830e3837d0d2b11073;hpb=adaabca253f2e76597725cdc86fc1fff6f0de1d2;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 94287fa0..4d2ca8f0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,46 +1,30 @@
 /***********************************************************
-*  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
+* Rocks'n'Diamonds -- McDuffin Strikes Back!               *
 *----------------------------------------------------------*
-*  (c) 1995-98 Artsoft Entertainment                       *
-*              Holger Schemel                              *
-*              Oststrasse 11a                              *
-*              33604 Bielefeld                             *
-*              phone: ++49 +521 290471                     *
-*              email: aeglos@valinor.owl.de                *
+* (c) 1995-2000 Artsoft Entertainment                      *
+*               Holger Schemel                             *
+*               Detmolder Strasse 189                      *
+*               33604 Bielefeld                            *
+*               Germany                                    *
+*               e-mail: info@artsoft.org                   *
 *----------------------------------------------------------*
-*  main.c                                                  *
+* main.c                                                   *
 ***********************************************************/
 
+#include "libgame/libgame.h"
+
 #include "main.h"
 #include "init.h"
 #include "game.h"
 #include "events.h"
-#include "sound.h"
 #include "joystick.h"
-#include "misc.h"
-
-#ifdef MSDOS
-#include <fcntl.h>
-#endif
-
-Display        *display;
-Visual	       *visual;
-int		screen;
-Window  	window;
-GC		gc, clip_gc[NUM_PIXMAPS], tile_clip_gc;
-Pixmap		pix[NUM_PIXMAPS];
-Pixmap		clipmask[NUM_PIXMAPS], tile_clipmask[NUM_TILES];
 
-#ifdef USE_XPM_LIBRARY
-XpmAttributes 	xpm_att[NUM_PICTURES];
-#endif
+GC		tile_clip_gc;
+Bitmap	       *pix[NUM_BITMAPS];
+Pixmap		tile_clipmask[NUM_TILES];
+DrawBuffer     *fieldbuffer;
+DrawBuffer     *drawto_field;
 
-Drawable        drawto, drawto_field, backbuffer, fieldbuffer;
-Colormap	cmap;
-
-int		sound_pipe[2];
-int		sound_device;
-char	       *sound_device_name = SOUND_DEVICE;
 int		joystick_device = 0;
 char	       *joystick_device_name[MAX_PLAYERS] =
 {
@@ -50,23 +34,16 @@ char	       *joystick_device_name[MAX_PLAYERS] =
   DEV_JOYSTICK_3
 };
 
-char	       *program_name = NULL;
-
 int		game_status = MAINMENU;
 boolean		level_editor_test_game = FALSE;
 boolean		network_playing = FALSE;
-int		button_status = MB_NOT_PRESSED;
-boolean		motion_status = FALSE;
+
 int		key_joystick_mapping = 0;
 int	    	global_joystick_status = JOYSTICK_STATUS;
 int	    	joystick_status = JOYSTICK_STATUS;
-int	    	sound_status = SOUND_STATUS;
-boolean		sound_loops_allowed = FALSE;
 
 boolean		redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
 int		redraw_x1 = 0, redraw_y1 = 0;
-int		redraw_mask;
-int		redraw_tiles;
 
 short		Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short		Ur[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -98,17 +75,15 @@ int		SBX_Left, SBX_Right;
 int		SBY_Upper, SBY_Lower;
 int		ZX,ZY, ExitX,ExitY;
 int		AllPlayersGone;
-int		FrameCounter, TimeFrames, TimePlayed, TimeLeft;
+
+int		TimeFrames, TimePlayed, TimeLeft;
 
 boolean		network_player_action_received = FALSE;
 
-struct LevelDirInfo    *leveldir_first = NULL, *leveldir_current = NULL;
 struct LevelInfo	level;
 struct PlayerInfo	stored_player[MAX_PLAYERS], *local_player = NULL;
 struct HiScore		highscore[MAX_SCORE_ENTRIES];
-struct SoundInfo	Sound[NUM_SOUNDS];
 struct TapeInfo		tape;
-struct OptionInfo	options;
 struct SetupInfo	setup;
 struct GameInfo		game;
 struct GlobalInfo	global;
@@ -562,17 +537,22 @@ char *element_info[] =
   "-------------------------------",
   */
 };
+int num_element_info = sizeof(element_info)/sizeof(char *);
+
+
+/* ========================================================================= */
+/* main()                                                                    */
+/* ========================================================================= */
 
 int main(int argc, char *argv[])
 {
-  program_name = (strrchr(argv[0],'/') ? strrchr(argv[0],'/') + 1 : argv[0]);
-
-#ifdef MSDOS
-  _fmode = O_BINARY;
-#endif
+  InitCommandName(argv[0]);
+  InitExitFunction(CloseAllAndExit);
+  InitPlatformDependantStuff();
 
   GetOptions(argv);
-  OpenAll(argc,argv);
+  OpenAll();
+
   EventLoop();
   CloseAllAndExit(0);
   exit(0);	/* to keep compilers happy */