X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.h;h=0d427559c812d71a0b821b87c7d2bdeb2dfd5324;hb=a4d4e8e444b21b58dcc88b52ff22726c545142a4;hp=ae4d28074a51e43e36144c03122e5d48c9f97aa0;hpb=5e8d9d0308f76bb35e7578a8859d6f01977d0f69;p=rocksndiamonds.git

diff --git a/src/main.h b/src/main.h
index ae4d2807..0d427559 100644
--- a/src/main.h
+++ b/src/main.h
@@ -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.h                                                  *
 ***********************************************************/
@@ -15,6 +14,13 @@
 #ifndef MAIN_H
 #define MAIN_H
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
 #ifndef MSDOS
 #define XK_MISCELLANY
 #define XK_LATIN1
@@ -33,14 +39,8 @@
 #include "msdos.h"
 #endif  /* #ifndef MSDOS */
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-
-typedef int BOOL;
+typedef unsigned char boolean;
+typedef unsigned char byte;
 
 #ifndef FALSE
 #define FALSE 0
@@ -82,10 +82,11 @@ typedef int BOOL;
 #ifndef SIGN
 #define SIGN(a)		((a) < 0 ? -1 : ((a)>0 ? 1 : 0))
 #endif
-#define SCROLLX(a)	((a) - scroll_x)
-#define SCROLLY(a)	((a) - scroll_y)
-#define UNSCROLLX(a)	((a) + scroll_x)
-#define UNSCROLLY(a)	((a) + scroll_y)
+#define SCREENX(a)	((a) - scroll_x)
+#define SCREENY(a)	((a) - scroll_y)
+#define LEVELX(a)	((a) + scroll_x)
+#define LEVELY(a)	((a) + scroll_y)
+#define IN_VIS_FIELD(x,y) ((x)>=0 && (x)<SCR_FIELDX && (y)>=0 &&(y)<SCR_FIELDY)
 #define IN_SCR_FIELD(x,y) ((x)>=BX1 && (x)<=BX2 && (y)>=BY1 &&(y)<=BY2)
 #define IN_LEV_FIELD(x,y) ((x)>=0 && (x)<lev_fieldx && (y)>=0 &&(y)<lev_fieldy)
 
@@ -143,12 +144,7 @@ typedef int BOOL;
 #define IS_PUSHABLE(e)		(Elementeigenschaften[e] & EP_BIT_PUSHABLE)
 #define ELEM_IS_PLAYER(e)	(Elementeigenschaften[e] & EP_BIT_PLAYER)
 
-/*
-#define IS_PLAYER(x,y)		(JX == (x) && JY == (y))
-*/
-
 #define IS_PLAYER(x,y)		(ELEM_IS_PLAYER(StorePlayer[x][y]))
-#define IS_LOCAL_PLAYER(x,y)	(StorePlayer[x][y] == EL_SPIELER1)
 
 #define IS_FREE(x,y)		(Feld[x][y] == EL_LEERRAUM && !IS_PLAYER(x,y))
 #define IS_FREE_OR_PLAYER(x,y)	(Feld[x][y] == EL_LEERRAUM)
@@ -170,6 +166,8 @@ typedef int BOOL;
 #define TAPE_IS_EMPTY(x)	((x).length == 0)
 #define TAPE_IS_STOPPED(x)	(!(x).recording && !(x).playing &&!(x).pausing)
 
+#define PLAYERINFO(x,y)		(&stored_player[StorePlayer[x][y]-EL_SPIELER1])
+
 /* Pixmaps with Xpm or X11 Bitmap files */
 #define PIX_BACK		0
 #define PIX_DOOR		1
@@ -198,7 +196,8 @@ typedef int BOOL;
 #define MAX_LEVDIR_ENTRIES	15
 #define MAX_SCORE_ENTRIES	15
 
-#define MAX_FILENAME		256
+#define MAX_OPTION_LEN		256
+#define MAX_FILENAME_LEN	256
 #define MAX_NUM_AMOEBA		100
 #define MAX_ELEMENTS		512
 
@@ -208,9 +207,59 @@ struct HiScore
   int Score;
 };
 
