From 95905cd9cf8e0b306b1922df7f914794a3125f92 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Tue, 29 Oct 2019 18:39:40 +1100 Subject: [PATCH 1/3] fix builds on clang --- src/world/Territory/Housing/HousingInteriorTerritory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.h b/src/world/Territory/Housing/HousingInteriorTerritory.h index efc4860b..22c3b43c 100644 --- a/src/world/Territory/Housing/HousingInteriorTerritory.h +++ b/src/world/Territory/Housing/HousingInteriorTerritory.h @@ -5,7 +5,7 @@ namespace Sapphire::World::Territory::Housing { - class HousingInteriorTerritory : public Territory +class HousingInteriorTerritory : public Sapphire::Territory { public: HousingInteriorTerritory( Common::LandIdent ident, uint16_t territoryTypeId, From 1b3aac4468078d00b3775052cce9310f749ae235 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Tue, 29 Oct 2019 18:49:27 +1100 Subject: [PATCH 2/3] handle bad json in exd_struct_gen --- src/tools/exd_struct_gen/main.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/tools/exd_struct_gen/main.cpp b/src/tools/exd_struct_gen/main.cpp index c418dd61..1fbcb042 100644 --- a/src/tools/exd_struct_gen/main.cpp +++ b/src/tools/exd_struct_gen/main.cpp @@ -127,8 +127,17 @@ std::string generateStruct( const std::string& exd ) } auto sheet = nlohmann::json(); - std::ifstream defJson( path ); - defJson >> sheet; + + try + { + std::ifstream defJson( path ); + defJson >> sheet; + } + catch( const std::exception& ex ) + { + Logger::error( "Failed parsing json definition, err: {} file: {}", ex.what(), path ); + return ""; + } for( auto& definition : sheet[ "definitions" ] ) { From a2dc55ac0a77f3d478f17ff4b727c13aac7e61b0 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Tue, 29 Oct 2019 19:38:51 +1100 Subject: [PATCH 3/3] fix formatting --- src/world/Territory/Housing/HousingInteriorTerritory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.h b/src/world/Territory/Housing/HousingInteriorTerritory.h index 22c3b43c..3ea97ae4 100644 --- a/src/world/Territory/Housing/HousingInteriorTerritory.h +++ b/src/world/Territory/Housing/HousingInteriorTerritory.h @@ -5,7 +5,7 @@ namespace Sapphire::World::Territory::Housing { -class HousingInteriorTerritory : public Sapphire::Territory + class HousingInteriorTerritory : public Sapphire::Territory { public: HousingInteriorTerritory( Common::LandIdent ident, uint16_t territoryTypeId,