projects
/
rocksndiamonds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0d95c7d
)
rnd-20090731-1-src
author
Holger Schemel
<info@artsoft.org>
Fri, 31 Jul 2009 16:32:41 +0000
(18:32 +0200)
committer
Holger Schemel
<info@artsoft.org>
Sat, 30 Aug 2014 08:57:35 +0000
(10:57 +0200)
src/conftime.h
patch
|
blob
|
history
src/game_sp/DDScrollBuffer.c
patch
|
blob
|
history
src/game_sp/Demo.c
patch
|
blob
|
history
src/game_sp/Display.c
patch
|
blob
|
history
src/game_sp/Globals.c
patch
|
blob
|
history
src/game_sp/MainForm.c
patch
|
blob
|
history
src/game_sp/Murphy.c
patch
|
blob
|
history
diff --git
a/src/conftime.h
b/src/conftime.h
index 1da4c6f8cb725b88c1fee048f033af82760787be..c9a9715a60571c1af44d38eb24d2de6011a65758 100644
(file)
--- a/
src/conftime.h
+++ b/
src/conftime.h
@@
-1
+1
@@
-#define COMPILE_DATE_STRING "2009-07-3
0 15:25
"
+#define COMPILE_DATE_STRING "2009-07-3
1 18:31
"
diff --git
a/src/game_sp/DDScrollBuffer.c
b/src/game_sp/DDScrollBuffer.c
index e71f1f10c221649998a8c00646d8a96d07c92c22..b1a88ed5d6986b713413ee48214cd5f6b40f671e 100644
(file)
--- 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;
ScrollX = mScrollX;
ScrollY = mScrollY;
-#if
1
+#if
0
printf("::: DDScrollBuffer.c: DDScrollBuffer_ScrollTo(): mScroll: %ld, %ld [%d, %d]\n",
mScrollX, mScrollY, X, Y);
#endif
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;
SoftScrollEH:
AlreadyRunning = False;
-#if
1
+#if
0
printf("::: DDScrollBuffer.c: DDScrollBuffer_SoftScrollTo(): mScroll: %ld, %ld\n",
mScrollX, mScrollY);
#endif
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 20b9298c48f113ec19eaddb336a38d879e78d5db..373a8364aad41f66e2487834338094029dd37ba1 100644
(file)
--- 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,
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 c23e57ade6ee1dedb060001f2663ebb8f1f9a0ad..2eefc737c8a85f01c18b20cbcc5e70a9c604892d 100644
(file)
--- 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;
{
long oldX, oldY;
-#if
1
+#if
0
printf("::: Display.c: ScrollTo(): %d, %d\n", X, Y);
#endif
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 f8d5277823f5640a3b0e957e9ec2a47670e95de0..daade3fec70b8f9d5283cc42d55f713a8485e7ba 100644
(file)
--- 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;
GravityFlag = LInfo.InitialGravity;
FreezeZonks = LInfo.InitialFreezeZonks;
-#if
1
+#if
0
printf("::: Globals.c: ReadDemo(): %d / %d\n", GravityFlag, FreezeZonks);
#endif
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 b04fda82c9a9c15dc29be3cad0e1dbc5f78882b6..0e31ae3eb6b6658043c73b6f83c8d472d702ae09 100644
(file)
--- a/
src/game_sp/MainForm.c
+++ b/
src/game_sp/MainForm.c
@@
-1007,7
+1007,7
@@
void DisplayLevel()
{
int X, Y;
{
int X, Y;
-#if
1
+#if
0
printf("::: MainForm.c: DisplayLevel(): %d, %d, %d\n",
Loaded, LevelLoaded, bPlaying);
#endif
printf("::: MainForm.c: DisplayLevel(): %d, %d, %d\n",
Loaded, LevelLoaded, bPlaying);
#endif
@@
-1031,7
+1031,7
@@
void DisplayLevel()
if (bPlaying)
{
if (bPlaying)
{
-#if
1
+#if
0
printf("::: MainForm.c: DisplayLevel(): [%ld, %ld, %ld, %ld] [%d, %d]...\n",
DisplayMinX, DisplayMinY, DisplayMaxX, DisplayMaxY,
FieldWidth, FieldHeight);
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
UpdateDeltaT();
#endif
-#if
1
+#if
0
printf("::: MainForm.c: menPlay_Click(): subFetchAndInitLevelB(): ...\n");
#endif
subFetchAndInitLevelB();
printf("::: MainForm.c: menPlay_Click(): subFetchAndInitLevelB(): ...\n");
#endif
subFetchAndInitLevelB();
-#if
1
+#if
0
printf("::: MainForm.c: menPlay_Click(): subFetchAndInitLevelB(): done\n");
#endif
printf("::: MainForm.c: menPlay_Click(): subFetchAndInitLevelB(): done\n");
#endif
@@
-2972,13
+2972,13
@@
static void ReStretch(float NewStretch)
long BW2, LW, LH, i;
#endif
long BW2, LW, LH, i;
#endif
-#if
1
+#if
0
printf("::: MainForm.c: ReStretch(): %d, %d\n", Loaded, LevelLoaded);
#endif
if (! Loaded)
{
printf("::: MainForm.c: ReStretch(): %d, %d\n", Loaded, LevelLoaded);
#endif
if (! Loaded)
{
-#if
1
+#if
0
printf("::: NewStretch == %f\n", NewStretch);
#endif
printf("::: NewStretch == %f\n", NewStretch);
#endif
@@
-3035,7
+3035,7
@@
static void ReStretch(float NewStretch)
if (Loaded && LevelLoaded)
{
if (Loaded && LevelLoaded)
{
-#if
1
+#if
0
printf("::: MainForm.c: ReStretch(): ...\n");
#endif
printf("::: MainForm.c: ReStretch(): ...\n");
#endif
@@
-3046,7
+3046,7
@@
static void ReStretch(float NewStretch)
subCalculateScreenScrollPos();
subCalculateScreenScrollPos();
-#if
1
+#if
0
printf("::: MainForm.c: ReStretch(): %d, %d\n", ScreenScrollXPos, ScreenScrollYPos);
#endif
printf("::: MainForm.c: ReStretch(): %d, %d\n", ScreenScrollXPos, ScreenScrollYPos);
#endif
@@
-3064,7
+3064,7
@@
static void ReStretch(float NewStretch)
static void SetScrollEdges()
{
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,
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;
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
printf("::: MainForm.c: SetScrollEdges() done [%d, %d, %d, %d]\n",
ScrollMinX, ScrollMinY, ScrollMaxX, ScrollMaxY);
#endif
@@
-3236,7
+3236,7
@@
static void picViewPort_Resize()
SetScrollEdges();
SetScrollEdges();
-#if
1
+#if
0
printf("::: MainForm.c: picViewPort_Resize(): %d, %d\n", ScrollX, ScrollY);
#endif
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 7ff39ab33722c9f41a113c6fa51ce1b313df4719..9ce921b380f9ff74446746c8a1ad70757e8ae2e8 100644
(file)
--- 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 (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;
#endif
RedDiskReleaseFlag = 1;
@@
-931,6
+931,10
@@
loc_g_6756:
if (LowByte(InfotronsNeeded) != 0)
return subAnimateMurphy;
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
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
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);
if (! ClearPos < 0) // clear field that murphy is leaving
subCopyFieldToScreen(ClearPos, 0);
+#endif
#if 0
printf("::: ---------------> %d, %d [%d, %d]\n",
#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]);
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)
if (! dx2 < 0)
+#endif
{
tPos = dxPos + dx2Step;
X = GetStretchX(tPos);
{
tPos = dxPos + dx2Step;
X = GetStretchX(tPos);