OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Rachael Alexanderson 2017-02-12 21:39:20 -05:00
commit 8c176575c8
64 changed files with 5296 additions and 4532 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/d_main.cpp
View file

@ -2520,7 +2520,10 @@ void D_DoomMain (void)
// Create replacements for dehacked pickups
FinishDehPatch();
if (!batchrun) Printf("M_Init: Init menus.\n");
M_Init();
// clean up the compiler symbols which are not needed any longer.
RemoveUnusedSymbols();
@ -2538,9 +2541,6 @@ void D_DoomMain (void)
bglobal.spawn_tries = 0;
bglobal.wanted_botnum = bglobal.getspawned.Size();
if (!batchrun) Printf ("M_Init: Init menus.\n");
M_Init ();
if (!batchrun) Printf ("P_Init: Init Playloop state.\n");
StartScreen->LoadingStatus ("Init game engine", 0x3f);
AM_StaticInit();
@ -2827,3 +2827,10 @@ void FStartupScreen::NetMessage(char const *,...) {}
void FStartupScreen::NetDone(void) {}
bool FStartupScreen::NetLoop(bool (*)(void *),void *) { return false; }
DEFINE_FIELD_X(InputEvent, event_t, type)
DEFINE_FIELD_X(InputEvent, event_t, subtype)
DEFINE_FIELD_X(InputEvent, event_t, data1)
DEFINE_FIELD_X(InputEvent, event_t, data2)
DEFINE_FIELD_X(InputEvent, event_t, data3)
DEFINE_FIELD_X(InputEvent, event_t, x)
DEFINE_FIELD_X(InputEvent, event_t, y)