X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fmain.c;h=d9319c5c35757089f610a256b4550f0d8e99bcf3;hb=983c38dbae8637ef26d8be356e04c9b64bf9fc1f;hp=f0136b3ee02e114bbf0d4b5fa225948740f84612;hpb=c2904baf5b039f6ac7982554fae2c4a9c9c2e5d2;p=rocksndiamonds.git

diff --git a/src/main.c b/src/main.c
index f0136b3e..d9319c5c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -53,7 +53,8 @@ boolean			Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 boolean			Pushed[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 unsigned long		Changed[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 unsigned long		ChangeEvent[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-short			JustStopped[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short			WasJustMoving[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short			WasJustFalling[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 short			AmoebaCnt[MAX_NUM_AMOEBA];
 short			AmoebaCnt2[MAX_NUM_AMOEBA];
@@ -63,9 +64,10 @@ short			ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 unsigned long		Properties[MAX_NUM_ELEMENTS][NUM_EP_BITFIELDS];
 
 int			GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-int			GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int 			GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 int 			GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+int			GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+int 			GfxDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
 
 int			lev_fieldx, lev_fieldy;
 int			scroll_x, scroll_y;
@@ -89,6 +91,7 @@ int			TimeFrames, TimePlayed, TimeLeft;
 
 boolean			network_player_action_received = FALSE;
 
+struct LevelSetInfo	levelset;
 struct LevelInfo	level, level_template;
 struct PlayerInfo	stored_player[MAX_PLAYERS], *local_player = NULL;
 struct HiScore		highscore[MAX_SCORE_ENTRIES];
@@ -100,6 +103,8 @@ struct MenuInfo		menu;
 struct DoorInfo		door_1, door_2;
 struct GraphicInfo     *graphic_info = NULL;
 struct SoundInfo       *sound_info = NULL;
+struct MusicInfo       *music_info = NULL;
+struct MusicFileInfo   *music_file_info = NULL;
 
 
 /* ------------------------------------------------------------------------- */
@@ -3672,38 +3677,45 @@ struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
 
 struct ElementActionInfo element_action_info[NUM_ACTIONS + 1 + 1] =
 {
-  { ".[DEFAULT]",	ACTION_DEFAULT,		TRUE	},
-  { ".waiting",		ACTION_WAITING,		TRUE	},
-  { ".falling",		ACTION_FALLING,		TRUE	},
-  { ".moving",		ACTION_MOVING,		TRUE	},
-  { ".digging",		ACTION_DIGGING,		FALSE	},
-  { ".snapping",	ACTION_SNAPPING,	FALSE	},
-  { ".collecting",	ACTION_COLLECTING,	FALSE	},
-  { ".dropping",	ACTION_DROPPING,	FALSE	},
-  { ".pushing",		ACTION_PUSHING,		FALSE	},
-  { ".walking",		ACTION_WALKING,		FALSE	},
-  { ".passing",		ACTION_PASSING,		FALSE	},
-  { ".impact",		ACTION_IMPACT,		FALSE	},
-  { ".breaking",	ACTION_BREAKING,	FALSE	},
-  { ".activating",	ACTION_ACTIVATING,	FALSE	},
-  { ".deactivating",	ACTION_DEACTIVATING,	FALSE	},
-  { ".opening",		ACTION_OPENING,		FALSE	},
-  { ".closing",		ACTION_CLOSING,		FALSE	},
-  { ".attacking",	ACTION_ATTACKING,	TRUE	},
-  { ".growing",		ACTION_GROWING,		TRUE	},
-  { ".shrinking",	ACTION_SHRINKING,	FALSE	},
-  { ".active",		ACTION_ACTIVE,		TRUE	},
-  { ".filling",		ACTION_FILLING,		FALSE	},
-  { ".emptying",	ACTION_EMPTYING,	FALSE	},
-  { ".changing",	ACTION_CHANGING,	FALSE	},
-  { ".exploding",	ACTION_EXPLODING,	FALSE	},
-  { ".dying",		ACTION_DYING,		FALSE	},
-  { ".other",		ACTION_OTHER,		FALSE	},
+  { ".[DEFAULT]",		ACTION_DEFAULT,			TRUE	},
+  { ".waiting",			ACTION_WAITING,			TRUE	},
+  { ".falling",			ACTION_FALLING,			TRUE	},
+  { ".moving",			ACTION_MOVING,			TRUE	},
+  { ".digging",			ACTION_DIGGING,			FALSE	},
+  { ".snapping",		ACTION_SNAPPING,		FALSE	},
+  { ".collecting",		ACTION_COLLECTING,		FALSE	},
+  { ".dropping",		ACTION_DROPPING,		FALSE	},
+  { ".pushing",			ACTION_PUSHING,			FALSE	},
+  { ".walking",			ACTION_WALKING,			FALSE	},
+  { ".passing",			ACTION_PASSING,			FALSE	},
+  { ".impact",			ACTION_IMPACT,			FALSE	},
+  { ".breaking",		ACTION_BREAKING,		FALSE	},
+  { ".activating",		ACTION_ACTIVATING,		FALSE	},
+  { ".deactivating",		ACTION_DEACTIVATING,		FALSE	},
+  { ".opening",			ACTION_OPENING,			FALSE	},
+  { ".closing",			ACTION_CLOSING,			FALSE	},
+  { ".attacking",		ACTION_ATTACKING,		TRUE	},
+  { ".growing",			ACTION_GROWING,			TRUE	},
+  { ".shrinking",		ACTION_SHRINKING,		FALSE	},
+  { ".active",			ACTION_ACTIVE,			TRUE	},
+  { ".filling",			ACTION_FILLING,			FALSE	},
+  { ".emptying",		ACTION_EMPTYING,		FALSE	},
+  { ".changing",		ACTION_CHANGING,		FALSE	},
+  { ".exploding",		ACTION_EXPLODING,		FALSE	},
+  { ".boring",			ACTION_BORING,			FALSE	},
+  { ".sleeping",		ACTION_SLEEPING,		TRUE	},
+  { ".dying",			ACTION_DYING,			FALSE	},
+  { ".turning",			ACTION_TURNING,			FALSE	},
+  { ".turning_from_left",	ACTION_TURNING_FROM_LEFT,	FALSE	},
+  { ".turning_from_right",	ACTION_TURNING_FROM_RIGHT,	FALSE	},
+  { ".turning_from_up",		ACTION_TURNING_FROM_UP,		FALSE	},
+  { ".turning_from_down",	ACTION_TURNING_FROM_DOWN,	FALSE	},
+  { ".other",			ACTION_OTHER,			FALSE	},
 
   /* empty suffix always matches -- check as last entry in InitSoundInfo() */
-  { "",			ACTION_DEFAULT,		TRUE	},
+  { "",				ACTION_DEFAULT,			TRUE	},
 
-  { NULL,		0,			0	}
+  { NULL,			0,				0	}
 };
 
 struct ElementDirectionInfo element_direction_info[NUM_DIRECTIONS + 1] =
@@ -3716,8 +3728,9 @@ struct ElementDirectionInfo element_direction_info[NUM_DIRECTIONS + 1] =
   { NULL,		0				}
 };
 
-struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1] =
+struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1 + 1] =
 {
+  { ".[DEFAULT]",	GAME_MODE_DEFAULT,		},
   { ".MAIN",		GAME_MODE_MAIN,			},
   { ".LEVELS",		GAME_MODE_LEVELS		},
   { ".SCORES",		GAME_MODE_SCORES,		},
@@ -3729,6 +3742,9 @@ struct SpecialSuffixInfo special_suffix_info[NUM_SPECIAL_GFX_ARGS + 1] =
   { ".PREVIEW",		GAME_MODE_PSEUDO_PREVIEW,	},
   { ".CRUMBLED",	GAME_MODE_PSEUDO_CRUMBLED,	},
 
+  /* empty suffix always matches -- check as last entry in InitMusicInfo() */
+  { "",			GAME_MODE_DEFAULT,		},
+
   { NULL,		0,				}
 };
 
@@ -3813,6 +3829,18 @@ struct FontInfo font_info[NUM_FONTS + 1] =
 };
 
 
+/* ------------------------------------------------------------------------- */
+/* music token prefix definitions                                            */
+/* ------------------------------------------------------------------------- */
+
+struct MusicPrefixInfo music_prefix_info[NUM_MUSIC_PREFIXES + 1] =
+{
+  { "background",		TRUE	},
+
+  { NULL,			0	}
+};
+
+
 /* ========================================================================= */
 /* main()                                                                    */
 /* ========================================================================= */