From a3c100a2ed80b9d13c23e9b4780af7176fea6bef Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 12 Jun 2020 23:10:19 +0200 Subject: [PATCH] - deleted the duplicate start screen class. --- src/common/engine/st_start.h | 3 + src/d_main.cpp | 73 -------------- src/st_start.h | 184 ----------------------------------- 3 files changed, 3 insertions(+), 257 deletions(-) delete mode 100644 src/st_start.h diff --git a/src/common/engine/st_start.h b/src/common/engine/st_start.h index 5b8edad4b..1456e051c 100644 --- a/src/common/engine/st_start.h +++ b/src/common/engine/st_start.h @@ -57,6 +57,9 @@ public: virtual void NetMessage(const char *format, ...) {} // cover for printf virtual void NetDone() {} virtual bool NetLoop(bool (*timer_callback)(void *), void *userdata) { return false; } + virtual void AppendStatusLine(const char* status) {} + virtual void LoadingStatus(const char* message, int colors) {} + protected: int MaxPos, CurPos, NotchPos; }; diff --git a/src/d_main.cpp b/src/d_main.cpp index 454e7cac6..4ec7536a3 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -3810,79 +3810,6 @@ UNSAFE_CCMD(restart) wantToRestart = true; } -//========================================================================== -// -// FStartupScreen Constructor -// -//========================================================================== - -FStartupScreen::FStartupScreen(int max_progress) -{ - MaxPos = max_progress; - CurPos = 0; - NotchPos = 0; -} - -//========================================================================== -// -// FStartupScreen Destructor -// -//========================================================================== - -FStartupScreen::~FStartupScreen() -{ -} - -//========================================================================== -// -// FStartupScreen :: LoadingStatus -// -// Used by Heretic for the Loading Status "window." -// -//========================================================================== - -void FStartupScreen::LoadingStatus(const char *message, int colors) -{ -} - -//========================================================================== -// -// FStartupScreen :: AppendStatusLine -// -// Used by Heretic for the "status line" at the bottom of the screen. -// -//========================================================================== - -void FStartupScreen::AppendStatusLine(const char *status) -{ -} - -//=========================================================================== -// -// DeleteStartupScreen -// -// Makes sure the startup screen has been deleted before quitting. -// -//=========================================================================== - -void DeleteStartupScreen() -{ - if (StartScreen != nullptr) - { - delete StartScreen; - StartScreen = nullptr; - } -} - - - -void FStartupScreen::Progress(void) {} -void FStartupScreen::NetInit(char const *,int) {} -void FStartupScreen::NetProgress(int) {} -void FStartupScreen::NetMessage(char const *,...) {} -void FStartupScreen::NetDone(void) {} -bool FStartupScreen::NetLoop(bool (*)(void *),void *) { return false; } - DEFINE_FIELD_X(InputEventData, event_t, type) DEFINE_FIELD_X(InputEventData, event_t, subtype) DEFINE_FIELD_X(InputEventData, event_t, data1) diff --git a/src/st_start.h b/src/st_start.h deleted file mode 100644 index 8e53b0e4f..000000000 --- a/src/st_start.h +++ /dev/null @@ -1,184 +0,0 @@ -#pragma once -/* -** st_start.h -** Interface for the startup screen. -** -**--------------------------------------------------------------------------- -** Copyright 2006-2007 Randy Heit -** 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. -**--------------------------------------------------------------------------- -** -** The startup screen interface is based on a mix of Heretic and Hexen. -** Actual implementation is system-specific. -*/ -#include - -class FStartupScreen -{ -public: - static FStartupScreen *CreateInstance(int max_progress); - - FStartupScreen(int max_progress); - virtual ~FStartupScreen(); - - virtual void Progress(); - virtual void LoadingStatus(const char *message, int colors); // Used by Heretic only - virtual void AppendStatusLine(const char *status); // Used by Heretic only - - virtual void NetInit(const char *message, int num_players); - virtual void NetProgress(int count); - virtual void NetMessage(const char *format, ...); // cover for printf - virtual void NetDone(); - virtual bool NetLoop(bool (*timer_callback)(void *), void *userdata); -protected: - int MaxPos, CurPos, NotchPos; -}; - -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: - long long NetMarqueeMode; - int NetMaxPos, NetCurPos; -}; - -class FGraphicalStartupScreen : public FBasicStartupScreen -{ -public: - FGraphicalStartupScreen(int max_progress); - ~FGraphicalStartupScreen(); -}; - -class FHereticStartupScreen : public FGraphicalStartupScreen -{ -public: - FHereticStartupScreen(int max_progress, long &hr); - - void Progress(); - void LoadingStatus(const char *message, int colors); - void AppendStatusLine(const char *status); -protected: - void SetWindowSize(); - - int ThermX, ThermY, ThermWidth, ThermHeight; - int HMsgY, SMsgX; -}; - -class FHexenStartupScreen : public FGraphicalStartupScreen -{ -public: - FHexenStartupScreen(int max_progress, long &hr); - ~FHexenStartupScreen(); - - void Progress(); - void NetProgress(int count); - void NetDone(); - void SetWindowSize(); - - // Hexen's notch graphics, converted to chunky pixels. - uint8_t * NotchBits; - uint8_t * NetNotchBits; -}; - -class FStrifeStartupScreen : public FGraphicalStartupScreen -{ -public: - FStrifeStartupScreen(int max_progress, long &hr); - ~FStrifeStartupScreen(); - - void Progress(); -protected: - void DrawStuff(int old_laser, int new_laser); - void SetWindowSize(); - - uint8_t *StartupPics[4+2+1]; -}; - - - -extern FStartupScreen *StartScreen; - -void DeleteStartupScreen(); -extern void ST_Endoom(); - -// The entire set of functions here uses native Windows types. These are recreations of those types so that the code doesn't need to be changed more than necessary - -struct BitmapInfoHeader -{ - uint32_t biSize; - int32_t biWidth; - int32_t biHeight; - uint16_t biPlanes; - uint16_t biBitCount; - uint32_t biCompression; - uint32_t biSizeImage; - int32_t biXPelsPerMeter; - int32_t biYPelsPerMeter; - uint32_t biClrUsed; - uint32_t biClrImportant; -}; - -struct RgbQuad -{ - uint8_t rgbBlue; - uint8_t rgbGreen; - uint8_t rgbRed; - uint8_t rgbReserved; -}; - - -struct BitmapInfo -{ - BitmapInfoHeader bmiHeader; - RgbQuad bmiColors[1]; -}; - -extern BitmapInfo* StartupBitmap; - - -void ST_Util_PlanarToChunky4(uint8_t* dest, const uint8_t* src, int width, int height); -void ST_Util_DrawBlock(BitmapInfo* bitmap_info, const uint8_t* src, int x, int y, int bytewidth, int height); -void ST_Util_ClearBlock(BitmapInfo* bitmap_info, uint8_t fill, int x, int y, int bytewidth, int height); -BitmapInfo* ST_Util_CreateBitmap(int width, int height, int color_bits); -uint8_t* ST_Util_BitsForBitmap(BitmapInfo* bitmap_info); -void ST_Util_FreeBitmap(BitmapInfo* bitmap_info); -void ST_Util_BitmapColorsFromPlaypal(BitmapInfo* bitmap_info); -uint8_t* ST_Util_LoadFont(const char* filename); -void ST_Util_FreeFont(uint8_t* font); -BitmapInfo* ST_Util_AllocTextBitmap(const uint8_t* font); -void ST_Util_DrawTextScreen(BitmapInfo* bitmap_info, const uint8_t* text_screen, const uint8_t* font); -void ST_Util_DrawChar(BitmapInfo* screen, const uint8_t* font, int x, int y, uint8_t charnum, uint8_t attrib); -void ST_Util_UpdateTextBlink(BitmapInfo* bitmap_info, const uint8_t* text_screen, const uint8_t* font, bool on); -