Persson-dev/Tower-Defense2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

send map when arriving late

Browse Source
This commit is contained in:
Simon Pribylski
2025-08-22 12:24:58 +02:00
parent 688b6e93ea
commit 5b6254c690
12 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/client/state/GameState.h
View File

@@ -14,7 +14,7 @@ class GameState : public ClientState {
float m_CurrentLerp;
public:
GameState(Client& a_Client, const game::WorldPtr& a_World, std::uint64_t a_StepTime);
GameState(Client& a_Client, const game::WorldPtr& a_World, std::uint64_t a_StepTime, const std::vector<protocol::LockStep> a_FirstSteps);
~GameState() {}
virtual void Update(float a_Delta) override;

1
include/client/state/LobbyState.h
View File

@@ -18,6 +18,7 @@ class LobbyState : public ClientState {
virtual void Handle(const protocol::packets::WorldHeaderPacket& a_Packet) override;
virtual void Handle(const protocol::packets::WorldDataPacket& a_Packet) override;
virtual void Handle(const protocol::packets::BeginGamePacket& a_Packet) override;
};
} // namespace client

2
include/server/state/GameState.h
View File

@@ -22,6 +22,8 @@ class GameState : public ServerState {
virtual void HandlePacket(PlayerID a_Id, const protocol::PacketBase& a_Packet) override;
virtual void Update(float a_Delta) override;
virtual void OnPlayerJoin(PlayerID a_Id, const td::PlayerInfo& a_Info) override;
friend class GameStateHandler;
};

2
include/td/protocol/packet/PacketData.h
View File

@@ -67,8 +67,6 @@ struct ChatMessage {
std::string m_Text;
};
// TODO: handle players joining in the first second
struct BeginGame {
std::vector<PlayerInfo> m_BlueTeam;
std::vector<PlayerInfo> m_RedTeam;

2
include/td/simulation/ClientSimulation.h
View File

@@ -39,7 +39,7 @@ class ClientSimulation : public protocol::PacketHandler {
* \brief Live update constructor (continuous game updates)
* \param a_StepTime in ms
*/
ClientSimulation(std::shared_ptr<game::World> a_World, std::uint64_t a_StepTime);
ClientSimulation(std::shared_ptr<game::World> a_World, std::uint64_t a_StepTime, const std::vector<protocol::LockStep>& a_FirstSteps);
/**
* \return the progress [0-1] between two steps

4
include/td/simulation/ServerSimulation.h
View File

@@ -16,7 +16,7 @@ class ServerSimulation : public protocol::CommandHandler {
game::World& m_World;
std::uint64_t m_StepTime;
std::uint64_t m_CurrentTime;
std::vector<td::protocol::LockStep> m_History;
std::vector<protocol::LockStep> m_History;
using protocol::CommandHandler::Handle;
@@ -27,6 +27,8 @@ class ServerSimulation : public protocol::CommandHandler {
protocol::packets::LockStepsPacket MakePacket();
std::vector<protocol::LockStep> GetFirstLocksteps();
// no checks are done !
virtual void Handle(const protocol::commands::SpawnTroopCommand& a_SpawnTroop) override;