Mamanyonyo/akashi-esquizolandia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #244 from Salanto/feature/music-on-area-join

Browse Source 
Actually play music on areaJoin
This commit is contained in:
Rosemary Witchaven 2022-03-14 12:57:18 -05:00 committed by GitHub
commit 09662620c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/packets.cpp
View File

@ -133,14 +133,9 @@ void AOClient::pktLoadingDone(AreaData* area, int argc, QStringList argv, AOPack
} }
server->m_player_count++; server->m_player_count++;
emit server->updatePlayerCount(server->m_player_count);
area->clientJoinedArea(-1, m_id);
m_joined = true; m_joined = true;
server->updateCharsTaken(area); server->updateCharsTaken(area);
arup(ARUPType::PLAYER_COUNT, true); // Tell everyone there is a new player
sendEvidenceList(area); sendEvidenceList(area);
sendPacket("HP", {"1", QString::number(area->defHP())}); sendPacket("HP", {"1", QString::number(area->defHP())});
sendPacket("HP", {"2", QString::number(area->proHP())}); sendPacket("HP", {"2", QString::number(area->proHP())});
sendPacket("FA", server->m_area_names); sendPacket("FA", server->m_area_names);
@ -169,6 +164,9 @@ void AOClient::pktLoadingDone(AreaData* area, int argc, QStringList argv, AOPack
sendPacket("TI", {QString::number(l_timer_id), "3"}); sendPacket("TI", {QString::number(l_timer_id), "3"});
} }
} }
emit server->updatePlayerCount(server->m_player_count);
area->clientJoinedArea(-1, m_id);
arup(ARUPType::PLAYER_COUNT, true); // Tell everyone there is a new player
} }
void AOClient::pktCharPassword(AreaData* area, int argc, QStringList argv, AOPacket packet) void AOClient::pktCharPassword(AreaData* area, int argc, QStringList argv, AOPacket packet)