+struct OptionInfo
+{
+  char *display_name;
+  char *server_host;
+  int server_port;
+  boolean serveronly;
+  boolean network;
+  boolean verbose;
+};
+
+struct SetupKeyboardInfo
+{
+  KeySym left;
+  KeySym right;
+  KeySym up;
+  KeySym down;
+  KeySym snap;
+  KeySym bomb;
+};
+
+struct SetupJoystickInfo
+{
+  boolean use_joystick;
+  int joystick_nr;
+  int button_snap;
+  int button_bomb;
+};
+
+struct SetupInfo
+{
+  boolean sound_on;
+  boolean sound_loops_on;
+  boolean sound_music_on;
+  boolean sound_simple_on;
+  boolean toons_on;
+  boolean direct_draw_on;
+  boolean scroll_delay_on;
+  boolean soft_scrolling_on;
+  boolean fading_on;
+  boolean autorecord_on;
+  boolean quick_doors;
+  struct SetupKeyboardInfo key_input[MAX_PLAYERS];
+  struct SetupJoystickInfo joy_input[MAX_PLAYERS];
+};
+
 struct PlayerInfo
 {
-  int nr, active, local;
+  boolean present;		/* player present in level playfield */
+  boolean connected;		/* player connected locally or via network */
+  boolean local;		/* player connected locally */
+  boolean active;		/* player (present && connected) */
+
+  int index_nr, client_nr, element_nr;
 
   char login_name[MAX_NAMELEN];
   char alias_name[MAX_NAMELEN];
@@ -219,13 +268,13 @@ struct PlayerInfo
   int leveldir_nr;
   int level_nr;
 
-  int JX,JY, lastJX,lastJY, ZX,ZY, ExitX,ExitY;
-  int MovDir, MovPos, Pushing;
-  int Frame, GfxPos;
-
-  int PlayerGone, LevelSolved, GameOver;
+  int jx,jy, last_jx,last_jy;
+  int MovDir, MovPos, GfxPos;
+  int Frame;
 
-  int frame_reset_delay;
+  boolean Pushing;
+  boolean gone, LevelSolved, GameOver;
+  boolean snapped;
 
   long move_delay;
   int last_move_dir;
@@ -233,6 +282,10 @@ struct PlayerInfo
   long push_delay;
   int push_delay_value;
 
+  int frame_reset_delay;
+
+  long actual_frame_counter;
+
   int score;
   int gems_still_needed;
   int sokobanfields_still_needed;
@@ -269,20 +322,20 @@ struct LevelDirInfo
 struct RecordingInfo
 {
   int level_nr;
-  unsigned int random_seed;
+  unsigned long random_seed;
   unsigned long date;
   unsigned long counter;
   unsigned long length;
   unsigned long length_seconds;
   unsigned int delay_played;
-  BOOL pause_before_death;
-  BOOL recording, playing, pausing;
-  BOOL fast_forward;
-  BOOL changed;
+  boolean pause_before_death;
+  boolean recording, playing, pausing;
+  boolean fast_forward;
+  boolean changed;
   struct
   {
-    unsigned char joystickdata;
-    unsigned char delay;
+    byte action[MAX_PLAYERS];
+    byte delay;
   } pos[MAX_TAPELEN];
 };
 
@@ -315,70 +368,70 @@ extern char	       *joystick_device_name[2];
 extern char	       *level_directory;
 extern int     		width, height;
 
+extern char	       *program_name;
+
 extern int		game_status;
 extern int		game_emulation;
-extern int		button_status, motion_status;
+extern boolean		network_playing;
+extern int		button_status;
+extern boolean		motion_status;
 extern int		key_joystick_mapping;
 extern int	    	global_joystick_status, joystick_status;
-extern int		sound_status, sound_on;
-extern int		sound_loops_allowed, sound_loops_on;
-extern int		sound_music_on;
-extern int		sound_simple_on;
-extern int		toons_on;
-extern int		direct_draw_on;
-extern int		scroll_delay_on;
-extern int		soft_scrolling_on;
-extern int		fading_on;
-extern int		autorecord_on;
-extern int		joystick_nr;
-extern int		quick_doors;
-
-extern BOOL		redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
+extern int		sound_status;
+extern boolean		sound_loops_allowed;
+
+extern boolean		redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
 extern int		redraw_x1, redraw_y1;
 extern int		redraw_mask;
 extern int		redraw_tiles;
 
-extern int		Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		Ur[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		Store[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		Store2[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		Frame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		JustHit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-extern int		AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
-extern long		Elementeigenschaften[MAX_ELEMENTS];
+extern short		Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		Ur[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		Store[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		Store2[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		Frame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern boolean		Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		JustHit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern short		AmoebaCnt[MAX_NUM_AMOEBA], AmoebaCnt2[MAX_NUM_AMOEBA];
+extern unsigned long	Elementeigenschaften[MAX_ELEMENTS];
 
 extern int		level_nr, leveldir_nr, num_leveldirs;
 extern int		lev_fieldx,lev_fieldy, scroll_x,scroll_y;
 
-extern int		FX,FY, ScreenMovPos, ScrollStepSize;
-extern int		GameFrameDelay, MoveSpeed;
+extern int		FX,FY, ScrollStepSize;
+extern int		ScreenMovDir, ScreenMovPos, ScreenGfxPos;
+extern int		GameFrameDelay;
+extern int		FfwdFrameDelay;
+extern int		MoveSpeed;
 extern int		BX1,BY1, BX2,BY2;
-extern int		JX,JY, lastJX,lastJY, ZX,ZY, ExitX,ExitY;
-extern int		PlayerGone,LevelSolved,GameOver;
-extern int		FrameCounter,TimeFrames,TimeLeft;
+extern int		ZX,ZY, ExitX,ExitY;
+extern int		AllPlayersGone;
+extern int		FrameCounter, TimeFrames, TimeLeft;
 extern int		MampferNr, SiebAktiv;
 
+extern byte		network_player_action[];
+extern boolean		network_player_action_received;
+extern int		TestPlayer;
+
 extern struct LevelDirInfo	leveldir[];
 extern struct LevelInfo		level;
-extern struct PlayerInfo	stored_player[];
-extern struct PlayerInfo       *local_player, *player;
+extern struct PlayerInfo	stored_player[], *local_player;
 extern struct HiScore		highscore[];
 extern struct RecordingInfo	tape;
 extern struct SoundInfo		Sound[];
 extern struct JoystickInfo	joystick[];
+extern struct OptionInfo	options;
+extern struct SetupInfo		setup;
 
 extern char		*sound_name[];
 extern int		background_loop[];
 extern int		num_bg_loops;
 
-extern char		*progname;
-
 
 /* often used screen positions */
 #define SX			8
@@ -600,7 +653,11 @@ extern char		*progname;
 #define EL_CHAR_COPY		(EL_CHAR_ASCII0+94)
 #define EL_CHAR_END		(EL_CHAR_START+79)
 
-#define EL_UNUSED_200		200
+#define EL_MAUER_X		200
+#define EL_MAUER_Y		201
+#define EL_MAUER_XY		202
+
+#define EL_UNUSED_200		203
 /* ... */
 #define EL_UNUSED_255		255
 
@@ -740,15 +797,20 @@ extern char		*progname;
 #define GFX_MAULWURF		145
 #define GFX_SCHWEIN		146
 #define GFX_DRACHE		147
+#define GFX_MAUER_XY		148
+#define GFX_MAUER_X		149
+#define GFX_MAUER_Y		150
 #define GFX_EDELSTEIN_ROT	152
 #define GFX_EDELSTEIN_LILA	154
 #define GFX_DYNABOMB_XL		156
 #define GFX_SONDE		159
 /* Zeile 10 (160) */
 #define GFX_EDELSTEIN_BD	163
-#define GFX_MAUER_R1		165
+#define GFX_MAUER_RIGHT		165
+#define GFX_MAUER_R1		GFX_MAUER_RIGHT
 #define GFX_MAUER_R		167
-#define GFX_MAUER_L1		168
+#define GFX_MAUER_LEFT		168
+#define GFX_MAUER_L1		GFX_MAUER_LEFT
 #define GFX_MAUER_L		170
 #define GFX_MAUER_LEBT		171
 #define GFX_SIEB2_LEER		172
@@ -778,23 +840,40 @@ extern char		*progname;
 #define GFX_FIREFLY_L		206
 #define GFX_FIREFLY_U		207
 
-/* CHANGE THIS!!!! (NO REGULAR POSITIONS...) */
-#define GFX_MASK_SPARKLING	210
-/* CHANGE THIS!!!! (NO REGULAR POSITIONS...) */
-
 #define GFX_SCHLUESSEL		GFX_SCHLUESSEL1
 #define GFX_SPIELFIGUR		GFX_SPIELER1
 
 
 /* graphics from "RocksHeroes" */
 
-#define GFX_SPIELER_DOWN	(GFX_START_ROCKSHEROES + 0*HEROES_PER_LINE + 0)
-#define GFX_SPIELER_UP		(GFX_START_ROCKSHEROES + 0*HEROES_PER_LINE + 4)
-#define GFX_SPIELER_LEFT	(GFX_START_ROCKSHEROES + 1*HEROES_PER_LINE + 0)
-#define GFX_SPIELER_RIGHT	(GFX_START_ROCKSHEROES + 1*HEROES_PER_LINE + 4)
-#define GFX_SPIELER_PUSH_RIGHT	(GFX_START_ROCKSHEROES + 2*HEROES_PER_LINE + 0)
-#define GFX_SPIELER_PUSH_LEFT	(GFX_START_ROCKSHEROES + 2*HEROES_PER_LINE + 4)
-#define GFX_SONDE_START		(GFX_START_ROCKSHEROES + 7*HEROES_PER_LINE + 0)
+#define GFX_SPIELER1_DOWN	(GFX_START_ROCKSHEROES + 0*HEROES_PER_LINE + 0)
+#define GFX_SPIELER1_UP		(GFX_START_ROCKSHEROES + 0*HEROES_PER_LINE + 4)
+#define GFX_SPIELER1_LEFT	(GFX_START_ROCKSHEROES + 1*HEROES_PER_LINE + 0)
+#define GFX_SPIELER1_RIGHT	(GFX_START_ROCKSHEROES + 1*HEROES_PER_LINE + 4)
+#define GFX_SPIELER1_PUSH_RIGHT	(GFX_START_ROCKSHEROES + 2*HEROES_PER_LINE + 0)
+#define GFX_SPIELER1_PUSH_LEFT	(GFX_START_ROCKSHEROES + 2*HEROES_PER_LINE + 4)
+#define GFX_SPIELER2_DOWN	(GFX_START_ROCKSHEROES + 3*HEROES_PER_LINE + 0)
+#define GFX_SPIELER2_UP		(GFX_START_ROCKSHEROES + 3*HEROES_PER_LINE + 4)
+#define GFX_SPIELER2_LEFT	(GFX_START_ROCKSHEROES + 4*HEROES_PER_LINE + 0)
+#define GFX_SPIELER2_RIGHT	(GFX_START_ROCKSHEROES + 4*HEROES_PER_LINE + 4)
+#define GFX_SPIELER2_PUSH_RIGHT	(GFX_START_ROCKSHEROES + 5*HEROES_PER_LINE + 0)
+#define GFX_SPIELER2_PUSH_LEFT	(GFX_START_ROCKSHEROES + 5*HEROES_PER_LINE + 4)
+#define GFX_SPIELER3_DOWN	(GFX_START_ROCKSHEROES + 6*HEROES_PER_LINE + 0)
+#define GFX_SPIELER3_UP		(GFX_START_ROCKSHEROES + 6*HEROES_PER_LINE + 4)
+#define GFX_SPIELER3_LEFT	(GFX_START_ROCKSHEROES + 7*HEROES_PER_LINE + 0)
+#define GFX_SPIELER3_RIGHT	(GFX_START_ROCKSHEROES + 7*HEROES_PER_LINE + 4)
+#define GFX_SPIELER3_PUSH_RIGHT	(GFX_START_ROCKSHEROES + 8*HEROES_PER_LINE + 0)
+#define GFX_SPIELER3_PUSH_LEFT	(GFX_START_ROCKSHEROES + 8*HEROES_PER_LINE + 4)
+#define GFX_SPIELER4_DOWN	(GFX_START_ROCKSHEROES + 9*HEROES_PER_LINE + 0)
+#define GFX_SPIELER4_UP		(GFX_START_ROCKSHEROES + 9*HEROES_PER_LINE + 4)
+#define GFX_SPIELER4_LEFT	(GFX_START_ROCKSHEROES +10*HEROES_PER_LINE + 0)
+#define GFX_SPIELER4_RIGHT	(GFX_START_ROCKSHEROES +10*HEROES_PER_LINE + 4)
+#define GFX_SPIELER4_PUSH_RIGHT	(GFX_START_ROCKSHEROES +11*HEROES_PER_LINE + 0)
+#define GFX_SPIELER4_PUSH_LEFT	(GFX_START_ROCKSHEROES +11*HEROES_PER_LINE + 4)
+#define GFX_MAUER_DOWN		(GFX_START_ROCKSHEROES +12*HEROES_PER_LINE + 0)
+#define GFX_MAUER_UP		(GFX_START_ROCKSHEROES +12*HEROES_PER_LINE + 3)
+
+#define GFX_SONDE_START		(GFX_START_ROCKSHEROES + 9*HEROES_PER_LINE + 8)
 #define GFX_SCHWEIN_DOWN	(GFX_START_ROCKSHEROES + 0*HEROES_PER_LINE + 8)
 #define GFX_SCHWEIN_UP		(GFX_START_ROCKSHEROES + 0*HEROES_PER_LINE +12)
 #define GFX_SCHWEIN_LEFT	(GFX_START_ROCKSHEROES + 1*HEROES_PER_LINE + 8)
@@ -807,16 +886,18 @@ extern char		*progname;
 #define GFX_MAULWURF_UP		(GFX_START_ROCKSHEROES + 4*HEROES_PER_LINE +12)
 #define GFX_MAULWURF_LEFT	(GFX_START_ROCKSHEROES + 5*HEROES_PER_LINE + 8)
 #define GFX_MAULWURF_RIGHT	(GFX_START_ROCKSHEROES + 5*HEROES_PER_LINE +12)
-#define GFX_PINGUIN_DOWN	(GFX_START_ROCKSHEROES + 7*HEROES_PER_LINE + 8)
-#define GFX_PINGUIN_UP		(GFX_START_ROCKSHEROES + 7*HEROES_PER_LINE +12)
-#define GFX_PINGUIN_LEFT	(GFX_START_ROCKSHEROES + 8*HEROES_PER_LINE + 8)
-#define GFX_PINGUIN_RIGHT	(GFX_START_ROCKSHEROES + 8*HEROES_PER_LINE +12)
-#define GFX_BLURB_LEFT		(GFX_START_ROCKSHEROES + 9*HEROES_PER_LINE + 8)
-#define GFX_BLURB_RIGHT		(GFX_START_ROCKSHEROES + 9*HEROES_PER_LINE +12)
-#define GFX_FLAMMEN_LEFT	(GFX_START_ROCKSHEROES + 8*HEROES_PER_LINE + 0)
-#define GFX_FLAMMEN_RIGHT	(GFX_START_ROCKSHEROES + 9*HEROES_PER_LINE + 0)
-#define GFX_FLAMMEN_UP		(GFX_START_ROCKSHEROES +10*HEROES_PER_LINE + 0)
-#define GFX_FLAMMEN_DOWN	(GFX_START_ROCKSHEROES +11*HEROES_PER_LINE + 0)
+#define GFX_PINGUIN_DOWN	(GFX_START_ROCKSHEROES + 6*HEROES_PER_LINE + 8)
+#define GFX_PINGUIN_UP		(GFX_START_ROCKSHEROES + 6*HEROES_PER_LINE +12)
+#define GFX_PINGUIN_LEFT	(GFX_START_ROCKSHEROES + 7*HEROES_PER_LINE + 8)
+#define GFX_PINGUIN_RIGHT	(GFX_START_ROCKSHEROES + 7*HEROES_PER_LINE +12)
+#define GFX_BLURB_LEFT		(GFX_START_ROCKSHEROES +10*HEROES_PER_LINE + 8)
+#define GFX_BLURB_RIGHT		(GFX_START_ROCKSHEROES +10*HEROES_PER_LINE +12)
+#define GFX_FUNKELN_BLAU	(GFX_START_ROCKSHEROES +11*HEROES_PER_LINE + 8)
+#define GFX_FUNKELN_WEISS	(GFX_START_ROCKSHEROES +11*HEROES_PER_LINE +12)
+#define GFX_FLAMMEN_LEFT	(GFX_START_ROCKSHEROES +12*HEROES_PER_LINE + 8)
+#define GFX_FLAMMEN_RIGHT	(GFX_START_ROCKSHEROES +13*HEROES_PER_LINE + 8)
+#define GFX_FLAMMEN_UP		(GFX_START_ROCKSHEROES +14*HEROES_PER_LINE + 8)
+#define GFX_FLAMMEN_DOWN	(GFX_START_ROCKSHEROES +15*HEROES_PER_LINE + 8)
 
 /* graphics from "RocksFont" */
 #define GFX_CHAR_START		(GFX_START_ROCKSFONT)
@@ -926,13 +1007,20 @@ extern char		*progname;
 				 (s)==SND_TYGER || (s)==SND_VOYAGER || \
 				 (s)==SND_TWILIGHT)
 
+/* default input keys */
+#define DEFAULT_KEY_LEFT	XK_Left
+#define DEFAULT_KEY_RIGHT	XK_Right
+#define DEFAULT_KEY_UP		XK_Up
+#define DEFAULT_KEY_DOWN	XK_Down
+#define DEFAULT_KEY_SNAP	XK_Shift_L
+#define DEFAULT_KEY_BOMB	XK_Shift_R
 
 /* directions for moving */
 #define MV_NO_MOVING		0
-#define MV_LEFT			1
-#define MV_RIGHT		2
-#define MV_UP			4
-#define MV_DOWN	       		8
+#define MV_LEFT			(1<<0)
+#define MV_RIGHT		(1<<1)
+#define MV_UP			(1<<2)
+#define MV_DOWN	       		(1<<3)
 
 /* font types */
 #define FS_SMALL		0
@@ -954,7 +1042,8 @@ extern char		*progname;
 #define TYPENAME		5
 #define HALLOFFAME		6
 #define SETUP			7
-#define EXITGAME		8
+#define SETUPINPUT		8
+#define EXITGAME		9
 
 /* values for game_emulation */
 #define EMU_NONE		0
@@ -1011,12 +1100,13 @@ extern char		*progname;
 
 /* old cookies */
 #define NAMES_COOKIE_10		"ROCKSNDIAMONDS_NAMES_FILE_VERSION_1.0"
+#define LEVELREC_COOKIE_10	"ROCKSNDIAMONDS_LEVELREC_FILE_VERSION_1.0"
 
 #define LEVEL_COOKIE		"ROCKSNDIAMONDS_LEVEL_FILE_VERSION_1.0"
 #define SCORE_COOKIE		"ROCKSNDIAMONDS_SCORE_FILE_VERSION_1.0"
 #define NAMES_COOKIE		"ROCKSNDIAMONDS_NAMES_FILE_VERSION_1.1"
 #define LEVELDIR_COOKIE		"ROCKSNDIAMONDS_LEVELDIR_FILE_VERSION_1.0"
-#define LEVELREC_COOKIE		"ROCKSNDIAMONDS_LEVELREC_FILE_VERSION_1.0"
+#define LEVELREC_COOKIE		"ROCKSNDIAMONDS_LEVELREC_FILE_VERSION_1.2"
 #define JOYSTICK_COOKIE		"ROCKSNDIAMONDS_JOYSTICK_FILE_VERSION_1.0"
 #define LEVEL_COOKIE_LEN	(strlen(LEVEL_COOKIE)+1)
 #define SCORE_COOKIE_LEN	(strlen(SCORE_COOKIE)+1)