fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Code review fix + Russian expanded FRM's

Browse Source 
- GetUnlistedFrmPath: remove unused path parameter
- Add RU FRM's (by NovaRain)
This commit is contained in:
phobos2077
2024-05-09 09:33:06 +02:00
parent ab9844ccdd
commit cc12986d2f
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/sfall_dat/dat_ru/art/intrface/BARTER_E.frm
BIN
View File
Binary file not shown.
artifacts/sfall_dat/dat_ru/art/intrface/INVBOX_E.frm
BIN
View File
Binary file not shown.
artifacts/sfall_dat/dat_ru/art/intrface/LOOT_E.frm
BIN
View File
Binary file not shown.
artifacts/sfall_dat/dat_ru/art/intrface/TRADE_E.frm
BIN
View File
Binary file not shown.
artifacts/sfall_dat/dat_ru/art/intrface/USE_E.frm
BIN
View File
Binary file not shown.
sfall/Modules/ExtraArt.cpp
+7 -7
View File
@@ -63,13 +63,13 @@ PcxFile LoadPcxFileCached(const char* file) {
return pcxFileCache.emplace(file, LoadPcxFile(file)).first->second; 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 const char* artfolder = fo::var::art[folderRef].path; // address of art type name
if (useLanguage) { 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 { } 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; if (folderRef > fo::OBJ_TYPE_SKILLDEX) return nullptr;
char frmPath[MAX_PATH]; 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); bool exists = fo::func::db_access(frmPath);
if (!exists && fo::var::use_language) { if (!exists && fo::var::use_language) {
GetUnlistedFrmPath(frmName, folderRef, false, frmPath, MAX_PATH); GetUnlistedFrmPath(frmName, folderRef, false, frmPath);
exists = fo::func::db_access(frmPath); exists = fo::func::db_access(frmPath);
} }
return exists; return exists;
@@ -92,11 +92,11 @@ fo::FrmFile* LoadUnlistedFrmCached(const char* frmName, unsigned int folderRef)
char frmPath[MAX_PATH]; 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); fo::FrmFile* frm = LoadFrmFileCached(frmPath);
if (frm == nullptr && fo::var::use_language) { if (frm == nullptr && fo::var::use_language) {
GetUnlistedFrmPath(frmName, folderRef, false, frmPath, MAX_PATH); GetUnlistedFrmPath(frmName, folderRef, false, frmPath);
frm = LoadFrmFileCached(frmPath); frm = LoadFrmFileCached(frmPath);
} }
return frm; return frm;