projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030729-1-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index c721a4cd734808cc3cdf4b6fbb8f1a8269fc26a8..beec6a9b79c50816cb6320405eaea80cde5f3627 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-40,7
+40,6
@@
boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
int redraw_x1 = 0, redraw_y1 = 0;
short Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int redraw_x1 = 0, redraw_y1 = 0;
short Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-short Ur[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovDir[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short MovDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@
-50,6
+49,8
@@
short Store2[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short Back[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
boolean Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short StorePlayer[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short Back[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
boolean Stop[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+boolean Pushed[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+boolean Changing[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short JustStopped[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaCnt[MAX_NUM_AMOEBA];
short JustStopped[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaCnt[MAX_NUM_AMOEBA];
@@
-86,7
+87,7
@@
int TimeFrames, TimePlayed, TimeLeft;
boolean network_player_action_received = FALSE;
boolean network_player_action_received = FALSE;
-struct LevelInfo level;
+struct LevelInfo level
, level_template
;
struct PlayerInfo stored_player[MAX_PLAYERS], *local_player = NULL;
struct HiScore highscore[MAX_SCORE_ENTRIES];
struct TapeInfo tape;
struct PlayerInfo stored_player[MAX_PLAYERS], *local_player = NULL;
struct HiScore highscore[MAX_SCORE_ENTRIES];
struct TapeInfo tape;
@@
-2922,11
+2923,36
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-",
"-"
},
"-",
"-"
},
+ {
+ "dynabomb",
+ "-",
+ "-"
+ },
{
"dynabomb_active",
"-",
"-"
},
{
"dynabomb_active",
"-",
"-"
},
+ {
+ "dynabomb_player_1",
+ "-",
+ "-"
+ },
+ {
+ "dynabomb_player_2",
+ "-",
+ "-"
+ },
+ {
+ "dynabomb_player_3",
+ "-",
+ "-"
+ },
+ {
+ "dynabomb_player_4",
+ "-",
+ "-"
+ },
{
"shield_normal_active",
"-",
{
"shield_normal_active",
"-",
@@
-2972,7
+2998,7
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
/* element action and direction definitions */
/* ------------------------------------------------------------------------- */
/* element action and direction definitions */
/* ------------------------------------------------------------------------- */
-struct ElementActionInfo element_action_info[NUM_ACTIONS + 1] =
+struct ElementActionInfo element_action_info[NUM_ACTIONS + 1
+ 1
] =
{
{ ".[DEFAULT]", ACTION_DEFAULT, TRUE },
{ ".waiting", ACTION_WAITING, TRUE },
{
{ ".[DEFAULT]", ACTION_DEFAULT, TRUE },
{ ".waiting", ACTION_WAITING, TRUE },
@@
-2983,6
+3009,7
@@
struct ElementActionInfo element_action_info[NUM_ACTIONS + 1] =
{ ".collecting", ACTION_COLLECTING, FALSE },
{ ".dropping", ACTION_DROPPING, FALSE },
{ ".pushing", ACTION_PUSHING, 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 },
{ ".passing", ACTION_PASSING, FALSE },
{ ".impact", ACTION_IMPACT, FALSE },
{ ".breaking", ACTION_BREAKING, FALSE },
@@
-3001,6
+3028,9
@@
struct ElementActionInfo element_action_info[NUM_ACTIONS + 1] =
{ ".dying", ACTION_DYING, FALSE },
{ ".other", ACTION_OTHER, FALSE },
{ ".dying", ACTION_DYING, FALSE },
{ ".other", ACTION_OTHER, FALSE },
+ /* empty suffix always matches -- check as last entry in InitSoundInfo() */
+ { "", ACTION_DEFAULT, TRUE },
+
{ NULL, 0, 0 }
};
{ NULL, 0, 0 }
};
@@
-3047,6
+3077,8
@@
struct TokenIntPtrInfo image_config_vars[] =
{ "menu.draw_xoffset.SETUP", &menu.draw_xoffset[GFX_SPECIAL_ARG_SETUP] },
{ "menu.draw_yoffset.SETUP", &menu.draw_yoffset[GFX_SPECIAL_ARG_SETUP] },
{ "menu.draw_xoffset.SETUP", &menu.draw_xoffset[GFX_SPECIAL_ARG_SETUP] },
{ "menu.draw_yoffset.SETUP", &menu.draw_yoffset[GFX_SPECIAL_ARG_SETUP] },
+ { "menu.scrollbar_xoffset", &menu.scrollbar_xoffset },
+
{ "menu.list_size", &menu.list_size_default },
{ "menu.list_size.LEVELS", &menu.list_size[GFX_SPECIAL_ARG_LEVELS] },
{ "menu.list_size.SCORES", &menu.list_size[GFX_SPECIAL_ARG_SCORES] },
{ "menu.list_size", &menu.list_size_default },
{ "menu.list_size.LEVELS", &menu.list_size[GFX_SPECIAL_ARG_LEVELS] },
{ "menu.list_size.SCORES", &menu.list_size[GFX_SPECIAL_ARG_SCORES] },
@@
-3112,7
+3144,7
@@
int main(int argc, char *argv[])
COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
InitExitFunction(CloseAllAndExit);
COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL);
InitExitFunction(CloseAllAndExit);
- InitPlatformDepend
a
ntStuff();
+ InitPlatformDepend
e
ntStuff();
GetOptions(argv);
OpenAll();
GetOptions(argv);
OpenAll();