From: Holger Schemel Date: Sun, 29 Sep 2002 22:25:15 +0000 (+0200) Subject: rnd-20020930-1-src X-Git-Tag: 3.0.0^2~228 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=9091c797c4a3abb34ceb98d80a82ae7310708fbb;p=rocksndiamonds.git rnd-20020930-1-src --- diff --git a/src/conftime.h b/src/conftime.h index f0425dde..73dcedfd 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2002-09-22 02:29]" +#define COMPILE_DATE_STRING "[2002-09-30 00:24]" diff --git a/src/game.c b/src/game.c index 2c5f0e9a..5dd55c76 100644 --- a/src/game.c +++ b/src/game.c @@ -669,12 +669,14 @@ void InitGame() InitGameEngine(); +#if 0 #if DEBUG #if USE_NEW_AMOEBA_CODE printf("Using new amoeba code.\n"); #else printf("Using old amoeba code.\n"); #endif +#endif #endif /* don't play tapes over network */ @@ -3132,7 +3134,7 @@ void StartMoving(int x, int y) else { Feld[newx][newy] = EL_EMPTY; - DrawLevelField(newx, newy); + DrawNewLevelField(newx, newy); } PlaySoundLevel(x, y, SND_YAMYAM_EATING); @@ -3153,7 +3155,7 @@ void StartMoving(int x, int y) else { Feld[newx][newy] = EL_EMPTY; - DrawLevelField(newx, newy); + DrawNewLevelField(newx, newy); } PlaySoundLevel(x, y, SND_DARK_YAMYAM_EATING); @@ -3205,7 +3207,7 @@ void StartMoving(int x, int y) #endif else if (element == EL_BUG || element == EL_SPACESHIP || element == EL_SP_SNIKSNAK || element == EL_MOLE) -#if 1 +#if 0 DrawLevelField(x, y); #else DrawNewLevelField(x, y); @@ -3296,7 +3298,7 @@ void ContinueMoving(int x, int y) }; Feld[x][y] = EL_SAND; - DrawLevelField(x, y); + DrawNewLevelField(x, y); for(i=0; i<4; i++) { @@ -3306,7 +3308,7 @@ void ContinueMoving(int x, int y) yy = y + xy[i][1]; if (IN_LEV_FIELD(xx, yy) && Feld[xx][yy] == EL_SAND) - DrawLevelField(xx, yy); /* for "ErdreichAnbroeckeln()" */ + DrawNewLevelField(xx, yy); /* for "ErdreichAnbroeckeln()" */ } } @@ -3365,18 +3367,8 @@ void ContinueMoving(int x, int y) if (!CAN_MOVE(element)) MovDir[newx][newy] = 0; - if (element == EL_BUG || element == EL_SPACESHIP || - element == EL_SP_SNIKSNAK || element == EL_PACMAN || - element == EL_SP_ELECTRON) - { - DrawNewLevelField(x, y); - DrawNewLevelField(newx, newy); - } - else - { - DrawLevelField(x, y); - DrawLevelField(newx, newy); - } + DrawNewLevelField(x, y); + DrawNewLevelField(newx, newy); Stop[newx][newy] = TRUE; JustStopped[newx][newy] = 3; @@ -3396,12 +3388,7 @@ void ContinueMoving(int x, int y) } else /* still moving on */ { - if (element == EL_BUG || element == EL_SPACESHIP || - element == EL_SP_SNIKSNAK || element == EL_PACMAN || - element == EL_SP_ELECTRON) - DrawNewLevelField(x, y); - else - DrawLevelField(x, y); + DrawNewLevelField(x, y); } } diff --git a/src/init.c b/src/init.c index 97c52c16..d800de9f 100644 --- a/src/init.c +++ b/src/init.c @@ -930,11 +930,10 @@ void InitElementInfo() { for(j=0; j