OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Remove some indirection

Browse source
This commit is contained in:
Magnus Norddahl 2024-08-19 07:53:30 +02:00
commit 87eb89ad33
3 changed files with 5 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/common/platform/win32/i_mainwindow.cpp
View file

@ -128,26 +128,6 @@ void MainWindow::ShowErrorPane(const char* text)
}
}
void MainWindow::ShowNetStartPane(const char* message, int maxpos)
{
NetStartWindow::ShowNetStartPane(message, maxpos);
}
void MainWindow::HideNetStartPane()
{
NetStartWindow::HideNetStartPane();
}
void MainWindow::SetNetStartProgress(int pos)
{
NetStartWindow::SetNetStartProgress(pos);
}
bool MainWindow::RunMessageLoop(bool (*timer_callback)(void*), void* userdata)
{
return NetStartWindow::RunMessageLoop(timer_callback, userdata);
}
bool MainWindow::CheckForRestart()
{
bool result = restartrequest;

5
src/common/platform/win32/i_mainwindow.h
View file

@ -25,11 +25,6 @@ public:
void PrintStr(const char* cp);
void GetLog(std::function<bool(const void* data, uint32_t size, uint32_t& written)> writeFile);
void ShowNetStartPane(const char* message, int maxpos);
void SetNetStartProgress(int pos);
bool RunMessageLoop(bool (*timer_callback)(void*), void* userdata);
void HideNetStartPane();
void SetWindowTitle(const char* caption);
HWND GetHandle() { return Window; }

10
src/common/platform/win32/st_start.cpp
View file

@ -53,7 +53,7 @@
#include "startupinfo.h"
#include "i_interface.h"
#include "texturemanager.h"
#include "i_mainwindow.h"
#include "common/widgets/netstartwindow.h"
// EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
@ -140,7 +140,7 @@ void FBasicStartupScreen::Progress()
void FBasicStartupScreen::NetInit(const char *message, int numplayers)
{
NetMaxPos = numplayers;
mainwindow.ShowNetStartPane(message, numplayers);
NetStartWindow::ShowNetStartPane(message, numplayers);
NetMaxPos = numplayers;
NetCurPos = 0;
@ -157,7 +157,7 @@ void FBasicStartupScreen::NetInit(const char *message, int numplayers)
void FBasicStartupScreen::NetDone()
{
mainwindow.HideNetStartPane();
NetStartWindow::HideNetStartPane();
}
//==========================================================================
@ -180,7 +180,7 @@ void FBasicStartupScreen::NetProgress(int count)
NetCurPos = count;
}
mainwindow.SetNetStartProgress(count);
NetStartWindow::SetNetStartProgress(count);
}
//==========================================================================
@ -199,5 +199,5 @@ void FBasicStartupScreen::NetProgress(int count)
bool FBasicStartupScreen::NetLoop(bool (*timer_callback)(void *), void *userdata)
{
return mainwindow.RunMessageLoop(timer_callback, userdata);
return NetStartWindow::RunMessageLoop(timer_callback, userdata);
}