fixed windows builds 2
This commit is contained in:
@@ -1,7 +1,6 @@
|
|||||||
#include "baseentity.h"
|
#include "baseentity.h"
|
||||||
#include "tier0/platform.h"
|
#include "tier0/platform.h"
|
||||||
#include "tier1/utlstring.h"
|
#include "tier1/utlstring.h"
|
||||||
#include <winscard.h>
|
|
||||||
|
|
||||||
CBaseEntity::CBaseEntity()
|
CBaseEntity::CBaseEntity()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -94,9 +94,10 @@ void IEngine::Init()
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef STEAM_ENABLED
|
#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
|
#endif
|
||||||
|
|
||||||
@@ -129,9 +130,11 @@ void IEngine::Init()
|
|||||||
Console()->AddCommand("exec default.cfg;");
|
Console()->AddCommand("exec default.cfg;");
|
||||||
Console()->Execute();
|
Console()->Execute();
|
||||||
|
|
||||||
|
if (INetworking::IsClient())
|
||||||
|
{
|
||||||
MainMenu()->Init();
|
MainMenu()->Init();
|
||||||
|
|
||||||
IConsoleUI::Init();
|
IConsoleUI::Init();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
};
|
};
|
||||||
@@ -141,7 +144,8 @@ void IEngine::Init()
|
|||||||
void IEngine::Frame(float fDelta)
|
void IEngine::Frame(float fDelta)
|
||||||
{
|
{
|
||||||
IServer::Think(fDelta);
|
IServer::Think(fDelta);
|
||||||
if (!ICommandLine::CheckParam("-dedicated"))
|
|
||||||
|
if (INetworking::IsClient())
|
||||||
{
|
{
|
||||||
MainMenu()->Frame();
|
MainMenu()->Frame();
|
||||||
IFGUI::Frame();
|
IFGUI::Frame();
|
||||||
@@ -154,6 +158,7 @@ void IEngine::Frame(float fDelta)
|
|||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
void IEngine::Shutdown()
|
void IEngine::Shutdown()
|
||||||
{
|
{
|
||||||
|
if (INetworking::IsClient())
|
||||||
MainMenu()->Deinit();
|
MainMenu()->Deinit();
|
||||||
INetworking::Deinit();
|
INetworking::Deinit();
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -152,7 +152,6 @@ void IInput::KeyEvent( EInputKey key, EKeyEventType event )
|
|||||||
|
|
||||||
if (g_inputModeStack[g_inputModeStack.GetSize()-1] != INPUT_MODE_MENU)
|
if (g_inputModeStack[g_inputModeStack.GetSize()-1] != INPUT_MODE_MENU)
|
||||||
{
|
{
|
||||||
V_printf("no menu\n");
|
|
||||||
MainMenu()->SetVisibility(false);
|
MainMenu()->SetVisibility(false);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ static CClientNetworkingCallbacks *net_pClientCallbacks;
|
|||||||
|
|
||||||
void INetworking::Init()
|
void INetworking::Init()
|
||||||
{
|
{
|
||||||
/*
|
|
||||||
Net_Init();
|
Net_Init();
|
||||||
|
|
||||||
#ifdef STEAMNETWORKINGSOCKETS_OPENSOURCE
|
#ifdef STEAMNETWORKINGSOCKETS_OPENSOURCE
|
||||||
@@ -112,8 +112,14 @@ void INetworking::Init()
|
|||||||
{
|
{
|
||||||
net_listenSocket = SteamGameServerNetworkingSockets()->CreateListenSocketP2P(0, 0, NULL);
|
net_listenSocket = SteamGameServerNetworkingSockets()->CreateListenSocketP2P(0, 0, NULL);
|
||||||
net_bIsServer = true;
|
net_bIsServer = true;
|
||||||
|
} else {
|
||||||
|
V_printf("Cool\n");
|
||||||
|
if (ICommandLine::ParamValue("-connect"))
|
||||||
|
{
|
||||||
|
Console()->AddCommand(CUtlString("connect %s;", ICommandLine::ParamValue("-connect")));
|
||||||
|
};
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
void INetworking::Deinit()
|
void INetworking::Deinit()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ void IServer::Think( float fDelta )
|
|||||||
/* tickrate */
|
/* tickrate */
|
||||||
while(g_fAccumulator>=fTickrate)
|
while(g_fAccumulator>=fTickrate)
|
||||||
{
|
{
|
||||||
|
if (INetworking::IsClient())
|
||||||
IInput::Frame();
|
IInput::Frame();
|
||||||
Console()->Execute();
|
Console()->Execute();
|
||||||
g_fAccumulator-=fTickrate;
|
g_fAccumulator-=fTickrate;
|
||||||
|
|||||||
@@ -1354,7 +1354,6 @@ IGraphicsPipeline *CVkRenderer::CreateGraphicsPipeline(
|
|||||||
allocInfo.descriptorSetCount = 1;
|
allocInfo.descriptorSetCount = 1;
|
||||||
allocInfo.pSetLayouts = &pipeline->m_pipeline.m_descriptorSetLayout;
|
allocInfo.pSetLayouts = &pipeline->m_pipeline.m_descriptorSetLayout;
|
||||||
vkAllocateDescriptorSets(g_vkDevice, &allocInfo, &pipeline->m_descriptorSet);
|
vkAllocateDescriptorSets(g_vkDevice, &allocInfo, &pipeline->m_descriptorSet);
|
||||||
V_printf("Created %p\n",pipeline->m_descriptorSet);
|
|
||||||
|
|
||||||
pipeline->m_writes = {};
|
pipeline->m_writes = {};
|
||||||
for (auto &input: inputs)
|
for (auto &input: inputs)
|
||||||
|
|||||||
Reference in New Issue
Block a user