OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'thereisnospoon' of https://github.com/jewalky/gzdoom

Browse source 
# Conflicts:
#	src/dobject.h
This commit is contained in:
Christoph Oelckers 2017-02-14 19:10:02 +01:00
commit 2234d36c7a
40 changed files with 1970 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/info.cpp
View file

@ -54,6 +54,7 @@
#include "thingdef.h"
#include "d_player.h"
#include "doomerrors.h"
#include "events.h"
extern void LoadActors ();
extern void InitBotStuff();
@ -210,6 +211,9 @@ void PClassActor::StaticInit()
ClearStrifeTypes();
LoadActors ();
InitBotStuff();
// reinit GLOBAL static stuff from gameinfo, once classes are loaded.
E_InitStaticHandlers(false);
}
//==========================================================================