diff --git a/src/servers/Server_Common/Database/DbConnection.cpp b/src/servers/Server_Common/Database/DbConnection.cpp index 9ba00fa5..fdb9533f 100644 --- a/src/servers/Server_Common/Database/DbConnection.cpp +++ b/src/servers/Server_Common/Database/DbConnection.cpp @@ -188,7 +188,7 @@ bool Core::Db::DbConnection::execute( boost::shared_ptr< Core::Db::PreparedState catch( std::runtime_error& e ) { g_log.error( e.what() ); - return nullptr; + return false; } } diff --git a/src/servers/Server_REST/PlayerMinimal.cpp b/src/servers/Server_REST/PlayerMinimal.cpp index a600477c..d6a34295 100644 --- a/src/servers/Server_REST/PlayerMinimal.cpp +++ b/src/servers/Server_REST/PlayerMinimal.cpp @@ -360,7 +360,7 @@ namespace Core { g_charaDb.directExecute( stmtItemGlobal ); } - void PlayerMinimal::createInvDbContainer( uint8_t slot ) const + void PlayerMinimal::createInvDbContainer( uint16_t slot ) const { auto stmtCreateInv = g_charaDb.getPreparedStatement( Db::CHARA_ITEMINV_INS ); stmtCreateInv->setInt( 1, m_id ); diff --git a/src/servers/Server_REST/PlayerMinimal.h b/src/servers/Server_REST/PlayerMinimal.h index 2146e25a..38019e10 100644 --- a/src/servers/Server_REST/PlayerMinimal.h +++ b/src/servers/Server_REST/PlayerMinimal.h @@ -150,7 +150,7 @@ namespace Core { m_gmRank = rank; } - void createInvDbContainer( uint8_t slot ) const; + void createInvDbContainer( uint16_t slot ) const; uint32_t m_modelEquip[10];