projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20100107-1-src
[rocksndiamonds.git]
/
src
/
game_sp
/
MainForm.c
diff --git
a/src/game_sp/MainForm.c
b/src/game_sp/MainForm.c
index 0e31ae3eb6b6658043c73b6f83c8d472d702ae09..9ee82353ac76f8e22d6ce2e6d8c72eca30aa57ce 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;
@@
-1604,7
+1633,7
@@
static void Form_Resize()
// NW = ScaleWidth - 2 * Space: If NW < 0 Then NW = 0
// NH = ScaleHeight - 3 * Space - cmbLevel.Height: If NH < 0 Then NH = 0
// picViewPort.Move Space, Space, NW, NH
// NW = ScaleWidth - 2 * Space: If NW < 0 Then NW = 0
// NH = ScaleHeight - 3 * Space - cmbLevel.Height: If NH < 0 Then NH = 0
// picViewPort.Move Space, Space, NW, NH
- Tmp = (ShowPanel != 0 ?
ScaleHeight - Panel.Height : ScaleHeight - Panel.
Height);
+ Tmp = (ShowPanel != 0 ?
ScaleHeight - Panel.Height : Scale
Height);
if (Tmp < 0)
Tmp = 0;
if (Tmp < 0)
Tmp = 0;
@@
-2022,7
+2051,7
@@
static void UpdateDeltaT()
if (! bPlaying)
return;
if (! bPlaying)
return;
- DeltaT = (DemoFlag != 0 ?
DeltaTDemo : DeltaTDemo
);
+ DeltaT = (DemoFlag != 0 ?
DeltaTDemo : DeltaTPlay
);
if (DeltaT < 0)
{
Stage.Blt();
if (DeltaT < 0)
{
Stage.Blt();
@@
-2087,7
+2116,7
@@
static void menOpen_Click()
*/
LFilt = LastOpenFilter;
*/
LFilt = LastOpenFilter;
- cmDlg.FilterIndex = (0 < LFilt & LFilt < 5 ?
LFilt : LFilt
);
+ cmDlg.FilterIndex = (0 < LFilt & LFilt < 5 ?
LFilt : 1
);
if (FileExists(CurPath))
cmDlg.InitDir = WithSlash(StripDir(CurPath));
if (FileExists(CurPath))
cmDlg.InitDir = WithSlash(StripDir(CurPath));
@@
-2164,7
+2193,7
@@
static void menPause_Click()
static StdPicture OldPic;
static char *OldText = 0;
static StdPicture OldPic;
static char *OldText = 0;
- PauseMode = (PauseMode != 0 ?
0 : 0
);
+ PauseMode = (PauseMode != 0 ?
0 : 1
);
if (PauseMode != 0)
{
if (IS_NOTHING(&OldPic, sizeof(OldPic)))
if (PauseMode != 0)
{
if (IS_NOTHING(&OldPic, sizeof(OldPic)))
@@
-2391,7
+2420,7
@@
static void menSoundFX_Click()
{
{
menSoundFX.Checked = ! menSoundFX.Checked;
{
{
menSoundFX.Checked = ! menSoundFX.Checked;
- FXOnFlag = (menSoundFX.Checked ?
-1 : -1
);
+ FXOnFlag = (menSoundFX.Checked ?
-1 : 0
);
}
}
}
}
@@
-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
@@
-2519,10
+2553,37
@@
void menPlay_Click()
// Trace "MainForm", "<-- menPlay_Click()"
// Trace "MainForm", "<-- menPlay_Click()"
+#endif
+}
+
+#if 1
+
+// static void menPlayDemo_Click()
+void menPlayDemo_Click()
+{
+ DemoFlag = 1;
+ RecordDemoFlag = 0;
+
+#if 0
+ lblStatus = "Demo Playback";
#endif
#endif
+ menPlay_Click();
+
+#if 1
+ return; /* return after initialization phase */
+#endif
+
+#if 0
+ if (LevelStatus != 1)
+ lblStatus = "Demo Failed";
+#endif
+
+ DemoFlag = 0;
}
}
+#else
+
// static void menPlayDemo_Click()
void menPlayDemo_Click()
{
// static void menPlayDemo_Click()
void menPlayDemo_Click()
{
@@
-2543,6
+2604,8
@@
void menPlayDemo_Click()
DemoFlag = 0;
}
DemoFlag = 0;
}
+#endif
+
#if 0
static void menRec_Click()
#if 0
static void menRec_Click()
@@
-2725,7
+2788,7
@@
static void PanelTim_Timer()
Tmp = Panel.Height;
if (PanelSeq < Panel.Height && -1 < PanelSeq)
{
Tmp = Panel.Height;
if (PanelSeq < Panel.Height && -1 < PanelSeq)
{
- PanelSeq = (ShowPanel != 0 ?
PanelSeq + 2 : PanelSeq +
2);
+ PanelSeq = (ShowPanel != 0 ?
PanelSeq + 2 : PanelSeq -
2);
Tmp = ScaleHeight - Tmp + PanelSeq;
Panel.top = Tmp;
picViewPort.Height = Tmp;
Tmp = ScaleHeight - Tmp + PanelSeq;
Panel.top = Tmp;
picViewPort.Height = Tmp;
@@
-2733,8
+2796,8
@@
static void PanelTim_Timer()
else
{
PanelTim.Enabled = False;
else
{
PanelTim.Enabled = False;
- PanelSeq = (PanelSeq < 0 ?
0 : 0
);
- ShowPanel = (ShowPanel == 0 ?
1 : 1
);
+ PanelSeq = (PanelSeq < 0 ?
0 : PanelSeq -
);
+ ShowPanel = (ShowPanel == 0 ?
1 : 0
);
menPanel.Checked = (ShowPanel != 0);
}
}
menPanel.Checked = (ShowPanel != 0);
}
}
@@
-2960,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;
}
@@
-3052,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();
}
@@
-3062,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",
@@
-3167,8
+3240,9
@@
void DrawFieldNoAnimated(int X, int Y)
}
#if 0
}
#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
StretchedSprites.BltEx(StretchWidth * X, StretchWidth * Y, Tmp);
#endif
StretchedSprites.BltEx(StretchWidth * X, StretchWidth * Y, Tmp);
@@
-3314,8
+3388,8
@@
void ShowKey(int KeyVar)
Tmp = State[i];
if (Tmp ^ LastState[i])
{
Tmp = State[i];
if (Tmp ^ LastState[i])
{
- Col = (i == 5 ?
vbRed : vbRed
);
- shpKey(i).FillColor = (Tmp ?
Col : Col
);
+ Col = (i == 5 ?
vbRed : vbGreen
);
+ shpKey(i).FillColor = (Tmp ?
Col : vbButtonFace
);
shpKey(i).Refresh;
LastState[i] = Tmp;
}
shpKey(i).Refresh;
LastState[i] = Tmp;
}
@@
-3378,7
+3452,7
@@
static void GetSettings()
}
Flag = CBool(s.Read("SoundFX", True));
}
Flag = CBool(s.Read("SoundFX", True));
- FXOnFlag = (Flag ?
-1 : -1
);
+ FXOnFlag = (Flag ?
-1 : 0
);
menSoundFX.Checked = Flag;
SignatureDelay = CLng(s.Read("SignatureDelay", 3000));
AllowRedDiskCheat = CInt(s.Read("AllowRedDiskCheat", 1));
menSoundFX.Checked = Flag;
SignatureDelay = CLng(s.Read("SignatureDelay", 3000));
AllowRedDiskCheat = CInt(s.Read("AllowRedDiskCheat", 1));
@@
-3406,7
+3480,7
@@
static void SaveSettings()
int i;
{
int i;
{
- s.Save "LastPath", (ModifiedFlag ?
OrigPath : Orig
Path);
+ s.Save "LastPath", (ModifiedFlag ?
OrigPath : Cur
Path);
if (WindowState != vbMinimized)
{
s.Save "Width", Width;
if (WindowState != vbMinimized)
{
s.Save "Width", Width;