Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
/*
|
|
|
|
** st_start.cpp
|
|
|
|
** Handles the startup screen.
|
|
|
|
**
|
|
|
|
**---------------------------------------------------------------------------
|
2007-01-05 04:21:14 +00:00
|
|
|
** Copyright 2006-2007 Randy Heit
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
** All rights reserved.
|
|
|
|
**
|
|
|
|
** Redistribution and use in source and binary forms, with or without
|
|
|
|
** modification, are permitted provided that the following conditions
|
|
|
|
** are met:
|
|
|
|
**
|
|
|
|
** 1. Redistributions of source code must retain the above copyright
|
|
|
|
** notice, this list of conditions and the following disclaimer.
|
|
|
|
** 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
** notice, this list of conditions and the following disclaimer in the
|
|
|
|
** documentation and/or other materials provided with the distribution.
|
|
|
|
** 3. The name of the author may not be used to endorse or promote products
|
|
|
|
** derived from this software without specific prior written permission.
|
|
|
|
**
|
|
|
|
** THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
|
|
** IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
|
|
** OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
|
|
** IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
|
|
** INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
|
|
** NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
|
|
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
|
|
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
|
|
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
|
|
** THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
**---------------------------------------------------------------------------
|
|
|
|
**
|
|
|
|
*/
|
|
|
|
|
2007-01-05 04:21:14 +00:00
|
|
|
// HEADER FILES ------------------------------------------------------------
|
|
|
|
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
#define WIN32_LEAN_AND_MEAN
|
2006-12-19 16:08:48 +00:00
|
|
|
#define _WIN32_WINNT 0x0501 // required to get the MARQUEE defines
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
#include <windows.h>
|
|
|
|
#include <commctrl.h>
|
|
|
|
#include <stdio.h>
|
2007-01-05 04:21:14 +00:00
|
|
|
#include "resource.h"
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
|
|
|
|
#define USE_WINDOWS_DWORD
|
|
|
|
#include "st_start.h"
|
|
|
|
#include "resource.h"
|
|
|
|
#include "templates.h"
|
|
|
|
#include "i_system.h"
|
2007-01-05 04:21:14 +00:00
|
|
|
#include "i_input.h"
|
2007-01-06 12:30:34 +00:00
|
|
|
#include "hardware.h"
|
2007-01-05 04:21:14 +00:00
|
|
|
#include "gi.h"
|
|
|
|
#include "w_wad.h"
|
|
|
|
#include "s_sound.h"
|
2010-02-24 02:58:48 +00:00
|
|
|
#include "m_argv.h"
|
2007-01-05 04:21:14 +00:00
|
|
|
|
|
|
|
// MACROS ------------------------------------------------------------------
|
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
// Hexen startup screen
|
2007-01-06 04:08:24 +00:00
|
|
|
#define ST_MAX_NOTCHES 32
|
|
|
|
#define ST_NOTCH_WIDTH 16
|
|
|
|
#define ST_NOTCH_HEIGHT 23
|
|
|
|
#define ST_PROGRESS_X 64 // Start of notches x screen pos.
|
|
|
|
#define ST_PROGRESS_Y 441 // Start of notches y screen pos.
|
2007-01-05 22:08:57 +00:00
|
|
|
|
|
|
|
#define ST_NETPROGRESS_X 288
|
|
|
|
#define ST_NETPROGRESS_Y 32
|
|
|
|
#define ST_NETNOTCH_WIDTH 4
|
|
|
|
#define ST_NETNOTCH_HEIGHT 16
|
|
|
|
#define ST_MAX_NETNOTCHES 8
|
2007-01-05 04:21:14 +00:00
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
// Heretic startup screen
|
2007-01-06 04:18:07 +00:00
|
|
|
#define HERETIC_MINOR_VERSION '3' // Since we're based on Heretic 1.3
|
2007-01-06 04:08:24 +00:00
|
|
|
|
|
|
|
#define THERM_X 14
|
|
|
|
#define THERM_Y 14
|
|
|
|
#define THERM_LEN 51
|
|
|
|
#define THERM_COLOR 0xAA // light green
|
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
// Strife startup screen
|
|
|
|
#define PEASANT_INDEX 0
|
|
|
|
#define LASER_INDEX 4
|
|
|
|
#define BOT_INDEX 6
|
|
|
|
|
|
|
|
#define ST_LASERSPACE_X 60
|
|
|
|
#define ST_LASERSPACE_Y 156
|
|
|
|
#define ST_LASERSPACE_WIDTH 200
|
|
|
|
#define ST_LASER_WIDTH 16
|
|
|
|
#define ST_LASER_HEIGHT 16
|
|
|
|
|
|
|
|
#define ST_BOT_X 14
|
|
|
|
#define ST_BOT_Y 138
|
|
|
|
#define ST_BOT_WIDTH 48
|
|
|
|
#define ST_BOT_HEIGHT 48
|
|
|
|
|
|
|
|
#define ST_PEASANT_X 262
|
|
|
|
#define ST_PEASANT_Y 136
|
|
|
|
#define ST_PEASANT_WIDTH 32
|
|
|
|
#define ST_PEASANT_HEIGHT 64
|
|
|
|
|
2007-01-06 04:08:24 +00:00
|
|
|
// Text mode color values
|
|
|
|
#define LO 85
|
|
|
|
#define MD 170
|
|
|
|
#define HI 255
|
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
#define TEXT_FONT_NAME "vga-rom-font.16"
|
|
|
|
|
2007-03-29 00:35:34 +00:00
|
|
|
// How many ms elapse between blinking text flips. On a standard VGA
|
|
|
|
// adapter, the characters are on for 16 frames and then off for another 16.
|
|
|
|
// The number here therefore corresponds roughly to the blink rate on a
|
|
|
|
// 60 Hz display.
|
|
|
|
#define BLINK_PERIOD 267
|
|
|
|
|
2007-01-05 04:21:14 +00:00
|
|
|
// TYPES -------------------------------------------------------------------
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
class FBasicStartupScreen : public FStartupScreen
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
FBasicStartupScreen(int max_progress, bool show_bar);
|
|
|
|
~FBasicStartupScreen();
|
|
|
|
|
|
|
|
void Progress();
|
|
|
|
void NetInit(const char *message, int num_players);
|
|
|
|
void NetProgress(int count);
|
|
|
|
void NetMessage(const char *format, ...); // cover for printf
|
|
|
|
void NetDone();
|
|
|
|
bool NetLoop(bool (*timer_callback)(void *), void *userdata);
|
|
|
|
protected:
|
|
|
|
LRESULT NetMarqueeMode;
|
|
|
|
int NetMaxPos, NetCurPos;
|
|
|
|
};
|
|
|
|
|
|
|
|
class FGraphicalStartupScreen : public FBasicStartupScreen
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
FGraphicalStartupScreen(int max_progress);
|
|
|
|
~FGraphicalStartupScreen();
|
|
|
|
};
|
|
|
|
|
|
|
|
class FHereticStartupScreen : public FGraphicalStartupScreen
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
FHereticStartupScreen(int max_progress, HRESULT &hr);
|
|
|
|
|
|
|
|
void Progress();
|
|
|
|
void LoadingStatus(const char *message, int colors);
|
|
|
|
void AppendStatusLine(const char *status);
|
|
|
|
protected:
|
|
|
|
int ThermX, ThermY, ThermWidth, ThermHeight;
|
|
|
|
int HMsgY, SMsgX;
|
|
|
|
};
|
|
|
|
|
|
|
|
class FHexenStartupScreen : public FGraphicalStartupScreen
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
FHexenStartupScreen(int max_progress, HRESULT &hr);
|
2010-03-27 21:12:08 +00:00
|
|
|
~FHexenStartupScreen();
|
2007-03-06 01:33:18 +00:00
|
|
|
|
|
|
|
void Progress();
|
|
|
|
void NetProgress(int count);
|
|
|
|
void NetDone();
|
2010-03-27 21:12:08 +00:00
|
|
|
|
|
|
|
// Hexen's notch graphics, converted to chunky pixels.
|
|
|
|
BYTE * NotchBits;
|
|
|
|
BYTE * NetNotchBits;
|
2007-03-06 01:33:18 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
class FStrifeStartupScreen : public FGraphicalStartupScreen
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
FStrifeStartupScreen(int max_progress, HRESULT &hr);
|
|
|
|
~FStrifeStartupScreen();
|
|
|
|
|
|
|
|
void Progress();
|
|
|
|
protected:
|
|
|
|
void DrawStuff(int old_laser, int new_laser);
|
|
|
|
|
|
|
|
BYTE *StartupPics[4+2+1];
|
|
|
|
};
|
|
|
|
|
2007-01-05 04:21:14 +00:00
|
|
|
// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
|
2007-01-07 05:00:07 +00:00
|
|
|
|
2007-01-06 12:30:34 +00:00
|
|
|
void RestoreConView();
|
2007-01-09 04:40:58 +00:00
|
|
|
void LayoutMainWindow (HWND hWnd, HWND pane);
|
2007-02-28 19:08:02 +00:00
|
|
|
int LayoutNetStartPane (HWND pane, int w);
|
2007-01-05 04:21:14 +00:00
|
|
|
|
2007-01-06 04:08:24 +00:00
|
|
|
bool ST_Util_CreateStartupWindow ();
|
2007-01-07 05:00:07 +00:00
|
|
|
void ST_Util_SizeWindowForBitmap (int scale);
|
2007-01-06 04:08:24 +00:00
|
|
|
BITMAPINFO *ST_Util_CreateBitmap (int width, int height, int color_bits);
|
|
|
|
BYTE *ST_Util_BitsForBitmap (BITMAPINFO *bitmap_info);
|
|
|
|
void ST_Util_FreeBitmap (BITMAPINFO *bitmap_info);
|
2007-01-07 05:00:07 +00:00
|
|
|
void ST_Util_BitmapColorsFromPlaypal (BITMAPINFO *bitmap_info);
|
2007-01-06 04:08:24 +00:00
|
|
|
void ST_Util_PlanarToChunky4 (BYTE *dest, const BYTE *src, int width, int height);
|
2007-01-07 05:00:07 +00:00
|
|
|
void ST_Util_DrawBlock (BITMAPINFO *bitmap_info, const BYTE *src, int x, int y, int bytewidth, int height);
|
|
|
|
void ST_Util_ClearBlock (BITMAPINFO *bitmap_info, BYTE fill, int x, int y, int bytewidth, int height);
|
2007-01-06 04:08:24 +00:00
|
|
|
void ST_Util_InvalidateRect (HWND hwnd, BITMAPINFO *bitmap_info, int left, int top, int right, int bottom);
|
2007-01-07 05:00:07 +00:00
|
|
|
BYTE *ST_Util_LoadFont (const char *filename);
|
2007-01-06 04:08:24 +00:00
|
|
|
void ST_Util_FreeFont (BYTE *font);
|
|
|
|
BITMAPINFO *ST_Util_AllocTextBitmap (const BYTE *font);
|
|
|
|
void ST_Util_DrawTextScreen (BITMAPINFO *bitmap_info, const BYTE *text_screen, const BYTE *font);
|
2007-03-29 00:35:34 +00:00
|
|
|
void ST_Util_UpdateTextBlink (BITMAPINFO *bitmap_info, const BYTE *text_screen, const BYTE *font, bool blink_on);
|
2007-01-06 04:08:24 +00:00
|
|
|
void ST_Util_DrawChar (BITMAPINFO *screen, const BYTE *font, int x, int y, BYTE charnum, BYTE attrib);
|
2007-01-05 04:21:14 +00:00
|
|
|
|
|
|
|
// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
|
|
|
|
|
|
|
|
// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
|
|
|
|
|
|
|
|
static INT_PTR CALLBACK NetStartPaneProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam);
|
|
|
|
|
|
|
|
// EXTERNAL DATA DECLARATIONS ----------------------------------------------
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
|
|
|
|
extern HINSTANCE g_hInst;
|
2007-01-06 04:08:24 +00:00
|
|
|
extern HWND Window, ConWindow, ProgressBar, NetStartPane, StartupScreen, GameTitleWindow;
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
|
2007-01-05 04:21:14 +00:00
|
|
|
// PUBLIC DATA DEFINITIONS -------------------------------------------------
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
FStartupScreen *StartScreen;
|
2007-01-06 04:08:24 +00:00
|
|
|
BITMAPINFO *StartupBitmap;
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
|
2007-01-07 09:43:58 +00:00
|
|
|
CUSTOM_CVAR(Int, showendoom, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
|
|
|
|
{
|
|
|
|
if (self < 0) self = 0;
|
|
|
|
else if (self > 2) self=2;
|
|
|
|
}
|
2007-01-07 05:00:07 +00:00
|
|
|
|
2007-01-05 04:21:14 +00:00
|
|
|
// PRIVATE DATA DEFINITIONS ------------------------------------------------
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
static const char *StrifeStartupPicNames[4+2+1] =
|
|
|
|
{
|
|
|
|
"STRTPA1", "STRTPB1", "STRTPC1", "STRTPD1",
|
|
|
|
"STRTLZ1", "STRTLZ2",
|
|
|
|
"STRTBOT"
|
|
|
|
};
|
|
|
|
static const int StrifeStartupPicSizes[4+2+1] =
|
|
|
|
{
|
|
|
|
2048, 2048, 2048, 2048,
|
|
|
|
256, 256,
|
|
|
|
2304
|
|
|
|
};
|
2007-01-06 04:08:24 +00:00
|
|
|
|
|
|
|
static const RGBQUAD TextModePalette[16] =
|
|
|
|
{
|
|
|
|
{ 0, 0, 0, 0 }, // 0 black
|
|
|
|
{ MD, 0, 0, 0 }, // 1 blue
|
|
|
|
{ 0, MD, 0, 0 }, // 2 green
|
|
|
|
{ MD, MD, 0, 0 }, // 3 cyan
|
|
|
|
{ 0, 0, MD, 0 }, // 4 red
|
|
|
|
{ MD, 0, MD, 0 }, // 5 magenta
|
|
|
|
{ 0, MD, MD, 0 }, // 6 brown
|
|
|
|
{ MD, MD, MD, 0 }, // 7 light gray
|
|
|
|
|
|
|
|
{ LO, LO, LO, 0 }, // 8 dark gray
|
|
|
|
{ HI, LO, LO, 0 }, // 9 light blue
|
|
|
|
{ LO, HI, LO, 0 }, // A light green
|
|
|
|
{ HI, HI, LO, 0 }, // B light cyan
|
|
|
|
{ LO, LO, HI, 0 }, // C light red
|
|
|
|
{ HI, LO, HI, 0 }, // D light magenta
|
|
|
|
{ LO, HI, HI, 0 }, // E yellow
|
|
|
|
{ HI, HI, HI, 0 }, // F white
|
|
|
|
};
|
2007-01-05 04:21:14 +00:00
|
|
|
|
|
|
|
// CODE --------------------------------------------------------------------
|
|
|
|
|
|
|
|
//==========================================================================
|
2006-12-29 02:21:47 +00:00
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FStartupScreen :: CreateInstance
|
2006-12-29 02:21:47 +00:00
|
|
|
//
|
2007-01-05 04:21:14 +00:00
|
|
|
// Initializes the startup screen for the detected game.
|
2006-12-29 02:21:47 +00:00
|
|
|
// Sets the size of the progress bar and displays the startup screen.
|
|
|
|
//
|
2007-01-05 04:21:14 +00:00
|
|
|
//==========================================================================
|
2006-12-29 02:21:47 +00:00
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
FStartupScreen *FStartupScreen::CreateInstance(int max_progress)
|
2007-01-05 04:21:14 +00:00
|
|
|
{
|
2007-03-06 01:33:18 +00:00
|
|
|
FStartupScreen *scr = NULL;
|
|
|
|
HRESULT hr;
|
2007-01-05 04:21:14 +00:00
|
|
|
|
2010-02-24 02:58:48 +00:00
|
|
|
if (!Args->CheckParm("-nostartup"))
|
2007-01-05 04:21:14 +00:00
|
|
|
{
|
2010-02-24 02:58:48 +00:00
|
|
|
if (gameinfo.gametype == GAME_Hexen)
|
|
|
|
{
|
|
|
|
scr = new FHexenStartupScreen(max_progress, hr);
|
|
|
|
}
|
|
|
|
else if (gameinfo.gametype == GAME_Heretic)
|
|
|
|
{
|
|
|
|
scr = new FHereticStartupScreen(max_progress, hr);
|
|
|
|
}
|
|
|
|
else if (gameinfo.gametype == GAME_Strife)
|
|
|
|
{
|
|
|
|
scr = new FStrifeStartupScreen(max_progress, hr);
|
|
|
|
}
|
|
|
|
if (scr != NULL && FAILED(hr))
|
|
|
|
{
|
|
|
|
delete scr;
|
|
|
|
scr = NULL;
|
|
|
|
}
|
2007-03-06 01:33:18 +00:00
|
|
|
}
|
|
|
|
if (scr == NULL)
|
2007-01-05 04:21:14 +00:00
|
|
|
{
|
2007-03-06 01:33:18 +00:00
|
|
|
scr = new FBasicStartupScreen(max_progress, true);
|
2007-01-05 04:21:14 +00:00
|
|
|
}
|
2007-03-06 01:33:18 +00:00
|
|
|
return scr;
|
2007-01-05 04:21:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
2006-12-29 02:21:47 +00:00
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FBasicStartupScreen Constructor
|
2006-12-29 02:21:47 +00:00
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// Shows a progress bar at the bottom of the window.
|
2006-12-29 02:21:47 +00:00
|
|
|
//
|
2007-01-05 04:21:14 +00:00
|
|
|
//==========================================================================
|
2006-12-29 02:21:47 +00:00
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
FBasicStartupScreen::FBasicStartupScreen(int max_progress, bool show_bar)
|
|
|
|
: FStartupScreen(max_progress)
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
{
|
2007-03-06 01:33:18 +00:00
|
|
|
if (show_bar)
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
{
|
2007-03-06 01:33:18 +00:00
|
|
|
ProgressBar = CreateWindowEx(0, PROGRESS_CLASS,
|
|
|
|
NULL, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS,
|
|
|
|
0, 0, 0, 0,
|
|
|
|
Window, 0, g_hInst, NULL);
|
|
|
|
SendMessage (ProgressBar, PBM_SETRANGE, 0, MAKELPARAM(0,MaxPos));
|
|
|
|
LayoutMainWindow (Window, NULL);
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
}
|
2007-03-06 01:33:18 +00:00
|
|
|
NetMaxPos = 0;
|
|
|
|
NetCurPos = 0;
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
}
|
|
|
|
|
2007-02-28 19:08:02 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FBasicStartupScreen Destructor
|
2007-02-28 19:08:02 +00:00
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// Called just before entering graphics mode to deconstruct the startup
|
|
|
|
// screen.
|
2007-02-28 19:08:02 +00:00
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
FBasicStartupScreen::~FBasicStartupScreen()
|
2007-02-28 19:08:02 +00:00
|
|
|
{
|
2007-03-06 01:33:18 +00:00
|
|
|
if (ProgressBar != NULL)
|
|
|
|
{
|
|
|
|
DestroyWindow (ProgressBar);
|
|
|
|
ProgressBar = NULL;
|
|
|
|
LayoutMainWindow (Window, NULL);
|
|
|
|
}
|
2007-12-09 01:14:35 +00:00
|
|
|
KillTimer(Window, 1337);
|
2007-02-28 19:08:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FBasicStartupScreen :: Progress
|
2007-02-28 19:08:02 +00:00
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// Bumps the progress meter one notch.
|
2007-02-28 19:08:02 +00:00
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
void FBasicStartupScreen::Progress()
|
2007-02-28 19:08:02 +00:00
|
|
|
{
|
2007-03-06 01:33:18 +00:00
|
|
|
if (CurPos < MaxPos)
|
|
|
|
{
|
|
|
|
CurPos++;
|
|
|
|
SendMessage (ProgressBar, PBM_SETPOS, CurPos, 0);
|
|
|
|
}
|
2007-02-28 19:08:02 +00:00
|
|
|
}
|
|
|
|
|
2007-01-05 04:21:14 +00:00
|
|
|
//==========================================================================
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FBasicStartupScreen :: NetInit
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
//
|
|
|
|
// Shows the network startup pane if it isn't visible. Sets the message in
|
|
|
|
// the pane to the one provided. If numplayers is 0, then the progress bar
|
|
|
|
// is a scrolling marquee style. If numplayers is 1, then the progress bar
|
|
|
|
// is just a full bar. If numplayers is >= 2, then the progress bar is a
|
|
|
|
// normal one, and a progress count is also shown in the pane.
|
|
|
|
//
|
2007-01-05 04:21:14 +00:00
|
|
|
//==========================================================================
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
void FBasicStartupScreen::NetInit(const char *message, int numplayers)
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
{
|
|
|
|
NetMaxPos = numplayers;
|
|
|
|
if (NetStartPane == NULL)
|
|
|
|
{
|
|
|
|
NetStartPane = CreateDialogParam (g_hInst, MAKEINTRESOURCE(IDD_NETSTARTPANE), Window, NetStartPaneProc, 0);
|
|
|
|
// We don't need two progress bars.
|
|
|
|
if (ProgressBar != NULL)
|
|
|
|
{
|
|
|
|
DestroyWindow (ProgressBar);
|
|
|
|
ProgressBar = NULL;
|
|
|
|
}
|
2007-02-28 19:08:02 +00:00
|
|
|
RECT winrect;
|
|
|
|
GetWindowRect (Window, &winrect);
|
|
|
|
SetWindowPos (Window, NULL, 0, 0,
|
|
|
|
winrect.right - winrect.left, winrect.bottom - winrect.top + LayoutNetStartPane (NetStartPane, 0),
|
|
|
|
SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOZORDER);
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
LayoutMainWindow (Window, NULL);
|
2007-03-06 01:33:18 +00:00
|
|
|
SetFocus (NetStartPane);
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
}
|
|
|
|
if (NetStartPane != NULL)
|
|
|
|
{
|
|
|
|
HWND ctl;
|
|
|
|
|
|
|
|
SetDlgItemText (NetStartPane, IDC_NETSTARTMESSAGE, message);
|
|
|
|
ctl = GetDlgItem (NetStartPane, IDC_NETSTARTPROGRESS);
|
|
|
|
|
|
|
|
if (numplayers == 0)
|
|
|
|
{
|
|
|
|
// PBM_SETMARQUEE is only available under XP and above, so this might fail.
|
|
|
|
NetMarqueeMode = SendMessage (ctl, PBM_SETMARQUEE, TRUE, 100);
|
|
|
|
if (NetMarqueeMode == FALSE)
|
|
|
|
{
|
|
|
|
SendMessage (ctl, PBM_SETRANGE, 0, MAKELPARAM(0,16));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// If we don't set the PBS_MARQUEE style, then the marquee will never show up.
|
|
|
|
SetWindowLong (ctl, GWL_STYLE, GetWindowLong (ctl, GWL_STYLE) | PBS_MARQUEE);
|
|
|
|
}
|
|
|
|
SetDlgItemText (NetStartPane, IDC_NETSTARTCOUNT, "");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
NetMarqueeMode = FALSE;
|
|
|
|
SendMessage (ctl, PBM_SETMARQUEE, FALSE, 0);
|
|
|
|
// Make sure the marquee really is turned off.
|
|
|
|
SetWindowLong (ctl, GWL_STYLE, GetWindowLong (ctl, GWL_STYLE) & (~PBS_MARQUEE));
|
|
|
|
|
|
|
|
SendMessage (ctl, PBM_SETRANGE, 0, MAKELPARAM(0,numplayers));
|
|
|
|
if (numplayers == 1)
|
|
|
|
{
|
|
|
|
SendMessage (ctl, PBM_SETPOS, 1, 0);
|
|
|
|
SetDlgItemText (NetStartPane, IDC_NETSTARTCOUNT, "");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
NetMaxPos = numplayers;
|
|
|
|
NetCurPos = 0;
|
2007-03-06 01:33:18 +00:00
|
|
|
NetProgress(1); // You always know about yourself
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
}
|
|
|
|
|
2007-01-05 04:21:14 +00:00
|
|
|
//==========================================================================
|
2006-12-29 02:21:47 +00:00
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FBasicStartupScreen :: NetDone
|
2006-12-29 02:21:47 +00:00
|
|
|
//
|
|
|
|
// Removes the network startup pane.
|
|
|
|
//
|
2007-01-05 04:21:14 +00:00
|
|
|
//==========================================================================
|
2006-12-29 02:21:47 +00:00
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
void FBasicStartupScreen::NetDone()
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
{
|
|
|
|
if (NetStartPane != NULL)
|
|
|
|
{
|
|
|
|
DestroyWindow (NetStartPane);
|
|
|
|
NetStartPane = NULL;
|
|
|
|
LayoutMainWindow (Window, NULL);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-05 04:21:14 +00:00
|
|
|
//==========================================================================
|
2006-12-29 02:21:47 +00:00
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FBasicStartupScreen :: NetMessage
|
2006-12-29 02:21:47 +00:00
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// Call this between NetInit() and NetDone() instead of Printf() to
|
2006-12-29 02:21:47 +00:00
|
|
|
// display messages, in case the progress meter is mixed in the same output
|
|
|
|
// stream as normal messages.
|
|
|
|
//
|
2007-01-05 04:21:14 +00:00
|
|
|
//==========================================================================
|
2006-12-29 02:21:47 +00:00
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
void FBasicStartupScreen::NetMessage(const char *format, ...)
|
2006-12-29 02:21:47 +00:00
|
|
|
{
|
2007-01-02 09:51:04 +00:00
|
|
|
FString str;
|
|
|
|
va_list argptr;
|
|
|
|
|
|
|
|
va_start (argptr, format);
|
|
|
|
str.VFormat (format, argptr);
|
|
|
|
va_end (argptr);
|
|
|
|
Printf ("%s\n", str.GetChars());
|
2006-12-29 02:21:47 +00:00
|
|
|
}
|
|
|
|
|
2007-01-05 04:21:14 +00:00
|
|
|
//==========================================================================
|
2006-12-29 02:21:47 +00:00
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FBasicStartupScreen :: NetProgress
|
2006-12-29 02:21:47 +00:00
|
|
|
//
|
|
|
|
// Sets the network progress meter. If count is 0, it gets bumped by 1.
|
|
|
|
// Otherwise, it is set to count.
|
|
|
|
//
|
2007-01-05 04:21:14 +00:00
|
|
|
//==========================================================================
|
2006-12-29 02:21:47 +00:00
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
void FBasicStartupScreen :: NetProgress(int count)
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
{
|
|
|
|
if (count == 0)
|
|
|
|
{
|
|
|
|
NetCurPos++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
NetCurPos = count;
|
|
|
|
}
|
|
|
|
if (NetStartPane == NULL)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (NetMaxPos == 0 && !NetMarqueeMode)
|
|
|
|
{
|
|
|
|
// PBM_SETMARQUEE didn't work, so just increment the progress bar endlessly.
|
|
|
|
SendDlgItemMessage (NetStartPane, IDC_NETSTARTPROGRESS, PBM_SETPOS, NetCurPos & 15, 0);
|
|
|
|
}
|
|
|
|
else if (NetMaxPos > 1)
|
|
|
|
{
|
|
|
|
char buf[16];
|
|
|
|
|
About a week's worth of changes here. As a heads-up, I wouldn't be
surprised if this doesn't build in Linux right now. The CMakeLists.txt
were checked with MinGW and NMake, but how they fair under Linux is an
unknown to me at this time.
- Converted most sprintf (and all wsprintf) calls to either mysnprintf or
FStrings, depending on the situation.
- Changed the strings in the wbstartstruct to be FStrings.
- Changed myvsnprintf() to output nothing if count is greater than INT_MAX.
This is so that I can use a series of mysnprintf() calls and advance the
pointer for each one. Once the pointer goes beyond the end of the buffer,
the count will go negative, but since it's an unsigned type it will be
seen as excessively huge instead. This should not be a problem, as there's
no reason for ZDoom to be using text buffers larger than 2 GB anywhere.
- Ripped out the disabled bit from FGameConfigFile::MigrateOldConfig().
- Changed CalcMapName() to return an FString instead of a pointer to a static
buffer.
- Changed startmap in d_main.cpp into an FString.
- Changed CheckWarpTransMap() to take an FString& as the first argument.
- Changed d_mapname in g_level.cpp into an FString.
- Changed DoSubstitution() in ct_chat.cpp to place the substitutions in an
FString.
- Fixed: The MAPINFO parser wrote into the string buffer to construct a map
name when given a Hexen map number. This was fine with the old scanner
code, but only a happy coincidence prevents it from crashing with the new
code
- Added the 'B' conversion specifier to StringFormat::VWorker() for printing
binary numbers.
- Added CMake support for building with MinGW, MSYS, and NMake. Linux support
is probably broken until I get around to booting into Linux again. Niceties
provided over the existing Makefiles they're replacing:
* All command-line builds can use the same build system, rather than having
a separate one for MinGW and another for Linux.
* Microsoft's NMake tool is supported as a target.
* Progress meters.
* Parallel makes work from a fresh checkout without needing to be primed
first with a single-threaded make.
* Porting to other architectures should be simplified, whenever that day
comes.
- Replaced the makewad tool with zipdir. This handles the dependency tracking
itself instead of generating an external makefile to do it, since I couldn't
figure out how to generate a makefile with an external tool and include it
with a CMake-generated makefile. Where makewad used a master list of files
to generate the package file, zipdir just zips the entire contents of one or
more directories.
- Added the gdtoa package from netlib's fp library so that ZDoom's printf-style
formatting can be entirely independant of the CRT.
SVN r1082 (trunk)
2008-07-23 04:57:26 +00:00
|
|
|
mysnprintf (buf, countof(buf), "%d/%d", NetCurPos, NetMaxPos);
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
SetDlgItemText (NetStartPane, IDC_NETSTARTCOUNT, buf);
|
|
|
|
SendDlgItemMessage (NetStartPane, IDC_NETSTARTPROGRESS, PBM_SETPOS, MIN(NetCurPos, NetMaxPos), 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-05 04:21:14 +00:00
|
|
|
//==========================================================================
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FBasicStartupScreen :: NetLoop
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
//
|
2006-12-29 02:21:47 +00:00
|
|
|
// The timer_callback function is called at least two times per second
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
// and passed the userdata value. It should return true to stop the loop and
|
|
|
|
// return control to the caller or false to continue the loop.
|
|
|
|
//
|
|
|
|
// ST_NetLoop will return true if the loop was halted by the callback and
|
|
|
|
// false if the loop was halted because the user wants to abort the
|
|
|
|
// network synchronization.
|
|
|
|
//
|
2007-01-05 04:21:14 +00:00
|
|
|
//==========================================================================
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
bool FBasicStartupScreen::NetLoop(bool (*timer_callback)(void *), void *userdata)
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
{
|
|
|
|
BOOL bRet;
|
|
|
|
MSG msg;
|
|
|
|
|
2006-12-23 03:40:12 +00:00
|
|
|
if (SetTimer (Window, 1337, 500, NULL) == 0)
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
{
|
|
|
|
I_FatalError ("Could not set network synchronization timer.");
|
|
|
|
}
|
|
|
|
|
|
|
|
while ((bRet = GetMessage(&msg, NULL, 0, 0)) != 0)
|
|
|
|
{
|
|
|
|
if (bRet == -1)
|
|
|
|
{
|
|
|
|
KillTimer (Window, 1337);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (msg.message == WM_TIMER && msg.hwnd == Window && msg.wParam == 1337)
|
|
|
|
{
|
|
|
|
if (timer_callback (userdata))
|
|
|
|
{
|
|
|
|
KillTimer (NetStartPane, 1);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!IsDialogMessage (NetStartPane, &msg))
|
|
|
|
{
|
|
|
|
TranslateMessage (&msg);
|
|
|
|
DispatchMessage (&msg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
KillTimer (Window, 1337);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2007-01-05 04:21:14 +00:00
|
|
|
//==========================================================================
|
2006-12-29 02:21:47 +00:00
|
|
|
//
|
|
|
|
// NetStartPaneProc
|
|
|
|
//
|
|
|
|
// DialogProc for the network startup pane. It just waits for somebody to
|
|
|
|
// click a button, and the only button available is the abort one.
|
|
|
|
//
|
2007-01-05 04:21:14 +00:00
|
|
|
//==========================================================================
|
2006-12-29 02:21:47 +00:00
|
|
|
|
2007-01-05 04:21:14 +00:00
|
|
|
static INT_PTR CALLBACK NetStartPaneProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
{
|
2007-03-06 01:33:18 +00:00
|
|
|
if (msg == WM_COMMAND && HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == IDCANCEL)
|
Note: I have not tried compiling these recent changes under Linux. I wouldn't
be surprised if it doesn't work.
- Reorganized the network startup loops so now they are event driven. There is
a single function that gets called to drive it, and it uses callbacks to
perform the different stages of the synchronization. This lets me have a nice,
responsive abort button instead of the previous unannounced hit-escape-to-
abort behavior, and I think the rearranged code is slightly easier to
understand too.
- Increased the number of bytes for version info during D_ArbitrateNetStart(),
in preparation for the day when NETGAMEVERSION requires more than one byte.
- I noticed an issue with Vista RC1 and the new fatal error setup. Even after
releasing a DirectDraw or Direct3D interface, the DWM can still use the
last image drawn using them when it composites the window. It doesn't always
do it but it does often enough that it is a real problem. At this point, I
don't know if it's a problem with the release version of Vista or not.
After messing around, I discovered the problem was caused by ~Win32Video()
hiding the window and then having it immediately shown soon after. The DWM
kept an image of the window to do the transition effect with, and then when
it didn't get a chance to do the transition, it didn't properly forget about
its saved image and kept plastering it on top of everything else
underneath.
- Added a network synchronization panel to the window during netgame startup.
- Fixed: PClass::CreateDerivedClass() must initialize StateList to NULL.
Otherwise, classic DECORATE definitions generate a big, fat crash.
- Resurrected the R_Init progress bar, now as a standard Windows control.
- Removed the sound failure dialog. The FMOD setup already defaulted to no
sound if initialization failed, so this only applies when snd_output is set
to "alternate" which now also falls back to no sound. In addition, it wasn't
working right, and I didn't feel like fixing it for the probably 0% of users
it affected.
- Fixed: The edit control used for logging output added text in reverse order
on Win9x.
- Went back to the roots and made graphics initialization one of the last
things to happen during setup. Now the startup text is visible again. More
importantly, the main window is no longer created invisible, which seems
to cause trouble with it not always appearing in the taskbar. The fatal
error dialog is now also embedded in the main window instead of being a
separate modal dialog, so you can play with the log window to see any
problems that might be reported there.
Rather than completely restoring the original startup order, I tried to
keep things as close to the way they were with early graphics startup. In
particular, V_Init() now creates a dummy screen so that things that need
screen dimensions can get them. It gets replaced by the real screen later
in I_InitGraphics(). Will need to check this under Linux to make sure it
didn't cause any problems there.
- Removed the following stubs that just called functions in Video:
- I_StartModeIterator()
- I_NextMode()
- I_DisplayType()
I_FullscreenChanged() was also removed, and a new fullscreen parameter
was added to IVideo::StartModeIterator(), since that's all it controlled.
- Renamed I_InitHardware() back to I_InitGraphics(), since that's all it's
initialized post-1.22.
SVN r416 (trunk)
2006-12-19 04:09:10 +00:00
|
|
|
{
|
|
|
|
PostQuitMessage (0);
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
return FALSE;
|
|
|
|
}
|
2007-01-05 04:21:14 +00:00
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FGraphicalStartupScreen Constructor
|
|
|
|
//
|
|
|
|
// This doesn't really do anything. The subclass is responsible for
|
|
|
|
// creating the resources that will be freed by this class's destructor.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
FGraphicalStartupScreen::FGraphicalStartupScreen(int max_progress)
|
|
|
|
: FBasicStartupScreen(max_progress, false)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// FGraphicalStartupScreen Destructor
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
FGraphicalStartupScreen::~FGraphicalStartupScreen()
|
|
|
|
{
|
|
|
|
if (StartupScreen != NULL)
|
|
|
|
{
|
|
|
|
DestroyWindow (StartupScreen);
|
|
|
|
StartupScreen = NULL;
|
|
|
|
}
|
|
|
|
if (StartupBitmap != NULL)
|
|
|
|
{
|
|
|
|
ST_Util_FreeBitmap (StartupBitmap);
|
|
|
|
StartupBitmap = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// FHexenStartupScreen Constructor
|
2007-01-05 04:21:14 +00:00
|
|
|
//
|
|
|
|
// Shows the Hexen startup screen. If the screen doesn't appear to be
|
2007-03-06 01:33:18 +00:00
|
|
|
// valid, it sets hr for a failure.
|
2007-01-05 04:21:14 +00:00
|
|
|
//
|
|
|
|
// The startup graphic is a planar, 4-bit 640x480 graphic preceded by a
|
|
|
|
// 16 entry (48 byte) VGA palette.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
FHexenStartupScreen::FHexenStartupScreen(int max_progress, HRESULT &hr)
|
|
|
|
: FGraphicalStartupScreen(max_progress)
|
2007-01-05 04:21:14 +00:00
|
|
|
{
|
|
|
|
int startup_lump = Wads.CheckNumForName ("STARTUP");
|
2010-03-27 21:12:08 +00:00
|
|
|
int netnotch_lump = Wads.CheckNumForName ("NETNOTCH");
|
|
|
|
int notch_lump = Wads.CheckNumForName ("NOTCH");
|
2007-03-06 01:33:18 +00:00
|
|
|
hr = E_FAIL;
|
2007-01-05 04:21:14 +00:00
|
|
|
|
2010-03-27 21:12:08 +00:00
|
|
|
if (startup_lump < 0 || Wads.LumpLength (startup_lump) != 153648 || !ST_Util_CreateStartupWindow() ||
|
|
|
|
netnotch_lump < 0 || Wads.LumpLength (netnotch_lump) != ST_NETNOTCH_WIDTH / 2 * ST_NETNOTCH_HEIGHT ||
|
|
|
|
notch_lump < 0 || Wads.LumpLength (notch_lump) != ST_NOTCH_WIDTH / 2 * ST_NOTCH_HEIGHT)
|
2007-01-05 04:21:14 +00:00
|
|
|
{
|
2010-03-27 21:12:08 +00:00
|
|
|
NetNotchBits = NotchBits = NULL;
|
2007-01-05 04:21:14 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2010-03-27 21:12:08 +00:00
|
|
|
NetNotchBits = new BYTE[ST_NETNOTCH_WIDTH / 2 * ST_NETNOTCH_HEIGHT];
|
|
|
|
Wads.ReadLump (netnotch_lump, NetNotchBits);
|
|
|
|
NotchBits = new BYTE[ST_NOTCH_WIDTH / 2 * ST_NOTCH_HEIGHT];
|
|
|
|
Wads.ReadLump (notch_lump, NotchBits);
|
|
|
|
|
2007-01-05 04:21:14 +00:00
|
|
|
BYTE startup_screen[153648];
|
|
|
|
union
|
|
|
|
{
|
|
|
|
RGBQUAD color;
|
|
|
|
DWORD quad;
|
|
|
|
};
|
|
|
|
|
|
|
|
Wads.ReadLump (startup_lump, startup_screen);
|
|
|
|
|
|
|
|
color.rgbReserved = 0;
|
|
|
|
|
2007-01-06 04:08:24 +00:00
|
|
|
StartupBitmap = ST_Util_CreateBitmap (640, 480, 4);
|
|
|
|
|
|
|
|
// Initialize the bitmap palette.
|
2007-01-05 04:21:14 +00:00
|
|
|
for (int i = 0; i < 16; ++i)
|
|
|
|
{
|
|
|
|
color.rgbRed = startup_screen[i*3+0];
|
|
|
|
color.rgbGreen = startup_screen[i*3+1];
|
|
|
|
color.rgbBlue = startup_screen[i*3+2];
|
|
|
|
// Convert from 6-bit per component to 8-bit per component.
|
|
|
|
quad = (quad << 2) | ((quad >> 4) & 0x03030303);
|
2007-01-06 04:08:24 +00:00
|
|
|
StartupBitmap->bmiColors[i] = color;
|
2007-01-05 04:21:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Fill in the bitmap data. Convert to chunky, because I can't figure out
|
|
|
|
// if Windows actually supports planar images or not, despite the presence
|
|
|
|
// of biPlanes in the BITMAPINFOHEADER.
|
2007-01-06 04:08:24 +00:00
|
|
|
ST_Util_PlanarToChunky4 (ST_Util_BitsForBitmap(StartupBitmap), startup_screen + 48, 640, 480);
|
2007-01-05 04:21:14 +00:00
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
ST_Util_SizeWindowForBitmap (1);
|
2007-01-05 04:21:14 +00:00
|
|
|
LayoutMainWindow (Window, NULL);
|
|
|
|
InvalidateRect (StartupScreen, NULL, TRUE);
|
|
|
|
|
|
|
|
S_ChangeMusic ("orb", true, true);
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
hr = S_OK;
|
2007-01-05 04:21:14 +00:00
|
|
|
}
|
|
|
|
|
2010-03-27 21:12:08 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// FHexenStartupScreen Deconstructor
|
|
|
|
//
|
|
|
|
// Frees the notch pictures.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
FHexenStartupScreen::~FHexenStartupScreen()
|
|
|
|
{
|
|
|
|
if (NotchBits)
|
|
|
|
delete[] NotchBits;
|
|
|
|
if (NetNotchBits)
|
|
|
|
delete[] NetNotchBits;
|
|
|
|
}
|
|
|
|
|
2007-01-05 04:21:14 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FHexenStartupScreen :: Progress
|
2007-01-05 04:21:14 +00:00
|
|
|
//
|
|
|
|
// Bumps the progress meter one notch.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
void FHexenStartupScreen::Progress()
|
2007-01-05 04:21:14 +00:00
|
|
|
{
|
|
|
|
int notch_pos, x, y;
|
|
|
|
|
|
|
|
if (CurPos < MaxPos)
|
|
|
|
{
|
|
|
|
CurPos++;
|
|
|
|
notch_pos = (CurPos * ST_MAX_NOTCHES) / MaxPos;
|
|
|
|
if (notch_pos != NotchPos)
|
|
|
|
{ // Time to draw another notch.
|
|
|
|
for (; NotchPos < notch_pos; NotchPos++)
|
|
|
|
{
|
|
|
|
x = ST_PROGRESS_X + ST_NOTCH_WIDTH * NotchPos;
|
|
|
|
y = ST_PROGRESS_Y;
|
2007-01-07 05:00:07 +00:00
|
|
|
ST_Util_DrawBlock (StartupBitmap, NotchBits, x, y, ST_NOTCH_WIDTH / 2, ST_NOTCH_HEIGHT);
|
2007-01-05 04:21:14 +00:00
|
|
|
}
|
|
|
|
S_Sound (CHAN_BODY, "StartupTick", 1, ATTN_NONE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
I_GetEvent ();
|
|
|
|
}
|
|
|
|
|
2007-02-28 19:08:02 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FHexenStartupScreen :: NetProgress
|
2007-02-28 19:08:02 +00:00
|
|
|
//
|
|
|
|
// Draws the red net noches in addition to the normal progress bar.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
void FHexenStartupScreen::NetProgress(int count)
|
2007-02-28 19:08:02 +00:00
|
|
|
{
|
|
|
|
int oldpos = NetCurPos;
|
|
|
|
int x, y;
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
FGraphicalStartupScreen::NetProgress (count);
|
2007-02-28 19:08:02 +00:00
|
|
|
if (NetMaxPos != 0 && NetCurPos > oldpos)
|
|
|
|
{
|
|
|
|
for (; oldpos < NetCurPos && oldpos < ST_MAX_NETNOTCHES; ++oldpos)
|
|
|
|
{
|
|
|
|
x = ST_NETPROGRESS_X + ST_NETNOTCH_WIDTH * oldpos;
|
|
|
|
y = ST_NETPROGRESS_Y;
|
|
|
|
ST_Util_DrawBlock (StartupBitmap, NetNotchBits, x, y, ST_NETNOTCH_WIDTH / 2, ST_NETNOTCH_HEIGHT);
|
|
|
|
}
|
|
|
|
S_Sound (CHAN_BODY, "Drip", 1, ATTN_NONE);
|
|
|
|
I_GetEvent ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-06 04:08:24 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FHexenStartupScreen :: NetDone
|
|
|
|
//
|
|
|
|
// Aside from the standard processing, also plays a sound.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void FHexenStartupScreen::NetDone()
|
|
|
|
{
|
|
|
|
S_Sound (CHAN_BODY, "PickupWeapon", 1, ATTN_NORM);
|
|
|
|
FGraphicalStartupScreen::NetDone();
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// FHereticStartupScreen Constructor
|
2007-01-06 04:08:24 +00:00
|
|
|
//
|
2007-01-07 05:00:07 +00:00
|
|
|
// Shows the Heretic startup screen. If the screen doesn't appear to be
|
2007-03-06 01:33:18 +00:00
|
|
|
// valid, it returns a failure code in hr.
|
2007-01-06 04:08:24 +00:00
|
|
|
//
|
|
|
|
// The loading screen is an 80x25 text screen with character data and
|
|
|
|
// attributes intermixed, which means it must be exactly 4000 bytes long.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
FHereticStartupScreen::FHereticStartupScreen(int max_progress, HRESULT &hr)
|
|
|
|
: FGraphicalStartupScreen(max_progress)
|
2007-01-06 04:08:24 +00:00
|
|
|
{
|
|
|
|
int loading_lump = Wads.CheckNumForName ("LOADING");
|
|
|
|
BYTE loading_screen[4000];
|
|
|
|
BYTE *font;
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
hr = E_FAIL;
|
2007-01-06 04:08:24 +00:00
|
|
|
if (loading_lump < 0 || Wads.LumpLength (loading_lump) != 4000 || !ST_Util_CreateStartupWindow())
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
font = ST_Util_LoadFont (TEXT_FONT_NAME);
|
2007-01-06 04:08:24 +00:00
|
|
|
if (font == NULL)
|
|
|
|
{
|
|
|
|
DestroyWindow (StartupScreen);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
Wads.ReadLump (loading_lump, loading_screen);
|
2007-01-06 04:18:07 +00:00
|
|
|
|
|
|
|
// Slap the Heretic minor version on the loading screen. Heretic
|
|
|
|
// did this inside the executable rather than coming with modified
|
|
|
|
// LOADING screens, so we need to do the same.
|
|
|
|
loading_screen[2*160 + 49*2] = HERETIC_MINOR_VERSION;
|
|
|
|
|
|
|
|
// Draw the loading screen to a bitmap.
|
2007-01-06 04:08:24 +00:00
|
|
|
StartupBitmap = ST_Util_AllocTextBitmap (font);
|
|
|
|
ST_Util_DrawTextScreen (StartupBitmap, loading_screen, font);
|
2007-01-07 05:00:07 +00:00
|
|
|
|
|
|
|
ThermX = THERM_X * 8;
|
|
|
|
ThermY = THERM_Y * font[0];
|
|
|
|
ThermWidth = THERM_LEN * 8 - 4;
|
|
|
|
ThermHeight = font[0];
|
2007-02-28 19:08:02 +00:00
|
|
|
HMsgY = 7;
|
|
|
|
SMsgX = 1;
|
2007-01-07 05:00:07 +00:00
|
|
|
|
2007-01-06 04:08:24 +00:00
|
|
|
ST_Util_FreeFont (font);
|
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
ST_Util_SizeWindowForBitmap (1);
|
2007-01-06 04:08:24 +00:00
|
|
|
LayoutMainWindow (Window, NULL);
|
|
|
|
InvalidateRect (StartupScreen, NULL, TRUE);
|
2007-03-06 01:33:18 +00:00
|
|
|
hr = S_OK;
|
2007-01-06 04:08:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FHereticStartupScreen::Progress
|
2007-01-06 04:08:24 +00:00
|
|
|
//
|
|
|
|
// Bumps the progress meter one notch.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
void FHereticStartupScreen::Progress()
|
2007-01-06 04:08:24 +00:00
|
|
|
{
|
|
|
|
int notch_pos;
|
|
|
|
|
|
|
|
if (CurPos < MaxPos)
|
|
|
|
{
|
|
|
|
CurPos++;
|
|
|
|
notch_pos = (CurPos * ThermWidth) / MaxPos;
|
2007-01-06 04:10:51 +00:00
|
|
|
if (notch_pos != NotchPos && !(notch_pos & 3))
|
2007-01-06 04:08:24 +00:00
|
|
|
{ // Time to draw another notch.
|
|
|
|
int left = NotchPos + ThermX;
|
|
|
|
int top = ThermY;
|
|
|
|
int right = notch_pos + ThermX;
|
|
|
|
int bottom = top + ThermHeight;
|
2007-01-07 05:00:07 +00:00
|
|
|
ST_Util_ClearBlock (StartupBitmap, THERM_COLOR, left, top, right - left, bottom - top);
|
|
|
|
NotchPos = notch_pos;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
I_GetEvent ();
|
|
|
|
}
|
|
|
|
|
2007-02-28 19:08:02 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FHereticStartupScreen :: LoadingStatus
|
2007-02-28 19:08:02 +00:00
|
|
|
//
|
|
|
|
// Prints text in the center box of the startup screen.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
void FHereticStartupScreen::LoadingStatus(const char *message, int colors)
|
2007-02-28 19:08:02 +00:00
|
|
|
{
|
|
|
|
BYTE *font = ST_Util_LoadFont (TEXT_FONT_NAME);
|
|
|
|
if (font != NULL)
|
|
|
|
{
|
|
|
|
int x;
|
|
|
|
|
|
|
|
for (x = 0; message[x] != '\0'; ++x)
|
|
|
|
{
|
2007-03-06 01:33:18 +00:00
|
|
|
ST_Util_DrawChar (StartupBitmap, font, 17 + x, HMsgY, message[x], colors);
|
2007-02-28 19:08:02 +00:00
|
|
|
}
|
|
|
|
ST_Util_InvalidateRect (StartupScreen, StartupBitmap, 17 * 8, HMsgY * font[0], (17 + x) * 8, HMsgY * font[0] + font[0]);
|
|
|
|
ST_Util_FreeFont (font);
|
|
|
|
HMsgY++;
|
|
|
|
I_GetEvent ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FHereticStartupScreen :: AppendStatusLine
|
2007-02-28 19:08:02 +00:00
|
|
|
//
|
|
|
|
// Appends text to Heretic's status line.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
void FHereticStartupScreen::AppendStatusLine(const char *status)
|
2007-02-28 19:08:02 +00:00
|
|
|
{
|
|
|
|
BYTE *font = ST_Util_LoadFont (TEXT_FONT_NAME);
|
|
|
|
if (font != NULL)
|
|
|
|
{
|
|
|
|
int x;
|
|
|
|
|
|
|
|
for (x = 0; status[x] != '\0'; ++x)
|
|
|
|
{
|
|
|
|
ST_Util_DrawChar (StartupBitmap, font, SMsgX + x, 24, status[x], 0x1f);
|
|
|
|
}
|
|
|
|
ST_Util_InvalidateRect (StartupScreen, StartupBitmap, SMsgX * 8, 24 * font[0], (SMsgX + x) * 8, 25 * font[0]);
|
|
|
|
ST_Util_FreeFont (font);
|
|
|
|
SMsgX += x;
|
|
|
|
I_GetEvent ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FStrifeStartupScreen Constructor
|
2007-01-07 05:00:07 +00:00
|
|
|
//
|
|
|
|
// Shows the Strife startup screen. If the screen doesn't appear to be
|
2007-03-06 01:33:18 +00:00
|
|
|
// valid, it returns a failure code in hr.
|
2007-01-07 05:00:07 +00:00
|
|
|
//
|
|
|
|
// The startup background is a raw 320x200 image, however Strife only
|
|
|
|
// actually uses 95 rows from it, starting at row 57. The rest of the image
|
|
|
|
// is discarded. (What a shame.)
|
|
|
|
//
|
|
|
|
// The peasants are raw 32x64 images. The laser dots are raw 16x16 images.
|
|
|
|
// The bot is a raw 48x48 image. All use the standard PLAYPAL.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
FStrifeStartupScreen::FStrifeStartupScreen(int max_progress, HRESULT &hr)
|
|
|
|
: FGraphicalStartupScreen(max_progress)
|
2007-01-07 05:00:07 +00:00
|
|
|
{
|
|
|
|
int startup_lump = Wads.CheckNumForName ("STARTUP0");
|
|
|
|
int i;
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
hr = E_FAIL;
|
|
|
|
for (i = 0; i < 4+2+1; ++i)
|
|
|
|
{
|
|
|
|
StartupPics[i] = NULL;
|
|
|
|
}
|
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
if (startup_lump < 0 || Wads.LumpLength (startup_lump) != 64000 || !ST_Util_CreateStartupWindow())
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
StartupBitmap = ST_Util_CreateBitmap (320, 200, 8);
|
|
|
|
ST_Util_BitmapColorsFromPlaypal (StartupBitmap);
|
|
|
|
|
|
|
|
// Fill bitmap with the startup image.
|
|
|
|
memset (ST_Util_BitsForBitmap(StartupBitmap), 0xF0, 64000);
|
|
|
|
FWadLump lumpr = Wads.OpenLumpNum (startup_lump);
|
|
|
|
lumpr.Seek (57 * 320, SEEK_SET);
|
|
|
|
lumpr.Read (ST_Util_BitsForBitmap(StartupBitmap) + 41 * 320, 95 * 320);
|
|
|
|
|
|
|
|
// Load the animated overlays.
|
|
|
|
for (i = 0; i < 4+2+1; ++i)
|
|
|
|
{
|
|
|
|
int lumpnum = Wads.CheckNumForName (StrifeStartupPicNames[i]);
|
|
|
|
int lumplen;
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
if (lumpnum >= 0 && (lumplen = Wads.LumpLength (lumpnum)) == StrifeStartupPicSizes[i])
|
2007-01-07 05:00:07 +00:00
|
|
|
{
|
|
|
|
FWadLump lumpr = Wads.OpenLumpNum (lumpnum);
|
2007-03-06 01:33:18 +00:00
|
|
|
StartupPics[i] = new BYTE[lumplen];
|
|
|
|
lumpr.Read (StartupPics[i], lumplen);
|
2007-01-07 05:00:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Make the startup image appear.
|
2007-03-06 01:33:18 +00:00
|
|
|
DrawStuff (0, 0);
|
2007-01-07 05:00:07 +00:00
|
|
|
ST_Util_SizeWindowForBitmap (2);
|
|
|
|
LayoutMainWindow (Window, NULL);
|
|
|
|
InvalidateRect (StartupScreen, NULL, TRUE);
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
hr = S_OK;
|
2007-01-07 05:00:07 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FStrifeStartupScreen Deconstructor
|
2007-01-07 05:00:07 +00:00
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// Frees the strife pictures.
|
2007-01-07 05:00:07 +00:00
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
FStrifeStartupScreen::~FStrifeStartupScreen()
|
2007-01-07 05:00:07 +00:00
|
|
|
{
|
2007-03-06 01:33:18 +00:00
|
|
|
for (int i = 0; i < 4+2+1; ++i)
|
2007-01-07 05:00:07 +00:00
|
|
|
{
|
2007-03-06 01:33:18 +00:00
|
|
|
if (StartupPics[i] != NULL)
|
2007-01-07 05:00:07 +00:00
|
|
|
{
|
2007-03-06 01:33:18 +00:00
|
|
|
delete[] StartupPics[i];
|
2007-01-07 05:00:07 +00:00
|
|
|
}
|
2007-03-06 01:33:18 +00:00
|
|
|
StartupPics[i] = NULL;
|
2007-01-07 05:00:07 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FStrifeStartupScreen :: Progress
|
2007-01-07 05:00:07 +00:00
|
|
|
//
|
|
|
|
// Bumps the progress meter one notch.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
void FStrifeStartupScreen::Progress()
|
2007-01-07 05:00:07 +00:00
|
|
|
{
|
|
|
|
int notch_pos;
|
|
|
|
|
|
|
|
if (CurPos < MaxPos)
|
|
|
|
{
|
|
|
|
CurPos++;
|
|
|
|
notch_pos = (CurPos * (ST_LASERSPACE_WIDTH - ST_LASER_WIDTH)) / MaxPos;
|
2007-01-09 04:40:58 +00:00
|
|
|
if (notch_pos != NotchPos && !(notch_pos & 1))
|
2007-01-07 05:00:07 +00:00
|
|
|
{ // Time to update.
|
2007-03-06 01:33:18 +00:00
|
|
|
DrawStuff (NotchPos, notch_pos);
|
2007-01-06 04:08:24 +00:00
|
|
|
NotchPos = notch_pos;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
I_GetEvent ();
|
|
|
|
}
|
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
2007-03-06 01:33:18 +00:00
|
|
|
// FStrifeStartupScreen :: DrawStuff
|
2007-01-07 05:00:07 +00:00
|
|
|
//
|
|
|
|
// Draws all the moving parts of Strife's startup screen. If you're
|
|
|
|
// running off a slow drive, it can look kind of good. Otherwise, it
|
|
|
|
// borders on crazy insane fast.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-03-06 01:33:18 +00:00
|
|
|
void FStrifeStartupScreen::DrawStuff(int old_laser, int new_laser)
|
2007-01-07 05:00:07 +00:00
|
|
|
{
|
|
|
|
int y;
|
|
|
|
|
|
|
|
// Clear old laser
|
|
|
|
ST_Util_ClearBlock (StartupBitmap, 0xF0, ST_LASERSPACE_X + old_laser,
|
|
|
|
ST_LASERSPACE_Y, ST_LASER_WIDTH, ST_LASER_HEIGHT);
|
|
|
|
// Draw new laser
|
2007-03-06 01:33:18 +00:00
|
|
|
ST_Util_DrawBlock (StartupBitmap, StartupPics[LASER_INDEX + (new_laser & 1)],
|
2007-01-07 05:00:07 +00:00
|
|
|
ST_LASERSPACE_X + new_laser, ST_LASERSPACE_Y, ST_LASER_WIDTH, ST_LASER_HEIGHT);
|
|
|
|
|
|
|
|
// The bot jumps up and down like crazy.
|
2007-01-09 04:40:58 +00:00
|
|
|
y = MAX(0, (new_laser >> 1) % 5 - 2);
|
2007-01-07 05:00:07 +00:00
|
|
|
if (y > 0)
|
|
|
|
{
|
|
|
|
ST_Util_ClearBlock (StartupBitmap, 0xF0, ST_BOT_X, ST_BOT_Y, ST_BOT_WIDTH, y);
|
|
|
|
}
|
2007-03-06 01:33:18 +00:00
|
|
|
ST_Util_DrawBlock (StartupBitmap, StartupPics[BOT_INDEX], ST_BOT_X, ST_BOT_Y + y, ST_BOT_WIDTH, ST_BOT_HEIGHT);
|
2007-01-07 05:00:07 +00:00
|
|
|
if (y < (5 - 1) - 2)
|
|
|
|
{
|
|
|
|
ST_Util_ClearBlock (StartupBitmap, 0xF0, ST_BOT_X, ST_BOT_Y + ST_BOT_HEIGHT + y, ST_BOT_WIDTH, 2 - y);
|
|
|
|
}
|
|
|
|
|
|
|
|
// The peasant desperately runs in place, trying to get away from the laser.
|
|
|
|
// Yet, despite all his limb flailing, he never manages to get anywhere.
|
2007-03-06 01:33:18 +00:00
|
|
|
ST_Util_DrawBlock (StartupBitmap, StartupPics[PEASANT_INDEX + ((new_laser >> 1) & 3)],
|
2007-01-07 05:00:07 +00:00
|
|
|
ST_PEASANT_X, ST_PEASANT_Y, ST_PEASANT_WIDTH, ST_PEASANT_HEIGHT);
|
|
|
|
}
|
2007-01-06 12:30:34 +00:00
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// ST_Endoom
|
|
|
|
//
|
|
|
|
// Shows an ENDOOM text screen
|
|
|
|
//
|
|
|
|
//==========================================================================
|
2007-01-09 04:40:58 +00:00
|
|
|
|
2007-01-06 12:30:34 +00:00
|
|
|
void ST_Endoom()
|
|
|
|
{
|
2007-01-07 09:43:58 +00:00
|
|
|
if (showendoom == 0) exit(0);
|
2007-01-06 12:30:34 +00:00
|
|
|
|
2009-09-08 21:01:24 +00:00
|
|
|
if (gameinfo.Endoom[0] == 0)
|
|
|
|
{
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
int endoom_lump = Wads.CheckNumForName (gameinfo.Endoom);
|
2007-01-06 12:30:34 +00:00
|
|
|
|
|
|
|
BYTE endoom_screen[4000];
|
|
|
|
BYTE *font;
|
|
|
|
MSG mess;
|
2007-03-06 01:33:18 +00:00
|
|
|
BOOL bRet;
|
2007-03-29 00:35:34 +00:00
|
|
|
bool blinking = false, blinkstate = false;
|
|
|
|
int i;
|
2007-01-06 12:30:34 +00:00
|
|
|
|
|
|
|
if (endoom_lump < 0 || Wads.LumpLength (endoom_lump) != 4000)
|
|
|
|
{
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
2007-01-07 09:43:58 +00:00
|
|
|
if (Wads.GetLumpFile(endoom_lump) == FWadCollection::IWAD_FILENUM && showendoom == 2)
|
|
|
|
{
|
|
|
|
// showendoom==2 means to show only lumps from PWADs.
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
font = ST_Util_LoadFont (TEXT_FONT_NAME);
|
2007-01-06 12:30:34 +00:00
|
|
|
if (font == NULL)
|
|
|
|
{
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!ST_Util_CreateStartupWindow())
|
|
|
|
{
|
|
|
|
ST_Util_FreeFont (font);
|
|
|
|
exit(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
I_ShutdownGraphics ();
|
|
|
|
RestoreConView ();
|
|
|
|
S_StopMusic(true);
|
|
|
|
|
|
|
|
Wads.ReadLump (endoom_lump, endoom_screen);
|
|
|
|
|
|
|
|
// Draw the loading screen to a bitmap.
|
|
|
|
StartupBitmap = ST_Util_AllocTextBitmap (font);
|
|
|
|
ST_Util_DrawTextScreen (StartupBitmap, endoom_screen, font);
|
|
|
|
|
2007-01-09 04:40:58 +00:00
|
|
|
// Make the title banner go away.
|
|
|
|
if (GameTitleWindow != NULL)
|
|
|
|
{
|
|
|
|
DestroyWindow (GameTitleWindow);
|
|
|
|
GameTitleWindow = NULL;
|
|
|
|
}
|
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
ST_Util_SizeWindowForBitmap (1);
|
2007-01-06 12:30:34 +00:00
|
|
|
LayoutMainWindow (Window, NULL);
|
|
|
|
InvalidateRect (StartupScreen, NULL, TRUE);
|
|
|
|
|
2007-03-29 00:35:34 +00:00
|
|
|
// Does this screen need blinking?
|
|
|
|
for (i = 0; i < 80*25; ++i)
|
2007-01-06 12:30:34 +00:00
|
|
|
{
|
2007-03-29 00:35:34 +00:00
|
|
|
if (endoom_screen[1+i*2] & 0x80)
|
2007-03-06 01:33:18 +00:00
|
|
|
{
|
2007-03-29 00:35:34 +00:00
|
|
|
blinking = true;
|
|
|
|
break;
|
2007-03-06 01:33:18 +00:00
|
|
|
}
|
2007-03-29 00:35:34 +00:00
|
|
|
}
|
|
|
|
if (blinking && SetTimer (Window, 0x5A15A, BLINK_PERIOD, NULL) == 0)
|
|
|
|
{
|
|
|
|
blinking = false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Wait until any key has been pressed or a quit message has been received
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
bRet = GetMessage (&mess, NULL, 0, 0);
|
|
|
|
if (bRet == 0 || bRet == -1 || // bRet == 0 means we received WM_QUIT
|
|
|
|
mess.message == WM_KEYDOWN || mess.message == WM_SYSKEYDOWN || mess.message == WM_LBUTTONDOWN)
|
2007-01-06 12:30:34 +00:00
|
|
|
{
|
2007-03-29 00:35:34 +00:00
|
|
|
if (blinking)
|
2007-03-06 01:33:18 +00:00
|
|
|
{
|
2007-03-29 00:35:34 +00:00
|
|
|
KillTimer (Window, 0x5A15A);
|
2007-03-06 01:33:18 +00:00
|
|
|
}
|
- Discovered that Shader Model 1.4 clamps my constants, so I can't use
palettes smaller than 256 entries with the shader I wrote for it. Is there
a list of gotchas like this listed some where? I'd really like to see it.
Well, when compiled with SM2.0, the PalTex shader seems to be every-so-
slightly faster on my GF7950GT than the SM1.4 version, so I guess it's a
minor win for cards that support it.
- Fixed: ST_Endoom() failed to free the bitmap it used.
- Added the DTA_ColorOverlay attribute to blend a color with the texture
being drawn. For software, this (currently) only works with black. For
hardware, it works with any color. The motiviation for this was so I could
rewrite the status bar calls that passed DIM_MAP to DTA_Translation to
draw darker icons into something that didn't require making a whole new
remap table.
- After having an "OMG! How could I have been so stupid?" moment, I have
removed the off-by-one check from D3DFB. I had thought the off-by-one error
was caused by rounding errors by the shader hardware. Not so. Rather, I
wasn't sampling what I thought I was sampling. A texture that uses palette
index 255 passes the value 1.0 to the shader. The shader needs to adjust the
range of its palette indexes, or it will end up trying to read color 256
from the palette texture when it should be reading color 255. Doh!
- The TranslationToTable() function has been added to map from translation
numbers used by actors to the tables those numbers represent. This function
performs validation for the input and returns NULL if the input value
is invalid.
- Major changes to the way translation tables work: No longer are they each a
256-byte array. Instead, the FRemapTable structure is used to represent each
one. It includes a remap array for the software renderer, a palette array
for a hardware renderer, and a native texture pointer for D3DFB. The
translationtables array itself is now an array of TArrays that point to the
real tables. The DTA_Translation attribute must also be passed a pointer
to a FRemapTable, not a byte array as previously.
- Modified DFrameBuffer::DrawRateStuff() so that it can do its thing properly
for D3DFB's 2D mode. Before, any fullscreen graphics (like help images)
covered it up.
SVN r640 (trunk)
2007-12-26 04:42:15 +00:00
|
|
|
ST_Util_FreeBitmap (StartupBitmap);
|
2007-03-29 00:35:34 +00:00
|
|
|
ST_Util_FreeFont (font);
|
|
|
|
exit (int(bRet == 0 ? mess.wParam : 0));
|
|
|
|
}
|
|
|
|
else if (blinking && mess.message == WM_TIMER && mess.hwnd == Window && mess.wParam == 0x5A15A)
|
|
|
|
{
|
|
|
|
ST_Util_UpdateTextBlink (StartupBitmap, endoom_screen, font, blinkstate);
|
|
|
|
blinkstate = !blinkstate;
|
2007-01-06 12:30:34 +00:00
|
|
|
}
|
2007-03-06 01:33:18 +00:00
|
|
|
TranslateMessage (&mess);
|
|
|
|
DispatchMessage (&mess);
|
2007-01-06 12:30:34 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-06 04:08:24 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// ST_Util_CreateStartupWindow
|
|
|
|
//
|
|
|
|
// Creates the static control that will draw the startup screen.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
bool ST_Util_CreateStartupWindow ()
|
|
|
|
{
|
|
|
|
StartupScreen = CreateWindowEx (WS_EX_NOPARENTNOTIFY, "STATIC", NULL,
|
|
|
|
WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | SS_OWNERDRAW,
|
|
|
|
0, 0, 0, 0, Window, NULL, g_hInst, NULL);
|
|
|
|
if (StartupScreen == NULL)
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
SetWindowLong (StartupScreen, GWL_ID, IDC_STATIC_STARTUP);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// ST_Util_SizeWindowForBitmap
|
|
|
|
//
|
2007-01-07 05:00:07 +00:00
|
|
|
// Resizes the main window so that the startup bitmap will be drawn
|
|
|
|
// at the desired scale.
|
2007-01-06 04:08:24 +00:00
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
void ST_Util_SizeWindowForBitmap (int scale)
|
2007-01-06 04:08:24 +00:00
|
|
|
{
|
|
|
|
DEVMODE displaysettings;
|
|
|
|
int w, h, cx, cy, x, y;
|
|
|
|
RECT rect;
|
|
|
|
|
2007-01-09 04:40:58 +00:00
|
|
|
if (GameTitleWindow != NULL)
|
|
|
|
{
|
|
|
|
GetClientRect (GameTitleWindow, &rect);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
rect.bottom = 0;
|
|
|
|
}
|
2007-01-07 05:00:07 +00:00
|
|
|
w = StartupBitmap->bmiHeader.biWidth * scale + GetSystemMetrics (SM_CXSIZEFRAME)*2;
|
|
|
|
h = StartupBitmap->bmiHeader.biHeight * scale + rect.bottom
|
2007-01-06 04:08:24 +00:00
|
|
|
+ GetSystemMetrics (SM_CYSIZEFRAME) * 2 + GetSystemMetrics (SM_CYCAPTION);
|
|
|
|
|
|
|
|
// Resize the window, but keep its center point the same, unless that
|
|
|
|
// puts it partially offscreen.
|
|
|
|
memset (&displaysettings, 0, sizeof(displaysettings));
|
|
|
|
displaysettings.dmSize = sizeof(displaysettings);
|
|
|
|
EnumDisplaySettings (NULL, ENUM_CURRENT_SETTINGS, &displaysettings);
|
|
|
|
GetWindowRect (Window, &rect);
|
|
|
|
cx = (rect.left + rect.right) / 2;
|
|
|
|
cy = (rect.top + rect.bottom) / 2;
|
|
|
|
x = cx - w / 2;
|
|
|
|
y = cy - h / 2;
|
|
|
|
if (x + w > (int)displaysettings.dmPelsWidth)
|
|
|
|
{
|
|
|
|
x = displaysettings.dmPelsWidth - w;
|
|
|
|
}
|
|
|
|
if (x < 0)
|
|
|
|
{
|
|
|
|
x = 0;
|
|
|
|
}
|
|
|
|
if (y + h > (int)displaysettings.dmPelsHeight)
|
|
|
|
{
|
|
|
|
y = displaysettings.dmPelsHeight - h;
|
|
|
|
}
|
|
|
|
if (y < 0)
|
|
|
|
{
|
|
|
|
y = 0;
|
|
|
|
}
|
|
|
|
MoveWindow (Window, x, y, w, h, TRUE);
|
|
|
|
}
|
|
|
|
|
2007-01-05 04:21:14 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// ST_Util_PlanarToChunky4
|
|
|
|
//
|
|
|
|
// Convert a 4-bpp planar image to chunky pixels.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void ST_Util_PlanarToChunky4 (BYTE *dest, const BYTE *src, int width, int height)
|
|
|
|
{
|
|
|
|
int y, x;
|
|
|
|
const BYTE *src1, *src2, *src3, *src4;
|
|
|
|
size_t plane_size = width / 8 * height;
|
|
|
|
|
|
|
|
src1 = src;
|
|
|
|
src2 = src1 + plane_size;
|
|
|
|
src3 = src2 + plane_size;
|
|
|
|
src4 = src3 + plane_size;
|
|
|
|
|
|
|
|
for (y = height; y > 0; --y)
|
|
|
|
{
|
|
|
|
for (x = width; x > 0; x -= 8)
|
|
|
|
{
|
|
|
|
// Pixels 0 and 1
|
|
|
|
dest[0] = (*src4 & 0x80) | ((*src3 & 0x80) >> 1) | ((*src2 & 0x80) >> 2) | ((*src1 & 0x80) >> 3) |
|
|
|
|
((*src4 & 0x40) >> 3) | ((*src3 & 0x40) >> 4) | ((*src2 & 0x40) >> 5) | ((*src1 & 0x40) >> 6);
|
|
|
|
// Pixels 2 and 3
|
|
|
|
dest[1] = ((*src4 & 0x20) << 2) | ((*src3 & 0x20) << 1) | ((*src2 & 0x20)) | ((*src1 & 0x20) >> 1) |
|
|
|
|
((*src4 & 0x10) >> 1) | ((*src3 & 0x10) >> 2) | ((*src2 & 0x10) >> 3) | ((*src1 & 0x10) >> 4);
|
|
|
|
// Pixels 4 and 5
|
|
|
|
dest[2] = ((*src4 & 0x08) << 4) | ((*src3 & 0x08) << 3) | ((*src2 & 0x08) << 2) | ((*src1 & 0x08) << 1) |
|
|
|
|
((*src4 & 0x04) << 1) | ((*src3 & 0x04)) | ((*src2 & 0x04) >> 1) | ((*src1 & 0x04) >> 2);
|
|
|
|
// Pixels 6 and 7
|
|
|
|
dest[3] = ((*src4 & 0x02) << 6) | ((*src3 & 0x02) << 5) | ((*src2 & 0x02) << 4) | ((*src1 & 0x02) << 3) |
|
|
|
|
((*src4 & 0x01) << 3) | ((*src3 & 0x01) << 2) | ((*src2 & 0x01) << 1) | ((*src1 & 0x01));
|
|
|
|
dest += 4;
|
|
|
|
src1 += 1;
|
|
|
|
src2 += 1;
|
|
|
|
src3 += 1;
|
|
|
|
src4 += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// ST_Util_DrawBlock
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
void ST_Util_DrawBlock (BITMAPINFO *bitmap_info, const BYTE *src, int x, int y, int bytewidth, int height)
|
2007-01-05 04:21:14 +00:00
|
|
|
{
|
2007-03-06 01:33:18 +00:00
|
|
|
if (src == NULL)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
int pitchshift = int(bitmap_info->bmiHeader.biBitCount == 4);
|
|
|
|
int destpitch = bitmap_info->bmiHeader.biWidth >> pitchshift;
|
|
|
|
BYTE *dest = ST_Util_BitsForBitmap(bitmap_info) + (x >> pitchshift) + y * destpitch;
|
|
|
|
|
|
|
|
ST_Util_InvalidateRect (StartupScreen, bitmap_info, x, y, x + (bytewidth << pitchshift), y + height);
|
|
|
|
|
2007-01-05 04:21:14 +00:00
|
|
|
if (bytewidth == 8)
|
|
|
|
{ // progress notches
|
|
|
|
for (; height > 0; --height)
|
|
|
|
{
|
|
|
|
((DWORD *)dest)[0] = ((const DWORD *)src)[0];
|
|
|
|
((DWORD *)dest)[1] = ((const DWORD *)src)[1];
|
|
|
|
dest += destpitch;
|
|
|
|
src += 8;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (bytewidth == 2)
|
|
|
|
{ // net progress notches
|
|
|
|
for (; height > 0; --height)
|
|
|
|
{
|
|
|
|
*((WORD *)dest) = *((const WORD *)src);
|
|
|
|
dest += destpitch;
|
|
|
|
src += 2;
|
|
|
|
}
|
|
|
|
}
|
2007-01-07 05:00:07 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
for (; height > 0; --height)
|
|
|
|
{
|
|
|
|
memcpy (dest, src, bytewidth);
|
|
|
|
dest += destpitch;
|
|
|
|
src += bytewidth;
|
|
|
|
}
|
|
|
|
}
|
2007-01-05 04:21:14 +00:00
|
|
|
}
|
2007-01-06 04:08:24 +00:00
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// ST_Util_ClearBlock
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
void ST_Util_ClearBlock (BITMAPINFO *bitmap_info, BYTE fill, int x, int y, int bytewidth, int height)
|
2007-01-06 04:08:24 +00:00
|
|
|
{
|
2007-01-07 05:00:07 +00:00
|
|
|
int pitchshift = int(bitmap_info->bmiHeader.biBitCount == 4);
|
|
|
|
int destpitch = bitmap_info->bmiHeader.biWidth >> pitchshift;
|
|
|
|
BYTE *dest = ST_Util_BitsForBitmap(bitmap_info) + (x >> pitchshift) + y * destpitch;
|
|
|
|
|
|
|
|
ST_Util_InvalidateRect (StartupScreen, bitmap_info, x, y, x + (bytewidth << pitchshift), y + height);
|
|
|
|
|
2007-01-06 04:08:24 +00:00
|
|
|
while (height > 0)
|
|
|
|
{
|
|
|
|
memset (dest, fill, bytewidth);
|
|
|
|
dest += destpitch;
|
|
|
|
height--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// ST_Util_CreateBitmap
|
|
|
|
//
|
|
|
|
// Creates a BITMAPINFOHEADER, RGBQUAD, and pixel data arranged
|
|
|
|
// consecutively in memory (in other words, a normal Windows BMP file).
|
|
|
|
// The BITMAPINFOHEADER will be filled in, and the caller must fill
|
|
|
|
// in the color and pixel data.
|
|
|
|
//
|
|
|
|
// You must pass 4 or 8 for color_bits.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
BITMAPINFO *ST_Util_CreateBitmap (int width, int height, int color_bits)
|
|
|
|
{
|
|
|
|
DWORD size_image = (width * height) >> int(color_bits == 4);
|
|
|
|
BITMAPINFO *bitmap_info = (BITMAPINFO *)M_Malloc (sizeof(BITMAPINFOHEADER) +
|
|
|
|
(sizeof(RGBQUAD) << color_bits) + size_image);
|
|
|
|
|
|
|
|
// Initialize the header.
|
|
|
|
bitmap_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
|
|
|
|
bitmap_info->bmiHeader.biWidth = width;
|
|
|
|
bitmap_info->bmiHeader.biHeight = height;
|
|
|
|
bitmap_info->bmiHeader.biPlanes = 1;
|
|
|
|
bitmap_info->bmiHeader.biBitCount = color_bits;
|
|
|
|
bitmap_info->bmiHeader.biCompression = 0;
|
|
|
|
bitmap_info->bmiHeader.biSizeImage = size_image;
|
|
|
|
bitmap_info->bmiHeader.biXPelsPerMeter = 0;
|
|
|
|
bitmap_info->bmiHeader.biYPelsPerMeter = 0;
|
|
|
|
bitmap_info->bmiHeader.biClrUsed = 1 << color_bits;
|
|
|
|
bitmap_info->bmiHeader.biClrImportant = 0;
|
|
|
|
|
|
|
|
return bitmap_info;
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// ST_Util_BitsForBitmap
|
|
|
|
//
|
|
|
|
// Given a bitmap created by ST_Util_CreateBitmap, returns the start
|
|
|
|
// address for the pixel data for the bitmap.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
BYTE *ST_Util_BitsForBitmap (BITMAPINFO *bitmap_info)
|
|
|
|
{
|
|
|
|
return (BYTE *)bitmap_info + sizeof(BITMAPINFOHEADER) + (sizeof(RGBQUAD) << bitmap_info->bmiHeader.biBitCount);
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// ST_Util_FreeBitmap
|
|
|
|
//
|
|
|
|
// Frees all the data for a bitmap created by ST_Util_CreateBitmap.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void ST_Util_FreeBitmap (BITMAPINFO *bitmap_info)
|
|
|
|
{
|
2008-02-17 02:40:03 +00:00
|
|
|
M_Free (bitmap_info);
|
2007-01-06 04:08:24 +00:00
|
|
|
}
|
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// ST_Util_BitmapColorsFromPlaypal
|
|
|
|
//
|
|
|
|
// Fills the bitmap palette from the PLAYPAL lump.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void ST_Util_BitmapColorsFromPlaypal (BITMAPINFO *bitmap_info)
|
|
|
|
{
|
|
|
|
BYTE playpal[768];
|
|
|
|
int i;
|
|
|
|
|
|
|
|
{
|
|
|
|
FWadLump lumpr = Wads.OpenLumpName ("PLAYPAL");
|
|
|
|
lumpr.Read (playpal, 768);
|
|
|
|
}
|
|
|
|
for (i = 0; i < 256; ++i)
|
|
|
|
{
|
|
|
|
bitmap_info->bmiColors[i].rgbBlue = playpal[i*3+2];
|
|
|
|
bitmap_info->bmiColors[i].rgbGreen = playpal[i*3+1];
|
|
|
|
bitmap_info->bmiColors[i].rgbRed = playpal[i*3];
|
|
|
|
bitmap_info->bmiColors[i].rgbReserved = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-01-06 04:08:24 +00:00
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// ST_Util_InvalidateRect
|
|
|
|
//
|
|
|
|
// Invalidates the portion of the window that the specified rect of the
|
|
|
|
// bitmap appears in.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void ST_Util_InvalidateRect (HWND hwnd, BITMAPINFO *bitmap_info, int left, int top, int right, int bottom)
|
|
|
|
{
|
|
|
|
RECT rect;
|
|
|
|
|
|
|
|
GetClientRect (hwnd, &rect);
|
|
|
|
rect.left = left * rect.right / bitmap_info->bmiHeader.biWidth - 1;
|
|
|
|
rect.top = top * rect.bottom / bitmap_info->bmiHeader.biHeight - 1;
|
|
|
|
rect.right = right * rect.right / bitmap_info->bmiHeader.biWidth + 1;
|
|
|
|
rect.bottom = bottom * rect.bottom / bitmap_info->bmiHeader.biHeight + 1;
|
|
|
|
InvalidateRect (hwnd, &rect, FALSE);
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// ST_Util_LoadFont
|
|
|
|
//
|
|
|
|
// Loads a monochrome fixed-width font. Every character is one byte
|
2007-01-07 05:00:07 +00:00
|
|
|
// (eight pixels) wide, so we can deduce the height of each character
|
|
|
|
// by looking at the size of the font data.
|
2007-01-06 04:08:24 +00:00
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
2007-01-07 05:00:07 +00:00
|
|
|
BYTE *ST_Util_LoadFont (const char *filename)
|
2007-01-06 04:08:24 +00:00
|
|
|
{
|
2007-01-07 05:00:07 +00:00
|
|
|
int lumpnum, lumplen, height;
|
2007-01-06 04:08:24 +00:00
|
|
|
BYTE *font;
|
|
|
|
|
|
|
|
lumpnum = Wads.CheckNumForFullName (filename);
|
|
|
|
if (lumpnum < 0)
|
|
|
|
{ // font not found
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
lumplen = Wads.LumpLength (lumpnum);
|
2007-01-07 05:00:07 +00:00
|
|
|
height = lumplen / 256;
|
|
|
|
if (height * 256 != lumplen)
|
2007-01-06 04:08:24 +00:00
|
|
|
{ // font is a bad size
|
|
|
|
return NULL;
|
|
|
|
}
|
2007-01-07 05:00:07 +00:00
|
|
|
if (height < 6 || height > 36)
|
|
|
|
{ // let's be reasonable here
|
|
|
|
return NULL;
|
|
|
|
}
|
2007-01-06 04:08:24 +00:00
|
|
|
font = new BYTE[lumplen + 1];
|
|
|
|
font[0] = height; // Store font height in the first byte.
|
|
|
|
Wads.ReadLump (lumpnum, font + 1);
|
|
|
|
return font;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ST_Util_FreeFont (BYTE *font)
|
|
|
|
{
|
|
|
|
delete[] font;
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// ST_Util_AllocTextBitmap
|
|
|
|
//
|
|
|
|
// Returns a bitmap properly sized to hold an 80x25 display of characters
|
|
|
|
// using the specified font.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
BITMAPINFO *ST_Util_AllocTextBitmap (const BYTE *font)
|
|
|
|
{
|
|
|
|
BITMAPINFO *bitmap = ST_Util_CreateBitmap (80 * 8, 25 * font[0], 4);
|
|
|
|
memcpy (bitmap->bmiColors, TextModePalette, sizeof(TextModePalette));
|
|
|
|
return bitmap;
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// ST_Util_DrawTextScreen
|
|
|
|
//
|
|
|
|
// Draws the text screen to the bitmap. The bitmap must be the proper size
|
|
|
|
// for the font.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void ST_Util_DrawTextScreen (BITMAPINFO *bitmap_info, const BYTE *text_screen, const BYTE *font)
|
|
|
|
{
|
|
|
|
int x, y;
|
|
|
|
|
|
|
|
for (y = 0; y < 25; ++y)
|
|
|
|
{
|
|
|
|
for (x = 0; x < 80; ++x)
|
|
|
|
{
|
|
|
|
ST_Util_DrawChar (bitmap_info, font, x, y, text_screen[0], text_screen[1]);
|
|
|
|
text_screen += 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// ST_Util_DrawChar
|
|
|
|
//
|
|
|
|
// Draws a character on the bitmap. X and Y specify the character cell,
|
|
|
|
// and fg and bg are 4-bit colors.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void ST_Util_DrawChar (BITMAPINFO *screen, const BYTE *font, int x, int y, BYTE charnum, BYTE attrib)
|
|
|
|
{
|
2007-03-29 00:35:34 +00:00
|
|
|
const BYTE bg_left = attrib & 0x70;
|
2007-01-06 04:08:24 +00:00
|
|
|
const BYTE fg = attrib & 0x0F;
|
|
|
|
const BYTE fg_left = fg << 4;
|
|
|
|
const BYTE bg = bg_left >> 4;
|
2007-03-29 00:35:34 +00:00
|
|
|
const BYTE color_array[4] = { bg_left | bg, attrib & 0x7F, fg_left | bg, fg_left | fg };
|
2007-01-06 04:08:24 +00:00
|
|
|
const BYTE *src = font + 1 + charnum * font[0];
|
|
|
|
int pitch = screen->bmiHeader.biWidth >> 1;
|
|
|
|
BYTE *dest = ST_Util_BitsForBitmap(screen) + x*4 + y * font[0] * pitch;
|
|
|
|
|
|
|
|
for (y = font[0]; y > 0; --y)
|
|
|
|
{
|
|
|
|
BYTE srcbyte = *src++;
|
|
|
|
|
|
|
|
// Pixels 0 and 1
|
|
|
|
dest[0] = color_array[(srcbyte >> 6) & 3];
|
|
|
|
// Pixels 2 and 3
|
|
|
|
dest[1] = color_array[(srcbyte >> 4) & 3];
|
|
|
|
// Pixels 4 and 5
|
|
|
|
dest[2] = color_array[(srcbyte >> 2) & 3];
|
|
|
|
// Pixels 6 and 7
|
|
|
|
dest[3] = color_array[(srcbyte) & 3];
|
|
|
|
dest += pitch;
|
|
|
|
}
|
|
|
|
}
|
2007-03-29 00:35:34 +00:00
|
|
|
|
|
|
|
//==========================================================================
|
|
|
|
//
|
|
|
|
// ST_Util_UpdateTextBlink
|
|
|
|
//
|
|
|
|
// Draws the parts of the text screen that blink to the bitmap. The bitmap
|
|
|
|
// must be the proper size for the font.
|
|
|
|
//
|
|
|
|
//==========================================================================
|
|
|
|
|
|
|
|
void ST_Util_UpdateTextBlink (BITMAPINFO *bitmap_info, const BYTE *text_screen, const BYTE *font, bool on)
|
|
|
|
{
|
|
|
|
int x, y;
|
|
|
|
|
|
|
|
for (y = 0; y < 25; ++y)
|
|
|
|
{
|
|
|
|
for (x = 0; x < 80; ++x)
|
|
|
|
{
|
|
|
|
if (text_screen[1] & 0x80)
|
|
|
|
{
|
|
|
|
ST_Util_DrawChar (bitmap_info, font, x, y, on ? text_screen[0] : ' ', text_screen[1]);
|
|
|
|
ST_Util_InvalidateRect (Window, bitmap_info, x*8, y*font[0], x*8+8, y*font[0]+font[0]);
|
|
|
|
}
|
|
|
|
text_screen += 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|