X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FMurphy.c;h=0bc114ff869a72c15d55aa7342bdbe396a824a78;hb=34e8c8894f9aa655a87577c946c31a3f9b6134c5;hp=990276f035a7f62343112587b650f81d4f767787;hpb=ce0bba1a070e5e64939491eb68087f68ef8fe870;p=rocksndiamonds.git diff --git a/src/game_sp/Murphy.c b/src/game_sp/Murphy.c index 990276f0..0bc114ff 100644 --- a/src/game_sp/Murphy.c +++ b/src/game_sp/Murphy.c @@ -4,13 +4,10 @@ #include "Murphy.h" + static void subEatRedDisk(int si); static boolean subMoveKillsMurphy(int si, int ax, int bl); -// static char *VB_Name = "modMurphy"; - -// --- Option Explicit - #if 1 #define LocalStretch (2) @@ -30,14 +27,8 @@ static boolean subMoveKillsMurphy(int si, int ax, int bl); void subAnimateMurphy(int *si) { - // int ax, al, ah, bx, bl, i, X, Y; - // int tX, tY, tDeltaX, tDeltaY, tPos, Tmp; -#if 1 int ax, al, bl, i, X, Y; int time1, time2; -#else - int ax, al, bx, bl, i, X, Y; -#endif int tDeltaX, tDeltaY, tPos, Tmp; // Variables that hold information about the animation sequence @@ -54,16 +45,6 @@ void subAnimateMurphy(int *si) ax = PlayField16[*si]; al = LowByte(ax); -#if 0 - printf("::: Murphy.c: subAnimateMurphy(): %d [%d, %d] %d, %d [%d]\n", - *si, *si % 60, *si / 60, ax, al, (al == fiMurphy)); -#endif - -#if 0 - printf("::: Murphy.c: subAnimateMurphy(): %d [%d] [%d]\n", - YawnSleepCounter, FrameCounter, TimerVar); -#endif - if (al != fiMurphy) { MurphyMoveCounter = 0; // We have no Murphy! Exit! @@ -87,11 +68,14 @@ void subAnimateMurphy(int *si) dx2 = -1; SeqPos = 0; // end of FS + ScratchGravity = 0; // scratch gravity off if (GravityFlag != 0) // Gravity? (1=gravity on) { bl = LowByte(PlayField16[*si - FieldWidth]); // check above - if (! (bl == fiPortUp || bl == fiPortUpAndDown || bl == fiPortAllDirections)) + if (! (bl == fiPortUp || + bl == fiPortUpAndDown || + bl == fiPortAllDirections)) { if (PlayField16[*si + FieldWidth] == 0) // gravity on and space below! ScratchGravity = 1; @@ -1175,7 +1159,6 @@ loc_g_6756: if (UpdateTimeFlag != 0) // update time? { UpdatedFlag = 1; // prevent double update - subUpdatePlayingTime(); // update playing time } }