diff --git a/artifacts/sfall_dat/dat_ru/art/intrface/BARTER_E.frm b/artifacts/sfall_dat/dat_ru/art/intrface/BARTER_E.frm new file mode 100644 index 00000000..956d1481 Binary files /dev/null and b/artifacts/sfall_dat/dat_ru/art/intrface/BARTER_E.frm differ diff --git a/artifacts/sfall_dat/dat_ru/art/intrface/INVBOX_E.frm b/artifacts/sfall_dat/dat_ru/art/intrface/INVBOX_E.frm new file mode 100644 index 00000000..230060c7 Binary files /dev/null and b/artifacts/sfall_dat/dat_ru/art/intrface/INVBOX_E.frm differ diff --git a/artifacts/sfall_dat/dat_ru/art/intrface/LOOT_E.frm b/artifacts/sfall_dat/dat_ru/art/intrface/LOOT_E.frm new file mode 100644 index 00000000..eea4fd02 Binary files /dev/null and b/artifacts/sfall_dat/dat_ru/art/intrface/LOOT_E.frm differ diff --git a/artifacts/sfall_dat/dat_ru/art/intrface/TRADE_E.frm b/artifacts/sfall_dat/dat_ru/art/intrface/TRADE_E.frm new file mode 100644 index 00000000..3759875c Binary files /dev/null and b/artifacts/sfall_dat/dat_ru/art/intrface/TRADE_E.frm differ diff --git a/artifacts/sfall_dat/dat_ru/art/intrface/USE_E.frm b/artifacts/sfall_dat/dat_ru/art/intrface/USE_E.frm new file mode 100644 index 00000000..6d4f060b Binary files /dev/null and b/artifacts/sfall_dat/dat_ru/art/intrface/USE_E.frm differ diff --git a/sfall/Modules/ExtraArt.cpp b/sfall/Modules/ExtraArt.cpp index 41a5df13..20024b88 100644 --- a/sfall/Modules/ExtraArt.cpp +++ b/sfall/Modules/ExtraArt.cpp @@ -63,13 +63,13 @@ PcxFile LoadPcxFileCached(const char* file) { return pcxFileCache.emplace(file, LoadPcxFile(file)).first->second; } -static void GetUnlistedFrmPath(const char* frmName, unsigned int folderRef, bool useLanguage, char* buf, size_t bufSize) { +static void GetUnlistedFrmPath(const char* frmName, unsigned int folderRef, bool useLanguage, char* pathBuf) { const char* artfolder = fo::var::art[folderRef].path; // address of art type name if (useLanguage) { - sprintf_s(buf, MAX_PATH, "art\\%s\\%s\\%s", (const char*)fo::var::language, artfolder, frmName); + sprintf_s(pathBuf, MAX_PATH, "art\\%s\\%s\\%s", (const char*)fo::var::language, artfolder, frmName); } else { - sprintf_s(buf, MAX_PATH, "art\\%s\\%s", artfolder, frmName); + sprintf_s(pathBuf, MAX_PATH, "art\\%s\\%s", artfolder, frmName); } } @@ -77,11 +77,11 @@ bool UnlistedFrmExists(const char* frmName, unsigned int folderRef) { if (folderRef > fo::OBJ_TYPE_SKILLDEX) return nullptr; char frmPath[MAX_PATH]; - GetUnlistedFrmPath(frmName, folderRef, fo::var::use_language != 0, frmPath, MAX_PATH); + GetUnlistedFrmPath(frmName, folderRef, fo::var::use_language != 0, frmPath); bool exists = fo::func::db_access(frmPath); if (!exists && fo::var::use_language) { - GetUnlistedFrmPath(frmName, folderRef, false, frmPath, MAX_PATH); + GetUnlistedFrmPath(frmName, folderRef, false, frmPath); exists = fo::func::db_access(frmPath); } return exists; @@ -92,11 +92,11 @@ fo::FrmFile* LoadUnlistedFrmCached(const char* frmName, unsigned int folderRef) char frmPath[MAX_PATH]; - GetUnlistedFrmPath(frmName, folderRef, fo::var::use_language != 0, frmPath, MAX_PATH); + GetUnlistedFrmPath(frmName, folderRef, fo::var::use_language != 0, frmPath); fo::FrmFile* frm = LoadFrmFileCached(frmPath); if (frm == nullptr && fo::var::use_language) { - GetUnlistedFrmPath(frmName, folderRef, false, frmPath, MAX_PATH); + GetUnlistedFrmPath(frmName, folderRef, false, frmPath); frm = LoadFrmFileCached(frmPath); } return frm;