Further clean up engine API initialisation

1 files changed, 1 insertions, 8 deletions

diff --git a/src/sst.c b/src/sst.c
index 13e8b19..5a7ca31 100644
--- a/src/sst.c
+++ b/src/sst.c
@@ -28,7 +28,6 @@
 #include "ent.h"
 #include "fov.h"
 #include "fixes.h"
-#include "gamedata.h"
 #include "gameinfo.h"
 #include "gametype.h"
 #include "hook.h"
@@ -201,13 +200,7 @@ static bool already_loaded = false, skip_unload = false;
 
 static bool do_load(ifacefactory enginef, ifacefactory serverf) {
 	factory_engine = enginef; factory_server = serverf;
-	if (!con_init(enginef, ifacever)) return false;
-	engineapi_init(); // load some other interfaces. also calls gamedata_init()
-	// detect p1 for the benefit of specific features
-	if (!GAMETYPE_MATCHES(Portal2) && con_findcmd("upgrade_portalgun")) {
-		_gametype_tag |= _gametype_tag_Portal1;
-	}
-	if (!gameinfo_init()) { con_disconnect(); return false; }
+	if (!engineapi_init(ifacever)) return false;
 
 	const void **p = vtable_firstdiff;
 	if (GAMETYPE_MATCHES(Portal2)) *p++ = (void *)&nop_p_v; // ClientFullyConnect