mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue with OOS in replays. Patch by elexis

Browse Source 
This was SVN commit r16790.
This commit is contained in:
sanderd17
2015-06-18 15:29:03 +00:00
parent 008fb80855
commit e7707f0f0c
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/network/NetTurnManager.cpp
+6 -8
View File
@@ -490,7 +490,8 @@ CNetReplayTurnManager::CNetReplayTurnManager(CSimulation2& simulation, IReplayLo
void CNetReplayTurnManager::StoreReplayCommand(u32 turn, int player, const std::string& command)
{
m_ReplayCommands[turn][player].push_back(command);
// Using the pair we make sure that commands per turn will be processed in the correct order
m_ReplayCommands[turn].push_back(std::make_pair(player, command));
}
void CNetReplayTurnManager::StoreReplayHash(u32 turn, const std::string& hash, bool quick)
@@ -542,14 +543,11 @@ void CNetReplayTurnManager::DoTurn(u32 turn)
m_TurnLength = m_ReplayTurnLengths[turn];
// Simulate commands for that turn
for (auto& command : m_ReplayCommands[turn])
for (const std::pair<player_id_t, std::string>& pair : m_ReplayCommands[turn])
{
for (size_t i = 0; i < command.second.size(); ++i)
{
JS::RootedValue data(m_Simulation2.GetScriptInterface().GetContext());
m_Simulation2.GetScriptInterface().ParseJSON(command.second[i], &data);
AddCommand(m_ClientId, command.first, data, m_CurrentTurn + 1);
}
JS::RootedValue command(m_Simulation2.GetScriptInterface().GetContext());
m_Simulation2.GetScriptInterface().ParseJSON(pair.second, &command);
AddCommand(m_ClientId, pair.first, command, m_CurrentTurn + 1);
}
}
source/network/NetTurnManager.h
+1 -1
View File
@@ -265,7 +265,7 @@ protected:
void DoTurn(u32 turn);
// Contains the commands of every player on each turn
std::map<u32, std::map<int, std::vector<std::string> > > m_ReplayCommands;
std::map<u32, std::vector<std::pair<player_id_t, std::string> > > m_ReplayCommands;
// Contains the length of every turn
std::map<u32, u32> m_ReplayTurnLengths;