Defensive programming.
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
2020-08-17 18:23:25 +02:00
parent f3721ad2a5
commit cc92cf1491
10 changed files with 67 additions and 26 deletions

View File

@@ -21,7 +21,11 @@ namespace PkmnLib::Battling {
void SetWeather(const ArbUt::StringView& name);
void ClearWeather();
const ArbUt::StringView& GetWeatherName() noexcept { return _weatherScript->GetName(); }
const ArbUt::StringView& GetWeatherName() noexcept {
if (_weatherScript == nullptr)
return ArbUt::StringView::EmptyString();
return _weatherScript->GetName();
}
size_t ScriptCount() const override { return CreatureLib::Battling::Battle::ScriptCount() + 1; }
void GetActiveScripts(ArbUt::List<CreatureLib::Battling::ScriptWrapper>& scripts) override {

View File

@@ -20,12 +20,15 @@ void PkmnLib::Battling::ExperienceLibrary::HandleExperienceGain(
const std::unordered_set<ArbUt::BorrowedPtr<CreatureLib::Battling::Creature>>& opponents) const {
auto fainted = dynamic_cast<Pokemon*>(faintedMon);
auto expGain = fainted->GetForme()->GetBaseExperience();
AssertNotNull(fainted);
auto& forme = fainted->GetForme();
AssertNotNull(forme);
auto expGain = forme->GetBaseExperience();
auto level = fainted->GetLevel();
float v1 = (expGain * level) / 5;
for (auto op : opponents) {
for (const auto& op : opponents) {
if (!op->AllowedExperienceGain())
continue;
auto experienceGain = CalculateDynamicExperience(level, v1, op, fainted);

View File

@@ -37,7 +37,7 @@ namespace PkmnLib::Battling {
_friendship(species->GetBaseHappiness()) {}
const ArbUt::BorrowedPtr<const Library::PokemonForme> GetForme() const {
return _variant.As<const Library::PokemonForme>();
return _variant.ForceAs<const Library::PokemonForme>();
}
inline bool IsShiny() const noexcept { return _coloring == 1; }