From ee098125e633e53c27b78675e0ad467769f20a82 Mon Sep 17 00:00:00 2001 From: "Marco Antonio J. Costa" Date: Fri, 17 Jul 2026 06:03:40 -0300 Subject: [PATCH] Strip dead per-language .slf entries from gGameLibaries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit InitializeFileDatabase, the only reader of gGameLibaries[], is called nowhere in the tree — VFS replaced this legacy loader. Delete the 7 #ifdef GERMAN/POLISH/DUTCH/ITALIAN/RUSSIAN/FRENCH/CHINESE entries outright rather than runtime-selecting them. NPC.h: two commented-out #if defined(CRIPPLED_VERSION)||defined(RUSSIAN) triplets. AimMembers.cpp: two commented-out #ifdef POLISH character-remap switch blocks. All already-dead. Verify grep for language macros outside i18n/ now returns only unrelated hits (filename literal, dev-tool CLI flag, stray comment, historical prose) — no #ifdef guards left. Co-Authored-By: Claude Sonnet 5 Co-Authored-By: Claude Fable 5 --- Laptop/AimMembers.cpp | 50 ----------------------------------------- TacticalAI/NPC.h | 5 ----- i18n/Ja2 Libs.cpp | 28 ----------------------- i18n/include/Ja2 Libs.h | 24 -------------------- 4 files changed, 107 deletions(-) diff --git a/Laptop/AimMembers.cpp b/Laptop/AimMembers.cpp index 63acc6fb..24519bc4 100644 --- a/Laptop/AimMembers.cpp +++ b/Laptop/AimMembers.cpp @@ -1468,31 +1468,6 @@ BOOLEAN LoadMercBioInfo(UINT8 ubIndex, STR16 pInfoString, STR16 pAddInfo) //{ // if( pInfoString[i] > 33 ) // pInfoString[i] -= 1; - // #ifdef POLISH - // switch( pInfoString[ i ] ) - // { - // case 260: pInfoString[ i ] = 165; break; - // case 262: pInfoString[ i ] = 198; break; - // case 280: pInfoString[ i ] = 202; break; - // case 321: pInfoString[ i ] = 163; break; - // case 323: pInfoString[ i ] = 209; break; - // case 211: pInfoString[ i ] = 211; break; - - // case 346: pInfoString[ i ] = 338; break; - // case 379: pInfoString[ i ] = 175; break; - // case 377: pInfoString[ i ] = 143; break; - // case 261: pInfoString[ i ] = 185; break; - // case 263: pInfoString[ i ] = 230; break; - // case 281: pInfoString[ i ] = 234; break; - - // case 322: pInfoString[ i ] = 179; break; - // case 324: pInfoString[ i ] = 241; break; - // case 243: pInfoString[ i ] = 243; break; - // case 347: pInfoString[ i ] = 339; break; - // case 380: pInfoString[ i ] = 191; break; - // case 378: pInfoString[ i ] = 376; break; - // } - // #endif //} DecodeString(pInfoString, SIZE_MERC_BIO_INFO); @@ -1514,31 +1489,6 @@ BOOLEAN LoadMercBioInfo(UINT8 ubIndex, STR16 pInfoString, STR16 pAddInfo) //{ // if( pAddInfo[i] > 33 ) // pAddInfo[i] -= 1; - // #ifdef POLISH - // switch( pAddInfo[ i ] ) - // { - // case 260: pAddInfo[ i ] = 165; break; - // case 262: pAddInfo[ i ] = 198; break; - // case 280: pAddInfo[ i ] = 202; break; - // case 321: pAddInfo[ i ] = 163; break; - // case 323: pAddInfo[ i ] = 209; break; - // case 211: pAddInfo[ i ] = 211; break; - - // case 346: pAddInfo[ i ] = 338; break; - // case 379: pAddInfo[ i ] = 175; break; - // case 377: pAddInfo[ i ] = 143; break; - // case 261: pAddInfo[ i ] = 185; break; - // case 263: pAddInfo[ i ] = 230; break; - // case 281: pAddInfo[ i ] = 234; break; - - // case 322: pAddInfo[ i ] = 179; break; - // case 324: pAddInfo[ i ] = 241; break; - // case 243: pAddInfo[ i ] = 243; break; - // case 347: pAddInfo[ i ] = 339; break; - // case 380: pAddInfo[ i ] = 191; break; - // case 378: pAddInfo[ i ] = 376; break; - // } - // #endif //} DecodeString(pAddInfo, SIZE_MERC_BIO_INFO); diff --git a/TacticalAI/NPC.h b/TacticalAI/NPC.h index a52cb3e8..f2bec488 100644 --- a/TacticalAI/NPC.h +++ b/TacticalAI/NPC.h @@ -38,9 +38,6 @@ typedef struct { //SB: unify structure for all versions -// #if defined( CRIPPLED_VERSION ) || defined( RUSSIAN ) -// UINT8 ubIdentifier[4]; -// #endif UINT16 fFlags; @@ -74,9 +71,7 @@ typedef struct INT16 sActionData; // special action value //SB: unify structure for all versions -//#if !defined( CRIPPLED_VERSION ) && !defined( RUSSIAN ) UINT8 ubUnused[4]; -//#endif } _old_NPCQuoteInfo; // 32 bytes diff --git a/i18n/Ja2 Libs.cpp b/i18n/Ja2 Libs.cpp index ed4541d8..c3319a08 100644 --- a/i18n/Ja2 Libs.cpp +++ b/i18n/Ja2 Libs.cpp @@ -27,34 +27,6 @@ LibraryInitHeader gGameLibaries[ ] = { "TileSets.slf", TRUE, TRUE }, { "LoadScreens.slf", TRUE, TRUE }, { "Intro.slf", TRUE, TRUE }, - -#ifdef GERMAN - { "German.slf", FALSE, TRUE }, -#endif - -#ifdef POLISH - { "Polish.slf", FALSE, TRUE }, -#endif - -#ifdef DUTCH - { "Dutch.slf", FALSE, TRUE }, -#endif - -#ifdef ITALIAN - { "Italian.slf", FALSE, TRUE }, -#endif - -#ifdef RUSSIAN - { "Russian.slf", FALSE, TRUE }, -#endif - -#ifdef FRENCH - { "French.slf", FALSE, TRUE }, -#endif - -#ifdef CHINESE - { "Chinese.slf", FALSE, TRUE }, -#endif }; diff --git a/i18n/include/Ja2 Libs.h b/i18n/include/Ja2 Libs.h index b154a4c5..1708cb8f 100644 --- a/i18n/include/Ja2 Libs.h +++ b/i18n/include/Ja2 Libs.h @@ -30,30 +30,6 @@ LIBRARY_LOADSCREENS, LIBRARY_INTRO, -#ifdef GERMAN - LIBRARY_GERMAN_DATA, -#endif - -#ifdef DUTCH - LIBRARY_DUTCH_DATA, -#endif - -#ifdef POLISH - LIBRARY_POLISH_DATA, -#endif - -#ifdef ITALIAN - LIBRARY_ITALIAN_DATA, -#endif - -#ifdef RUSSIAN - LIBRARY_RUSSIAN_DATA, -#endif - -#ifdef FRENCH - LIBRARY_FRENCH_DATA, -#endif - NUMBER_OF_LIBRARIES };