From 340ea95b84407fa66fdbff79372b6fb239091948 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Fri, 4 May 2018 04:01:30 +0000 Subject: [PATCH] let's not redundantly call this...ok, SOE? --- .../sharedUtility/src/shared/DataTableManager.cpp | 15 ++++++++++----- .../sharedUtility/src/shared/DataTableManager.h | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/engine/shared/library/sharedUtility/src/shared/DataTableManager.cpp b/engine/shared/library/sharedUtility/src/shared/DataTableManager.cpp index f6f633c5..830ecb32 100755 --- a/engine/shared/library/sharedUtility/src/shared/DataTableManager.cpp +++ b/engine/shared/library/sharedUtility/src/shared/DataTableManager.cpp @@ -64,12 +64,17 @@ void DataTableManager::remove() // ---------------------------------------------------------------------- -DataTable* DataTableManager::open(const std::string& table) +DataTable* DataTableManager::open(const std::string& table, bool tryGetTable) { FATAL(!m_installed, ("DataTableManager::open: not installed.")); - DataTable *retVal = getTable(table, false); - if (retVal) - return retVal; + + DataTable *retVal = nullptr; + + if (tryGetTable) { + retVal = getTable(table, false); + if (retVal) + return retVal; + } if (!TreeFile::exists(table.c_str())) { @@ -125,7 +130,7 @@ DataTable * DataTableManager::getTable(const std::string& table, bool openIfNotF { if (openIfNotFound) { - DataTable * dt = open(table); + DataTable * dt = open(table, false); if (!dt) { DEBUG_WARNING(true, ("Could not find table [%s]", table.c_str())); diff --git a/engine/shared/library/sharedUtility/src/shared/DataTableManager.h b/engine/shared/library/sharedUtility/src/shared/DataTableManager.h index 40ff5647..273c73e8 100755 --- a/engine/shared/library/sharedUtility/src/shared/DataTableManager.h +++ b/engine/shared/library/sharedUtility/src/shared/DataTableManager.h @@ -32,7 +32,7 @@ public: private: static void remove(); - static DataTable * open(const std::string& table); + static DataTable * open(const std::string& table, bool tryGetTable = true); DataTableManager(); ~DataTableManager();