X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FInitGameConditions.c;h=0afc9fa3e8e199486ccdf3a2ce29b19f234c728f;hb=d45b35552f4ca1ada1266fb7e8b6968d878019a6;hp=e12e98360c740f1fabc208451ad32877c0af0411;hpb=fe656a41b406b06d9dc5b93d01191d52b1da3b4d;p=rocksndiamonds.git diff --git a/src/game_sp/InitGameConditions.c b/src/game_sp/InitGameConditions.c index e12e9836..0afc9fa3 100644 --- a/src/game_sp/InitGameConditions.c +++ b/src/game_sp/InitGameConditions.c @@ -96,15 +96,24 @@ int InitMurphyPosB(int si) MurphyScreenYPos = GetStretchY(si); // Murphy's screen y-position // To Do: draw Murphy in location ax +#if 1 + StretchedSprites.BltImg(MurphyScreenXPos, MurphyScreenYPos, aniMurphy, 0); +#else StretchedSprites.BltEx(MurphyScreenXPos, MurphyScreenYPos, fiMurphy); +#endif MurphyScreenXPos = MurphyScreenXPos / Stretch; MurphyScreenYPos = MurphyScreenYPos / Stretch; subCalculateScreenScrollPos(); // calculate screen start addrs - printf("::: InitGameConditions.c: ScreenScroll{X,Y}Pos %d, %d\n", - ScreenScrollXPos, ScreenScrollYPos); +#if 0 + printf(":1: %d, %d [%d, %d] [%d, %d] [%d, %d]\n", + mScrollX, mScrollY, + mScrollX_last, mScrollY_last, + ScreenScrollXPos, ScreenScrollYPos, + ScrollX, ScrollY); +#endif if (AutoScrollFlag) { @@ -118,6 +127,14 @@ int InitMurphyPosB(int si) } } +#if 0 + printf(":2: %d, %d [%d, %d] [%d, %d] [%d, %d]\n", + mScrollX, mScrollY, + mScrollX_last, mScrollY_last, + ScreenScrollXPos, ScreenScrollYPos, + ScrollX, ScrollY); +#endif + return InitMurphyPosB; } // InitMurphyPosB @@ -292,7 +309,7 @@ int subFetchAndInitLevelB() MovLowByte(&data_SPtorunavail, 0); // no SP file data_scr_demo = 0; - UpdatePlayTime = (0 == demo_stopped ? True : True); + UpdatePlayTime = (0 == demo_stopped ? True : False); demo_stopped = 0; subFetchAndInitLevelA(UpdatePlayTime);