X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=radiant%2Feclass_fgd.cpp;h=b92afbfc6f1980a9676bfcf37edd338a5e517e71;hb=e3af470d9d19e105c9a9c6228931ee2645d09371;hp=7b87791520b4c5365acf8d92fbafe8383bf5a33d;hpb=b7e36c120eb1546a6c6f97f30e42ab7f9a559c61;p=xonotic%2Fnetradiant.git diff --git a/radiant/eclass_fgd.cpp b/radiant/eclass_fgd.cpp index 7b877915..b92afbfc 100644 --- a/radiant/eclass_fgd.cpp +++ b/radiant/eclass_fgd.cpp @@ -28,6 +28,7 @@ #include "ifilesystem.h" #include "iscriplib.h" #include "qerplugin.h" +#include "mainframe.h" #include "string/string.h" #include "eclasslib.h" @@ -91,7 +92,7 @@ inline bool EntityClassFGD_parseToken( Tokeniser& tokeniser, const char* token ) return string_equal( tokeniser.getToken(), token ); } -#define PARSE_ERROR "error parsing entity class definition" +const char *PARSE_ERROR = "error parsing entity class definition"; void EntityClassFGD_parseSplitString( Tokeniser& tokeniser, CopiedString& string ){ StringOutputStream buffer( 256 ); @@ -699,12 +700,12 @@ EntityClassFGDAPI(){ m_eclassmanager.realise = &EntityClassFGD_realise; m_eclassmanager.unrealise = &EntityClassFGD_unrealise; - GlobalRadiant().attachGameToolsPathObserver( g_EntityClassFGD ); - GlobalRadiant().attachGameNameObserver( g_EntityClassFGD ); + Radiant_attachGameToolsPathObserver( g_EntityClassFGD ); + Radiant_attachGameNameObserver( g_EntityClassFGD ); } ~EntityClassFGDAPI(){ - GlobalRadiant().detachGameNameObserver( g_EntityClassFGD ); - GlobalRadiant().detachGameToolsPathObserver( g_EntityClassFGD ); + Radiant_detachGameNameObserver( g_EntityClassFGD ); + Radiant_detachGameToolsPathObserver( g_EntityClassFGD ); EntityClassFGD_destroy(); }