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

fix gcc build

Browse Source
This commit is contained in:
Simon Pribylski
2025-07-30 17:56:13 +02:00
parent 2e556e0d45
commit 2b8447766a
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/td/common/Array.h
View File

@@ -48,6 +48,10 @@ class Array {
return m_Data[a_Index]; return m_Data[a_Index];
} }
const T& operator[](std::size_t a_Index) const {
return m_Data[a_Index];
}
~Array() { ~Array() {
delete [] m_Data; delete [] m_Data;
} }

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

@@ -74,7 +74,7 @@ struct BeginGame {
struct LockSteps { struct LockSteps {
std::uint16_t m_FirstFrameNumber; std::uint16_t m_FirstFrameNumber;
std::array<LockStep, LOCKSTEP_BUFFER_SIZE> m_LockSteps; Array<LockStep, LOCKSTEP_BUFFER_SIZE> m_LockSteps;
}; };
struct WorldHeader { struct WorldHeader {

2
src/main.cpp
View File

@@ -108,7 +108,7 @@ int main(int argc, char** argv) {
display.OnKeyDown.Connect([&simulation](SDL_Keycode key){ display.OnKeyDown.Connect([&simulation](SDL_Keycode key){
if (key == SDLK_A) { if (key == SDLK_A) {
auto spawn = std::make_shared<td::protocol::commands::SpawnTroopCommand>(0, 0, td::Vec2fp{td::FpFloat(77), td::FpFloat(13)}, 0); auto spawn = std::make_shared<td::protocol::commands::SpawnTroopCommand>(0, 0, td::Vec2fp{td::FpFloat(77), td::FpFloat(13)}, 0);
std::array<td::protocol::LockStep, LOCKSTEP_BUFFER_SIZE> steps{}; td::Array<td::protocol::LockStep, LOCKSTEP_BUFFER_SIZE> steps{};
steps[0].push_back(spawn); steps[0].push_back(spawn);
td::protocol::packets::LockStepsPacket packet{0, steps}; td::protocol::packets::LockStepsPacket packet{0, steps};
simulation.HandlePacket(packet); simulation.HandlePacket(packet);

6
src/td/simulation/GameHistory.cpp
View File

@@ -25,15 +25,15 @@ bool GameHistory::HasNextStep() const {
return HasLockStep(m_Cursor); return HasLockStep(m_Cursor);
} }
void GameHistory::FromPacket(td::protocol::pdata::LockSteps&& a_Steps) { void GameHistory::FromPacket(protocol::pdata::LockSteps&& a_Steps) {
for (int i = 0; i < LOCKSTEP_BUFFER_SIZE; i++) { for (int i = 0; i < LOCKSTEP_BUFFER_SIZE; i++) {
protocol::LockStep& step = a_Steps.m_LockSteps[i]; protocol::LockStep& step = a_Steps.m_LockSteps[i];
SetLockStep(i + a_Steps.m_FirstFrameNumber, std::move(step)); SetLockStep(i + a_Steps.m_FirstFrameNumber, std::move(step));
} }
} }
td::protocol::packets::LockStepsPacket GameHistory::ToPacket(HistorySizeType a_StartIndex) { protocol::packets::LockStepsPacket GameHistory::ToPacket(HistorySizeType a_StartIndex) {
std::array<protocol::LockStep, LOCKSTEP_BUFFER_SIZE> steps; Array<protocol::LockStep, LOCKSTEP_BUFFER_SIZE> steps;
for (int i = 0; i < LOCKSTEP_BUFFER_SIZE; i++) { for (int i = 0; i < LOCKSTEP_BUFFER_SIZE; i++) {
steps[i] = GetLockStep(a_StartIndex + i); steps[i] = GetLockStep(a_StartIndex + i);
} }