From 0837db88abab847e55855353a5d702ef4e29184c Mon Sep 17 00:00:00 2001 From: marvin Date: Wed, 30 Jan 2019 21:50:12 +0100 Subject: [PATCH] fixed crashbug --- src/game/server/wave.cpp | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/game/server/wave.cpp b/src/game/server/wave.cpp index edc390268..b60318f45 100644 --- a/src/game/server/wave.cpp +++ b/src/game/server/wave.cpp @@ -30,19 +30,24 @@ std::vector CWave::GetZombNum(int wave) std::string wave_str= std::to_string(wave); json waves = m_Json.at("Waves"); //GameServer()->Console()->Print(IConsole::OUTPUT_LEVEL_DEBUG, "debug", aBuf); - json curwave = waves.at(wave_str); - if(true) + + json j = waves[wave_str]; + if(!j.is_object()) + { + return GetEndlessWave(); + } + //if(j.is_object()){ + std::vector result; + for(int i = 0; i < 13; ++i) { - json j = curwave;//*it; - std::vector result; - for(int i = 0; i < 13; ++i) - { - result.push_back(j.value(m_JsonZombieNames[i], 0)); - } - return result; + result.push_back(j.value(m_JsonZombieNames[i], 0)); } + return result; + /*} else + { return GetEndlessWave(); + }*/ } std::vector CWave::GetEndlessWave()