projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20040503-1-src
[rocksndiamonds.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 990a7b7155309394d72ca70cb3f2edfff51109e1..e2182ecd2c22a400d8c397228895ea9be00ffd1d 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-34,6
+34,11
@@
int game_status = -1;
boolean level_editor_test_game = FALSE;
boolean network_playing = FALSE;
boolean level_editor_test_game = FALSE;
boolean network_playing = FALSE;
+#if defined(TARGET_SDL)
+boolean network_server = FALSE;
+SDL_Thread *server_thread;
+#endif
+
int key_joystick_mapping = 0;
boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
int key_joystick_mapping = 0;
boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
@@
-55,11
+60,13
@@
unsigned long Changed[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
unsigned long ChangeEvent[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short WasJustMoving[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short WasJustFalling[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
unsigned long ChangeEvent[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short WasJustMoving[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short WasJustFalling[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short CheckCollision[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaCnt[MAX_NUM_AMOEBA];
short AmoebaCnt2[MAX_NUM_AMOEBA];
short AmoebaNr[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short AmoebaCnt[MAX_NUM_AMOEBA];
short AmoebaCnt2[MAX_NUM_AMOEBA];
-short ExplodePhase[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
short ExplodeField[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short ExplodePhase[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+short ExplodeDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@
-89,7
+96,7
@@
int ZX, ZY;
int ExitX, ExitY;
int AllPlayersGone;
int ExitX, ExitY;
int AllPlayersGone;
-int TimeFrames, TimePlayed, TimeLeft;
+int TimeFrames, TimePlayed, TimeLeft
, TapeTime
;
boolean network_player_action_received = FALSE;
boolean network_player_action_received = FALSE;
@@
-657,7
+664,7
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
{
"black_orb",
"black_orb",
{
"black_orb",
"black_orb",
- "bomb"
+ "b
lack orb b
omb"
},
{
"amoeba_to_diamond",
},
{
"amoeba_to_diamond",
@@
-3394,6
+3401,21
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"group",
"group element 32"
},
"group",
"group element 32"
},
+ {
+ "unknown",
+ "unknown",
+ "unknown element"
+ },
+ {
+ "trigger_element",
+ "trigger",
+ "element triggering change"
+ },
+ {
+ "trigger_player",
+ "trigger",
+ "player triggering change"
+ },
/* ----------------------------------------------------------------------- */
/* "real" (and therefore drawable) runtime elements */
/* ----------------------------------------------------------------------- */
/* "real" (and therefore drawable) runtime elements */
@@
-3684,6
+3706,26
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-",
"-"
},
"-",
"-"
},
+ {
+ "player_is_exploding_1",
+ "-",
+ "-"
+ },
+ {
+ "player_is_exploding_2",
+ "-",
+ "-"
+ },
+ {
+ "player_is_exploding_3",
+ "-",
+ "-"
+ },
+ {
+ "player_is_exploding_4",
+ "-",
+ "-"
+ },
{
"quicksand.filling",
"quicksand",
{
"quicksand.filling",
"quicksand",
@@
-3830,12
+3872,22
@@
struct ElementInfo element_info[MAX_NUM_ELEMENTS + 1] =
"-"
},
{
"-"
},
{
- "internal
/editor
",
+ "internal
_clipboard_custom
",
"internal",
"internal",
- "-"
+ "empty custom element"
+ },
+ {
+ "internal_clipboard_change",
+ "internal",
+ "empty change page"
+ },
+ {
+ "internal_clipboard_group",
+ "internal",
+ "empty group element"
},
{
},
{
- "internal
/
dummy",
+ "internal
_
dummy",
"internal",
"-"
},
"internal",
"-"
},