projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version number set to 4.0.1.0
[rocksndiamonds.git]
/
src
/
game_sp
/
Murphy.c
diff --git
a/src/game_sp/Murphy.c
b/src/game_sp/Murphy.c
index 55b43e0044d0751efd52c15fe4bbd9366e039541..bf590db0fd22da5b5dfe0991a440be88b764cb52 100644
(file)
--- a/
src/game_sp/Murphy.c
+++ b/
src/game_sp/Murphy.c
@@
-4,66
+4,70
@@
#include "Murphy.h"
#include "Murphy.h"
+
static void subEatRedDisk(int si);
static boolean subMoveKillsMurphy(int si, int ax, int bl);
static void subEatRedDisk(int si);
static boolean subMoveKillsMurphy(int si, int ax, int bl);
-// static char *VB_Name = "modMurphy";
-
-// --- Option Explicit
-
-#define LocalStretch (1)
+#define LocalStretch (2)
+#define MurphyZoomFactor (ZoomFactor)
// ==========================================================================
// SUBROUTINE
// Move Murphy in any direction
// ==========================================================================
// ==========================================================================
// SUBROUTINE
// Move Murphy in any direction
// ==========================================================================
-
int subAnimateMurphy(int
si)
+
void subAnimateMurphy(int *
si)
{
{
- int subAnimateMurphy;
-
- // int ax, al, ah, bx, bl, i, X, Y;
- // int tX, tY, tDeltaX, tDeltaY, tPos, Tmp;
- int ax, al, bx, bl, i, X, Y;
+ int ax, al, bl, i, X, Y;
+ int time1, time2;
int tDeltaX, tDeltaY, tPos, Tmp;
// Variables that hold information about the animation sequence
int tDeltaX, tDeltaY, tPos, Tmp;
// Variables that hold information about the animation sequence
- static int
*dx = 0; // an array of image positions in moving.mpx, finalized with -1
+ static int
dx1 = 0; // image/animation token
static int dx2 = 0; // an additional image position of a second sprite, for instance: yellow disk if pushed
static int MurphyDX = 0, MurphyDY = 0; // murphys move steps
static int SeqPos = 0; // index into dx()
static int ClearPos = 0; // Position to clear before blitting sprites, none=-1
static int dxPos = 0; // field-position to draw dx(SeqPos)
static int dx2Step = 0; // position of dx2 relative to dx-position
static int dx2 = 0; // an additional image position of a second sprite, for instance: yellow disk if pushed
static int MurphyDX = 0, MurphyDY = 0; // murphys move steps
static int SeqPos = 0; // index into dx()
static int ClearPos = 0; // Position to clear before blitting sprites, none=-1
static int dxPos = 0; // field-position to draw dx(SeqPos)
static int dx2Step = 0; // position of dx2 relative to dx-position
+ static int dx1SequenceLength = 0;
- ax = PlayField16[si];
+ ax = PlayField16[
*
si];
al = LowByte(ax);
al = LowByte(ax);
+
if (al != fiMurphy)
{
MurphyMoveCounter = 0; // We have no Murphy! Exit!
if (al != fiMurphy)
{
MurphyMoveCounter = 0; // We have no Murphy! Exit!
- return subAnimateMurphy;
+
+ return;
}
MurphyMoveCounter = 1; // We have a Murphy!
}
MurphyMoveCounter = 1; // We have a Murphy!
- MurphyExplodePos = si;
- if (ax != 3) // yes--go proceed moving murphy?
+ MurphyExplodePos = *si;
+
+ // (check if high byte of PlayField16 has stored movement information)
+ if (ax != fiMurphy) // yes--go proceed moving murphy?
goto locProceedMovingMurphy;
// FS: reset moving sequence variables
MurphyDX = 0;
MurphyDY = 0;
goto locProceedMovingMurphy;
// FS: reset moving sequence variables
MurphyDX = 0;
MurphyDY = 0;
- ClearPos = si;
- dxPos = si;
+ ClearPos = *si;
+ dxPos = *si;
+ dx1 = -1;
dx2 = -1;
SeqPos = 0;
// end of FS
dx2 = -1;
SeqPos = 0;
// end of FS
+
ScratchGravity = 0; // scratch gravity off
if (GravityFlag != 0) // Gravity? (1=gravity on)
{
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))
+ bl = LowByte(PlayField16[*si - FieldWidth]); // check above
+ if (! (bl == fiPortUp ||
+ bl == fiPortUpAndDown ||
+ bl == fiPortAllDirections))
{
{
- if (PlayField16[si + FieldWidth] == 0) // gravity on and space below!
+ if (PlayField16[
*
si + FieldWidth] == 0) // gravity on and space below!
ScratchGravity = 1;
}
} // loc_g_5E8B:
ScratchGravity = 1;
}
} // loc_g_5E8B:
@@
-79,73
+83,86
@@
int subAnimateMurphy(int si)
goto loc_g_6364;
}
goto loc_g_6364;
}
- ax = (TimerVar & 3);
- if (ax != 0)
- return subAnimateMurphy;
-
// ------------------------------------------------------------------
// Murphy's YAWN & SLEEP sequence, counted down by YawnSleepCounter:
// ------------------------------------------------------------------
// Murphy's YAWN & SLEEP sequence, counted down by YawnSleepCounter:
+
YawnSleepCounter = YawnSleepCounter + 1;
YawnSleepCounter = YawnSleepCounter + 1;
- if (YawnSleepCounter == 4)
+
+ if (YawnSleepCounter < 16)
+ return;
+
+ if (YawnSleepCounter < 2000)
{
{
-
subCopyFieldToScreen(si, fiMurphy);
// normal grin
- return subAnimateMurphy;
- } // loc_g_5ECE:
+ // normal grin
+ // (default: single graphic, no animation)
+ subCopyAnimToScreen(*si, aniMurphy, YawnSleepCounter - 16);
- if (YawnSleepCounter <= 500) // loc_g_5ED7:
- return subAnimateMurphy;
+ return;
+ }
- if (YawnSleepCounter <
= 522
)
+ if (YawnSleepCounter <
4000
)
{
{
- bx = (YawnSleepCounter - 500) / 2;
- subCopyFieldToScreen(si, aniMurphyYawn + bx); // yawn! and look depressed afterwards...
- return subAnimateMurphy;
- } // loc_g_5F00:
+ // yawn! and look depressed afterwards...
+ // (default: 12 animation frames with delay of 8)
+ subCopyAnimToScreen(*si, aniMurphyYawn, YawnSleepCounter - 2000);
- if (YawnSleepCounter <= 1000)
- return subAnimateMurphy;
+ return;
+ }
- if (YawnSleepCounter <
= 1022
)
+ if (YawnSleepCounter <
6400
)
{
{
- bx = (YawnSleepCounter - 1000) / 2;
- subCopyFieldToScreen(si, aniMurphyYawn + bx); // yawn again!
- return subAnimateMurphy;
- } // loc_g_5F32:
+ // yawn again!
+ // (default: 12 animation frames with delay of 8)
+ subCopyAnimToScreen(*si, aniMurphyYawn, YawnSleepCounter - 4000);
+
+ return;
+ }
- if (YawnSleepCounter <= 1600) // loc_g_5F3B:
-
return subAnimateMurphy
;
+ // time1 = 6400 + 12 * 8; // (default: 6496 == 6400 + 12 * 8)
+
time1 = 6400 + 12 * 10
;
- if (YawnSleepCounter <
= 1622
)
+ if (YawnSleepCounter <
time1
)
{
{
- bx = (YawnSleepCounter - 1600) / 2;
- subCopyFieldToScreen(si, aniMurphyYawn + bx); // yawn again! - third time
- return subAnimateMurphy;
- } // loc_g_5F64:
+ // yawn again! - third time
+ // (default: 12 animation frames with delay of 8)
+ subCopyAnimToScreen(*si, aniMurphyYawn, YawnSleepCounter - 6400);
+
+ return;
+ }
-
if (YawnSleepCounter > 165
4)
-
return subAnimateMurphy
;
+
// time2 = 6496 + 3 * 64; // (default: 6688 == 6496 + 3 * 6
4)
+
time2 = 6496 + 3 * 100
;
- if (PlayField16[si - 1] == 0)
+ if (YawnSleepCounter > time2) // Murphy already went to sleep
+ return;
+
+ if (PlayField16[*si - 1] == 0)
{
{
- if (PlayField16[si + 1] == 0)
+ if (PlayField16[
*
si + 1] == 0)
{
{
- YawnSleepCounter = 36;
-
return subAnimateMurphy
;
+ // no sleep -- go back to "wait and start yawning" phase
+
YawnSleepCounter = 144
;
+ return;
}
else
{
}
else
{
- bx = (YawnSleepCounter - 1622) / 16;
- subCopyFieldToScreen(si, aniMurphySleepRight + bx); // go to sleep
- return subAnimateMurphy;
+ // go to sleep (right side)
+ // (default: 3 animation frames with delay of 64)
+ subCopyAnimToScreen(*si, aniMurphySleepRight, YawnSleepCounter - time1);
+
+ return;
}
}
- } // loc_g_5F81:
+ }
+
+ // go to sleep (left side)
+ // (default: 3 animation frames with delay of 64)
+ subCopyAnimToScreen(*si, aniMurphySleepLeft, YawnSleepCounter - time1);
- bx = (YawnSleepCounter - 1622) / 16;
- subCopyFieldToScreen(si, aniMurphySleepLeft + bx); // go to sleep
- return subAnimateMurphy;
+ return;
// end of YAWN-SLEEP-Sequence
// end of YAWN-SLEEP-Sequence
+
// ------------------------------------------------------------------
// ==========================================================================
// (Direct Jump) a key was pressed
// ------------------------------------------------------------------
// ==========================================================================
// (Direct Jump) a key was pressed
@@
-155,24
+172,24
@@
locKeyPressed5FCF:
if (ScratchGravity == 0)
goto loc_g_6003;
if (ScratchGravity == 0)
goto loc_g_6003;
- if (PlayField16[si + FieldWidth] != 0)
+ if (PlayField16[
*
si + FieldWidth] != 0)
goto loc_g_6003;
if (bl == keyUp)
{
goto loc_g_6003;
if (bl == keyUp)
{
- if (PlayField16[si - FieldWidth] == fiBase)
+ if (PlayField16[
*
si - FieldWidth] == fiBase)
goto loc_g_6003;
}
else if (bl == keyLeft)
{
goto loc_g_6003;
}
else if (bl == keyLeft)
{
- if (PlayField16[si - 1] == fiBase)
+ if (PlayField16[
*
si - 1] == fiBase)
goto loc_g_6003;
}
else if (bl == keyRight)
{
goto loc_g_6003;
}
else if (bl == keyRight)
{
- if (PlayField16[si + 1] == fiBase)
+ if (PlayField16[
*
si + 1] == fiBase)
goto loc_g_6003;
} // loc_g_6001:
goto loc_g_6003;
} // loc_g_6001:
@@
-235,7
+252,7
@@
loc_g_6003:
default:
RedDiskReleaseFlag = 0;
default:
RedDiskReleaseFlag = 0;
- return
subAnimateMurphy
;
+ return;
break;
}
break;
}
@@
-247,7
+264,7
@@
loc_g_6078:
// FS:
MurphyDY = -2;
// end of FS
// FS:
MurphyDY = -2;
// end of FS
- ax = PlayField16[si - FieldWidth];
+ ax = PlayField16[
*
si - FieldWidth];
al = LowByte(ax);
if (ax == fiSpace)
goto loc_g_6312;
al = LowByte(ax);
if (ax == fiSpace)
goto loc_g_6312;
@@
-276,10
+293,10
@@
loc_g_6078:
if (al == fiYellowDisk)
goto loc_g_6AB8;
if (al == fiYellowDisk)
goto loc_g_6AB8;
- if (! subMoveKillsMurphy(si - FieldWidth, ax, bl))
+ if (! subMoveKillsMurphy(
*
si - FieldWidth, ax, bl))
goto loc_g_6078;
goto loc_g_6078;
- return
subAnimateMurphy
;
+ return;
// ==========================================================================
// moving right to left ...
// ==========================================================================
// moving right to left ...
@@
-290,7
+307,7
@@
loc_g_60DA:
MurphyDX = -2;
// end of FS
MurphyVarFaceLeft = 1;
MurphyDX = -2;
// end of FS
MurphyVarFaceLeft = 1;
- ax = PlayField16[si - 1];
+ ax = PlayField16[
*
si - 1];
al = LowByte(ax);
if (ax == fiSpace)
goto loc_g_6341;
al = LowByte(ax);
if (ax == fiSpace)
goto loc_g_6341;
@@
-325,10
+342,10
@@
loc_g_60DA:
if (ax == fiOrangeDisk)
goto loc_g_6B9B;
if (ax == fiOrangeDisk)
goto loc_g_6B9B;
- if (! subMoveKillsMurphy(si - 1, ax, bl))
+ if (! subMoveKillsMurphy(
*
si - 1, ax, bl))
goto loc_g_60DA;
goto loc_g_60DA;
- return
subAnimateMurphy
;
+ return;
// ==========================================================================
// moving up to down ...
// ==========================================================================
// moving up to down ...
@@
-338,7
+355,7
@@
loc_g_6154:
// FS:
MurphyDY = 2;
// end of FS
// FS:
MurphyDY = 2;
// end of FS
- ax = PlayField16[si + FieldWidth];
+ ax = PlayField16[
*
si + FieldWidth];
al = LowByte(ax);
if (ax == fiSpace)
goto loc_g_6364;
al = LowByte(ax);
if (ax == fiSpace)
goto loc_g_6364;
@@
-367,10
+384,10
@@
loc_g_6154:
if (al == fiYellowDisk)
goto loc_g_6B2A;
if (al == fiYellowDisk)
goto loc_g_6B2A;
- if (! subMoveKillsMurphy(si + FieldWidth, ax, bl))
+ if (! subMoveKillsMurphy(
*
si + FieldWidth, ax, bl))
goto loc_g_6154;
goto loc_g_6154;
- return
subAnimateMurphy
;
+ return;
// ==========================================================================
// moving left to right ...
// ==========================================================================
// moving left to right ...
@@
-381,7
+398,7
@@
loc_g_61B6:
MurphyDX = 2;
// end of FS
MurphyVarFaceLeft = 0;
MurphyDX = 2;
// end of FS
MurphyVarFaceLeft = 0;
- ax = PlayField16[si + 1];
+ ax = PlayField16[
*
si + 1];
al = LowByte(ax);
if (ax == fiSpace)
goto loc_g_6399;
al = LowByte(ax);
if (ax == fiSpace)
goto loc_g_6399;
@@
-416,10
+433,10
@@
loc_g_61B6:
if (ax == fiOrangeDisk)
goto loc_g_6BD3;
if (ax == fiOrangeDisk)
goto loc_g_6BD3;
- if (! subMoveKillsMurphy(si + 1, ax, bl))
+ if (! subMoveKillsMurphy(
*
si + 1, ax, bl))
goto loc_g_61B6;
goto loc_g_61B6;
- return
subAnimateMurphy
;
+ return;
// ==========================================================================
// touching down to up ...
// ==========================================================================
// touching down to up ...
@@
-428,9
+445,9
@@
loc_g_61B6:
loc_g_622E:
// FS:
ClearPos = -1;
loc_g_622E:
// FS:
ClearPos = -1;
- dxPos = si - FieldWidth;
+ dxPos =
*
si - FieldWidth;
// end of FS
// end of FS
- ax = PlayField16[si - FieldWidth];
+ ax = PlayField16[
*
si - FieldWidth];
al = LowByte(ax);
al = LowByte(ax);
if (ax == fiBase)
al = LowByte(ax);
al = LowByte(ax);
if (ax == fiBase)
@@
-448,7
+465,7
@@
loc_g_622E:
if (al == fiRedDisk)
goto loc_g_6A48;
if (al == fiRedDisk)
goto loc_g_6A48;
- return
subAnimateMurphy
;
+ return;
// ==========================================================================
// touching right to left ...
// ==========================================================================
// touching right to left ...
@@
-457,10
+474,10
@@
loc_g_622E:
loc_g_6258:
// FS:
ClearPos = -1;
loc_g_6258:
// FS:
ClearPos = -1;
- dxPos = si - 1;
+ dxPos =
*
si - 1;
// end of FS
MurphyVarFaceLeft = 1;
// end of FS
MurphyVarFaceLeft = 1;
- ax = PlayField16[si - 1];
+ ax = PlayField16[
*
si - 1];
al = LowByte(ax);
if (ax == fiBase)
goto loc_g_651D;
al = LowByte(ax);
if (ax == fiBase)
goto loc_g_651D;
@@
-477,7
+494,7
@@
loc_g_6258:
if (al == fiRedDisk)
goto loc_g_6A64;
if (al == fiRedDisk)
goto loc_g_6A64;
- return
subAnimateMurphy
;
+ return;
// ==========================================================================
// touching up to down ...
// ==========================================================================
// touching up to down ...
@@
-486,9
+503,9
@@
loc_g_6258:
loc_g_6288:
// FS:
ClearPos = -1;
loc_g_6288:
// FS:
ClearPos = -1;
- dxPos = si + FieldWidth;
+ dxPos =
*
si + FieldWidth;
// end of FS
// end of FS
- ax = PlayField16[si + FieldWidth];
+ ax = PlayField16[
*
si + FieldWidth];
al = LowByte(ax);
if (ax == fiBase)
goto loc_g_655B;
al = LowByte(ax);
if (ax == fiBase)
goto loc_g_655B;
@@
-505,7
+522,7
@@
loc_g_6288:
if (al == fiRedDisk)
goto loc_g_6A80;
if (al == fiRedDisk)
goto loc_g_6A80;
- return
subAnimateMurphy
;
+ return;
// ==========================================================================
// touching left to right ...
// ==========================================================================
// touching left to right ...
@@
-514,10
+531,10
@@
loc_g_6288:
loc_g_62B2:
// FS:
ClearPos = -1;
loc_g_62B2:
// FS:
ClearPos = -1;
- dxPos = si + 1;
+ dxPos =
*
si + 1;
// end of FS
MurphyVarFaceLeft = 0;
// end of FS
MurphyVarFaceLeft = 0;
- ax = PlayField16[si + 1];
+ ax = PlayField16[
*
si + 1];
al = LowByte(ax);
if (ax == fiBase)
goto loc_g_6599;
al = LowByte(ax);
if (ax == fiBase)
goto loc_g_6599;
@@
-534,7
+551,7
@@
loc_g_62B2:
if (al == fiRedDisk)
goto loc_g_6A9C;
if (al == fiRedDisk)
goto loc_g_6A9C;
- return
subAnimateMurphy
;
+ return;
// ==========================================================================
// Release Red disk: no move ...
// ==========================================================================
// Release Red disk: no move ...
@@
-545,19
+562,19
@@
loc_g_62E2:
ClearPos = -1;
// end of FS
if (LowByte(RedDiskCount) == 0)
ClearPos = -1;
// end of FS
if (LowByte(RedDiskCount) == 0)
- return
subAnimateMurphy
;
+ return;
if (LowByte(RedDiskReleasePhase) != 0)
if (LowByte(RedDiskReleasePhase) != 0)
- return
subAnimateMurphy
;
+ return;
if (LowByte(RedDiskReleaseFlag) != 1)
if (LowByte(RedDiskReleaseFlag) != 1)
- return
subAnimateMurphy
;
+ return;
- MovHighByte(&PlayField16[si], 0x2A);
+ MovHighByte(&PlayField16[
*
si], 0x2A);
MovingPictureSequencePhase = 0x40; // init picture move sequence
MovingPictureSequencePhase = 0x40; // init picture move sequence
- dx = aniRedDisk;
+ dx
1
= aniRedDisk;
MovLowByte(&RedDiskReleasePhase, 1);
MovLowByte(&RedDiskReleasePhase, 1);
-
Mov(&RedDiskReleaseMurphyPos, si)
; // remember Murphy's location
+
RedDiskReleaseMurphyPos = *si
; // remember Murphy's location
goto loc_Split;
// ==========================================================================
goto loc_Split;
// ==========================================================================
@@
-565,10
+582,10
@@
loc_g_62E2:
// ==========================================================================
loc_g_6312:
// ==========================================================================
loc_g_6312:
- dx
= (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpRigh
t);
- PlayField16[si - FieldWidth] = 0x103;
- PlayField16[si] = 0x300;
-
si =
si - FieldWidth;
+ dx
1 = (MurphyVarFaceLeft == 0 ? aniMurphyMoveUpRight : aniMurphyMoveUpLef
t);
+ PlayField16[
*
si - FieldWidth] = 0x103;
+ PlayField16[
*
si] = 0x300;
+
*si = *
si - FieldWidth;
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-576,10
+593,10
@@
loc_g_6312:
// ==========================================================================
loc_g_6341:
// ==========================================================================
loc_g_6341:
- dx
= aniMurphyEat
Left;
- PlayField16[si - 1] = 0x203;
- PlayField16[si] = 0x300;
-
si =
si - 1;
+ dx
1 = aniMurphyMove
Left;
+ PlayField16[
*
si - 1] = 0x203;
+ PlayField16[
*
si] = 0x300;
+
*si = *
si - 1;
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-587,10
+604,10
@@
loc_g_6341:
// ==========================================================================
loc_g_6364:
// ==========================================================================
loc_g_6364:
- dx
= (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpRigh
t);
- PlayField16[si + FieldWidth] = 0x303;
- PlayField16[si] = 0x300;
-
si =
si + FieldWidth;
+ dx
1 = (MurphyVarFaceLeft == 0 ? aniMurphyMoveUpRight : aniMurphyMoveUpLef
t);
+ PlayField16[
*
si + FieldWidth] = 0x303;
+ PlayField16[
*
si] = 0x300;
+
*si = *
si + FieldWidth;
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-598,10
+615,10
@@
loc_g_6364:
// ==========================================================================
loc_g_6399:
// ==========================================================================
loc_g_6399:
- dx
= aniMurphyEat
Right;
- PlayField16[si + 1] = 0x403;
- PlayField16[si] = 0x300;
-
si =
si + 1;
+ dx
1 = aniMurphyMove
Right;
+ PlayField16[
*
si + 1] = 0x403;
+ PlayField16[
*
si] = 0x300;
+
*si = *
si + 1;
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-609,23
+626,25
@@
loc_g_6399:
// ==========================================================================
loc_g_63C2:
// ==========================================================================
loc_g_63C2:
- if (SgnHighByte(PlayField16[si - FieldWidth]) >= 0)
+ if (SgnHighByte(PlayField16[
*
si - FieldWidth]) >= 0)
{
{
- ExplodeFieldSP(si); // Explode
- return subAnimateMurphy;
+ ExplodeFieldSP(*si); // Explode
+
+ return;
}
}
- PlayField16[si - FieldWidth] = fiBase;
+ PlayField16[
*
si - FieldWidth] = fiBase;
// ==========================================================================
// BASE moving down to up
// ==========================================================================
loc_g_63D3:
// ==========================================================================
// BASE moving down to up
// ==========================================================================
loc_g_63D3:
- subSoundFXBase();
- dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpRight);
- PlayField16[si - FieldWidth] = 0x503;
- PlayField16[si] = 0x300;
- si = si - FieldWidth;
+ subSoundFX(*si, fiBase, actDigging);
+
+ dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyDigUpRight : aniMurphyDigUpLeft);
+ PlayField16[*si - FieldWidth] = 0x503;
+ PlayField16[*si] = 0x300;
+ *si = *si - FieldWidth;
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-633,23
+652,25
@@
loc_g_63D3:
// ==========================================================================
loc_g_640B:
// ==========================================================================
loc_g_640B:
- if (SgnHighByte(PlayField16[si - 1]) >= 0)
+ if (SgnHighByte(PlayField16[
*
si - 1]) >= 0)
{
{
- ExplodeFieldSP(si); // Explode
- return subAnimateMurphy;
+ ExplodeFieldSP(*si); // Explode
+
+ return;
}
}
- PlayField16[si - 1] = fiBase;
+ PlayField16[
*
si - 1] = fiBase;
// ==========================================================================
// BASE moving right to left
// ==========================================================================
loc_g_641C:
// ==========================================================================
// BASE moving right to left
// ==========================================================================
loc_g_641C:
- subSoundFXBase();
- dx = aniMurphyEatLeft;
- PlayField16[si - 1] = 0x203;
- PlayField16[si] = 0x300;
- si = si - 1;
+ subSoundFX(*si, fiBase, actDigging);
+
+ dx1 = aniMurphyDigLeft;
+ PlayField16[*si - 1] = 0x203;
+ PlayField16[*si] = 0x300;
+ *si = *si - 1;
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-657,23
+678,25
@@
loc_g_641C:
// ==========================================================================
loc_g_6448:
// ==========================================================================
loc_g_6448:
- if (SgnHighByte(PlayField16[si + FieldWidth]) >= 0)
+ if (SgnHighByte(PlayField16[
*
si + FieldWidth]) >= 0)
{
{
- ExplodeFieldSP(si); // Explode
- return subAnimateMurphy;
+ ExplodeFieldSP(*si); // Explode
+
+ return;
}
}
- PlayField16[si + FieldWidth] = fiBase;
+ PlayField16[
*
si + FieldWidth] = fiBase;
// ==========================================================================
// BASE moving up to down
// ==========================================================================
loc_g_6459:
// ==========================================================================
// BASE moving up to down
// ==========================================================================
loc_g_6459:
- subSoundFXBase();
- dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpRight);
- PlayField16[si + FieldWidth] = 0x703;
- PlayField16[si] = 0x300;
- si = si + FieldWidth;
+ subSoundFX(*si, fiBase, actDigging);
+
+ dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyDigUpRight : aniMurphyDigUpLeft);
+ PlayField16[*si + FieldWidth] = 0x703;
+ PlayField16[*si] = 0x300;
+ *si = *si + FieldWidth;
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-681,23
+704,25
@@
loc_g_6459:
// ==========================================================================
loc_g_6491:
// ==========================================================================
loc_g_6491:
- if (SgnHighByte(PlayField16[si + 1]) >= 0)
+ if (SgnHighByte(PlayField16[
*
si + 1]) >= 0)
{
{
- ExplodeFieldSP(si); // Explode
- return subAnimateMurphy;
+ ExplodeFieldSP(*si); // Explode
+
+ return;
}
}
- PlayField16[si + 1] = fiBase;
+ PlayField16[
*
si + 1] = fiBase;
// ==========================================================================
// BASE moving left to right
// ==========================================================================
loc_g_64A2:
// ==========================================================================
// BASE moving left to right
// ==========================================================================
loc_g_64A2:
- subSoundFXBase();
- dx = aniMurphyEatRight;
- PlayField16[si + 1] = 0x803;
- PlayField16[si] = 0x300;
- si = si + 1;
+ subSoundFX(*si, fiBase, actDigging);
+
+ dx1 = aniMurphyDigRight;
+ PlayField16[*si + 1] = 0x803;
+ PlayField16[*si] = 0x300;
+ *si = *si + 1;
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-705,23
+730,25
@@
loc_g_64A2:
// ==========================================================================
loc_g_64CE:
// ==========================================================================
loc_g_64CE:
- if (SgnHighByte(PlayField16[si - FieldWidth]) >= 0)
+ if (SgnHighByte(PlayField16[
*
si - FieldWidth]) >= 0)
{
{
- ExplodeFieldSP(si); // Explode
- return subAnimateMurphy;
+ ExplodeFieldSP(*si); // Explode
+
+ return;
}
}
- PlayField16[si - FieldWidth] = fiBase;
+ PlayField16[
*
si - FieldWidth] = fiBase;
// ==========================================================================
// BASE touching down to up
// ==========================================================================
loc_g_64DF:
// ==========================================================================
// BASE touching down to up
// ==========================================================================
loc_g_64DF:
- subCopyFieldToScreen(si, aniMurphyTouchUp);
- subSoundFXBase();
- dx = aniTouchBase;
- dxPos = si - FieldWidth;
- MovHighByte(&PlayField16[si], 0x10);
+ subCopyImageToScreen(*si, aniMurphyTouchUp);
+ subSoundFX(*si, fiBase, actDigging);
+
+ dx1 = aniTouchBase;
+ dxPos = *si - FieldWidth;
+ MovHighByte(&PlayField16[*si], 0x10);
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-729,23
+756,25
@@
loc_g_64DF:
// ==========================================================================
loc_g_650C:
// ==========================================================================
loc_g_650C:
- if (SgnHighByte(PlayField16[si - 1]) >= 0)
+ if (SgnHighByte(PlayField16[
*
si - 1]) >= 0)
{
{
- ExplodeFieldSP(si); // Explode
- return subAnimateMurphy;
+ ExplodeFieldSP(*si); // Explode
+
+ return;
}
}
- PlayField16[si - 1] = fiBase;
+ PlayField16[
*
si - 1] = fiBase;
// ==========================================================================
// BASE touching right to left
// ==========================================================================
loc_g_651D:
// ==========================================================================
// BASE touching right to left
// ==========================================================================
loc_g_651D:
- subCopyFieldToScreen(si, aniMurphyTouchLeft);
- subSoundFXBase();
- dx = aniTouchBase;
- dxPos = si - 1;
- MovHighByte(&PlayField16[si], 0x11);
+ subCopyImageToScreen(*si, aniMurphyTouchLeft);
+ subSoundFX(*si, fiBase, actDigging);
+
+ dx1 = aniTouchBase;
+ dxPos = *si - 1;
+ MovHighByte(&PlayField16[*si], 0x11);
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-753,23
+782,25
@@
loc_g_651D:
// ==========================================================================
loc_g_654A:
// ==========================================================================
loc_g_654A:
- if (SgnHighByte(PlayField16[si + FieldWidth]) >= 0)
+ if (SgnHighByte(PlayField16[
*
si + FieldWidth]) >= 0)
{
{
- ExplodeFieldSP(si); // Explode
- return subAnimateMurphy;
+ ExplodeFieldSP(*si); // Explode
+
+ return;
}
}
- PlayField16[si + FieldWidth] = fiBase;
+ PlayField16[
*
si + FieldWidth] = fiBase;
// ==========================================================================
// BASE touching up to down
// ==========================================================================
loc_g_655B:
// ==========================================================================
// BASE touching up to down
// ==========================================================================
loc_g_655B:
- subCopyFieldToScreen(si, aniMurphyTouchDown);
- subSoundFXBase();
- dx = aniTouchBase;
- dxPos = si + FieldWidth;
- MovHighByte(&PlayField16[si], 0x12);
+ subCopyImageToScreen(*si, aniMurphyTouchDown);
+ subSoundFX(*si, fiBase, actDigging);
+
+ dx1 = aniTouchBase;
+ dxPos = *si + FieldWidth;
+ MovHighByte(&PlayField16[*si], 0x12);
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-777,23
+808,25
@@
loc_g_655B:
// ==========================================================================
loc_g_6588:
// ==========================================================================
loc_g_6588:
- if (SgnHighByte(PlayField16[si + 1]) >= 0)
+ if (SgnHighByte(PlayField16[
*
si + 1]) >= 0)
{
{
- ExplodeFieldSP(si); // Explode
- return subAnimateMurphy;
+ ExplodeFieldSP(*si); // Explode
+
+ return;
}
}
- PlayField16[si + 1] = fiBase;
+ PlayField16[
*
si + 1] = fiBase;
// ==========================================================================
// BASE touching left to right
// ==========================================================================
loc_g_6599:
// ==========================================================================
// BASE touching left to right
// ==========================================================================
loc_g_6599:
- subCopyFieldToScreen(si, aniMurphyTouchRight);
- subSoundFXBase();
- dx = aniTouchBase;
- dxPos = si + 1;
- MovHighByte(&PlayField16[si], 0x13);
+ subCopyImageToScreen(*si, aniMurphyTouchRight);
+ subSoundFX(*si, fiBase, actDigging);
+
+ dx1 = aniTouchBase;
+ dxPos = *si + 1;
+ MovHighByte(&PlayField16[*si], 0x13);
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-801,11
+834,12
@@
loc_g_6599:
// ==========================================================================
loc_g_65C6:
// ==========================================================================
loc_g_65C6:
- subSoundFXInfotron();
- dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpRight);
- PlayField16[si - FieldWidth] = 0x903;
- PlayField16[si] = 0x300;
- si = si - FieldWidth;
+ subSoundFX(*si, fiInfotron, actCollecting);
+
+ dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+ PlayField16[*si - FieldWidth] = 0x903;
+ PlayField16[*si] = 0x300;
+ *si = *si - FieldWidth;
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-813,14
+847,12
@@
loc_g_65C6:
// ==========================================================================
loc_g_65FE:
// ==========================================================================
loc_g_65FE:
- subSoundFXInfotron();
- dx = aniEatInfotronLeft;
- dx2 = fiInfotron;
- dx2Step = -1;
- ClearPos = -1;
- PlayField16[si - 1] = 0xA03;
- PlayField16[si] = 0x300;
- si = si - 1;
+ subSoundFX(*si, fiInfotron, actCollecting);
+
+ dx1 = aniEatInfotronLeft;
+ PlayField16[*si - 1] = 0xA03;
+ PlayField16[*si] = 0x300;
+ *si = *si - 1;
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-828,11
+860,12
@@
loc_g_65FE:
// ==========================================================================
loc_g_662A:
// ==========================================================================
loc_g_662A:
- subSoundFXInfotron();
- dx = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpRight);
- PlayField16[si + FieldWidth] = 0xB03;
- PlayField16[si] = 0x300;
- si = si + FieldWidth;
+ subSoundFX(*si, fiInfotron, actCollecting);
+
+ dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft);
+ PlayField16[*si + FieldWidth] = 0xB03;
+ PlayField16[*si] = 0x300;
+ *si = *si + FieldWidth;
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-840,14
+873,12
@@
loc_g_662A:
// ==========================================================================
loc_g_6662:
// ==========================================================================
loc_g_6662:
- subSoundFXInfotron();
- dx = aniEatInfotronRight;
- dx2 = fiInfotron;
- dx2Step = 1;
- ClearPos = -1;
- PlayField16[si + 1] = 0xC03;
- PlayField16[si] = 0x300;
- si = si + 1;
+ subSoundFX(*si, fiInfotron, actCollecting);
+
+ dx1 = aniEatInfotronRight;
+ PlayField16[*si + 1] = 0xC03;
+ PlayField16[*si] = 0x300;
+ *si = *si + 1;
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-855,11
+886,12
@@
loc_g_6662:
// ==========================================================================
loc_g_668E:
// ==========================================================================
loc_g_668E:
- subCopyFieldToScreen(si, aniMurphyTouchUp);
- subSoundFXInfotron();
- dx = aniTouchInfotron;
- MovHighByte(&PlayField16[si], 0x14);
- MovHighByte(&PlayField16[si - FieldWidth], 0xFF);
+ subCopyImageToScreen(*si, aniMurphyTouchUp);
+ subSoundFX(*si, fiInfotron, actCollecting);
+
+ dx1 = aniTouchInfotron;
+ MovHighByte(&PlayField16[*si], 0x14);
+ MovHighByte(&PlayField16[*si - FieldWidth], 0xFF);
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-867,11
+899,12
@@
loc_g_668E:
// ==========================================================================
loc_g_66C0:
// ==========================================================================
loc_g_66C0:
- subCopyFieldToScreen(si, aniMurphyTouchLeft);
- subSoundFXInfotron();
- dx = aniTouchInfotron;
- MovHighByte(&PlayField16[si], 0x15);
- MovHighByte(&PlayField16[si - 1], 0xFF);
+ subCopyImageToScreen(*si, aniMurphyTouchLeft);
+ subSoundFX(*si, fiInfotron, actCollecting);
+
+ dx1 = aniTouchInfotron;
+ MovHighByte(&PlayField16[*si], 0x15);
+ MovHighByte(&PlayField16[*si - 1], 0xFF);
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-879,11
+912,12
@@
loc_g_66C0:
// ==========================================================================
loc_g_66F2:
// ==========================================================================
loc_g_66F2:
- subCopyFieldToScreen(si, aniMurphyTouchDown);
- subSoundFXInfotron();
- dx = aniTouchInfotron;
- MovHighByte(&PlayField16[si], 0x16);
- MovHighByte(&PlayField16[si + FieldWidth], 0xFF);
+ subCopyImageToScreen(*si, aniMurphyTouchDown);
+ subSoundFX(*si, fiInfotron, actCollecting);
+
+ dx1 = aniTouchInfotron;
+ MovHighByte(&PlayField16[*si], 0x16);
+ MovHighByte(&PlayField16[*si + FieldWidth], 0xFF);
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-891,11
+925,12
@@
loc_g_66F2:
// ==========================================================================
loc_g_6724:
// ==========================================================================
loc_g_6724:
- subCopyFieldToScreen(si, aniMurphyTouchRight);
- subSoundFXInfotron();
- dx = aniTouchInfotron;
- MovHighByte(&PlayField16[si], 0x17);
- MovHighByte(&PlayField16[si + 1], 0xFF);
+ subCopyImageToScreen(*si, aniMurphyTouchRight);
+ subSoundFX(*si, fiInfotron, actCollecting);
+
+ dx1 = aniTouchInfotron;
+ MovHighByte(&PlayField16[*si], 0x17);
+ MovHighByte(&PlayField16[*si + 1], 0xFF);
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-909,28
+944,15
@@
loc_g_6756:
MurphyDY = 0;
// end of FS
if (LowByte(InfotronsNeeded) != 0)
MurphyDY = 0;
// end of FS
if (LowByte(InfotronsNeeded) != 0)
- return
subAnimateMurphy
;
+ return;
- subSoundFXExit();
- data_h_DemoDone = 1; // EP set level success bytes
- LevelStatus = 1; // set Level Status DONE
- EP_GameDemoVar0DAA = 0; // force demo for lead-out
- if (SavedGameFlag == 0) // saved game running?
- {
- if (UpdateTimeFlag != 0) // update time?
- {
- UpdatedFlag = 1; // prevent double update
- subUpdatePlayingTime(); // update playing time
- }
- }
+ game_sp.LevelSolved = TRUE;
-#if 0
- subUpdateHallOfFame(); // update time + Hall-Of-Fame
-#endif
+ subSoundFX(*si, fiExit, actPassing);
LeadOutCounter = 0x40; // quit: start lead-out
LeadOutCounter = 0x40; // quit: start lead-out
- dx = aniMurphyExit;
- MovHighByte(&PlayField16[si], 0xD);
+ dx
1
= aniMurphyExit;
+ MovHighByte(&PlayField16[
*
si], 0xD);
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-938,17
+960,17
@@
loc_g_6756:
// ==========================================================================
loc_g_679B:
// ==========================================================================
loc_g_679B:
- ax = PlayField16[si - 2];
+ ax = PlayField16[
*
si - 2];
if (ax != 0)
if (ax != 0)
- return
subAnimateMurphy
;
+ return;
- MovHighByte(&PlayField16[si - 2], 1);
- subCopy
FieldToScreen(
si, aniPushLeft); // draw pushing murphy
- dx = aniZonkRollLeft;
- dxPos = si - 1;
+ MovHighByte(&PlayField16[
*
si - 2], 1);
+ subCopy
ImageToScreen(*
si, aniPushLeft); // draw pushing murphy
+ dx
1
= aniZonkRollLeft;
+ dxPos =
*
si - 1;
dx2 = aniPushLeft;
dx2Step = 1;
dx2 = aniPushLeft;
dx2Step = 1;
- MovHighByte(&PlayField16[si], 0xE);
+ MovHighByte(&PlayField16[
*
si], 0xE);
goto loc_MoveNoSplit;
// ==========================================================================
goto loc_MoveNoSplit;
// ==========================================================================
@@
-956,21
+978,21
@@
loc_g_679B:
// ==========================================================================
loc_g_67D4:
// ==========================================================================
loc_g_67D4:
- ax = PlayField16[si + 2];
+ ax = PlayField16[
*
si + 2];
if (ax != 0)
if (ax != 0)
- return
subAnimateMurphy
;
+ return;
- ax = PlayField16[si + FieldWidth + 1];
+ ax = PlayField16[
*
si + FieldWidth + 1];
if (ax == 0) // zonk falls
if (ax == 0) // zonk falls
- return
subAnimateMurphy
;
+ return;
- MovHighByte(&PlayField16[si + 2], 1);
- subCopy
FieldToScreen(
si, aniPushRight); // draw pushing murphy
- dx = aniZonkRollRight;
- dxPos = si + 1;
+ MovHighByte(&PlayField16[
*
si + 2], 1);
+ subCopy
ImageToScreen(*
si, aniPushRight); // draw pushing murphy
+ dx
1
= aniZonkRollRight;
+ dxPos =
*
si + 1;
dx2 = aniPushRight;
dx2Step = -1;
dx2 = aniPushRight;
dx2Step = -1;
- MovHighByte(&PlayField16[si], 0xF);
+ MovHighByte(&PlayField16[
*
si], 0xF);
goto loc_MoveNoSplit;
// ==========================================================================
goto loc_MoveNoSplit;
// ==========================================================================
@@
-978,15
+1000,17
@@
loc_g_67D4:
// ==========================================================================
loc_g_6817:
// ==========================================================================
loc_g_6817:
- subCopy
FieldToScreen(
si, aniMurphyTouchUp);
+ subCopy
ImageToScreen(*
si, aniMurphyTouchUp);
if (YellowDisksExploded != 0)
{
if (YellowDisksExploded != 0)
{
- YawnSleepCounter = 10; // stay hypnotized
- return subAnimateMurphy;
+ YawnSleepCounter = 40; // stay hypnotized
+
+ return;
} // loc_g_6838:
} // loc_g_6838:
- subCopyFieldToScreen(si - FieldWidth, 0x88); // draw new terminal type
- TerminalState[si - FieldWidth] = 8;
+ // draw new terminal type
+ GfxGraphic[GetX(*si - FieldWidth)][GetY(*si - FieldWidth)] = aniTerminalActive;
+ TerminalState[*si - FieldWidth] = 8;
goto loc_g_68F0;
// ==========================================================================
goto loc_g_68F0;
// ==========================================================================
@@
-994,15
+1018,17
@@
loc_g_6817:
// ==========================================================================
loc_g_684E:
// ==========================================================================
loc_g_684E:
- subCopy
FieldToScreen(
si, aniMurphyTouchLeft);
+ subCopy
ImageToScreen(*
si, aniMurphyTouchLeft);
if (YellowDisksExploded != 0)
{
if (YellowDisksExploded != 0)
{
- YawnSleepCounter = 10; // stay hypnotized
- return subAnimateMurphy;
+ YawnSleepCounter = 40; // stay hypnotized
+
+ return;
} // loc_g_6838:
} // loc_g_6838:
- subCopyFieldToScreen(si - 1, 0x88); // draw new terminal type
- TerminalState[si - 1] = 8;
+ // draw new terminal type
+ GfxGraphic[GetX(*si - 1)][GetY(*si - 1)] = aniTerminalActive;
+ TerminalState[*si - 1] = 8;
goto loc_g_68F0;
// ==========================================================================
goto loc_g_68F0;
// ==========================================================================
@@
-1010,15
+1036,17
@@
loc_g_684E:
// ==========================================================================
loc_g_6884:
// ==========================================================================
loc_g_6884:
- subCopy
FieldToScreen(
si, aniMurphyTouchDown);
+ subCopy
ImageToScreen(*
si, aniMurphyTouchDown);
if (YellowDisksExploded != 0)
{
if (YellowDisksExploded != 0)
{
- YawnSleepCounter = 10; // stay hypnotized
- return subAnimateMurphy;
+ YawnSleepCounter = 40; // stay hypnotized
+
+ return;
} // loc_g_6838:
} // loc_g_6838:
- subCopyFieldToScreen(si + FieldWidth, 0x88); // draw new terminal type
- TerminalState[si + FieldWidth] = 8;
+ // draw new terminal type
+ GfxGraphic[GetX(*si + FieldWidth)][GetY(*si + FieldWidth)] = aniTerminalActive;
+ TerminalState[*si + FieldWidth] = 8;
goto loc_g_68F0;
// ==========================================================================
goto loc_g_68F0;
// ==========================================================================
@@
-1026,15
+1054,17
@@
loc_g_6884:
// ==========================================================================
loc_g_68BA:
// ==========================================================================
loc_g_68BA:
- subCopy
FieldToScreen(
si, aniMurphyTouchRight);
+ subCopy
ImageToScreen(*
si, aniMurphyTouchRight);
if (YellowDisksExploded != 0)
{
if (YellowDisksExploded != 0)
{
- YawnSleepCounter = 10; // stay hypnotized
- return subAnimateMurphy;
+ YawnSleepCounter = 40; // stay hypnotized
+
+ return;
} // loc_g_6838:
} // loc_g_6838:
- subCopyFieldToScreen(si + 1, 0x88); // draw new terminal type
- TerminalState[si + 1] = 8;
+ // draw new terminal type
+ GfxGraphic[GetX(*si + 1)][GetY(*si + 1)] = aniTerminalActive;
+ TerminalState[*si + 1] = 8;
// ==========================================================================
// common TERMINAL stuff moving/touching from all directions
// ==========================================================================
// ==========================================================================
// common TERMINAL stuff moving/touching from all directions
// ==========================================================================
@@
-1048,20
+1078,20
@@
loc_g_68F0:
ExplodeFieldSP (i);
}
ExplodeFieldSP (i);
}
- return
subAnimateMurphy
;
+ return;
// ==========================================================================
// PORT down to up, VERTICAL PORT, CROSS PORT all moving down to up
// ==========================================================================
loc_g_6916:
// ==========================================================================
// PORT down to up, VERTICAL PORT, CROSS PORT all moving down to up
// ==========================================================================
loc_g_6916:
- if (PlayField16[si - 2 * FieldWidth] != 0)
- return
subAnimateMurphy
;
+ if (PlayField16[
*
si - 2 * FieldWidth] != 0)
+ return;
- dx = aniSplitUpDown;
+ dx
1
= aniSplitUpDown;
dx2Step = -FieldWidth;
dx2Step = -FieldWidth;
- PlayField16[si] = 0x1803;
- PlayField16[si - 2 * FieldWidth] = 0x300;
+ PlayField16[
*
si] = 0x1803;
+ PlayField16[
*
si - 2 * FieldWidth] = 0x300;
goto loc_StopSplit;
// ==========================================================================
goto loc_StopSplit;
// ==========================================================================
@@
-1069,13
+1099,13
@@
loc_g_6916:
// ==========================================================================
loc_g_693A:
// ==========================================================================
loc_g_693A:
- if (PlayField16[si - 2] != 0)
- return
subAnimateMurphy
;
+ if (PlayField16[
*
si - 2] != 0)
+ return;
- dx
= aniMurphyEat
Left;
+ dx
1 = aniMurphyMove
Left;
dx2Step = -1;
dx2Step = -1;
- PlayField16[si] = 0x1903;
- PlayField16[si - 2] = 0x300;
+ PlayField16[
*
si] = 0x1903;
+ PlayField16[
*
si - 2] = 0x300;
goto loc_StopSplit;
// ==========================================================================
goto loc_StopSplit;
// ==========================================================================
@@
-1083,13
+1113,13
@@
loc_g_693A:
// ==========================================================================
loc_g_695E:
// ==========================================================================
loc_g_695E:
- if (PlayField16[si + 2 * FieldWidth] != 0)
- return
subAnimateMurphy
;
+ if (PlayField16[
*
si + 2 * FieldWidth] != 0)
+ return;
- dx = aniSplitUpDown;
+ dx
1
= aniSplitUpDown;
dx2Step = FieldWidth;
dx2Step = FieldWidth;
- PlayField16[si] = 0x1A03;
- PlayField16[si + 2 * FieldWidth] = 0x300;
+ PlayField16[
*
si] = 0x1A03;
+ PlayField16[
*
si + 2 * FieldWidth] = 0x300;
goto loc_StopSplit;
// ==========================================================================
goto loc_StopSplit;
// ==========================================================================
@@
-1097,13
+1127,13
@@
loc_g_695E:
// ==========================================================================
loc_g_6982:
// ==========================================================================
loc_g_6982:
- if (PlayField16[si + 2] != 0)
- return
subAnimateMurphy
;
+ if (PlayField16[
*
si + 2] != 0)
+ return;
- dx
= aniMurphyEat
Right;
+ dx
1 = aniMurphyMove
Right;
dx2Step = 1;
dx2Step = 1;
- PlayField16[si] = 0x1B03;
- PlayField16[si + 2] = 0x300;
+ PlayField16[
*
si] = 0x1B03;
+ PlayField16[
*
si + 2] = 0x300;
loc_StopSplit:
MovingPictureSequencePhase = 0; // stop picture move sequence
loc_StopSplit:
MovingPictureSequencePhase = 0; // stop picture move sequence
@@
-1115,9
+1145,9
@@
loc_StopSplit:
// ==========================================================================
loc_g_69A6:
// ==========================================================================
loc_g_69A6:
- dx
= (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpRigh
t);
- PlayField16[si] = 0x1C03;
- PlayField16[si - FieldWidth] = 0x300;
+ dx
1 = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLef
t);
+ PlayField16[
*
si] = 0x1C03;
+ PlayField16[
*
si - FieldWidth] = 0x300;
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-1125,10
+1155,10
@@
loc_g_69A6:
// ==========================================================================
loc_g_69CE:
// ==========================================================================
loc_g_69CE:
- dx = aniMurphyEatLeft;
- PlayField16[si] = 0x300; // !!!!!! this time we move murphy at sequence-start!
- PlayField16[si - 1] = 0x1D03;
-
si =
si - 1;
+ dx
1
= aniMurphyEatLeft;
+ PlayField16[
*
si] = 0x300; // !!!!!! this time we move murphy at sequence-start!
+ PlayField16[
*
si - 1] = 0x1D03;
+
*si = *
si - 1;
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-1136,9
+1166,9
@@
loc_g_69CE:
// ==========================================================================
loc_g_69F7:
// ==========================================================================
loc_g_69F7:
- dx
= (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpRigh
t);
- PlayField16[si] = 0x1E03;
- PlayField16[si + FieldWidth] = 0x300;
+ dx
1 = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLef
t);
+ PlayField16[
*
si] = 0x1E03;
+ PlayField16[
*
si + FieldWidth] = 0x300;
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-1147,7
+1177,7
@@
loc_g_69F7:
loc_g_6A1F:
// dx = aniMurphyEatRightRedDisk 'this sequence is 9 steps long!
loc_g_6A1F:
// dx = aniMurphyEatRightRedDisk 'this sequence is 9 steps long!
- dx = aniMurphyEatRight;
+ dx
1
= aniMurphyEatRight;
// --------------------------------------------------------------------------
// BugFix
// Table data_h_145A, pointed to by table data_h_105E, has a severe bug:
// --------------------------------------------------------------------------
// BugFix
// Table data_h_145A, pointed to by table data_h_105E, has a severe bug:
@@
-1158,16
+1188,17
@@
loc_g_6A1F:
// We only correct Murphies x-location here, when the sequence starts.
// Remember that this is not the real bug-fix, but we must live with
// this existing bug and correct for the consequences of it.
// We only correct Murphies x-location here, when the sequence starts.
// Remember that this is not the real bug-fix, but we must live with
// this existing bug and correct for the consequences of it.
- if (0 == AllowEatRightRedDiskBug) // Murphy's screen x-position
- MurphyScreenXPos = MurphyScreenXPos - 2;
+
+ if (AllowEatRightRedDiskBug == 0) // Murphy's screen x-position
+ MurphyScreenXPos = MurphyScreenXPos - 2 * MurphyZoomFactor;
SeqPos = -1;
// FS: for me this means to blit the first animation frame twice
// end of BugFix
// --------------------------------------------------------------------------
SeqPos = -1;
// FS: for me this means to blit the first animation frame twice
// end of BugFix
// --------------------------------------------------------------------------
- PlayField16[si] = 0x300; // !!!!!! this time we move murphy at sequence-start!
- PlayField16[si + 1] = 0x1F03;
-
si =
si + 1;
+ PlayField16[
*
si] = 0x300; // !!!!!! this time we move murphy at sequence-start!
+ PlayField16[
*
si + 1] = 0x1F03;
+
*si = *
si + 1;
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-1175,9
+1206,9
@@
loc_g_6A1F:
// ==========================================================================
loc_g_6A48:
// ==========================================================================
loc_g_6A48:
- dx = aniTouchRedDisk;
- MovHighByte(&PlayField16[si], 0x20);
- MovHighByte(&PlayField16[si - FieldWidth], 3);
+ dx
1
= aniTouchRedDisk;
+ MovHighByte(&PlayField16[
*
si], 0x20);
+ MovHighByte(&PlayField16[
*
si - FieldWidth], 3);
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-1185,9
+1216,9
@@
loc_g_6A48:
// ==========================================================================
loc_g_6A64:
// ==========================================================================
loc_g_6A64:
- dx = aniTouchRedDisk;
- MovHighByte(&PlayField16[si], 0x21);
- MovHighByte(&PlayField16[si - 1], 3);
+ dx
1
= aniTouchRedDisk;
+ MovHighByte(&PlayField16[
*
si], 0x21);
+ MovHighByte(&PlayField16[
*
si - 1], 3);
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-1195,9
+1226,9
@@
loc_g_6A64:
// ==========================================================================
loc_g_6A80:
// ==========================================================================
loc_g_6A80:
- dx = aniTouchRedDisk;
- MovHighByte(&PlayField16[si], 0x22);
- MovHighByte(&PlayField16[si + FieldWidth], 3);
+ dx
1
= aniTouchRedDisk;
+ MovHighByte(&PlayField16[
*
si], 0x22);
+ MovHighByte(&PlayField16[
*
si + FieldWidth], 3);
goto loc_StopNoSplit;
// ==========================================================================
goto loc_StopNoSplit;
// ==========================================================================
@@
-1205,9
+1236,9
@@
loc_g_6A80:
// ==========================================================================
loc_g_6A9C:
// ==========================================================================
loc_g_6A9C:
- dx = aniTouchRedDisk;
- MovHighByte(&PlayField16[si], 0x23);
- MovHighByte(&PlayField16[si + 1], 3);
+ dx
1
= aniTouchRedDisk;
+ MovHighByte(&PlayField16[
*
si], 0x23);
+ MovHighByte(&PlayField16[
*
si + 1], 3);
loc_StopNoSplit:
MovingPictureSequencePhase = 0; // stop picture move sequence
loc_StopNoSplit:
MovingPictureSequencePhase = 0; // stop picture move sequence
@@
-1218,16
+1249,16
@@
loc_StopNoSplit:
// ==========================================================================
loc_g_6AB8:
// ==========================================================================
loc_g_6AB8:
- if (PlayField16[si - 2 * FieldWidth] != 0)
- return subAnimateMurphy;
-
- PlayField16[si - 2 * FieldWidth] = 0x1200;
- subCopyFieldToScreen(si, aniPushRight);
- dx = aniYellowDisk;
- dxPos = si - FieldWidth;
- dx2 = aniPushUpDown;
+ if (PlayField16[*si - 2 * FieldWidth] != 0)
+ return;
+
+ PlayField16[*si - 2 * FieldWidth] = 0x1200;
+ dx1 = aniYellowDisk;
+ dxPos = *si - FieldWidth;
+ dx2 = (MurphyVarFaceLeft == 0 ? aniPushRight : aniPushLeft);
dx2Step = FieldWidth;
dx2Step = FieldWidth;
- PlayField16[si] = 0x2403;
+ PlayField16[*si] = 0x2403;
+ subCopyImageToScreen(*si, dx2);
goto loc_MoveNoSplit;
// ==========================================================================
goto loc_MoveNoSplit;
// ==========================================================================
@@
-1235,16
+1266,16
@@
loc_g_6AB8:
// ==========================================================================
loc_g_6AF1:
// ==========================================================================
loc_g_6AF1:
- if (PlayField16[si - 2] != 0)
- return
subAnimateMurphy
;
+ if (PlayField16[
*
si - 2] != 0)
+ return;
- PlayField16[si - 2] = 0x1200;
- subCopy
FieldToScreen(
si, aniPushLeft);
- dx = aniYellowDisk;
- dxPos = si - 1;
+ PlayField16[
*
si - 2] = 0x1200;
+ subCopy
ImageToScreen(*
si, aniPushLeft);
+ dx
1
= aniYellowDisk;
+ dxPos =
*
si - 1;
dx2 = aniPushLeft;
dx2Step = 1;
dx2 = aniPushLeft;
dx2Step = 1;
- PlayField16[si] = 0x2503;
+ PlayField16[
*
si] = 0x2503;
goto loc_MoveNoSplit;
// ==========================================================================
goto loc_MoveNoSplit;
// ==========================================================================
@@
-1252,16
+1283,16
@@
loc_g_6AF1:
// ==========================================================================
loc_g_6B2A:
// ==========================================================================
loc_g_6B2A:
- if (PlayField16[si + 2 * FieldWidth] != 0)
- return subAnimateMurphy;
-
- PlayField16[si + 2 * FieldWidth] = 0x1200;
- subCopyFieldToScreen(si, aniPushRight);
- dx = aniYellowDisk;
- dxPos = si + FieldWidth;
- dx2 = aniPushUpDown;
+ if (PlayField16[*si + 2 * FieldWidth] != 0)
+ return;
+
+ PlayField16[*si + 2 * FieldWidth] = 0x1200;
+ dx1 = aniYellowDisk;
+ dxPos = *si + FieldWidth;
+ dx2 = (MurphyVarFaceLeft == 0 ? aniPushRight : aniPushLeft);
dx2Step = -FieldWidth;
dx2Step = -FieldWidth;
- PlayField16[si] = 0x2703;
+ PlayField16[*si] = 0x2703;
+ subCopyImageToScreen(*si, dx2);
goto loc_MoveNoSplit;
// ==========================================================================
goto loc_MoveNoSplit;
// ==========================================================================
@@
-1269,16
+1300,16
@@
loc_g_6B2A:
// ==========================================================================
loc_g_6B63:
// ==========================================================================
loc_g_6B63:
- if (PlayField16[si + 2] != 0)
- return
subAnimateMurphy
;
+ if (PlayField16[
*
si + 2] != 0)
+ return;
- PlayField16[si + 2] = 0x1200;
- subCopy
FieldToScreen(
si, aniPushRight);
- dx = aniYellowDisk;
- dxPos = si + 1;
+ PlayField16[
*
si + 2] = 0x1200;
+ subCopy
ImageToScreen(*
si, aniPushRight);
+ dx
1
= aniYellowDisk;
+ dxPos =
*
si + 1;
dx2 = aniPushRight;
dx2Step = -1;
dx2 = aniPushRight;
dx2Step = -1;
- PlayField16[si] = 0x2603;
+ PlayField16[
*
si] = 0x2603;
goto loc_MoveNoSplit;
// ==========================================================================
goto loc_MoveNoSplit;
// ==========================================================================
@@
-1286,16
+1317,16
@@
loc_g_6B63:
// ==========================================================================
loc_g_6B9B:
// ==========================================================================
loc_g_6B9B:
- if (PlayField16[si - 2] != 0)
- return
subAnimateMurphy
;
+ if (PlayField16[
*
si - 2] != 0)
+ return;
- PlayField16[si - 2] = 0x800;
- subCopy
FieldToScreen(
si, aniPushLeft);
- dx = aniOrangeDisk;
- dxPos = si - 1;
+ PlayField16[
*
si - 2] = 0x800;
+ subCopy
ImageToScreen(*
si, aniPushLeft);
+ dx
1
= aniOrangeDisk;
+ dxPos =
*
si - 1;
dx2 = aniPushLeft;
dx2Step = 1;
dx2 = aniPushLeft;
dx2Step = 1;
- PlayField16[si] = 0x2803;
+ PlayField16[
*
si] = 0x2803;
goto loc_MoveNoSplit;
// ==========================================================================
goto loc_MoveNoSplit;
// ==========================================================================
@@
-1303,19
+1334,19
@@
loc_g_6B9B:
// ==========================================================================
loc_g_6BD3:
// ==========================================================================
loc_g_6BD3:
- if (PlayField16[si + 2] != 0)
- return
subAnimateMurphy
;
+ if (PlayField16[
*
si + 2] != 0)
+ return;
- if (PlayField16[si + FieldWidth + 1] == 0) // falling goes before pushing
- return
subAnimateMurphy
;
+ if (PlayField16[
*
si + FieldWidth + 1] == 0) // falling goes before pushing
+ return;
- PlayField16[si + 2] = 0x100;
- subCopy
FieldToScreen(
si, aniPushRight);
- dx = aniOrangeDisk;
- dxPos = si + 1;
+ PlayField16[
*
si + 2] = 0x100;
+ subCopy
ImageToScreen(*
si, aniPushRight);
+ dx
1
= aniOrangeDisk;
+ dxPos =
*
si + 1;
dx2 = aniPushRight;
dx2Step = -1;
dx2 = aniPushRight;
dx2Step = -1;
- PlayField16[si] = 0x2903;
+ PlayField16[
*
si] = 0x2903;
// ==========================================================================
// Copy screen animation action table to action work space
// (To paint sequence: Push Zonk/Disk / release red disk / Port passing)
// ==========================================================================
// Copy screen animation action table to action work space
// (To paint sequence: Push Zonk/Disk / release red disk / Port passing)
@@
-1342,10
+1373,34
@@
locProceedMovingMurphy: // proceed moving murphy
ax = ax - 1; // next picture of sequence
MovingPictureSequencePhase = ax; // store for later
ax = ax - 1; // next picture of sequence
MovingPictureSequencePhase = ax; // store for later
+
if (ax == 0) // Sound effects
if (ax == 0) // Sound effects
- subSoundFXPush();
+ {
+ switch (HighByte(PlayField16[*si]))
+ {
+ case 0xE:
+ case 0xF:
+ subSoundFX(*si, fiZonk, actPushing);
+ break;
+
+ case 0x28:
+ case 0x29:
+ subSoundFX(*si, fiOrangeDisk, actPushing);
+ break;
+
+ case 0x24:
+ case 0x25:
+ case 0x26:
+ case 0x27:
+ subSoundFX(*si, fiYellowDisk, actPushing);
+ break;
+
+ default:
+ break;
+ }
+ }
- bl = HighByte(PlayField16[si]);
+ bl = HighByte(PlayField16[
*
si]);
if (bl == 0xE) // Push Zonk to left
goto loc_g_6F7E;
if (bl == 0xE) // Push Zonk to left
goto loc_g_6F7E;
@@
-1373,50
+1428,49
@@
locProceedMovingMurphy: // proceed moving murphy
if (bl == 0x2A) // Red disk release timer
goto loc_g_716E;
if (bl == 0x2A) // Red disk release timer
goto loc_g_716E;
- return
subAnimateMurphy
;
+ return;
// ==========================================================================
// Paint frame of MOVING.DAT sequence
// ==========================================================================
loc_g_6C8F:
// ==========================================================================
// Paint frame of MOVING.DAT sequence
// ==========================================================================
loc_g_6C8F:
+
+ if (SeqPos <= 0)
+ dx1SequenceLength = getSequenceLength(dx1);
+
if (SplitMoveFlag == 0)
{
// ++++++++++++++++++++++++++
// Begin of normal movement
if (SplitMoveFlag == 0)
{
// ++++++++++++++++++++++++++
// Begin of normal movement
- MurphyScreenXPos = MurphyScreenXPos + MurphyDX;
- MurphyScreenYPos = MurphyScreenYPos + MurphyDY;
- if (! ClearPos < 0) // clear field that murphy is leaving
- subCopyFieldToScreen(ClearPos, 0);
+ MurphyScreenXPos = MurphyScreenXPos + MurphyDX * MurphyZoomFactor;
+ MurphyScreenYPos = MurphyScreenYPos + MurphyDY * MurphyZoomFactor;
- if (dx2 == fiInfotron) // special case of infotron moving left or right
- {
- tDeltaX = 0;
- tDeltaY = 0;
- }
- else
- {
- tDeltaX = MurphyDX * LocalStretch * (SeqPos + 1);
- tDeltaY = MurphyDY * LocalStretch * (SeqPos + 1);
- }
+ if (!(ClearPos < 0)) // clear field that murphy is leaving
+ subCopyImageToScreen(ClearPos, aniSpace);
+
+ tDeltaX = MurphyDX * LocalStretch * (SeqPos + 1);
+ tDeltaY = MurphyDY * LocalStretch * (SeqPos + 1);
X = GetStretchX(dxPos) + tDeltaX;
Y = GetStretchY(dxPos) + tDeltaY;
X = GetStretchX(dxPos) + tDeltaX;
Y = GetStretchY(dxPos) + tDeltaY;
- Tmp = (SeqPos < 0 ? 0 : 0); // 9StepBugFix!(red disk move right)
- StretchedSprites.BltEx(X, Y, dx[Tmp]);
- if (! dx2 < 0)
+ Tmp = (SeqPos < 0 ? 0 : SeqPos); // 9StepBugFix!(red disk move right)
+
+ if (isSnappingSequence(dx1) && SeqPos == dx1SequenceLength - 1)
+ dx1 = aniSpace;
+
+ DDSpriteBuffer_BltImg(X, Y, dx1, Tmp);
+ GfxGraphic[GetX(*si)][GetY(*si)] = -1; // (Murphy's position)
+ GfxGraphic[GetX(dxPos)][GetY(dxPos)] = -1; // (snapping position)
+
+ if (!(dx2 < 0))
{
tPos = dxPos + dx2Step;
X = GetStretchX(tPos);
Y = GetStretchY(tPos);
{
tPos = dxPos + dx2Step;
X = GetStretchX(tPos);
Y = GetStretchY(tPos);
- if (dx2 == fiInfotron) // special case of infotron moving left or right
- {
- StretchedSprites.BltEx(X, Y, dx[SeqPos] + dx2Step);
- }
- else // pushing something
- {
- StretchedSprites.BltEx(X + tDeltaX, Y + tDeltaY, dx2);
- }
+
+ // (SeqPos iterates from 0 to 7 while pushing)
+ DDSpriteBuffer_BltImg(X + tDeltaX, Y + tDeltaY, dx2, SeqPos);
}
// End of normal movement
}
// End of normal movement
@@
-1426,32
+1480,33
@@
loc_g_6C8F:
{
// ++++++++++++++++++++++++++++++++
// Begin of split movement (port)
{
// ++++++++++++++++++++++++++++++++
// Begin of split movement (port)
- MurphyScreenXPos = MurphyScreenXPos + 2 * MurphyDX;
- MurphyScreenYPos = MurphyScreenYPos + 2 * MurphyDY;
- subCopy
FieldToScreen(ClearPos, 0
); // clear the field that murphy leaves
+ MurphyScreenXPos = MurphyScreenXPos + 2 * MurphyDX
* MurphyZoomFactor
;
+ MurphyScreenYPos = MurphyScreenYPos + 2 * MurphyDY
* MurphyZoomFactor
;
+ subCopy
ImageToScreen(ClearPos, aniSpace
); // clear the field that murphy leaves
tDeltaX = MurphyDX * LocalStretch * (SeqPos + 1);
tDeltaY = MurphyDY * LocalStretch * (SeqPos + 1);
X = GetStretchX(dxPos) + tDeltaX;
Y = GetStretchY(dxPos) + tDeltaY;
tDeltaX = MurphyDX * LocalStretch * (SeqPos + 1);
tDeltaY = MurphyDY * LocalStretch * (SeqPos + 1);
X = GetStretchX(dxPos) + tDeltaX;
Y = GetStretchY(dxPos) + tDeltaY;
- StretchedSprites.BltEx(X, Y, dx[SeqPos]); // plot first murphy
+ DDSpriteBuffer_BltImg(X, Y, dx1, SeqPos); // plot first murphy
+
tPos = dxPos + dx2Step;
X = GetStretchX(tPos);
Y = GetStretchY(tPos);
tPos = dxPos + dx2Step;
X = GetStretchX(tPos);
Y = GetStretchY(tPos);
-
StretchedSprites.BltEx(X + tDeltaX, Y + tDeltaY, dx[SeqPos]
); // plot second murphy
-
StretchedSprites.BltEx(X, Y, LowByte(PlayField16[tPos])
); // replot the port on top
+
DDSpriteBuffer_BltImg(X + tDeltaX, Y + tDeltaY, dx1, SeqPos
); // plot second murphy
+
DDSpriteBuffer_BltImg(X, Y, fiGraphic[LowByte(PlayField16[tPos])], 0
); // replot the port on top
// End of split movement (port)
// ------------------------------
} // loc_g_6D1E:'loc_g_6D28:
SeqPos = SeqPos + 1;
// End of split movement (port)
// ------------------------------
} // loc_g_6D1E:'loc_g_6D28:
SeqPos = SeqPos + 1;
- if (
dx[SeqPos] > -1
)
- return
subAnimateMurphy
;
+ if (
SeqPos < dx1SequenceLength
)
+ return;
// Follow-up after movement completed 'loc_g_6D35:
MurphyXPos = MurphyXPos + MurphyDX;
MurphyYPos = MurphyYPos + MurphyDY;
// Follow-up after movement completed 'loc_g_6D35:
MurphyXPos = MurphyXPos + MurphyDX;
MurphyYPos = MurphyYPos + MurphyDY;
- bl = HighByte(PlayField16[si]); // animation phase
- MovHighByte(&PlayField16[si], 0);
+ bl = HighByte(PlayField16[
*
si]); // animation phase
+ MovHighByte(&PlayField16[
*
si], 0);
if (bl == 0x1) // space, moving up
goto loc_g_6EC8;
if (bl == 0x1) // space, moving up
goto loc_g_6EC8;
@@
-1580,7
+1635,8
@@
loc_g_6C8F:
goto loc_g_747F;
ExitToMenuFlag = 1;
goto loc_g_747F;
ExitToMenuFlag = 1;
- return subAnimateMurphy;
+
+ return;
// ==========================================================================
// infotron, moving up
// ==========================================================================
// infotron, moving up
@@
-1590,11
+1646,11
@@
loc_g_6EBA:
if (0 < LowByte(InfotronsNeeded))
InfotronsNeeded = InfotronsNeeded - 1;
if (0 < LowByte(InfotronsNeeded))
InfotronsNeeded = InfotronsNeeded - 1;
- subDisplayInfotronsNeeded();
loc_g_6EC8: // space, base
loc_g_6EC8: // space, base
- PlayField16[si] = fiMurphy;
- subAdjustZonksInfotronsAboveMurphy(si + FieldWidth);
- return subAnimateMurphy;
+ PlayField16[*si] = fiMurphy;
+ subAdjustZonksInfotronsAboveMurphy(*si + FieldWidth);
+
+ return;
// ==========================================================================
// infotron, moving left
// ==========================================================================
// infotron, moving left
@@
-1604,11
+1660,11
@@
loc_g_6ED8:
if (0 < LowByte(InfotronsNeeded))
InfotronsNeeded = InfotronsNeeded - 1;
if (0 < LowByte(InfotronsNeeded))
InfotronsNeeded = InfotronsNeeded - 1;
- subDisplayInfotronsNeeded();
loc_g_6EE6: // space, base
loc_g_6EE6: // space, base
- PlayField16[si] = fiMurphy;
- subAdjustZonksInfotronsAboveMurphy(si + 1);
- return subAnimateMurphy;
+ PlayField16[*si] = fiMurphy;
+ subAdjustZonksInfotronsAboveMurphy(*si + 1);
+
+ return;
// ==========================================================================
// infotron, moving down
// ==========================================================================
// infotron, moving down
@@
-1618,13
+1674,13
@@
loc_g_6EF6:
if (0 < LowByte(InfotronsNeeded))
InfotronsNeeded = InfotronsNeeded - 1;
if (0 < LowByte(InfotronsNeeded))
InfotronsNeeded = InfotronsNeeded - 1;
- subDisplayInfotronsNeeded();
loc_g_6F04: // space, base
loc_g_6F04: // space, base
- if (LowByte(PlayField16[si - FieldWidth]) != fiExplosion)
- PlayField16[si - FieldWidth] = 0;
+ if (LowByte(PlayField16[
*
si - FieldWidth]) != fiExplosion)
+ PlayField16[
*
si - FieldWidth] = 0;
- PlayField16[si] = fiMurphy;
- return subAnimateMurphy;
+ PlayField16[*si] = fiMurphy;
+
+ return;
// ==========================================================================
// infotron, moving right
// ==========================================================================
// infotron, moving right
@@
-1634,11
+1690,11
@@
loc_g_71B6:
if (0 < LowByte(InfotronsNeeded))
InfotronsNeeded = InfotronsNeeded - 1;
if (0 < LowByte(InfotronsNeeded))
InfotronsNeeded = InfotronsNeeded - 1;
- subDisplayInfotronsNeeded();
loc_g_71C4: // space, base
loc_g_71C4: // space, base
- subAdjustZonksInfotronsAboveMurphy(si - 1);
- PlayField16[si] = fiMurphy;
- return subAnimateMurphy;
+ subAdjustZonksInfotronsAboveMurphy(*si - 1);
+ PlayField16[*si] = fiMurphy;
+
+ return;
// ==========================================================================
// infotron, touching up
// ==========================================================================
// infotron, touching up
@@
-1648,12
+1704,11
@@
loc_g_71D4:
if (0 < LowByte(InfotronsNeeded))
InfotronsNeeded = InfotronsNeeded - 1;
if (0 < LowByte(InfotronsNeeded))
InfotronsNeeded = InfotronsNeeded - 1;
- subDisplayInfotronsNeeded();
loc_g_71E2: // base
loc_g_71E2: // base
- if (LowByte(PlayField16[si - FieldWidth]) != fiExplosion)
- PlayField16[si - FieldWidth] = 0;
+ if (LowByte(PlayField16[
*
si - FieldWidth]) != fiExplosion)
+ PlayField16[
*
si - FieldWidth] = 0;
- return
subAnimateMurphy
;
+ return;
// ==========================================================================
// infotron, touching left
// ==========================================================================
// infotron, touching left
@@
-1663,12
+1718,11
@@
loc_g_71F0:
if (0 < LowByte(InfotronsNeeded))
InfotronsNeeded = InfotronsNeeded - 1;
if (0 < LowByte(InfotronsNeeded))
InfotronsNeeded = InfotronsNeeded - 1;
- subDisplayInfotronsNeeded();
loc_g_71FE: // base
loc_g_71FE: // base
- if (LowByte(PlayField16[si - 1]) != fiExplosion)
- PlayField16[si - 1] = 0;
+ if (LowByte(PlayField16[
*
si - 1]) != fiExplosion)
+ PlayField16[
*
si - 1] = 0;
- return
subAnimateMurphy
;
+ return;
// ==========================================================================
// infotron, touching down
// ==========================================================================
// infotron, touching down
@@
-1678,12
+1732,11
@@
loc_g_720C:
if (0 < LowByte(InfotronsNeeded))
InfotronsNeeded = InfotronsNeeded - 1;
if (0 < LowByte(InfotronsNeeded))
InfotronsNeeded = InfotronsNeeded - 1;
- subDisplayInfotronsNeeded();
loc_g_721A: // base
loc_g_721A: // base
- if (LowByte(PlayField16[si + FieldWidth]) != fiExplosion)
- PlayField16[si + FieldWidth] = 0;
+ if (LowByte(PlayField16[
*
si + FieldWidth]) != fiExplosion)
+ PlayField16[
*
si + FieldWidth] = 0;
- return
subAnimateMurphy
;
+ return;
// ==========================================================================
// infotron, touching right
// ==========================================================================
// infotron, touching right
@@
-1693,40
+1746,41
@@
loc_g_7228:
if (0 < LowByte(InfotronsNeeded))
InfotronsNeeded = InfotronsNeeded - 1;
if (0 < LowByte(InfotronsNeeded))
InfotronsNeeded = InfotronsNeeded - 1;
- subDisplayInfotronsNeeded();
loc_g_7236: // base
loc_g_7236: // base
- if (LowByte(PlayField16[si + 1]) != fiExplosion)
- PlayField16[si + 1] = 0;
+ if (LowByte(PlayField16[
*
si + 1]) != fiExplosion)
+ PlayField16[
*
si + 1] = 0;
- return
subAnimateMurphy
;
+ return;
// ==========================================================================
// zonk, pushing left
// ==========================================================================
loc_g_6F18:
// ==========================================================================
// zonk, pushing left
// ==========================================================================
loc_g_6F18:
- if (LowByte(PlayField16[si]) != fiExplosion)
- PlayField16[si] = 0;
+ if (LowByte(PlayField16[*si]) != fiExplosion)
+ PlayField16[*si] = 0;
+
+ PlayField16[*si - 1] = fiMurphy;
+ PlayField16[*si - 2] = fiZonk;
+ subExplodeSnikSnaksBelow(*si - 2);
+ *si = *si - 1;
- PlayField16[si - 1] = fiMurphy;
- PlayField16[si - 2] = fiZonk;
- subExplodeSnikSnaksBelow(si - 2);
- si = si - 1;
- return subAnimateMurphy;
+ return;
// ==========================================================================
// zonk, pushing right
// ==========================================================================
loc_g_6F3B:
// ==========================================================================
// zonk, pushing right
// ==========================================================================
loc_g_6F3B:
- if (LowByte(PlayField16[si]) != fiExplosion)
- PlayField16[si] = 0;
+ if (LowByte(PlayField16[
*
si]) != fiExplosion)
+ PlayField16[
*
si] = 0;
- PlayField16[si + 1] = fiMurphy;
- PlayField16[si + 2] = fiZonk;
- subExplodeSnikSnaksBelow(si + 2);
- si = si + 1;
- return subAnimateMurphy;
+ PlayField16[*si + 1] = fiMurphy;
+ PlayField16[*si + 2] = fiZonk;
+ subExplodeSnikSnaksBelow(*si + 2);
+ *si = *si + 1;
+
+ return;
// ==========================================================================
// exit
// ==========================================================================
// exit
@@
-1734,135
+1788,146
@@
loc_g_6F3B:
loc_g_6F77:
ExitToMenuFlag = 1;
loc_g_6F77:
ExitToMenuFlag = 1;
- return subAnimateMurphy;
+
+ PlayField16[*si] = fiSpace; // remove Murphy from playfield after exiting
+
+ return;
// ==========================================================================
// Push Zonk from right to left
// ==========================================================================
loc_g_6F7E:
// ==========================================================================
// Push Zonk from right to left
// ==========================================================================
loc_g_6F7E:
- if (DemoKeyCode == keyLeft && PlayField16[si - 1] == fiZonk)
- return
subAnimateMurphy
;
+ if (DemoKeyCode == keyLeft && PlayField16[
*
si - 1] == fiZonk)
+ return;
- PlayField16[si] = fiMurphy; // else restore - no more zonk pushing!
- PlayField16[si - 1] = fiZonk;
- if (LowByte(PlayField16[si - 2]) != fiExplosion)
- PlayField16[si - 2] = 0;
+ PlayField16[
*
si] = fiMurphy; // else restore - no more zonk pushing!
+ PlayField16[
*
si - 1] = fiZonk;
+ if (LowByte(PlayField16[
*
si - 2]) != fiExplosion)
+ PlayField16[
*
si - 2] = 0;
- subCopyFieldToScreen(si, fiMurphy);
- return subAnimateMurphy;
+ subCopyImageToScreen(*si, aniMurphy);
+
+ return;
// ==========================================================================
// Push Zonk from left to right
// ==========================================================================
loc_g_6FBC:
// ==========================================================================
// Push Zonk from left to right
// ==========================================================================
loc_g_6FBC:
- if (DemoKeyCode == keyRight && PlayField16[si + 1] == fiZonk)
- return subAnimateMurphy;
+ if (DemoKeyCode == keyRight && PlayField16[*si + 1] == fiZonk)
+ return;
+
+ PlayField16[*si] = fiMurphy; // else restore - no more zonk pushing!
+ PlayField16[*si + 1] = fiZonk;
+ if (LowByte(PlayField16[*si + 2]) != fiExplosion)
+ PlayField16[*si + 2] = 0;
- PlayField16[si] = fiMurphy; // else restore - no more zonk pushing!
- PlayField16[si + 1] = fiZonk;
- if (LowByte(PlayField16[si + 2]) != fiExplosion)
- PlayField16[si + 2] = 0;
+ subCopyImageToScreen(*si, aniMurphy);
- subCopyFieldToScreen(si, fiMurphy);
- return subAnimateMurphy;
+ return;
// ==========================================================================
// Push orange disk from right to left
// ==========================================================================
loc_g_6FFA:
// ==========================================================================
// Push orange disk from right to left
// ==========================================================================
loc_g_6FFA:
- if (DemoKeyCode == keyLeft && PlayField16[si - 1] == fiOrangeDisk)
- return
subAnimateMurphy
;
+ if (DemoKeyCode == keyLeft && PlayField16[
*
si - 1] == fiOrangeDisk)
+ return;
- PlayField16[si] = fiMurphy; // else restore - no more pushing!
- PlayField16[si - 1] = fiOrangeDisk;
- if (LowByte(PlayField16[si - 2]) != fiExplosion)
- PlayField16[si - 2] = 0;
+ PlayField16[
*
si] = fiMurphy; // else restore - no more pushing!
+ PlayField16[
*
si - 1] = fiOrangeDisk;
+ if (LowByte(PlayField16[
*
si - 2]) != fiExplosion)
+ PlayField16[
*
si - 2] = 0;
- subCopyFieldToScreen(si, fiMurphy);
- return subAnimateMurphy;
+ subCopyImageToScreen(*si, aniMurphy);
+
+ return;
// ==========================================================================
// Push orange disk from left to right
// ==========================================================================
loc_g_7038:
// ==========================================================================
// Push orange disk from left to right
// ==========================================================================
loc_g_7038:
- if (DemoKeyCode == keyRight && PlayField16[si + 1] == fiOrangeDisk)
- return subAnimateMurphy;
+ if (DemoKeyCode == keyRight && PlayField16[*si + 1] == fiOrangeDisk)
+ return;
+
+ PlayField16[*si] = fiMurphy; // else restore - no more pushing!
+ PlayField16[*si + 1] = fiOrangeDisk;
+ if (LowByte(PlayField16[*si + 2]) != fiExplosion)
+ PlayField16[*si + 2] = 0;
- PlayField16[si] = fiMurphy; // else restore - no more pushing!
- PlayField16[si + 1] = fiOrangeDisk;
- if (LowByte(PlayField16[si + 2]) != fiExplosion)
- PlayField16[si + 2] = 0;
+ subCopyImageToScreen(*si, aniMurphy);
- subCopyFieldToScreen(si, fiMurphy);
- return subAnimateMurphy;
+ return;
// ==========================================================================
// Push yellow disk from down to up
// ==========================================================================
loc_g_7076:
// ==========================================================================
// Push yellow disk from down to up
// ==========================================================================
loc_g_7076:
- if (DemoKeyCode == keyUp && PlayField16[si - FieldWidth] == fiYellowDisk)
- return subAnimateMurphy;
+ if (DemoKeyCode == keyUp && PlayField16[*si - FieldWidth] == fiYellowDisk)
+ return;
+
+ PlayField16[*si] = fiMurphy; // else restore - no more pushing!
+ PlayField16[*si - FieldWidth] = fiYellowDisk;
+ if (LowByte(PlayField16[*si - 2 * FieldWidth]) != fiExplosion)
+ PlayField16[*si - 2 * FieldWidth] = 0;
- PlayField16[si] = fiMurphy; // else restore - no more pushing!
- PlayField16[si - FieldWidth] = fiYellowDisk;
- if (LowByte(PlayField16[si - 2 * FieldWidth]) != fiExplosion)
- PlayField16[si - 2 * FieldWidth] = 0;
+ subCopyImageToScreen(*si, aniMurphy);
- subCopyFieldToScreen(si, fiMurphy);
- return subAnimateMurphy;
+ return;
// ==========================================================================
// Push yellow disk from right to left
// ==========================================================================
loc_g_70B4:
// ==========================================================================
// Push yellow disk from right to left
// ==========================================================================
loc_g_70B4:
- if (DemoKeyCode == keyLeft && PlayField16[si - 1] == fiYellowDisk)
- return
subAnimateMurphy
;
+ if (DemoKeyCode == keyLeft && PlayField16[
*
si - 1] == fiYellowDisk)
+ return;
- PlayField16[si] = fiMurphy; // else restore - no more pushing!
- PlayField16[si - 1] = fiYellowDisk;
- if (LowByte(PlayField16[si - 2]) != fiExplosion)
- PlayField16[si - 2] = 0;
+ PlayField16[
*
si] = fiMurphy; // else restore - no more pushing!
+ PlayField16[
*
si - 1] = fiYellowDisk;
+ if (LowByte(PlayField16[
*
si - 2]) != fiExplosion)
+ PlayField16[
*
si - 2] = 0;
- subCopyFieldToScreen(si, fiMurphy);
- return subAnimateMurphy;
+ subCopyImageToScreen(*si, aniMurphy);
+
+ return;
// ==========================================================================
// Push yellow disk from up to down
// ==========================================================================
loc_g_70F2:
// ==========================================================================
// Push yellow disk from up to down
// ==========================================================================
loc_g_70F2:
- if (DemoKeyCode == keyDown && PlayField16[si + FieldWidth] == fiYellowDisk)
- return subAnimateMurphy;
+ if (DemoKeyCode == keyDown && PlayField16[*si + FieldWidth] == fiYellowDisk)
+ return;
+
+ PlayField16[*si] = fiMurphy; // else restore - no more pushing!
+ PlayField16[*si + FieldWidth] = fiYellowDisk;
+ if (LowByte(PlayField16[*si + 2 * FieldWidth]) != fiExplosion)
+ PlayField16[*si + 2 * FieldWidth] = 0;
- PlayField16[si] = fiMurphy; // else restore - no more pushing!
- PlayField16[si + FieldWidth] = fiYellowDisk;
- if (LowByte(PlayField16[si + 2 * FieldWidth]) != fiExplosion)
- PlayField16[si + 2 * FieldWidth] = 0;
+ subCopyImageToScreen(*si, aniMurphy);
- subCopyFieldToScreen(si, fiMurphy);
- return subAnimateMurphy;
+ return;
// ==========================================================================
// Push yellow disk from left to right
// ==========================================================================
loc_g_7130:
// ==========================================================================
// Push yellow disk from left to right
// ==========================================================================
loc_g_7130:
- if (DemoKeyCode == keyRight && PlayField16[si + 1] == fiYellowDisk)
- return
subAnimateMurphy
;
+ if (DemoKeyCode == keyRight && PlayField16[
*
si + 1] == fiYellowDisk)
+ return;
- PlayField16[si] = fiMurphy; // else restore - no more pushing!
- PlayField16[si + 1] = fiYellowDisk;
- if (LowByte(PlayField16[si + 2]) != fiExplosion)
- PlayField16[si + 2] = 0;
+ PlayField16[
*
si] = fiMurphy; // else restore - no more pushing!
+ PlayField16[
*
si + 1] = fiYellowDisk;
+ if (LowByte(PlayField16[
*
si + 2]) != fiExplosion)
+ PlayField16[
*
si + 2] = 0;
- subCopyFieldToScreen(si, fiMurphy);
- return subAnimateMurphy;
+ subCopyImageToScreen(*si, aniMurphy);
+
+ return;
// ==========================================================================
// time red disk release (space)
// ==========================================================================
// time red disk release (space)
@@
-1871,292
+1936,304
@@
loc_g_7130:
loc_g_716E:
if (DemoKeyCode != keySpace)
{
loc_g_716E:
if (DemoKeyCode != keySpace)
{
- PlayField16[si] = fiMurphy;
- subCopy
FieldToScreen(si, f
iMurphy);
+ PlayField16[
*
si] = fiMurphy;
+ subCopy
ImageToScreen(*si, an
iMurphy);
RedDiskReleasePhase = 0;
}
else if (MovingPictureSequencePhase == 0x20)
{
RedDiskReleasePhase = 0;
}
else if (MovingPictureSequencePhase == 0x20)
{
- subCopyFieldToScreen(si, 43); // anxious murphy
+ // anxious murphy, dropping red disk
+ subCopyImageToScreen(*si, aniMurphyDropping);
RedDiskReleasePhase = 1;
}
RedDiskReleasePhase = 1;
}
- return
subAnimateMurphy
;
+ return;
// ==========================================================================
// Special port down to up
// ==========================================================================
loc_g_7244:
// ==========================================================================
// Special port down to up
// ==========================================================================
loc_g_7244:
- if (LowByte(PlayField16[si]) != fiExplosion)
- PlayField16[si] = 0;
+ if (LowByte(PlayField16[
*
si]) != fiExplosion)
+ PlayField16[
*
si] = 0;
- PlayField16[si - 2 * FieldWidth] = fiMurphy;
+ PlayField16[
*
si - 2 * FieldWidth] = fiMurphy;
SplitMoveFlag = 0;
SplitMoveFlag = 0;
-
si =
si - FieldWidth;
- if (HighByte(PlayField16[si]) == 1)
- subSpPortTest(si);
+
*si = *
si - FieldWidth;
+ if (HighByte(PlayField16[
*
si]) == 1)
+ subSpPortTest(
*
si);
- si = si - FieldWidth;
- return subAnimateMurphy;
+ *si = *si - FieldWidth;
+
+ return;
// ==========================================================================
// Special port right to left
// ==========================================================================
loc_g_7272:
// ==========================================================================
// Special port right to left
// ==========================================================================
loc_g_7272:
- if (LowByte(PlayField16[si]) != fiExplosion)
- PlayField16[si] = 0;
+ if (LowByte(PlayField16[
*
si]) != fiExplosion)
+ PlayField16[
*
si] = 0;
- PlayField16[si - 2] = fiMurphy;
+ PlayField16[
*
si - 2] = fiMurphy;
SplitMoveFlag = 0;
SplitMoveFlag = 0;
- si = si - 1;
- if (HighByte(PlayField16[si]) == 1)
- subSpPortTest(si);
+ *si = *si - 1;
+ if (HighByte(PlayField16[*si]) == 1)
+ subSpPortTest(*si);
+
+ *si = *si - 1;
- si = si - 1;
- return subAnimateMurphy;
+ return;
// ==========================================================================
// Special port up to down
// ==========================================================================
loc_g_729F:
// ==========================================================================
// Special port up to down
// ==========================================================================
loc_g_729F:
- if (LowByte(PlayField16[si]) != fiExplosion)
- PlayField16[si] = 0;
+ if (LowByte(PlayField16[
*
si]) != fiExplosion)
+ PlayField16[
*
si] = 0;
- PlayField16[si + 2 * FieldWidth] = fiMurphy;
+ PlayField16[
*
si + 2 * FieldWidth] = fiMurphy;
SplitMoveFlag = 0;
SplitMoveFlag = 0;
- si = si + FieldWidth;
- if (HighByte(PlayField16[si]) == 1)
- subSpPortTest(si);
+ *si = *si + FieldWidth;
+ if (HighByte(PlayField16[*si]) == 1)
+ subSpPortTest(*si);
+
+ *si = *si + FieldWidth;
- si = si + FieldWidth;
- return subAnimateMurphy;
+ return;
// ==========================================================================
// Special port left to right
// ==========================================================================
loc_g_72CD:
// ==========================================================================
// Special port left to right
// ==========================================================================
loc_g_72CD:
- if (LowByte(PlayField16[si]) != fiExplosion)
- PlayField16[si] = 0;
+ if (LowByte(PlayField16[
*
si]) != fiExplosion)
+ PlayField16[
*
si] = 0;
- PlayField16[si + 2] = fiMurphy;
+ PlayField16[
*
si + 2] = fiMurphy;
SplitMoveFlag = 0;
SplitMoveFlag = 0;
- si = si + 1;
- if (HighByte(PlayField16[si]) == 1)
- subSpPortTest(si);
+ *si = *si + 1;
+ if (HighByte(PlayField16[*si]) == 1)
+ subSpPortTest(*si);
+
+ *si = *si + 1;
- si = si + 1;
- return subAnimateMurphy;
+ return;
// ==========================================================================
// Move Red Disk up
// ==========================================================================
loc_g_72FA:
// ==========================================================================
// Move Red Disk up
// ==========================================================================
loc_g_72FA:
- if (LowByte(PlayField16[si]) != fiExplosion)
- PlayField16[si] = 0;
+ if (LowByte(PlayField16[
*
si]) != fiExplosion)
+ PlayField16[
*
si] = 0;
- si = si - FieldWidth;
- PlayField16[si] = fiMurphy;
- subEatRedDisk(si); // inc+show Murphy's red disks
- return subAnimateMurphy;
+ *si = *si - FieldWidth;
+ PlayField16[*si] = fiMurphy;
+ subEatRedDisk(*si); // inc+show Murphy's red disks
+
+ return;
// ==========================================================================
// Move Red Disk left
// ==========================================================================
loc_g_7318:
// ==========================================================================
// Move Red Disk left
// ==========================================================================
loc_g_7318:
- if (LowByte(PlayField16[si + 1]) != fiExplosion)
- PlayField16[si + 1] = 0;
+ if (LowByte(PlayField16[*si + 1]) != fiExplosion)
+ PlayField16[*si + 1] = 0;
+
+ PlayField16[*si] = fiMurphy;
+ subEatRedDisk(*si); // inc+show Murphy's red disks
- PlayField16[si] = fiMurphy;
- subEatRedDisk(si); // inc+show Murphy's red disks
- return subAnimateMurphy;
+ return;
// ==========================================================================
// Move Red Disk down
// ==========================================================================
loc_g_7333:
// ==========================================================================
// Move Red Disk down
// ==========================================================================
loc_g_7333:
- if (LowByte(PlayField16[si]) != fiExplosion)
- PlayField16[si] = 0;
+ if (LowByte(PlayField16[*si]) != fiExplosion)
+ PlayField16[*si] = 0;
+
+ *si = *si + FieldWidth;
+ PlayField16[*si] = fiMurphy;
+ subEatRedDisk(*si); // inc+show Murphy's red disks
- si = si + FieldWidth;
- PlayField16[si] = fiMurphy;
- subEatRedDisk(si); // inc+show Murphy's red disks
- return subAnimateMurphy;
+ return;
// ==========================================================================
// Move Red Disk right
// ==========================================================================
loc_g_7351:
// ==========================================================================
// Move Red Disk right
// ==========================================================================
loc_g_7351:
- if (LowByte(PlayField16[si - 1]) != fiExplosion)
- PlayField16[si - 1] = 0;
+ if (LowByte(PlayField16[*si - 1]) != fiExplosion)
+ PlayField16[*si - 1] = 0;
+
+ PlayField16[*si] = fiMurphy;
+ subEatRedDisk(*si); // inc+show Murphy's red disks
- PlayField16[si] = fiMurphy;
- subEatRedDisk(si); // inc+show Murphy's red disks
- return subAnimateMurphy;
+ return;
// ==========================================================================
// Eat Red Disk up
// ==========================================================================
loc_g_736C:
// ==========================================================================
// Eat Red Disk up
// ==========================================================================
loc_g_736C:
- if (LowByte(PlayField16[si - FieldWidth]) != fiExplosion)
- PlayField16[si - FieldWidth] = 0;
+ if (LowByte(PlayField16[
*
si - FieldWidth]) != fiExplosion)
+ PlayField16[
*
si - FieldWidth] = 0;
- subEatRedDisk(si - FieldWidth); // inc+show Murphy's red disks
- return subAnimateMurphy;
+ subEatRedDisk(*si - FieldWidth); // inc+show Murphy's red disks
+
+ return;
// ==========================================================================
// Eat Red Disk left
// ==========================================================================
loc_g_7381:
// ==========================================================================
// Eat Red Disk left
// ==========================================================================
loc_g_7381:
- if (LowByte(PlayField16[si - 1]) != fiExplosion)
- PlayField16[si - 1] = 0;
+ if (LowByte(PlayField16[*si - 1]) != fiExplosion)
+ PlayField16[*si - 1] = 0;
+
+ subEatRedDisk(*si - 1); // inc+show Murphy's red disks
- subEatRedDisk(si - 1); // inc+show Murphy's red disks
- return subAnimateMurphy;
+ return;
// ==========================================================================
// Eat Red Disk down
// ==========================================================================
loc_g_7396:
// ==========================================================================
// Eat Red Disk down
// ==========================================================================
loc_g_7396:
- if (LowByte(PlayField16[si + FieldWidth]) != fiExplosion)
- PlayField16[si + FieldWidth] = 0;
+ if (LowByte(PlayField16[*si + FieldWidth]) != fiExplosion)
+ PlayField16[*si + FieldWidth] = 0;
+
+ subEatRedDisk(*si + FieldWidth); // inc+show Murphy's red disks
- subEatRedDisk(si + FieldWidth); // inc+show Murphy's red disks
- return subAnimateMurphy;
+ return;
// ==========================================================================
// Eat Red Disk right
// ==========================================================================
loc_g_73AB:
// ==========================================================================
// Eat Red Disk right
// ==========================================================================
loc_g_73AB:
- if (LowByte(PlayField16[si + 1]) != fiExplosion)
- PlayField16[si + 1] = 0;
+ if (LowByte(PlayField16[
*
si + 1]) != fiExplosion)
+ PlayField16[
*
si + 1] = 0;
- subEatRedDisk(si + 1); // inc+show Murphy's red disks
- return subAnimateMurphy;
+ subEatRedDisk(*si + 1); // inc+show Murphy's red disks
+
+ return;
// ==========================================================================
// yellow disk, pushing up
// ==========================================================================
loc_g_73C0:
// ==========================================================================
// yellow disk, pushing up
// ==========================================================================
loc_g_73C0:
- if (LowByte(PlayField16[si]) != fiExplosion)
- PlayField16[si] = 0;
+ if (LowByte(PlayField16[*si]) != fiExplosion)
+ PlayField16[*si] = 0;
+
+ *si = *si - FieldWidth;
+ PlayField16[*si] = fiMurphy;
+ PlayField16[*si - FieldWidth] = fiYellowDisk;
- si = si - FieldWidth;
- PlayField16[si] = fiMurphy;
- PlayField16[si - FieldWidth] = fiYellowDisk;
- return subAnimateMurphy;
+ return;
// ==========================================================================
// yellow disk, pushing left
// ==========================================================================
loc_g_73DD:
// ==========================================================================
// yellow disk, pushing left
// ==========================================================================
loc_g_73DD:
- if (LowByte(PlayField16[si]) != fiExplosion)
- PlayField16[si] = 0;
+ if (LowByte(PlayField16[*si]) != fiExplosion)
+ PlayField16[*si] = 0;
+
+ *si = *si - 1;
+ PlayField16[*si] = fiMurphy;
+ PlayField16[*si - 1] = fiYellowDisk;
- si = si - 1;
- PlayField16[si] = fiMurphy;
- PlayField16[si - 1] = fiYellowDisk;
- return subAnimateMurphy;
+ return;
// ==========================================================================
// yellow disk, pushing down
// ==========================================================================
loc_g_73FA:
// ==========================================================================
// yellow disk, pushing down
// ==========================================================================
loc_g_73FA:
- if (LowByte(PlayField16[si]) != fiExplosion)
- PlayField16[si] = 0;
+ if (LowByte(PlayField16[*si]) != fiExplosion)
+ PlayField16[*si] = 0;
+
+ *si = *si + FieldWidth;
+ PlayField16[*si] = fiMurphy;
+ PlayField16[*si + FieldWidth] = fiYellowDisk;
- si = si + FieldWidth;
- PlayField16[si] = fiMurphy;
- PlayField16[si + FieldWidth] = fiYellowDisk;
- return subAnimateMurphy;
+ return;
// ==========================================================================
// yellow disk pushing right
// ==========================================================================
loc_g_7417:
// ==========================================================================
// yellow disk pushing right
// ==========================================================================
loc_g_7417:
- if (LowByte(PlayField16[si]) != fiExplosion)
- PlayField16[si] = 0;
+ if (LowByte(PlayField16[
*
si]) != fiExplosion)
+ PlayField16[
*
si] = 0;
- si = si + 1;
- PlayField16[si] = fiMurphy;
- PlayField16[si + 1] = fiYellowDisk;
- return subAnimateMurphy;
+ *si = *si + 1;
+ PlayField16[*si] = fiMurphy;
+ PlayField16[*si + 1] = fiYellowDisk;
+
+ return;
// ==========================================================================
// orange disk, pushing left
// ==========================================================================
loc_g_7434:
// ==========================================================================
// orange disk, pushing left
// ==========================================================================
loc_g_7434:
- if (LowByte(PlayField16[si]) != fiExplosion)
- PlayField16[si] = 0;
+ if (LowByte(PlayField16[
*
si]) != fiExplosion)
+ PlayField16[
*
si] = 0;
- si = si - 1;
- PlayField16[si] = fiMurphy;
- PlayField16[si - 1] = fiOrangeDisk;
- return subAnimateMurphy;
+ *si = *si - 1;
+ PlayField16[*si] = fiMurphy;
+ PlayField16[*si - 1] = fiOrangeDisk;
+
+ return;
// ==========================================================================
// orange disk, pushing right
// ==========================================================================
loc_g_7451:
// ==========================================================================
// orange disk, pushing right
// ==========================================================================
loc_g_7451:
- if (LowByte(PlayField16[si]) != fiExplosion)
- PlayField16[si] = 0;
+ if (LowByte(PlayField16[
*
si]) != fiExplosion)
+ PlayField16[
*
si] = 0;
-
si =
si + 1;
- PlayField16[si] = fiMurphy;
- PlayField16[si + 1] = fiOrangeDisk;
- if (PlayField16[si + FieldWidth + 1] == 0) // make it fall down if below is empty
+
*si = *
si + 1;
+ PlayField16[
*
si] = fiMurphy;
+ PlayField16[
*
si + 1] = fiOrangeDisk;
+ if (PlayField16[
*
si + FieldWidth + 1] == 0) // make it fall down if below is empty
{
{
- MovHighByte(&PlayField16[si + 1], 0x20);
- MovHighByte(&PlayField16[si + FieldWidth + 1], fiOrangeDisk);
+ MovHighByte(&PlayField16[
*
si + 1], 0x20);
+ MovHighByte(&PlayField16[
*
si + FieldWidth + 1], fiOrangeDisk);
}
}
- return
subAnimateMurphy
;
+ return;
// ==========================================================================
// Release a red disk
// ==========================================================================
loc_g_747F:
// ==========================================================================
// Release a red disk
// ==========================================================================
loc_g_747F:
- PlayField16[si] = fiMurphy;
+ PlayField16[
*
si] = fiMurphy;
RedDiskReleasePhase = 2;
RedDiskCount = RedDiskCount - 1;
RedDiskReleasePhase = 2;
RedDiskCount = RedDiskCount - 1;
- subDisplayRedDiskCount();
- subSoundFXPush(); // Sound effects
-
return subAnimateMurphy
;
+
subSoundFX(*si, fiRedDisk, actDropping)
;
} // subAnimateMurphy
// ==========================================================================
// SUBROUTINE
// ==========================================================================
} // subAnimateMurphy
// ==========================================================================
// SUBROUTINE
// ==========================================================================
-
int
subExplodeSnikSnaksBelow(int si)
+
void
subExplodeSnikSnaksBelow(int si)
{
{
- int subExplodeSnikSnaksBelow;
-
int ax;
ax = LowByte(PlayField16[si + FieldWidth]);
if (ax == 0x11 || ax == 0xBB)
ExplodeFieldSP(si + FieldWidth);
int ax;
ax = LowByte(PlayField16[si + FieldWidth]);
if (ax == 0x11 || ax == 0xBB)
ExplodeFieldSP(si + FieldWidth);
-
- return subExplodeSnikSnaksBelow;
} // subExplodeSnikSnaksBelow
// ==========================================================================
} // subExplodeSnikSnaksBelow
// ==========================================================================
@@
-2241,44
+2318,40
@@
loc_g_753F:
// The 10-port data base is at data_h_0D28, 10 entries of 6 bytes each:
// (hi),(lo),(gravity),(freeze zonks),(freeze enemies),(unused)
// ==========================================================================
// The 10-port data base is at data_h_0D28, 10 entries of 6 bytes each:
// (hi),(lo),(gravity),(freeze zonks),(freeze enemies),(unused)
// ==========================================================================
-int subSpPortTest(int si)
-{
- int subSpPortTest;
- int i, cx, bx;
+void subSpPortTest(int si)
+{
+ int i;
- cx = LInfo.SpecialPortCount; // number of special ports
- for (i = 1; i <= cx; i++)
+ for (i = 0; i < LInfo.SpecialPortCount; i++)
{
{
+ if (LInfo.SpecialPort[i].PortLocation / 2 == si)
{
{
- bx = HighByte(LInfo.SpecialPort[i].PortLocation);
- MovHighByte(&bx, LowByte(LInfo.SpecialPort[i].PortLocation));
- if (bx / 2 == si)
- {
- GravityFlag = LInfo.SpecialPort[i].Gravity;
- FreezeZonks = LInfo.SpecialPort[i].FreezeZonks;
- SnikSnaksElectronsFrozen = LInfo.SpecialPort[i].FreezeEnemies;
- // RandomTime = RandomTime Xor RandomSeed 'is RandomTime used at all? no!
- i = cx + 1;
- }
+ GravityFlag = LInfo.SpecialPort[i].Gravity;
+ FreezeZonks = LInfo.SpecialPort[i].FreezeZonks;
+ SnikSnaksElectronsFrozen = LInfo.SpecialPort[i].FreezeEnemies;
+ break;
}
}
}
}
+}
- return subSpPortTest;
-} // subSpPortTest
-
-void subCopyFieldToScreen(int si, int fi)
+void subCopyAnimToScreen(int si, int graphic, int sync_frame)
{
int X, Y;
// +++++++++++++++++++++++++++++++++++++++++
X = GetStretchX(si);
Y = GetStretchY(si);
{
int X, Y;
// +++++++++++++++++++++++++++++++++++++++++
X = GetStretchX(si);
Y = GetStretchY(si);
-
StretchedSprites.BltEx(X, Y, fi
);
+
DDSpriteBuffer_BltImg(X, Y, graphic, sync_frame
);
// +++++++++++++++++++++++++++++++++++++++++
}
// +++++++++++++++++++++++++++++++++++++++++
}
+void subCopyImageToScreen(int si, int graphic)
+{
+ subCopyAnimToScreen(si, graphic, 0);
+}
+
static void subEatRedDisk(int si)
{
if (AllowRedDiskCheat == 0)
static void subEatRedDisk(int si)
{
if (AllowRedDiskCheat == 0)
@@
-2291,13
+2364,10
@@
static void subEatRedDisk(int si)
}
RedDiskCount = (RedDiskCount + 1) % 256;
}
RedDiskCount = (RedDiskCount + 1) % 256;
- subDisplayRedDiskCount();
}
}
-
int
subAdjustZonksInfotronsAboveMurphy(int si)
+
void
subAdjustZonksInfotronsAboveMurphy(int si)
{
{
- int subAdjustZonksInfotronsAboveMurphy;
-
int ax;
if (LowByte(PlayField16[si]) != fiExplosion)
int ax;
if (LowByte(PlayField16[si]) != fiExplosion)
@@
-2312,7
+2382,7
@@
int subAdjustZonksInfotronsAboveMurphy(int si)
MovHighByte(&PlayField16[si - FieldWidth], 0x40); // make falling straigt down
}
MovHighByte(&PlayField16[si - FieldWidth], 0x40); // make falling straigt down
}
- return
subAdjustZonksInfotronsAboveMurphy
;
+ return;
loc_g_15A8: // empty above
ax = PlayField16[si - FieldWidth - 1];
loc_g_15A8: // empty above
ax = PlayField16[si - FieldWidth - 1];
@@
-2324,7
+2394,7
@@
loc_g_15B6:
if (ax == fiZonk || ax == fiInfotron)
goto loc_g_15E8;
if (ax == fiZonk || ax == fiInfotron)
goto loc_g_15E8;
- return
subAdjustZonksInfotronsAboveMurphy
;
+ return;
loc_g_15C5: // zonk/infotron above left
ax = PlayField16[si - 1];
loc_g_15C5: // zonk/infotron above left
ax = PlayField16[si - 1];
@@
-2333,7
+2403,8
@@
loc_g_15C5: // zonk/infotron above left
MovHighByte(&PlayField16[si - FieldWidth - 1], 0x60); // make roll right
PlayField16[si - FieldWidth] = 0x8888;
MovHighByte(&PlayField16[si - FieldWidth - 1], 0x60); // make roll right
PlayField16[si - FieldWidth] = 0x8888;
- return subAdjustZonksInfotronsAboveMurphy;
+
+ return;
loc_g_15E8: // zonk/infotron above right
ax = PlayField16[si + 1];
loc_g_15E8: // zonk/infotron above right
ax = PlayField16[si + 1];
@@
-2342,6
+2413,4
@@
loc_g_15E8: // zonk/infotron above right
MovHighByte(&PlayField16[si - FieldWidth + 1], 0x50); // make roll left
PlayField16[si - FieldWidth] = 0x8888;
}
MovHighByte(&PlayField16[si - FieldWidth + 1], 0x50); // make roll left
PlayField16[si - FieldWidth] = 0x8888;
}
-
- return subAdjustZonksInfotronsAboveMurphy;
-} // subAdjustZonksInfotronsAboveMurphy
+}