OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- made sysCallbacks a value variable instead of a pointer to simplify the checks for it.

Browse source
This commit is contained in:
Christoph Oelckers 2020-10-03 16:47:47 +02:00
commit ff62d7a8a3
20 changed files with 34 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/common/engine/d_event.cpp
View file

@ -137,7 +137,7 @@ void D_PostEvent(event_t* ev)
{
return;
}
if (sysCallbacks && sysCallbacks->DispatchEvent && sysCallbacks->DispatchEvent(ev))
if (sysCallbacks.DispatchEvent && sysCallbacks.DispatchEvent(ev))
return;
events[eventhead] = *ev;

2
src/common/engine/i_interface.cpp
View file

@ -1,7 +1,7 @@
#include "i_interface.h"
// Some global engine variables taken out of the backend code.
SystemCallbacks *sysCallbacks;
SystemCallbacks sysCallbacks;
FString endoomName;
bool batchrun;
float menuBlurAmount;

2
src/common/engine/i_interface.h
View file

@ -24,7 +24,7 @@ struct SystemCallbacks
bool (*DispatchEvent)(event_t* ev);
};
extern SystemCallbacks *sysCallbacks;
extern SystemCallbacks sysCallbacks;
struct WadStuff
{

2
src/common/engine/i_net.cpp
View file

@ -162,7 +162,7 @@ uint8_t TransmitBuffer[TRANSMIT_SIZE];
FString GetPlayerName(int num)
{
if (sysCallbacks && sysCallbacks->GetPlayerName) return sysCallbacks->GetPlayerName(sendplayer[num]);
if (sysCallbacks.GetPlayerName) return sysCallbacks.GetPlayerName(sendplayer[num]);
else return FStringf("Player %d", sendplayer[num] + 1);
}