projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20020318-2-src
[rocksndiamonds.git]
/
src
/
game.c
diff --git
a/src/game.c
b/src/game.c
index 423fc4c85fb5785071da7f2be6b80fe97afedeaf..5dbf9df02a21b95923757ebeff666a09bc1c15a7 100644
(file)
--- a/
src/game.c
+++ b/
src/game.c
@@
-25,6
+25,9
@@
/* this switch controls how rocks move horizontally */
#define OLD_GAME_BEHAVIOUR FALSE
/* this switch controls how rocks move horizontally */
#define OLD_GAME_BEHAVIOUR FALSE
+/* EXPERIMENTAL STUFF */
+#define USE_NEW_AMOEBA_CODE FALSE
+
/* for DigField() */
#define DF_NO_PUSH 0
#define DF_DIG 1
/* for DigField() */
#define DF_NO_PUSH 0
#define DF_DIG 1
@@
-268,7
+271,7
@@
static void InitField(int x, int y, boolean init_game)
StorePlayer[x][y] = Feld[x][y];
StorePlayer[x][y] = Feld[x][y];
- if (options.
verbose
)
+ if (options.
debug
)
{
printf("Player %d activated.\n", player->element_nr);
printf("[Local player is %d and currently %s.]\n",
{
printf("Player %d activated.\n", player->element_nr);
printf("[Local player is %d and currently %s.]\n",
@@
-437,6
+440,14
@@
void InitGame()
boolean emulate_sb = TRUE; /* unless non-SOKOBAN elements found */
boolean emulate_sp = TRUE; /* unless non-SUPAPLEX elements found */
boolean emulate_sb = TRUE; /* unless non-SOKOBAN elements found */
boolean emulate_sp = TRUE; /* unless non-SUPAPLEX elements found */
+#if DEBUG
+#if USE_NEW_AMOEBA_CODE
+ printf("Using new amoeba code.\n");
+#else
+ printf("Using old amoeba code.\n");
+#endif
+#endif
+
/* don't play tapes over network */
network_playing = (options.network && !tape.playing);
/* don't play tapes over network */
network_playing = (options.network && !tape.playing);
@@
-659,7
+670,7
@@
void InitGame()
tape.player_participates[i] = TRUE;
}
tape.player_participates[i] = TRUE;
}
- if (options.
verbose
)
+ if (options.
debug
)
{
for (i=0; i<MAX_PLAYERS; i++)
{
{
for (i=0; i<MAX_PLAYERS; i++)
{
@@
-793,7
+804,7
@@
void InitGame()
KeyboardAutoRepeatOff();
KeyboardAutoRepeatOff();
- if (options.
verbose
)
+ if (options.
debug
)
{
for (i=0; i<4; i++)
printf("Player %d %sactive.\n",
{
for (i=0; i<4; i++)
printf("Player %d %sactive.\n",
@@
-4503,10
+4514,12
@@
void GameActions()
AmoebeWaechst(x, y);
else if (element == EL_DEAMOEBING)
AmoebeSchrumpft(x, y);
AmoebeWaechst(x, y);
else if (element == EL_DEAMOEBING)
AmoebeSchrumpft(x, y);
-#if 0
+
+#if !USE_NEW_AMOEBA_CODE
else if (IS_AMOEBALIVE(element))
AmoebeAbleger(x, y);
#endif
else if (IS_AMOEBALIVE(element))
AmoebeAbleger(x, y);
#endif
+
else if (element == EL_LIFE || element == EL_LIFE_ASYNC)
Life(x, y);
else if (element == EL_ABLENK_EIN)
else if (element == EL_LIFE || element == EL_LIFE_ASYNC)
Life(x, y);
else if (element == EL_ABLENK_EIN)
@@
-4590,8
+4603,8
@@
void GameActions()
}
}
}
}
-#if
1
- /* new experimental amoeba growth stuff*/
+#if
USE_NEW_AMOEBA_CODE
+ /* new experimental amoeba growth stuff
*/
#if 1
if (!(FrameCounter % 8))
#endif
#if 1
if (!(FrameCounter % 8))
#endif