X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=e18599dfd383ca4f1e93fdaa11a761704b3456fb;hb=0c27626bae90cb1eeea4939de0130a49b9aac507;hp=565394fc72dc071c39105f94bd52c318c146c9d1;hpb=cdf554f6229e6eafe2f19519adfe90c74e3449f2;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index 565394fc..e18599df 100644
--- a/src/main.c
+++ b/src/main.c
@@ -86,24 +86,18 @@ unsigned 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, ScrollStepSize = TILEX/8;
+int		FX = SX, FY = SY, ScrollStepSize;
 int		ScreenMovDir = MV_NO_MOVING, ScreenMovPos = 0;
 int		ScreenGfxPos = 0;
 int		BorderElement = EL_BETON;
 int		GameFrameDelay = GAME_FRAME_DELAY;
 int		FfwdFrameDelay = FFWD_FRAME_DELAY;
-int		MoveSpeed = 8;
 int		BX1 = 0, BY1 = 0, BX2 = SCR_FIELDX-1, BY2 = SCR_FIELDY-1;
 int		SBX_Left, SBX_Right;
 int		SBY_Upper, SBY_Lower;
 int		ZX,ZY, ExitX,ExitY;
 int		AllPlayersGone;
 int		FrameCounter, TimeFrames, TimePlayed, TimeLeft;
-int		MampferMax, MampferNr;
-boolean		SiebAktiv;
-int		SiebCount;
-
-int		game_emulation = EMU_NONE;
 
 boolean		network_player_action_received = FALSE;
 
@@ -117,6 +111,8 @@ struct OptionInfo	options;
 struct SetupInfo	setup;
 struct SetupFileList	*setup_list = NULL;
 struct SetupFileList	*level_setup_list = NULL;
+struct GameInfo		game;
+struct GlobalInfo	global;
 
 /* data needed for playing sounds */
 char *sound_name[NUM_SOUNDS] =
@@ -181,7 +177,8 @@ char *sound_name[NUM_SOUNDS] =
   "boom",
   "booom",
   "exit",
-  "empty"
+  "empty",
+  "gate"
 };
 
 /* background music */
@@ -319,86 +316,86 @@ char *element_info[] =
   "pig",
   "fire breathing dragon",
   "unknown",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
-  "letter",
+  "letter ' '",
+  "letter '!'",
+  "letter '\"'",
+  "letter '#'",
+  "letter '$'",
+  "letter '%'",
+  "letter '&'",
+  "letter '''",
+  "letter '('",
+  "letter ')'",
+  "letter '*'",
+  "letter '+'",
+  "letter ','",
+  "letter '-'",
+  "letter '.'",
+  "letter '/'",
+  "letter '0'",
+  "letter '1'",
+  "letter '2'",
+  "letter '3'",
+  "letter '4'",
+  "letter '5'",
+  "letter '6'",
+  "letter '7'",
+  "letter '8'",
+  "letter '9'",
+  "letter ':'",
+  "letter ';'",
+  "letter '<'",
+  "letter '='",
+  "letter '>'",
+  "letter '?'",
+  "letter '@'",
+  "letter 'A'",
+  "letter 'B'",
+  "letter 'C'",
+  "letter 'D'",
+  "letter 'E'",
+  "letter 'F'",
+  "letter 'G'",
+  "letter 'H'",
+  "letter 'I'",
+  "letter 'J'",
+  "letter 'K'",
+  "letter 'L'",
+  "letter 'M'",
+  "letter 'N'",
+  "letter 'O'",
+  "letter 'P'",
+  "letter 'Q'",
+  "letter 'R'",
+  "letter 'S'",
+  "letter 'T'",
+  "letter 'U'",
+  "letter 'V'",
+  "letter 'W'",
+  "letter 'X'",
+  "letter 'Y'",
+  "letter 'Z'",
+  "letter 'Ä'",
+  "letter 'Ö'",
+  "letter 'Ü'",
+  "letter '^'",
+  "letter ''",
+  "letter ''",
+  "letter ''",
+  "letter ''",
+  "letter ''",
+  "letter ''",
+  "letter ''",
+  "letter ''",
+  "letter ''",
+  "letter ''",
+  "letter ''",
+  "letter ''",
+  "letter ''",
+  "letter ''",
+  "letter ''",
+  "letter ''",
+  "letter ''",
   "growing wall (horizontally)",
   "growing wall (vertically)",
   "growing wall (all directions)",