projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20100218-1-src
[rocksndiamonds.git]
/
src
/
game_sp
/
MainForm.c
diff --git
a/src/game_sp/MainForm.c
b/src/game_sp/MainForm.c
index 4ac25f812e2f398b756d92b5e710197d940bb8f1..1c93dc26e7627ceddfb38fc49cc6d57b975e0154 100644
(file)
--- a/
src/game_sp/MainForm.c
+++ b/
src/game_sp/MainForm.c
@@
-2490,6
+2490,9
@@
void menPlay_Click()
UpdateDeltaT();
#endif
UpdateDeltaT();
#endif
+#if 1
+#endif
+
#if 0
printf("::: MainForm.c: menPlay_Click(): subFetchAndInitLevelB(): ...\n");
#endif
#if 0
printf("::: MainForm.c: menPlay_Click(): subFetchAndInitLevelB(): ...\n");
#endif
@@
-3128,7
+3131,11
@@
static void ReStretch(float NewStretch)
#endif
}
#endif
}
+#if 0
static void SetScrollEdges()
static void SetScrollEdges()
+#else
+void SetScrollEdges()
+#endif
{
#if 0
printf("::: MainForm.c: SetScrollEdges() ... [%ld, %ld, %ld, %ld] [%f, %d] [%d, %d, %d, %d]\n",
{
#if 0
printf("::: MainForm.c: SetScrollEdges() ... [%ld, %ld, %ld, %ld] [%f, %d] [%d, %d, %d, %d]\n",
@@
-3154,7
+3161,7
@@
void DrawField(int X, int Y)
tsi = GetSI(X, Y);
Tmp = LowByte(PlayField16[tsi]);
tsi = GetSI(X, Y);
Tmp = LowByte(PlayField16[tsi]);
- if (
40 < Tmp
)
+ if (
Tmp > 40
)
Tmp = 0;
if (Tmp == fiRAM || Tmp == fiHardWare)
Tmp = 0;
if (Tmp == fiRAM || Tmp == fiHardWare)
@@
-3165,11
+3172,23
@@
void DrawField(int X, int Y)
if (EditFlag)
{
if (EditFlag)
{
- if (
fiOrangeDisk < Tmp
&& Tmp < fiSnikSnak)
+ if (
Tmp > fiOrangeDisk
&& Tmp < fiSnikSnak)
Tmp = DisPlayField[tsi];
}
Tmp = DisPlayField[tsi];
}
+#if 1
+ if (Tmp >= 0 && Tmp <= 40)
+ {
+ subCopyImageToScreen(tsi, fiGraphic[Tmp]);
+
+#if 1
+ if (Tmp != fiSpace && Tmp != fiSnikSnak && Tmp != fiElectron)
+ GfxGraphic[X][Y] = fiGraphic[Tmp];
+#endif
+ }
+#else
StretchedSprites.BltEx(StretchWidth * X, StretchWidth * Y, Tmp);
StretchedSprites.BltEx(StretchWidth * X, StretchWidth * Y, Tmp);
+#endif
}
void DrawFieldAnimated(int X, int Y)
}
void DrawFieldAnimated(int X, int Y)
@@
-3209,15
+3228,23
@@
void DrawFieldNoAnimated(int X, int Y)
switch (Tmp)
{
case fiSnikSnak:
switch (Tmp)
{
case fiSnikSnak:
+#if 1
+ subCopyImageToScreen(tsi, aniSpace);
+#else
StretchedSprites.BltEx(StretchWidth * X, StretchWidth * Y, fiSpace);
StretchedSprites.BltEx(StretchWidth * X, StretchWidth * Y, fiSpace);
+#endif
break;
case fiElectron:
break;
case fiElectron:
+#if 1
+ subCopyImageToScreen(tsi, aniSpace);
+#else
StretchedSprites.BltEx(StretchWidth * X, StretchWidth * Y, fiSpace);
StretchedSprites.BltEx(StretchWidth * X, StretchWidth * Y, fiSpace);
+#endif
break;
default:
break;
default:
- if (
40 < Tmp
)
+ if (
Tmp > 40
)
Tmp = 0;
if (Tmp == fiRAM || Tmp == fiHardWare)
Tmp = 0;
if (Tmp == fiRAM || Tmp == fiHardWare)
@@
-3228,7
+3255,7
@@
void DrawFieldNoAnimated(int X, int Y)
if (EditFlag)
{
if (EditFlag)
{
- if (
fiOrangeDisk < Tmp
&& Tmp < fiSnikSnak)
+ if (
Tmp > fiOrangeDisk
&& Tmp < fiSnikSnak)
Tmp = DisPlayField[tsi];
}
Tmp = DisPlayField[tsi];
}
@@
-3238,7
+3265,20
@@
void DrawFieldNoAnimated(int X, int Y)
X, Y, Tmp);
#endif
X, Y, Tmp);
#endif
+#if 1
+ if (Tmp >= 0 && Tmp <= 40)
+ {
+ subCopyImageToScreen(tsi, fiGraphic[Tmp]);
+
+#if 1
+ if (Tmp != fiSpace && Tmp != fiSnikSnak && Tmp != fiElectron)
+ GfxGraphic[X][Y] = fiGraphic[Tmp];
+#endif
+ }
+#else
StretchedSprites.BltEx(StretchWidth * X, StretchWidth * Y, Tmp);
StretchedSprites.BltEx(StretchWidth * X, StretchWidth * Y, Tmp);
+#endif
+
break;
}
}
break;
}
}