- cleaned out some duplicates in Posix platform code

This commit is contained in:
Christoph Oelckers 2022-05-19 08:32:50 +02:00
parent 59cddf1601
commit 077aa6b0ae
7 changed files with 4 additions and 53 deletions

View file

@ -1039,7 +1039,7 @@ void I_NetMessage(const char* text, ...)
FString str;
va_list argptr;
va_start(argptr, format);
va_start(argptr, text);
str.VFormat(format, argptr);
va_end(argptr);
fprintf(stderr, "\r%-40s\n", str.GetChars());

View file

@ -83,8 +83,6 @@ protected:
extern FStartupScreen *StartWindow;
extern void ST_Endoom();
//===========================================================================
//
// DeleteStartupScreen

View file

@ -42,22 +42,6 @@
#include "engineerrors.h"
FStartupScreen *StartScreen;
CUSTOM_CVAR(Int, showendoom, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
{
if (self < 0)
{
self = 0;
}
else if (self > 2)
{
self = 2;
}
}
// ---------------------------------------------------------------------------
@ -152,12 +136,3 @@ FStartupScreen *FStartupScreen::CreateInstance(const int maxProgress)
{
return new FBasicStartupScreen(maxProgress, true);
}
// ---------------------------------------------------------------------------
void ST_Endoom()
{
throw CExitEvent(0);
}

View file

@ -70,22 +70,6 @@ class FTTYStartupScreen : public FStartupScreen
extern void RedrawProgressBar(int CurPos, int MaxPos);
extern void CleanProgressBar();
// PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
// PRIVATE FUNCTION PROTOTYPES ---------------------------------------------
// EXTERNAL DATA DECLARATIONS ----------------------------------------------
// PUBLIC DATA DEFINITIONS -------------------------------------------------
FStartupScreen *StartWindow;
CUSTOM_CVAR(Int, showendoom, 0, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
{
if (self < 0) self = 0;
else if (self > 2) self=2;
}
// PRIVATE DATA DEFINITIONS ------------------------------------------------
static const char SpinnyProgressChars[4] = { '|', '/', '-', '\\' };
@ -309,7 +293,3 @@ bool FTTYStartupScreen::NetLoop(bool (*timer_callback)(void *), void *userdata)
}
}
void ST_Endoom()
{
throw CExitEvent(0);
}

View file

@ -63,10 +63,6 @@ void ST_Util_SizeWindowForBitmap (int scale);
extern HINSTANCE g_hInst;
// PUBLIC DATA DEFINITIONS -------------------------------------------------
FStartupScreen *StartWindow;
// PRIVATE DATA DEFINITIONS ------------------------------------------------
// CODE --------------------------------------------------------------------

View file

@ -330,6 +330,8 @@ FString lastIWAD;
int restart = 0;
bool AppActive = true;
bool playedtitlemusic;
FStartupScreen* StartWindow;
FStartScreen* StartScreen;
cycle_t FrameCycles;

View file

@ -56,7 +56,7 @@
#include "g_level.h"
#include "d_event.h"
#include "p_tick.h"
#include "st_start.h"
#include "startscreen.h"
#include "d_main.h"
#include "i_system.h"
#include "doommenu.h"