From 50e8a62178139afdef702b693a6184a7370dbebb Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Tue, 10 Jan 2023 16:25:25 +0200 Subject: [PATCH] Remove access to creature dwellings names via CGeneralTextHandler --- lib/CGameState.cpp | 4 ++-- lib/CGeneralTextHandler.cpp | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/CGameState.cpp b/lib/CGameState.cpp index 9f93d7ddb..f3b181161 100644 --- a/lib/CGameState.cpp +++ b/lib/CGameState.cpp @@ -149,10 +149,10 @@ void MetaString::getLocalString(const std::pair &txt, std::string &dst dst = VLC->generaltexth->translate("core.arraytxt", ser); break; case CREGENS: - dst = VLC->generaltexth->translate("core.crgen1", ser); + dst = VLC->objtypeh->getObjectName(Obj::CREATURE_GENERATOR1, ser); break; case CREGENS4: - dst = VLC->generaltexth->translate("core.crgen4", ser); + dst = VLC->objtypeh->getObjectName(Obj::CREATURE_GENERATOR4, ser); break; case ADVOB_TXT: dst = VLC->generaltexth->translate("core.advevent", ser); diff --git a/lib/CGeneralTextHandler.cpp b/lib/CGeneralTextHandler.cpp index e6823d6ce..b29fa168e 100644 --- a/lib/CGeneralTextHandler.cpp +++ b/lib/CGeneralTextHandler.cpp @@ -440,8 +440,6 @@ CGeneralTextHandler::CGeneralTextHandler(): readToVector("core.advevent", "DATA/ADVEVENT.TXT" ); readToVector("core.restypes", "DATA/RESTYPES.TXT" ); readToVector("core.randsign", "DATA/RANDSIGN.TXT" ); - readToVector("core.crgen1", "DATA/CRGEN1.TXT" ); - readToVector("core.crgen4", "DATA/CRGEN4.TXT" ); readToVector("core.overview", "DATA/OVERVIEW.TXT" ); readToVector("core.arraytxt", "DATA/ARRAYTXT.TXT" ); readToVector("core.priskill", "DATA/PRISKILL.TXT" );