From: Holger Schemel Date: Fri, 31 Jul 2009 16:32:41 +0000 (+0200) Subject: rnd-20090731-1-src X-Git-Tag: 3.3.0.0^2~83 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=c35ed5e69718416c4b428f1ffeddf31105e933b2;p=rocksndiamonds.git rnd-20090731-1-src --- diff --git a/src/conftime.h b/src/conftime.h index 1da4c6f8..c9a9715a 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "2009-07-30 15:25" +#define COMPILE_DATE_STRING "2009-07-31 18:31" diff --git a/src/game_sp/DDScrollBuffer.c b/src/game_sp/DDScrollBuffer.c index e71f1f10..b1a88ed5 100644 --- a/src/game_sp/DDScrollBuffer.c +++ b/src/game_sp/DDScrollBuffer.c @@ -317,7 +317,7 @@ void DDScrollBuffer_ScrollTo(int X, int Y) ScrollX = mScrollX; ScrollY = mScrollY; -#if 1 +#if 0 printf("::: DDScrollBuffer.c: DDScrollBuffer_ScrollTo(): mScroll: %ld, %ld [%d, %d]\n", mScrollX, mScrollY, X, Y); #endif @@ -431,7 +431,7 @@ void DDScrollBuffer_SoftScrollTo(int X, int Y, long TimeMS, int FPS) SoftScrollEH: AlreadyRunning = False; -#if 1 +#if 0 printf("::: DDScrollBuffer.c: DDScrollBuffer_SoftScrollTo(): mScroll: %ld, %ld\n", mScrollX, mScrollY); #endif diff --git a/src/game_sp/Demo.c b/src/game_sp/Demo.c index 20b9298c..373a8364 100644 --- a/src/game_sp/Demo.c +++ b/src/game_sp/Demo.c @@ -47,7 +47,7 @@ void subGetNextDemoKey() } } -#if 1 +#if 0 printf("::: %04d [%03ld, %02d] ----------> %s [%d] [%d, %d] [%d, %d]\n", TimerVar, DemoOffset - DemoPointer, DemoKeyRepeatCounter, diff --git a/src/game_sp/Display.c b/src/game_sp/Display.c index c23e57ad..2eefc737 100644 --- a/src/game_sp/Display.c +++ b/src/game_sp/Display.c @@ -106,7 +106,7 @@ void ScrollTo(int X, int Y) { long oldX, oldY; -#if 1 +#if 0 printf("::: Display.c: ScrollTo(): %d, %d\n", X, Y); #endif diff --git a/src/game_sp/Globals.c b/src/game_sp/Globals.c index f8d52778..daade3fe 100644 --- a/src/game_sp/Globals.c +++ b/src/game_sp/Globals.c @@ -522,7 +522,7 @@ static void ReadDemo() GravityFlag = LInfo.InitialGravity; FreezeZonks = LInfo.InitialFreezeZonks; -#if 1 +#if 0 printf("::: Globals.c: ReadDemo(): %d / %d\n", GravityFlag, FreezeZonks); #endif diff --git a/src/game_sp/MainForm.c b/src/game_sp/MainForm.c index b04fda82..0e31ae3e 100644 --- a/src/game_sp/MainForm.c +++ b/src/game_sp/MainForm.c @@ -1007,7 +1007,7 @@ void DisplayLevel() { int X, Y; -#if 1 +#if 0 printf("::: MainForm.c: DisplayLevel(): %d, %d, %d\n", Loaded, LevelLoaded, bPlaying); #endif @@ -1031,7 +1031,7 @@ void DisplayLevel() if (bPlaying) { -#if 1 +#if 0 printf("::: MainForm.c: DisplayLevel(): [%ld, %ld, %ld, %ld] [%d, %d]...\n", DisplayMinX, DisplayMinY, DisplayMaxX, DisplayMaxY, FieldWidth, FieldHeight); @@ -2461,13 +2461,13 @@ void menPlay_Click() UpdateDeltaT(); #endif -#if 1 +#if 0 printf("::: MainForm.c: menPlay_Click(): subFetchAndInitLevelB(): ...\n"); #endif subFetchAndInitLevelB(); -#if 1 +#if 0 printf("::: MainForm.c: menPlay_Click(): subFetchAndInitLevelB(): done\n"); #endif @@ -2972,13 +2972,13 @@ static void ReStretch(float NewStretch) long BW2, LW, LH, i; #endif -#if 1 +#if 0 printf("::: MainForm.c: ReStretch(): %d, %d\n", Loaded, LevelLoaded); #endif if (! Loaded) { -#if 1 +#if 0 printf("::: NewStretch == %f\n", NewStretch); #endif @@ -3035,7 +3035,7 @@ static void ReStretch(float NewStretch) if (Loaded && LevelLoaded) { -#if 1 +#if 0 printf("::: MainForm.c: ReStretch(): ...\n"); #endif @@ -3046,7 +3046,7 @@ static void ReStretch(float NewStretch) subCalculateScreenScrollPos(); -#if 1 +#if 0 printf("::: MainForm.c: ReStretch(): %d, %d\n", ScreenScrollXPos, ScreenScrollYPos); #endif @@ -3064,7 +3064,7 @@ static void ReStretch(float NewStretch) static void SetScrollEdges() { -#if 1 +#if 0 printf("::: MainForm.c: SetScrollEdges() ... [%ld, %ld, %ld, %ld] [%f, %d] [%d, %d, %d, %d]\n", DisplayMinX, DisplayMinY, DisplayMaxX, DisplayMaxY, Stretch, BaseWidth, @@ -3076,7 +3076,7 @@ static void SetScrollEdges() ScrollMaxX = (int)(DisplayMaxX + 1.5) * Stretch * BaseWidth - picPane.Width; ScrollMaxY = (int)(DisplayMaxY + 1.5) * Stretch * BaseWidth - picPane.Height; -#if 1 +#if 0 printf("::: MainForm.c: SetScrollEdges() done [%d, %d, %d, %d]\n", ScrollMinX, ScrollMinY, ScrollMaxX, ScrollMaxY); #endif @@ -3236,7 +3236,7 @@ static void picViewPort_Resize() SetScrollEdges(); -#if 1 +#if 0 printf("::: MainForm.c: picViewPort_Resize(): %d, %d\n", ScrollX, ScrollY); #endif diff --git a/src/game_sp/Murphy.c b/src/game_sp/Murphy.c index 7ff39ab3..9ce921b3 100644 --- a/src/game_sp/Murphy.c +++ b/src/game_sp/Murphy.c @@ -88,8 +88,8 @@ int subAnimateMurphy(int *si) if (bl != 0) // a key was pressed! goto locKeyPressed5FCF; -#if 1 - printf("::: !!! %d [%d]\n", DemoKeyCode, GravityFlag); +#if 0 + printf("::: Murphy.c: !!! %d [%d]\n", DemoKeyCode, GravityFlag); #endif RedDiskReleaseFlag = 1; @@ -931,6 +931,10 @@ loc_g_6756: if (LowByte(InfotronsNeeded) != 0) return subAnimateMurphy; +#if 1 + printf("::: Murphy.c: !!!!!!!!!! GAME SOLVED !!!!!!!!!!\n"); +#endif + subSoundFXExit(); data_h_DemoDone = 1; // EP set level success bytes LevelStatus = 1; // set Level Status DONE @@ -1417,8 +1421,14 @@ loc_g_6C8F: MurphyScreenXPos = MurphyScreenXPos + MurphyDX; MurphyScreenYPos = MurphyScreenYPos + MurphyDY; #endif + +#if 1 + if (!(ClearPos < 0)) // clear field that murphy is leaving + subCopyFieldToScreen(ClearPos, 0); +#else if (! ClearPos < 0) // clear field that murphy is leaving subCopyFieldToScreen(ClearPos, 0); +#endif #if 0 printf("::: ---------------> %d, %d [%d, %d]\n", @@ -1440,7 +1450,12 @@ loc_g_6C8F: Y = GetStretchY(dxPos) + tDeltaY; Tmp = (SeqPos < 0 ? 0 : 0); // 9StepBugFix!(red disk move right) StretchedSprites.BltEx(X, Y, dx[Tmp]); + +#if 1 + if (!(dx2 < 0)) +#else if (! dx2 < 0) +#endif { tPos = dxPos + dx2Step; X = GetStretchX(tPos);