X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fmain.c;h=4b1a8c64ac0da60cc1283569cef6e4662568e15c;hp=2db25f2eecdc237fa2b245c3c762e262836bd6d9;hb=823bddb0d9cc63ddda17a2cd20266aa3b82bde38;hpb=b7d31643c9c84104fb3ebef778e545928610ff65

diff --git a/src/main.c b/src/main.c
index 2db25f2e..4b1a8c64 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,35 +1,40 @@
 /***********************************************************
 *  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                                                  *
 ***********************************************************/
 
 #include "main.h"
 #include "init.h"
+#include "game.h"
 #include "events.h"
 #include "sound.h"
 #include "joystick.h"
 
+#ifdef MSDOS
+#include <fcntl.h>
+#endif
+
 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];
 #endif
 
-Drawable        drawto, drawto_field, backbuffer;
+Drawable        drawto, drawto_field, backbuffer, fieldbuffer;
 Colormap	cmap;
 
 int		sound_pipe[2];
@@ -39,7 +44,9 @@ 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		game_status = MAINMENU;
 int		game_emulation = EMU_NONE;
@@ -54,12 +61,15 @@ int		sound_simple_on = FALSE;
 int		toons_on = TRUE;
 int		direct_draw_on = FALSE;
 int		scroll_delay_on = FALSE;
+int		soft_scrolling_on = TRUE;
 int		fading_on = FALSE;
 int		autorecord_on = FALSE;
 int		joystick_nr = 0;
 int		quick_doors = FALSE;
+int		networking = FALSE;
 
-BOOL		redraw[SCR_FIELDX][SCR_FIELDY];
+BOOL		redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
+int		redraw_x1 = 0, redraw_y1 = 0;
 int		redraw_mask;
 int		redraw_tiles;
 
@@ -70,6 +80,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];
@@ -80,18 +91,22 @@ long		Elementeigenschaften[MAX_ELEMENTS];
 int		level_nr, leveldir_nr, num_leveldirs;
 int		lev_fieldx,lev_fieldy, scroll_x,scroll_y;
 
-int		JX,JY, ZX,ZY, ExitX,ExitY;
-int		PlayerMovDir, PlayerFrame, PlayerPushing;
-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		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		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;
@@ -180,8 +195,26 @@ 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;
+#endif
 
   OpenAll(argc,argv);
   EventLoop();