projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20030708-2-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index f4d613400278ae033a15944fac3f8025ef23a0ed..1df43610f1978c38e8e0dc8b6f787c6b60246aa6 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,7
@@
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];
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
+86,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;
@@
-2938,8
+2938,23
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-"
},
{
"-"
},
{
- "internal_default_element",
- "DEFAULT",
+ "[default]",
+ "default",
+ "-"
+ },
+ {
+ "[bd_default]",
+ "bd_default",
+ "-"
+ },
+ {
+ "[sp_default]",
+ "sp_default",
+ "-"
+ },
+ {
+ "[sb_default]",
+ "sb_default",
"-"
},
"-"
},
@@
-2968,6
+2983,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 },
@@
-3097,7
+3113,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();