X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FMurphy.c;h=ae4fd7641cdabf3b0995e54db3cec0cfd44c7482;hb=949580a3bafe5c8abd1fac99202411b65900b883;hp=ff03ea27091dcce2321efc97d0223848134792c3;hpb=3d31c6dd1b4f598453c3079d292f47f372f10151;p=rocksndiamonds.git diff --git a/src/game_sp/Murphy.c b/src/game_sp/Murphy.c index ff03ea27..ae4fd764 100644 --- a/src/game_sp/Murphy.c +++ b/src/game_sp/Murphy.c @@ -755,7 +755,12 @@ loc_g_63C2: // ========================================================================== loc_g_63D3: +#if 1 + subSoundFX(*si, fiBase, actDigging); +#else subSoundFXBase(); +#endif + dx = (MurphyVarFaceLeft == 0 ? aniFramesMurphyEatUpRight : aniFramesMurphyEatUpLeft); dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyDigUpRight : aniMurphyDigUpLeft); PlayField16[*si - FieldWidth] = 0x503; @@ -781,7 +786,12 @@ loc_g_640B: // ========================================================================== loc_g_641C: +#if 1 + subSoundFX(*si, fiBase, actDigging); +#else subSoundFXBase(); +#endif + dx = aniFramesMurphyEatLeft; dx1 = aniMurphyDigLeft; PlayField16[*si - 1] = 0x203; @@ -807,7 +817,12 @@ loc_g_6448: // ========================================================================== loc_g_6459: +#if 1 + subSoundFX(*si, fiBase, actDigging); +#else subSoundFXBase(); +#endif + dx = (MurphyVarFaceLeft == 0 ? aniFramesMurphyEatUpRight : aniFramesMurphyEatUpLeft); dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyDigUpRight : aniMurphyDigUpLeft); PlayField16[*si + FieldWidth] = 0x703; @@ -833,7 +848,12 @@ loc_g_6491: // ========================================================================== loc_g_64A2: +#if 1 + subSoundFX(*si, fiBase, actDigging); +#else subSoundFXBase(); +#endif + dx = aniFramesMurphyEatRight; dx1 = aniMurphyDigRight; PlayField16[*si + 1] = 0x803; @@ -860,7 +880,12 @@ loc_g_64CE: loc_g_64DF: subCopyImageToScreen(*si, aniMurphyTouchUp); +#if 1 + subSoundFX(*si, fiBase, actDigging); +#else subSoundFXBase(); +#endif + dx = aniFramesTouchBase; dx1 = aniTouchBase; dxPos = *si - FieldWidth; @@ -886,7 +911,12 @@ loc_g_650C: loc_g_651D: subCopyImageToScreen(*si, aniMurphyTouchLeft); +#if 1 + subSoundFX(*si, fiBase, actDigging); +#else subSoundFXBase(); +#endif + dx = aniFramesTouchBase; dx1 = aniTouchBase; dxPos = *si - 1; @@ -912,7 +942,12 @@ loc_g_654A: loc_g_655B: subCopyImageToScreen(*si, aniMurphyTouchDown); +#if 1 + subSoundFX(*si, fiBase, actDigging); +#else subSoundFXBase(); +#endif + dx = aniFramesTouchBase; dx1 = aniTouchBase; dxPos = *si + FieldWidth; @@ -938,7 +973,12 @@ loc_g_6588: loc_g_6599: subCopyImageToScreen(*si, aniMurphyTouchRight); +#if 1 + subSoundFX(*si, fiBase, actDigging); +#else subSoundFXBase(); +#endif + dx = aniFramesTouchBase; dx1 = aniTouchBase; dxPos = *si + 1; @@ -950,7 +990,12 @@ loc_g_6599: // ========================================================================== loc_g_65C6: +#if 1 + subSoundFX(*si, fiInfotron, actCollecting); +#else subSoundFXInfotron(); +#endif + dx = (MurphyVarFaceLeft == 0 ? aniFramesMurphyEatUpRight : aniFramesMurphyEatUpLeft); dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft); PlayField16[*si - FieldWidth] = 0x903; @@ -963,7 +1008,12 @@ loc_g_65C6: // ========================================================================== loc_g_65FE: +#if 1 + subSoundFX(*si, fiInfotron, actCollecting); +#else subSoundFXInfotron(); +#endif + dx = aniFramesEatInfotronLeft; dx1 = aniEatInfotronLeft; #if 0 @@ -981,7 +1031,12 @@ loc_g_65FE: // ========================================================================== loc_g_662A: +#if 1 + subSoundFX(*si, fiInfotron, actCollecting); +#else subSoundFXInfotron(); +#endif + dx = (MurphyVarFaceLeft == 0 ? aniFramesMurphyEatUpRight : aniFramesMurphyEatUpLeft); dx1 = (MurphyVarFaceLeft == 0 ? aniMurphyEatUpRight : aniMurphyEatUpLeft); PlayField16[*si + FieldWidth] = 0xB03; @@ -994,7 +1049,12 @@ loc_g_662A: // ========================================================================== loc_g_6662: +#if 1 + subSoundFX(*si, fiInfotron, actCollecting); +#else subSoundFXInfotron(); +#endif + dx = aniFramesEatInfotronRight; dx1 = aniEatInfotronRight; #if 0 @@ -1013,7 +1073,12 @@ loc_g_6662: loc_g_668E: subCopyImageToScreen(*si, aniMurphyTouchUp); +#if 1 + subSoundFX(*si, fiInfotron, actCollecting); +#else subSoundFXInfotron(); +#endif + dx = aniFramesTouchInfotron; dx1 = aniTouchInfotron; MovHighByte(&PlayField16[*si], 0x14); @@ -1026,7 +1091,12 @@ loc_g_668E: loc_g_66C0: subCopyImageToScreen(*si, aniMurphyTouchLeft); +#if 1 + subSoundFX(*si, fiInfotron, actCollecting); +#else subSoundFXInfotron(); +#endif + dx = aniFramesTouchInfotron; dx1 = aniTouchInfotron; MovHighByte(&PlayField16[*si], 0x15); @@ -1039,7 +1109,12 @@ loc_g_66C0: loc_g_66F2: subCopyImageToScreen(*si, aniMurphyTouchDown); +#if 1 + subSoundFX(*si, fiInfotron, actCollecting); +#else subSoundFXInfotron(); +#endif + dx = aniFramesTouchInfotron; dx1 = aniTouchInfotron; MovHighByte(&PlayField16[*si], 0x16); @@ -1052,7 +1127,12 @@ loc_g_66F2: loc_g_6724: subCopyImageToScreen(*si, aniMurphyTouchRight); +#if 1 + subSoundFX(*si, fiInfotron, actCollecting); +#else subSoundFXInfotron(); +#endif + dx = aniFramesTouchInfotron; dx1 = aniTouchInfotron; MovHighByte(&PlayField16[*si], 0x17); @@ -1073,15 +1153,20 @@ loc_g_6756: return; #if 1 - if (!game_sp_info.LevelSolved) + if (!game_sp.LevelSolved) printf("::: Murphy.c: !!!!!!!!!! LEVEL %d SOLVED !!!!!!!!!!\n",LevelNumber); #endif #if 1 - game_sp_info.LevelSolved = TRUE; + game_sp.LevelSolved = TRUE; #endif +#if 1 + subSoundFX(*si, fiExit, actPassing); +#else subSoundFXExit(); +#endif + data_h_DemoDone = 1; // EP set level success bytes LevelStatus = 1; // set Level Status DONE EP_GameDemoVar0DAA = 0; // force demo for lead-out @@ -1161,7 +1246,11 @@ loc_g_6817: #if 1 // draw new terminal type +#if 1 + GfxGraphic[GetX(*si - FieldWidth)][GetY(*si - FieldWidth)] = aniTerminalActive; +#else subCopyImageToScreen(*si - FieldWidth, aniTerminalActive); +#endif #else subCopyFieldToScreen(*si - FieldWidth, 0x88); // draw new terminal type #endif @@ -1183,7 +1272,11 @@ loc_g_684E: #if 1 // draw new terminal type +#if 1 + GfxGraphic[GetX(*si - 1)][GetY(*si - 1)] = aniTerminalActive; +#else subCopyImageToScreen(*si - 1, aniTerminalActive); +#endif #else subCopyFieldToScreen(*si - 1, 0x88); // draw new terminal type #endif @@ -1205,7 +1298,11 @@ loc_g_6884: #if 1 // draw new terminal type +#if 1 + GfxGraphic[GetX(*si + FieldWidth)][GetY(*si + FieldWidth)] = aniTerminalActive; +#else subCopyImageToScreen(*si + FieldWidth, aniTerminalActive); +#endif #else subCopyFieldToScreen(*si + FieldWidth, 0x88); // draw new terminal type #endif @@ -1227,7 +1324,11 @@ loc_g_68BA: #if 1 // draw new terminal type +#if 1 + GfxGraphic[GetX(*si + 1)][GetY(*si + 1)] = aniTerminalActive; +#else subCopyImageToScreen(*si + 1, aniTerminalActive); +#endif #else subCopyFieldToScreen(*si + 1, 0x88); // draw new terminal type #endif @@ -1581,8 +1682,36 @@ locProceedMovingMurphy: // proceed moving murphy ax = ax - 1; // next picture of sequence MovingPictureSequencePhase = ax; // store for later + if (ax == 0) // Sound effects +#if 1 + { + 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; + } + } +#else subSoundFXPush(); +#endif bl = HighByte(PlayField16[*si]); if (bl == 0xE) // Push Zonk to left @@ -1675,12 +1804,15 @@ loc_g_6C8F: MurphyScreenXPos, MurphyScreenYPos, MurphyDX, MurphyDY); #endif +#if 0 + // !!! special two-tile animation currently not used !!! if (dx2 == fiInfotron) // special case of infotron moving left or right { tDeltaX = 0; tDeltaY = 0; } else +#endif { tDeltaX = MurphyDX * LocalStretch * (SeqPos + 1); tDeltaY = MurphyDY * LocalStretch * (SeqPos + 1); @@ -1697,6 +1829,8 @@ loc_g_6C8F: #if 1 StretchedSprites.BltImg(X, Y, dx1, Tmp); + GfxGraphic[GetX(*si)][GetY(*si)] = -1; // (Murphy's position) + GfxGraphic[GetX(dxPos)][GetY(dxPos)] = -1; // (snapping position) // printf("::: Tmp: %d\n", Tmp); #else StretchedSprites.BltEx(X, Y, dx[Tmp]); @@ -1711,11 +1845,14 @@ loc_g_6C8F: tPos = dxPos + dx2Step; X = GetStretchX(tPos); Y = GetStretchY(tPos); +#if 0 + // !!! special two-tile animation currently not used !!! if (dx2 == fiInfotron) // special case of infotron moving left or right { StretchedSprites.BltEx(X, Y, dx[SeqPos] + dx2Step); } else // pushing something +#endif { #if 1 // (SeqPos iterates from 0 to 7 while pushing) @@ -1746,12 +1883,21 @@ loc_g_6C8F: tDeltaY = MurphyDY * LocalStretch * (SeqPos + 1); X = GetStretchX(dxPos) + tDeltaX; Y = GetStretchY(dxPos) + tDeltaY; +#if 1 + StretchedSprites.BltImg(X, Y, dx1, SeqPos); // plot first murphy +#else StretchedSprites.BltEx(X, Y, dx[SeqPos]); // plot first murphy +#endif tPos = dxPos + dx2Step; X = GetStretchX(tPos); Y = GetStretchY(tPos); +#if 1 + StretchedSprites.BltImg(X + tDeltaX, Y + tDeltaY, dx1, SeqPos); // plot second murphy + StretchedSprites.BltImg(X, Y, fiGraphic[LowByte(PlayField16[tPos])], 0); // replot the port on top +#else StretchedSprites.BltEx(X + tDeltaX, Y + tDeltaY, dx[SeqPos]); // plot second murphy StretchedSprites.BltEx(X, Y, LowByte(PlayField16[tPos])); // replot the port on top +#endif // End of split movement (port) // ------------------------------ } // loc_g_6D1E:'loc_g_6D28: @@ -2498,7 +2644,12 @@ loc_g_747F: RedDiskReleasePhase = 2; RedDiskCount = RedDiskCount - 1; subDisplayRedDiskCount(); + +#if 1 + subSoundFX(*si, fiRedDisk, actDropping); +#else subSoundFXPush(); // Sound effects +#endif } // subAnimateMurphy // ========================================================================== @@ -2650,6 +2801,8 @@ int subSpPortTest(int si) return subSpPortTest; } // subSpPortTest +#if 0 + void subCopyFieldToScreen(int si, int fi) { int X, Y; @@ -2661,6 +2814,8 @@ void subCopyFieldToScreen(int si, int fi) // +++++++++++++++++++++++++++++++++++++++++ } +#endif + void subCopyAnimToScreen(int si, int graphic, int sync_frame) { int X, Y;