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 1358ab0278fe819540ac5c5d8593c1b25f54b691..1c93dc26e7627ceddfb38fc49cc6d57b975e0154 100644
(file)
--- a/
src/game_sp/MainForm.c
+++ b/
src/game_sp/MainForm.c
@@
-674,16
+674,26
@@
void DrawFieldNoAnimated(int X, int Y);
// --- Option Explicit
// --- Option Compare Text
// --- Option Explicit
// --- Option Compare Text
+#if 0
+
long SetParent(long hWndChild, long hWndNewParent);
long SetWindowLong(long hWnd, long nIndex, long dwNewLong);
long GetWindowLong(long hWnd, long nIndex);
long SetParent(long hWndChild, long hWndNewParent);
long SetWindowLong(long hWnd, long nIndex, long dwNewLong);
long GetWindowLong(long hWnd, long nIndex);
+#if 0
long GetTempPath(long nBufferLength, char *lpBuffer);
long GetTempPath(long nBufferLength, char *lpBuffer);
+#endif
long GetWindowText(long hWnd, char *lpString, long cch);
long GetWindowText(long hWnd, char *lpString, long cch);
+#endif
+
+#if 0
+
#define GWL_STYLE ((-16))
#define WS_CHILD (0x40000000)
#define WS_POPUP (0x80000000)
#define GWL_STYLE ((-16))
#define WS_CHILD (0x40000000)
#define WS_POPUP (0x80000000)
+#endif
+
// [UNCOMMENTED] Dim StretchWidth2&
char *MpxBmp;
// [UNCOMMENTED] Dim StretchWidth2&
char *MpxBmp;
@@
-1003,6
+1013,17
@@
static boolean InstanceStillRunning(char *TmpFile)
#endif
#endif
+void DrawFrameIfNeeded()
+{
+ DrawFrame(0);
+
+ /* !!! CHECK THIS !!! */
+#if 1
+ if (! menBorder.Checked)
+ DrawFrame(1);
+#endif
+}
+
void DisplayLevel()
{
int X, Y;
void DisplayLevel()
{
int X, Y;
@@
-1018,13
+1039,18
@@
void DisplayLevel()
if (! LevelLoaded)
return;
if (! LevelLoaded)
return;
+ ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
+ ClearRectangle(screenBitmap, 0, 0,
+ MAX_BUF_XSIZE * TILEX, MAX_BUF_YSIZE * TILEY);
+
#if 1
SetDisplayRegion();
#endif
DrawFrame(0);
#if 1
SetDisplayRegion();
#endif
DrawFrame(0);
-#if 0
+ /* !!! CHECK THIS !!! */
+#if 1
if (! menBorder.Checked)
DrawFrame(1);
#endif
if (! menBorder.Checked)
DrawFrame(1);
#endif
@@
-1369,7
+1395,10
@@
void Form_Load()
PauseMode = 0;
// BaseWidth = 16
PauseMode = 0;
// BaseWidth = 16
- menBorder_Click();
+#if 1
+ if (0)
+ menBorder_Click();
+#endif
Loaded = True;
Loaded = True;
@@
-2461,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
@@
-2509,7
+2541,9
@@
void menPlay_Click()
// Trace "MainForm", "subFetchAndInitLevel returned"
// Trace "MainForm", "subFetchAndInitLevel returned"
+#if 0
Stage.Blt();
Stage.Blt();
+#endif
#if 0
#if 0
@@
-2520,10
+2554,9
@@
void menPlay_Click()
// Trace "MainForm", "<-- menPlay_Click()"
#endif
// Trace "MainForm", "<-- menPlay_Click()"
#endif
-
}
}
-#if
0
+#if
1
// static void menPlayDemo_Click()
void menPlayDemo_Click()
// static void menPlayDemo_Click()
void menPlayDemo_Click()
@@
-2538,7
+2571,7
@@
void menPlayDemo_Click()
menPlay_Click();
#if 1
menPlay_Click();
#if 1
- return;
+ return;
/* return after initialization phase */
#endif
#if 0
#endif
#if 0
@@
-2990,7
+3023,11
@@
static void picPane_Paint()
Oldflag = NoDisplayFlag;
NoDisplayFlag = False;
Oldflag = NoDisplayFlag;
NoDisplayFlag = False;
+
+#if 0
Stage.Blt();
Stage.Blt();
+#endif
+
NoDisplayFlag = Oldflag;
}
NoDisplayFlag = Oldflag;
}
@@
-3082,7
+3119,9
@@
static void ReStretch(float NewStretch)
ScrollTo(ScreenScrollXPos, ScreenScrollYPos);
ScrollTo(ScreenScrollXPos, ScreenScrollYPos);
+#if 0
Stage.Blt();
Stage.Blt();
+#endif
picPane_Paint();
}
picPane_Paint();
}
@@
-3092,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",
@@
-3118,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)
@@
-3129,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)
@@
-3173,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)
@@
-3192,16
+3255,30
@@
void DrawFieldNoAnimated(int X, int Y)
if (EditFlag)
{
if (EditFlag)
{
- if (
fiOrangeDisk < Tmp
&& Tmp < fiSnikSnak)
+ if (
Tmp > fiOrangeDisk
&& Tmp < fiSnikSnak)
Tmp = DisPlayField[tsi];
}
#if 0
Tmp = DisPlayField[tsi];
}
#if 0
- printf("::: MainForm.c: DrawFieldNoAnimated(): %d, %d [%d]\n",
- X, Y, Tmp);
+ if (TEST_flag)
+ printf("::: MainForm.c: DrawFieldNoAnimated(): %d, %d [%d]\n",
+ X, Y, Tmp);
#endif
#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;
}
}