projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20100303-1-src
[rocksndiamonds.git]
/
src
/
game_sp
/
InitGameConditions.c
diff --git
a/src/game_sp/InitGameConditions.c
b/src/game_sp/InitGameConditions.c
index d5818d25acbc285be57c8c64348d5483457ec40b..0afc9fa3e8e199486ccdf3a2ce29b19f234c728f 100644
(file)
--- a/
src/game_sp/InitGameConditions.c
+++ b/
src/game_sp/InitGameConditions.c
@@
-96,12
+96,25
@@
int InitMurphyPosB(int si)
MurphyScreenYPos = GetStretchY(si); // Murphy's screen y-position
// To Do: draw Murphy in location ax
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);
StretchedSprites.BltEx(MurphyScreenXPos, MurphyScreenYPos, fiMurphy);
+#endif
MurphyScreenXPos = MurphyScreenXPos / Stretch;
MurphyScreenYPos = MurphyScreenYPos / Stretch;
subCalculateScreenScrollPos(); // calculate screen start addrs
MurphyScreenXPos = MurphyScreenXPos / Stretch;
MurphyScreenYPos = MurphyScreenYPos / Stretch;
subCalculateScreenScrollPos(); // calculate screen start addrs
+
+#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)
{
if (bPlaying)
if (AutoScrollFlag)
{
if (bPlaying)
@@
-114,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
return InitMurphyPosB;
} // InitMurphyPosB
@@
-288,7
+309,7
@@
int subFetchAndInitLevelB()
MovLowByte(&data_SPtorunavail, 0); // no SP file
data_scr_demo = 0;
MovLowByte(&data_SPtorunavail, 0); // no SP file
data_scr_demo = 0;
- UpdatePlayTime = (0 == demo_stopped ?
True : Tru
e);
+ UpdatePlayTime = (0 == demo_stopped ?
True : Fals
e);
demo_stopped = 0;
subFetchAndInitLevelA(UpdatePlayTime);
demo_stopped = 0;
subFetchAndInitLevelA(UpdatePlayTime);