mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-26 06:27:45 +00:00
Code Activity

Merge pull request #590 from NotAdam/develop

Browse source 
fix clang builds & exd_struct_gen error handling
This commit is contained in:
Adam 2019-10-29 19:06:28 +10:00 • committed by GitHub
commit 7942f22252
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/tools/exd_struct_gen/main.cpp
View file

@ -127,8 +127,17 @@ std::string generateStruct( const std::string& exd )
} }
auto sheet = nlohmann::json(); 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" ] ) for( auto& definition : sheet[ "definitions" ] )
{ {

2
src/world/Territory/Housing/HousingInteriorTerritory.h
View file

@ -5,7 +5,7 @@
namespace Sapphire::World::Territory::Housing namespace Sapphire::World::Territory::Housing
{ {
class HousingInteriorTerritory : public Territory class HousingInteriorTerritory : public Sapphire::Territory
{ {
public: public:
HousingInteriorTerritory( Common::LandIdent ident, uint16_t territoryTypeId, HousingInteriorTerritory( Common::LandIdent ident, uint16_t territoryTypeId,