浏览代码

Remove access to creature dwellings names via CGeneralTextHandler

Ivan Savenko 2 年之前
父节点
当前提交
50e8a62178
共有 2 个文件被更改,包括 2 次插入4 次删除
  1. 2 2
      lib/CGameState.cpp
  2. 0 2
      lib/CGeneralTextHandler.cpp

+ 2 - 2
lib/CGameState.cpp

@@ -149,10 +149,10 @@ void MetaString::getLocalString(const std::pair<ui8,ui32> &txt, std::string &dst
 			dst = VLC->generaltexth->translate("core.arraytxt", ser);
 			dst = VLC->generaltexth->translate("core.arraytxt", ser);
 			break;
 			break;
 		case CREGENS:
 		case CREGENS:
-			dst = VLC->generaltexth->translate("core.crgen1", ser);
+			dst = VLC->objtypeh->getObjectName(Obj::CREATURE_GENERATOR1, ser);
 			break;
 			break;
 		case CREGENS4:
 		case CREGENS4:
-			dst = VLC->generaltexth->translate("core.crgen4", ser);
+			dst = VLC->objtypeh->getObjectName(Obj::CREATURE_GENERATOR4, ser);
 			break;
 			break;
 		case ADVOB_TXT:
 		case ADVOB_TXT:
 			dst = VLC->generaltexth->translate("core.advevent", ser);
 			dst = VLC->generaltexth->translate("core.advevent", ser);

+ 0 - 2
lib/CGeneralTextHandler.cpp

@@ -440,8 +440,6 @@ CGeneralTextHandler::CGeneralTextHandler():
 	readToVector("core.advevent", "DATA/ADVEVENT.TXT" );
 	readToVector("core.advevent", "DATA/ADVEVENT.TXT" );
 	readToVector("core.restypes", "DATA/RESTYPES.TXT" );
 	readToVector("core.restypes", "DATA/RESTYPES.TXT" );
 	readToVector("core.randsign", "DATA/RANDSIGN.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.overview", "DATA/OVERVIEW.TXT" );
 	readToVector("core.arraytxt", "DATA/ARRAYTXT.TXT" );
 	readToVector("core.arraytxt", "DATA/ARRAYTXT.TXT" );
 	readToVector("core.priskill", "DATA/PRISKILL.TXT" );
 	readToVector("core.priskill", "DATA/PRISKILL.TXT" );