X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.c;h=1aac4c96c76a7a6f84b43f17406ec3a2e62d7986;hp=302b5418e8d7e87878eb8c1948dd8e9de23d5742;hb=b2a0ff1ddd4430110b331129469dabb8ea7b6ba7;hpb=4b0c6356359ee52f98cee8fa578179c6c41d4ef1

diff --git a/src/main.c b/src/main.c
index 302b5418..1aac4c96 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,13 +1,12 @@
 /***********************************************************
 *  Rocks'n'Diamonds -- McDuffin Strikes Back!              *
 *----------------------------------------------------------*
-*  ©1995 Artsoft Development                               *
-*        Holger Schemel                                    *
-*        33659 Bielefeld-Senne                             *
-*        Telefon: (0521) 493245                            *
-*        eMail: aeglos@valinor.owl.de                      *
-*               aeglos@uni-paderborn.de                    *
-*               q99492@pbhrzx.uni-paderborn.de             *
+*  (c) 1995-98 Artsoft Entertainment                       *
+*              Holger Schemel                              *
+*              Oststrasse 11a                              *
+*              33604 Bielefeld                             *
+*              phone: ++49 +521 290471                     *
+*              email: aeglos@valinor.owl.de                *
 *----------------------------------------------------------*
 *  main.c                                                  *
 ***********************************************************/
@@ -27,9 +26,9 @@ Display        *display;
 Visual	       *visual;
 int		screen;
 Window  	window;
-GC		gc, clip_gc[NUM_PIXMAPS];
+GC		gc, clip_gc[NUM_PIXMAPS], tile_clip_gc;
 Pixmap		pix[NUM_PIXMAPS];
-Pixmap		clipmask[NUM_PIXMAPS];
+Pixmap		clipmask[NUM_PIXMAPS], tile_clipmask[NUM_TILES];
 
 #ifdef XPM_INCLUDE_FILE
 XpmAttributes 	xpm_att[NUM_PICTURES];
@@ -45,7 +44,11 @@ int		joystick_device = 0;
 char	       *joystick_device_name[2] = { DEV_JOYSTICK_0, DEV_JOYSTICK_1 };
 char	       *level_directory = LEVEL_PATH;
 int     	width, height;
-unsigned long	pen_fg, pen_bg;
+
+char	       *server_host = NULL;
+int		server_port = 0;
+int		networking = FALSE;
+int		standalone = TRUE;
 
 int		game_status = MAINMENU;
 int		game_emulation = EMU_NONE;
@@ -78,6 +81,7 @@ int		MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int		MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int		Store[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int		Store2[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+int		StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int		Frame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int		Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int		JustHit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -88,22 +92,22 @@ long		Elementeigenschaften[MAX_ELEMENTS];
 int		level_nr, leveldir_nr, num_leveldirs;
 int		lev_fieldx,lev_fieldy, scroll_x,scroll_y;
 
-int		FX = SX, FY = SY, ScreenMovPos = 0, ScrollStepSize = TILEX/8;
-int		GameSpeed = GAME_FRAME_DELAY, MoveSpeed = 8;
+int		FX = SX, FY = SY, ScrollStepSize = TILEX/8;
+int		ScreenMovDir = MV_NO_MOVING, ScreenMovPos = 0;
+int		ScreenGfxPos = 0;
+int		GameFrameDelay = GAME_FRAME_DELAY, MoveSpeed = 8;
 int		BX1 = 0, BY1 = 0, BX2 = SCR_FIELDX-1, BY2 = SCR_FIELDY-1;
-int		JX,JY, lastJX,lastJY, ZX,ZY, ExitX,ExitY;
-int		PlayerMovDir, PlayerMovPos, PlayerPushing;
-int		PlayerFrame, PlayerGfxPos;
-int		PlayerGone, LevelSolved, GameOver;
-int		FrameCounter, TimeFrames, TimeLeft, Score;
-int		Gems, SokobanFields, Lights, Friends;
-int		Dynamite, Key[4], MampferNr;
-int		DynaBombCount, DynaBombSize, DynaBombsLeft, DynaBombXL;
-int		SiebAktiv;
+int		ZX,ZY, ExitX,ExitY;
+int		AllPlayersGone;
+int		FrameCounter, TimeFrames, TimeLeft;
+int		MampferNr, SiebAktiv;
+
+int		TestPlayer = 0;
 
 struct LevelDirInfo	leveldir[MAX_LEVDIR_ENTRIES];
 struct LevelInfo	level;
-struct PlayerInfo	player;
+struct PlayerInfo	stored_player[MAX_PLAYERS+1];
+struct PlayerInfo      *local_player;
 struct HiScore		highscore[MAX_SCORE_ENTRIES];
 struct SoundInfo	Sound[NUM_SOUNDS];
 struct RecordingInfo	tape;
@@ -192,8 +196,22 @@ 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]);
+
+
 
 #ifdef MSDOS
   _fmode = O_BINARY;