- added Gez's patch to move Hexen's startup notches out of the EXE.

SVN r2250 (trunk)

src/win32/st_start.cpp

@@ -153,10 +153,15 @@ class FHexenStartupScreen : public FGraphicalStartupScreen
 {
 public:
 	FHexenStartupScreen(int max_progress, HRESULT &hr);
+	~FHexenStartupScreen();
 
 	void Progress();
 	void NetProgress(int count);
 	void NetDone();
+
+	// Hexen's notch graphics, converted to chunky pixels.
+	BYTE * NotchBits;
+	BYTE * NetNotchBits;
 };
 
 class FStrifeStartupScreen : public FGraphicalStartupScreen
@@ -253,55 +258,6 @@ static const RGBQUAD TextModePalette[16] =
 	{ HI, HI, HI, 0 },		// F white
 };
 
-// Hexen's notch graphics, converted to chunky pixels.
-
-static const BYTE NotchBits[] =
-{
-	0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x07, 0x70, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x0c, 0xc0, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x08, 0x80, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x68, 0x86, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x78, 0x87, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0xd8, 0x8d, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0xd8, 0x8d, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0xd8, 0x8d, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0xd8, 0x8d, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0xd8, 0x87, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0xd7, 0x7d, 0x60, 0x00, 0x00,
-	0x00, 0x66, 0x99, 0x99, 0x96, 0x69, 0x66, 0x00,
-	0x00, 0x69, 0x96, 0x99, 0x69, 0x96, 0x96, 0x00,
-	0x06, 0x9d, 0x99, 0x69, 0x96, 0xd9, 0x79, 0x60,
-	0x06, 0x7d, 0xdd, 0xdd, 0xdd, 0xdd, 0x77, 0x60,
-	0x06, 0x78, 0x88, 0x88, 0x88, 0x88, 0xd6, 0x60,
-	0x06, 0x7a, 0xaa, 0xaa, 0xaa, 0xaa, 0xd6, 0x60,
-	0x06, 0x7a, 0x77, 0x77, 0x77, 0xa7, 0x96, 0x60,
-	0x06, 0x77, 0xa7, 0x77, 0x77, 0xa7, 0x96, 0x60,
-	0x06, 0x97, 0xa7, 0x79, 0x77, 0x77, 0x96, 0x60,
-	0x00, 0x67, 0x79, 0x99, 0x99, 0xd7, 0x96, 0x60,
-	0x00, 0x69, 0x99, 0x66, 0x69, 0x69, 0x66, 0x00
-};
-
-static const BYTE NetNotchBits[] =
-{
-	0x52, 0x20,
-	0x23, 0x25,
-	0x33, 0x25,
-	0x31, 0x35,
-	0x31, 0x35,
-	0x31, 0x35,
-	0x33, 0x35,
-	0x31, 0x35,
-	0x31, 0x35,
-	0x31, 0x25,
-	0x33, 0x35,
-	0x31, 0x20,
-	0x21, 0x35,
-	0x23, 0x25,
-	0x52, 0x20,
-	0x05, 0x50
-};
-
 // CODE --------------------------------------------------------------------
 
 //==========================================================================
@@ -678,13 +634,23 @@ FHexenStartupScreen::FHexenStartupScreen(int max_progress, HRESULT &hr)
 : FGraphicalStartupScreen(max_progress)
 {
 	int startup_lump = Wads.CheckNumForName ("STARTUP");
+	int netnotch_lump = Wads.CheckNumForName ("NETNOTCH");
+	int notch_lump = Wads.CheckNumForName ("NOTCH");
 	hr = E_FAIL;
 
-	if (startup_lump < 0 || Wads.LumpLength (startup_lump) != 153648 || !ST_Util_CreateStartupWindow())
+	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)
 	{
+		NetNotchBits = NotchBits = NULL;
 		return;
 	}
 
+	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);
+
 	BYTE startup_screen[153648];
 	union
 	{
@@ -723,6 +689,22 @@ FHexenStartupScreen::FHexenStartupScreen(int max_progress, HRESULT &hr)
 	hr = S_OK;
 }
 
+//==========================================================================
+//
+// FHexenStartupScreen Deconstructor
+//
+// Frees the notch pictures.
+//
+//==========================================================================
+
+FHexenStartupScreen::~FHexenStartupScreen()
+{
+	if (NotchBits)
+		delete[] NotchBits;
+	if (NetNotchBits)
+		delete[] NetNotchBits;
+}
+
 //==========================================================================
 //
 // FHexenStartupScreen :: Progress