Skip to content

Commit 76a7a31

Browse files
committed
Resource send fix
1 parent fbdc1b4 commit 76a7a31

2 files changed

Lines changed: 20 additions & 30 deletions

File tree

src/game/server/gamemodes/infection/reinfected.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -181,14 +181,6 @@ void CGameControllerReinfected::StartRandomInfection()
181181
str_format(aBuf, sizeof(aBuf), "'%s' has been infected!", Server()->ClientName(aPlayers[RandomInfected]));
182182
GameServer()->SendChat(-1, CHAT_ALL, -1, aBuf);
183183
}
184-
Uuid Sound = calculate_uuid("ninja_attack_04");
185-
for(int i = 0; i < MAX_CLIENTS; i++)
186-
{
187-
if(GameServer()->m_apPlayers[i])
188-
{
189-
GameServer()->CreateCustomSound(GameServer()->m_apPlayers[i]->m_ViewPos, Sound, CmaskOne(i));
190-
}
191-
}
192184
}
193185
}
194186

@@ -213,8 +205,6 @@ CGameControllerReinfected::CGameControllerReinfected(CGameContext *pGameServer)
213205
{
214206
m_pGameType = "Reinfected";
215207
m_pHelper = new CReinfectedHelper(this);
216-
217-
GameServer()->ResourceManager()->AddResource("audio/wp_ninja_attack-04.opus", "ninja_attack_04", calculate_uuid("ninja_attack_04"));
218208
}
219209

220210
CGameControllerReinfected::~CGameControllerReinfected()

src/game/server/resource.cpp

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ void CServerResManager::SendResourceData(int ClientID, const Uuid RequestUuid)
5151
else
5252
pTarget->m_aDownloadChunks[ClientID]++;
5353

54-
CNetMsg_Sv_CustomResData Msg;
55-
Msg.m_Uuid = &pTarget->m_Uuid;
56-
Msg.m_Data = &pTarget->m_pData[Offset];
57-
Msg.m_DataSize = ChunkSize;
58-
Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientID);
54+
CNetMsg_Sv_CustomResData Msg;
55+
Msg.m_Uuid = &pTarget->m_Uuid;
56+
Msg.m_Data = &pTarget->m_pData[Offset];
57+
Msg.m_DataSize = ChunkSize;
58+
Server()->SendPackMsg(&Msg, MSGFLAG_VITAL | MSGFLAG_FLUSH | MSGFLAG_NORECORD, ClientID);
5959

6060
if(Config()->m_Debug)
6161
{
@@ -101,21 +101,21 @@ void CServerResManager::AddResource(const char *pPath, const char *pName, const
101101

102102
void CServerResManager::OnClientEnter(int ClientID)
103103
{
104-
if(Server()->GetClientVersion(ClientID) < 0x0706)
105-
return;
106-
for(int i = 0; i < m_lResources.size(); i++)
107-
{
108-
CNetMsg_Sv_CustomRes Resource;
109-
Resource.m_Uuid = &m_lResources[i].m_Uuid;
110-
Resource.m_Type = m_lResources[i].m_Type;
111-
Resource.m_Name = m_lResources[i].m_aName;
112-
Resource.m_Crc = m_lResources[i].m_Crc;
113-
Resource.m_Sha256 = &m_lResources[i].m_Sha256;
114-
Resource.m_Size = m_lResources[i].m_DataSize;
115-
Server()->SendPackMsg(&Resource, MSGFLAG_VITAL | MSGFLAG_FLUSH, ClientID);
116-
117-
m_lResources[i].m_aDownloadChunks[i] = 0;
118-
}
104+
if(Server()->GetClientVersion(ClientID) < 0x0706)
105+
return;
106+
for(int i = 0; i < m_lResources.size(); i++)
107+
{
108+
CNetMsg_Sv_CustomRes Resource;
109+
Resource.m_Uuid = &m_lResources[i].m_Uuid;
110+
Resource.m_Type = m_lResources[i].m_Type;
111+
Resource.m_Name = m_lResources[i].m_aName;
112+
Resource.m_Crc = m_lResources[i].m_Crc;
113+
Resource.m_Sha256 = &m_lResources[i].m_Sha256;
114+
Resource.m_Size = m_lResources[i].m_DataSize;
115+
Server()->SendPackMsg(&Resource, MSGFLAG_VITAL | MSGFLAG_FLUSH | MSGFLAG_NORECORD, ClientID);
116+
117+
m_lResources[i].m_aDownloadChunks[ClientID] = 0;
118+
}
119119
}
120120

121121
void CServerResManager::Clear()

0 commit comments

Comments
 (0)