mentalrob/server
1
0
Fork 0
forked from metin2/server
Code Pull Requests Activity

Rewrote network stack, started working on porting to 64-bit

Browse Source
This commit is contained in:
Exynox
2022-03-12 11:39:41 +02:00
parent 64596d344c
commit a056345a7b
167 changed files with 1388 additions and 3085 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
game/src/guild_war.cpp
View File

@@ -51,7 +51,7 @@ void CGuild::GuildWarPacket(DWORD dwOppGID, BYTE bWarType, BYTE bWarState)
{
ch->SendGuildName( dwOppGID );
d->BufferedPacket(&pack, sizeof(pack));
d->RawPacket(&pack, sizeof(pack));
d->Packet(&pack2, sizeof(pack2));
}
}
@@ -74,7 +74,7 @@ void CGuild::SendEnemyGuild(LPCHARACTER ch)
TPacketGCGuild p;
p.header = HEADER_GC_GUILD;
p.subheader = GUILD_SUBHEADER_GC_WAR_SCORE;
p.size = sizeof(p) + sizeof(DWORD) + sizeof(DWORD) + sizeof(long);
p.size = sizeof(p) + sizeof(DWORD) + sizeof(DWORD) + sizeof(int);
for (itertype(m_EnemyGuild) it = m_EnemyGuild.begin(); it != m_EnemyGuild.end(); ++it)
{
@@ -84,26 +84,26 @@ void CGuild::SendEnemyGuild(LPCHARACTER ch)
pack2.bType = it->second.type;
pack2.bWarState = it->second.state;
d->BufferedPacket(&pack, sizeof(pack));
d->RawPacket(&pack, sizeof(pack));
d->Packet(&pack2, sizeof(pack2));
if (it->second.state == GUILD_WAR_ON_WAR)
{
long lScore;
int lScore;
lScore = GetWarScoreAgainstTo(pack2.dwGuildOpp);
d->BufferedPacket(&p, sizeof(p));
d->BufferedPacket(&pack2.dwGuildSelf, sizeof(DWORD));
d->BufferedPacket(&pack2.dwGuildOpp, sizeof(DWORD));
d->Packet(&lScore, sizeof(long));
d->RawPacket(&p, sizeof(p));
d->RawPacket(&pack2.dwGuildSelf, sizeof(DWORD));
d->RawPacket(&pack2.dwGuildOpp, sizeof(DWORD));
d->Packet(&lScore, sizeof(int));
lScore = CGuildManager::instance().TouchGuild(pack2.dwGuildOpp)->GetWarScoreAgainstTo(pack2.dwGuildSelf);
d->BufferedPacket(&p, sizeof(p));
d->BufferedPacket(&pack2.dwGuildOpp, sizeof(DWORD));
d->BufferedPacket(&pack2.dwGuildSelf, sizeof(DWORD));
d->Packet(&lScore, sizeof(long));
d->RawPacket(&p, sizeof(p));
d->RawPacket(&pack2.dwGuildOpp, sizeof(DWORD));
d->RawPacket(&pack2.dwGuildSelf, sizeof(DWORD));
d->Packet(&lScore, sizeof(int));
}
}
}
@@ -201,14 +201,14 @@ void CGuild::SetWarScoreAgainstTo(DWORD dwOppGID, int iScore)
p.header = HEADER_GC_GUILD;
p.subheader = GUILD_SUBHEADER_GC_WAR_SCORE;
p.size = sizeof(p) + sizeof(DWORD) + sizeof(DWORD) + sizeof(long);
p.size = sizeof(p) + sizeof(DWORD) + sizeof(DWORD) + sizeof(int);
TEMP_BUFFER buf;
buf.write(&p, sizeof(p));
buf.write(&dwSelfGID, sizeof(DWORD));
buf.write(&dwOppGID, sizeof(DWORD));
buf.write(&iScore, sizeof(long));
buf.write(&iScore, sizeof(int));
Packet(buf.read_peek(), buf.size());
@@ -626,7 +626,7 @@ void CGuild::EndWar(DWORD dwOppGID)
}
}
void CGuild::SetGuildWarMapIndex(DWORD dwOppGID, long lMapIndex)
void CGuild::SetGuildWarMapIndex(DWORD dwOppGID, int lMapIndex)
{
itertype(m_EnemyGuild) it = m_EnemyGuild.find(dwOppGID);