diff --git a/engine/baseentity.cpp b/engine/baseentity.cpp index 1def78d..de42005 100644 --- a/engine/baseentity.cpp +++ b/engine/baseentity.cpp @@ -1,7 +1,6 @@ #include "baseentity.h" #include "tier0/platform.h" #include "tier1/utlstring.h" -#include CBaseEntity::CBaseEntity() { diff --git a/engine/engine.cpp b/engine/engine.cpp index 97337f8..340e761 100644 --- a/engine/engine.cpp +++ b/engine/engine.cpp @@ -94,9 +94,10 @@ void IEngine::Init() #endif #ifdef STEAM_ENABLED - if (!SteamAPI_Init()) + SteamErrMsg err; + if (SteamAPI_InitEx(&err) != k_ESteamAPIInitResult_OK) { - Plat_FatalErrorFunc("Failed to init Steam\n"); + Plat_FatalErrorFunc("Failed to init Steam: %s\n", err); } #endif @@ -128,10 +129,12 @@ void IEngine::Init() // execute default config Console()->AddCommand("exec default.cfg;"); Console()->Execute(); - - MainMenu()->Init(); - IConsoleUI::Init(); + if (INetworking::IsClient()) + { + MainMenu()->Init(); + IConsoleUI::Init(); + } }; @@ -141,7 +144,8 @@ void IEngine::Init() void IEngine::Frame(float fDelta) { IServer::Think(fDelta); - if (!ICommandLine::CheckParam("-dedicated")) + + if (INetworking::IsClient()) { MainMenu()->Frame(); IFGUI::Frame(); @@ -154,7 +158,8 @@ void IEngine::Frame(float fDelta) //----------------------------------------------------------------------------- void IEngine::Shutdown() { - MainMenu()->Deinit(); + if (INetworking::IsClient()) + MainMenu()->Deinit(); INetworking::Deinit(); }; diff --git a/engine/input.cpp b/engine/input.cpp index 65c4ae2..4d1ce6a 100644 --- a/engine/input.cpp +++ b/engine/input.cpp @@ -152,7 +152,6 @@ void IInput::KeyEvent( EInputKey key, EKeyEventType event ) if (g_inputModeStack[g_inputModeStack.GetSize()-1] != INPUT_MODE_MENU) { - V_printf("no menu\n"); MainMenu()->SetVisibility(false); } return; diff --git a/engine/networking.cpp b/engine/networking.cpp index 9870059..db3012b 100644 --- a/engine/networking.cpp +++ b/engine/networking.cpp @@ -69,7 +69,7 @@ static CClientNetworkingCallbacks *net_pClientCallbacks; void INetworking::Init() { -/* + Net_Init(); #ifdef STEAMNETWORKINGSOCKETS_OPENSOURCE @@ -112,8 +112,14 @@ void INetworking::Init() { net_listenSocket = SteamGameServerNetworkingSockets()->CreateListenSocketP2P(0, 0, NULL); net_bIsServer = true; + } else { + V_printf("Cool\n"); + if (ICommandLine::ParamValue("-connect")) + { + Console()->AddCommand(CUtlString("connect %s;", ICommandLine::ParamValue("-connect"))); + }; } - */ + } void INetworking::Deinit() { diff --git a/engine/server.cpp b/engine/server.cpp index 930e030..b9b233f 100644 --- a/engine/server.cpp +++ b/engine/server.cpp @@ -54,7 +54,8 @@ void IServer::Think( float fDelta ) /* tickrate */ while(g_fAccumulator>=fTickrate) { - IInput::Frame(); + if (INetworking::IsClient()) + IInput::Frame(); Console()->Execute(); g_fAccumulator-=fTickrate; for (auto &entity: EntityManager()->m_entities) diff --git a/engine/vk_video.cpp b/engine/vk_video.cpp index 9891667..bafc1c3 100644 --- a/engine/vk_video.cpp +++ b/engine/vk_video.cpp @@ -1354,7 +1354,6 @@ IGraphicsPipeline *CVkRenderer::CreateGraphicsPipeline( allocInfo.descriptorSetCount = 1; allocInfo.pSetLayouts = &pipeline->m_pipeline.m_descriptorSetLayout; vkAllocateDescriptorSets(g_vkDevice, &allocInfo, &pipeline->m_descriptorSet); - V_printf("Created %p\n",pipeline->m_descriptorSet); pipeline->m_writes = {}; for (auto &input: inputs)